diff --git a/Engine/lib/bullet/.travis.yml b/Engine/lib/bullet/.travis.yml new file mode 100644 index 000000000..d2ad176f4 --- /dev/null +++ b/Engine/lib/bullet/.travis.yml @@ -0,0 +1,27 @@ +language: cpp +os: + - linux + - osx +compiler: + - gcc + - clang +addons: + apt: + packages: + - python3 + +script: + - echo "CXX="$CXX + - echo "CC="$CC + - cmake . -DBUILD_PYBULLET=ON -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror + - make -j8 + - ctest -j8 --output-on-failure + # Build again with double precision + - cmake . -G "Unix Makefiles" -DUSE_DOUBLE_PRECISION=ON #-DCMAKE_CXX_FLAGS=-Werror + - make -j8 + - ctest -j8 --output-on-failure + # Build again with shared libraries + - cmake . -G "Unix Makefiles" -DBUILD_SHARED_LIBS=ON + - make -j8 + - ctest -j8 --output-on-failure + - sudo make install diff --git a/Engine/lib/bullet/AUTHORS b/Engine/lib/bullet/AUTHORS deleted file mode 100644 index f2cc86dd7..000000000 --- a/Engine/lib/bullet/AUTHORS +++ /dev/null @@ -1,22 +0,0 @@ - -Bullet Physics Library is an open source project with help from the community at the Physics Forum -See the forum at http://bulletphysics.com - -The project was started by Erwin Coumans - -Following people contributed to Bullet -(random order, please let us know on the forum if your name should be in this list) - -Gino van den Bergen: LinearMath classes -Christer Ericson: parts of the voronoi simplex solver -Simon Hobbs: 3d axis sweep and prune, Extras/SATCollision, separating axis theorem + SIMD code -Dirk Gregorius: generic D6 constraint -Erin Catto: accumulated impulse in sequential impulse -Nathanael Presson: EPA penetration depth calculation -Francisco Leon: GIMPACT Concave Concave collision -Joerg Henrichs: make buildsystem (work in progress) -Eric Sunshine: jam + msvcgen buildsystem -Steve Baker: GPU physics and general implementation improvements -Jay Lee: Double precision support -KleMiX, aka Vsevolod Klementjev, managed version, rewritten in C# for XNA -Erwin Coumans: most other source code diff --git a/Engine/lib/bullet/AUTHORS.txt b/Engine/lib/bullet/AUTHORS.txt new file mode 100644 index 000000000..556e6f641 --- /dev/null +++ b/Engine/lib/bullet/AUTHORS.txt @@ -0,0 +1,40 @@ +Bullet Physics is created by Erwin Coumans with contributions from the following authors / copyright holders: + +AMD +Apple +Steve Baker +Gino van den Bergen +Nicola Candussi +Erin Catto +Lawrence Chai +Erwin Coumans +Christer Ericson +Disney Animation +Google +Dirk Gregorius +Marcus Hennix +MBSim Development Team +Takahiro Harada +Simon Hobbs +John Hsu +Ole Kniemeyer +Jay Lee +Francisco Leon +Vsevolod Klementjev +Phil Knight +John McCutchan +Steven Peters +Roman Ponomarev +Nathanael Presson +Gabor PUHR +Arthur Shek +Russel Smith +Sony +Jakub Stephien +Marten Svanfeldt +Pierre Terdiman +Steven Thompson +Tamas Umenhoffer +Yunfei Bai + +If your name is missing, please send an email to erwin.coumans@gmail.com or file an issue at http://github.com/bulletphysics/bullet3 diff --git a/Engine/lib/bullet/BulletConfig.cmake.in b/Engine/lib/bullet/BulletConfig.cmake.in new file mode 100644 index 000000000..f5dc7bdbb --- /dev/null +++ b/Engine/lib/bullet/BulletConfig.cmake.in @@ -0,0 +1,25 @@ +# -*- cmake -*- +# +# BulletConfig.cmake(.in) +# + +# Use the following variables to compile and link against Bullet: +# BULLET_FOUND - True if Bullet was found on your system +# BULLET_USE_FILE - The file making Bullet usable +# BULLET_DEFINITIONS - Definitions needed to build with Bullet +# BULLET_INCLUDE_DIR - Directory where Bullet-C-Api.h can be found +# BULLET_INCLUDE_DIRS - List of directories of Bullet and it's dependencies +# BULLET_LIBRARIES - List of libraries to link against Bullet library +# BULLET_LIBRARY_DIRS - List of directories containing Bullet' libraries +# BULLET_ROOT_DIR - The base directory of Bullet +# BULLET_VERSION_STRING - A human-readable string containing the version + +set ( BULLET_FOUND 1 ) +set ( BULLET_USE_FILE "@BULLET_USE_FILE@" ) +set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" ) +set ( BULLET_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" ) +set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" ) +set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" ) +set ( BULLET_LIBRARY_DIRS "@LIB_DESTINATION@" ) +set ( BULLET_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" ) +set ( BULLET_VERSION_STRING "@BULLET_VERSION@" ) \ No newline at end of file diff --git a/Engine/lib/bullet/BulletLicense.txt b/Engine/lib/bullet/BulletLicense.txt deleted file mode 100644 index 2e5680a8d..000000000 --- a/Engine/lib/bullet/BulletLicense.txt +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (c) 2003-2010 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -Free for commercial use, please report projects in the forum at http://www.bulletphysics.org - -In case you want to display a Bullet logo in your software: you can download the Bullet logo in various vector formats and high resolution at the download section in http://bullet.googlecode.com diff --git a/Engine/lib/bullet/CMakeLists.txt b/Engine/lib/bullet/CMakeLists.txt index 18a089a9e..26e662c97 100644 --- a/Engine/lib/bullet/CMakeLists.txt +++ b/Engine/lib/bullet/CMakeLists.txt @@ -5,178 +5,43 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) SET(MSVC_INCREMENTAL_DEFAULT ON) PROJECT(BULLET_PHYSICS) -SET(BULLET_VERSION 2.82) +SET(BULLET_VERSION 2.85) IF(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) + if(POLICY CMP0042) + # Enable MACOSX_RPATH by default. + cmake_policy(SET CMP0042 NEW) + endif(POLICY CMP0042) ENDIF(COMMAND cmake_policy) IF (NOT CMAKE_BUILD_TYPE) # SET(CMAKE_BUILD_TYPE "Debug") SET(CMAKE_BUILD_TYPE "Release") -ENDIF (NOT CMAKE_BUILD_TYPE) +ENDIF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") #MESSAGE("CMAKE_CXX_FLAGS_DEBUG="+${CMAKE_CXX_FLAGS_DEBUG}) OPTION(USE_DOUBLE_PRECISION "Use double precision" OFF) OPTION(USE_GRAPHICAL_BENCHMARK "Use Graphical Benchmark" ON) +OPTION(BUILD_SHARED_LIBS "Use shared libraries" OFF) +OPTION(USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD "Use btSoftMultiBodyDynamicsWorld" OFF) +OPTION(BULLET2_USE_THREAD_LOCKS "Build Bullet 2 libraries with mutex locking around certain operations" OFF) - -OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)" OFF) OPTION(USE_MSVC_INCREMENTAL_LINKING "Use MSVC Incremental Linking" OFF) - OPTION(USE_CUSTOM_VECTOR_MATH "Use custom vectormath library" OFF) -IF (USE_CUSTOM_VECTOR_MATH) - ADD_DEFINITIONS(-DUSE_SYSTEM_VECTORMATH) - IF(WIN32) - SET (VECTOR_MATH_INCLUDE ${BULLET_PHYSICS_SOURCE_DIR}/src/vectormath/sse CACHE PATH "Vector Math library include path.") - ELSE(WIN32) - SET (VECTOR_MATH_INCLUDE ${BULLET_PHYSICS_SOURCE_DIR}/src/vectormath/scalar CACHE PATH "Vector Math library include path.") - ENDIF(WIN32) -ENDIF(USE_CUSTOM_VECTOR_MATH) +#statically linking VC++ isn't supported for WindowsPhone/WindowsStore +IF (CMAKE_SYSTEM_NAME STREQUAL WindowsPhone OR CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)" ON) +ELSE () + OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)" OFF) +ENDIF (CMAKE_SYSTEM_NAME STREQUAL WindowsPhone OR CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - -IF (APPLE OR MSVC) - OPTION(BUILD_MULTITHREADING "Use BulletMultiThreading" ON) -ELSE() - OPTION(BUILD_MULTITHREADING "Use BulletMultiThreading" OFF) -ENDIF() - -IF (BUILD_MULTITHREADING) - OPTION(USE_MULTITHREADED_BENCHMARK "Use Multithreaded Benchmark" OFF) - IF (USE_MULTITHREADED_BENCHMARK) - ADD_DEFINITIONS(-DUSE_PARALLEL_SOLVER_BENCHMARK -DUSE_PARALLEL_DISPATCHER_BENCHMARK) - ENDIF(USE_MULTITHREADED_BENCHMARK) - - IF (MSVC OR APPLE) - OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" ON) - ELSE() - OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF) - ENDIF(MSVC OR APPLE) - - IF(MSVC) - FIND_PATH(DIRECTX_SDK_BASE_DIR Include/D3D11.h PATH $ENV{DXSDK_DIR} ) - IF(DIRECTX_SDK_BASE_DIR) - OPTION(USE_DX11 "Use DirectX 11" ON) - ELSE() - OPTION(USE_DX11 "Use DirectX 11" OFF) - ENDIF() - - FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{ATISTREAMSDKROOT} $ENV{AMDAPPSDKROOT} ) - IF(AMD_OPENCL_BASE_DIR) - #AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable - SET(AMD_OPENCL_INCLUDES ${AMD_OPENCL_BASE_DIR}/include ) - MESSAGE("AMD OPENCL SDK FOUND") - IF (CMAKE_CL_64) - SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86_64 ) - ELSE(CMAKE_CL_64) - SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86 ) - ENDIF(CMAKE_CL_64) - SET(CMAKE_ATISTREAMSDK_LIBRARY ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ) - OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON) - IF (CMAKE_CL_64) - SET(CMAK_GLEW_LIBRARY - ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib ) - ELSE(CMAKE_CL_64) - SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib ) - ENDIF(CMAKE_CL_64) - ELSE() - OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF) - ENDIF() - - FIND_PATH(INTEL_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{INTELOCLSDKROOT} ) - IF(INTEL_OPENCL_BASE_DIR) - SET(INTEL_OPENCL_INCLUDES ${INTEL_OPENCL_BASE_DIR}/include ) - MESSAGE("INTEL OPENCL SDK FOUND") - MESSAGE(${INTEL_OPENCL_INCLUDES}) - IF (CMAKE_CL_64) - SET(CMAKE_INTELOCLSDK_LIBPATH ${INTEL_OPENCL_BASE_DIR}/lib/x64 ) - ELSE(CMAKE_CL_64) - SET(CMAKE_INTELOCLSDK_LIBPATH ${INTEL_OPENCL_BASE_DIR}/lib/x86 ) - ENDIF(CMAKE_CL_64) - SET(INTEL_OPENCL_LIBRARIES ${CMAKE_INTELOCLSDK_LIBPATH}/OpenCL.lib) - OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" ON) - ELSE() - OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" OFF) - ENDIF() - - FIND_PATH(NVIDIA_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{CUDA_PATH} ) - IF(NVIDIA_OPENCL_BASE_DIR) - SET(NVIDIA_OPENCL_INCLUDES ${NVIDIA_OPENCL_BASE_DIR}/include ) - MESSAGE("NVIDIA OPENCL SDK FOUND") - MESSAGE(${NVIDIA_OPENCL_INCLUDES}) - IF (CMAKE_CL_64) - SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/x64 ) - ELSE(CMAKE_CL_64) - SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/Win32 ) - ENDIF(CMAKE_CL_64) - SET(NVIDIA_OPENCL_LIBRARIES ${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib) - - OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON) - ELSE() - OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" OFF) - ENDIF() - ELSE(MSVC) - FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{ATISTREAMSDKROOT} $ENV{AMDAPPSDKROOT} ) - IF(AMD_OPENCL_BASE_DIR) - #AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable - SET(AMD_OPENCL_INCLUDES ${AMD_OPENCL_BASE_DIR}/include ) - MESSAGE("AMD OPENCL SDK FOUND") - MESSAGE(${AMD_OPENCL_INCLUDES}) - IF (CMAKE_CL_64) - SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86_64 ) - ELSE(CMAKE_CL_64) - SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86 ) - ENDIF(CMAKE_CL_64) - OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON) - SET(CMAKE_ATISTREAMSDK_LIBRARY OpenCL ) - ELSE() - OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF) - ENDIF(AMD_OPENCL_BASE_DIR) - - FIND_PATH(INTEL_OPENCL_INCLUDES CL/cl.h) - FIND_PATH(INTEL_OPENCL_ICD_CFG intelocl64.icd /etc/OpenCL/vendors) - FIND_LIBRARY(INTEL_OPENCL_LIBRARIES OpenCL PATH /usr/lib64) - IF (INTEL_OPENCL_INCLUDES AND INTEL_OPENCL_LIBRARIES AND INTEL_OPENCL_ICD_CFG) - MESSAGE("INTEL OPENCL SDK FOUND") - MESSAGE(${INTEL_OPENCL_LIBRARIES}) - OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" ON) - ELSE () - MESSAGE("INTEL OPENCL NOT FOUND") - OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" OFF) - ENDIF () - - - FIND_PATH(NVIDIA_OPENCL_INCLUDES CL/cl.h) - FIND_PATH(NVIDIA_OPENCL_ICD_CFG nvidia.icd /etc/OpenCL/vendors) - FIND_LIBRARY(NVIDIA_OPENCL_LIBRARIES OpenCL PATH /usr/lib64 /usr/local/lib) - IF (NVIDIA_OPENCL_INCLUDES AND NVIDIA_OPENCL_LIBRARIES AND NVIDIA_OPENCL_ICD_CFG) - MESSAGE("NVidia OPENCL FOUND") - MESSAGE(${NVIDIA_OPENCL_LIBRARIES}) - OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON) - ELSE () - MESSAGE("NVidia OPENCL NOT FOUND") - OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" OFF) - ENDIF () - ENDIF(MSVC) - -ELSE(BUILD_MULTITHREADING) -# SET(BUILD_NVIDIA_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for NVidia" FORCE) -# SET(BUILD_AMD_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for AMD" FORCE) -# SET(BUILD_INTEL_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for Intel (CPU)" FORCE) -# SET(BUILD_MINICL_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for MiniCL (Generic CPU)" FORCE) -# SET(USE_DX11 OFF CACHE BOOL "Use DirectX 11" FORCE) -# SET(USE_MULTITHREADED_BENCHMARK OFF CACHE BOOL "Use Multithreaded Benchmark" FORCE) -ENDIF(BUILD_MULTITHREADING) - - - - -#SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO") -#SET(CMAKE_EXE_LINKER_FLAGS "/STACK:10000000 /INCREMENTAL:NO") +#SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO") +#SET(CMAKE_EXE_LINKER_FLAGS "/STACK:10000000 /INCREMENTAL:NO") #MESSAGE("MSVC_INCREMENTAL_YES_FLAG"+${MSVC_INCREMENTAL_YES_FLAG}) @@ -185,26 +50,28 @@ IF(MSVC) IF (NOT USE_MSVC_INCREMENTAL_LINKING) #MESSAGE("MSVC_INCREMENTAL_DEFAULT"+${MSVC_INCREMENTAL_DEFAULT}) SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:NO") - - STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_DEBUG}) + + STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_DEBUG}) SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO ${replacementFlags}" ) MESSAGE("CMAKE_EXE_LINKER_FLAGS_DEBUG=${CMAKE_EXE_LINKER_FLAGS_DEBUG}") - -# STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags2 ${CMAKE_EXE_LINKER_FLAGS}) -# SET(CMAKE_EXE_LINKER_FLAGS ${replacementFlag2}) -# STRING(REPLACE "INCREMENTAL:YES" "" replacementFlags3 ${CMAKE_EXTRA_LINK_FLAGS}) -# SET(CMAKE_EXTRA_LINK_FLAGS ${replacementFlag3}) - - - STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}) - SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) + + STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags2 ${CMAKE_EXE_LINKER_FLAGS}) + + SET(CMAKE_EXE_LINKER_FLAGS ${replacementFlag2}) + STRING(REPLACE "INCREMENTAL:YES" "" replacementFlags3 "${CMAKE_EXTRA_LINK_FLAGS}") + + SET(CMAKE_EXTRA_LINK_FLAGS ${replacementFlag3}) + + + STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") + SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags3}" ) - + ENDIF (NOT USE_MSVC_INCREMENTAL_LINKING) IF (NOT USE_MSVC_RUNTIME_LIBRARY_DLL) #We statically link to reduce dependancies - FOREACH(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) + FOREACH(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO ) IF(${flag_var} MATCHES "/MD") STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") ENDIF(${flag_var} MATCHES "/MD") @@ -219,13 +86,15 @@ IF(MSVC) ELSE() OPTION(USE_MSVC_SSE "Use MSVC /arch:sse option" ON) IF (USE_MSVC_SSE) - ADD_DEFINITIONS(/arch:SSE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE") ENDIF() ENDIF() OPTION(USE_MSVC_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON) IF (USE_MSVC_FAST_FLOATINGPOINT) - ADD_DEFINITIONS(/fp:fast) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast") ENDIF() + + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267") ENDIF(MSVC) @@ -265,7 +134,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES) ENDIF (WIN32) -OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU demos" ON) +OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON) @@ -279,20 +148,30 @@ ADD_DEFINITIONS( -DBT_USE_DOUBLE_PRECISION) SET( BULLET_DOUBLE_DEF "-DBT_USE_DOUBLE_PRECISION") ENDIF (USE_DOUBLE_PRECISION) +IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) +ADD_DEFINITIONS(-DUSE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) +ENDIF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) + IF(USE_GRAPHICAL_BENCHMARK) ADD_DEFINITIONS( -DUSE_GRAPHICAL_BENCHMARK) ENDIF (USE_GRAPHICAL_BENCHMARK) +IF(BULLET2_USE_THREAD_LOCKS) + ADD_DEFINITIONS( -DBT_THREADSAFE=1 ) + IF (NOT MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + ENDIF (NOT MSVC) +ENDIF (BULLET2_USE_THREAD_LOCKS) + IF (WIN32) OPTION(USE_GLUT "Use Glut" ON) -ADD_DEFINITIONS( -D_IRR_STATIC_LIB_ ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE ) ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS ) IF (USE_GLUT AND MSVC) - string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - remove_definitions(-D_WINDOWS ) + string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + remove_definitions(-D_WINDOWS ) ENDIF() @@ -301,11 +180,11 @@ ELSE(WIN32) OPTION(USE_GLUT "Use Glut" ON) ENDIF(WIN32) - + IF(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) ENDIF(COMMAND cmake_policy) - + # This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system # This should be the case. @@ -320,60 +199,89 @@ ELSE (OPENGL_FOUND) SET(OPENGL_glu_LIBRARY glu32) ENDIF (OPENGL_FOUND) -# ADD_DEFINITIONS(-DBT_USE_FREEGLUT) -FIND_PACKAGE(GLU) +#FIND_PACKAGE(GLU) -IF (USE_GLUT) - FIND_PACKAGE(GLUT) - IF (GLUT_FOUND) - MESSAGE("GLUT FOUND") - MESSAGE(${GLUT_glut_LIBRARY}) - ELSE (GLUT_FOUND) - IF (MINGW) - MESSAGE ("GLUT NOT FOUND not found, trying to use MINGW glut32") - SET(GLUT_glut_LIBRARY glut32) - #TODO add better GLUT detection for MinGW - SET(GLUT_FOUND TRUE) - ENDIF (MINGW) - IF (MSVC) - SET(GLUT_FOUND TRUE) - IF (CMAKE_CL_64) - message("Win64 using Glut/glut64.lib") - SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib) - ELSE(CMAKE_CL_64) - message("Win32 using Glut/glut32.lib") - SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib) - ENDIF (CMAKE_CL_64) - INCLUDE_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/Glut) + +IF (APPLE) + FIND_LIBRARY(COCOA_LIBRARY Cocoa) +ENDIF() + +OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON) + +OPTION(BUILD_PYBULLET "Set when you want to build pybullet (experimental Python bindings for Bullet)" OFF) + + +IF(BUILD_PYBULLET) + + FIND_PACKAGE(PythonLibs) + + OPTION(BUILD_PYBULLET_NUMPY "Set when you want to build pybullet with NumPy support" OFF) + OPTION(BUILD_PYBULLET_ENET "Set when you want to build pybullet with enet UDP networking support" ON) + + IF(BUILD_PYBULLET_NUMPY) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/build3/cmake) + #include(FindNumPy) + FIND_PACKAGE(NumPy) + if (PYTHON_NUMPY_FOUND) + message("NumPy found") + add_definitions(-DPYBULLET_USE_NUMPY) + else() + message("NumPy not found") + endif() + ENDIF() + OPTION(BUILD_PYBULLET "Set when you want to build pybullet (experimental Python bindings for Bullet)" OFF) + + IF(WIN32) + SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Shared Libs" FORCE) + ELSE(WIN32) + SET(BUILD_SHARED_LIBS ON CACHE BOOL "Shared Libs" FORCE) + ENDIF(WIN32) +ENDIF(BUILD_PYBULLET) + +IF(BUILD_BULLET3) + IF(APPLE) + MESSAGE("Mac OSX Version is ${_CURRENT_OSX_VERSION}") + IF(_CURRENT_OSX_VERSION VERSION_LESS 10.9) + MESSAGE("Mac OSX below 10.9 has no OpenGL 3 support so please disable the BUILD_OPENGL3_DEMOS option") + #unset(BUILD_OPENGL3_DEMOS CACHE) + + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" OFF) ELSE() - MESSAGE("GLUT NOT FOUND") - ENDIF (MSVC) - ENDIF (GLUT_FOUND) - - IF(NOT WIN32) - # This is added for linux. This should always work if everything is installed and working fine. - INCLUDE_DIRECTORIES(/usr/include /usr/local/include) - ENDIF() -ENDIF(USE_GLUT) - - -OPTION(BUILD_DEMOS "Set when you want to build the demos" ON) -IF(BUILD_DEMOS) - IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/Demos AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/Demos) - SUBDIRS(Demos) - ENDIF() -ENDIF(BUILD_DEMOS) - -# "Demos_ps3") -IF (MSVC) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/Demos_ps3 AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/Demos_ps3) - MESSAGE("Demos_ps3 found") - SUBDIRS(Demos_ps3) + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build the OpenGL3+ demos" ON) ENDIF() + ELSE() + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" ON) ENDIF() -ENDIF(MSVC) +ELSE(BUILD_BULLET3) + unset(BUILD_OPENGL3_DEMOS CACHE) + OPTION(BUILD_OPENGL3_DEMOS "Set when you want to build Bullet 3 OpenGL3+ demos" OFF) +ENDIF(BUILD_BULLET3) +IF(BUILD_OPENGL3_DEMOS) + IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/Demos3 AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/Demos3) + SUBDIRS(Demos3) + ENDIF() +ELSE() + ADD_DEFINITIONS(-DNO_OPENGL3) +ENDIF(BUILD_OPENGL3_DEMOS) + +OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON) +IF(BUILD_BULLET2_DEMOS) + + IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/examples AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/examples) + SUBDIRS(examples) + ENDIF() + + IF (BULLET2_USE_THREAD_LOCKS) + OPTION(BULLET2_MULTITHREADED_OPEN_MP_DEMO "Build Bullet 2 MultithreadedDemo using OpenMP (requires a compiler with OpenMP support)" OFF) + OPTION(BULLET2_MULTITHREADED_TBB_DEMO "Build Bullet 2 MultithreadedDemo using Intel Threading Building Blocks (requires the TBB library to be already installed)" OFF) + IF (MSVC) + OPTION(BULLET2_MULTITHREADED_PPL_DEMO "Build Bullet 2 MultithreadedDemo using Microsoft Parallel Patterns Library (requires MSVC compiler)" OFF) + ENDIF (MSVC) + ENDIF (BULLET2_USE_THREAD_LOCKS) + +ENDIF(BUILD_BULLET2_DEMOS) + OPTION(BUILD_EXTRAS "Set when you want to build the extras" ON) @@ -381,6 +289,7 @@ IF(BUILD_EXTRAS) SUBDIRS(Extras) ENDIF(BUILD_EXTRAS) + #Maya Dynamica plugin is moved to http://dynamica.googlecode.com SUBDIRS(src) @@ -398,18 +307,18 @@ ENDIF() IF(INSTALL_LIBS) SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) - SET (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name") + SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name") ## the following are directories where stuff will be installed to - SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/bullet/" CACHE PATH "The subdirectory to the header prefix") - SET(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") - IF(NOT WIN32) + SET(INCLUDE_INSTALL_DIR "include/bullet/" CACHE PATH "The subdirectory to the header prefix") + SET(PKGCONFIG_INSTALL_PREFIX "lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") + IF(NOT MSVC) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY) INSTALL( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc - DESTINATION - ${PKGCONFIG_INSTALL_PREFIX}) - ENDIF(NOT WIN32) + FILES + ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc + DESTINATION + ${PKGCONFIG_INSTALL_PREFIX}) + ENDIF(NOT MSVC) ENDIF(INSTALL_LIBS) #INSTALL of other files requires CMake 2.6 @@ -417,23 +326,27 @@ IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) OPTION(INSTALL_EXTRA_LIBS "Set when you want extra libraries installed" OFF) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) -OPTION(BUILD_UNIT_TESTS "Build Unit Tests" OFF) +OPTION(BUILD_UNIT_TESTS "Build Unit Tests" ON) IF (BUILD_UNIT_TESTS) - SUBDIRS(UnitTests) + ENABLE_TESTING() + SUBDIRS(test) ENDIF() set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet ) list (APPEND BULLET_LIBRARIES LinearMath) -list (APPEND BULLET_LIBRARIES BulletCollisions) +IF(BUILD_BULLET3) + list (APPEND BULLET_LIBRARIES BulletInverseDynamics) +ENDIF(BUILD_BULLET3) +list (APPEND BULLET_LIBRARIES BulletCollision) list (APPEND BULLET_LIBRARIES BulletDynamics) list (APPEND BULLET_LIBRARIES BulletSoftBody) -set (BULLET_USE_FILE ${CMAKE_INSTALL_PREFIX}/${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake) -configure_file ( ${CMAKE_SOURCE_DIR}/BulletConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake - @ONLY ESCAPE_QUOTES - ) -install ( FILES ${CMAKE_SOURCE_DIR}/UseBullet.cmake - ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake - DESTINATION ${BULLET_CONFIG_CMAKE_PATH} - ) +set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake) +configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake + @ONLY ESCAPE_QUOTES + ) +install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake + ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake + DESTINATION ${BULLET_CONFIG_CMAKE_PATH} + ) diff --git a/Engine/lib/bullet/COPYING b/Engine/lib/bullet/COPYING deleted file mode 100644 index 794842d9b..000000000 --- a/Engine/lib/bullet/COPYING +++ /dev/null @@ -1,17 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2011 Erwin Coumans http://bulletphysics.org - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -All files in the Bullet/src folder are under this Zlib license. -Files in the Extras and Demos folder may have a different license, see the respective files. diff --git a/Engine/lib/bullet/ChangeLog b/Engine/lib/bullet/ChangeLog deleted file mode 100644 index f5c85c801..000000000 --- a/Engine/lib/bullet/ChangeLog +++ /dev/null @@ -1,795 +0,0 @@ -Bullet Continuous Collision Detection and Physics Library -Primary author and maintainer: Erwin Coumans - -This ChangeLog is incomplete, for an up-to-date list of all fixed issues see http://bullet.googlecode.com -using http://tinyurl.com/yabmjjj - -2013 October 23 - - Bullet 2.82 release - - See docs/BulletQuickstart.pdf or issue tracked for details. - -2012 September 10 - - Bullet 2.81 release preparation - -2011 September 15 - - Bullet 2.79 release, revision 2433 (mainly a bugfix release) - - Revert a change in 2.78 related to speculative contacts (it has undesired side effects) - - Use HACD Hierachical Approximate Convex Decomposition (thanks to Khaled Mammou and Sujeon Kim) - - Add Intel cmake-build support for OpenCL accelerated cloth/particle - - add premake4 build system support to autogenerate visual studio project files that can be shipped (see msvc folder) - - preliminary build support for Google NativeClient, using premake4 (see msvc folder) - - -2011 April 8 - - Bullet 2.78 release 2383 - - Added FractureDemo - - Added Separatinx Axis Test and Polyhedral Clipping support (See InternalEdgeDemo) - - Added speculative contacts as CCD response method (See CcdPhysicsDemo) - - OpenCL and DirectCompute cloth as basic support for capsule collision - -2010 September 7 - - autotools now uses CamelCase naming for libraries just like cmake: - libbulletdynamics -> libBulletDynamics, libbulletmath -> libLinearMath - -2010 July 21 - - Preparing for Bullet 2.77 release, around revision r2135 - - Added an OpenCL particle demo, running on NVidia, AMD and MiniCL - Thanks to NVidia for the original particle demo from their OpenCL SDK - - Added GPU deformable object solvers for OpenCL and DirectCompute, and a DirectX 11 cloth demo - Thanks to AMD - - Create a separate library for MiniCL, - MiniCL is a rudimentary OpenCL wrapper that allows to compile OpenCL kernels for multi-core CPU, using Win32 Threads or Posix - - Moved vectormath into Bullet/src, and added a SSE implementation - - Added a btParallelConstraintSolver, mainly for PlayStation 3 Cell SPUs (although it runs fine on CPU too) - -2010 March 6 - - Dynamica Maya plugin (and COLLADA support) is moved to http://dynamica.googlecode.com - -2010 February - - Bullet 2.76 release, revision 2010 - - support for the .bullet binary file format - - btInternalEdgeUtility to adjust unwanted collisions against internal triangle edges - - Improved Maya Dynamica plugin with better constraint authoring and .bullet file export - - -2009 September 17 - - Minor update to Bullet 2.75 release, revision 1776 - - Support for btConvex2dShape, check out Bullet/Demos/Box2dDemo - - Fixes in build systems - - Minor fix in btGjkPairDetector - - Initialize world transform for btCollisionShape in constructor - - -2009 September 6 - - Bullet 2.75 release - - Added SPH fluid simulation in Extras, not integrated with rigid body / soft body yet - Thanks to Rama Hoetzlein to make this contribution available under the ZLib license - - add special capsule-capsule collider code in btConvexConvexCollisionAlgorithm, to speed up capsule-ragdolls - - soft body improvement: faster building of bending constraints - - soft body improvement: allow to disable/enable cluster self-collision - - soft body fix: 'exploding' soft bodies when using cluster collision - - fix some degenerate cases in continuous convex cast, could impact ray cast/convex cast - Thanks to Jacob Langford for the report and reproduction cases, see http://code.google.com/p/bullet/issues/detail?id=250&can=1&start=200 - - re-enabled split impulse - - added btHinge2Constraint, btUniversalConstraint, btGeneric6DofSpringConstraint - - demonstrate 2D physics with 2D/3D object interaction - - -2008 December 2 - - Fix contact refresh issues with btCompoundShape, introduced with btDbvt acceleration structure in btCompoundCollisionAlgorithm - - Made btSequentialImpulseConstraintSolver 100% compatible with ODE quickstep - constraints can use 'solveConstraint' method or 'getInfo/getInfo2' - -2008 November 30 - - Add highly optimized SIMD branchless PGS/SI solver innerloop - -2008 November 12 - - Add compound shape export to BulletColladaConverter - Thanks to JamesH for the report: http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=12&t=2840 - - Fix compiler build for Visual Studio 6 - Thanks to JoF for the report: http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=2841 - -2008 November 11 - - Add CProfileManager::dumpAll() to dump performance statistics to console using printf. - - Add support for interaction between btSoftBody and btCollisionObject/btGhostObject - -2008 November 8 - - Fix PosixThreadSupport - - Add improved btHeightfieldTerrainShape support and new Demos/TerrainDemo - Thanks to tomva, http://code.google.com/p/bullet/issues/detail?id=63&can=1 - - Moved kinematic character controller from Demos/CharacterDemo into src/BulletDynamics/Character/btKinematicCharacterController.cpp - -2008 November 6 - - reduced default memory pool allocation from 40Mb to 3Mb. This should be more suitable for all platforms, including iPhone - - improved CUDA broadphase - - IBM Cell SDK 3.x support, fix ibmsdk Makefiles - - improved CMake support with 'install' and 'framework option - -2008 November 4 - - add btAxisSweep::resetPool to avoid non-determinism due to shuffled linked list - Thanks to Ole for the contribution, - -2008 October 30 - - disabled btTriangleMesh duplicate search by default, it is extremely slow - - added Extras/IFF binary chunk serialization library as preparation for in-game native platform serialization (planned COLLADA DOM -> IFF converter) - -2008 October 20 - - added SCE Physics Effects box-box collision detection for SPU/BulletMultiThreaded version - See Bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp - Thanks to Sony Computer Entertainment Japan, SCEI for the contribution - -2008 October 17 - - Added btGhostObject support, this helps character controller, explosions, triggers and other local spatial queries - -2008 October 10 - - Moved aabb to btBroadphaseProxy, improves rayTest dramatically. Further raytest improvements using the broadphase acceleration structures are planned - - Moved BulletMultiThreaded from Extras to /src/BulletMultiThreaded for better integration - - -2008 October 3 - - Add support for autoconf automake - ./autogen.sh and ./configure will create both Makefile and Jamfile. CMake and autogenerated Visual Studio projectfiles remain supported too. - - Improved ColladaConverter: plane shape export, and callback for shape construction to allow deletion of memory - -2008 Sept 30 - - Improved Soft Body support, fixed issues related to soft body colliding against concave triangle meshes - - Shared more code between regular version and SPU/BulletMultiThreaded, in particular GJK/EPA - -2008 Sept 28 - - Fixed rotation issues in Dynamic Maya Plugin - -2008 Sept 11 - - Enable CCD motion clamping for btDiscreteDynamicsWorld, to avoid tunneling. A more advanced solution will be implemented in btContinuousDynamicsWorld. - -2008 Sept 7 - - Add btScaledBvhTriangleMeshShape, to allow re-use of btBvhTriangleMeshShape of different sizes, without copying of the BVH data. - -2008 Sept 5 - - Enabled Demos/ForkLiftDemo - Thanks Roman Ponomarev. - -2008 Sept 4 - - Added btCudaBroadphase in Extras/CUDA: some research into accelerating Bullet using CUDA. - Thanks to the particle demo from the NVidia CUDA SDK. - -2008 Sept 3 - - Several bug fixes and contributions related to inertia tensor, memory leaks etc. - Thanks to Ole K. - -2008 Sept 1 - - Updated CDTestFramework, with latest version of OPCODE Array SAP. See Extras/CDTestFramework - Thanks to Pierre Terdiman for the update - -2008 August 25 - - Walt Disney Studios contributes their in-house Maya Plugin for simulating Bullet physics, with options for other engines such as PhysBam or PhysX. - Thanks to Nicola Candussi and Arthur Shek - -2008 August 14 - - Improved performance for btDbvtBroadphase, based on dual dynamic AABB trees (one for static, one for dynamic objects, where objects can move from one to the other tree) - Thanks to Nathanael Presson again, for all his work. - -2008 July 31 - - Added Havok .hkx to COLLADA Physics .dae converter patch+information - - Fix btSubsimplexConvexCast - Thanks to Nacho, http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=2422) - - Fix in rendering, GL_STENCIL - - btTriangleIndexVertexArray indices should be unsigned int/unsigned short int, - - Made InternalProcessAllTriangles virtual, thanks to - Both thank to Fullmetalcoder, http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=2401 - - clamp impulse for btPoint2PointConstraint - Thanks to Martijn Reuvers, http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=2418 - - Free memory of bvh, pass in scaling factor (optional) - Thanks to Roy Eltham, http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=2375 - -2008 July 27 - -btDbvtBroadphase: - - Fixed a performance issues reported by 'reltham' - - Added btDbvtBroadphase::optimize() for people who want good performances right -away or don't do dynamics. - - fixed compilation issues when DBVT_BP_PROFILE was set. -btSoftBody: - - Fixed singular matrix issues related to polar decomposition (flat meshes). -DemoApplication: - - Shadows (enable/disable through 'g' or DemoApplication::setShadows(bool)). - - Texture can be enable/disable through 'u' -CDFramework: - - fixed compilation issues. - All thanks to Nathanael Presson - -2008 July 10 - - Added btMultimaterialTriangleMeshShape and MultiMaterialDemo - Thanks to Alex Silverman for the contribution - -2008 June 30 - - Added initial support for kinematic character controller - Thanks to John McCutchan - -2008 April 14 - - Added ray cast support for Soft Bodies - Thanks to Nathanael Presson for the contribution - -2008 April 9 - - Cleanup of Stan Melax ConvexHull, removed Extras/ConvexHull, moved sources into LinearMath/BulletCollision - -2008 April 4 - - Added btSliderConstraint and demo - Thanks Roman Ponomarev - -2008 April 3 - - Fixed btMinkowskiSumShape, and added hitpoint to btSubsimplexConvexCast - -2008 April 2 - - Added Extras/CdTestFrameWork - Thanks Pierre Terdiman - -2008 April 1 - - Added posix thread (pthread) support - Thanks Enrico - -2008 March 30 - - Added Soft Body, cloth, rope and deformable volumes, including demos and interaction - Thanks Nathanael Presson for this great contribution - - 2008 March 17 - - Improved BulletColladaConverter - Thanks John McCutchan - -2008 March 15 - - btMultiSapBroadphase in a working state. Needs more optimizations to be fully useable. - - Allow btOptimizedBvh to be used for arbitrary objects, not just triangles - - added quicksort to btAlignedObjectArray - - removed btTypedUserInfo, added btHashMap - -2008 March 30 - - Moved quickstep solver and boxbox into Bullet/src folder - Thanks Russell L. Smith for permission to redistribute Open Dynamics Engine quickstep and box-box under the ZLib license - -2008 Feb 27 - - Added initial version for Character Control Demo - - Applied fixes to IBM Cell SDK 3.0 build makefiles - Thanks Jochen and mojo for reporting/providing patch: http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1922 - -2008 Feb 8 - - Bugfixes in ConvexCast support against the world. - Thanks to Isgmasa for reporting/providing fix: http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1823 - -2008 Feb 6 - - Added btCapsuleShapeX and btCapsuleShapeZ for capsules around X and Z axis (default capsule is around Y) - -2008 Feb 3 - - Added btTypedUserInfo, useful for serialization - -2008 Jan 31 - - Add support for 16 and 32-bit indices for SPU / BulletMultiThreaded version. - -2008 Jan 29 - - Added COLLADA Physics export/serialization/snapshot from any Bullet btDynamicsWorld. Saving the physics world into a text .xml file is useful for debugging etc. - -2008 Jan 23 - - Added Stan Melax Convex Hull utility library in Extras/ConvexHull. This is useful to render non-polyhedral convex objects, and to simplify convex polyhedra. - -2008 Jan 14 - - Add support for batch raycasting on SPU / BulletMultiThreaded - -2007 Dec 16 - - Added btRigidBodyConstructionInfo, to make it easier to set individual setting (and leave other untouched) during rigid body construction. - Thanks Vangelis Kokkevis for pointing this out. - - Fixed memoryleak in the ConstraintDemo and Raytracer demo. - - Fixed issue with clearing forces/gravity at the end of the stepSimulation, instead of during internalSingleStepSimulation. - Thanks chunky for pointing this out: http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1780 - - Disabled additional damping in rigid body by default, but enable it in most demos. Set btRigidBodyConstructionInfo m_additionalDamping to true to enable this. - - Removed obsolete QUICKPROF BEGIN/END_PROFILE, and enabled BT_PROFILE. Profiling is enabled by default (see Bullet/Demos/OpenGL/DemoApplication.cpp how to use this). - User can switch off profiling by enabling define BT_NO_PROFILE in Bullet/src/btQuickprof.h. - -2007 Dec 14 - - Added Hello World and BulletMultiThreaded demos - - Add portable version of BulletMultiThreaded, through SequentialThreadSupport (non-parallel but sharing the same code-path) - - Add Cmake support for AllBulletDemos - - -2007 Dec 11 - - Moved the 'btRigidBody::clearForce' to the end of the stepSimulation, instead of in each substep. - See discussion http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1601 - - Added btConvexPlaneCollisionAlgorithm, makes planes perform better, and prevents tunneling - Thanks Andy O'Neil for reporting the performance/functionality issue - - Fixes for IBM Cell SDK 3.0 - Thanks to Jochen Roth for the patch. - -2007 Dec 10 - - Fixes in btHeightfieldTerrainShape - Thanks to Jay Lee for the patch. - -2007 Dec 9 - - Only update aabb of active objects - Thanks Peter Tchernev for reporting (http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1764 ) - - Added workaround to compile libxml under Visual Studio 2008 Beta 2 - - Make glui compile under MSVC 9.0 beta (vsnprintf is already defined) - -2007 Dec 6 - - Added DynamicControlDemo, showing dynamic control through constraint motors - Thanks to Eddy Boxerman - - Add support for generic concave shapes for convex cast. - - Added convex cast query to collision world. - - Added workaround for OpenGL bug in Mac OS X 10.5.0 (Leopard) - - Added concave raycast demo - All above thanks to John McCutchan (JMC) - - Fixed issues that prevent Linux version to compile. - Thanks to Enrico for reporting and patch, see - - Fixed misleading name 'numTriangleIndices' into 'numTriangles' - Thanks Sean Tasker for reporting: - -2007 Nov 28: - - Added raycast against trianglemesh. Will be extended to object cast soon. - Thanks John McCutchan (JMC) - - make getNumPoints const correct, add const getPoints(). - Thanks Dirk Gregorius - - Bugfix: allow btCollisionObjects (non-btRigidBody) to interact properly with btRigidBody for cache-friendly btSequentialImpulseConstraintSolver. - Thanks Andy O'Neil for pointing this out. - - Bugfix: don't fail if spheres have identical center, use arbitrary separating normal (1,0,0) - Thanks Sean Tasker for reporting! http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1681 - - -2007, November 20 - - Added hierarchical profiling - - Fixed memory leak in btMultiSapBroadphase, - - Fixed hash function (typo, should use 2 proxies) - Thanks to Stephen (shatcher) for reporting and fixes! http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1696 - -2007 Nov 11 - - Fixed parallel solver (BulletMultiThreaded) friction issue - - Terminate Win32 Threads when closing the CcdPhysicsDemo (when USE_PARALLEL_SOLVER/USE_PARALLEL_DISPATCHER is defined) - -2007 Nov 6 - - Added support for 16-bit indices for triangle meshes - - Added support for multiple mesh parts using btBvhTriangleMeshShape. - Thanks to Tim Johansson - -2007 Oct 22 - - All memory allocations go through btAlignedAlloc/btAlignedFree. User can override this to verify memory leaks - - added a few more demos to AllBulletDemos - - fix for one of the constructors of btHingeConstraint - Thanks Marcus Hennix - -2007 Oct 20 - - included glui, a GLUT/OpenGL based toolkit for some graphical user elements - Removed dynamic_cast from glui, to allow linkage without rtti - - added Box2D framework using glui, allowing all demos to run within one executable - Thanks Erin Catto for the FrameWork skeleton (http://www.box2d.org) - -2007 Ocy 17 - - Allow user to pass in their own memory (stack and pool) allocators, through collisionConfiguration. See demos how to use this - -2007 Oct 14 - - Included working version of Cell SPU parallel optimized version for Libspe2 SPU task scheduler. - This version compiles and runs on Playstation 3 Linux and IBM CellBlade, see BulletSpuOptimized.pdf for build instructions - (Official Playstation 3 developers can request a SPURS version through Sony PS3 Devnet.) - Thanks to IBM 'Extreme Blue' project for the contribution - http://www-913.ibm.com/employment/us/extremeblue/ - Thanks Minh Cuong Tran, Benjamin Hoeferlin, Frederick Roth and Martina Huellmann - for various contributions to get this initial Libspe2 parallel version up and running. - -2007 Oct 13 - - made 'btCollisionShape::calculateLocalInertia' const - Thanks to cgripeos, see http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1514 - - applied a large patch to remove warnings - Thanks to Enrico, see http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1568 - - removed SSE includes, added #incude for memset in Extras/quickstep, thanks Eternl Knight - -2007 Oct 11 - - added Hashed Overlapping Pair Cache, recommended by Pierre Terdiman. It works like a charm, thanks Pierre and Erin Catto (code from Box2D) - - modified some margins inside btBoxShape, btCylinderShape and btSphereShape - - added cone debug rendering (for cones with x, y and z up-axis) - - added improvements for optional Extra/quickstep, thanks to Remotion - - some performance improvements for Bullet constraint solver - -2007 Sept 28 - - upgraded GIMPACT to version 0.3 - Thanks to Francisco Leon - -2007 Sept 27 - - added contribution from IBM Extreme Blue project for Libspe2 support. This allow to execute BulletMultiThreaded on Cell SPU under PS3 Linux and Cell Blade. See http://www-913.ibm.com/employment/us/extremeblue - Thanks to Minh Cuong Tran, Frederick Roth, Martina Heullmann and Benjamin Hoeferlin. - -2007 Sept 13 - - Improved btGenericD6Constraint. It can be used to create ragdolls (similar to the new btConeTwistConstraint). See GenericJointDemo - - Added support for Bullet constraints in the optional Extras/quickstep ODE solver. See CcdPhysicsDemo, enable #COMPARE_WITH_QUICKSTEP and add libquickstep to the dependencies. - For both patches/improvements thanks Francisco Leon/projectileman - -2007 Sept 10 - - removed union from btQuadWordStorage, it caused issues under certain version of gcc/Linux - -2007 Sept 10 - - Reverted constraint solver, due to some issues. Need to review the recent memory allocation changes. - - Fixed issue with kinematic objects rotating at low speed: quaternion was de-normalized, passing value > 1 into acosf returns #IND00 invalid values - - 16 byte memory alignment for BVH serialization - - memory cleanup for btPoolAllocator - -2007 Sept 9 - - Added serialization for BVH/btBvhTriangleMeshShape, including endian swapping. See ConcaveDemo for an example. - Thanks to Phil Knight for the contribution. - - Fixed issues related to stack allocator/compound collision algorithm - Thanks Proctoid, http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=18&t=1460 - - Increase some default memory pool settings, and added a fallback for the constraints solver to use heap memory - - Removed accidential testing code in btScalar.h related to operator new. - - Enable btAxis3Sweep and bt32BitAxis3Sweep to be linked in at the same time, using template - -2007 Sept 7 - - Replaced several dynamic memory allocations by stack allocation and pool allocations - - Added branch-free quantized aabb bounding box overlap check, works better on Playstation 3 and XBox 360 - Thanks to Phil Knight. Also see www.cellperformance.com for related articles - - Collision algorithms and settings for the memory/stack allocator can be done using btDefaultCollisionConfiguration - This is an API change. See demos how to modify existing implementations with a one-liner. - - Register several collision algorithms by default (sphere-sphere, sphere-box, sphere-triangle) - - Use other traveral method for BVH by default, this improves triangle mesh collision performance. - -2007 Aug 31 - - fixed MSVC 6 build - Thanks Proctoid, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1375 - - fixed double precision build issues - Thanks Alex Silverman, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1434 - -2007 Aug 24 - - fixed bug in btMatrix3x3::transposeTimes(const btMatrix3x3& m) const. Luckily it wasn't used in core parts of the library (yet). - Thanks to Jay Lee - -2007 Aug 15 - - fixed bug in Extras/GIMPACT 0.2 related to moving triangle meshes - Thanks Thomas, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1368 - -2007 Aug 14 - - added parallel constraint solver. Works on Playstation 3 Cell SPU and multi core (Win Threads on PC and XBox 360). - See Extras/BulletMultiThreaded for SpuSolverTask subfolder and SpuParallelSolver.cpp - Thanks Marten Svanfeldt (Starbreeze Studios) - - fixed some bugs related to parallel collision detection (Extras/BulletMultiThreaded) - Thanks Marten Svanfeldt (Starbreeze Studios) - -2007 Aug 2 - - added compound and concave-convex (swapped) case for BulletMultiThreaded collision detection, thanks to Marten Svanfeldt - - refactored broadphase and overlapping pair cache. This allows performance improvement by combining multiple broadphases. This helps add/remove of large batches of objects and large worlds. See also Pierre Terdiman forum topic: - http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1329 - - -2007 July 27 - - added Ragdoll Demo - Thanks to Marten Svanfeldt (Starbreeze Studios) - - - added Vector Math library for SIMD 3D graphics linear algebra (vector, matrix, quaternion) - See Bullet/Extras/vectormathlibrary - Supports SIMD SSE, PowerPC PPU and Cell SPU (including PS3 Linux and CellBlade), as well as generic portable scalar version - Will be used to improve BulletMultiThreaded performance - Open Sourced by Sony Computer Entertainment Inc. under the new BSD license - - added SIMD math library - 4-way SIMD for common math functions like atan2f4, cosf4, floorf4, fabsf4, rsqrtf4 etc. Used by Vector Math library under PPU and SPU. - Supports PowerPC (PPU) and Cell SPU, including PS3 Linux and CellBlade. - See Bullet/Extras/simdmathlibrary - Open sourced by Sony Computer Entertainment Inc. under the new BSD license - - -2007 July 25 - - added several patches: per-rigidbody sleeping threshold. added Assert to prevent deletion of rigidbody while constraints are still pointing at it - Thanks to Marten Svanfeldt (Starbreeze Studios) - -2007 July 13 - - fixed relative #include paths again. We can't use "../" relative paths: some compilers choke on it (it causes extreme long paths) - Within the libraries, we always need to start with "BulletCollision/" or "BulletDynamics/ or "LinearMath/" - -2007 July 10 - - Updated Bullet User Manual - -2007 July 5 - - added btConeTwistConstraint, especially useful for ragdolls. See Demos/RagdollDemo - Thanks to Marten Svanfeldt (Starbreeze Studios) - -2007 June 29 - - btHeightfieldTerrainShape: Added heightfield support, with customizations - - Upgraded to GIMPACT 0.2, see Extras/GIMPACT and MovingConcaveDemo - - Several patches from Marten Svanfeldt (Starbreeze Studios) - Improved collision filtering (in broadphase and rigidbody) - Improved debug rendering - Allow to set collision filter group/mask in addRigidBody - - -2007 June 15 - - Changed btAlignedObjectArray to call copy constructor/replacement new for duplication, rather then assignment operator (operator=). - -2007 June 11 - - Added multi-threading. Originally for Playstation 3 Cell SPU, but the same code can run using Win32 Threads using fake DMA transfers (memcpy) - Libspe2 support for Cell Blade / PS3 Linux is upcoming - See Extras/BulletMultiThreaded. Usage: replace btCollisionDispatcher by btSpuGatheringCollisionDispatcher - - - Added managed Bullet library, entirely rewritten in C# for Windows and XBox 360 XNA - See Extras/BulletX - Thanks to KleMiX, aka Vsevolod Klementjev - -2007 May 31 - - sign-bit went wrong in case of 32-bit broadphase, causing quantization problems. - Thanks DevO for reporting. - -2007 May 23 - - Fixed quantization problem for planar triangle meshes in btOptimizedBvh - Thanks Phil Knight for reporting and helping to fix this bug. - -2007 May 20 - - btAxisSweep3: Fixed a bug in btAxisSweep3 (sweep and prune) related to object removal. Only showed up when at least one btStaticPlaneShape was inserted. - Thanks tbp for more details on reproducing case. - - btAxisSweep3: Fixed issue with full 32bit precision btAxisSweep3 (define BP_USE_FIXEDPOINT_INT_32), it used only 0xffff/65536 for quantization instead of full integer space (0xffffffff) - - btRaycastVehicle: Added 'getForwardVector' and getCurrentSpeedKmHour utility functions - - Fixed local scaling issues (btConvexTriangleMeshShape, btBvhTriangleMeshShape, removed scaling from btMatrix3x3). - Thanks Volker for reporting! - - Added second filename search, so that starting BspDemo and ConvexDecompositionDemo from within Visual Studio (without setting the starting path) still works - -2007 April 22 - - Added braking functionality to btRaycastVehicle - - Removed tons of warnings, under MSVC 2005 compilation in -W4 - -2007 March 21 - - Fixed issues: comma at end of enum causes errors for some compilers - - Fixed initialization bug in LocalRayResult ( m_localShapeInfo(localShapeInfo) ) - -2007 March 20 - - Added refit tree to quantized stackless tree, and updated ConcaveDemo as example. - -2007 March 17 - - Added constraint solver optimizations, avoiding cross products during iterations, and gather rigidbody/constraint info in contiguous memory (btSolverBody/btSolverConstraint) - - These optimizations don't give large benefit yet, but it has good potential. Turned on by default. Can be switched off using solver->setSolverMode(SOLVER_RANDMIZE_ORDER). - - Enabled anti-jitter for rigid bodies. This is experimental, and can be switched off by setting a global (it is experimental so no proper interface) gJitterVelocityDampingFactor = 1.0; - - Fixed bug in islandmanifold.heapSort(btPersistentManifoldSortPredicate()); , thanks Noehrgel for reporting this (affected Sun Solaris) - -2007 March 12 - - Added compile-time toggle between on 16-bit and 32-bit fixed-point SAP broadphase. - This allows the number of bodies to exceed 32767 - - Enable useQuantizedAabbCompression on btTriangleMesh, see ColladaDemo - -2007 March 8 - - Fixed bug in constraint/island sorting (caused by replacing STL by dedicated btAlignedObjectArray with heapSort) - Thanks Clemens Unterkofler for pointing this out! - -2007 March 6 - - removed STL from the Bullet library: replace std::vector by btAlignedObjectArray. Also removed the std::set for overlapping pair set, and turned it into an overlapping pair array. The SAP only adds objects, never removed. Removal is postponed for during traversal of overlapping pairs (duplicates and non-overlapping pairs are removed during that traversal). - - added heap sort and binary search/linear search to btAlignedObjectArray - - fixed wrong cast, thanks Hamstray, http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1015 - - -2007 Feb 25 - - Improved performance of convex collision shapes, cache local AABB instead of recomputation. This fixes issue with very slow performance in larger .bsp levels - -2007 Feb 24 - - Added compressed/quantized AABB tree, 16 bytes per node, while supporting 32-bit (triangle) indices. - Should be faster and smaller then original version (quantized aabb check is done in integer space) - Original aabb tree nodes are still supported. They are 44 bytes, with full floating point precision and additional subPart index. - - added meter-unit scaling support in ColladaConverter.cpp - -2007 Feb 21 - - Build system: updated bullet.pc.in library names - - Updated EPA comparison integration (missing parameter) - -2007 Jan 04 - - fixed optimized AABB tree building: in some cases the tree building fails due to unbalanced trees, which generated stack overflow - -2006 Dec 15 - - added contribution to allow double precision collision detection/dynamics. Define BT_USE_DOUBLE_PRECISION in your project and libraries that include Bullet - -2006 Dec 14 - - merged contact and non-contact constraint solving into one loop, will improve stability of jointed bodies during collisions - - added first draft for hingeConstraint motor - -2006 Dec 8, Erwin Coumans - - preparation for SIMD: added btAlignedAllocator and btAlignedObjectArray, to replace stl std::vector, same interface, but compatible with 16 byte alignment - - cleaned up dependencies in autogenerated msvc projectfiles - - aligned btVector3 on 16 bytes boundary, under win32. see if developers will come up with problems - -2006 Dec 04, Erwin Coumans - Added btNearCallback. This is similar to Open Dynamics Engine (ODE) dNearCallback, but important differences: - - contact points are persistent (lifetime more then one frame, for warmstarting/incremental contact point management) - - continuous collision detection, time of impact - Added btRigidBody::isInWorld(), returns true if btRigidBody is inside a btCollisionWorld/btDynamicsWorld derived class - Added angularFactor to btRigidbody, this helps some character control (no angular impulse applied) - - -2006 Nov 28 - Moved StackAlloc from EPA into LinearMath/btStackAlloc - renamed internal class ConcaveShape into btConcaveShape - added btHeightfieldTerrainShape (not completed yet) - -2006 Nov 15 Nathanael Presson - Added EPA penetration depth algorithm, Expanding Polytope Algorithm - Added Pierre Terdiman penetration depth comparison/test DEMO - Fixed Bullet's Minkowski sampling penetration depth solver - Contributed by Nathanael Presson - -2006 Nov 11 Francisco León Nájera - Added GIMPACT trimesh collision detection: concave versus concave, - Contributed by Francisco León Nájera - -2006 Nov 2 - Minor refactoring: btCollisionObject changes from struct into class, added accessor methods - Force use of btMotionState to synchronize graphics transform, disabled old btRigidBody constructor that accepts btTransform - Renamed treshold into threshold throughout the code - -2006 Oct 30 - Enable decoupling of physics and graphics framerate using interpolation and internal fixed timestep, based on btMotionState - Enabled raycast vehicle demo (still needs tuning) - Refresh contact points, even when they are already persistent. - Fixed debugDraw colors (thanks pc0de for reporting) - Use Dispatcher in ConcaveConvexCollisionAlgorithm (so it uses the registered collision algorithm, not hardcoded convexconcave) - Improved performance of constraint solver by precalculating the cross product/impulse arm - Added collision comparison code: ODE box-box, also sphere-triangle - Added safety check into GJK, and an assert for AABB's that are very large - Fixed kinematic support (deriving velocities for animated objects) - Updated comparison/optional quickstep solver in Extras - UserCollisionAlgorithm demonstrates btTriangleMesh usage (easier trimesh compared to index array version) - Removed scaling from btTransform (we only want to deal with rigid transforms) - -2006 Oct 4 - Fixed minor leak in btOptimizeBVH - Cleanup of btRigidBody construction - added getW() in btQuaternion - assert when setLinearVelocity is called on btRigidBody - renamed projectfile library from collada-dom to colladadom (to make VC6 happy) - -2006 Sept 27 - Big Refactoring: renamed and moved files, create a replacement for CcdPhysicsEnvironment/CcdPhysicsController. - All Bullet classes in LinearMath, BulletCollision and BulletDynamics start with bt, and methods start with lowercase. - Moved classes into src folder, which is the only include folder needed. - Added 2 headerfiles in src: btBulletCollisionCommon.h and btBulletDynamicsCommon.h - -2006 Sept 23 - Fixed 2 bugs, causing crashes when removing objects. Should do better unit-testing. UnionFind and 3D SAP were involved. - -2006 Sept 19 - Allow programmable friction and contact solver model. User can register their own functions for several interaction types. - Improved performance, and removed hardcoded maximum overlaps (switched from C-array to stl::set) - -2006 Sept 16 - Added Bullet 2.0 User Manual - Allow registration of custom user collision algorithms - -2006 Sept 10 - Started cleaning up demos - -2006 Sept 4 - Fixed concave collision bug (caused instability/missing collisions in meshes/compounds) - Fixed memoryleak in OptimizedBvh, added RayTestSingle to CollisionWorld - Prepared for VehicleDemo - Increased Performance (island generation for sleeping objects took too much time) - Better COLLADA 1.4.1 physics conformance in ColladaDemo - -2006 August 11 - Added Quake BspDemo - Improved CCD for compound and non-convex objects - -2006 August 10 - Added per-triangle material (friction/restitution) support for non-convex meshes. See ConcaveDemo for usage. - -2006 August 9 - Added CMake support (see http://cmake.org) - This can autogenerate makefiles, projectfiles cross platform (including MacOS X Xcode ) - Just run cmake . in the root folder and it will autogenerate build files - -2006 July 26 Erwin Coumans - Upgraded to COLLADA-DOM 1.4.1, latest SVN version - ColladaDemo can export snapshots to .dae - -2006 July 24 Erwin Coumans - Added Compound CollisionShape support - (this is still low performance -> requires stackless tree-versus-tree traversal for better performance) - -2006 July 15 Erwin Coumans - Added initial support for Parallel execution (collision detection, constraint solving) - See ParallelPhysicsEnvironment in Extras\PhysicsInterface\CcdPhysics - -2006 July 10 Erwin Coumans - Added MacOS X support (some build issues mainly) - -2006 July 5 Erwin Coumans - Improved COLLADA 1.4 physics import, both COLLADA-DOM and FCollada - -2006 June 29 Erwin Coumans - Refactoring of the broadphase - Moved some optional files to Extras: Algebraic ccd and EPA, quickstep - Moved the limits on bodies/overlap to 32k and 65k - -2006 June 25 Erwin Coumans - Added basic Collision Filtering, during broadphase - Allow adding meshes to the TriangleIndexVertexArray, - (input for TriangleMeshShape) - Preparation for CompoundShape - -2006 June 19 Erwin Coumans - Added support for COLLADA Physics Import. - Both jam and Visual Studio can compile ColladaDemo - -2006 June 18 Dirk Gregorius - Started implementing Generic6DOF joint and setup basic interface - - -2006 June 17 Frank Richter - Bumped version in configure.ac to 1.5.6 (assuming that "1.5f" is - the next version released). - Updated files in mk/autoconf and mk/jam with copies from CS; fixes a - GLU detection issue on MinGW. - Set msvc/bullet_ico.ico as the default application icon. - Disabled exceptions for gcc builds. - Applied a patch from Michael D. Adams to fix a warning with gcc. -2006 jUNE 16 Erwin Coumans - Constraints now merge simulation islands. - -2006 May 24 - Improved GJK accuracy, fixed GjkConvexCast issue, thanks to ~MyXa~ for reporting - -2006 May 19 - Added restitution support - Moved out Friction and Dynamics info from ManifoldPoint (removed logical dependency) - Added a void* m_userPersistentData in ManifoldPoint. - Added a ContactDestroyedCallback, to allow user to handle destruction of m_userPersistentData - -2006 May 13 - Fixed some bugs in friction / jacobian calculations. Reported by Dirk Gregorius. Thanks! - -2006 May 9 - Fixed raycasting filtering - Moved repository to SVN at https://svn.sourceforge.net/svnroot/bullet - -2006 April 27 - Moved raycasting to CollisionWorld, to make it more generic - Added basic CCD option in the CcdCollisionDemo - Fixed 'noResponse' mode, for triggering rigidbodies (useful for Artificial Intelligence queries) - Improved Bullet/ODE sample (in Extras) - -2006 April 10 - Separating Axis Test (SAT) convex hull collision detector, contribution by Simon Hobbs - Added SIMD SSE Math classes (for above SAT) - Added Mouse picking in CcdPhysicsDemo - Improved penetration depth estimation in MinkowskiPenetrationDepthSolver, both accuracy and performance - Added Hinge constraint - Added quickprof profiling (see http://sourceforge.net/projects/quickprof ) - -2006 March 21 Frank Richter - Removed VC manifest files. - Removed superfluous "grpplugins" projects. - -2006 March 20 Erwin Coumans - Clamped the acculumated impulse rather then intermediate impulse (within the iteration) - Use the persistent contacts for reusing the impulse - Separated friction and normal solving for better stability - Decreased the default number of iterations of the constraint solver from 10 to 4 - -2006 March 19 Frank Richter - Removed a couple of CSisms from the VC projects. - Fixed VC include & lib paths to go to the Addtional* options - instead the command line arguments. - Added pkgconfig support. - -2006 March 14 Frank Richter - Added support for shipped GLUT on MinGW. - Fixed GLUT support on MinGW. - -2006 March 13 Frank Richter - Bolted on Jam-based build system. - Generated VC project files. - Fixed GCC warnings. - Fixed Linux build issues. - -2006 March 13 -Added 3D Sweep and Prune Broadphase Collision Detection, Contribution from Simon Hobbs. - -2006 March 2 - Minor change in license to ZLib/LibPNG - This makes it legally a bit easier to deploy on Playstation 3 - Prepared for more generic constraints, added ConstraintsDemo - -2006 Feb 23 - Rearranged files and dependencies to allow for easier standalone Collision Detection without Bullet Dynamics. - See Demos/CollisionInterfaceDemo and Extras/ode/ode/test/test_BulletGjk.cpp for examples how to use. - -2005 August 6 - Bullet 0.2 release with demos, sources, doxygen, draft manual - -2005 June 1 - First public release of Bullet - - -... todo: add history - -2003 Initial version (continuous collision detection) diff --git a/Engine/lib/bullet/Doxyfile b/Engine/lib/bullet/Doxyfile index d483fe4b2..fe2ffd8e8 100644 --- a/Engine/lib/bullet/Doxyfile +++ b/Engine/lib/bullet/Doxyfile @@ -270,7 +270,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src +INPUT = src/LinearMath src/BulletCollision src/BulletDynamics src/BulletSoftBody src/btBulletCollisionCommon.h src/btBulletDynamicsCommon.h Extras/Serialize/BulletWorldImporter Extras/Serialize/BulletFileLoader # If the value of the INPUT tag contains directories, you can use the @@ -605,7 +605,7 @@ SEARCH_INCLUDES = YES # contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = src +INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the diff --git a/Engine/lib/bullet/INSTALL b/Engine/lib/bullet/INSTALL deleted file mode 100644 index 0f42fb52e..000000000 --- a/Engine/lib/bullet/INSTALL +++ /dev/null @@ -1,111 +0,0 @@ -Bullet Collision Detection and Physics Library - -See also http://bulletphysics.org/mediawiki-1.5.8/index.php/Creating_a_project_from_scratch - -** Windows Compilation ** - - Open the Microsoft Visual Studio solution in msvc/20xx/BULLET_PHYSICS.sln - -Alternatively, use CMake to autogenerate a build system for Windows: - - - Download/install CMake from www.cmake.org or package manager - - Use cmake-gui or - - List available build systems by running 'cmake' in the Bullet root folder - - Use cmake-gui - - Create a build system using the -G option for example: - - cmake . -G "Visual Studio 9 2008" or - cmake . -G "Visual Studio 9 2008 Win64" - - -** Linux Compilation ** - - - Download/install CMake from www.cmake.org or package manager - CMake is like autoconf in that it will create build scripts which are then - used for the actual compilation - - - List available build systems by running 'cmake' in the Bullet root folder - - Create a build system using the -G option for example: - - cmake . -G "Unix Makefiles" - - - There are some options for cmake builds: - BUILD_SHARED_LIBS: default 'OFF', set to 'ON' to build .so libraries - BUILD_EXTRAS: default 'ON', compiles additional libraries in 'Extras' - BUILD_DEMOS: default 'ON', compiles applications found in 'Demos' - CMAKE_INSTALL_PREFIX: default '/usr/local', the installation path. - CMAKE_INSTALL_RPATH: if you install outside a standard ld search path, - then you should set this to the installation lib path. - CMAKE_BUILD_TYPE: default 'Release', can include debug symbols with - either 'Debug' or 'RelWithDebInfo'. - Other options may be discovered by 'cmake --help-variable-list' and - 'cmake --help-variable OPTION' - - - Run 'cmake' with desired options of the form -DOPTION=VALUE - By default this will create the usual Makefile build system, but CMake can - also produce Eclipse or KDevelop project files. See 'cmake --help' to see - what "generators" are available in your environment, selected via '-G'. - For example: - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebugInfo - - - Assuming using the default Makefile output from cmake, run 'make' to - build, and then 'make install' if you wish to install. - - -** Mac OS X Compilation ** - - - Download/install CMake from www.cmake.org or package manager - CMake is like autoconf in that it will create build scripts which are then - used for the actual compilation - - - List available build systems by running 'cmake' in the Bullet root folder - - Create a build system using the -G option for example: - - cmake . -G Xcode - cmake . -G "Unix Makefiles" - - - There are some options for cmake builds: - BUILD_SHARED_LIBS: default 'OFF', set to 'ON' to build .dylib libraries - BUILD_EXTRAS: default 'ON', compiles additional libraries in 'Extras' - BUILD_DEMOS: default 'ON', compiles applications found in 'Demos' - CMAKE_INSTALL_PREFIX: default '/usr/local', the installation path. - CMAKE_INSTALL_NAME_DIR: if you install outside a standard ld search - path, then you should set this to the installation lib/framework path. - CMAKE_OSX_ARCHITECTURES: defaults to the native architecture, but can be - set to a semicolon separated list for fat binaries, e.g. ppc;i386;x86_64 - CMAKE_BUILD_TYPE: default 'Release', can include debug symbols with - either 'Debug' or 'RelWithDebInfo'. - - To build framework bundles: - FRAMEWORK: default 'OFF', also requires 'BUILD_SHARED_LIBS' set ON - If both FRAMEWORK and BUILD_SHARED_LIBS are set, will create - OS X style Framework Bundles which can be placed in - linked via the -framework gcc argument or drag into Xcode projects. - (If not framework, then UNIX style 'include' and 'lib' will be produced) - - Other options may be discovered by 'cmake --help-variable-list' and - 'cmake --help-variable OPTION' - - - Run 'cmake' with desired options of the form -DOPTION=VALUE - By default this will create the usual Makefile build system, but CMake can - also produce Eclipse or KDevelop project files. See 'cmake --help' to see - what "generators" are available in your environment, selected via '-G'. - For example: - cmake -DBUILD_SHARED_LIBS=ON -DFRAMEWORK=ON \ - -DCMAKE_INSTALL_PREFIX=/Library/Frameworks \ - -DCMAKE_INSTALL_NAME_DIR=/Library/Frameworks \ - -DCMAKE_OSX_ARCHITECTURES='ppc;i386;x86_64' \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo - - - Assuming using the default Makefile output from cmake, run 'make' to build - and then 'make install'. - - -** Alternative Mac OS X and Linux via autoconf/make ** - - at the command line: - ./autogen.sh - ./configure - make - - -** For more help, visit http://www.bulletphysics.org ** diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h b/Engine/lib/bullet/LICENSE.txt similarity index 82% rename from Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h rename to Engine/lib/bullet/LICENSE.txt index 8b89de03f..319c84e34 100644 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h +++ b/Engine/lib/bullet/LICENSE.txt @@ -1,19 +1,15 @@ -/* + +The files in this repository are licensed under the zlib license, except for the files under 'Extras' and examples/ThirdPartyLibs. + Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ +http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -*/ - - - - - diff --git a/Engine/lib/bullet/Makefile.am b/Engine/lib/bullet/Makefile.am deleted file mode 100644 index a9b97a8e6..000000000 --- a/Engine/lib/bullet/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if CONDITIONAL_BUILD_DEMOS -SUBDIRS=src Extras Demos -else -SUBDIRS=src -endif -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = bullet.pc diff --git a/Engine/lib/bullet/NEWS b/Engine/lib/bullet/NEWS deleted file mode 100644 index dec9f0fd9..000000000 --- a/Engine/lib/bullet/NEWS +++ /dev/null @@ -1,5 +0,0 @@ - -For news, visit the Bullet Physics forums at -http://www.bulletphysics.org and http://bullet.googlecode.com - - diff --git a/Engine/lib/bullet/README b/Engine/lib/bullet/README deleted file mode 100644 index 1eda762c0..000000000 --- a/Engine/lib/bullet/README +++ /dev/null @@ -1,6 +0,0 @@ - -Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games and animation. -Free for commercial use, including Playstation 3, open source under the ZLib License. - -See the Bullet_User_Manual.pdf for more info and visit the Bullet Physics Forum at -http://bulletphysics.org diff --git a/Engine/lib/bullet/README.md b/Engine/lib/bullet/README.md new file mode 100644 index 000000000..28821e4e3 --- /dev/null +++ b/Engine/lib/bullet/README.md @@ -0,0 +1,107 @@ + +[![Travis Build Status](https://api.travis-ci.org/bulletphysics/bullet3.png?branch=master)](https://travis-ci.org/bulletphysics/bullet3) +[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/6sly9uxajr6xsstq)](https://ci.appveyor.com/project/erwincoumans/bullet3) + +# Bullet Physics SDK + +This is the official C++ source code repository of the Bullet Physics SDK: real-time collision detection and multi-physics simulation for VR, games, visual effects, robotics, machine learning etc. + +New in Bullet 2.85: pybullet Python bindings, improved support for robotics and VR + +The Bullet 2 API will stay default and up-to-date while slowly moving to a new API. +The steps towards a new API is in a nutshell: + +1. The old Bullet2 demos are being merged into the examples/ExampleBrowser +2. A new physics-engine agnostic C-API is created, see examples/SharedMemory/PhysicsClientC_API.h +3. Python bindings in pybullet are on top of this C-API, see examples/pybullet +4. A Virtual Reality sandbox using openvr for HTC Vive and Oculus Rift is available +5. The OpenCL examples in the ExampleBrowser can be enabled using --enable_experimental_opencl + +You can still use svn or svn externals using the github git repository: use svn co https://github.com/bulletphysics/bullet3/trunk + +## Requirements for Bullet 2 + +A C++ compiler for C++ 2003. The library is tested on Windows, Linux, Mac OSX, iOS, Android, +but should likely work on any platform with C++ compiler. +Some optional demos require OpenGL 2 or OpenGL 3, there are some non-graphical demos and unit tests too. + +## Contributors and Coding Style information + +https://docs.google.com/document/d/1u9vyzPtrVoVhYqQOGNWUgjRbfwfCdIts_NzmvgiJ144/edit + +## Requirements for experimental OpenCL GPGPU support + +The entire collision detection and rigid body dynamics can be executed on the GPU. + +A high-end desktop GPU, such as an AMD Radeon 7970 or NVIDIA GTX 680 or better. +We succesfully tested the software under Windows, Linux and Mac OSX. +The software currently doesn't work on OpenCL CPU devices. It might run +on a laptop GPU but performance will not likely be very good. Note that +often an OpenCL drivers fails to compile a kernel. Some unit tests exist to +track down the issue, but more work is required to cover all OpenCL kernels. + +## License + +All source code files are licensed under the permissive zlib license +(http://opensource.org/licenses/Zlib) unless marked differently in a particular folder/file. + +## Build instructions for Bullet using premake. You can also use cmake instead. + +**Windows** + +Click on build_visual_studio.bat and open build3/vs2010/0MySolution.sln + +**Windows Virtual Reality sandbox for HTC Vive and Oculus Rift** + +Click on build_visual_studio_vr_pybullet_double.bat and open build3/vs2010/0MySolution.sln +Edit this batch file to choose where Python include/lib directories are located. +Build and run the App_SharedMemoryPhysics_VR project, preferably in Release/optimized build. +You can connect from Python pybullet to the sandbox using: + +``` +import pybullet as p +p.connect(p.SHARED_MEMORY) +``` + +**Linux and Mac OSX gnu make** + +In a terminal type: + + cd build3 + +Depending on your system (Linux 32bit, 64bit or Mac OSX) use one of the following lines + + ./premake4_linux gmake + ./premake4_linux64 gmake + ./premake4_osx gmake + +Then + + cd gmake + make + +**Mac OSX Xcode** + +Click on build3/xcode4.command or in a terminal window execute + + ./premake_osx xcode4 + +## Usage + +The App_ExampleBrowser executables will be located in the bin folder. +You can just run it though a terminal/command prompt, or by clicking it. + + +``` +[--start_demo_name="Demo Name"] Start with a selected demo +[--mp4=moviename.mp4] Create a mp4 movie of the window, requires ffmpeg installed +[--mouse_move_multiplier=0.400000] Set the mouse move sensitivity +[--mouse_wheel_multiplier=0.01] Set the mouse wheel sensitivity +[--background_color_red= 0.9] Set the red component for background color. Same for green and blue +[--fixed_timestep= 0.0] Use either a real-time delta time (0.0) or a fixed step size (0.016666) +``` + +You can use mouse picking to grab objects. When holding the ALT or CONTROL key, you have Maya style camera mouse controls. +Press F1 to create a series of screenshots. Hit ESCAPE to exit the demo app. + +Check out the docs folder and the Bullet physics forums for further information. diff --git a/Engine/lib/bullet/RELEASING.TXT b/Engine/lib/bullet/RELEASING.TXT deleted file mode 100644 index 49d6ba40e..000000000 --- a/Engine/lib/bullet/RELEASING.TXT +++ /dev/null @@ -1,36 +0,0 @@ -This document details the steps necessary to package a release of Bullet. - -1) Preparing for release: - -update VERSION in several places (/VERSION file, /CMakeLists.txt, /configure.ac, /src/LinearMath/btScalar.h, /src/LinearMath/btSerializer.h around line 441) -re-generate serialization structures, if they changed (/src/LinearMath/btSerializer.cpp using makesdna) -update ChangeLog with larger/important changes -regenerate MSVC project files using build/vs_all.bat -create a Subversion tag revision in bullet.googlecode.com/svn/tags/bullet- - -2) Generating the release .zip: -Do an SVN export on a Windows machine into the directory: bullet-X.YY -prepare a zip file containing the directory - -3) Generating the release .tar.gz: -Do an SVN export on a Unix machine into the directory: bullet-X.YY -prepare a .tar.gz file containing the directory - -4) Uploading release to google code: - -Google Code Bullet downloads URL: http://code.google.com/p/bullet/downloads/list - -Title of release should follow this guide line: Bullet Physics SDK (revision) - -It is better to upload the .tar.gz before the .zip so that the .zip appears first in the list - -If the release is an Alpha/Beta or RC the tags should be: Type-Source, OpSys-ALL -If the release is a final release the tags should be: Type-Source, OpSys-ALL, Featured - -5) Obsoleting old releases - -Edit the tags on old releases and add the 'Deprecated' tag - -6) Announcing final releases: - -Final release announcements are done here: http://bulletphysics.com/Bullet/phpBB3/viewforum.php?f=18 diff --git a/Engine/lib/bullet/UseBullet.cmake b/Engine/lib/bullet/UseBullet.cmake new file mode 100644 index 000000000..5ed94874a --- /dev/null +++ b/Engine/lib/bullet/UseBullet.cmake @@ -0,0 +1,10 @@ +# -*- cmake -*- +# +# UseBullet.cmake +# + + +add_definitions ( ${BULLET_DEFINITIONS} ) +include_directories ( ${BULLET_INCLUDE_DIRS} ) +link_directories ( ${BULLET_LIBRARY_DIRS} ) + diff --git a/Engine/lib/bullet/VERSION b/Engine/lib/bullet/VERSION index 90c00fa39..7cf322cf9 100644 --- a/Engine/lib/bullet/VERSION +++ b/Engine/lib/bullet/VERSION @@ -1 +1 @@ -2.82 +2.85 diff --git a/Engine/lib/bullet/acinclude.m4 b/Engine/lib/bullet/acinclude.m4 deleted file mode 100644 index 0505895ce..000000000 --- a/Engine/lib/bullet/acinclude.m4 +++ /dev/null @@ -1,3054 +0,0 @@ -# checkbuild.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_SPLIT_TUPLE(TUPLE, OUTPUT-VARIABLES) -# Split a build-tuple into its component parts. A build tuple is -# constructed by CS_CREATE_TUPLE() and is comprised of compiler flags, -# linker flags, and library references. OUTPUT-VARIABLES is a -# comma-delimited list of shell variables which should receive the -# extracted compiler flags, linker flags, and library references, -# respectively. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_SPLIT_TUPLE], - [CS_SPLIT([$1], [cs_dummy,$2], [@]) - m4_map([_CS_SPLIT_TUPLE], [$2])]) - -AC_DEFUN([_CS_SPLIT_TUPLE], - [$1=`echo $$1 | sed 'y%@%:@% %'` - ]) - - - -#------------------------------------------------------------------------------ -# CS_CREATE_TUPLE([CFLAGS], [LFLAGS], [LIBS]) -# Construct a build-tuple which is comprised of compiler flags, linker -# flags, and library references. Build tuples are encoded so as to -# preserve whitespace in each component. This makes it possible for -# macros (such as CS_BUILD_IFELSE) which employ build tuples to accept -# whitespace-delimited lists of tuples, and for shell "for" statements to -# iterate over tuple lists without compromising whitespace embedded -# within individual flags or library references. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CREATE_TUPLE], [`echo @$1@$2@$3 | sed 'y% %@%:@%'`]) - - - -#------------------------------------------------------------------------------ -# CS_LANG_CFLAGS -# Return the literal string CFLAGS if the current language is C. Return -# the literal string CXXFLAGS if the current language is C++. Generic -# compiler test macros which need to modify or save the compiler flags -# can invoke this macro to get the name of the compiler flags environment -# variable (either CFLAGS or CXXFLAGS) depending upon the current -# language. For example: -# CS_LANG_CFLAGS="$CS_LANG_CFLAGS -Wall" -# With C, this expands to: -# CFLAGS="$CFLAGS -Wall" -# With C++, it expands to: -# CXXFLAGS="$CXXFLAGS -Wall" -#------------------------------------------------------------------------------ -AC_DEFUN([CS_LANG_CFLAGS], [AC_LANG_CASE([C], [CFLAGS], [C++], [CXXFLAGS])]) - - - -#------------------------------------------------------------------------------ -# CS_BUILD_IFELSE([PROGRAM], [FLAGS], [LANGUAGE], [ACTION-IF-BUILT], -# [ACTION-IF-NOT-BUILT], [OTHER-CFLAGS], [OTHER-LFLAGS], -# [OTHER-LIBS], [INHIBIT-OTHER-FLAGS], [ERROR-REGEX]) -# Try building a program using the supplied compiler flags, linker flags, -# and library references. PROGRAM is typically a program composed via -# AC_LANG_PROGRAM(). PROGRAM may be omitted if you are interested only -# in learning if the compiler or linker respects certain flags. LANGUAGE -# is typically either C or C++ and specifies which compiler to use for -# the test. If LANGUAGE is omitted, C is used. FLAGS is a whitespace -# delimited list of build tuples. Tuples are created with -# CS_CREATE_TUPLE() and are composed of up to three elements each. The -# first element represents compiler flags, the second linker flags, and -# the third libraries used when linking the program. Each tuple from -# FLAGS is attempted in order. If you want a build attempted with no -# special flags prior to builds with specialized flags, create an empty -# tuple with CS_CREATE_TUPLE() at the start of the FLAGS list. If the -# build is successful, then the shell variables cs_build_ok is set to -# "yes", cs_build_cflags, cs_build_lflags, and cs_build_libs are set to -# the tuple elements which resulted in the successful build, and -# ACTION-IF-BUILT is invoked. Upon successful build, no further tuples -# are consulted. If no tuple results in a successful build, then -# cs_build_ok is set to "no" and ACTION-IF-NOT-BUILT is invoked. -# OTHER-CFLAGS, OTHER-LFLAGS, and OTHER-LIBS specify additional compiler -# flags, linker flags, and libraries which should be used with each tuple -# build attempt. Upon successful build, these additional flags are also -# reflected in the variables cs_build_cflags, cs_build_lflags, and -# cs_build_libs unless INHIBIT-OTHER-FLAGS is a non-empty string. The -# optional ERROR-REGEX places an additional constraint upon the build -# check. If specified, ERROR-REGEX, which is a standard `grep' regular -# expression, is applied to output captured from the compiler and linker. -# If ERROR-REGEX matches, then the build is deemed a failure, and -# cs_build_ok is set to "no". This facility is useful for broken build -# tools which emit an error message yet still return success as a result. -# In such cases, it should be possible to detect the failure by scanning -# the tools' output. -# -# IMPLEMENTATION NOTES -# -# In Autoconf 2.57 and earlier, AC_LINK_IFELSE() invokes AC_TRY_EVAL(), -# which does not provide access to the captured output. To work around -# this limitation, we temporarily re-define AC_TRY_EVAL() as -# _AC_EVAL_STDERR(), which leaves the captured output in conftest.err -# (which we must also delete). In Autoconf 2.58, however, -# AC_LINK_IFELSE() instead already invokes _AC_EVAL_STDERR() on our -# behalf, however we must be careful to apply ERROR-REGEX within the -# invocation AC_LINK_IFELSE(), since AC_LINK_IFELSE() deletes -# conftest.err before it returns. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_BUILD_IFELSE], - [AC_LANG_PUSH(m4_default([$3],[C])) - cs_cflags_save="$CS_LANG_CFLAGS" - cs_lflags_save="$LDFLAGS" - cs_libs_save="$LIBS" - cs_build_ok=no - m4_ifval([$10], [m4_pushdef([AC_TRY_EVAL], [_AC_EVAL_STDERR]($$[1]))]) - - for cs_build_item in m4_default([$2],[CS_CREATE_TUPLE()]) - do - CS_SPLIT_TUPLE( - [$cs_build_item],[cs_cflags_test,cs_lflags_test,cs_libs_test]) - CS_LANG_CFLAGS="$cs_cflags_test $6 $cs_cflags_save" - LDFLAGS="$cs_lflags_test $7 $cs_lflags_save" - LIBS="$cs_libs_test $8 $cs_libs_save" - AC_LINK_IFELSE(m4_default([$1], [AC_LANG_PROGRAM([],[])]), - [m4_ifval([$10], - [AS_IF([AC_TRY_COMMAND( - [grep "AS_ESCAPE([$10])" conftest.err >/dev/null 2>&1])], - [cs_build_ok=no], [cs_build_ok=yes])], - [cs_build_ok=yes])]) - AS_IF([test $cs_build_ok = yes], [break]) - done - - m4_ifval([$10], [m4_popdef([AC_TRY_EVAL]) rm -f conftest.err]) - CS_LANG_CFLAGS=$cs_cflags_save - LDFLAGS=$cs_lflags_save - LIBS=$cs_libs_save - AC_LANG_POP(m4_default([$3],[C])) - - AS_IF([test $cs_build_ok = yes], - [cs_build_cflags=CS_TRIM([$cs_cflags_test[]m4_ifval([$9],[],[ $6])]) - cs_build_lflags=CS_TRIM([$cs_lflags_test[]m4_ifval([$9],[],[ $7])]) - cs_build_libs=CS_TRIM([$cs_libs_test[]m4_ifval([$9],[],[ $8])]) - $4], - [$5])]) - - - -#------------------------------------------------------------------------------ -# CS_CHECK_BUILD(MESSAGE, CACHE-VAR, [PROGRAM], [FLAGS], [LANGUAGE], -# [ACTION-IF-BUILT], [ACTION-IF-NOT-BUILT], [IGNORE-CACHE], -# [OTHER-CFLAGS], [OTHER-LFLAGS], [OTHER-LIBS], -# [INHIBIT-OTHER-FLAGS], [ERROR-REGEX]) -# Like CS_BUILD_IFELSE() but also prints "checking" and result messages, -# and optionally respects the cache. Sets CACHE-VAR to "yes" upon -# success, else "no" upon failure. Additionally, sets CACHE-VAR_cflags, -# CACHE-VAR_lflags, and CACHE-VAR_libs to the values which resulted in a -# successful build. If IGNORE-CACHE is "yes", then the cache variables -# are ignored upon entry to this macro, however they are still set to -# appropriate values upon exit. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_BUILD], - [AS_IF([test "$8" != yes], - [AC_CACHE_CHECK([$1], [$2], - [CS_BUILD_IFELSE([$3], [$4], [$5], - [$2=yes - $2_cflags=$cs_build_cflags - $2_lflags=$cs_build_lflags - $2_libs=$cs_build_libs], - [$2=no], [$9], [$10], [$11], [$12], [$13])])], - [AC_MSG_CHECKING([$1]) - CS_BUILD_IFELSE([$3], [$4], [$5], - [$2=yes - $2_cflags=$cs_build_cflags - $2_lflags=$cs_build_lflags - $2_libs=$cs_build_libs], - [$2=no], [$9], [$10], [$11], [$12], [$13]) - AC_MSG_RESULT([$$2])]) - AS_IF([test $$2 = yes], [$6], - [$2_cflags='' - $2_lflags='' - $2_libs='' - $7])]) - - - -#------------------------------------------------------------------------------ -# CS_CHECK_BUILD_FLAGS(MESSAGE, CACHE-VAR, FLAGS, [LANGUAGE], -# [ACTION-IF-RECOGNIZED], [ACTION-IF-NOT-RECOGNIZED], -# [OTHER-CFLAGS], [OTHER-LFLAGS], [OTHER-LIBS], -# [ERROR-REGEX]) -# Like CS_CHECK_BUILD(), but checks only if the compiler or linker -# recognizes a command-line option or options. MESSAGE is the "checking" -# message. CACHE-VAR is the shell cache variable which receives the flag -# or flags recognized by the compiler or linker. FLAGS is a -# whitespace-delimited list of build tuples created with -# CS_CREATE_TUPLE(). Each tuple from FLAGS is attempted in order until -# one is found which is recognized by the compiler. After that, no -# further flags are checked. LANGUAGE is typically either C or C++ and -# specifies which compiler to use for the test. If LANGUAGE is omitted, -# C is used. If a command-line option is recognized, then CACHE-VAR is -# set to the composite value of $cs_build_cflags, $cs_build_lflags, and -# $cs_build_libs of the FLAGS element which succeeded (not including the -# "other" flags) and ACTION-IF-RECOGNIZED is invoked. If no options are -# recognized, then CACHE-VAR is set to the empty string, and -# ACTION-IF-NOT-RECOGNIZED is invoked. As a convenience, in case -# comparing CACHE-VAR against the empty string to test for failure is -# undesirable, a second variable named CACHE-VAR_ok is set to the literal -# "no" upon failure, and to the same value as CACHE-VAR upon success. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_BUILD_FLAGS], - [AC_CACHE_CHECK([$1], [$2_ok], - [CS_BUILD_IFELSE([], [$3], [$4], - [$2=CS_TRIM([$cs_build_cflags $cs_build_lflags $cs_build_libs]) - $2_ok="$$2"], - [$2='' - $2_ok=no], [$7], [$8], [$9], [Y], [$10])]) - AS_IF([test "$$2_ok" != no], [$5], [$6])]) -#============================================================================== -# Copyright (C)2003-2006 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_COMMON_TOOLS_LINK -# Checks for common tools related to linking. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_COMMON_TOOLS_LINK], - [ - # The default RANLIB in Jambase is wrong on some platforms, and is also - # unsuitable during cross-compilation, so we set the value unconditionally - # (sixth argument of CS_EMIT_BUILD_PROPERTY). - AC_PROG_RANLIB - CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [], [], [], [Y]) - - CS_CHECK_TOOLS([DLLTOOL], [dlltool]) - CS_EMIT_BUILD_PROPERTY([CMD.DLLTOOL], [$DLLTOOL]) - - CS_CHECK_TOOLS([DLLWRAP], [dllwrap]) - CS_EMIT_BUILD_PROPERTY([CMD.DLLWRAP], [$DLLWRAP]) - - CS_CHECK_TOOLS([WINDRES], [windres]) - CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES]) - - CS_CHECK_TOOLS([STRINGS], [strings]) - CS_EMIT_BUILD_PROPERTY([CMD.STRINGS], [$STRINGS]) - - CS_CHECK_TOOLS([OBJCOPY], [objcopy]) - CS_EMIT_BUILD_PROPERTY([CMD.OBJCOPY], [$OBJCOPY]) - - CS_CHECK_LIBTOOL - CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL]) - CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL]) - ]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_COMMON_TOOLS_BASIC -# Checks for basic tools for building things. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_COMMON_TOOLS_BASIC], - [CS_CHECK_MKDIR - CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR]) - CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS]) - - CS_CHECK_PROGS([INSTALL], [install]) - CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_COMMON_TOOLS_DOC_TEXINFO -# Checks for tools to generate documentation from texinfo files. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_COMMON_TOOLS_DOC_TEXINFO], - [CS_CHECK_PROGS([TEXI2DVI], [texi2dvi]) - CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI]) - - CS_CHECK_PROGS([TEXI2PDF], [texi2pdf]) - CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF]) - - CS_CHECK_PROGS([DVIPS], [dvips]) - CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS]) - - CS_CHECK_PROGS([DVIPDF], [dvipdf]) - CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF]) - - CS_CHECK_PROGS([MAKEINFO], [makeinfo]) - CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_COMMON_TOOLS_DOC_DOXYGEN -# Checks for tools to generate source documentation via doxygen. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_COMMON_TOOLS_DOC_DOXYGEN], - [CS_CHECK_PROGS([DOXYGEN], [doxygen]) - CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN]) - - CS_CHECK_TOOLS([DOT], [dot]) - CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_COMMON_LIBS -# Check for typical required libraries (libm, libmx, libdl, libnsl). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_COMMON_LIBS], - [AC_LANG_PUSH([C]) - AC_CHECK_LIB([m], [pow], [cs_cv_libm_libs=-lm], [cs_cv_libm_libs=]) - AC_CHECK_LIB([m], [cosf], [cs_cv_libm_libs=-lm]) - AC_CHECK_LIB([mx], [cosf]) - AC_CHECK_LIB([dl], [dlopen], [cs_cv_libdl_libs=-ldl], [cs_cv_libdl_libs=]) - AC_CHECK_LIB([nsl], [gethostbyname]) - AC_LANG_POP([C])]) -# checkcppunit.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_CPPUNIT([EMITTER]) -# Check if CppUnit (http://cppunit.sourceforge.net/), the unit-testing -# framework is available. The shell variable cs_cv_libcppunit is set to -# "yes" if CppUnit is discovered, else "no". If available, then the -# variables cs_cv_libcppunit_cflags, cs_cv_libcppunit_lflags, and -# cs_cv_libcppunit_libs are set. If EMITTER is provided, then -# CS_EMIT_BUILD_RESULT() is invoked with EMITTER in order to record the -# results in an output file. As a convenience, if EMITTER is the literal -# value "emit" or "yes", then CS_EMIT_BUILD_RESULT()'s default emitter -# will be used. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_CPPUNIT], - [CS_CHECK_LIB_WITH([cppunit], - [AC_LANG_PROGRAM([[#include ]], - [CppUnit::TextUi::TestRunner r; r.run();])], - [], [C++]) - - AS_IF([test $cs_cv_libcppunit = yes], - [CS_CHECK_BUILD([if cppunit is sufficiently recent], - [cs_cv_libcppunit_recent], - [AC_LANG_PROGRAM( - [[#include ]], - [CppUnit::BriefTestProgressListener b; b.startTest(0);])], - [], [C++], - [CS_EMIT_BUILD_RESULT([cs_cv_libcppunit], [CPPUNIT], - CS_EMITTER_OPTIONAL([$1]))], [], [], - [$cs_cv_libcppunit_cflags], - [$cs_cv_libcppunit_lflags], - [$cs_cv_libcppunit_libs])])]) -# checklib.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003-2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# cs_lib_paths_default -# Whitespace delimited list of directory tuples in which to search, by -# default, for external libraries. Each list item can specify an -# include|library directory tuple (for example, "/usr/include|/usr/lib"), -# or a single directory (for example, "/usr"). If the second form is -# used, then "include" and "lib" subdirectories of the directory are -# searched. If the library resources are not found, then the directory -# itself is searched. Thus, "/proj" is shorthand for -# "/proj/include|/proj/lib /proj|/proj". -# -# Present Cases: -# /usr/local -- Not all compilers search here by default, so we specify -# it manually. -# /sw -- Fink, the MacOS/X manager of Unix packages, installs here by -# default. -# /opt/local -- DarwinPorts installs here by default. -#------------------------------------------------------------------------------ -m4_define([cs_lib_paths_default], - [/usr/local/include|/usr/local/lib \ - /sw/include|/sw/lib \ - /opt/local/include|/opt/local/lib \ - /opt/include|/opt/lib]) - - - -#------------------------------------------------------------------------------ -# cs_pkg_paths_default -# Comma delimited list of additional directories in which the -# `pkg-config' command should search for its `.pc' files. -# -# Present Cases: -# /usr/local/lib/pkgconfig -- Although a common location for .pc files -# installed by "make install", many `pkg-config' commands neglect -# to search here automatically. -# /sw/lib/pkgconfig -- Fink, the MacOS/X manager of Unix packages, -# installs .pc files here by default. -# /opt/local/lib/pkgconfig -- DarwinPorts installs .pc files here by -# default. -#------------------------------------------------------------------------------ -m4_define([cs_pkg_paths_default], - [/usr/local/lib/pkgconfig, - /sw/lib/pkgconfig, - /opt/local/lib/pkgconfig, - /opt/lib/pkgconfig]) - - - -#------------------------------------------------------------------------------ -# CS_CHECK_LIB_WITH(LIBRARY, PROGRAM, [SEARCH-LIST], [LANGUAGE], -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [OTHER-CFLAGS], -# [OTHER-LFLAGS], [OTHER-LIBS], [ALIASES]) -# Very roughly similar in concept to AC_CHECK_LIB(), but allows caller to -# to provide list of directories in which to search for LIBRARY; allows -# user to override library location via --with-LIBRARY=dir; and consults -# `pkg-config' (if present) and `LIBRARY-config' (if present, i.e. -# `sdl-config') in order to obtain compiler and linker flags. LIBRARY is -# the name of the library or MacOS/X framework which is to be located -# (for example, "readline" for `libreadline.a' or `readline.framework'). -# PROGRAM, which is typically composed with AC_LANG_PROGRAM(), is a -# program which references at least one function or symbol in LIBRARY. -# SEARCH-LIST is a whitespace-delimited list of paths in which to search -# for the library and its header files, in addition to those searched by -# the compiler and linker by default, and those referenced by the -# cs_lib_paths_default macro. Each list item can specify an -# `include|library' directory tuple (for example, -# "/usr/include|/usr/lib"), or a single directory (for example, "/usr"). -# If the second form is used, then "include" and "lib" subdirectories of -# the directory are searched. If the library resources are not found, -# then the directory itself is searched. Thus, "/proj" is shorthand for -# "/proj/include|/proj/lib /proj|/proj". Items in the search list can -# include wildcards. SEARCH-LIST can be overridden by the user with the -# --with-LIBRARY=dir option, in which case only "dir/include|dir/lib" and -# "dir|dir" are searched. If SEARCH-LIST is omitted and the user did not -# override the search list via --with-LIBRARY=dir, then only the -# directories normally searched by the compiler and the directories -# mentioned via cs_lib_paths_default are searched. LANGUAGE is typically -# either C or C++ and specifies which compiler to use for the test. If -# LANGUAGE is omitted, C is used. OTHER-CFLAGS, OTHER-LFLAGS, and -# OTHER-LIBS can specify additional compiler flags, linker flags, and -# libraries needed to successfully link with LIBRARY. The optional -# ALIASES is a comma-delimited list of library names for which to search -# in case LIBRARY is not located (for example "[sdl1.2, sdl12]" for -# libsdl1.2.a, sdl1.2.framework, libsdl12.a, and sdl12.framework). If -# the library or one of its aliases is found and can be successfully -# linked into a program, then the shell cache variable cs_cv_libLIBRARY -# is set to "yes"; cs_cv_libLIBRARY_cflags, cs_cv_libLIBRARY_lflags, and -# cs_cv_libLIBRARY_libs are set, respectively, to the compiler flags -# (including OTHER-CFLAGS), linker flags (including OTHER-LFLAGS), and -# library references (including OTHER-LIBS) which resulted in a -# successful build; and ACTION-IF-FOUND is invoked. If the library was -# not found or was unlinkable, or if the user disabled the library via -# --without-LIBRARY, then cs_cv_libLIBRARY is set to "no" and -# ACTION-IF-NOT-FOUND is invoked. Note that the exported shell variable -# names are always composed from LIBRARY regardless of whether the test -# succeeded because the primary library was discovered or one of the -# aliases. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_LIB_WITH], - [AC_ARG_WITH([$1], [AC_HELP_STRING([--with-$1=dir], - [specify location of lib$1 if not detected automatically; searches - dir/include, dir/lib, and dir])]) - - # Backward compatibility: Recognize --with-lib$1 as alias for --with-$1. - AS_IF([test -n "$with_lib$1" && test -z "$with_$1"], - [with_$1="$with_lib$1"]) - - AS_IF([test -z "$with_$1"], [with_$1=yes]) - AS_IF([test "$with_$1" != no], - [# If --with-$1 value is same as cached value, then assume other - # cached values are also valid; otherwise, ignore all cached values. - AS_IF([test "$with_$1" != "$cs_cv_with_$1"], - [cs_ignore_cache=yes], [cs_ignore_cache=no]) - - cs_check_lib_flags='' - AS_IF([test $with_$1 = yes], - [m4_foreach([cs_check_lib_alias], [$1, $10], - [_CS_CHECK_LIB_PKG_CONFIG_FLAGS([cs_check_lib_flags], - cs_check_lib_alias) - _CS_CHECK_LIB_CONFIG_FLAGS([cs_check_lib_flags], - cs_check_lib_alias) - ])]) - - AS_IF([test $with_$1 != yes], - [cs_check_lib_paths=$with_$1], - [cs_check_lib_paths="| cs_lib_paths_default $3"]) - m4_foreach([cs_check_lib_alias], [$1, $10], - [_CS_CHECK_LIB_CREATE_FLAGS([cs_check_lib_flags], - cs_check_lib_alias, [$cs_check_lib_paths]) - ]) - - CS_CHECK_BUILD([for lib$1], [cs_cv_lib$1], [$2], [$cs_check_lib_flags], - [$4], [], [], [$cs_ignore_cache], [$7], [$8], [$9])], - [cs_cv_lib$1=no]) - - cs_cv_with_$1="$with_$1" - AS_IF([test "$cs_cv_lib$1" = yes], [$5], [$6])]) - - - -#------------------------------------------------------------------------------ -# CS_CHECK_PKG_CONFIG -# Check if the `pkg-config' command is available and reasonably recent. -# This program acts as a central repository of build flags for various -# packages. For example, to determine the compiler flags for FreeType2 -# use, "pkg-config --cflags freetype2"; and "pkg-config --libs freetype2" -# to determine the linker flags. If `pkg-config' is found and is -# sufficiently recent, PKG_CONFIG is set and AC_SUBST() invoked. -#------------------------------------------------------------------------------ -m4_define([CS_PKG_CONFIG_MIN], [0.9.0]) -AC_DEFUN([CS_CHECK_PKG_CONFIG], - [AS_IF([test "$cs_prog_pkg_config_checked" != yes], - [CS_CHECK_TOOLS([PKG_CONFIG], [pkg-config]) - _CS_CHECK_PKG_CONFIG_PREPARE_PATH - cs_prog_pkg_config_checked=yes]) - AS_IF([test -z "$cs_cv_prog_pkg_config_ok"], - [AS_IF([test -n "$PKG_CONFIG"], - [AS_IF([$PKG_CONFIG --atleast-pkgconfig-version=CS_PKG_CONFIG_MIN], - [cs_cv_prog_pkg_config_ok=yes], - [cs_cv_prog_pkg_config_ok=no])], - [cs_cv_prog_pkg_config_ok=no])])]) - -AC_DEFUN([_CS_CHECK_PKG_CONFIG_PREPARE_PATH], - [PKG_CONFIG_PATH="m4_foreach([cs_pkg_path], [cs_pkg_paths_default], - [cs_pkg_path$PATH_SEPARATOR])$PKG_CONFIG_PATH" - export PKG_CONFIG_PATH]) - - - -#------------------------------------------------------------------------------ -# _CS_CHECK_LIB_PKG_CONFIG_FLAGS(VARIABLE, LIBRARY) -# Helper macro for CS_CHECK_LIB_WITH(). Checks if `pkg-config' knows -# about LIBRARY and, if so, appends a build tuple consisting of the -# compiler and linker flags reported by `pkg-config' to the list of -# tuples stored in the shell variable VARIABLE. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_CHECK_LIB_PKG_CONFIG_FLAGS], - [CS_CHECK_PKG_CONFIG - AS_IF([test $cs_cv_prog_pkg_config_ok = yes], - [AC_CACHE_CHECK([if $PKG_CONFIG recognizes $2], [_CS_CLPCF_CVAR([$2])], - [AS_IF([$PKG_CONFIG --exists $2], - [_CS_CLPCF_CVAR([$2])=yes], [_CS_CLPCF_CVAR([$2])=no])]) - AS_IF([test $_CS_CLPCF_CVAR([$2]) = yes], - [_CS_CHECK_LIB_CONFIG_PROG_FLAGS([$1], [pkg_config_$2], - [$PKG_CONFIG], [$2])])])]) - -AC_DEFUN([_CS_CLPCF_CVAR], [AS_TR_SH([cs_cv_prog_pkg_config_$1])]) - - - -#------------------------------------------------------------------------------ -# _CS_CHECK_LIB_CONFIG_FLAGS(VARIABLE, LIBRARY) -# Helper macro for CS_CHECK_LIB_WITH(). Checks if `LIBRARY-config' -# (i.e. `sdl-config') exists and, if so, appends a build tuple consisting -# of the compiler and linker flags reported by `LIBRARY-config' to the -# list of tuples stored in the shell variable VARIABLE. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_CHECK_LIB_CONFIG_FLAGS], - [CS_CHECK_TOOLS(_CS_CLCF_SHVAR([$2]), [$2-config]) - AS_IF([test -n "$_CS_CLCF_SHVAR([$2])"], - [AS_IF([test -z "$_CS_CLCF_CVAR([$2])"], - [AS_IF([$_CS_CLCF_SHVAR([$2]) --cflags --libs >/dev/null 2>&1], - [_CS_CLCF_CVAR([$2])=yes], [_CS_CLCF_CVAR([$2])=no])]) - AS_IF([test $_CS_CLCF_CVAR([$2]) = yes], - [_CS_CHECK_LIB_CONFIG_PROG_FLAGS([$1], [config_$2], - [$_CS_CLCF_SHVAR([$2])])])])]) - -AC_DEFUN([_CS_CLCF_CVAR], [AS_TR_SH([cs_cv_prog_config_$1_ok])]) -AC_DEFUN([_CS_CLCF_SHVAR], [m4_toupper(AS_TR_SH([CONFIG_$1]))]) - - - -#------------------------------------------------------------------------------ -# _CS_CHECK_LIB_CONFIG_PROG_FLAGS(VARIABLE, TAG, CONFIG-PROGRAM, [ARGS]) -# Helper macro for _CS_CHECK_LIB_PKG_CONFIG_FLAGS() and -# _CS_CHECK_LIB_CONFIG_FLAGS(). CONFIG-PROGRAM is a command which -# responds to the --cflags and --libs options and returns suitable -# compiler and linker flags for some package. ARGS, if supplied, is -# passed to CONFIG-PROGRAM after the --cflags or --libs argument. The -# results of the --cflags and --libs options are packed into a build -# tuple and appended to the list of tuples stored in the shell variable -# VARIABLE. TAG is used to compose the name of the cache variable. A good -# choice for TAG is some unique combination of the library name and -# configuration program. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_CHECK_LIB_CONFIG_PROG_FLAGS], - [AS_IF([test -z "$_CS_CLCPF_CVAR([$2])"], - [cs_check_lib_cflag=CS_RUN_PATH_NORMALIZE([$3 --cflags $4]) - cs_check_lib_lflag='' - cs_check_lib_libs=CS_RUN_PATH_NORMALIZE([$3 --libs $4]) - _CS_CLCPF_CVAR([$2])=CS_CREATE_TUPLE( - [$cs_check_lib_cflag], - [$cs_check_lib_lflag], - [$cs_check_lib_libs])]) - $1="$$1 $_CS_CLCPF_CVAR([$2])"]) - -AC_DEFUN([_CS_CLCPF_CVAR], [AS_TR_SH([cs_cv_prog_$1_flags])]) - - - -#------------------------------------------------------------------------------ -# _CS_CHECK_LIB_CREATE_FLAGS(VARIABLE, LIBRARY, PATHS) -# Helper macro for CS_CHECK_LIB_WITH(). Constructs a list of build -# tuples suitable for CS_CHECK_BUILD() and appends the tuple list to the -# shell variable VARIABLE. LIBRARY and PATHS have the same meanings as -# the like-named arguments of CS_CHECK_LIB_WITH(). -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_CHECK_LIB_CREATE_FLAGS], - [for cs_lib_item in $3 - do - case $cs_lib_item in - *\|*) CS_SPLIT( - [$cs_lib_item], [cs_check_incdir,cs_check_libdir], [|]) - _CS_CHECK_LIB_CREATE_FLAG([$1], - [$cs_check_incdir], [$cs_check_libdir], [$2]) - ;; - *) _CS_CHECK_LIB_CREATE_FLAG([$1], - [$cs_lib_item/include], [$cs_lib_item/lib], [$2]) - _CS_CHECK_LIB_CREATE_FLAG( - [$1], [$cs_lib_item], [$cs_lib_item], [$2]) - ;; - esac - done]) - - - -#------------------------------------------------------------------------------ -# _CS_CHECK_LIB_CREATE_FLAG(VARIABLE, HEADER-DIR, LIBRARY-DIR, LIBRARY) -# Helper macro for _CS_CHECK_LIB_CREATE_FLAGS(). Constructs build tuples -# suitable for CS_CHECK_BUILD() for given header and library directories, -# and appends the tuples to the shell variable VARIABLE. Synthesizes -# tuples which check for LIBRARY as a MacOS/X framework, and a standard -# link library. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_CHECK_LIB_CREATE_FLAG], - [AS_IF([test -n "$2"], [cs_check_lib_cflag="-I$2"], [cs_check_lib_cflag='']) - AS_IF([test -n "$3"], [cs_check_lib_lflag="-L$3"], [cs_check_lib_lflag='']) - AS_IF([test -n "$4"], - [cs_check_lib_libs="-l$4" - cs_check_lib_framework="-framework $4"], - [cs_check_lib_libs='' - cs_check_lib_framework='']) - $1="$$1 - CS_CREATE_TUPLE( - [$cs_check_lib_cflag], - [$cs_check_lib_lflag], - [$cs_check_lib_framework]) - CS_CREATE_TUPLE( - [$cs_check_lib_cflag], - [$cs_check_lib_lflag], - [$cs_check_lib_libs])"]) -# checklibtool.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2004 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_LIBTOOL -# Find and identify the various implementations of libtool. In -# particular, this macro is aware of GNU libtool and Apple's libtool -# (which serves a completely different purpose). On MacOS/X, GNU libtool -# is typically named glibtool, however a user might also use Fink to -# install the unadorned libtool; and the Fink-installed version might -# shadow Apple's own libtool if it appears in the PATH before the Apple -# tool. This macro jumps through the necessary hoops to distinguish and -# locate the various implementations. Sets the shell variable LIBTOOL to -# the located GNU libtool (if any), and APPLE_LIBTOOL to the located -# Apple libtool. Invokes AC_SUBST() for LIBTOOL and APPLE_LIBTOOL. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_LIBTOOL], -[# GNU: Search for libtool before glibtool since Fink version is likely newer. -m4_define([cs_lt_path_gnu], - [/sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH]) -AS_IF([test -z "$LIBTOOL"], - [CS_CHECK_TOOLS([LIBTOOL_TEST], [libtool glibtool gnulibtool], [], - [cs_lt_path_gnu]) - AS_IF([test -n "$LIBTOOL_TEST"], - [CS_PATH_PROG([LIBTOOL_PATH], [$LIBTOOL_TEST], [], [cs_lt_path_gnu]) - CS_LIBTOOL_CLASSIFY([$LIBTOOL_PATH], - [LIBTOOL="$LIBTOOL_PATH"], - [AS_IF([test -z "$APPLE_LIBTOOL"], [APPLE_LIBTOOL="$LIBTOOL_PATH"]) - CS_CHECK_TOOLS([LIBTOOL], [glibtool gnulibtool])])])]) -AC_SUBST([LIBTOOL]) - -# Apple: Ensure that Apple libtool will be found before GNU libtool from Fink. -m4_define([cs_lt_path_apple],[/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH]) -AS_IF([test -z "$APPLE_LIBTOOL"], - [CS_PATH_PROG([CS_LT_APPLE], [libtool], [], [cs_lt_path_apple]) - CS_LIBTOOL_CLASSIFY([$CS_LT_APPLE], [], - [APPLE_LIBTOOL="$CS_LT_APPLE"])]) -AC_SUBST([APPLE_LIBTOOL])]) - -AC_DEFUN([CS_LIBTOOL_CLASSIFY], - [AS_IF([test -n "$1"], - [AC_MSG_CHECKING([classification of $1]) - CS_LIBTOOL_GNU_IFELSE([$1], - [AC_MSG_RESULT([gnu]) - $2], - [AC_MSG_RESULT([apple]) - $3])])]) - -AC_DEFUN([CS_LIBTOOL_GNU_IFELSE], - [AS_IF([AC_RUN_LOG([$1 --version 1>&2])], [$2], [$3])]) -#============================================================================== -# Copyright (C)2003-2006 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_OPENGL -# Check for OpenGL. -# -# IMPLEMENTATION NOTES -# -# Some Mesa installations require pthread, so pthread flags are employed if -# available. -# -# The check for opengl32 needs to precede other checks because Cygwin users -# often have Mesa installed, and Mesa's OpenGL library is compiled without the -# __stdcall flags which results in link errors, whereas Microsoft's native -# opengl32 works fine. Conversely, some Unix implementations have Wine -# installed (Windows emulation layer) which includes an opengl32.so library. -# We need to avoid detection of this library on Unix since it would cause an -# undesirable dependence upon Wine. -# -# Many OpenGL libraries on Unix already contain GLX, so there is no separate -# GLX library, thus we first check for GLX using the discovered OpenGL library -# before attempting to locate a separate GLX-specific library. -# -# On MacOS/X, some users have XFree86 installed which creates a link from -# /usr/include/GL to /usr/X11R6/include/GL. We want to ignore this directory -# and instead check for Apple's OpenGL.framework, if we are not cross-building -# for Darwin. We accomplish this by placing the OpenGL.framework test ahead of -# the other tests. -# -# At least one user (Jorrit) has a strange installation in which inclusion of -# fails if an int32 is not present, thus we must take this into -# account. -#------------------------------------------------------------------------------ -m4_define([cs_define_int32], - [[#if !HAVE_TYPE_INT32 - typedef long int32; - #endif - ]]) - -# CS_GL_INCLUDE(CPP-MACRO,FALLBACK,HEADER) -AC_DEFUN([CS_GL_INCLUDE], - [[#if HAVE_WINDOWS_H - #if !HAVE_TYPE_INT32 - typedef long int32; - #endif - #include - #endif - #ifndef CS_HEADER_GLOBAL - #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y) - #define CS_HEADER_GLOBAL_COMPOSE(X,Y) - #endif - #ifdef $1 - #include CS_HEADER_GLOBAL($1,$3) - #else - #include <$2/$3> - #endif]]) - -AC_DEFUN([CS_CHECK_OPENGL], - [AC_REQUIRE([CS_CHECK_HOST]) - AC_REQUIRE([CS_CHECK_COMMON_LIBS]) - AC_REQUIRE([CS_CHECK_PTHREAD]) - AC_REQUIRE([AC_PATH_X]) - AC_REQUIRE([AC_PATH_XTRA]) - AC_CHECK_TYPE([int32], [AC_DEFINE([HAVE_TYPE_INT32], [], - [Whether the int32 type is available])], []) - AC_CHECK_HEADERS([windows.h], [], [], [cs_define_int32]) - - # Apply plaform-specific flags if necessary. - cs_gl_plat_cflags='' - cs_gl_plat_lflags='' - cs_gl_plat_libs='' - AS_IF([test -n "$cs_cv_libm_cflags$cs_cv_libm_lflags$cs_cv_libm_libs"], - [cs_gl_plat_cflags="$cs_cv_libm_cflags $cs_gl_plat_cflags" - cs_gl_plat_lflags="$cs_cv_libm_lflags $cs_gl_plat_lflags" - cs_gl_plat_libs="$cs_cv_libm_libs $cs_gl_plat_libs"]) - AS_IF([test $cs_cv_sys_pthread = yes], - [cs_gl_plat_cflags="$cs_cv_sys_pthread_cflags $cs_gl_plat_cflags" - cs_gl_plat_lflags="$cs_cv_sys_pthread_lflags $cs_gl_plat_lflags" - cs_gl_plat_libs="$cs_cv_sys_pthread_libs $cs_gl_plat_libs"]) - AS_IF([test "$no_x" != yes], - [cs_gl_plat_cflags="$X_CFLAGS $cs_gl_plat_cflags" - cs_gl_plat_lflags="$cs_gl_plat_lflags" - cs_gl_plat_libs=" - $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS $cs_gl_plat_libs"]) - - # Mesa requested? - AC_ARG_WITH([mesa], [AC_HELP_STRING([--with-mesa], - [use Mesa OpenGL library if available (default YES)])], - [], [with_mesa=yes]) - - AS_IF([test $with_mesa != no], - [cs_mesa_gl=CS_CREATE_TUPLE([],[],[-lMesaGL])]) - - # MacOS/X or Darwin? - AS_IF([test "x$cs_host_macosx" = "xyes"], - [cs_osx_gl=CS_CREATE_TUPLE([-DCS_OPENGL_PATH=OpenGL],[],[-framework OpenGL])]) - AS_IF([test "x$cs_host_macosx" = "xyes"], - [cs_gl_plat_lflags="$cs_plat_lflags -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"]) - - # Windows? - AS_IF([test $cs_host_family = windows], - [cs_win32_gl=CS_CREATE_TUPLE([],[],[-lopengl32])]) - - # Check for OpenGL. - CS_CHECK_BUILD([for OpenGL], [cs_cv_libgl], - [AC_LANG_PROGRAM([CS_GL_INCLUDE([CS_OPENGL_PATH],[GL],[gl.h])],[glEnd()])], - [$cs_win32_gl \ - $cs_osx_gl \ - CS_CREATE_TUPLE([],[],[-lGL]) \ - CS_CREATE_TUPLE([],[],[-lgl]) \ - $cs_mesa_gl], [], - [CS_EMIT_BUILD_RESULT([cs_cv_libgl], [GL])], [], [], - [$cs_gl_plat_cflags], [$cs_gl_plat_lflags], [$cs_gl_plat_libs])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_GLU -# Check for GLU. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_GLU], - [AC_REQUIRE([CS_CHECK_OPENGL]) - AS_IF([test $cs_cv_libgl = yes], - [AS_IF([test $with_mesa != no], - [cs_mesa_glu=CS_CREATE_TUPLE([],[],[-lMesaGLU])]) - - # MacOS/X or Darwin? - AS_IF([test "x$cs_host_macosx" = "xyes"], - [cs_osx_glu=CS_CREATE_TUPLE([-DCS_GLU_PATH=OpenGL],[],[-framework OpenGL])]) - - # Windows? - AS_IF([test $cs_host_family = windows], - [cs_win32_glu=CS_CREATE_TUPLE([],[],[-lglu32])]) - - # Check for GLU. - CS_CHECK_BUILD([for GLU], [cs_cv_libglu], - [AC_LANG_PROGRAM( - [CS_GL_INCLUDE([CS_GLU_PATH],[GL],[glu.h])], [gluNewQuadric()])], - [$cs_osx_glu \ - CS_CREATE_TUPLE() \ - $cs_win32_glu \ - CS_CREATE_TUPLE([],[],[-lGLU]) \ - CS_CREATE_TUPLE([],[],[-lglu]) \ - $cs_mesa_glu], [], - [CS_EMIT_BUILD_RESULT([cs_cv_libglu], [GLU])], [], [], - [$cs_cv_libgl_cflags], [$cs_cv_libgl_lflags], [$cs_cv_libgl_libs])])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_GLX -# Check for GLX. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_GLX], - [AC_REQUIRE([CS_CHECK_OPENGL]) - AS_IF([test $cs_cv_libgl = yes], - [AS_IF([test $with_mesa != no], - [cs_mesa_glx=CS_CREATE_TUPLE([],[],[-lMesaGLX])]) - - # Check for GLX. - AS_IF([test "$no_x" != yes], - [CS_CHECK_BUILD([for GLX], [cs_cv_libglx], - [AC_LANG_PROGRAM([[#include ]], [glXWaitGL()])], - [CS_CREATE_TUPLE() \ - CS_CREATE_TUPLE([],[],[-lGLX]) \ - CS_CREATE_TUPLE([],[],[-lglx]) \ - $cs_mesa_glx], [], - [CS_EMIT_BUILD_RESULT([cs_cv_libglx], [GLX])], [], [], - [$cs_cv_libgl_cflags], [$cs_cv_libgl_lflags], [$cs_cv_libgl_libs])])])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_GLXEXT([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# Check for GLX extensions. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_GLXEXT], - [AC_REQUIRE([CS_CHECK_GLX]) - AS_IF([test x$cs_cv_libglx = "xyes"], - [# Check for GLX extensions. - CS_CHECK_BUILD([for GLX extensions], [cs_cv_libglx_extensions], - [AC_LANG_PROGRAM( - [[#define GLX_GLXEXT_PROTOTYPES - #include ]], - [glXGetProcAddressARB(0)])], - [CS_CREATE_TUPLE( - [$cs_cv_libglx_cflags], - [$cs_cv_libglx_lflags], - [$cs_cv_libglx_libs])], - [], [$1], [$2])])]) - - - -#------------------------------------------------------------------------------ -# CS_CHECK_GLUT -# Check for GLUT. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_GLUT], - [AC_REQUIRE([CS_CHECK_GLU]) - AS_IF([test x$cs_cv_libglu = "xyes"], - [# MacOS/X or Darwin? - AS_IF([test "x$cs_host_macosx" = "xyes"], - [cs_osx_glut=CS_CREATE_TUPLE([-DCS_GLUT_PATH=GLUT],[],[-framework GLUT])]) - - # Windows? - AS_IF([test $cs_host_family = windows], - [cs_win32_glut=CS_CREATE_TUPLE([],[],[-lglut32])]) - - # Check for GLUT. - CS_CHECK_BUILD([for GLUT], [cs_cv_libglut], - [AC_LANG_PROGRAM( - [CS_GL_INCLUDE([CS_GLUT_PATH],[GL],[glut.h])], [glutSwapBuffers()])], - [$cs_osx_glut \ - CS_CREATE_TUPLE() \ - $cs_win32_glut \ - CS_CREATE_TUPLE([],[],[-lGLUT]) \ - CS_CREATE_TUPLE([],[],[-lglut])], [], - [CS_EMIT_BUILD_RESULT([cs_cv_libglut], [GLUT])], [], [], - [$cs_cv_libgl_cflags $cs_cv_libglu_cflags], - [$cs_cv_libgl_lflags $cs_cv_libglu_lflags], - [$cs_cv_libgl_libs $cs_cv_libglu_libs])])]) - -# checkpic.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_COMPILER_PIC([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check if compiler can be instructed to produce -# position-independent-code (PIC). This feature is required by some -# platforms when building plugin modules and shared libraries. If -# LANGUAGE is not provided, then `C' is assumed (other options include -# `C++'). If CACHE-VAR is not provided, then it defaults to the name -# "cs_cv_prog_compiler_pic". If a PIC-enabling option (such as `-fPIC') -# is discovered, then it is assigned to CACHE-VAR and ACTION-IF-FOUND is -# invoked; otherwise the empty string is assigned to CACHE-VAR and -# ACTION-IF-NOT-FOUND is invoked. -# -# IMPLEMENTATION NOTES -# -# On some platforms (such as Windows), the -fPIC option is superfluous -# and emits a warning "-fPIC ignored for target (all code is position -# independent)", despite the fact that the compiler accepts the option -# and returns a success code. We want to re-interpret the warning as a -# failure in order to avoid unnecessary compiler diagnostics in case the -# client inserts the result of this check into CFLAGS, for instance. We -# do so by attempting to promote warnings to errors using the result of -# CS_COMPILER_ERRORS(). As an extra safe-guard, we also scan the compiler -# output for an appropriate diagnostic because some gcc warnings fail to -# promote to error status despite use of -Werror. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_PIC], - [CS_COMPILER_ERRORS([$1], - [m4_default([$2_werror],[cs_cv_prog_compiler_pic_werror])]) - CS_CHECK_BUILD_FLAGS( - [how to enable m4_default([$1],[C]) PIC generation], - [m4_default([$2],[cs_cv_prog_compiler_pic])], - [CS_CREATE_TUPLE([-fPIC])], [$1], [$3], [$4], - [m4_default([$$2_werror],[$cs_cv_prog_compiler_pic_werror])], [], [], - [fPIC])]) - -# Backward-compatiblity alias. -AC_DEFUN([CS_CHECK_COMPILER_PIC], [CS_COMPILER_PIC([$1],[$2],[$3],[$4])]) -# checkprog.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2004 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# cs_bin_paths_default -# Comma delimited list of additional directories in which tools and -# commands might be found. -# -# Present Cases: -# /usr/local/bin -- Although a common location for executables, it is -# now-and-then absent from the default PATH setting. -# /sw/bin -- Fink, the MacOS/X manager of Unix packages, installs -# executables here. -#------------------------------------------------------------------------------ -m4_define([cs_bin_paths_default], [/usr/local/bin, /sw/bin]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_PROG(VARIABLE, PROGRAM, VALUE-IF-FOUND, [VALUE-IF-NOT-FOUND], -# [PATH], [REJECT]) -# Simple wrapper for AC_CHECK_PROG() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_PROG], - [_CS_PROG_PATH_PREPARE - AC_CHECK_PROG([$1], [$2], [$3], [$4], - m4_ifval([$5], [_CS_PROG_CLIENT_PATH([$5])]), [$6])]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_PROGS(VARIABLE, PROGRAMS, [VALUE-IF-NOT-FOUND], [PATH]) -# Simple wrapper for AC_CHECK_PROGS() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_PROGS], - [_CS_PROG_PATH_PREPARE - AC_CHECK_PROGS([$1], [$2], [$3], - m4_ifval([$4], [_CS_PROG_CLIENT_PATH([$4])]))]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_TOOL(VARIABLE, TOOL, [VALUE-IF-NOT-FOUND], [PATH]) -# Simple wrapper for AC_CHECK_TOOL() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_TOOL], - [_CS_PROG_PATH_PREPARE - AC_CHECK_TOOL([$1], [$2], [$3], - m4_ifval([$4], [_CS_PROG_CLIENT_PATH([$4])]))]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_TOOLS(VARIABLE, TOOLS, [VALUE-IF-NOT-FOUND], [PATH]) -# Simple wrapper for AC_CHECK_TOOLS() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_TOOLS], - [_CS_PROG_PATH_PREPARE - AC_CHECK_TOOLS([$1], [$2], [$3], - m4_ifval([$4], [_CS_PROG_CLIENT_PATH([$4])]))]) - - -#------------------------------------------------------------------------------ -# CS_PATH_PROG(VARIABLE, PROGRAM, [VALUE-IF-NOT-FOUND], [PATH]) -# Simple wrapper for AC_PATH_PROG() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_PATH_PROG], - [_CS_PROG_PATH_PREPARE - AC_PATH_PROG([$1], [$2], [$3], - m4_ifval([$4], [_CS_PROG_CLIENT_PATH([$4])]))]) - - -#------------------------------------------------------------------------------ -# CS_PATH_PROGS(VARIABLE, PROGRAMS, [VALUE-IF-NOT-FOUND], [PATH]) -# Simple wrapper for AC_PATH_PROGS() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_PATH_PROGS], - [_CS_PROG_PATH_PREPARE - AC_PATH_PROGS([$1], [$2], [$3], - m4_ifval([$4], [_CS_PROG_CLIENT_PATH([$4])]))]) - - -#------------------------------------------------------------------------------ -# CS_PATH_TOOL(VARIABLE, TOOL, [VALUE-IF-NOT-FOUND], [PATH]) -# Simple wrapper for AC_PATH_TOOL() which ensures that the search path -# is augmented by the directories mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_PATH_TOOL], - [_CS_PROG_PATH_PREPARE - AC_PATH_TOOL([$1], [$2], [$3], - m4_ifval([$4], [_CS_PROG_CLIENT_PATH([$4])]))]) - - -#------------------------------------------------------------------------------ -# _CS_PROG_PATH_PREPARE -# Ensure that the PATH environment variable mentions the set of -# directories listed in cs_bin_paths_default. These directories may not -# appear by default in the typical PATH, yet they might be common -# locations for tools and commands. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_PROG_PATH_PREPARE], - [AS_REQUIRE([_AS_PATH_SEPARATOR_PREPARE]) - AS_IF([test "$cs_prog_path_prepared" != yes], - [cs_prog_path_prepared=yes - PATH="$PATH[]m4_foreach([cs_bin_path], [cs_bin_paths_default], - [$PATH_SEPARATOR[]cs_bin_path])" - export PATH])]) - - -#------------------------------------------------------------------------------ -# _CS_PROG_CLIENT_PATH(CLIENT-PATH) -# Given a client-supplied replacement for PATH, augment the list by -# appending the locations mentioned in cs_bin_paths_default. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_PROG_CLIENT_PATH], - [AS_REQUIRE([_AS_PATH_SEPARATOR_PREPARE])dnl - $1[]m4_foreach([cs_bin_path], [cs_bin_paths_default], - [$PATH_SEPARATOR[]cs_bin_path])]) -# checkpthread.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003-2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_PTHREAD([REJECT-MASK]) -# Check for pthread. Also check if the pthread implementation supports -# the recursive and timed mutex extensions. (Timed mutexes are needed for -# the NPTL: New Posix Thread Library on GNU/Linux if the mutex is going -# to be used with any of the timed condition-wait functions.) The shell -# variable cs_cv_sys_pthread is set to "yes" if pthread is available, -# else "no". If available, then the variables cs_cv_sys_pthread_cflags, -# cs_cv_sys_pthread_lflags, and cs_cv_sys_pthread_libs are set. (As a -# convenience, these variables can be emitted to an output file with -# CS_EMIT_BUILD_RESULT() by passing "cs_cv_sys_pthread" as its CACHE-VAR -# argument.) If the recursive mutex extension is supported, then -# cs_cv_sys_pthread_mutex_recursive will be set with the literal name of -# the constant which must be passed to pthread_mutexattr_settype() to -# enable this feature. The constant name will be typically -# PTHREAD_MUTEX_RECURSIVE or PTHREAD_MUTEX_RECURSIVE_NP. If the recursive -# mutex extension is not available, then -# cs_cv_sys_pthread_mutex_recursive will be set to "no". If the timed -# mutex extension is supported, then cs_cv_sys_pthread_mutex_timed will -# be set with the literal name of the constant which must be passed to -# pthread_mutexattr_settype() to enable this feature. The constant name -# will be typically PTHREAD_MUTEX_TIMED or PTHREAD_MUTEX_TIMED_NP. If the -# timed mutex extension is not available, then -# cs_cv_sys_pthread_mutex_timed will be set to "no". REJECT-MASK can be -# used to limit the platforms on which the pthread test is performed. It -# is compared against $host_os; matches are rejected. If omitted, then -# the test is performed on all platforms. Examples: To avoid testing on -# Cygwin, use "cygwin*"; to avoid testing on Cygwin and AIX, use -# "cygwin*|aix*". -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_PTHREAD], - [AC_REQUIRE([AC_CANONICAL_HOST]) - case $host_os in - m4_ifval([$1], - [$1) - cs_cv_sys_pthread=no - ;; - ]) - *) - CS_CHECK_BUILD([for pthread], [cs_cv_sys_pthread], - [AC_LANG_PROGRAM( - [[#include - #include - void* worker(void* p) { (void)p; return p; }]], - [pthread_t tid; - sem_t sem; - pthread_create(&tid, 0, worker, 0); - sem_init(&sem, 0, 0); - sem_destroy(&sem);])], - [cs_pthread_flags]) - ;; - esac - _CS_CHECK_MUTEX_FEATURE([PTHREAD_MUTEX_RECURSIVE], - [cs_cv_sys_pthread_mutex_recursive], [for pthread recursive mutexes])]) - -# _CS_CHECK_MUTEX_FEATURE(FEATURE, CACHE-VAR, MESSAGE) -AC_DEFUN([_CS_CHECK_MUTEX_FEATURE], - [AS_IF([test $cs_cv_sys_pthread = yes], - [AC_CACHE_CHECK([$3], [$2], - [CS_BUILD_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, CS_MUTEX_FEATURE);])], - [CS_CREATE_TUPLE([-DCS_MUTEX_FEATURE=$1]) \ - CS_CREATE_TUPLE([-DCS_MUTEX_FEATURE=$1_NP])], - [], - [$2=`echo $cs_build_cflags | sed 's/.*\($1_*N*P*\).*/\1/'`], - [$2=no], - [$cs_cv_sys_pthread_cflags -D_GNU_SOURCE], - [$cs_cv_sys_pthread_lflags], - [$cs_cv_sys_pthread_libs])])], - [$2=no])]) - -#------------------------------------------------------------------------------ -# CS_CHECK_PTHREAD_ATFORK(CACHE-VAR) -# Checks whether the pthread library contains pthread_atfork(). Sets -# CACHE-VAR to "yes" or "no", according to the test result. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_PTHREAD_ATFORK], - [AS_IF([test $cs_cv_sys_pthread = yes], - [AC_CACHE_CHECK([for pthread_atfork support], [$1], - [CS_BUILD_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [pthread_atfork (0, 0, 0);])], - [], [], - [$1=yes], [$1=no], - [$cs_cv_sys_pthread_cflags -D_GNU_SOURCE], - [$cs_cv_sys_pthread_lflags], - [$cs_cv_sys_pthread_libs])])], - [$1=no])]) - -m4_define([cs_pthread_flags], - [CS_CREATE_TUPLE() \ - CS_CREATE_TUPLE([], [], [-lpthread]) \ - CS_CREATE_TUPLE([], [], [-lpthread -lrt]) \ - CS_CREATE_TUPLE([-pthread], [-pthread], []) \ - CS_CREATE_TUPLE([-pthread], [-pthread], [-lpthread]) \ - CS_CREATE_TUPLE([-pthread], [-pthread], [-lc_r])]) -# checktt2.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2004,2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_TEMPLATE_TOOLKIT2([EMITTER]) -# Check if Template Toolkit 2 (http://www.tt2.org/) is available. The -# shell variable cs_cv_perl_tt2 is set to "yes" if the package is -# discovered, else "no". Also sets the shell variable TTREE to the name -# path of the 'ttree' utility program and invokes AC_SUBST(). If EMITTER -# is provided and the package was discovered, then -# CS_EMIT_BUILD_PROPERTY() is invoked with EMITTER in order to record the -# value of the TTREE variable in an output file. As a convenience, if -# EMITTER is the literal value "emit" or "yes", then -# CS_EMIT_BUILD_RESULT()'s default emitter will be used. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_TEMPLATE_TOOLKIT2], - [CS_CHECK_PROGS([PERL], [perl5 perl]) - AS_IF([test -n "$PERL"], - [AC_CACHE_CHECK([for TemplateToolkit], [cs_cv_perl_tt2], - [AS_IF([AC_RUN_LOG( - [$PERL -M'Template 2.11' -MTemplate::Plugin -e 0 1>&2])], - [cs_cv_perl_tt2=yes], - [cs_cv_perl_tt2=no])]) - CS_PATH_PROGS([TTREE], [ttree]) - AS_IF([test $cs_cv_perl_tt2 = yes && test -n "$TTREE"], - [CS_EMIT_BUILD_PROPERTY([TTREE], [$TTREE], [], [], - CS_EMITTER_OPTIONAL([$1]))])])]) -# compiler.m4 -*- Autoconf -*- -#============================================================================= -# Copyright (C)2003 by Matze Braun -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================= - -#----------------------------------------------------------------------------- -# Detection of C and C++ compilers and setting flags -# -# CS_PROG_CC -# Detects the C compiler. Also takes care of the CFLAGS, CPPFLAGS and CC -# environment variables. This will filter out all -g and -O from the -# CFLAGS variable because Autoconf's -g and -O defaults are not always -# desired. This will also set the CMD.CC and COMPILER.CFLAGS variables -# in Jamconfig -# CS_PROG_CXX -# Detects the C++ compiler. Also takes care of the CXXFLAGS, CPPFLAGS -# and CXX environment variables. This will filter out all -g and -O from -# the CXXFLAGS variable because Autoconf's -g and -O defaults are not -# always desired. This will also set the CMD.C++ and COMPILER.C++FLAGS -# variables in Jamconfig -# CS_PROG_LINK -# Tries to determine a linker. This is done by checking if a C++ or -# Objecctive-C++ compiler is available in which case it is used for -# linking; otherwise the C or Objective-C compiler is used. This also -# sets the CMD.LINK and COMPILER.LFLAGS variables in Jamconfig and -# respects the LDFLAGS environment variable. Finally, checks if linker -# recognizes -shared and sets PLUGIN.LFLAGS; and checks if linker -# recognizes -soname and sets PLUGIN.LFLAGS.USE_SONAME to "yes". -#----------------------------------------------------------------------------- -AC_DEFUN([CS_PROG_CC],[ - CFLAGS="$CFLAGS" # Filter undesired flags - AS_IF([test -n "$CC"],[ - CS_EMIT_BUILD_PROPERTY([CMD.CC], [$CC]) - CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+]) - - # Check if compiler recognizes -pipe directive. - CS_EMIT_BUILD_FLAGS([if $CC accepts -pipe], [cs_cv_prog_cc_pipe], - [CS_CREATE_TUPLE([-pipe])], [C], [COMPILER.CFLAGS], [+]) - ]) -]) - -AC_DEFUN([CS_PROG_CXX],[ - CXXFLAGS="$CXXFLAGS" # Filter undesired flags - AS_IF([test -n "$CXX"],[ - CS_EMIT_BUILD_PROPERTY([CMD.C++], [$CXX]) - - CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [$CPPFLAGS $CXXFLAGS], [+]) - - # Check if compiler can be instructed to produce position-independent-code - # (PIC). This feature is required by some platforms when building plugin - # modules and shared libraries. - CS_COMPILER_PIC([C++], [cs_cv_prog_cxx_pic], - [CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS.PIC], - [$cs_cv_prog_cxx_pic])]) - ]) -]) - -AC_DEFUN([CS_PROG_LINK],[ - AC_REQUIRE([CS_PROG_CXX]) - AS_IF([test -n "$CXX"], - [CS_EMIT_BUILD_PROPERTY([CMD.LINK], [AS_ESCAPE([$(CMD.C++)])])], - [CS_EMIT_BUILD_PROPERTY([CMD.LINK], [AS_ESCAPE([$(CMD.CC)])])]) - - CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$LDFLAGS], [+]) - - # Check if compiler/linker recognizes -shared directive which is needed for - # linking plugin modules. Unfortunately, the Apple compiler (and possibly - # others) requires extra effort. Even though the compiler does not recognize - # the -shared option, it nevertheless returns a "success" result after emitting - # the warning "unrecognized option `-shared'". Worse, even -Werror fails to - # promote the warning to an error, so we must instead scan the compiler's - # output for an appropriate diagnostic. - CS_CHECK_BUILD_FLAGS([if -shared is accepted], [cs_cv_prog_link_shared], - [CS_CREATE_TUPLE([-shared $cs_cv_prog_cxx_pic])], [C++], - [CS_EMIT_BUILD_PROPERTY([PLUGIN.LFLAGS], [-shared], [+])], [], - [], [], [], [shared]) - - # Check if linker recognizes -soname which is used to assign a name internally - # to plugin modules. - CS_CHECK_BUILD([if -soname is accepted], [cs_cv_prog_link_soname], [], - [CS_CREATE_TUPLE([-Wl,-soname,foobar])], [C++], - [CS_EMIT_BUILD_PROPERTY([PLUGIN.LFLAGS.USE_SONAME], [yes])]) -]) -#------------------------------------------------------------------------------ -# Determine host platform. Recognized families: Unix, Windows, MacOS/X. -# Orginial Macros Copyright (C)2003 Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#------------------------------------------------------------------------------ - -#------------------------------------------------------------------------------ -# Determine host CPU. -# -# CS_CHECK_HOST_CPU -# Set the shell variable cs_host_cpu to a normalized form of the CPU name -# returned by config.guess/config.sub. Typically, Crystal Space's -# conception of CPU name is the same as that returned by -# config.guess/config.sub, but there may be exceptions as seen in the -# `case' statement. Also takes the normalized name, uppercases it to -# form a name suitable for the C preprocessor. Additionally sets the -# TARGET.PROCESSOR Jamconfig property. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_HOST_CPU], - [AC_REQUIRE([AC_CANONICAL_HOST]) - case $host_cpu in - [[Ii][3-9]86*|[Xx]86*]) cs_host_cpu=x86 ;; - *) cs_host_cpu=$host_cpu ;; - esac - cs_host_cpu_normalized="AS_TR_CPP([$cs_host_cpu])" - CS_JAMCONFIG_PROPERTY([TARGET.PROCESSOR], [$cs_host_cpu_normalized]) - ]) - - -#------------------------------------------------------------------------------ -# CS_CHECK_HOST -# Sets the shell variables cs_host_target cs_host_family, -# cs_host_os_normalized, and cs_host_os_normalized_uc. Emits appropriate -# CS_PLATFORM_UNIX, CS_PLATFORM_WIN32, CS_PLATFORM_MACOSX via -# AC_DEFINE(), and TARGET.OS and TARGET.OS.NORMALIZED to Jamconfig. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_HOST], - [AC_REQUIRE([AC_CANONICAL_HOST]) - CS_CHECK_HOST_CPU - cs_host_os_normalized='' - case $host_os in - mingw*|cygwin*) - cs_host_target=win32gcc - cs_host_family=windows - ;; - darwin*) - _CS_CHECK_HOST_DARWIN - ;; - *) - # Everything else is assumed to be Unix or Unix-like. - cs_host_target=unix - cs_host_family=unix - ;; - esac - - case $cs_host_family in - windows) - AC_DEFINE([CS_PLATFORM_WIN32], [], - [Define when compiling for Win32]) - AS_IF([test -z "$cs_host_os_normalized"], - [cs_host_os_normalized='Win32']) - ;; - unix) - AC_DEFINE([CS_PLATFORM_UNIX], [], - [Define when compiling for Unix and Unix-like (i.e. MacOS/X)]) - AS_IF([test -z "$cs_host_os_normalized"], - [cs_host_os_normalized='Unix']) - ;; - esac - - cs_host_os_normalized_uc="AS_TR_CPP([$cs_host_os_normalized])" - CS_JAMCONFIG_PROPERTY([TARGET.OS], [$cs_host_os_normalized_uc]) - CS_JAMCONFIG_PROPERTY([TARGET.OS.NORMALIZED], [$cs_host_os_normalized]) -]) - -AC_DEFUN([_CS_CHECK_HOST_DARWIN], - [AC_REQUIRE([CS_PROG_CC]) - AC_REQUIRE([CS_PROG_CXX]) - - # Both MacOS/X and Darwin are identified via $host_os as "darwin". We need - # a way to distinguish between the two. If Carbon.h is present, then - # assume MacOX/S; if not, assume Darwin. If --with-x=yes was invoked, and - # Carbon.h is present, then assume that user wants to cross-build for - # Darwin even though build host is MacOS/X. - # IMPLEMENTATION NOTE *1* - # The QuickTime 7.0 installer removes , which - # causes #include to fail unconditionally. Re-installing - # the QuickTime SDK should restore the header, however not all developers - # know to do this, so we work around the problem of the missing - # CarbonSound.h by #defining __CARBONSOUND__ in the test in order to - # prevent Carbon.h from attempting to #include the missing header. - # IMPLEMENTATION NOTE *2* - # At least one MacOS/X user switches between gcc 2.95 and gcc 3.3 with a - # script which toggles the values of CC, CXX, and CPP. Unfortunately, CPP - # was being set to run the preprocessor directly ("cpp", for instance) - # rather than running it via the compiler ("gcc -E", for instance). The - # problem with running the preprocessor directly is that __APPLE__ and - # __GNUC__ are not defined, which causes the Carbon.h check to fail. We - # avoid this problem by supplying a non-empty fourth argument to - # AC_CHECK_HEADER(), which causes it to test compile the header only (which - # is a more robust test), rather than also testing it via the preprocessor. - - AC_DEFINE([__CARBONSOUND__], [], - [Avoid problem caused by missing ]) - AC_CHECK_HEADER([Carbon/Carbon.h], - [cs_host_macosx=yes], [cs_host_macosx=no], [/* force compile */]) - - AS_IF([test $cs_host_macosx = yes], - [AC_MSG_CHECKING([for --with-x]) - AS_IF([test "${with_x+set}" = set && test "$with_x" = "yes"], - [AC_MSG_RESULT([yes (assume Darwin)]) - cs_host_macosx=no], - [AC_MSG_RESULT([no])])]) - - AS_IF([test $cs_host_macosx = yes], - [cs_host_target=macosx - cs_host_family=unix - cs_host_os_normalized='MacOS/X' - AC_DEFINE([CS_PLATFORM_MACOSX], [], - [Define when compiling for MacOS/X]) - - AC_CACHE_CHECK([for Objective-C compiler], [cs_cv_prog_objc], - [cs_cv_prog_objc="$CC"]) - CS_JAMCONFIG_PROPERTY([CMD.OBJC], [$cs_cv_prog_objc]) - AC_CACHE_CHECK([for Objective-C++ compiler], [cs_cv_prog_objcxx], - [cs_cv_prog_objcxx="$CXX"]) - CS_JAMCONFIG_PROPERTY([CMD.OBJC++], [$cs_cv_prog_objcxx])], - - [cs_host_target=unix - cs_host_family=unix])]) -# diagnose.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_MSG_ERROR(ERROR-DESCRIPTION, [EXIT-STATUS]) -# A convenience wrapper for AC_MSG_ERROR() which invokes AC_CACHE_SAVE() -# before aborting the script. Saving the cache should make subsequent -# re-invocations of the configure script faster once the user has -# corrected the problem(s) which caused the failure. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_MSG_ERROR], - [AC_CACHE_SAVE - AC_MSG_ERROR([$1], [$2])]) -# embed.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003,2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_META_INFO_EMBED([EMITTER], [GPL-OKAY]) -# Determine if plugin meta-information should be embedded or if it should -# exist in a stand-alone .csplugin file, and check if necessary tools and -# libraries are present. Sets the shell variable -# enable_meta_info_embedding to "yes" if the user requested embedding or -# if it was enabled by default; otherwise sets it to "no". -# -# If EMITTER is provided, then a subset of the following variables -# (depending upon platform and availability) are recorded by invoking -# CS_EMIT_BUILD_PROPERTY() with EMITTER. As a convenience, if EMITTER is -# the literal value "emit" or "yes", then CS_EMIT_BUILD_RESULT()'s -# default emitter will be used. -# -# EMBED_META := yes or no -# EMBED_META.CFLAGS := compiler flags -# EMBED_META.LFLAGS := linker flags -# CMD.WINDRES := windres.exe -# OBJCOPY.AVAILABLE := yes or no -# CMD.OBJCOPY := objcopy.exe -# LIBBFD.AVAILABLE := yes or no -# LIBBFD.CFLAGS := libbfd compiler flags -# LIBBFD.LFLAGS := libbfd linker flags -# ELF.AVAILABLE := yes or no -# -# In general, clients need only concern themselves with the various -# EMBED_META-related variables. For building plugin modules, utilize -# EMBED_META.CFLAGS when compiling, and EMBED_META.LFLAGS when linking. -# -# On Unix, when CS' own ELF metadata reader can't be used (because the -# necessary header file elf.h was not found) embedding is accomplished -# via libbfd, which carries a GPL license. Projects which carry licenses -# not compatible with GPL should consider carefully before enabling -# embedding on Unix. If your project is GPL-compatible, then set GPL-OKAY -# to "yes". This will indicate that it is safe to use libbfd if the ELF -# reader can not be used. If your project is not GPL-compatible, then -# set it to "no" in order to disable embedding on Unix if the ELF reader -# is not usable. (The user can still manually override the setting via -# the --enable-meta-info-embedding option.) -# -# IMPLEMENTATION NOTES -# -# Recent versions of Mingw supply libbfd and libiberty. Since Crystal -# Space uses native Win32 API for meta-information embedding on Windows, -# we do not require these libraries on Windows. More importantly, users -# do not want to see these GPL-licensed libraries appear in the link -# statement for plugin modules, thus we explicitly disable the libbfd -# test on Windows. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_META_INFO_EMBED], - [AC_REQUIRE([AC_CANONICAL_HOST]) - _CS_META_INFO_EMBED_ENABLE([$1], [$2]) - AS_IF([test $enable_meta_info_embedding = yes], - [_CS_META_INFO_EMBED_TOOLS([$1]) - AS_IF([test $cs_header_elf_h = yes], - [CS_EMIT_BUILD_PROPERTY([ELF.AVAILABLE], [yes], [], [], - CS_EMITTER_OPTIONAL([$1]))], - [case $host_os in - mingw*|cygwin*) ;; - *) - CS_CHECK_LIBBFD([$1], - [CS_EMIT_BUILD_PROPERTY([EMBED_META.CFLAGS], - [$cs_cv_libbfd_ok_cflags], [+], [], - CS_EMITTER_OPTIONAL([$1])) - CS_EMIT_BUILD_PROPERTY([EMBED_META.LFLAGS], - [$cs_cv_libbfd_ok_lflags $cs_cv_libbfd_ok_libs], - [+], [], CS_EMITTER_OPTIONAL([$1]))]) - ;; - esac])])]) - - -#------------------------------------------------------------------------------ -# _CS_META_INFO_EMBED_ENABLE([EMITTER], [GPL-OKAY]) -# Helper for CS_META_INFO_EMBED which adds an -# --enable-meta-info-embedding option to the configure script allowing -# the user to control embedding. Sets the shell variable -# enable_meta_info_embedding to yes or no. -# -# IMPLEMENTATION NOTES -# -# On Unix, embedding is enabled by default if elf.h is found and disabled -# by default unless overridden via GPL-OKAY because libbfd carries a GPL -# license which may be incompatible with a project's own license (such as -# LGPL). -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_META_INFO_EMBED_ENABLE], - [AC_REQUIRE([CS_CHECK_HOST]) - AC_CHECK_HEADERS([elf.h], [cs_header_elf_h=yes], [cs_header_elf_h=no]) - AC_MSG_CHECKING([whether to embed plugin meta-information]) - case $cs_host_target in - unix) AS_IF([test $cs_header_elf_h = yes], - [cs_embed_meta_info_default=yes], - [cs_embed_meta_info_default=m4_ifval([$2],[$2],[no])]) ;; - *) cs_embed_meta_info_default=yes ;; - esac - AC_ARG_ENABLE([meta-info-embedding], - [AC_HELP_STRING([--enable-meta-info-embedding], - [store plugin meta-information directly inside plugin modules if - supported by platform; if disabled, meta-information is stored in - stand-alone .csplugin files; this option is enabled by default for - non-Unix platforms and on Unix platforms with ELF-format object - files; it is disabled by default on Unix platforms if ELF is not - available and the project uses a non-GPL-compatible license (such - as LGPL) since the non-ELF Unix embedding technology requires the - GPL-licensed libbfd library; if ELF is not available, enable this - option on Unix only if you are certain you want a GPL-licensed - library infecting your project])], - [], [enable_meta_info_embedding=$cs_embed_meta_info_default]) - AC_MSG_RESULT([$enable_meta_info_embedding]) - CS_EMIT_BUILD_PROPERTY([EMBED_META], [$enable_meta_info_embedding], - [], [], CS_EMITTER_OPTIONAL([$1]))]) - - - -#------------------------------------------------------------------------------ -# _CS_META_INFO_EMBED_TOOLS([EMITTER]) -# Helper for CS_META_INFO_EMBED() which searches for tools required for -# plugin meta-info embedding. -#------------------------------------------------------------------------------ -AC_DEFUN([_CS_META_INFO_EMBED_TOOLS], - [CS_CHECK_TOOLS([WINDRES], [windres]) - CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES], [], [], - CS_EMITTER_OPTIONAL([$1])) - - CS_CHECK_TOOLS([OBJCOPY], [objcopy]) - AS_IF([test -n "$OBJCOPY"], - [CS_EMIT_BUILD_PROPERTY([OBJCOPY.AVAILABLE], [yes], [], [], - CS_EMITTER_OPTIONAL([$1])) - CS_EMIT_BUILD_PROPERTY([CMD.OBJCOPY], [$OBJCOPY], [], [], - CS_EMITTER_OPTIONAL([$1]))])]) - - - -#------------------------------------------------------------------------------ -# CS_CHECK_LIBBFD([EMITTER], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# Exhaustive check for a usable GPL-licensed libbfd, the Binary File -# Descriptor library, a component of binutils, which allows low-level -# manipulation of executable and object files. If EMITTER is provided, -# then the following variables are recorded by invoking -# CS_EMIT_BUILD_PROPERTY() with EMITTER. As a convenience, if EMITTER is -# the literal value "emit" or "yes", then CS_EMIT_BUILD_RESULT()'s -# default emitter will be used. -# -# LIBBFD.AVAILABLE := yes or no -# LIBBFD.CFLAGS := libbfd compiler flags -# LIBBFD.LFLAGS := libbfd linker flags -# -# The shell variable cs_cv_libbfd_ok is set to yes if a usable libbfd was -# discovered, else no. If found, the additional shell variables -# cs_cv_libbfd_ok_cflags, cs_cv_libbfd_ok_lflags, and -# cs_cv_libbfd_ok_libs are also set. -# -# WARNING -# -# libbfd carries a GPL license which is incompatible with the LGPL -# license of Crystal Space. Do not use this library with projects under -# less restrictive licenses, such as LGPL. -# -# IMPLEMENTATION NOTES -# -# It seems that some platforms have two version of libiberty installed: -# one from binutils and one from gcc. The binutils version resides in -# /usr/lib, whereas the gcc version resides in the gcc installation -# directory. The gcc version, by default, takes precedence at link time -# over the binutils version. Unfortunately, in broken cases, the gcc -# version of libiberty is missing htab_create_alloc() which is required -# by some libbfd functions. The extensive secondary check of libbfd -# catches this anomalous case of broken gcc libiberty. It turns out that -# it is possible to make the linker prefer the binutils version by -# specifying -L/usr/lib, thus the extensive test attempts to do so in an -# effort to resolve this unfortunate issue. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_LIBBFD], - [CS_CHECK_LIB_WITH([bfd], - [AC_LANG_PROGRAM([[#include ]], [bfd_init();])], - [], [], [], [], [], [], [-liberty]) - - AS_IF([test $cs_cv_libbfd = yes], - [CS_CHECK_BUILD([if libbfd is usable], [cs_cv_libbfd_ok], - [AC_LANG_PROGRAM([[#include ]], - [bfd* p; - asection* s; - bfd_init(); - p = bfd_openr(0,0); - bfd_check_format(p,bfd_object); - bfd_get_section_by_name(p,0); - bfd_section_size(p,s); - bfd_get_section_contents(p,s,0,0,0); - bfd_close(p);])], - [CS_CREATE_TUPLE() CS_CREATE_TUPLE([],[-L/usr/lib],[])], - [], [], [], [], - [$cs_cv_libbfd_cflags], - [$cs_cv_libbfd_lflags], - [$cs_cv_libbfd_libs])], - [cs_cv_libbfd_ok=no]) - - AS_IF([test $cs_cv_libbfd_ok = yes], - [CS_EMIT_BUILD_RESULT([cs_cv_libbfd_ok], [LIBBFD], - CS_EMITTER_OPTIONAL([$1])) - $2], - [$3])]) -# emit.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003-2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_EMIT_BUILD_PROPERTY(KEY, VALUE, [APPEND], [EMPTY-OKAY], [EMITTER], -# [UNCONDITIONAL]) -# A utility function which invokes an emitter to record the KEY/VALUE -# tuple if VALUE is not the empty string (after leading and trailing -# whitespace is stripped). If EMPTY-OKAY is not an empty string, then the -# property is emitted even if VALUE is empty; that is, it is emitted -# unconditionally. If APPEND is the empty string, then the emitter sets -# the key's value directly (though it may be overridden by the -# environment), otherwise the emitter appends VALUE to the existing value -# of the key. EMITTER is a macro name, such as CS_JAMCONFIG_PROPERTY or -# CS_MAKEFILE_PROPERTY, which performs the actual task of emitting the -# KEY/VALUE tuple; it should also accept APPEND as an optional third -# argument. If EMITTER is omitted, CS_JAMCONFIG_PROPERTY is used. Some -# emitters accept an optional fourth argument, UNCONDITIONAL, which -# instructs it to set KEY's value unconditionally, even if KEY already -# had been assigned a value via some other mechanism (such as imported -# from the environment, or from Jambase, in the case of -# CS_JAMCONFIG_PROPERTY). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_EMIT_BUILD_PROPERTY], - [cs_build_prop_val="$2" - cs_build_prop_val=CS_TRIM([$cs_build_prop_val]) - m4_ifval([$4], - [CS_JAMCONFIG_PROPERTY([$1], [$cs_build_prop_val], [$3])], - AS_IF([test -n "$cs_build_prop_val"], - [m4_default([$5],[CS_JAMCONFIG_PROPERTY])( - [$1], [$cs_build_prop_val], [$3], [$6])]))]) - - - -#------------------------------------------------------------------------------ -# CS_EMIT_BUILD_RESULT(CACHE-VAR, PREFIX, [EMITTER]) -# Record the results of CS_CHECK_BUILD() or CS_CHECK_LIB_WITH() via some -# emitter. If CACHE-VAR indicates that the build succeeded, then the -# following properties are emitted: -# -# PREFIX.AVAILABLE = yes -# PREFIX.CFLAGS = $CACHE-VAR_cflags -# PREFIX.LFLAGS = $CACHE-VAR_lflags $CACHE-VAR_libs -# -# EMITTER is a macro name, such as CS_JAMCONFIG_PROPERTY or -# CS_MAKEFILE_PROPERTY, which performs the actual task of emitting the -# KEY/VALUE tuple. If EMITTER is omitted, CS_JAMCONFIG_PROPERTY is used. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_EMIT_BUILD_RESULT], - [AS_IF([test "$$1" = yes], - [CS_EMIT_BUILD_PROPERTY([$2.AVAILABLE], [yes], [], [], [$3]) - CS_EMIT_BUILD_PROPERTY([$2.CFLAGS], [$$1_cflags], [], [], [$3]) - CS_EMIT_BUILD_PROPERTY([$2.LFLAGS], [$$1_lflags $$1_libs], - [], [], [$3])])]) - - - -#------------------------------------------------------------------------------ -# CS_EMIT_BUILD_FLAGS(MESSAGE, CACHE-VAR, FLAGS, [LANGUAGE], EMITTER-KEY, -# [APPEND], [ACTION-IF-RECOGNIZED], -# [ACTION-IF-NOT-RECOGNIZED], [EMITTER]) -# A convenience wrapper for CS_CHECK_BUILD_FLAGS() which also records the -# results via CS_EMIT_BUILD_PROPERTY(). Checks if the compiler or linker -# recognizes a command-line option. MESSAGE is the "checking" message. -# CACHE-VAR is the shell cache variable which receives the flag -# recognized by the compiler or linker, or "no" if the flag was not -# recognized. FLAGS is a whitespace- delimited list of build tuples -# created with CS_CREATE_TUPLE(). Each tuple from FLAGS is attempted in -# order until one is found which is recognized by the compiler. After -# that, no further flags are checked. LANGUAGE is typically either C or -# C++ and specifies which compiler to use for the test. If LANGUAGE is -# omitted, C is used. EMITTER-KEY is the name to pass as the emitter's -# "key" argument if a usable flag is encountered. If APPEND is not the -# empty string, then the discovered flag is appended to the existing -# value of the EMITTER-KEY. If the command-line option was recognized, -# then ACTION-IF-RECOGNIZED is invoked, otherwise -# ACTION-IF-NOT-RECOGNIZED is invoked. EMITTER is a macro name, such as -# CS_JAMCONFIG_PROPERTY or CS_MAKEFILE_PROPERTY, which performs the -# actual task of emitting the KEY/VALUE tuple; it should also accept -# APPEND as an optional third argument. If EMITTER is omitted, -# CS_JAMCONFIG_PROPERTY is used. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_EMIT_BUILD_FLAGS], - [CS_CHECK_BUILD_FLAGS([$1], [$2], [$3], [$4], - [CS_EMIT_BUILD_PROPERTY([$5], [$$2], [$6], [], [$9]) - $7], - [$8])]) - - - -#------------------------------------------------------------------------------ -# CS_EMITTER_OPTIONAL([EMITTER]) -# The CS_EMIT_FOO() macros optionally accept an emitter. If no emitter is -# supplied to those macros, then a default emitter is chosen. Other -# macros, however, which perform testing and optionally emit the results -# may wish to interpret an omitted EMITTER as a request not to emit the -# results. CS_EMITTER_OPTIONAL() is a convenience macro to help in these -# cases. It should be passed to one of the CS_EMIT_FOO() macros in place -# of the literal EMITTER argument. It functions by re-interpretating -# EMITTER as follows: -# -# - If EMITTER is omitted, then CS_NULL_EMITTER is returned, effectively -# disabling output by the CS_EMIT_FOO() macro. -# - If EMITTER is the literal string "emit" or "yes", then it returns an -# empty string, which signals to the CS_EMIT_FOO() macro that is should -# use its default emitter. -# - Any other value for EMITTER is passed along as-is to the -# CS_EMIT_FOO() macro. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_EMITTER_OPTIONAL], - [m4_case([$1], - [], [[CS_NULL_EMITTER]], - [emit], [], - [yes], [], - [[$1]])]) - - - -#------------------------------------------------------------------------------ -# CS_NULL_EMITTER(KEY, VALUE, [APPEND]) -# A do-nothing emitter suitable for use as the EMITTER argument of one of -# the CS_EMIT_FOO() macros. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_NULL_EMITTER], [: -]) - - - -#------------------------------------------------------------------------------ -# CS_SUBST_EMITTER(KEY, VALUE, [APPEND]) -# An emitter wrapped around AC_SUBST(). Invokes -# AC_SUBST(AS_TR_SH(KEY),VALUE). The APPEND argument is ignored. -# Suitable for use as the EMITTER argument of one of the CS_EMIT_FOO() -# macros. The call to AS_TR_SH() ensures that KEY is transformed into a -# valid shell variable. For instance, if a macro attempts to emit -# MYLIB.CFLAGS and MYLIB.LFLAGS via CS_SUBST_EMITTER(), then the names -# will be transformed to MYLIB_CFLAGS and MYLIB_LFLAGS, respectively, for -# the invocation of AC_SUBST(). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_SUBST_EMITTER], [AC_SUBST(AS_TR_SH([$1]),[$2])]) - - - -#------------------------------------------------------------------------------ -# CS_DEFINE_EMITTER(KEY, VALUE, [APPEND]) -# An emitter wrapped around AC_DEFINE_UNQUOTED(). Invokes -# AC_DEFINE_UNQUOTED(AS_TR_CPP(KEY),VALUE). The APPEND argument is -# ignored. Suitable for use as the EMITTER argument of one of the -# CS_EMIT_FOO() macros. The call to AS_TR_CPP() ensures that KEY is a -# well-formed token for the C-preprocessor. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_DEFINE_EMITTER], - [AC_DEFINE_UNQUOTED(AS_TR_CPP([$1]),[$2], - [Define when feature is available])]) -# headercache.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# Text cache facility for C-style #define properties. The cache is stored in -# the shell variable cs_header_text. -# -# CS_HEADER_APPEND(TEXT) -# Append text to the C header text cache. This is a cover for -# CS_TEXT_CACHE_APPEND(). -# -# CS_HEADER_PREPEND(TEXT) -# Prepend text to the C header text cache. This is a cover for -# CS_TEXT_CACHE_PREPEND(). -# -# CS_HEADER_PROPERTY(KEY, [VALUE]) -# Append a line of the form "#define KEY VALUE" to the C header text -# cache. If the VALUE argument is omitted, then the appended line has -# the simplified form "#define KEY". -# -# CS_HEADER_OUTPUT(FILENAME) -# Instruct config.status to write the C header text cache to the given -# filename. This is a cover for CS_TEXT_CACHE_OUTPUT(). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_HEADER_APPEND], [CS_TEXT_CACHE_APPEND([cs_header_text], [$1])]) -AC_DEFUN([CS_HEADER_PREPEND], [CS_TEXT_CACHE_PREPEND([cs_header_text], [$1])]) -AC_DEFUN([CS_HEADER_PROPERTY], -[CS_HEADER_APPEND([@%:@define $1[]m4_ifval([$2], [ $2], []) -])]) -AC_DEFUN([CS_HEADER_OUTPUT], [CS_TEXT_CACHE_OUTPUT([cs_header_text], [$1])]) -#----------------------------------------------------------------------------- -# installdirs.m4 (c) Matze Braun -# Macro for emitting the installation paths gathered by Autoconf. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#----------------------------------------------------------------------------- - -#----------------------------------------------------------------------------- -# CS_OUTPUT_INSTALLDIRS([EMITTER], [RAW-BACKSLASHES]) -# Emit installation directories collected by Autoconf. EMITTER is a macro -# name, such as CS_JAMCONFIG_PROPERTY or CS_MAKEFILE_PROPERTY, which performs -# the actual task of emitting the KEY/VALUE tuple. If EMITTER is omitted, -# CS_JAMCONFIG_PROPERTY is used. If RAW-BACKSLASHES is not provided, then -# backslashes in emitted values are each escaped with an additional -# backslash. If RAW-BACKSLASHES is not the null value, then backslashes are -# emitted raw. The following properties are emitted: -# -# prefix -# exec_prefix -# bindir -# sbindir -# libexecdir -# datadir -# sysconfdir -# sharedstatedir -# localstatedir -# libdir -# includedir -# oldincludedir -# infodir -# mandir -#----------------------------------------------------------------------------- -AC_DEFUN([CS_OUTPUT_INSTALLDIRS],[ -# Handle the case when no prefix is given, and the special case when a path -# contains more than 2 slashes, these paths seem to be correct but Jam fails -# on them. -AS_IF([test $prefix = NONE], - [cs_install_prefix="$ac_default_prefix"], - [cs_install_prefix=`echo "$prefix" | sed -e 's:///*:/:g'`]) -AS_IF([test $exec_prefix = NONE], - [cs_install_exec_prefix="AS_ESCAPE([$(prefix)])"], - [cs_install_exec_prefix=`echo "$exec_prefix" | sed -e 's:///*:/:g'`]) - -_CS_OUTPUT_INSTALL_DIRS([$1], [prefix], - [CS_PREPARE_INSTALLPATH([$cs_install_prefix], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [exec_prefix], - [CS_PREPARE_INSTALLPATH([$cs_install_exec_prefix], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [bindir], - [CS_PREPARE_INSTALLPATH([$bindir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [sbindir], - [CS_PREPARE_INSTALLPATH([$sbindir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [libexecdir], - [CS_PREPARE_INSTALLPATH([$libexecdir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [datadir], - [CS_PREPARE_INSTALLPATH([$datadir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [sysconfdir], - [CS_PREPARE_INSTALLPATH([$sysconfdir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [sharedstatedir], - [CS_PREPARE_INSTALLPATH([$sharedstatedir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [localstatedir], - [CS_PREPARE_INSTALLPATH([$localstatedir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [libdir], - [CS_PREPARE_INSTALLPATH([$libdir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [includedir], - [CS_PREPARE_INSTALLPATH([$includedir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [oldincludedir], - [CS_PREPARE_INSTALLPATH([$oldincludedir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [infodir], - [CS_PREPARE_INSTALLPATH([$infodir], [$2])]) -_CS_OUTPUT_INSTALL_DIRS([$1], [mandir], - [CS_PREPARE_INSTALLPATH([$mandir], [$2])]) -]) - -AC_DEFUN([_CS_OUTPUT_INSTALL_DIRS], - [m4_default([$1], [CS_JAMCONFIG_PROPERTY])([$2], [$3])]) - - -#----------------------------------------------------------------------------- -# CS_PREPARE_INSTALLPATH(VALUE, [RAW-BACKSLASHES]) -# Transform variable references of the form ${bla} to $(bla) in VALUE and -# correctly quotes backslashes. This is needed if you need to emit some of -# the paths from Autoconf. RAW-BACKSLASHES has the same meaning as in -# CS_OUTPUT_INSTALLDIRS. -#----------------------------------------------------------------------------- -AC_DEFUN([CS_PREPARE_INSTALLPATH], -[`echo "$1" | sed 's/\${\([[a-zA-Z_][a-zA-Z_]]*\)}/$(\1)/g;m4_ifval([$2], - [s/\\/\\\\/g], [s/\\\\/\\\\\\\\/g])'`]) -# jamcache.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# Text cache facility for Jam-style properties. The cache is stored in -# the shell variable cs_jamfile_text. -# -# CS_JAMCONFIG_APPEND(TEXT) -# Append text to the Jam text cache. This is a cover for -# CS_TEXT_CACHE_APPEND(). -# -# CS_JAMCONFIG_PREPEND(TEXT) -# Prepend text to the Jam text cache. This is a cover for -# CS_TEXT_CACHE_PREPEND(). -# -# CS_JAMCONFIG_PROPERTY(KEY, VALUE, [APPEND], [UNCONDITIONAL]) -# Append a line of the form "KEY ?= VALUE" to the Jam text cache. If the -# APPEND argument is not the empty string, then VALUE is appended to the -# existing value of KEY using the form "KEY += VALUE". If the -# UNCONDITIONAL argument is not empty, then the value of KEY is set -# unconditionally "KEY = VALUE", rather than via "KEY ?= VALUE". APPEND -# takes precedence over UNCONDITIONAL. Note that if VALUE references -# other Jam variables, for example $(OBJS), then be sure to protect the -# value with AS_ESCAPE(). For example: -# CS_JAMCONFIG_PROPERTY([ALLOBJS], [AS_ESCAPE([$(OBJS) $(LIBOBJS)])]) -# -# CS_JAMCONFIG_OUTPUT(FILENAME) -# Instruct config.status to write the Jam text cache to the given -# filename. This is a cover for CS_TEXT_CACHE_OUTPUT(). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_JAMCONFIG_APPEND], - [CS_TEXT_CACHE_APPEND([cs_jamconfig_text], [$1])]) -AC_DEFUN([CS_JAMCONFIG_PREPEND], - [CS_TEXT_CACHE_PREPEND([cs_jamconfig_text], [$1])]) -AC_DEFUN([CS_JAMCONFIG_PROPERTY], - [CS_JAMCONFIG_APPEND( - [$1 m4_ifval([$3], [+=], m4_ifval([$4], [=], [?=])) \"$2\" ; -])]) -AC_DEFUN([CS_JAMCONFIG_OUTPUT], - [CS_TEXT_CACHE_OUTPUT([cs_jamconfig_text], [$1])]) -# makecache.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# Text cache facility for makefile-style properties. The cache is stored in -# the shell variable cs_makefile_text. -# -# CS_MAKEFILE_APPEND(TEXT) -# Append text to the makefile text cache. This is a cover for -# CS_TEXT_CACHE_APPEND(). -# -# CS_MAKEFILE_PREPEND(TEXT) -# Prepend text to the makefile text cache. This is a cover for -# CS_TEXT_CACHE_PREPEND(). -# -# CS_MAKEFILE_PROPERTY(KEY, VALUE, [APPEND]) -# Append a line of the form "KEY = VALUE" to the makefile text cache. If -# the APPEND argument is not the empty string, then VALUE is appended to -# the existing value of KEY using the form "KEY += VALUE". Note that if -# VALUE references other makefile variables, for example $(OBJS), then be -# sure to protect the value with AS_ESCAPE(). For example: -# CS_MAKEFILE_PROPERTY([ALLOBJS], [AS_ESCAPE([$(OBJS) $(LIBOBJS)])]) -# -# CS_MAKEFILE_OUTPUT(FILENAME) -# Instruct config.status to write the makefile text cache to the given -# filename. This is a cover for CS_TEXT_CACHE_OUTPUT(). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_MAKEFILE_APPEND], - [CS_TEXT_CACHE_APPEND([cs_makefile_text], [$1])]) -AC_DEFUN([CS_MAKEFILE_PREPEND], - [CS_TEXT_CACHE_PREPEND([cs_makefile_text], [$1])]) -AC_DEFUN([CS_MAKEFILE_PROPERTY], - [CS_MAKEFILE_APPEND([$1 m4_ifval([$3], [+=], [=]) $2 -])]) -AC_DEFUN([CS_MAKEFILE_OUTPUT],[CS_TEXT_CACHE_OUTPUT([cs_makefile_text], [$1])]) -# mkdir.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_CHECK_MKDIR -# Determine how to create a directory and a directory tree. Sets the -# shell variable MKDIR to the command which creates a directory, and -# MKDIRS to the command which creates a directory tree. Invokes -# AC_SUBST() for MKDIR and MKDIRS. -# -# IMPLEMENTATION NOTES -# We need to know the exact commands, so that we can emit them, thus the -# AS_MKDIR_P function is not what we want to use here since it does not -# provide access to the commands (and might not even discover suitable -# commands). First try "mkdir -p", then try the older "mkdirs". -# Finally, if the mkdir command failed to recognize -p, then it might -# have created a directory named "-p", so clean up that bogus directory. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_CHECK_MKDIR], - [AC_CACHE_CHECK([how to create a directory], [cs_cv_shell_mkdir], - [cs_cv_shell_mkdir='mkdir']) - AC_SUBST([MKDIR], [$cs_cv_shell_mkdir]) - - AC_CACHE_CHECK([how to create a directory tree], [cs_cv_shell_mkdir_p], - [if $cs_cv_shell_mkdir -p . 2>/dev/null; then - cs_cv_shell_mkdir_p='mkdir -p' - elif mkdirs . 2>/dev/null; then - cs_cv_shell_mkdir_p='mkdirs' - fi - test -d ./-p && rmdir ./-p]) - AS_VAR_SET_IF([cs_cv_shell_mkdir_p], - [AC_SUBST([MKDIRS], [$cs_cv_shell_mkdir_p])], - [CS_MSG_ERROR([do not know how to create a directory tree])])]) - - - -#------------------------------------------------------------------------------ -# Replacement for AS_MKDIR_P() from m4sugar/m4sh.m4 which fixes two problems -# which are present in Autoconf 2.57 and probably all earlier 2.5x versions. -# This bug, along with a patch, was submitted to the Autoconf GNATS database by -# Eric Sunshine as #227 on 17-Dec-2002. The bogus "-p" directory bug was fixed -# for Autoconf 2.58 on 26-Sep-2003. The "mkdirs" optimization was not accepted -# (since it is unnecessary; it's only an optimization). -# -# 1) Removes bogus "-p" directory which the stock AS_MKDIR_P() leaves laying -# around in the working directory if the mkdir command does not recognize -# the -p option. -# 2) Takes advantage of the older "mkdirs" program if it exists and if "mkdir -# -p" does not work. -#------------------------------------------------------------------------------ -m4_defun([_AS_MKDIR_P_PREPARE], -[if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p' -elif mkdirs . 2>/dev/null; then - as_mkdir_p='mkdirs' -else - as_mkdir_p='' -fi -test -d ./-p && rmdir ./-p -])# _AS_MKDIR_P_PREPARE - -m4_define([AS_MKDIR_P], -[AS_REQUIRE([_$0_PREPARE])dnl -{ if test -n "$as_mkdir_p"; then - $as_mkdir_p $1 - else - as_dir=$1 - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`AS_DIRNAME("$as_dir")` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || AS_ERROR([cannot create directory $1]); } -])# AS_MKDIR_P -#============================================================================== -# packageinfo.m4 -# Macros for setting general info on the package, such as name and version -# numbers and propagate them to the generated make and Jam property files. -# -# Copyright (C)2003 by Matthias Braun -# Copyright (C)2003,2004 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== - -#------------------------------------------------------------------------------ -# CS_PACKAGEINFO([LONGNAME], [COPYRIGHT, [HOMEPAGE]) -# Set additional information for the package. Note that the version -# number of your application should only contain numbers, because on -# Windows you can only set numerical values in some of the file -# properties (such as versioninfo .rc files). -#------------------------------------------------------------------------------ -AC_DEFUN([CS_PACKAGEINFO], - [PACKAGE_LONGNAME="[$1]" - PACKAGE_COPYRIGHT="[$2]" - PACKAGE_HOMEPAGE="[$3]" -]) - - -#------------------------------------------------------------------------------ -# CS_EMIT_PACKAGEINFO([EMITTER]) -# Emit extended package information using the provided EMITTER. EMITTER -# is a macro name, such as CS_JAMCONFIG_PROPERTY or CS_MAKEFILE_PROPERTY, -# which performs the actual task of emitting the KEY/VALUE tuple. If -# EMITTER is omitted, CS_JAMCONFIG_PROPERTY is used. For backward -# compatibility, if EMITTER is the literal value "jam", then -# CS_JAMCONFIG_PROPERTY is used; if it is "make", then -# CS_MAKEFILE_PROPERTY is used; however use of these literal names is -# highly discouraged. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_EMIT_PACKAGEINFO], - [_CS_EMIT_PACKAGEINFO([$1], [PACKAGE_NAME], [$PACKAGE_NAME]) - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_VERSION], [$PACKAGE_VERSION]) - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_STRING], [$PACKAGE_STRING]) - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_BUGREPORT], [$PACKAGE_BUGREPORT]) - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_LONGNAME], [$PACKAGE_LONGNAME]) - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_HOMEPAGE], [$PACKAGE_HOMEPAGE]) - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_COPYRIGHT], [$PACKAGE_COPYRIGHT]) - for cs_veritem in m4_translit(AC_PACKAGE_VERSION, [.], [ ]); do - _CS_EMIT_PACKAGEINFO([$1], [PACKAGE_VERSION_LIST], [$cs_veritem], [+]) - done - ]) - -AC_DEFUN([_CS_EMIT_PACKAGEINFO], - [m4_case([$1], - [make], [CS_MAKEFILE_PROPERTY([$2], [$3], [$4])], - [jam], [CS_JAMCONFIG_PROPERTY([$2], [$3], [$4])], - [], [CS_JAMCONFIG_PROPERTY([$2], [$3], [$4])], - [$1([$2], [$3], [$4])])]) -# path.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2004 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_PATH_NORMALIZE(STRING) -# Normalize a pathname at run-time by transliterating Windows/DOS -# backslashes to forward slashes. Also collapses whitespace. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_PATH_NORMALIZE], -[`echo "x$1" | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`]) - - -#------------------------------------------------------------------------------ -# CS_RUN_PATH_NORMALIZE(COMMAND) -# Normalize the pathname emitted by COMMAND by transliterating -# Windows/DOS backslashes to forward slashes. Also collapses whitespace. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_RUN_PATH_NORMALIZE], -[`AC_RUN_LOG([$1]) | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`]) -############################################################################### -# progver.m4 -# Written by Norman Kramer -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -############################################################################### -# -# From the input pattern we create regular expressions we send through sed -# to extract the version information from the standard input to sed. -# Then we extract from the resulting version string subparts. -# The same happens with the supplied version string. It too is split into its -# subparts according to the pattern. -# Then the subparts from the gathered version string and the supplied one are -# compared. -# -# How does the pattern look like ? -# It is a sequence of 9s and _s and separators. -# 9 denotes a non empty sequence of digits. -# _ denotes a non empty sequence of characters from the class [a-zA-Z]. -# | everything behind is optional -# Everything else is treated as a separator. -# Consecutive 9s and _s are compressed to contain only one of each type. -# For instance "99_.9.__abc9_" will become "9_.9._abc9_". -# -# How we find the parts we compare ? -# From this transformed string we yield the parts we will later compare. -# We break up the string as follows: -# Any sequence of separators represent one breakup. Additional breakups are -# placed behind every 9 and _ . -# So the example from above will give: -# -# "99_.9.__abc9_" ===compress==> "9_.9._abc9_" ===breakup==> "9" "_" "9" "_" "9" "_" -# -# How we create the regular expressions ? -# We take the compressed pattern and quote every separator. -# The we replace the 9s with [0-9][0-9]* -# and the _s with [a-zA-Z][a-zA-Z]* . -# The above example will become: -# -# "99_.9.__abc9_" ===compress==> "9_.9._abc9_" ===rexify==> -# [0-9][0-9]*[a-zA-Z][a-zA-Z]*\.[0-9][0-9]*\.[a-zA-Z][a-zA-Z]*\a\b\c[0-9][0-9]*[a-zA-Z][a-zA-Z]* -# -# Voila. -# -# To yield the subparts from the string we additionally enclose the -# 9s and _s with \( and \). -# -############################################################################### - -# **************************************************************** -# ** helper definitions ** -# **************************************************************** -m4_define([CS_VCHK_RUNTH], [m4_pushdef([i], [$1])m4_if($1,0,,[CS_VCHK_RUNTH(m4_decr($1), [$2])][$2])m4_popdef([i])]) -m4_define([CS_VCHK_PREFIX], []) -m4_define([CS_VCHK_SUFFIX], []) -m4_define([CS_VCHK_GROUPPREFIX], [\(]) -m4_define([CS_VCHK_GROUPSUFFIX], [\)]) -m4_define([CS_VCHK_CHAR], [[[[a-zA-Z]]]]) -m4_define([CS_VCHK_DIGIT], [[[0-9]]]) -m4_define([CS_VCHK_SEQUENCE], [CS_VCHK_PREFIX[]CS_VCHK_SINGLE[]CS_VCHK_SINGLE[]*CS_VCHK_SUFFIX[]]) -m4_define([CS_VCHK_OPTSEQUENCE], [CS_VCHK_PREFIX[]CS_VCHK_SINGLE[]*CS_VCHK_SUFFIX[]]) -m4_define([CS_VCHK_REXSEQ], [m4_bpatsubst($1, [$2], [[]CS_VCHK_SEQUENCE[]])]) -m4_define([CS_VCHK_GROUPINGON], [m4_pushdef([CS_VCHK_PREFIX], [CS_VCHK_GROUPPREFIX])m4_pushdef([CS_VCHK_SUFFIX], [CS_VCHK_GROUPSUFFIX])]) -m4_define([CS_VCHK_GROUPINGOFF], [m4_popdef([CS_VCHK_SUFFIX])m4_popdef([CS_VCHK_PREFIX])]) -m4_define([CS_VCHK_OPTON], [m4_pushdef([CS_VCHK_SEQUENCE], [CS_VCHK_OPTSEQUENCE])]) -m4_define([CS_VCHK_OPTOFF], [m4_popdef([CS_VCHK_SEQUENCE])]) -m4_define([CS_VCHK_RMOPT], [CS_VCHK_RMCHAR([$1], m4_index([$1], [|]))]) -m4_define([CS_VCHK_RMCHAR], [m4_if($2,-1,[$1],m4_substr([$1], 0, $2)[]m4_substr([$1], m4_incr($2)))]) -m4_define([CS_VCHK_RMALL], [m4_translit([$1], [|], [])]) -m4_define([CS_VCHK_CUTOFF], [m4_if(m4_index($1,[|]),-1, [$1], [m4_substr($1, 0, m4_index($1,[|]))])]) -m4_define([CS_VCHK_CYCLEOPT], [ -m4_if($2,-1,, [m4_pushdef([i], CS_VCHK_CUTOFF([$1])) m4_pushdef([j], CS_VCHK_DUMMY_TAIL([$1])) CS_VCHK_CYCLEOPT( CS_VCHK_RMOPT([$1]), m4_index($1, [|]), [$3])$3 m4_popdef([i]) m4_popdef([j])]) -]) -m4_define([CS_VCHK_TAIL], [m4_if(m4_index($1,[|]),-1, [], [m4_substr($1, m4_incr(m4_index($1,[|])))])]) -m4_define([CS_VCHK_DUMMY_COMPRESS], [m4_bpatsubst(m4_bpatsubst([$1], [__*], [A]), [99*], [0])]) -m4_define([CS_VCHK_DUMMY_TAIL], [CS_VCHK_DUMMY_COMPRESS(m4_translit(CS_VCHK_TAIL([$1]), [|], []))]) - -# **************************************************************** -# ** FlagsOn / FlagsOff ** -# **************************************************************** -m4_define([CS_VCHK_FLAGSON], -[m4_if($#, 0, [], - $1, [], [], - [$1], [group], [CS_VCHK_GROUPINGON[]], - [$1], [opt], [CS_VCHK_OPTON[]])dnl -m4_if($#, 0, [], $1, [], [], [CS_VCHK_FLAGSON(m4_shift($@))])]) - -m4_define([CS_VCHK_FLAGSOFF], -[m4_if($#, 0, [], - $1, [], [], - $1, [group], [CS_VCHK_GROUPINGOFF[]], - [$1], [opt], [CS_VCHK_OPTOFF[]])dnl -m4_if($#, 0, [], $1, [], [], [CS_VCHK_FLAGSOFF(m4_shift($@))])]) - -# **************************************************************** -# ** rexify / sedify ** -# **************************************************************** -m4_define([CS_VCHK_REXIFY], -[m4_pushdef([CS_VCHK_SINGLE], [$1])dnl -CS_VCHK_FLAGSON(m4_shift(m4_shift(m4_shift($@))))dnl -CS_VCHK_REXSEQ([$3], [$2])dnl -CS_VCHK_FLAGSOFF(m4_shift(m4_shift(m4_shift($@))))dnl -m4_popdef([CS_VCHK_SINGLE])]) - -m4_define([CS_VCHK_QUOTESEP], [m4_bpatsubst($1, [[^9_]], [\\\&])]) - -m4_define([CS_VCHK_REXCHAR], [CS_VCHK_REXIFY([CS_VCHK_CHAR], [__*], $@)]) -m4_define([CS_VCHK_REXDIGIT], [CS_VCHK_REXIFY([CS_VCHK_DIGIT], [99*], $@)]) -m4_define([CS_VCHK_SEDIFY], [CS_VCHK_REXDIGIT([CS_VCHK_REXCHAR([CS_VCHK_QUOTESEP([$1])], m4_shift($@))], m4_shift($@))]) -m4_define([CS_VCHK_SEDEXPRALL], [/CS_VCHK_SEDIFY([$1])/!d;s/.*\(CS_VCHK_SEDIFY([$1])\).*/\1/;q]) -m4_define([CS_VCHK_SEDEXPRNTH], [/CS_VCHK_SEDIFY([$1])/!d;s/.*CS_VCHK_SEDIFY([$1],[group]).*/\$2/]) - -# **************************************************************** -# ** Pattern splitting ** -# **************************************************************** -m4_define([CS_VCHK_SPLITSEP], [CS_VCHK_REXIFY([s], [[^9_][^9_]*], $@)]) -m4_define([CS_VCHK_SPLITDIGIT], [CS_VCHK_REXIFY([d], [99*], $@)]) -m4_define([CS_VCHK_SPLITCHAR], [CS_VCHK_REXIFY([c], [__*], $@)]) - -# **************************************************************** -# ** return a list of 's' 'd' 'c' 'e' chars denoting the kind ** -# ** pattern parts: separator, digit, char, end ** -# **************************************************************** -m4_define([CS_VCHK_PATTERNLIST], [m4_pushdef([CS_VCHK_SEQUENCE], [CS_VCHK_SINGLE ])dnl -m4_translit(CS_VCHK_SPLITDIGIT([CS_VCHK_SPLITCHAR([CS_VCHK_SPLITSEP([$1])])]), [ ], m4_if([$2],[],[ ],[$2]))e[]dnl -m4_popdef([CS_VCHK_SEQUENCE])]) - -# **************************************************************** -# ** Build the shell commands we emit to the configure script. ** -# **************************************************************** -m4_define([CS_VCHK_PATCOUNT], [m4_len(m4_bpatsubst(CS_VCHK_PATTERNLIST([$1]), [[^dc]]))]) - -# **************************************************************************************** -# ** CS_VCHK_EXTRACTVERSION(EXTRACT_CALL, MIN_VERSION, PATTERN, PRGPREFIX, COMPARISION) ** -# **************************************************************************************** -m4_define([CS_VCHK_EXTRACTVERSION], -[cs_prog_$4_is_version= -cs_prog_$4_min_version= -cs_prog_$4_is_suffix= -cs_prog_$4_min_suffix= -cs_prog_$4_is_suffix_done= -cs_prog_$4_min_suffix_done= -CS_VCHK_CYCLEOPT([$3], [], -[test -z $cs_prog_$4_is_version && cs_prog_$4_is_version=`$1 | sed 'CS_VCHK_SEDEXPRALL([i])'` -test -n "$cs_prog_$4_is_version" && test -z $cs_prog_$4_is_suffix_done && { cs_prog_$4_is_suffix_done=yes ; cs_prog_$4_is_suffix=j ; } -]) -CS_VCHK_CYCLEOPT([$3], , -[test -z $cs_prog_$4_min_version && cs_prog_$4_min_version=`echo $2 | sed 'CS_VCHK_SEDEXPRALL([i])'` -test -n "$cs_prog_$4_min_version" && test -z $cs_prog_$4_min_suffix_done && { cs_prog_$4_min_suffix_done=yes ; cs_prog_$4_min_suffix=j ; } -]) -CS_VCHK_RUNTH([CS_VCHK_PATCOUNT([$3])], - [cs_prog_$4_is_ver_[]i=`echo ${cs_prog_$4_is_version}${cs_prog_$4_is_suffix} | sed 'CS_VCHK_SEDEXPRNTH([CS_VCHK_RMALL([$3])], [i])'` -]) -CS_VCHK_RUNTH([CS_VCHK_PATCOUNT([$3])], - [cs_prog_$4_min_ver_[]i=`echo $cs_prog_$4_min_version${cs_prog_$4_min_suffix} | sed 'CS_VCHK_SEDEXPRNTH([CS_VCHK_RMALL([$3])], [i])'` -]) -cs_cv_prog_$4_version_ok='' -CS_VCHK_RUNTH([CS_VCHK_PATCOUNT([$3])], -[test -z "$cs_cv_prog_$4_version_ok" && { expr "$cs_prog_$4_is_ver_[]i" "$5" "$cs_prog_$4_min_ver_[]i" >/dev/null || cs_cv_prog_$4_version_ok=no ; } -test -z "$cs_cv_prog_$4_version_ok" && { expr "$cs_prog_$4_min_ver_[]i" "$5" "$cs_prog_$4_is_ver_[]i" >/dev/null || cs_cv_prog_$4_version_ok=yes ; } -]) -AS_IF([test -z "$cs_cv_prog_$4_version_ok"], [cs_cv_prog_$4_version_ok=yes]) -cs_cv_prog_$4_version_ok_annotated="$cs_cv_prog_$4_version_ok" -AS_IF([test -n "$cs_prog_$4_is_version"], - [cs_cv_prog_$4_version_ok_annotated="$cs_cv_prog_$4_version_ok_annotated (version $cs_prog_$4_is_version)"]) -]) - -############################################################################## -# CS_CHECK_PROG_VERSION(PROG, EXTRACT_CALL, VERSION, PATTERN, -# [ACTION-IF-OKAY], [ACTION-IF-NOT-OKAY], [CMP]) -# Check the version of a program PROG. -# Version information is emitted by EXTRACT_CALL (for instance "bison -V"). -# The discovered program version is compared against VERSION. -# The pattern of the version string matches PATTERN -# The extracted version and the supplied version are compared with the CMP -# operator. i.e. EXTRACTED_VERSION CMP SUPPLIED_VERSION -# CMP defaults to >= if not specified. -# ACTION-IF-OKAY is invoked if comparision yields true, otherwise -# ACTION-IF-NOT-OKAY is invoked. -# -# PATTERN literals: 9 .. marks a non empty sequence of digits -# _ .. marks a non empty sequence of characters from [a-zA-Z] -# | .. everything behind is optional -# .. everything else is taken as separator - it is better -# to not try stuff like space, slash or comma. -# -# The test results in cs_cv_prog_PROG_version_ok being either yes or no. -############################################################################## -AC_DEFUN([CS_CHECK_PROG_VERSION], -[AC_CACHE_CHECK([if $1 version m4_default([$7],[>=]) $3], - [AS_TR_SH([cs_cv_prog_$1_version_ok_annotated])], - [CS_VCHK_EXTRACTVERSION([$2], [$3], [$4], AS_TR_SH([$1]), - m4_default([$7],[>=]))]) -AS_IF([test "$AS_TR_SH([cs_cv_prog_$1_version_ok])" = yes], [$5], [$6])]) -# qualify.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_SYMBOL_QUALIFIER(MESSAGE, CACHE-VAR, QUALIFIERS, [SYMBOL], [LANG], -# [ACTION-IF-ACCEPTED], [ACTION-IF-NOT-ACCEPTED]) -# Test if a symbol can be qualified by one of the elements of the -# comma-separated list of QUALIFIERS. Examples of qualifiers include -# __attribute__((deprecated)), __declspec(dllimport), etc. MESSAGE is the -# "checking" message. CACHE-VAR is the variable which receives the -# qualifier which succeeded, or the the literal "no" if none were -# accepted. SYMBOL is the symbol to which the qualifier should be -# applied. If omitted, then SYMBOL defaults to "void f();". LANG is the -# language of the test, typically "C" or "C++". It defaults to "C" if -# omitted. ACTION-IF-ACCEPTED is invoked after CACHE-VAR is set if one of -# the qualifiers is accepted, else ACTION-IF-NOT-ACCEPTED is invoked. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_SYMBOL_QUALIFIER], - [AC_CACHE_CHECK([$1], [$2], - [$2='no' - m4_foreach([cs_symbol_qualifier], [$3], - [AS_IF([test "$$2" = no], - [CS_BUILD_IFELSE( - [AC_LANG_PROGRAM( - [cs_symbol_qualifier m4_default([$4],[void f()]);], - [])], - [], [$5], [$2='cs_symbol_qualifier'], [$2='no'])])])]) - AS_IF([test $$2 != no], [$6], [$7])]) -# split.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_SPLIT(LINE, [OUTPUT-VARIABLES], [DELIMITER], [FILLER]) -# Split LINE into individual tokens. Tokens are delimited by DELIMITER, -# which is the space character if omitted. OUTPUT-VARIABLES is a -# comma-delimited list of shell variables which should receive the -# extracted tokens. If there are too few tokens to fill the output -# variables, then the excess variables will be assigned the empty string. -# If there are too few output variables, then the excess tokens will be -# ignored. If OUTPUT-VARIABLES is omitted, then the split tokens will be -# assigned to the shell meta-variables $1, $2, $3, etc. When -# OUTPUT-VARIABLES is omitted, FILLER is assigned to meta-variables in -# cases where DELIMITER delimits a zero-length token. FILLER defaults -# to "filler". For example, if DELIMITER is "+" and OUTPUT-VARIABLES is -# omitted, given the line "one++three", $1 will be "one", $2 will be -# "filler", and $3 will be "three". -#------------------------------------------------------------------------------ -AC_DEFUN([CS_SPLIT], - [m4_define([cs_split_filler], m4_default([$4],[filler])) - set cs_split_filler `echo "$1" | awk 'BEGIN { FS="m4_default([$3],[ ])" } - { for (i=1; i <= NF; ++i) - { if ($i == "") print "cs_split_filler"; else print $i } }'` - shift - m4_map([_CS_SPLIT], [$2])]) - -AC_DEFUN([_CS_SPLIT], - [AS_IF([test $[@%:@] -eq 0], [$1=''], - [AS_IF([test "$[1]" = cs_split_filler], [$1=''], [$1=$[1]]) - shift])]) -# textcache.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# Text cache facility. These macros provide a way to incrementally store -# arbitrary text in a shell variable, and to write the saved text to a file. -# -# CS_TEXT_CACHE_APPEND(VARIABLE, TEXT) -# Append text to the contents of the named shell variable. If the text -# contains references to shell variables (such as $foo), then those -# references will be expanded. If expansion is not desired, then protect -# the text with AS_ESCAPE(). -# -# CS_TEXT_CACHE_PREPEND(VARIABLE, TEXT) -# Prepend text to the contents of the named shell variable. If the text -# contains references to shell variables (such as $foo), then those -# references will be expanded. If expansion is not desired, then protect -# the text with AS_ESCAPE(). -# -# CS_TEXT_CACHE_OUTPUT(VARIABLE, FILENAME) -# Instruct config.status to write the contents of the named shell -# variable to the given filename. If the file resides in a directory, -# the directory will be created, if necessary. If the output file -# already exists, and if the cached text is identical to the contents of -# the existing file, then the existing file is left alone, thus its time -# stamp remains unmolested. This heuristic may help to minimize rebuilds -# when the file is listed as a dependency in a makefile. -# -# *NOTE* -# There is a bug in Autoconf 2.57 and probably all earlier 2.5x versions -# which results in errors if AC_CONFIG_COMMANDS is invoked for a `tag' -# which represents a file in a directory which does not yet exist. -# Unfortunately, even invoking AS_MKDIR_P in the `cmd' portion of -# AC_CONFIG_COMMANDS does not solve the problem because the generated -# configure script attempts to access information about the directory -# before AS_MKDIR_P has a chance to create it. This forces us to invoke -# AS_MKDIR_P in the third argument to AC_CONFIG_COMMANDS (the -# `init-cmds') rather than the second (the `cmds'). This is undesirable -# because it means that the directory will be created anytime -# config.status is invoked (even for a simple --help), rather than being -# created only when requested to output the text cache. This bug was -# submitted to the Autoconf GNATS database by Eric Sunshine as #228 on -# 27-Dec-2002. It was fixed for Autoconf 2.58 on 26-Sep-2003. The -# official fix makes the assumption that `tag' always represents a file -# (as opposed to some generic target), and creates the file's directory -# is not present. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_TEXT_CACHE_APPEND], [$1="${$1}$2"]) -AC_DEFUN([CS_TEXT_CACHE_PREPEND], [$1="$2${$1}"]) -AC_DEFUN([CS_TEXT_CACHE_OUTPUT], - [AC_CONFIG_COMMANDS([$2], - [echo $ECHO_N "$$1$ECHO_C" > $tmp/tcache - AS_IF([diff $2 $tmp/tcache >/dev/null 2>&1], - [AC_MSG_NOTICE([$2 is unchanged])], - [rm -f $2 - cp $tmp/tcache $2]) - rm -f $tmp/tcache], - [$1='$$1' - cs_dir=`AS_DIRNAME([$2])` - AS_ESCAPE(AS_MKDIR_P([$cs_dir]), [$`\])])]) -# trim.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2003 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_TRIM(STRING) -# Strip leading and trailing spaces from STRING and collapse internal -# runs of multiple spaces to a single space. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_TRIM], [`echo x$1 | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`]) -# warnings.m4 -*- Autoconf -*- -#============================================================================== -# Copyright (C)2005 by Eric Sunshine -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This library 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 Library General Public -# License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with this library; if not, write to the Free Software Foundation, -# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -#============================================================================== -AC_PREREQ([2.56]) - -#------------------------------------------------------------------------------ -# CS_COMPILER_WARNINGS([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check how to enable compilation warnings. If LANGUAGE is not provided, -# then `C' is assumed (other options include `C++'). If CACHE-VAR is not -# provided, then it defaults to the name -# "cs_cv_prog_compiler_enable_warnings". If an option for enabling -# warnings (such as `-Wall') is discovered, then it is assigned to -# CACHE-VAR and ACTION-IF-FOUND is invoked; otherwise the empty string is -# assigned to CACHE-VAR and ACTION-IF-NOT-FOUND is invoked. -# -# IMPLEMENTATION NOTES -# -# On some platforms, it is more appropriate to use -Wmost rather than -# -Wall even if the compiler understands both, thus we attempt -Wmost -# before -Wall. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_WARNINGS], - [CS_CHECK_BUILD_FLAGS( - [how to enable m4_default([$1],[C]) compilation warnings], - [m4_default([$2],[cs_cv_prog_compiler_enable_warnings])], - [CS_CREATE_TUPLE([-Wmost]) CS_CREATE_TUPLE([-Wall])], - [$1], [$3], [$4])]) - - - -#------------------------------------------------------------------------------ -# CS_COMPILER_ERRORS([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check how to promote compilation diganostics from warning to error -# status. If LANGUAGE is not provided, then `C' is assumed (other options -# include `C++'). If CACHE-VAR is not provided, then it defaults to the -# name "cs_cv_prog_compiler_enable_errors". If an option for performing -# this promotion (such as `-Werror') is discovered, then it is assigned -# to CACHE-VAR and ACTION-IF-FOUND is invoked; otherwise the empty string -# is assigned to CACHE-VAR and ACTION-IF-NOT-FOUND is invoked. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_ERRORS], - [CS_CHECK_BUILD_FLAGS( - [how to treat m4_default([$1],[C]) warnings as errors], - [m4_default([$2],[cs_cv_prog_compiler_enable_errors])], - [CS_CREATE_TUPLE([-Werror])], [$1], [$3], [$4])]) - - - -#------------------------------------------------------------------------------ -# CS_COMPILER_IGNORE_UNUSED([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check how to instruct compiler to ignore unused variables and -# arguments. This option may be useful for code generated by tools, such -# as Swig, Bison, and Flex, over which the client has no control, yet -# wishes to compile without excessive diagnostic spew. If LANGUAGE is -# not provided, then `C' is assumed (other options include `C++'). If -# CACHE-VAR is not provided, then it defaults to the name -# "cs_cv_prog_compiler_ignore_unused". If an option (such as -# `-Wno-unused') is discovered, then it is assigned to CACHE-VAR and -# ACTION-IF-FOUND is invoked; otherwise the empty string is assigned to -# CACHE-VAR and ACTION-IF-NOT-FOUND is invoked. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_IGNORE_UNUSED], - [CS_CHECK_BUILD_FLAGS( - [how to suppress m4_default([$1],[C]) unused variable warnings], - [m4_default([$2],[cs_cv_prog_compiler_ignore_unused])], - [CS_CREATE_TUPLE([-Wno-unused])], [$1], [$3], [$4])]) - - - -#------------------------------------------------------------------------------ -# CS_COMPILER_IGNORE_UNINITIALIZED([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check how to instruct compiler to ignore uninitialized variables. This -# option may be useful for code generated by tools, such as Swig, Bison, -# and Flex, over which the client has no control, yet wishes to compile -# without excessive diagnostic spew. If LANGUAGE is not provided, then -# `C' is assumed (other options include `C++'). If CACHE-VAR is not -# provided, then it defaults to the name -# "cs_cv_prog_compiler_ignore_uninitialized". If an option (such as -# `-Wno-uninitialized') is discovered, then it is assigned to CACHE-VAR -# and ACTION-IF-FOUND is invoked; otherwise the empty string is assigned -# to CACHE-VAR and ACTION-IF-NOT-FOUND is invoked. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_IGNORE_UNINITIALIZED], - [CS_CHECK_BUILD_FLAGS( - [how to suppress m4_default([$1],[C]) uninitialized warnings], - [m4_default([$2], - [cs_cv_prog_compiler_ignore_uninitialized_variables])], - [CS_CREATE_TUPLE([-Wno-uninitialized])], [$1], [$3], [$4])]) - - - -#------------------------------------------------------------------------------ -# CS_COMPILER_IGNORE_PRAGMAS([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check how to instruct compiler to ignore unrecognized #pragma -# directives. This option may be useful for code which contains -# unprotected #pragmas which are not understood by all compilers. If -# LANGUAGE is not provided, then `C' is assumed (other options include -# `C++'). If CACHE-VAR is not provided, then it defaults to the name -# "cs_cv_prog_compiler_ignore_unknown_pragmas". If an option (such as -# `-Wno-unknown-pragmas') is discovered, then it is assigned to CACHE-VAR -# and ACTION-IF-FOUND is invoked; otherwise the empty string is assigned -# to CACHE-VAR and ACTION-IF-NOT-FOUND is invoked. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_IGNORE_PRAGMAS], - [CS_CHECK_BUILD_FLAGS( - [how to suppress m4_default([$1],[C]) unknown [#pragma] warnings], - [m4_default([$2],[cs_cv_prog_compiler_ignore_unknown_pragmas])], - [CS_CREATE_TUPLE([-Wno-unknown-pragmas])], [$1], [$3], [$4])]) - - - -#------------------------------------------------------------------------------ -# CS_COMPILER_IGNORE_LONG_DOUBLE([LANGUAGE], [CACHE-VAR], [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# Check how to instruct compiler to suppress warnings about `long double' -# usage. This option may be useful for code generated by tools, such as -# Swig, Bison, and Flex, over which the client has no control, yet wishes -# to compile without excessive diagnostic spew. If LANGUAGE is not -# provided, then `C' is assumed (other options include `C++'). If -# CACHE-VAR is not provided, then it defaults to the name -# "cs_cv_prog_compiler_ignore_long_double". If an option (such as -# `-Wno-long-double') is discovered, then it is assigned to CACHE-VAR and -# ACTION-IF-FOUND is invoked; otherwise the empty string is assigned to -# CACHE-VAR and ACTION-IF-NOT-FOUND is invoked. -#------------------------------------------------------------------------------ -AC_DEFUN([CS_COMPILER_IGNORE_LONG_DOUBLE], - [CS_CHECK_BUILD_FLAGS( - [how to suppress m4_default([$1],[C]) `long double' warnings], - [m4_default([$2],[cs_cv_prog_compiler_ignore_long_double])], - [CS_CREATE_TUPLE([-Wno-long-double])], [$1], [$3], [$4])]) diff --git a/Engine/lib/bullet/appveyor.yml b/Engine/lib/bullet/appveyor.yml new file mode 100644 index 000000000..42a1c32fe --- /dev/null +++ b/Engine/lib/bullet/appveyor.yml @@ -0,0 +1,19 @@ +build: + project: build3/vs2010/0_Bullet3Solution.sln + +build_script: + - mkdir cm + - cd cm + - cmake .. -G"Visual Studio 14 2015 Win64" + - cmake --build . --target ALL_BUILD --config Release -- /maxcpucount:4 /verbosity:quiet + +test_script: + - ctest --parallel 4 --build-config Release --output-on-failure + +before_build: + - echo %CD% + - ps: cd build3 + - echo %CD% + - premake4 vs2010 + - ps: cd .. + diff --git a/Engine/lib/bullet/autogen.sh b/Engine/lib/bullet/autogen.sh deleted file mode 100644 index 35623facf..000000000 --- a/Engine/lib/bullet/autogen.sh +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh - -if [ "$USER" = "root" ]; then - echo "*** You cannot do this as "$USER" please use a normal user account." - exit 1 -fi -if test ! -f configure.ac ; then - echo "*** Please invoke this script from directory containing configure.ac." - exit 1 -fi - -echo "running aclocal" -aclocal -rc=$? - -if test $rc -eq 0; then - echo "running libtool" - libtoolize --force --automake --copy - rc=$? -else - echo "An error occured, autogen.sh stopping." - exit $rc -fi - -if test $rc -eq 0; then - echo "libtool worked." -else - echo "libtool not found. trying glibtool." - glibtoolize --force --automake --copy - rc=$? -fi - -if test $rc -eq 0; then - echo "running automake" - automake --add-missing --copy - rc=$? -else - echo "An error occured, autogen.sh stopping." - exit $rc -fi - -if test $rc -eq 0; then - echo "running autoheader" - autoheader - rc=$? -else - echo "An error occured, autogen.sh stopping." - exit $rc -fi - -if test $rc -eq 0; then - echo "running autoconf" - autoconf - rc=$? -else - echo "An error occured, autogen.sh stopping." - exit $rc -fi - -echo "autogen.sh complete" -exit $rc diff --git a/Engine/lib/bullet/bullet.pc.cmake b/Engine/lib/bullet/bullet.pc.cmake new file mode 100644 index 000000000..8b989faba --- /dev/null +++ b/Engine/lib/bullet/bullet.pc.cmake @@ -0,0 +1,6 @@ +Name: bullet +Description: Bullet Continuous Collision Detection and Physics Library +Requires: +Version: @BULLET_VERSION@ +Libs: -L@CMAKE_INSTALL_PREFIX@/@LIB_DESTINATION@ -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath +Cflags: @BULLET_DOUBLE_DEF@ -I@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -I@CMAKE_INSTALL_PREFIX@/include diff --git a/Engine/lib/bullet/bullet.pc.in b/Engine/lib/bullet/bullet.pc.in deleted file mode 100644 index ffcd4f367..000000000 --- a/Engine/lib/bullet/bullet.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: bullet -Description: Bullet Continuous Collision Detection and Physics Library -Requires: -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -Cflags: -I${includedir}/bullet diff --git a/Engine/lib/bullet/config.h.in b/Engine/lib/bullet/config.h.in deleted file mode 100644 index 11b564d03..000000000 --- a/Engine/lib/bullet/config.h.in +++ /dev/null @@ -1,113 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* Architecture is PowerPC */ -#undef ARCH_PPC - -/* Architecture is x86 */ -#undef ARCH_X86 - -/* Architecture is x86-64 */ -#undef ARCH_X86_64 - -/* Use the Apple OpenGL framework. */ -#undef HAVE_APPLE_OPENGL_FRAMEWORK - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLEXT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLUT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLU_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Platform is Apple */ -#undef PLATFORM_APPLE - -/* Platform is Linux */ -#undef PLATFORM_LINUX - -/* Platform is Win32 */ -#undef PLATFORM_WIN32 - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif diff --git a/Engine/lib/bullet/configure.ac b/Engine/lib/bullet/configure.ac deleted file mode 100644 index 3e9780b80..000000000 --- a/Engine/lib/bullet/configure.ac +++ /dev/null @@ -1,172 +0,0 @@ -#---------------------------------------------------------------------------- -# Autoconf input script. Invoke the ./autogen.sh script to generate a -# configure script from this file. -#---------------------------------------------------------------------------- -AC_PREREQ([2.54]) - -#---------------------------------------------------------------------------- -# Initialize Autoconf. -#---------------------------------------------------------------------------- -AC_INIT( - [bullet], - [2.82], - [erwin.coumans@gmail.com]) -AC_CANONICAL_HOST -AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE -AM_PROG_CC_C_O -AC_PROG_CXX -AC_PROG_LIBTOOL - -case "$host" in - *-*-mingw*|*-*-cygwin*) - AC_DEFINE(PLATFORM_WIN32, 1, [Platform is Win32]) - opengl_LIBS="-lunsupported_platform" - PLATFORM_STRING="Win32" - ;; - *-*-linux*) - AC_DEFINE(PLATFORM_LINUX, 1, [Platform is Linux]) - opengl_LIBS="-lGL -lGLU -lglut" - PLATFORM_STRING="Linux" - ;; - *-*-darwin*) - AC_MSG_WARN([Hello]) - AC_DEFINE(PLATFORM_APPLE, 1, [Platform is Apple]) - opengl_LIBS="-framework AGL -framework OpenGL -framework GLUT" - PLATFORM_STRING="Apple" - ;; - *) - AC_MSG_WARN([*** Please add $host to configure.ac checks!]) - ;; -esac -AC_SUBST(opengl_LIBS) - -case "$host" in - i?86-* | k?-* | athlon-* | pentium*-) - AC_DEFINE(ARCH_X86, 1, [Architecture is x86]) - ARCH_SPECIFIC_CFLAGS="" - ARCH_STRING="X86" - ;; - x86_64-*) - AC_DEFINE(ARCH_X86_64, 1, [Architecture is x86-64]) - ARCH_SPECIFIC_CFLAGS="-DUSE_ADDR64" - ARCH_STRING="X86-64" - ;; - ppc-* | powerpc-*) - AC_MSG_WARN([HI THERE!]) - AC_DEFINE(ARCH_PPC, 1, [Architecture is PowerPC]) - ARCH_SPECIFIC_CFLAGS="" - ARCH_STRING="PowerPC" - ;; - *) - AC_MSG_ERROR([Unknown Architecture]) - ;; -esac -AC_C_BIGENDIAN - - -#---------------------------------------------------------------------------- -# Setup for the configuration header. -#---------------------------------------------------------------------------- -AC_CONFIG_HEADERS([config.h]) -#---------------------------------------------------------------------------- -# Package configuration switches. -#---------------------------------------------------------------------------- -AC_ARG_ENABLE([multithreaded], - [AC_HELP_STRING([--enable-multithreaded], - [build BulletMultiThreaded (default NO)])], - [disable_multithreaded=no], [disable_multithreaded=yes]) -AC_MSG_CHECKING([BulletMultiThreaded]) -AS_IF([test "$disable_multithreaded" = yes], [build_multithreaded=no], [build_multithreaded=yes]) -AC_MSG_RESULT([$build_multithreaded]) -AM_CONDITIONAL([CONDITIONAL_BUILD_MULTITHREADED], [test "$build_multithreaded" = yes]) - -AC_ARG_ENABLE([demos], - [AS_HELP_STRING([--disable-demos], - [disable Bullet demos])], - [], - [enable_demos=yes]) -AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false]) - -dnl Check for OpenGL and GLUT - - -case "$host" in - *-*-darwin*) - AC_DEFINE([HAVE_APPLE_OPENGL_FRAMEWORK], [1], - [Use the Apple OpenGL framework.]) - GL_LIBS="-framework GLUT -framework OpenGL -framework Carbon -framework AGL" - have_glut=yes - have_glu=yes - have_gl=yes - ;; - *) - have_gl_headers=yes - AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glext.h GL/glut.h, , - [have_gl_headers=no], - [[#ifdef WIN32 - #include - #endif - #if HAVE_GL_GL_H - #include - #endif - #if HAVE_GL_GLU_H - #include - #endif - ]]) - have_gl=no - have_glu=no - have_glut=no - TEMP_LDFLAGS="$LDFLAGS" - AC_CHECK_LIB(GL, main, [GL_LIBS="-lGL"; have_gl=yes]) - AC_CHECK_LIB(GLU, main, [GL_LIBS="-lGLU $GL_LIBS"; have_glu=yes], , -lGL) - AC_CHECK_LIB(GLUT, main, [GL_LIBS="-lGLUT -LGLU $GL_LIBS"; have_glut=yes], ,-lGLUT) - AC_CHECK_LIB(opengl32, main, [GL_LIBS="-lopengl32"; have_gl=yes]) - AC_CHECK_LIB(glu32, main, [GL_LIBS="-lglu32 $GL_LIBS"; have_glu=yes], , -lopengl32) - LDFLAGS="$TEMP_LDFLAGS" - if test $have_gl = no -o $have_glu = no -o $have_gl_headers = no; then - if test x$enable_demos = xyes; then - AC_MSG_WARN([Demos and Extras will not be built because OpenGL and GLUT doesn't seem to work. See `config.log' for details.]) - fi - enable_demos=no - else - AC_MSG_NOTICE([Found OpenGL]) - fi - ;; -esac - - - -AC_SUBST(GL_LIBS) - - -if test "x$enable_demos" != xno; then - AC_MSG_NOTICE([Building Bullet demos]) - AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS],[true]) -fi - - - -AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug], - [build with debugging information (default NO)])], - [], [enable_debug=no]) - -AC_MSG_CHECKING([build mode]) -AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize]) -AC_MSG_RESULT([$build_mode]) - - - -CFLAGS="$ARCH_SPECIFIC_CFLAGS $CFLAGS" -CXXFLAGS="$ARCH_SPECIFIC_CFLAGS $CXXFLAGS $CFLAGS" -#---------------------------------------------------------------------------- -# Emit generated files. -#---------------------------------------------------------------------------- -AC_CONFIG_FILES([bullet.pc Makefile Demos/Makefile Demos/SoftDemo/Makefile Demos/AllBulletDemos/Makefile Demos/MultiThreadedDemo/Makefile Demos/OpenGL/Makefile Demos/ForkLiftDemo/Makefile Demos/FeatherstoneMultiBodyDemo/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile Demos/TerrainDemo/Makefile src/Makefile Extras/Makefile]) -AC_OUTPUT - -AC_MSG_NOTICE([ - -Please type 'make' to build Bullet -]) diff --git a/Engine/lib/bullet/install-sh b/Engine/lib/bullet/install-sh deleted file mode 100644 index b777f1244..000000000 --- a/Engine/lib/bullet/install-sh +++ /dev/null @@ -1,322 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2004-07-05.00 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit 0;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit 0;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/Engine/lib/bullet/src/Bullet-C-Api.h b/Engine/lib/bullet/src/Bullet-C-Api.h deleted file mode 100644 index f27a17d51..000000000 --- a/Engine/lib/bullet/src/Bullet-C-Api.h +++ /dev/null @@ -1,176 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -/* - Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's. - Work in progress, functionality will be added on demand. - - If possible, use the richer Bullet C++ API, by including "btBulletDynamicsCommon.h" -*/ - -#ifndef BULLET_C_API_H -#define BULLET_C_API_H - -#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name - -#ifdef BT_USE_DOUBLE_PRECISION -typedef double plReal; -#else -typedef float plReal; -#endif - -typedef plReal plVector3[3]; -typedef plReal plQuaternion[4]; - -#ifdef __cplusplus -extern "C" { -#endif - -/** Particular physics SDK (C-API) */ - PL_DECLARE_HANDLE(plPhysicsSdkHandle); - -/** Dynamics world, belonging to some physics SDK (C-API)*/ - PL_DECLARE_HANDLE(plDynamicsWorldHandle); - -/** Rigid Body that can be part of a Dynamics World (C-API)*/ - PL_DECLARE_HANDLE(plRigidBodyHandle); - -/** Collision Shape/Geometry, property of a Rigid Body (C-API)*/ - PL_DECLARE_HANDLE(plCollisionShapeHandle); - -/** Constraint for Rigid Bodies (C-API)*/ - PL_DECLARE_HANDLE(plConstraintHandle); - -/** Triangle Mesh interface (C-API)*/ - PL_DECLARE_HANDLE(plMeshInterfaceHandle); - -/** Broadphase Scene/Proxy Handles (C-API)*/ - PL_DECLARE_HANDLE(plCollisionBroadphaseHandle); - PL_DECLARE_HANDLE(plBroadphaseProxyHandle); - PL_DECLARE_HANDLE(plCollisionWorldHandle); - -/** - Create and Delete a Physics SDK -*/ - - extern plPhysicsSdkHandle plNewBulletSdk(void); //this could be also another sdk, like ODE, PhysX etc. - extern void plDeletePhysicsSdk(plPhysicsSdkHandle physicsSdk); - -/** Collision World, not strictly necessary, you can also just create a Dynamics World with Rigid Bodies which internally manages the Collision World with Collision Objects */ - - typedef void(*btBroadphaseCallback)(void* clientData, void* object1,void* object2); - - extern plCollisionBroadphaseHandle plCreateSapBroadphase(btBroadphaseCallback beginCallback,btBroadphaseCallback endCallback); - - extern void plDestroyBroadphase(plCollisionBroadphaseHandle bp); - - extern plBroadphaseProxyHandle plCreateProxy(plCollisionBroadphaseHandle bp, void* clientData, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ); - - extern void plDestroyProxy(plCollisionBroadphaseHandle bp, plBroadphaseProxyHandle proxyHandle); - - extern void plSetBoundingBox(plBroadphaseProxyHandle proxyHandle, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ); - -/* todo: add pair cache support with queries like add/remove/find pair */ - - extern plCollisionWorldHandle plCreateCollisionWorld(plPhysicsSdkHandle physicsSdk); - -/* todo: add/remove objects */ - - -/* Dynamics World */ - - extern plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdk); - - extern void plDeleteDynamicsWorld(plDynamicsWorldHandle world); - - extern void plStepSimulation(plDynamicsWorldHandle, plReal timeStep); - - extern void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object); - - extern void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object); - - -/* Rigid Body */ - - extern plRigidBodyHandle plCreateRigidBody( void* user_data, float mass, plCollisionShapeHandle cshape ); - - extern void plDeleteRigidBody(plRigidBodyHandle body); - - -/* Collision Shape definition */ - - extern plCollisionShapeHandle plNewSphereShape(plReal radius); - extern plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z); - extern plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height); - extern plCollisionShapeHandle plNewConeShape(plReal radius, plReal height); - extern plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height); - extern plCollisionShapeHandle plNewCompoundShape(void); - extern void plAddChildShape(plCollisionShapeHandle compoundShape,plCollisionShapeHandle childShape, plVector3 childPos,plQuaternion childOrn); - - extern void plDeleteShape(plCollisionShapeHandle shape); - - /* Convex Meshes */ - extern plCollisionShapeHandle plNewConvexHullShape(void); - extern void plAddVertex(plCollisionShapeHandle convexHull, plReal x,plReal y,plReal z); -/* Concave static triangle meshes */ - extern plMeshInterfaceHandle plNewMeshInterface(void); - extern void plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2); - extern plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle); - - extern void plSetScaling(plCollisionShapeHandle shape, plVector3 scaling); - -/* SOLID has Response Callback/Table/Management */ -/* PhysX has Triggers, User Callbacks and filtering */ -/* ODE has the typedef void dNearCallback (void *data, dGeomID o1, dGeomID o2); */ - -/* typedef void plUpdatedPositionCallback(void* userData, plRigidBodyHandle rbHandle, plVector3 pos); */ -/* typedef void plUpdatedOrientationCallback(void* userData, plRigidBodyHandle rbHandle, plQuaternion orientation); */ - - /* get world transform */ - extern void plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix); - extern void plGetPosition(plRigidBodyHandle object,plVector3 position); - extern void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation); - - /* set world transform (position/orientation) */ - extern void plSetPosition(plRigidBodyHandle object, const plVector3 position); - extern void plSetOrientation(plRigidBodyHandle object, const plQuaternion orientation); - extern void plSetEuler(plReal yaw,plReal pitch,plReal roll, plQuaternion orient); - extern void plSetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix); - - typedef struct plRayCastResult { - plRigidBodyHandle m_body; - plCollisionShapeHandle m_shape; - plVector3 m_positionWorld; - plVector3 m_normalWorld; - } plRayCastResult; - - extern int plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plRayCastResult res); - - /* Sweep API */ - - /* extern plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal); */ - - /* Continuous Collision Detection API */ - - // needed for source/blender/blenkernel/intern/collision.c - double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]); - -#ifdef __cplusplus -} -#endif - - -#endif //BULLET_C_API_H - diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.cpp b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.cpp index 95443af50..2ca20cdd8 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.cpp +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.cpp @@ -38,8 +38,9 @@ static DBVT_INLINE btDbvtVolume merge( const btDbvtVolume& a, const btDbvtVolume& b) { #if (DBVT_MERGE_IMPL==DBVT_IMPL_SSE) - ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtAabbMm)]); - btDbvtVolume& res=*(btDbvtVolume*)locals; + ATTRIBUTE_ALIGNED16( char locals[sizeof(btDbvtAabbMm)]); + btDbvtVolume* ptr = (btDbvtVolume*) locals; + btDbvtVolume& res=*ptr; #else btDbvtVolume res; #endif @@ -250,7 +251,8 @@ static btDbvtVolume bounds( const tNodeArray& leaves) { #if DBVT_MERGE_IMPL==DBVT_IMPL_SSE ATTRIBUTE_ALIGNED16(char locals[sizeof(btDbvtVolume)]); - btDbvtVolume& volume=*(btDbvtVolume*)locals; + btDbvtVolume* ptr = (btDbvtVolume*) locals; + btDbvtVolume& volume=*ptr; volume=leaves[0]->volume; #else btDbvtVolume volume=leaves[0]->volume; diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h index b64936844..1ca175723 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h @@ -122,6 +122,7 @@ subject to the following restrictions: #error "DBVT_INT0_IMPL undefined" #endif + // // Defaults volumes // @@ -188,6 +189,9 @@ struct btDbvtNode }; }; +typedef btAlignedObjectArray btNodeStack; + + ///The btDbvt class implements a fast dynamic bounding volume tree based on axis aligned bounding boxes (aabb tree). ///This btDbvt is used for soft body collision detection and for the btDbvtBroadphase. It has a fast insert, remove and update of nodes. ///Unlike the btQuantizedBvh, nodes can be dynamically moved around, which allows for change in topology of the underlying data structure. @@ -263,7 +267,6 @@ struct btDbvt btAlignedObjectArray m_stkStack; - mutable btAlignedObjectArray m_rayTestStack; // Methods @@ -325,6 +328,16 @@ struct btDbvt void collideTV( const btDbvtNode* root, const btDbvtVolume& volume, DBVT_IPOLICY) const; + + DBVT_PREFIX + void collideTVNoStackAlloc( const btDbvtNode* root, + const btDbvtVolume& volume, + btNodeStack& stack, + DBVT_IPOLICY) const; + + + + ///rayTest is a re-entrant ray test, and can be called in parallel as long as the btAlignedAlloc is thread-safe (uses locking etc) ///rayTest is slower than rayTestInternal, because it builds a local stack, using memory allocations, and it recomputes signs/rayDirectionInverses each time DBVT_PREFIX @@ -343,6 +356,7 @@ struct btDbvt btScalar lambda_max, const btVector3& aabbMin, const btVector3& aabbMax, + btAlignedObjectArray& stack, DBVT_IPOLICY) const; DBVT_PREFIX @@ -917,39 +931,72 @@ inline void btDbvt::collideTT( const btDbvtNode* root0, } #endif -// DBVT_PREFIX inline void btDbvt::collideTV( const btDbvtNode* root, const btDbvtVolume& vol, DBVT_IPOLICY) const { DBVT_CHECKTYPE - if(root) - { - ATTRIBUTE_ALIGNED16(btDbvtVolume) volume(vol); - btAlignedObjectArray stack; - stack.resize(0); - stack.reserve(SIMPLE_STACKSIZE); - stack.push_back(root); - do { - const btDbvtNode* n=stack[stack.size()-1]; - stack.pop_back(); - if(Intersect(n->volume,volume)) + if(root) + { + ATTRIBUTE_ALIGNED16(btDbvtVolume) volume(vol); + btAlignedObjectArray stack; + stack.resize(0); + stack.reserve(SIMPLE_STACKSIZE); + stack.push_back(root); + do { + const btDbvtNode* n=stack[stack.size()-1]; + stack.pop_back(); + if(Intersect(n->volume,volume)) + { + if(n->isinternal()) { - if(n->isinternal()) - { - stack.push_back(n->childs[0]); - stack.push_back(n->childs[1]); - } - else - { - policy.Process(n); - } + stack.push_back(n->childs[0]); + stack.push_back(n->childs[1]); } - } while(stack.size()>0); - } + else + { + policy.Process(n); + } + } + } while(stack.size()>0); + } } +// +DBVT_PREFIX +inline void btDbvt::collideTVNoStackAlloc( const btDbvtNode* root, + const btDbvtVolume& vol, + btNodeStack& stack, + DBVT_IPOLICY) const +{ + DBVT_CHECKTYPE + if(root) + { + ATTRIBUTE_ALIGNED16(btDbvtVolume) volume(vol); + stack.resize(0); + stack.reserve(SIMPLE_STACKSIZE); + stack.push_back(root); + do { + const btDbvtNode* n=stack[stack.size()-1]; + stack.pop_back(); + if(Intersect(n->volume,volume)) + { + if(n->isinternal()) + { + stack.push_back(n->childs[0]); + stack.push_back(n->childs[1]); + } + else + { + policy.Process(n); + } + } + } while(stack.size()>0); + } +} + + DBVT_PREFIX inline void btDbvt::rayTestInternal( const btDbvtNode* root, const btVector3& rayFrom, @@ -959,7 +1006,8 @@ inline void btDbvt::rayTestInternal( const btDbvtNode* root, btScalar lambda_max, const btVector3& aabbMin, const btVector3& aabbMax, - DBVT_IPOLICY) const + btAlignedObjectArray& stack, + DBVT_IPOLICY ) const { (void) rayTo; DBVT_CHECKTYPE @@ -969,7 +1017,6 @@ inline void btDbvt::rayTestInternal( const btDbvtNode* root, int depth=1; int treshold=DOUBLE_STACKSIZE-2; - btAlignedObjectArray& stack = m_rayTestStack; stack.resize(DOUBLE_STACKSIZE); stack[0]=root; btVector3 bounds[2]; @@ -1193,19 +1240,34 @@ inline void btDbvt::collideOCL( const btDbvtNode* root, /* Insert 0 */ j=nearest(&stack[0],&stock[0],nes[q].value,0,stack.size()); stack.push_back(0); + + //void * memmove ( void * destination, const void * source, size_t num ); + #if DBVT_USE_MEMMOVE - memmove(&stack[j+1],&stack[j],sizeof(int)*(stack.size()-j-1)); + { + int num_items_to_move = stack.size()-1-j; + if(num_items_to_move > 0) + memmove(&stack[j+1],&stack[j],sizeof(int)*num_items_to_move); + } #else - for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1]; + for(int k=stack.size()-1;k>j;--k) { + stack[k]=stack[k-1]; + } #endif stack[j]=allocate(ifree,stock,nes[q]); /* Insert 1 */ j=nearest(&stack[0],&stock[0],nes[1-q].value,j,stack.size()); stack.push_back(0); #if DBVT_USE_MEMMOVE - memmove(&stack[j+1],&stack[j],sizeof(int)*(stack.size()-j-1)); + { + int num_items_to_move = stack.size()-1-j; + if(num_items_to_move > 0) + memmove(&stack[j+1],&stack[j],sizeof(int)*num_items_to_move); + } #else - for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1]; + for(int k=stack.size()-1;k>j;--k) { + stack[k]=stack[k-1]; + } #endif stack[j]=allocate(ifree,stock,nes[1-q]); } diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp index 75cfac643..4f33db500 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp @@ -16,6 +16,7 @@ subject to the following restrictions: ///btDbvtBroadphase implementation by Nathanael Presson #include "btDbvtBroadphase.h" +#include "LinearMath/btThreads.h" // // Profiling @@ -142,6 +143,11 @@ btDbvtBroadphase::btDbvtBroadphase(btOverlappingPairCache* paircache) { m_stageRoots[i]=0; } +#if BT_THREADSAFE + m_rayTestStacks.resize(BT_MAX_THREAD_COUNT); +#else + m_rayTestStacks.resize(1); +#endif #if DBVT_BP_PROFILE clear(m_profiling); #endif @@ -227,6 +233,23 @@ struct BroadphaseRayTester : btDbvt::ICollide void btDbvtBroadphase::rayTest(const btVector3& rayFrom,const btVector3& rayTo, btBroadphaseRayCallback& rayCallback,const btVector3& aabbMin,const btVector3& aabbMax) { BroadphaseRayTester callback(rayCallback); + btAlignedObjectArray* stack = &m_rayTestStacks[0]; +#if BT_THREADSAFE + // for this function to be threadsafe, each thread must have a separate copy + // of this stack. This could be thread-local static to avoid dynamic allocations, + // instead of just a local. + int threadIndex = btGetCurrentThreadIndex(); + btAlignedObjectArray localStack; + if (threadIndex < m_rayTestStacks.size()) + { + // use per-thread preallocated stack if possible to avoid dynamic allocations + stack = &m_rayTestStacks[threadIndex]; + } + else + { + stack = &localStack; + } +#endif m_sets[0].rayTestInternal( m_sets[0].m_root, rayFrom, @@ -236,6 +259,7 @@ void btDbvtBroadphase::rayTest(const btVector3& rayFrom,const btVector3& rayTo, rayCallback.m_lambda_max, aabbMin, aabbMax, + *stack, callback); m_sets[1].rayTestInternal( m_sets[1].m_root, @@ -246,6 +270,7 @@ void btDbvtBroadphase::rayTest(const btVector3& rayFrom,const btVector3& rayTo, rayCallback.m_lambda_max, aabbMin, aabbMax, + *stack, callback); } diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h index 18b64ad0e..a61f00df0 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h @@ -87,6 +87,7 @@ struct btDbvtBroadphase : btBroadphaseInterface bool m_releasepaircache; // Release pair cache on delete bool m_deferedcollide; // Defere dynamic/static collision to collide call bool m_needcleanup; // Need to run cleanup? + btAlignedObjectArray< btAlignedObjectArray > m_rayTestStacks; #if DBVT_BP_PROFILE btClock m_clock; struct { diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h index 89c307d14..7b0f9489a 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h @@ -64,6 +64,12 @@ struct btDispatcherInfo btScalar m_convexConservativeDistanceThreshold; }; +enum ebtDispatcherQueryType +{ + BT_CONTACT_POINT_ALGORITHMS = 1, + BT_CLOSEST_POINT_ALGORITHMS = 2 +}; + ///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs. ///For example for pairwise collision detection, calculating contact points stored in btPersistentManifold or user callbacks (game logic). class btDispatcher @@ -73,7 +79,7 @@ class btDispatcher public: virtual ~btDispatcher() ; - virtual btCollisionAlgorithm* findAlgorithm(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btPersistentManifold* sharedManifold=0) = 0; + virtual btCollisionAlgorithm* findAlgorithm(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btPersistentManifold* sharedManifold, ebtDispatcherQueryType queryType) = 0; virtual btPersistentManifold* getNewManifold(const btCollisionObject* b0,const btCollisionObject* b1)=0; diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp index ae22dadc7..55ebf06f1 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp @@ -34,7 +34,6 @@ int gFindPairs =0; btHashedOverlappingPairCache::btHashedOverlappingPairCache(): m_overlapFilterCallback(0), - m_blockedForChanges(false), m_ghostPairCallback(0) { int initialAllocatedSize= 2; @@ -373,10 +372,10 @@ void* btHashedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* pro return userData; } //#include - +#include "LinearMath/btQuickprof.h" void btHashedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback,btDispatcher* dispatcher) { - + BT_PROFILE("btHashedOverlappingPairCache::processAllOverlappingPairs"); int i; // printf("m_overlappingPairArray.size()=%d\n",m_overlappingPairArray.size()); diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h index eee90e473..146142704 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h @@ -94,7 +94,6 @@ class btHashedOverlappingPairCache : public btOverlappingPairCache { btBroadphasePairArray m_overlappingPairArray; btOverlapFilterCallback* m_overlapFilterCallback; - bool m_blockedForChanges; protected: diff --git a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp index 889216df5..93de49998 100644 --- a/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp +++ b/Engine/lib/bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp @@ -107,6 +107,8 @@ void btQuantizedBvh::setQuantizationValues(const btVector3& bvhAabbMin,const btV v = unQuantize(vecIn); m_bvhAabbMin.setMin(v-clampValue); } + aabbSize = m_bvhAabbMax - m_bvhAabbMin; + m_bvhQuantization = btVector3(btScalar(65533.0),btScalar(65533.0),btScalar(65533.0)) / aabbSize; { quantize(vecIn,m_bvhAabbMax,true); v = unQuantize(vecIn); diff --git a/Engine/lib/bullet/src/BulletCollision/CMakeLists.txt b/Engine/lib/bullet/src/BulletCollision/CMakeLists.txt index c4723ae25..90741a126 100644 --- a/Engine/lib/bullet/src/BulletCollision/CMakeLists.txt +++ b/Engine/lib/bullet/src/BulletCollision/CMakeLists.txt @@ -18,6 +18,7 @@ SET(BulletCollision_SRCS CollisionDispatch/btCollisionDispatcher.cpp CollisionDispatch/btCollisionObject.cpp CollisionDispatch/btCollisionWorld.cpp + CollisionDispatch/btCollisionWorldImporter.cpp CollisionDispatch/btCompoundCollisionAlgorithm.cpp CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp @@ -126,6 +127,7 @@ SET(CollisionDispatch_HDRS CollisionDispatch/btCollisionObject.h CollisionDispatch/btCollisionObjectWrapper.h CollisionDispatch/btCollisionWorld.h + CollisionDispatch/btCollisionWorldImporter.h CollisionDispatch/btCompoundCollisionAlgorithm.h CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h CollisionDispatch/btConvexConcaveCollisionAlgorithm.h @@ -269,10 +271,10 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true) - + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}") # Have to list out sub-directories manually: SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) @@ -280,7 +282,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision) SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes) SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact) SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision) - + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp index 634017809..006cc65a2 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp @@ -100,7 +100,7 @@ bool SphereTriangleDetector::collide(const btVector3& sphereCenter,btVector3 &po btScalar radiusWithThreshold = radius + contactBreakingThreshold; btVector3 normal = (vertices[1]-vertices[0]).cross(vertices[2]-vertices[0]); - normal.normalize(); + normal.safeNormalize(); btVector3 p1ToCentre = sphereCenter - vertices[0]; btScalar distanceFromPlane = p1ToCentre.dot(normal); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h index 669498494..35f77d4e6 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h @@ -40,6 +40,9 @@ public: virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1) =0; + virtual btCollisionAlgorithmCreateFunc* getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1) = 0; + + }; #endif //BT_COLLISION_CONFIGURATION diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp index 669d0b6b5..737067ef9 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp @@ -16,7 +16,7 @@ subject to the following restrictions: #include "btCollisionDispatcher.h" - +#include "LinearMath/btQuickprof.h" #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" @@ -50,8 +50,10 @@ m_dispatcherFlags(btCollisionDispatcher::CD_USE_RELATIVE_CONTACT_BREAKING_THRESH { for (int j=0;jgetCollisionAlgorithmCreateFunc(i,j); - btAssert(m_doubleDispatch[i][j]); + m_doubleDispatchContactPoints[i][j] = m_collisionConfiguration->getCollisionAlgorithmCreateFunc(i,j); + btAssert(m_doubleDispatchContactPoints[i][j]); + m_doubleDispatchClosestPoints[i][j] = m_collisionConfiguration->getClosestPointsAlgorithmCreateFunc(i, j); + } } @@ -61,7 +63,12 @@ m_dispatcherFlags(btCollisionDispatcher::CD_USE_RELATIVE_CONTACT_BREAKING_THRESH void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc *createFunc) { - m_doubleDispatch[proxyType0][proxyType1] = createFunc; + m_doubleDispatchContactPoints[proxyType0][proxyType1] = createFunc; +} + +void btCollisionDispatcher::registerClosestPointsCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc *createFunc) +{ + m_doubleDispatchClosestPoints[proxyType0][proxyType1] = createFunc; } btCollisionDispatcher::~btCollisionDispatcher() @@ -84,14 +91,10 @@ btPersistentManifold* btCollisionDispatcher::getNewManifold(const btCollisionObj btScalar contactProcessingThreshold = btMin(body0->getContactProcessingThreshold(),body1->getContactProcessingThreshold()); - void* mem = 0; - - if (m_persistentManifoldPoolAllocator->getFreeCount()) + void* mem = m_persistentManifoldPoolAllocator->allocate( sizeof( btPersistentManifold ) ); + if (NULL == mem) { - mem = m_persistentManifoldPoolAllocator->allocate(sizeof(btPersistentManifold)); - } else - { - //we got a pool memory overflow, by default we fallback to dynamically allocate memory. If we require a contiguous contact pool then assert. + //we got a pool memory overflow, by default we fallback to dynamically allocate memory. If we require a contiguous contact pool then assert. if ((m_dispatcherFlags&CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION)==0) { mem = btAlignedAlloc(sizeof(btPersistentManifold),16); @@ -142,14 +145,23 @@ void btCollisionDispatcher::releaseManifold(btPersistentManifold* manifold) -btCollisionAlgorithm* btCollisionDispatcher::findAlgorithm(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btPersistentManifold* sharedManifold) + +btCollisionAlgorithm* btCollisionDispatcher::findAlgorithm(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btPersistentManifold* sharedManifold, ebtDispatcherQueryType algoType) { btCollisionAlgorithmConstructionInfo ci; ci.m_dispatcher1 = this; ci.m_manifold = sharedManifold; - btCollisionAlgorithm* algo = m_doubleDispatch[body0Wrap->getCollisionShape()->getShapeType()][body1Wrap->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci,body0Wrap,body1Wrap); + btCollisionAlgorithm* algo = 0; + if (algoType == BT_CONTACT_POINT_ALGORITHMS) + { + algo = m_doubleDispatchContactPoints[body0Wrap->getCollisionShape()->getShapeType()][body1Wrap->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci, body0Wrap, body1Wrap); + } + else + { + algo = m_doubleDispatchClosestPoints[body0Wrap->getCollisionShape()->getShapeType()][body1Wrap->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci, body0Wrap, body1Wrap); + } return algo; } @@ -189,7 +201,7 @@ bool btCollisionDispatcher::needsCollision(const btCollisionObject* body0,const if ((!body0->isActive()) && (!body1->isActive())) needsCollision = false; - else if (!body0->checkCollideWith(body1)) + else if ((!body0->checkCollideWith(body1)) || (!body1->checkCollideWith(body0))) needsCollision = false; return needsCollision ; @@ -227,6 +239,8 @@ public: virtual bool processOverlap(btBroadphasePair& pair) { + BT_PROFILE("btCollisionDispatcher::processOverlap"); + (*m_dispatcher->getNearCallback())(pair,*m_dispatcher,m_dispatchInfo); return false; @@ -249,7 +263,6 @@ void btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pa - //by default, Bullet will use this near callback void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo) { @@ -265,7 +278,7 @@ void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, //dispatcher will keep algorithms persistent in the collision pair if (!collisionPair.m_algorithm) { - collisionPair.m_algorithm = dispatcher.findAlgorithm(&obj0Wrap,&obj1Wrap); + collisionPair.m_algorithm = dispatcher.findAlgorithm(&obj0Wrap,&obj1Wrap,0, BT_CONTACT_POINT_ALGORITHMS); } if (collisionPair.m_algorithm) @@ -293,13 +306,13 @@ void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, void* btCollisionDispatcher::allocateCollisionAlgorithm(int size) { - if (m_collisionAlgorithmPoolAllocator->getFreeCount()) - { - return m_collisionAlgorithmPoolAllocator->allocate(size); - } - - //warn user for overflow? - return btAlignedAlloc(static_cast(size), 16); + void* mem = m_collisionAlgorithmPoolAllocator->allocate( size ); + if (NULL == mem) + { + //warn user for overflow? + return btAlignedAlloc(static_cast(size), 16); + } + return mem; } void btCollisionDispatcher::freeCollisionAlgorithm(void* ptr) diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h index 92696ee54..b97ee3c1b 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h @@ -57,7 +57,9 @@ protected: btPoolAllocator* m_persistentManifoldPoolAllocator; - btCollisionAlgorithmCreateFunc* m_doubleDispatch[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES]; + btCollisionAlgorithmCreateFunc* m_doubleDispatchContactPoints[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES]; + + btCollisionAlgorithmCreateFunc* m_doubleDispatchClosestPoints[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES]; btCollisionConfiguration* m_collisionConfiguration; @@ -84,6 +86,8 @@ public: ///registerCollisionCreateFunc allows registration of custom/alternative collision create functions void registerCollisionCreateFunc(int proxyType0,int proxyType1, btCollisionAlgorithmCreateFunc* createFunc); + void registerClosestPointsCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc *createFunc); + int getNumManifolds() const { return int( m_manifoldsPtr.size()); @@ -115,7 +119,7 @@ public: virtual void clearManifold(btPersistentManifold* manifold); - btCollisionAlgorithm* findAlgorithm(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btPersistentManifold* sharedManifold = 0); + btCollisionAlgorithm* findAlgorithm(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btPersistentManifold* sharedManifold, ebtDispatcherQueryType queryType); virtual bool needsCollision(const btCollisionObject* body0,const btCollisionObject* body1); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp index d09241000..fdecac162 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp @@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -28,13 +28,19 @@ btCollisionObject::btCollisionObject() m_collisionFlags(btCollisionObject::CF_STATIC_OBJECT), m_islandTag1(-1), m_companionId(-1), + m_worldArrayIndex(-1), m_activationState1(1), m_deactivationTime(btScalar(0.)), m_friction(btScalar(0.5)), - m_rollingFriction(0.0f), m_restitution(btScalar(0.)), + m_rollingFriction(0.0f), + m_spinningFriction(0.f), + m_contactDamping(.1), + m_contactStiffness(1e4), m_internalType(CO_COLLISION_OBJECT), m_userObjectPointer(0), + m_userIndex2(-1), + m_userIndex(-1), m_hitFraction(btScalar(1.)), m_ccdSweptSphereRadius(btScalar(0.)), m_ccdMotionThreshold(btScalar(0.)), @@ -90,6 +96,8 @@ const char* btCollisionObject::serialize(void* dataBuffer, btSerializer* seriali dataOut->m_deactivationTime = m_deactivationTime; dataOut->m_friction = m_friction; dataOut->m_rollingFriction = m_rollingFriction; + dataOut->m_contactDamping = m_contactDamping; + dataOut->m_contactStiffness = m_contactStiffness; dataOut->m_restitution = m_restitution; dataOut->m_internalType = m_internalType; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h index 89cad1682..0cae21000 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -79,24 +79,31 @@ protected: int m_islandTag1; int m_companionId; + int m_worldArrayIndex; // index of object in world's collisionObjects array mutable int m_activationState1; mutable btScalar m_deactivationTime; btScalar m_friction; btScalar m_restitution; - btScalar m_rollingFriction; + btScalar m_rollingFriction;//torsional friction orthogonal to contact normal (useful to stop spheres rolling forever) + btScalar m_spinningFriction; // torsional friction around the contact normal (useful for grasping) + btScalar m_contactDamping; + btScalar m_contactStiffness; + + ///m_internalType is reserved to distinguish Bullet's btCollisionObject, btRigidBody, btSoftBody, btGhostObject etc. ///do not assign your own m_internalType unless you write a new dynamics object class. int m_internalType; ///users can point to their objects, m_userPointer is not used by Bullet, see setUserPointer/getUserPointer - union - { - void* m_userObjectPointer; - int m_userIndex; - }; + + void* m_userObjectPointer; + + int m_userIndex2; + + int m_userIndex; ///time of impact calculation btScalar m_hitFraction; @@ -110,13 +117,12 @@ protected: /// If some object should have elaborate collision filtering by sub-classes int m_checkCollideWith; + btAlignedObjectArray m_objectsWithoutCollisionCheck; + ///internal update revision number. It will be increased when the object changes. This allows some subsystems to perform lazy evaluation. int m_updateRevision; - virtual bool checkCollideWithOverride(const btCollisionObject* /* co */) const - { - return true; - } + btVector3 m_customDebugColorRGB; public: @@ -130,7 +136,9 @@ public: CF_CUSTOM_MATERIAL_CALLBACK = 8,//this allows per-triangle material (friction/restitution) CF_CHARACTER_OBJECT = 16, CF_DISABLE_VISUALIZE_OBJECT = 32, //disable debug drawing - CF_DISABLE_SPU_COLLISION_PROCESSING = 64//disable parallel/SPU processing + CF_DISABLE_SPU_COLLISION_PROCESSING = 64,//disable parallel/SPU processing + CF_HAS_CONTACT_STIFFNESS_DAMPING = 128, + CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR = 256, }; enum CollisionObjectTypes @@ -225,7 +233,34 @@ public: return m_collisionShape; } - + void setIgnoreCollisionCheck(const btCollisionObject* co, bool ignoreCollisionCheck) + { + if (ignoreCollisionCheck) + { + //We don't check for duplicates. Is it ok to leave that up to the user of this API? + //int index = m_objectsWithoutCollisionCheck.findLinearSearch(co); + //if (index == m_objectsWithoutCollisionCheck.size()) + //{ + m_objectsWithoutCollisionCheck.push_back(co); + //} + } + else + { + m_objectsWithoutCollisionCheck.remove(co); + } + m_checkCollideWith = m_objectsWithoutCollisionCheck.size() > 0; + } + + virtual bool checkCollideWithOverride(const btCollisionObject* co) const + { + int index = m_objectsWithoutCollisionCheck.findLinearSearch(co); + if (index < m_objectsWithoutCollisionCheck.size()) + { + return false; + } + return true; + } + @@ -292,8 +327,40 @@ public: { return m_rollingFriction; } - - + void setSpinningFriction(btScalar frict) + { + m_updateRevision++; + m_spinningFriction = frict; + } + btScalar getSpinningFriction() const + { + return m_spinningFriction; + } + void setContactStiffnessAndDamping(btScalar stiffness, btScalar damping) + { + m_updateRevision++; + m_contactStiffness = stiffness; + m_contactDamping = damping; + + m_collisionFlags |=CF_HAS_CONTACT_STIFFNESS_DAMPING; + + //avoid divisions by zero... + if (m_contactStiffness< SIMD_EPSILON) + { + m_contactStiffness = SIMD_EPSILON; + } + } + + btScalar getContactStiffness() const + { + return m_contactStiffness; + } + + btScalar getContactDamping() const + { + return m_contactDamping; + } + ///reserved for Bullet internal usage int getInternalType() const { @@ -391,7 +458,18 @@ public: m_companionId = id; } - SIMD_FORCE_INLINE btScalar getHitFraction() const + SIMD_FORCE_INLINE int getWorldArrayIndex() const + { + return m_worldArrayIndex; + } + + // only should be called by CollisionWorld + void setWorldArrayIndex(int ix) + { + m_worldArrayIndex = ix; + } + + SIMD_FORCE_INLINE btScalar getHitFraction() const { return m_hitFraction; } @@ -452,6 +530,12 @@ public: { return m_userIndex; } + + int getUserIndex2() const + { + return m_userIndex2; + } + ///users can point to their objects, userPointer is not used by Bullet void setUserPointer(void* userPointer) { @@ -463,12 +547,37 @@ public: { m_userIndex = index; } + + void setUserIndex2(int index) + { + m_userIndex2 = index; + } int getUpdateRevisionInternal() const { return m_updateRevision; } + void setCustomDebugColor(const btVector3& colorRGB) + { + m_customDebugColorRGB = colorRGB; + m_collisionFlags |= CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR; + } + + void removeCustomDebugColor() + { + m_collisionFlags &= ~CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR; + } + + bool getCustomDebugColor(btVector3& colorRGB) const + { + bool hasCustomColor = (0!=(m_collisionFlags&CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR)); + if (hasCustomColor) + { + colorRGB = m_customDebugColorRGB; + } + return hasCustomColor; + } inline bool checkCollideWith(const btCollisionObject* co) const { @@ -504,6 +613,8 @@ struct btCollisionObjectDoubleData double m_deactivationTime; double m_friction; double m_rollingFriction; + double m_contactDamping; + double m_contactStiffness; double m_restitution; double m_hitFraction; double m_ccdSweptSphereRadius; @@ -537,7 +648,8 @@ struct btCollisionObjectFloatData float m_deactivationTime; float m_friction; float m_rollingFriction; - + float m_contactDamping; + float m_contactStiffness; float m_restitution; float m_hitFraction; float m_ccdSweptSphereRadius; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp index 093c6f9b2..3bbf7586e 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp @@ -34,7 +34,7 @@ subject to the following restrictions: #include "LinearMath/btSerializer.h" #include "BulletCollision/CollisionShapes/btConvexPolyhedron.h" #include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" -#include "BulletCollision/Gimpact/btGImpactShape.h" + //#define DISABLE_DBVT_COMPOUNDSHAPE_RAYCAST_ACCELERATION @@ -115,7 +115,9 @@ void btCollisionWorld::addCollisionObject(btCollisionObject* collisionObject,sho //check that the object isn't already added btAssert( m_collisionObjects.findLinearSearch(collisionObject) == m_collisionObjects.size()); + btAssert(collisionObject->getWorldArrayIndex() == -1); // do not add the same object to more than one collision world + collisionObject->setWorldArrayIndex(m_collisionObjects.size()); m_collisionObjects.push_back(collisionObject); //calculate new AABB @@ -195,6 +197,7 @@ void btCollisionWorld::updateAabbs() for ( int i=0;igetWorldArrayIndex() == i); //only update aabb of active objects if (m_forceUpdateAllAabbs || colObj->isActive()) @@ -253,9 +256,25 @@ void btCollisionWorld::removeCollisionObject(btCollisionObject* collisionObject) } - //swapremove - m_collisionObjects.remove(collisionObject); - + int iObj = collisionObject->getWorldArrayIndex(); + btAssert(iObj >= 0 && iObj < m_collisionObjects.size()); // trying to remove an object that was never added or already removed previously? + if (iObj >= 0 && iObj < m_collisionObjects.size()) + { + btAssert(collisionObject == m_collisionObjects[iObj]); + m_collisionObjects.swap(iObj, m_collisionObjects.size()-1); + m_collisionObjects.pop_back(); + if (iObj < m_collisionObjects.size()) + { + m_collisionObjects[iObj]->setWorldArrayIndex(iObj); + } + } + else + { + // slow linear search + //swapremove + m_collisionObjects.remove(collisionObject); + } + collisionObject->setWorldArrayIndex(-1); } @@ -292,12 +311,13 @@ void btCollisionWorld::rayTestSingleInternal(const btTransform& rayFromTrans,con btGjkConvexCast gjkConvexCaster(castShape,convexShape,&simplexSolver); //btContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0); - bool condition = true; + btConvexCast* convexCasterPtr = 0; - if (resultCallback.m_flags & btTriangleRaycastCallback::kF_UseSubSimplexConvexCastRaytest) - convexCasterPtr = &subSimplexConvexCaster; - else + //use kF_UseSubSimplexConvexCastRaytest by default + if (resultCallback.m_flags & btTriangleRaycastCallback::kF_UseGjkConvexCastRaytest) convexCasterPtr = &gjkConvexCaster; + else + convexCasterPtr = &subSimplexConvexCaster; btConvexCast& convexCaster = *convexCasterPtr; @@ -308,6 +328,7 @@ void btCollisionWorld::rayTestSingleInternal(const btTransform& rayFromTrans,con { if (castResult.m_fraction < resultCallback.m_closestHitFraction) { + //todo: figure out what this is about. When is rayFromTest.getBasis() not identity? #ifdef USE_SUBSIMPLEX_CONVEX_CAST //rotate normal into worldspace castResult.m_normal = rayFromTrans.getBasis() * castResult.m_normal; @@ -387,14 +408,7 @@ void btCollisionWorld::rayTestSingleInternal(const btTransform& rayFromTrans,con rcb.m_hitFraction = resultCallback.m_closestHitFraction; triangleMesh->performRaycast(&rcb,rayFromLocal,rayToLocal); } - else if(collisionShape->getShapeType()==GIMPACT_SHAPE_PROXYTYPE) - { - btGImpactMeshShape* concaveShape = (btGImpactMeshShape*)collisionShape; - - BridgeTriangleRaycastCallback rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObjectWrap->getCollisionObject(),concaveShape, colObjWorldTransform); - rcb.m_hitFraction = resultCallback.m_closestHitFraction; - concaveShape->processAllTrianglesRay(&rcb,rayFromLocal,rayToLocal); - }else + else { //generic (slower) case btConcaveShape* concaveShape = (btConcaveShape*)collisionShape; @@ -770,7 +784,7 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape, hitPointLocal, hitFraction); - bool normalInWorldSpace = false; + bool normalInWorldSpace = true; return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace); } @@ -795,23 +809,50 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape, } } } else { - ///@todo : use AABB tree or other BVH acceleration structure! if (collisionShape->isCompound()) { - BT_PROFILE("convexSweepCompound"); - const btCompoundShape* compoundShape = static_cast(collisionShape); - int i=0; - for (i=0;igetNumChildShapes();i++) + struct btCompoundLeafCallback : btDbvt::ICollide { - btTransform childTrans = compoundShape->getChildTransform(i); - const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i); - btTransform childWorldTrans = colObjWorldTransform * childTrans; - - struct LocalInfoAdder : public ConvexResultCallback { - ConvexResultCallback* m_userCallback; + btCompoundLeafCallback( + const btCollisionObjectWrapper* colObjWrap, + const btConvexShape* castShape, + const btTransform& convexFromTrans, + const btTransform& convexToTrans, + btScalar allowedPenetration, + const btCompoundShape* compoundShape, + const btTransform& colObjWorldTransform, + ConvexResultCallback& resultCallback) + : + m_colObjWrap(colObjWrap), + m_castShape(castShape), + m_convexFromTrans(convexFromTrans), + m_convexToTrans(convexToTrans), + m_allowedPenetration(allowedPenetration), + m_compoundShape(compoundShape), + m_colObjWorldTransform(colObjWorldTransform), + m_resultCallback(resultCallback) { + } + + const btCollisionObjectWrapper* m_colObjWrap; + const btConvexShape* m_castShape; + const btTransform& m_convexFromTrans; + const btTransform& m_convexToTrans; + btScalar m_allowedPenetration; + const btCompoundShape* m_compoundShape; + const btTransform& m_colObjWorldTransform; + ConvexResultCallback& m_resultCallback; + + public: + + void ProcessChild(int index, const btTransform& childTrans, const btCollisionShape* childCollisionShape) + { + btTransform childWorldTrans = m_colObjWorldTransform * childTrans; + + struct LocalInfoAdder : public ConvexResultCallback { + ConvexResultCallback* m_userCallback; int m_i; - LocalInfoAdder (int i, ConvexResultCallback *user) + LocalInfoAdder(int i, ConvexResultCallback *user) : m_userCallback(user), m_i(i) { m_closestHitFraction = m_userCallback->m_closestHitFraction; @@ -820,27 +861,66 @@ void btCollisionWorld::objectQuerySingleInternal(const btConvexShape* castShape, { return m_userCallback->needsCollision(p); } - virtual btScalar addSingleResult (btCollisionWorld::LocalConvexResult& r, bool b) - { - btCollisionWorld::LocalShapeInfo shapeInfo; - shapeInfo.m_shapePart = -1; - shapeInfo.m_triangleIndex = m_i; - if (r.m_localShapeInfo == NULL) - r.m_localShapeInfo = &shapeInfo; - const btScalar result = m_userCallback->addSingleResult(r, b); - m_closestHitFraction = m_userCallback->m_closestHitFraction; - return result; - - } - }; + virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult& r, bool b) + { + btCollisionWorld::LocalShapeInfo shapeInfo; + shapeInfo.m_shapePart = -1; + shapeInfo.m_triangleIndex = m_i; + if (r.m_localShapeInfo == NULL) + r.m_localShapeInfo = &shapeInfo; + const btScalar result = m_userCallback->addSingleResult(r, b); + m_closestHitFraction = m_userCallback->m_closestHitFraction; + return result; - LocalInfoAdder my_cb(i, &resultCallback); - - btCollisionObjectWrapper tmpObj(colObjWrap,childCollisionShape,colObjWrap->getCollisionObject(),childWorldTrans,-1,i); + } + }; - objectQuerySingleInternal(castShape, convexFromTrans,convexToTrans, - &tmpObj,my_cb, allowedPenetration); - + LocalInfoAdder my_cb(index, &m_resultCallback); + + btCollisionObjectWrapper tmpObj(m_colObjWrap, childCollisionShape, m_colObjWrap->getCollisionObject(), childWorldTrans, -1, index); + + objectQuerySingleInternal(m_castShape, m_convexFromTrans, m_convexToTrans, &tmpObj, my_cb, m_allowedPenetration); + } + + void Process(const btDbvtNode* leaf) + { + // Processing leaf node + int index = leaf->dataAsInt; + + btTransform childTrans = m_compoundShape->getChildTransform(index); + const btCollisionShape* childCollisionShape = m_compoundShape->getChildShape(index); + + ProcessChild(index, childTrans, childCollisionShape); + } + }; + + BT_PROFILE("convexSweepCompound"); + const btCompoundShape* compoundShape = static_cast(collisionShape); + + btVector3 fromLocalAabbMin, fromLocalAabbMax; + btVector3 toLocalAabbMin, toLocalAabbMax; + + castShape->getAabb(colObjWorldTransform.inverse() * convexFromTrans, fromLocalAabbMin, fromLocalAabbMax); + castShape->getAabb(colObjWorldTransform.inverse() * convexToTrans, toLocalAabbMin, toLocalAabbMax); + + fromLocalAabbMin.setMin(toLocalAabbMin); + fromLocalAabbMax.setMax(toLocalAabbMax); + + btCompoundLeafCallback callback(colObjWrap, castShape, convexFromTrans, convexToTrans, + allowedPenetration, compoundShape, colObjWorldTransform, resultCallback); + + const btDbvt* tree = compoundShape->getDynamicAabbTree(); + if (tree) { + const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds = btDbvtVolume::FromMM(fromLocalAabbMin, fromLocalAabbMax); + tree->collideTV(tree->m_root, bounds, callback); + } else { + int i; + for (i=0;igetNumChildShapes();i++) + { + const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i); + btTransform childTrans = compoundShape->getChildTransform(i); + callback.ProcessChild(i, childTrans, childCollisionShape); + } } } } @@ -1151,7 +1231,7 @@ struct btSingleContactCallback : public btBroadphaseAabbCallback btCollisionObjectWrapper ob0(0,m_collisionObject->getCollisionShape(),m_collisionObject,m_collisionObject->getWorldTransform(),-1,-1); btCollisionObjectWrapper ob1(0,collisionObject->getCollisionShape(),collisionObject,collisionObject->getWorldTransform(),-1,-1); - btCollisionAlgorithm* algorithm = m_world->getDispatcher()->findAlgorithm(&ob0,&ob1); + btCollisionAlgorithm* algorithm = m_world->getDispatcher()->findAlgorithm(&ob0,&ob1,0, BT_CLOSEST_POINT_ALGORITHMS); if (algorithm) { btBridgedManifoldResult contactPointResult(&ob0,&ob1, m_resultCallback); @@ -1187,10 +1267,11 @@ void btCollisionWorld::contactPairTest(btCollisionObject* colObjA, btCollisionOb btCollisionObjectWrapper obA(0,colObjA->getCollisionShape(),colObjA,colObjA->getWorldTransform(),-1,-1); btCollisionObjectWrapper obB(0,colObjB->getCollisionShape(),colObjB,colObjB->getWorldTransform(),-1,-1); - btCollisionAlgorithm* algorithm = getDispatcher()->findAlgorithm(&obA,&obB); + btCollisionAlgorithm* algorithm = getDispatcher()->findAlgorithm(&obA,&obB, 0, BT_CLOSEST_POINT_ALGORITHMS); if (algorithm) { btBridgedManifoldResult contactPointResult(&obA,&obB, resultCallback); + contactPointResult.m_closestPointDistanceThreshold = resultCallback.m_closestDistanceThreshold; //discrete collision detection query algorithm->processCollision(&obA,&obB, getDispatchInfo(),&contactPointResult); @@ -1251,7 +1332,10 @@ public: void btCollisionWorld::debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color) { // Draw a small simplex at the center of the object - getDebugDrawer()->drawTransform(worldTransform,1); + if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawFrames) + { + getDebugDrawer()->drawTransform(worldTransform,1); + } if (shape->getShapeType() == COMPOUND_SHAPE_PROXYTYPE) { @@ -1429,81 +1513,93 @@ void btCollisionWorld::debugDrawObject(const btTransform& worldTransform, const void btCollisionWorld::debugDrawWorld() { - if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints) + if (getDebugDrawer()) { - int numManifolds = getDispatcher()->getNumManifolds(); - btVector3 color(1,1,0); - for (int i=0;igetManifoldByIndexInternal(i); - //btCollisionObject* obA = static_cast(contactManifold->getBody0()); - //btCollisionObject* obB = static_cast(contactManifold->getBody1()); + btIDebugDraw::DefaultColors defaultColors = getDebugDrawer()->getDefaultColors(); - int numContacts = contactManifold->getNumContacts(); - for (int j=0;jgetDebugMode() & btIDebugDraw::DBG_DrawContactPoints) + { + + + if (getDispatcher()) { - btManifoldPoint& cp = contactManifold->getContactPoint(j); - getDebugDrawer()->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color); + int numManifolds = getDispatcher()->getNumManifolds(); + + for (int i=0;igetManifoldByIndexInternal(i); + //btCollisionObject* obA = static_cast(contactManifold->getBody0()); + //btCollisionObject* obB = static_cast(contactManifold->getBody1()); + + int numContacts = contactManifold->getNumContacts(); + for (int j=0;jgetContactPoint(j); + getDebugDrawer()->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),defaultColors.m_contactPoint); + } + } } } - } - if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb))) - { - int i; - - for ( i=0;igetDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb))) { - btCollisionObject* colObj = m_collisionObjects[i]; - if ((colObj->getCollisionFlags() & btCollisionObject::CF_DISABLE_VISUALIZE_OBJECT)==0) + int i; + + for ( i=0;igetDebugMode() & btIDebugDraw::DBG_DrawWireframe)) + btCollisionObject* colObj = m_collisionObjects[i]; + if ((colObj->getCollisionFlags() & btCollisionObject::CF_DISABLE_VISUALIZE_OBJECT)==0) { - btVector3 color(btScalar(1.),btScalar(1.),btScalar(1.)); - switch(colObj->getActivationState()) + if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawWireframe)) { - case ACTIVE_TAG: - color = btVector3(btScalar(1.),btScalar(1.),btScalar(1.)); break; - case ISLAND_SLEEPING: - color = btVector3(btScalar(0.),btScalar(1.),btScalar(0.));break; - case WANTS_DEACTIVATION: - color = btVector3(btScalar(0.),btScalar(1.),btScalar(1.));break; - case DISABLE_DEACTIVATION: - color = btVector3(btScalar(1.),btScalar(0.),btScalar(0.));break; - case DISABLE_SIMULATION: - color = btVector3(btScalar(1.),btScalar(1.),btScalar(0.));break; - default: + btVector3 color(btScalar(0.4),btScalar(0.4),btScalar(0.4)); + + switch(colObj->getActivationState()) { - color = btVector3(btScalar(1),btScalar(0.),btScalar(0.)); - } - }; + case ACTIVE_TAG: + color = defaultColors.m_activeObject; break; + case ISLAND_SLEEPING: + color = defaultColors.m_deactivatedObject;break; + case WANTS_DEACTIVATION: + color = defaultColors.m_wantsDeactivationObject;break; + case DISABLE_DEACTIVATION: + color = defaultColors.m_disabledDeactivationObject;break; + case DISABLE_SIMULATION: + color = defaultColors.m_disabledSimulationObject;break; + default: + { + color = btVector3(btScalar(.3),btScalar(0.3),btScalar(0.3)); + } + }; - debugDrawObject(colObj->getWorldTransform(),colObj->getCollisionShape(),color); - } - if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb)) - { - btVector3 minAabb,maxAabb; - btVector3 colorvec(1,0,0); - colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb); - btVector3 contactThreshold(gContactBreakingThreshold,gContactBreakingThreshold,gContactBreakingThreshold); - minAabb -= contactThreshold; - maxAabb += contactThreshold; + colObj->getCustomDebugColor(color); - btVector3 minAabb2,maxAabb2; - - if(getDispatchInfo().m_useContinuous && colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY && !colObj->isStaticOrKinematicObject()) - { - colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(),minAabb2,maxAabb2); - minAabb2 -= contactThreshold; - maxAabb2 += contactThreshold; - minAabb.setMin(minAabb2); - maxAabb.setMax(maxAabb2); + debugDrawObject(colObj->getWorldTransform(),colObj->getCollisionShape(),color); } + if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb)) + { + btVector3 minAabb,maxAabb; + btVector3 colorvec = defaultColors.m_aabb; + colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb); + btVector3 contactThreshold(gContactBreakingThreshold,gContactBreakingThreshold,gContactBreakingThreshold); + minAabb -= contactThreshold; + maxAabb += contactThreshold; - m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec); + btVector3 minAabb2,maxAabb2; + + if(getDispatchInfo().m_useContinuous && colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY && !colObj->isStaticOrKinematicObject()) + { + colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(),minAabb2,maxAabb2); + minAabb2 -= contactThreshold; + maxAabb2 += contactThreshold; + minAabb.setMin(minAabb2); + maxAabb.setMax(maxAabb2); + } + + m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec); + } } } - } } } @@ -1512,15 +1608,6 @@ void btCollisionWorld::debugDrawWorld() void btCollisionWorld::serializeCollisionObjects(btSerializer* serializer) { int i; - //serialize all collision objects - for (i=0;igetInternalType() == btCollisionObject::CO_COLLISION_OBJECT) - { - colObj->serializeSingleObject(serializer); - } - } ///keep track of shapes already serialized btHashMap serializedShapes; @@ -1537,6 +1624,15 @@ void btCollisionWorld::serializeCollisionObjects(btSerializer* serializer) } } + //serialize all collision objects + for (i=0;igetInternalType() == btCollisionObject::CO_COLLISION_OBJECT) || (colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK)) + { + colObj->serializeSingleObject(serializer); + } + } } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.h index b3fffdecd..29d371116 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -27,7 +27,7 @@ subject to the following restrictions: * @section install_sec Installation * * @subsection step1 Step 1: Download - * You can download the Bullet Physics Library from the Google Code repository: http://code.google.com/p/bullet/downloads/list + * You can download the Bullet Physics Library from the github repository: https://github.com/bulletphysics/bullet3/releases * * @subsection step2 Step 2: Building * Bullet has multiple build systems, including premake, cmake and autotools. Premake and cmake support all platforms. @@ -412,10 +412,12 @@ public: { short int m_collisionFilterGroup; short int m_collisionFilterMask; - + btScalar m_closestDistanceThreshold; + ContactResultCallback() :m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter), - m_collisionFilterMask(btBroadphaseProxy::AllFilter) + m_collisionFilterMask(btBroadphaseProxy::AllFilter), + m_closestDistanceThreshold(0) { } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp new file mode 100644 index 000000000..36dd04350 --- /dev/null +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp @@ -0,0 +1,1147 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#include "btCollisionWorldImporter.h" +#include "btBulletCollisionCommon.h" +#include "LinearMath/btSerializer.h" //for btBulletSerializedArrays definition + +#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT +#include "BulletCollision/Gimpact/btGImpactShape.h" +#endif //SUPPORT_GIMPACT_SHAPE_IMPORT + +btCollisionWorldImporter::btCollisionWorldImporter(btCollisionWorld* world) +:m_collisionWorld(world), +m_verboseMode(0) +{ + +} + +btCollisionWorldImporter::~btCollisionWorldImporter() +{ +} + + + + + +bool btCollisionWorldImporter::convertAllObjects( btBulletSerializedArrays* arrays) +{ + + m_shapeMap.clear(); + m_bodyMap.clear(); + + int i; + + for (i=0;im_bvhsDouble.size();i++) + { + btOptimizedBvh* bvh = createOptimizedBvh(); + btQuantizedBvhDoubleData* bvhData = arrays->m_bvhsDouble[i]; + bvh->deSerializeDouble(*bvhData); + m_bvhMap.insert(arrays->m_bvhsDouble[i],bvh); + } + for (i=0;im_bvhsFloat.size();i++) + { + btOptimizedBvh* bvh = createOptimizedBvh(); + btQuantizedBvhFloatData* bvhData = arrays->m_bvhsFloat[i]; + bvh->deSerializeFloat(*bvhData); + m_bvhMap.insert(arrays->m_bvhsFloat[i],bvh); + } + + + + + + for (i=0;im_colShapeData.size();i++) + { + btCollisionShapeData* shapeData = arrays->m_colShapeData[i]; + btCollisionShape* shape = convertCollisionShape(shapeData); + if (shape) + { + // printf("shapeMap.insert(%x,%x)\n",shapeData,shape); + m_shapeMap.insert(shapeData,shape); + } + + if (shape&& shapeData->m_name) + { + char* newname = duplicateName(shapeData->m_name); + m_objectNameMap.insert(shape,newname); + m_nameShapeMap.insert(newname,shape); + } + } + + + for (i=0;im_collisionObjectDataDouble.size();i++) + { + btCollisionObjectDoubleData* colObjData = arrays->m_collisionObjectDataDouble[i]; + btCollisionShape** shapePtr = m_shapeMap.find(colObjData->m_collisionShape); + if (shapePtr && *shapePtr) + { + btTransform startTransform; + colObjData->m_worldTransform.m_origin.m_floats[3] = 0.f; + startTransform.deSerializeDouble(colObjData->m_worldTransform); + + btCollisionShape* shape = (btCollisionShape*)*shapePtr; + btCollisionObject* body = createCollisionObject(startTransform,shape,colObjData->m_name); + body->setFriction(btScalar(colObjData->m_friction)); + body->setRestitution(btScalar(colObjData->m_restitution)); + +#ifdef USE_INTERNAL_EDGE_UTILITY + if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE) + { + btBvhTriangleMeshShape* trimesh = (btBvhTriangleMeshShape*)shape; + if (trimesh->getTriangleInfoMap()) + { + body->setCollisionFlags(body->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK); + } + } +#endif //USE_INTERNAL_EDGE_UTILITY + m_bodyMap.insert(colObjData,body); + } else + { + printf("error: no shape found\n"); + } + } + for (i=0;im_collisionObjectDataFloat.size();i++) + { + btCollisionObjectFloatData* colObjData = arrays->m_collisionObjectDataFloat[i]; + btCollisionShape** shapePtr = m_shapeMap.find(colObjData->m_collisionShape); + if (shapePtr && *shapePtr) + { + btTransform startTransform; + colObjData->m_worldTransform.m_origin.m_floats[3] = 0.f; + startTransform.deSerializeFloat(colObjData->m_worldTransform); + + btCollisionShape* shape = (btCollisionShape*)*shapePtr; + btCollisionObject* body = createCollisionObject(startTransform,shape,colObjData->m_name); + +#ifdef USE_INTERNAL_EDGE_UTILITY + if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE) + { + btBvhTriangleMeshShape* trimesh = (btBvhTriangleMeshShape*)shape; + if (trimesh->getTriangleInfoMap()) + { + body->setCollisionFlags(body->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK); + } + } +#endif //USE_INTERNAL_EDGE_UTILITY + m_bodyMap.insert(colObjData,body); + } else + { + printf("error: no shape found\n"); + } + } + + return true; +} + + + +void btCollisionWorldImporter::deleteAllData() +{ + int i; + + for (i=0;iremoveCollisionObject(m_allocatedCollisionObjects[i]); + delete m_allocatedCollisionObjects[i]; + } + + m_allocatedCollisionObjects.clear(); + + + for (i=0;im_numMeshParts;a++) + { + btMeshPartData* curPart = &curData->m_meshPartsPtr[a]; + if(curPart->m_vertices3f) + delete [] curPart->m_vertices3f; + + if(curPart->m_vertices3d) + delete [] curPart->m_vertices3d; + + if(curPart->m_indices32) + delete [] curPart->m_indices32; + + if(curPart->m_3indices16) + delete [] curPart->m_3indices16; + + if(curPart->m_indices16) + delete [] curPart->m_indices16; + + if (curPart->m_3indices8) + delete [] curPart->m_3indices8; + + } + delete [] curData->m_meshPartsPtr; + delete curData; + } + m_allocatedbtStridingMeshInterfaceDatas.clear(); + + for (i=0;im_shapeType) + { + case STATIC_PLANE_PROXYTYPE: + { + btStaticPlaneShapeData* planeData = (btStaticPlaneShapeData*)shapeData; + btVector3 planeNormal,localScaling; + planeNormal.deSerializeFloat(planeData->m_planeNormal); + localScaling.deSerializeFloat(planeData->m_localScaling); + shape = createPlaneShape(planeNormal,planeData->m_planeConstant); + shape->setLocalScaling(localScaling); + + break; + } + case SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE: + { + btScaledTriangleMeshShapeData* scaledMesh = (btScaledTriangleMeshShapeData*) shapeData; + btCollisionShapeData* colShapeData = (btCollisionShapeData*) &scaledMesh->m_trimeshShapeData; + colShapeData->m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE; + btCollisionShape* childShape = convertCollisionShape(colShapeData); + btBvhTriangleMeshShape* meshShape = (btBvhTriangleMeshShape*)childShape; + btVector3 localScaling; + localScaling.deSerializeFloat(scaledMesh->m_localScaling); + + shape = createScaledTrangleMeshShape(meshShape, localScaling); + break; + } +#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT + case GIMPACT_SHAPE_PROXYTYPE: + { + btGImpactMeshShapeData* gimpactData = (btGImpactMeshShapeData*) shapeData; + if (gimpactData->m_gimpactSubType == CONST_GIMPACT_TRIMESH_SHAPE) + { + btStridingMeshInterfaceData* interfaceData = createStridingMeshInterfaceData(&gimpactData->m_meshInterface); + btTriangleIndexVertexArray* meshInterface = createMeshInterface(*interfaceData); + + + btGImpactMeshShape* gimpactShape = createGimpactShape(meshInterface); + btVector3 localScaling; + localScaling.deSerializeFloat(gimpactData->m_localScaling); + gimpactShape->setLocalScaling(localScaling); + gimpactShape->setMargin(btScalar(gimpactData->m_collisionMargin)); + gimpactShape->updateBound(); + shape = gimpactShape; + } else + { + printf("unsupported gimpact sub type\n"); + } + break; + } +#endif //SUPPORT_GIMPACT_SHAPE_IMPORT + //The btCapsuleShape* API has issue passing the margin/scaling/halfextents unmodified through the API + //so deal with this + case CAPSULE_SHAPE_PROXYTYPE: + { + btCapsuleShapeData* capData = (btCapsuleShapeData*)shapeData; + + + switch (capData->m_upAxis) + { + case 0: + { + shape = createCapsuleShapeX(1,1); + break; + } + case 1: + { + shape = createCapsuleShapeY(1,1); + break; + } + case 2: + { + shape = createCapsuleShapeZ(1,1); + break; + } + default: + { + printf("error: wrong up axis for btCapsuleShape\n"); + } + + + }; + if (shape) + { + btCapsuleShape* cap = (btCapsuleShape*) shape; + cap->deSerializeFloat(capData); + } + break; + } + case CYLINDER_SHAPE_PROXYTYPE: + case CONE_SHAPE_PROXYTYPE: + case BOX_SHAPE_PROXYTYPE: + case SPHERE_SHAPE_PROXYTYPE: + case MULTI_SPHERE_SHAPE_PROXYTYPE: + case CONVEX_HULL_SHAPE_PROXYTYPE: + { + btConvexInternalShapeData* bsd = (btConvexInternalShapeData*)shapeData; + btVector3 implicitShapeDimensions; + implicitShapeDimensions.deSerializeFloat(bsd->m_implicitShapeDimensions); + btVector3 localScaling; + localScaling.deSerializeFloat(bsd->m_localScaling); + btVector3 margin(bsd->m_collisionMargin,bsd->m_collisionMargin,bsd->m_collisionMargin); + switch (shapeData->m_shapeType) + { + case BOX_SHAPE_PROXYTYPE: + { + btBoxShape* box= (btBoxShape*)createBoxShape(implicitShapeDimensions/localScaling+margin); + //box->initializePolyhedralFeatures(); + shape = box; + + break; + } + case SPHERE_SHAPE_PROXYTYPE: + { + shape = createSphereShape(implicitShapeDimensions.getX()); + break; + } + + case CYLINDER_SHAPE_PROXYTYPE: + { + btCylinderShapeData* cylData = (btCylinderShapeData*) shapeData; + btVector3 halfExtents = implicitShapeDimensions+margin; + switch (cylData->m_upAxis) + { + case 0: + { + shape = createCylinderShapeX(halfExtents.getY(),halfExtents.getX()); + break; + } + case 1: + { + shape = createCylinderShapeY(halfExtents.getX(),halfExtents.getY()); + break; + } + case 2: + { + shape = createCylinderShapeZ(halfExtents.getX(),halfExtents.getZ()); + break; + } + default: + { + printf("unknown Cylinder up axis\n"); + } + + }; + + + + break; + } + case CONE_SHAPE_PROXYTYPE: + { + btConeShapeData* conData = (btConeShapeData*) shapeData; + btVector3 halfExtents = implicitShapeDimensions;//+margin; + switch (conData->m_upIndex) + { + case 0: + { + shape = createConeShapeX(halfExtents.getY(),halfExtents.getX()); + break; + } + case 1: + { + shape = createConeShapeY(halfExtents.getX(),halfExtents.getY()); + break; + } + case 2: + { + shape = createConeShapeZ(halfExtents.getX(),halfExtents.getZ()); + break; + } + default: + { + printf("unknown Cone up axis\n"); + } + + }; + + + + break; + } + case MULTI_SPHERE_SHAPE_PROXYTYPE: + { + btMultiSphereShapeData* mss = (btMultiSphereShapeData*)bsd; + int numSpheres = mss->m_localPositionArraySize; + + btAlignedObjectArray tmpPos; + btAlignedObjectArray radii; + radii.resize(numSpheres); + tmpPos.resize(numSpheres); + int i; + for ( i=0;im_localPositionArrayPtr[i].m_pos); + radii[i] = mss->m_localPositionArrayPtr[i].m_radius; + } + shape = createMultiSphereShape(&tmpPos[0],&radii[0],numSpheres); + break; + } + case CONVEX_HULL_SHAPE_PROXYTYPE: + { + // int sz = sizeof(btConvexHullShapeData); + // int sz2 = sizeof(btConvexInternalShapeData); + // int sz3 = sizeof(btCollisionShapeData); + btConvexHullShapeData* convexData = (btConvexHullShapeData*)bsd; + int numPoints = convexData->m_numUnscaledPoints; + + btAlignedObjectArray tmpPoints; + tmpPoints.resize(numPoints); + int i; + for ( i=0;im_unscaledPointsDoublePtr) + tmpPoints[i].deSerialize(convexData->m_unscaledPointsDoublePtr[i]); + if (convexData->m_unscaledPointsFloatPtr) + tmpPoints[i].deSerializeFloat(convexData->m_unscaledPointsFloatPtr[i]); +#else + if (convexData->m_unscaledPointsFloatPtr) + tmpPoints[i].deSerialize(convexData->m_unscaledPointsFloatPtr[i]); + if (convexData->m_unscaledPointsDoublePtr) + tmpPoints[i].deSerializeDouble(convexData->m_unscaledPointsDoublePtr[i]); +#endif //BT_USE_DOUBLE_PRECISION + } + btConvexHullShape* hullShape = createConvexHullShape(); + for (i=0;iaddPoint(tmpPoints[i]); + } + hullShape->setMargin(bsd->m_collisionMargin); + //hullShape->initializePolyhedralFeatures(); + shape = hullShape; + break; + } + default: + { + printf("error: cannot create shape type (%d)\n",shapeData->m_shapeType); + } + } + + if (shape) + { + shape->setMargin(bsd->m_collisionMargin); + + btVector3 localScaling; + localScaling.deSerializeFloat(bsd->m_localScaling); + shape->setLocalScaling(localScaling); + + } + break; + } + case TRIANGLE_MESH_SHAPE_PROXYTYPE: + { + btTriangleMeshShapeData* trimesh = (btTriangleMeshShapeData*)shapeData; + btStridingMeshInterfaceData* interfaceData = createStridingMeshInterfaceData(&trimesh->m_meshInterface); + btTriangleIndexVertexArray* meshInterface = createMeshInterface(*interfaceData); + if (!meshInterface->getNumSubParts()) + { + return 0; + } + + btVector3 scaling; scaling.deSerializeFloat(trimesh->m_meshInterface.m_scaling); + meshInterface->setScaling(scaling); + + + btOptimizedBvh* bvh = 0; +#if 1 + if (trimesh->m_quantizedFloatBvh) + { + btOptimizedBvh** bvhPtr = m_bvhMap.find(trimesh->m_quantizedFloatBvh); + if (bvhPtr && *bvhPtr) + { + bvh = *bvhPtr; + } else + { + bvh = createOptimizedBvh(); + bvh->deSerializeFloat(*trimesh->m_quantizedFloatBvh); + } + } + if (trimesh->m_quantizedDoubleBvh) + { + btOptimizedBvh** bvhPtr = m_bvhMap.find(trimesh->m_quantizedDoubleBvh); + if (bvhPtr && *bvhPtr) + { + bvh = *bvhPtr; + } else + { + bvh = createOptimizedBvh(); + bvh->deSerializeDouble(*trimesh->m_quantizedDoubleBvh); + } + } +#endif + + + btBvhTriangleMeshShape* trimeshShape = createBvhTriangleMeshShape(meshInterface,bvh); + trimeshShape->setMargin(trimesh->m_collisionMargin); + shape = trimeshShape; + + if (trimesh->m_triangleInfoMap) + { + btTriangleInfoMap* map = createTriangleInfoMap(); + map->deSerialize(*trimesh->m_triangleInfoMap); + trimeshShape->setTriangleInfoMap(map); + +#ifdef USE_INTERNAL_EDGE_UTILITY + gContactAddedCallback = btAdjustInternalEdgeContactsCallback; +#endif //USE_INTERNAL_EDGE_UTILITY + + } + + //printf("trimesh->m_collisionMargin=%f\n",trimesh->m_collisionMargin); + break; + } + case COMPOUND_SHAPE_PROXYTYPE: + { + btCompoundShapeData* compoundData = (btCompoundShapeData*)shapeData; + btCompoundShape* compoundShape = createCompoundShape(); + + btCompoundShapeChildData* childShapeDataArray = &compoundData->m_childShapePtr[0]; + + + btAlignedObjectArray childShapes; + for (int i=0;im_numChildShapes;i++) + { + btCompoundShapeChildData* ptr = &compoundData->m_childShapePtr[i]; + + btCollisionShapeData* cd = compoundData->m_childShapePtr[i].m_childShape; + + btCollisionShape* childShape = convertCollisionShape(cd); + if (childShape) + { + btTransform localTransform; + localTransform.deSerializeFloat(compoundData->m_childShapePtr[i].m_transform); + compoundShape->addChildShape(localTransform,childShape); + } else + { +#ifdef _DEBUG + printf("error: couldn't create childShape for compoundShape\n"); +#endif + } + + } + shape = compoundShape; + + break; + } + case SOFTBODY_SHAPE_PROXYTYPE: + { + return 0; + } + default: + { +#ifdef _DEBUG + printf("unsupported shape type (%d)\n",shapeData->m_shapeType); +#endif + } + } + + return shape; + +} + + + +char* btCollisionWorldImporter::duplicateName(const char* name) +{ + if (name) + { + int l = (int)strlen(name); + char* newName = new char[l+1]; + memcpy(newName,name,l); + newName[l] = 0; + m_allocatedNames.push_back(newName); + return newName; + } + return 0; +} + + + + + + + + + + + +btTriangleIndexVertexArray* btCollisionWorldImporter::createMeshInterface(btStridingMeshInterfaceData& meshData) +{ + btTriangleIndexVertexArray* meshInterface = createTriangleMeshContainer(); + + for (int i=0;iaddIndexedMesh(meshPart,meshPart.m_indexType); + } + } + + return meshInterface; +} + + +btStridingMeshInterfaceData* btCollisionWorldImporter::createStridingMeshInterfaceData(btStridingMeshInterfaceData* interfaceData) +{ + //create a new btStridingMeshInterfaceData that is an exact copy of shapedata and store it in the WorldImporter + btStridingMeshInterfaceData* newData = new btStridingMeshInterfaceData; + + newData->m_scaling = interfaceData->m_scaling; + newData->m_numMeshParts = interfaceData->m_numMeshParts; + newData->m_meshPartsPtr = new btMeshPartData[newData->m_numMeshParts]; + + for(int i = 0;i < newData->m_numMeshParts;i++) + { + btMeshPartData* curPart = &interfaceData->m_meshPartsPtr[i]; + btMeshPartData* curNewPart = &newData->m_meshPartsPtr[i]; + + curNewPart->m_numTriangles = curPart->m_numTriangles; + curNewPart->m_numVertices = curPart->m_numVertices; + + if(curPart->m_vertices3f) + { + curNewPart->m_vertices3f = new btVector3FloatData[curNewPart->m_numVertices]; + memcpy(curNewPart->m_vertices3f,curPart->m_vertices3f,sizeof(btVector3FloatData) * curNewPart->m_numVertices); + } + else + curNewPart->m_vertices3f = NULL; + + if(curPart->m_vertices3d) + { + curNewPart->m_vertices3d = new btVector3DoubleData[curNewPart->m_numVertices]; + memcpy(curNewPart->m_vertices3d,curPart->m_vertices3d,sizeof(btVector3DoubleData) * curNewPart->m_numVertices); + } + else + curNewPart->m_vertices3d = NULL; + + int numIndices = curNewPart->m_numTriangles * 3; + ///the m_3indices8 was not initialized in some Bullet versions, this can cause crashes at loading time + ///we catch it by only dealing with m_3indices8 if none of the other indices are initialized + bool uninitialized3indices8Workaround =false; + + if(curPart->m_indices32) + { + uninitialized3indices8Workaround=true; + curNewPart->m_indices32 = new btIntIndexData[numIndices]; + memcpy(curNewPart->m_indices32,curPart->m_indices32,sizeof(btIntIndexData) * numIndices); + } + else + curNewPart->m_indices32 = NULL; + + if(curPart->m_3indices16) + { + uninitialized3indices8Workaround=true; + curNewPart->m_3indices16 = new btShortIntIndexTripletData[curNewPart->m_numTriangles]; + memcpy(curNewPart->m_3indices16,curPart->m_3indices16,sizeof(btShortIntIndexTripletData) * curNewPart->m_numTriangles); + } + else + curNewPart->m_3indices16 = NULL; + + if(curPart->m_indices16) + { + uninitialized3indices8Workaround=true; + curNewPart->m_indices16 = new btShortIntIndexData[numIndices]; + memcpy(curNewPart->m_indices16,curPart->m_indices16,sizeof(btShortIntIndexData) * numIndices); + } + else + curNewPart->m_indices16 = NULL; + + if(!uninitialized3indices8Workaround && curPart->m_3indices8) + { + curNewPart->m_3indices8 = new btCharIndexTripletData[curNewPart->m_numTriangles]; + memcpy(curNewPart->m_3indices8,curPart->m_3indices8,sizeof(btCharIndexTripletData) * curNewPart->m_numTriangles); + } + else + curNewPart->m_3indices8 = NULL; + + } + + m_allocatedbtStridingMeshInterfaceDatas.push_back(newData); + + return(newData); +} + +#ifdef USE_INTERNAL_EDGE_UTILITY +extern ContactAddedCallback gContactAddedCallback; + +static bool btAdjustInternalEdgeContactsCallback(btManifoldPoint& cp, const btCollisionObject* colObj0,int partId0,int index0,const btCollisionObject* colObj1,int partId1,int index1) +{ + + btAdjustInternalEdgeContacts(cp,colObj1,colObj0, partId1,index1); + //btAdjustInternalEdgeContacts(cp,colObj1,colObj0, partId1,index1, BT_TRIANGLE_CONVEX_BACKFACE_MODE); + //btAdjustInternalEdgeContacts(cp,colObj1,colObj0, partId1,index1, BT_TRIANGLE_CONVEX_DOUBLE_SIDED+BT_TRIANGLE_CONCAVE_DOUBLE_SIDED); + return true; +} +#endif //USE_INTERNAL_EDGE_UTILITY + + +/* +btRigidBody* btWorldImporter::createRigidBody(bool isDynamic, btScalar mass, const btTransform& startTransform,btCollisionShape* shape,const char* bodyName) +{ + btVector3 localInertia; + localInertia.setZero(); + + if (mass) + shape->calculateLocalInertia(mass,localInertia); + + btRigidBody* body = new btRigidBody(mass,0,shape,localInertia); + body->setWorldTransform(startTransform); + + if (m_dynamicsWorld) + m_dynamicsWorld->addRigidBody(body); + + if (bodyName) + { + char* newname = duplicateName(bodyName); + m_objectNameMap.insert(body,newname); + m_nameBodyMap.insert(newname,body); + } + m_allocatedRigidBodies.push_back(body); + return body; + +} +*/ + +btCollisionObject* btCollisionWorldImporter::getCollisionObjectByName(const char* name) +{ + btCollisionObject** bodyPtr = m_nameColObjMap.find(name); + if (bodyPtr && *bodyPtr) + { + return *bodyPtr; + } + return 0; +} + +btCollisionObject* btCollisionWorldImporter::createCollisionObject(const btTransform& startTransform,btCollisionShape* shape, const char* bodyName) +{ + btCollisionObject* colObj = new btCollisionObject(); + colObj->setWorldTransform(startTransform); + colObj->setCollisionShape(shape); + m_collisionWorld->addCollisionObject(colObj);//todo: flags etc + + if (bodyName) + { + char* newname = duplicateName(bodyName); + m_objectNameMap.insert(colObj,newname); + m_nameColObjMap.insert(newname,colObj); + } + m_allocatedCollisionObjects.push_back(colObj); + + return colObj; +} + + + +btCollisionShape* btCollisionWorldImporter::createPlaneShape(const btVector3& planeNormal,btScalar planeConstant) +{ + btStaticPlaneShape* shape = new btStaticPlaneShape(planeNormal,planeConstant); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} +btCollisionShape* btCollisionWorldImporter::createBoxShape(const btVector3& halfExtents) +{ + btBoxShape* shape = new btBoxShape(halfExtents); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} +btCollisionShape* btCollisionWorldImporter::createSphereShape(btScalar radius) +{ + btSphereShape* shape = new btSphereShape(radius); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + + +btCollisionShape* btCollisionWorldImporter::createCapsuleShapeX(btScalar radius, btScalar height) +{ + btCapsuleShapeX* shape = new btCapsuleShapeX(radius,height); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createCapsuleShapeY(btScalar radius, btScalar height) +{ + btCapsuleShape* shape = new btCapsuleShape(radius,height); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createCapsuleShapeZ(btScalar radius, btScalar height) +{ + btCapsuleShapeZ* shape = new btCapsuleShapeZ(radius,height); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createCylinderShapeX(btScalar radius,btScalar height) +{ + btCylinderShapeX* shape = new btCylinderShapeX(btVector3(height,radius,radius)); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createCylinderShapeY(btScalar radius,btScalar height) +{ + btCylinderShape* shape = new btCylinderShape(btVector3(radius,height,radius)); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createCylinderShapeZ(btScalar radius,btScalar height) +{ + btCylinderShapeZ* shape = new btCylinderShapeZ(btVector3(radius,radius,height)); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createConeShapeX(btScalar radius,btScalar height) +{ + btConeShapeX* shape = new btConeShapeX(radius,height); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createConeShapeY(btScalar radius,btScalar height) +{ + btConeShape* shape = new btConeShape(radius,height); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCollisionShape* btCollisionWorldImporter::createConeShapeZ(btScalar radius,btScalar height) +{ + btConeShapeZ* shape = new btConeShapeZ(radius,height); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btTriangleIndexVertexArray* btCollisionWorldImporter::createTriangleMeshContainer() +{ + btTriangleIndexVertexArray* in = new btTriangleIndexVertexArray(); + m_allocatedTriangleIndexArrays.push_back(in); + return in; +} + +btOptimizedBvh* btCollisionWorldImporter::createOptimizedBvh() +{ + btOptimizedBvh* bvh = new btOptimizedBvh(); + m_allocatedBvhs.push_back(bvh); + return bvh; +} + + +btTriangleInfoMap* btCollisionWorldImporter::createTriangleInfoMap() +{ + btTriangleInfoMap* tim = new btTriangleInfoMap(); + m_allocatedTriangleInfoMaps.push_back(tim); + return tim; +} + +btBvhTriangleMeshShape* btCollisionWorldImporter::createBvhTriangleMeshShape(btStridingMeshInterface* trimesh, btOptimizedBvh* bvh) +{ + if (bvh) + { + btBvhTriangleMeshShape* bvhTriMesh = new btBvhTriangleMeshShape(trimesh,bvh->isQuantized(), false); + bvhTriMesh->setOptimizedBvh(bvh); + m_allocatedCollisionShapes.push_back(bvhTriMesh); + return bvhTriMesh; + } + + btBvhTriangleMeshShape* ts = new btBvhTriangleMeshShape(trimesh,true); + m_allocatedCollisionShapes.push_back(ts); + return ts; + +} +btCollisionShape* btCollisionWorldImporter::createConvexTriangleMeshShape(btStridingMeshInterface* trimesh) +{ + return 0; +} +#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT +btGImpactMeshShape* btCollisionWorldImporter::createGimpactShape(btStridingMeshInterface* trimesh) +{ + btGImpactMeshShape* shape = new btGImpactMeshShape(trimesh); + m_allocatedCollisionShapes.push_back(shape); + return shape; + +} +#endif //SUPPORT_GIMPACT_SHAPE_IMPORT + +btConvexHullShape* btCollisionWorldImporter::createConvexHullShape() +{ + btConvexHullShape* shape = new btConvexHullShape(); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btCompoundShape* btCollisionWorldImporter::createCompoundShape() +{ + btCompoundShape* shape = new btCompoundShape(); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + + +btScaledBvhTriangleMeshShape* btCollisionWorldImporter::createScaledTrangleMeshShape(btBvhTriangleMeshShape* meshShape,const btVector3& localScaling) +{ + btScaledBvhTriangleMeshShape* shape = new btScaledBvhTriangleMeshShape(meshShape,localScaling); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + +btMultiSphereShape* btCollisionWorldImporter::createMultiSphereShape(const btVector3* positions,const btScalar* radi,int numSpheres) +{ + btMultiSphereShape* shape = new btMultiSphereShape(positions, radi, numSpheres); + m_allocatedCollisionShapes.push_back(shape); + return shape; +} + + + + // query for data +int btCollisionWorldImporter::getNumCollisionShapes() const +{ + return m_allocatedCollisionShapes.size(); +} + +btCollisionShape* btCollisionWorldImporter::getCollisionShapeByIndex(int index) +{ + return m_allocatedCollisionShapes[index]; +} + +btCollisionShape* btCollisionWorldImporter::getCollisionShapeByName(const char* name) +{ + btCollisionShape** shapePtr = m_nameShapeMap.find(name); + if (shapePtr&& *shapePtr) + { + return *shapePtr; + } + return 0; +} + + +const char* btCollisionWorldImporter::getNameForPointer(const void* ptr) const +{ + const char*const * namePtr = m_objectNameMap.find(ptr); + if (namePtr && *namePtr) + return *namePtr; + return 0; +} + + +int btCollisionWorldImporter::getNumRigidBodies() const +{ + return m_allocatedRigidBodies.size(); +} + +btCollisionObject* btCollisionWorldImporter::getRigidBodyByIndex(int index) const +{ + return m_allocatedRigidBodies[index]; +} + + +int btCollisionWorldImporter::getNumBvhs() const +{ + return m_allocatedBvhs.size(); +} + btOptimizedBvh* btCollisionWorldImporter::getBvhByIndex(int index) const +{ + return m_allocatedBvhs[index]; +} + +int btCollisionWorldImporter::getNumTriangleInfoMaps() const +{ + return m_allocatedTriangleInfoMaps.size(); +} + +btTriangleInfoMap* btCollisionWorldImporter::getTriangleInfoMapByIndex(int index) const +{ + return m_allocatedTriangleInfoMaps[index]; +} + + diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h new file mode 100644 index 000000000..9a6d16fbe --- /dev/null +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.h @@ -0,0 +1,190 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#ifndef BT_COLLISION_WORLD_IMPORTER_H +#define BT_COLLISION_WORLD_IMPORTER_H + +#include "LinearMath/btTransform.h" +#include "LinearMath/btVector3.h" +#include "LinearMath/btAlignedObjectArray.h" +#include "LinearMath/btHashMap.h" + +class btCollisionShape; +class btCollisionObject; +struct btBulletSerializedArrays; + + +struct ConstraintInput; +class btCollisionWorld; +struct btCollisionShapeData; +class btTriangleIndexVertexArray; +class btStridingMeshInterface; +struct btStridingMeshInterfaceData; +class btGImpactMeshShape; +class btOptimizedBvh; +struct btTriangleInfoMap; +class btBvhTriangleMeshShape; +class btPoint2PointConstraint; +class btHingeConstraint; +class btConeTwistConstraint; +class btGeneric6DofConstraint; +class btGeneric6DofSpringConstraint; +class btSliderConstraint; +class btGearConstraint; +struct btContactSolverInfo; + + + + +class btCollisionWorldImporter +{ +protected: + btCollisionWorld* m_collisionWorld; + + int m_verboseMode; + + btAlignedObjectArray m_allocatedCollisionShapes; + btAlignedObjectArray m_allocatedRigidBodies; + + btAlignedObjectArray m_allocatedBvhs; + btAlignedObjectArray m_allocatedTriangleInfoMaps; + btAlignedObjectArray m_allocatedTriangleIndexArrays; + btAlignedObjectArray m_allocatedbtStridingMeshInterfaceDatas; + btAlignedObjectArray m_allocatedCollisionObjects; + + + btAlignedObjectArray m_allocatedNames; + + btAlignedObjectArray m_indexArrays; + btAlignedObjectArray m_shortIndexArrays; + btAlignedObjectArray m_charIndexArrays; + + btAlignedObjectArray m_floatVertexArrays; + btAlignedObjectArray m_doubleVertexArrays; + + + btHashMap m_bvhMap; + btHashMap m_timMap; + + btHashMap m_nameShapeMap; + btHashMap m_nameColObjMap; + + btHashMap m_objectNameMap; + + btHashMap m_shapeMap; + btHashMap m_bodyMap; + + + //methods + + + + char* duplicateName(const char* name); + + btCollisionShape* convertCollisionShape( btCollisionShapeData* shapeData ); + + +public: + + btCollisionWorldImporter(btCollisionWorld* world); + + virtual ~btCollisionWorldImporter(); + + bool convertAllObjects( btBulletSerializedArrays* arrays); + + ///delete all memory collision shapes, rigid bodies, constraints etc. allocated during the load. + ///make sure you don't use the dynamics world containing objects after you call this method + virtual void deleteAllData(); + + void setVerboseMode(int verboseMode) + { + m_verboseMode = verboseMode; + } + + int getVerboseMode() const + { + return m_verboseMode; + } + + // query for data + int getNumCollisionShapes() const; + btCollisionShape* getCollisionShapeByIndex(int index); + int getNumRigidBodies() const; + btCollisionObject* getRigidBodyByIndex(int index) const; + int getNumConstraints() const; + + int getNumBvhs() const; + btOptimizedBvh* getBvhByIndex(int index) const; + int getNumTriangleInfoMaps() const; + btTriangleInfoMap* getTriangleInfoMapByIndex(int index) const; + + // queris involving named objects + btCollisionShape* getCollisionShapeByName(const char* name); + btCollisionObject* getCollisionObjectByName(const char* name); + + + const char* getNameForPointer(const void* ptr) const; + + ///those virtuals are called by load and can be overridden by the user + + + + //bodies + + virtual btCollisionObject* createCollisionObject( const btTransform& startTransform, btCollisionShape* shape,const char* bodyName); + + ///shapes + + virtual btCollisionShape* createPlaneShape(const btVector3& planeNormal,btScalar planeConstant); + virtual btCollisionShape* createBoxShape(const btVector3& halfExtents); + virtual btCollisionShape* createSphereShape(btScalar radius); + virtual btCollisionShape* createCapsuleShapeX(btScalar radius, btScalar height); + virtual btCollisionShape* createCapsuleShapeY(btScalar radius, btScalar height); + virtual btCollisionShape* createCapsuleShapeZ(btScalar radius, btScalar height); + + virtual btCollisionShape* createCylinderShapeX(btScalar radius,btScalar height); + virtual btCollisionShape* createCylinderShapeY(btScalar radius,btScalar height); + virtual btCollisionShape* createCylinderShapeZ(btScalar radius,btScalar height); + virtual btCollisionShape* createConeShapeX(btScalar radius,btScalar height); + virtual btCollisionShape* createConeShapeY(btScalar radius,btScalar height); + virtual btCollisionShape* createConeShapeZ(btScalar radius,btScalar height); + virtual class btTriangleIndexVertexArray* createTriangleMeshContainer(); + virtual btBvhTriangleMeshShape* createBvhTriangleMeshShape(btStridingMeshInterface* trimesh, btOptimizedBvh* bvh); + virtual btCollisionShape* createConvexTriangleMeshShape(btStridingMeshInterface* trimesh); +#ifdef SUPPORT_GIMPACT_SHAPE_IMPORT + virtual btGImpactMeshShape* createGimpactShape(btStridingMeshInterface* trimesh); +#endif //SUPPORT_GIMPACT_SHAPE_IMPORT + virtual btStridingMeshInterfaceData* createStridingMeshInterfaceData(btStridingMeshInterfaceData* interfaceData); + + virtual class btConvexHullShape* createConvexHullShape(); + virtual class btCompoundShape* createCompoundShape(); + virtual class btScaledBvhTriangleMeshShape* createScaledTrangleMeshShape(btBvhTriangleMeshShape* meshShape,const btVector3& localScalingbtBvhTriangleMeshShape); + + virtual class btMultiSphereShape* createMultiSphereShape(const btVector3* positions,const btScalar* radi,int numSpheres); + + virtual btTriangleIndexVertexArray* createMeshInterface(btStridingMeshInterfaceData& meshData); + + ///acceleration and connectivity structures + virtual btOptimizedBvh* createOptimizedBvh(); + virtual btTriangleInfoMap* createTriangleInfoMap(); + + + + +}; + + +#endif //BT_WORLD_IMPORTER_H diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp index 991841ee2..7f4dea1c6 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp @@ -65,7 +65,13 @@ void btCompoundCollisionAlgorithm::preallocateChildAlgorithms(const btCollisionO const btCollisionShape* childShape = compoundShape->getChildShape(i); btCollisionObjectWrapper childWrap(colObjWrap,childShape,colObjWrap->getCollisionObject(),colObjWrap->getWorldTransform(),-1,i);//wrong child trans, but unused (hopefully) - m_childCollisionAlgorithms[i] = m_dispatcher->findAlgorithm(&childWrap,otherObjWrap,m_sharedManifold); + m_childCollisionAlgorithms[i] = m_dispatcher->findAlgorithm(&childWrap,otherObjWrap,m_sharedManifold, BT_CONTACT_POINT_ALGORITHMS); + + + btAlignedObjectArray m_childCollisionAlgorithmsContact; + btAlignedObjectArray m_childCollisionAlgorithmsClosestPoints; + + } } } @@ -123,13 +129,19 @@ public: //backup btTransform orgTrans = m_compoundColObjWrap->getWorldTransform(); - btTransform orgInterpolationTrans = m_compoundColObjWrap->getWorldTransform(); + const btTransform& childTrans = compoundShape->getChildTransform(index); btTransform newChildWorldTrans = orgTrans*childTrans ; //perform an AABB check first - btVector3 aabbMin0,aabbMax0,aabbMin1,aabbMax1; + btVector3 aabbMin0,aabbMax0; childShape->getAabb(newChildWorldTrans,aabbMin0,aabbMax0); + + btVector3 extendAabb(m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold); + aabbMin0 -= extendAabb; + aabbMax0 += extendAabb; + + btVector3 aabbMin1, aabbMax1; m_otherObjWrap->getCollisionShape()->getAabb(m_otherObjWrap->getWorldTransform(),aabbMin1,aabbMax1); if (gCompoundChildShapePairCallback) @@ -142,12 +154,22 @@ public: { btCollisionObjectWrapper compoundWrap(this->m_compoundColObjWrap,childShape,m_compoundColObjWrap->getCollisionObject(),newChildWorldTrans,-1,index); + + btCollisionAlgorithm* algo = 0; - - //the contactpoint is still projected back using the original inverted worldtrans - if (!m_childCollisionAlgorithms[index]) - m_childCollisionAlgorithms[index] = m_dispatcher->findAlgorithm(&compoundWrap,m_otherObjWrap,m_sharedManifold); - + if (m_resultOut->m_closestPointDistanceThreshold > 0) + { + algo = m_dispatcher->findAlgorithm(&compoundWrap, m_otherObjWrap, 0, BT_CLOSEST_POINT_ALGORITHMS); + } + else + { + //the contactpoint is still projected back using the original inverted worldtrans + if (!m_childCollisionAlgorithms[index]) + { + m_childCollisionAlgorithms[index] = m_dispatcher->findAlgorithm(&compoundWrap, m_otherObjWrap, m_sharedManifold, BT_CONTACT_POINT_ALGORITHMS); + } + algo = m_childCollisionAlgorithms[index]; + } const btCollisionObjectWrapper* tmpWrap = 0; @@ -164,8 +186,7 @@ public: m_resultOut->setShapeIdentifiersB(-1,index); } - - m_childCollisionAlgorithms[index]->processCollision(&compoundWrap,m_otherObjWrap,m_dispatchInfo,m_resultOut); + algo->processCollision(&compoundWrap,m_otherObjWrap,m_dispatchInfo,m_resultOut); #if 0 if (m_dispatchInfo.m_debugDraw && (m_dispatchInfo.m_debugDraw->getDebugMode() & btIDebugDraw::DBG_DrawAabb)) @@ -229,9 +250,12 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap removeChildAlgorithms(); preallocateChildAlgorithms(body0Wrap,body1Wrap); + m_compoundShapeRevision = compoundShape->getUpdateRevision(); } - + if (m_childCollisionAlgorithms.size()==0) + return; + const btDbvt* tree = compoundShape->getDynamicAabbTree(); //use a dynamic aabb tree to cull potential child-overlaps btCompoundLeafCallback callback(colObjWrap,otherObjWrap,m_dispatcher,dispatchInfo,resultOut,&m_childCollisionAlgorithms[0],m_sharedManifold); @@ -241,7 +265,7 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap ///so we should add a 'refreshManifolds' in the btCollisionAlgorithm { int i; - btManifoldArray manifoldArray; + manifoldArray.resize(0); for (i=0;igetWorldTransform().inverse() * otherObjWrap->getWorldTransform(); otherObjWrap->getCollisionShape()->getAabb(otherInCompoundSpace,localAabbMin,localAabbMax); + btVector3 extraExtends(resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold); + localAabbMin -= extraExtends; + localAabbMax += extraExtends; const ATTRIBUTE_ALIGNED16(btDbvtVolume) bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax); //process all children, that overlap with the given AABB bounds - tree->collideTV(tree->m_root,bounds,callback); + tree->collideTVNoStackAlloc(tree->m_root,bounds,stack2,callback); } else { @@ -288,10 +315,10 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap //iterate over all children, perform an AABB check inside ProcessChildShape int numChildren = m_childCollisionAlgorithms.size(); int i; - btManifoldArray manifoldArray; + manifoldArray.resize(0); const btCollisionShape* childShape = 0; btTransform orgTrans; - btTransform orgInterpolationTrans; + btTransform newChildWorldTrans; btVector3 aabbMin0,aabbMax0,aabbMin1,aabbMax1; @@ -301,8 +328,8 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap { childShape = compoundShape->getChildShape(i); //if not longer overlapping, remove the algorithm - orgTrans = colObjWrap->getWorldTransform(); - orgInterpolationTrans = colObjWrap->getWorldTransform(); + orgTrans = colObjWrap->getWorldTransform(); + const btTransform& childTrans = compoundShape->getChildTransform(i); newChildWorldTrans = orgTrans*childTrans ; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h index 536751456..d2086fbc0 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h @@ -26,6 +26,7 @@ class btDispatcher; #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" #include "btCollisionCreateFunc.h" #include "LinearMath/btAlignedObjectArray.h" +#include "BulletCollision/BroadphaseCollision/btDbvt.h" class btDispatcher; class btCollisionObject; @@ -36,6 +37,10 @@ extern btShapePairCallback gCompoundChildShapePairCallback; /// btCompoundCollisionAlgorithm supports collision between CompoundCollisionShapes and other collision shapes class btCompoundCollisionAlgorithm : public btActivatingCollisionAlgorithm { + btNodeStack stack2; + btManifoldArray manifoldArray; + +protected: btAlignedObjectArray m_childCollisionAlgorithms; bool m_isSwapped; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp index a52dd34fe..8dd7e4403 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp @@ -15,6 +15,7 @@ subject to the following restrictions: */ #include "btCompoundCompoundCollisionAlgorithm.h" +#include "LinearMath/btQuickprof.h" #include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include "BulletCollision/CollisionShapes/btCompoundShape.h" #include "BulletCollision/BroadphaseCollision/btDbvt.h" @@ -27,10 +28,8 @@ subject to the following restrictions: btShapePairCallback gCompoundCompoundChildShapePairCallback = 0; btCompoundCompoundCollisionAlgorithm::btCompoundCompoundCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,bool isSwapped) -:btActivatingCollisionAlgorithm(ci,body0Wrap,body1Wrap), -m_sharedManifold(ci.m_manifold) +:btCompoundCollisionAlgorithm(ci,body0Wrap,body1Wrap,isSwapped) { - m_ownsManifold = false; void* ptr = btAlignedAlloc(sizeof(btHashedSimplePairCache),16); m_childCollisionAlgorithmCache= new(ptr) btHashedSimplePairCache(); @@ -114,10 +113,9 @@ struct btCompoundCompoundLeafCallback : btDbvt::ICollide btManifoldResult* resultOut, btHashedSimplePairCache* childAlgorithmsCache, btPersistentManifold* sharedManifold) - :m_compound0ColObjWrap(compound1ObjWrap),m_compound1ColObjWrap(compound0ObjWrap),m_dispatcher(dispatcher),m_dispatchInfo(dispatchInfo),m_resultOut(resultOut), + :m_numOverlapPairs(0),m_compound0ColObjWrap(compound1ObjWrap),m_compound1ColObjWrap(compound0ObjWrap),m_dispatcher(dispatcher),m_dispatchInfo(dispatchInfo),m_resultOut(resultOut), m_childCollisionAlgorithmCache(childAlgorithmsCache), - m_sharedManifold(sharedManifold), - m_numOverlapPairs(0) + m_sharedManifold(sharedManifold) { } @@ -127,6 +125,7 @@ struct btCompoundCompoundLeafCallback : btDbvt::ICollide void Process(const btDbvtNode* leaf0,const btDbvtNode* leaf1) { + BT_PROFILE("btCompoundCompoundLeafCallback::Process"); m_numOverlapPairs++; @@ -162,6 +161,11 @@ struct btCompoundCompoundLeafCallback : btDbvt::ICollide childShape0->getAabb(newChildWorldTrans0,aabbMin0,aabbMax0); childShape1->getAabb(newChildWorldTrans1,aabbMin1,aabbMax1); + btVector3 thresholdVec(m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold, m_resultOut->m_closestPointDistanceThreshold); + + aabbMin0 -= thresholdVec; + aabbMax0 += thresholdVec; + if (gCompoundCompoundChildShapePairCallback) { if (!gCompoundCompoundChildShapePairCallback(childShape0,childShape1)) @@ -177,17 +181,24 @@ struct btCompoundCompoundLeafCallback : btDbvt::ICollide btSimplePair* pair = m_childCollisionAlgorithmCache->findPair(childIndex0,childIndex1); btCollisionAlgorithm* colAlgo = 0; + if (m_resultOut->m_closestPointDistanceThreshold > 0) + { + colAlgo = m_dispatcher->findAlgorithm(&compoundWrap0, &compoundWrap1, 0, BT_CLOSEST_POINT_ALGORITHMS); + } + else + { + if (pair) + { + colAlgo = (btCollisionAlgorithm*)pair->m_userPointer; - if (pair) - { - colAlgo = (btCollisionAlgorithm*)pair->m_userPointer; - - } else - { - colAlgo = m_dispatcher->findAlgorithm(&compoundWrap0,&compoundWrap1,m_sharedManifold); - pair = m_childCollisionAlgorithmCache->addOverlappingPair(childIndex0,childIndex1); - btAssert(pair); - pair->m_userPointer = colAlgo; + } + else + { + colAlgo = m_dispatcher->findAlgorithm(&compoundWrap0, &compoundWrap1, m_sharedManifold, BT_CONTACT_POINT_ALGORITHMS); + pair = m_childCollisionAlgorithmCache->addOverlappingPair(childIndex0, childIndex1); + btAssert(pair); + pair->m_userPointer = colAlgo; + } } btAssert(colAlgo); @@ -218,10 +229,12 @@ struct btCompoundCompoundLeafCallback : btDbvt::ICollide static DBVT_INLINE bool MyIntersect( const btDbvtAabbMm& a, - const btDbvtAabbMm& b, const btTransform& xform) + const btDbvtAabbMm& b, const btTransform& xform, btScalar distanceThreshold) { btVector3 newmin,newmax; btTransformAabb(b.Mins(),b.Maxs(),0.f,xform,newmin,newmax); + newmin -= btVector3(distanceThreshold, distanceThreshold, distanceThreshold); + newmax += btVector3(distanceThreshold, distanceThreshold, distanceThreshold); btDbvtAabbMm newb = btDbvtAabbMm::FromMM(newmin,newmax); return Intersect(a,newb); } @@ -230,7 +243,7 @@ static DBVT_INLINE bool MyIntersect( const btDbvtAabbMm& a, static inline void MycollideTT( const btDbvtNode* root0, const btDbvtNode* root1, const btTransform& xform, - btCompoundCompoundLeafCallback* callback) + btCompoundCompoundLeafCallback* callback, btScalar distanceThreshold) { if(root0&&root1) @@ -242,7 +255,7 @@ static inline void MycollideTT( const btDbvtNode* root0, stkStack[0]=btDbvt::sStkNN(root0,root1); do { btDbvt::sStkNN p=stkStack[--depth]; - if(MyIntersect(p.a->volume,p.b->volume,xform)) + if(MyIntersect(p.a->volume,p.b->volume,xform, distanceThreshold)) { if(depth>treshold) { @@ -292,12 +305,21 @@ void btCompoundCompoundCollisionAlgorithm::processCollision (const btCollisionOb const btCompoundShape* compoundShape0 = static_cast(col0ObjWrap->getCollisionShape()); const btCompoundShape* compoundShape1 = static_cast(col1ObjWrap->getCollisionShape()); + const btDbvt* tree0 = compoundShape0->getDynamicAabbTree(); + const btDbvt* tree1 = compoundShape1->getDynamicAabbTree(); + if (!tree0 || !tree1) + { + return btCompoundCollisionAlgorithm::processCollision(body0Wrap,body1Wrap,dispatchInfo,resultOut); + } ///btCompoundShape might have changed: ////make sure the internal child collision algorithm caches are still valid if ((compoundShape0->getUpdateRevision() != m_compoundShapeRevision0) || (compoundShape1->getUpdateRevision() != m_compoundShapeRevision1)) { ///clear all removeChildAlgorithms(); + m_compoundShapeRevision0 = compoundShape0->getUpdateRevision(); + m_compoundShapeRevision1 = compoundShape1->getUpdateRevision(); + } @@ -329,14 +351,13 @@ void btCompoundCompoundCollisionAlgorithm::processCollision (const btCollisionOb } - const btDbvt* tree0 = compoundShape0->getDynamicAabbTree(); - const btDbvt* tree1 = compoundShape1->getDynamicAabbTree(); + btCompoundCompoundLeafCallback callback(col0ObjWrap,col1ObjWrap,this->m_dispatcher,dispatchInfo,resultOut,this->m_childCollisionAlgorithmCache,m_sharedManifold); const btTransform xform=col0ObjWrap->getWorldTransform().inverse()*col1ObjWrap->getWorldTransform(); - MycollideTT(tree0->m_root,tree1->m_root,xform,&callback); + MycollideTT(tree0->m_root,tree1->m_root,xform,&callback, resultOut->m_closestPointDistanceThreshold); //printf("#compound-compound child/leaf overlap =%d \r",callback.m_numOverlapPairs); @@ -376,7 +397,9 @@ void btCompoundCompoundCollisionAlgorithm::processCollision (const btCollisionOb newChildWorldTrans0 = orgTrans0*childTrans0 ; childShape0->getAabb(newChildWorldTrans0,aabbMin0,aabbMax0); } - + btVector3 thresholdVec(resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold, resultOut->m_closestPointDistanceThreshold); + aabbMin0 -= thresholdVec; + aabbMax0 += thresholdVec; { btTransform orgInterpolationTrans1; const btCollisionShape* childShape1 = 0; @@ -391,7 +414,8 @@ void btCompoundCompoundCollisionAlgorithm::processCollision (const btCollisionOb childShape1->getAabb(newChildWorldTrans1,aabbMin1,aabbMax1); } - + aabbMin1 -= thresholdVec; + aabbMax1 += thresholdVec; if (!TestAabbAgainstAabb2(aabbMin0,aabbMax0,aabbMin1,aabbMax1)) { diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h index 7e2d7ad70..06a762f20 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h @@ -17,6 +17,8 @@ subject to the following restrictions: #ifndef BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H #define BT_COMPOUND_COMPOUND_COLLISION_ALGORITHM_H +#include "btCompoundCollisionAlgorithm.h" + #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btDispatcher.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h" @@ -35,15 +37,12 @@ typedef bool (*btShapePairCallback)(const btCollisionShape* pShape0, const btCol extern btShapePairCallback gCompoundCompoundChildShapePairCallback; /// btCompoundCompoundCollisionAlgorithm supports collision between two btCompoundCollisionShape shapes -class btCompoundCompoundCollisionAlgorithm : public btActivatingCollisionAlgorithm +class btCompoundCompoundCollisionAlgorithm : public btCompoundCollisionAlgorithm { class btHashedSimplePairCache* m_childCollisionAlgorithmCache; btSimplePairArray m_removePairs; - class btPersistentManifold* m_sharedManifold; - bool m_ownsManifold; - int m_compoundShapeRevision0;//to keep track of changes, so that childAlgorithm array can be updated int m_compoundShapeRevision1; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp index 4ec9ae713..1cb3d2e7a 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp @@ -47,8 +47,6 @@ subject to the following restrictions: btConvex2dConvex2dAlgorithm::CreateFunc::CreateFunc(btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver) { - m_numPerturbationIterations = 0; - m_minimumPointsPerturbationThreshold = 3; m_simplexSolver = simplexSolver; m_pdSolver = pdSolver; } @@ -57,15 +55,13 @@ btConvex2dConvex2dAlgorithm::CreateFunc::~CreateFunc() { } -btConvex2dConvex2dAlgorithm::btConvex2dConvex2dAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver,int numPerturbationIterations, int minimumPointsPerturbationThreshold) +btConvex2dConvex2dAlgorithm::btConvex2dConvex2dAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver,int /* numPerturbationIterations */, int /* minimumPointsPerturbationThreshold */) : btActivatingCollisionAlgorithm(ci,body0Wrap,body1Wrap), m_simplexSolver(simplexSolver), m_pdSolver(pdSolver), m_ownManifold (false), m_manifoldPtr(mf), -m_lowLevelOfDetail(false), - m_numPerturbationIterations(numPerturbationIterations), -m_minimumPointsPerturbationThreshold(minimumPointsPerturbationThreshold) +m_lowLevelOfDetail(false) { (void)body0Wrap; (void)body1Wrap; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h index 18d9385a1..24d133677 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h @@ -40,9 +40,6 @@ class btConvex2dConvex2dAlgorithm : public btActivatingCollisionAlgorithm btPersistentManifold* m_manifoldPtr; bool m_lowLevelOfDetail; - int m_numPerturbationIterations; - int m_minimumPointsPerturbationThreshold; - public: btConvex2dConvex2dAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver, int numPerturbationIterations, int minimumPointsPerturbationThreshold); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp index e23f5f7a8..c774383dc 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp @@ -15,6 +15,7 @@ subject to the following restrictions: #include "btConvexConcaveCollisionAlgorithm.h" +#include "LinearMath/btQuickprof.h" #include "BulletCollision/CollisionDispatch/btCollisionObject.h" #include "BulletCollision/CollisionShapes/btMultiSphereShape.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" @@ -79,6 +80,7 @@ void btConvexTriangleCallback::clearCache() void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, int triangleIndex) { + BT_PROFILE("btConvexTriangleCallback::processTriangle"); if (!TestTriangleAgainstAabb2(triangle, m_aabbMin, m_aabbMax)) { @@ -88,20 +90,19 @@ partId, int triangleIndex) //just for debugging purposes //printf("triangle %d",m_triangleCount++); - const btCollisionObject* ob = const_cast(m_triBodyWrap->getCollisionObject()); + btCollisionAlgorithmConstructionInfo ci; ci.m_dispatcher1 = m_dispatcher; - //const btCollisionObject* ob = static_cast(m_triBodyWrap->getCollisionObject()); - - #if 0 + ///debug drawing of the overlapping triangles if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe )) { + const btCollisionObject* ob = const_cast(m_triBodyWrap->getCollisionObject()); btVector3 color(1,1,0); btTransform& tr = ob->getWorldTransform(); m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color); @@ -117,8 +118,16 @@ partId, int triangleIndex) btCollisionObjectWrapper triObWrap(m_triBodyWrap,&tm,m_triBodyWrap->getCollisionObject(),m_triBodyWrap->getWorldTransform(),partId,triangleIndex);//correct transform? - btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBodyWrap,&triObWrap,m_manifoldPtr); - + btCollisionAlgorithm* colAlgo = 0; + + if (m_resultOut->m_closestPointDistanceThreshold > 0) + { + colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBodyWrap, &triObWrap, 0, BT_CLOSEST_POINT_ALGORITHMS); + } + else + { + colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBodyWrap, &triObWrap, m_manifoldPtr, BT_CONTACT_POINT_ALGORITHMS); + } const btCollisionObjectWrapper* tmpWrap = 0; if (m_resultOut->getBody0Internal() == m_triBodyWrap->getCollisionObject()) @@ -169,7 +178,8 @@ void btConvexTriangleCallback::setTimeStepAndCounters(btScalar collisionMarginTr const btCollisionShape* convexShape = static_cast(m_convexBodyWrap->getCollisionShape()); //CollisionShape* triangleShape = static_cast(triBody->m_collisionShape); convexShape->getAabb(convexInTriangleSpace,m_aabbMin,m_aabbMax); - btScalar extraMargin = collisionMarginTriangle; + btScalar extraMargin = collisionMarginTriangle+ resultOut->m_closestPointDistanceThreshold; + btVector3 extra(extraMargin,extraMargin,extraMargin); m_aabbMax += extra; @@ -185,7 +195,7 @@ void btConvexConcaveCollisionAlgorithm::clearCache() void btConvexConcaveCollisionAlgorithm::processCollision (const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) { - + BT_PROFILE("btConvexConcaveCollisionAlgorithm::processCollision"); const btCollisionObjectWrapper* convexBodyWrap = m_isSwapped ? body1Wrap : body0Wrap; const btCollisionObjectWrapper* triBodyWrap = m_isSwapped ? body0Wrap : body1Wrap; @@ -266,6 +276,7 @@ btScalar btConvexConcaveCollisionAlgorithm::calculateTimeOfImpact(btCollisionObj virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex) { + BT_PROFILE("processTriangle"); (void)partId; (void)triangleIndex; //do a swept sphere for now diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h index e90d06eb1..93d842ef5 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h @@ -26,14 +26,16 @@ class btDispatcher; #include "btCollisionCreateFunc.h" ///For each triangle in the concave mesh that overlaps with the AABB of a convex (m_convexProxy), processTriangle is called. -class btConvexTriangleCallback : public btTriangleCallback +ATTRIBUTE_ALIGNED16(class) btConvexTriangleCallback : public btTriangleCallback { - const btCollisionObjectWrapper* m_convexBodyWrap; - const btCollisionObjectWrapper* m_triBodyWrap; btVector3 m_aabbMin; btVector3 m_aabbMax ; + const btCollisionObjectWrapper* m_convexBodyWrap; + const btCollisionObjectWrapper* m_triBodyWrap; + + btManifoldResult* m_resultOut; btDispatcher* m_dispatcher; @@ -41,6 +43,8 @@ class btConvexTriangleCallback : public btTriangleCallback btScalar m_collisionMarginTriangle; public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + int m_triangleCount; btPersistentManifold* m_manifoldPtr; @@ -75,17 +79,19 @@ int m_triangleCount; /// btConvexConcaveCollisionAlgorithm supports collision between convex shapes and (concave) trianges meshes. -class btConvexConcaveCollisionAlgorithm : public btActivatingCollisionAlgorithm +ATTRIBUTE_ALIGNED16(class) btConvexConcaveCollisionAlgorithm : public btActivatingCollisionAlgorithm { - bool m_isSwapped; - btConvexTriangleCallback m_btConvexTriangleCallback; + bool m_isSwapped; + public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + btConvexConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,bool isSwapped); virtual ~btConvexConcaveCollisionAlgorithm(); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp index 7f2722aa4..bc23fdb98 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp @@ -179,11 +179,10 @@ static SIMD_FORCE_INLINE btScalar capsuleCapsuleDistance( -btConvexConvexAlgorithm::CreateFunc::CreateFunc(btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver) +btConvexConvexAlgorithm::CreateFunc::CreateFunc(btConvexPenetrationDepthSolver* pdSolver) { m_numPerturbationIterations = 0; m_minimumPointsPerturbationThreshold = 3; - m_simplexSolver = simplexSolver; m_pdSolver = pdSolver; } @@ -191,9 +190,8 @@ btConvexConvexAlgorithm::CreateFunc::~CreateFunc() { } -btConvexConvexAlgorithm::btConvexConvexAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver,int numPerturbationIterations, int minimumPointsPerturbationThreshold) +btConvexConvexAlgorithm::btConvexConvexAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,btConvexPenetrationDepthSolver* pdSolver,int numPerturbationIterations, int minimumPointsPerturbationThreshold) : btActivatingCollisionAlgorithm(ci,body0Wrap,body1Wrap), -m_simplexSolver(simplexSolver), m_pdSolver(pdSolver), m_ownManifold (false), m_manifoldPtr(mf), @@ -349,8 +347,8 @@ void btConvexConvexAlgorithm ::processCollision (const btCollisionObjectWrapper* btGjkPairDetector::ClosestPointInput input; - - btGjkPairDetector gjkPairDetector(min0,min1,m_simplexSolver,m_pdSolver); + btVoronoiSimplexSolver simplexSolver; + btGjkPairDetector gjkPairDetector( min0, min1, &simplexSolver, m_pdSolver ); //TODO: if (dispatchInfo.m_useContinuous) gjkPairDetector.setMinkowskiA(min0); gjkPairDetector.setMinkowskiB(min1); @@ -367,7 +365,7 @@ void btConvexConvexAlgorithm ::processCollision (const btCollisionObjectWrapper* // input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactProcessingThreshold(); //} else //{ - input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactBreakingThreshold(); + input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactBreakingThreshold()+resultOut->m_closestPointDistanceThreshold; // } input.m_maximumDistanceSquared*= input.m_maximumDistanceSquared; @@ -503,9 +501,11 @@ void btConvexConvexAlgorithm ::processCollision (const btCollisionObjectWrapper* // printf("sepNormalWorldSpace=%f,%f,%f\n",sepNormalWorldSpace.getX(),sepNormalWorldSpace.getY(),sepNormalWorldSpace.getZ()); + worldVertsB1.resize(0); btPolyhedralContactClipping::clipHullAgainstHull(sepNormalWorldSpace, *polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(), body0Wrap->getWorldTransform(), - body1Wrap->getWorldTransform(), minDist-threshold, threshold, *resultOut); + body1Wrap->getWorldTransform(), minDist-threshold, threshold, worldVertsB1,worldVertsB2, + *resultOut); } if (m_ownManifold) @@ -568,8 +568,9 @@ void btConvexConvexAlgorithm ::processCollision (const btCollisionObjectWrapper* if (foundSepAxis) { + worldVertsB2.resize(0); btPolyhedralContactClipping::clipFaceAgainstHull(sepNormalWorldSpace, *polyhedronA->getConvexPolyhedron(), - body0Wrap->getWorldTransform(), vertices, minDist-threshold, maxDist, *resultOut); + body0Wrap->getWorldTransform(), vertices, worldVertsB2,minDist-threshold, maxDist, *resultOut); } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h index 51db0c654..cd75ba12d 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h @@ -24,6 +24,7 @@ subject to the following restrictions: #include "btCollisionCreateFunc.h" #include "btCollisionDispatcher.h" #include "LinearMath/btTransformUtil.h" //for btConvexSeparatingDistanceUtil +#include "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h" class btConvexPenetrationDepthSolver; @@ -42,9 +43,10 @@ class btConvexConvexAlgorithm : public btActivatingCollisionAlgorithm #ifdef USE_SEPDISTANCE_UTIL2 btConvexSeparatingDistanceUtil m_sepDistance; #endif - btSimplexSolverInterface* m_simplexSolver; btConvexPenetrationDepthSolver* m_pdSolver; + btVertexArray worldVertsB1; + btVertexArray worldVertsB2; bool m_ownManifold; btPersistentManifold* m_manifoldPtr; @@ -59,7 +61,7 @@ class btConvexConvexAlgorithm : public btActivatingCollisionAlgorithm public: - btConvexConvexAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap, btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver, int numPerturbationIterations, int minimumPointsPerturbationThreshold); + btConvexConvexAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap, btConvexPenetrationDepthSolver* pdSolver, int numPerturbationIterations, int minimumPointsPerturbationThreshold); virtual ~btConvexConvexAlgorithm(); @@ -87,18 +89,17 @@ public: { btConvexPenetrationDepthSolver* m_pdSolver; - btSimplexSolverInterface* m_simplexSolver; int m_numPerturbationIterations; int m_minimumPointsPerturbationThreshold; - CreateFunc(btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver); + CreateFunc(btConvexPenetrationDepthSolver* pdSolver); virtual ~CreateFunc(); virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap) { void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConvexAlgorithm)); - return new(mem) btConvexConvexAlgorithm(ci.m_manifold,ci,body0Wrap,body1Wrap,m_simplexSolver,m_pdSolver,m_numPerturbationIterations,m_minimumPointsPerturbationThreshold); + return new(mem) btConvexConvexAlgorithm(ci.m_manifold,ci,body0Wrap,body1Wrap,m_pdSolver,m_numPerturbationIterations,m_minimumPointsPerturbationThreshold); } }; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp index c3cacec4a..f6e4e57b0 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp @@ -44,9 +44,7 @@ btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefault //btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc* stackAlloc,btPoolAllocator* persistentManifoldPool,btPoolAllocator* collisionAlgorithmPool) { - void* mem = btAlignedAlloc(sizeof(btVoronoiSimplexSolver),16); - m_simplexSolver = new (mem)btVoronoiSimplexSolver(); - + void* mem = NULL; if (constructionInfo.m_useEpaPenetrationAlgorithm) { mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver),16); @@ -59,7 +57,7 @@ btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefault //default CreationFunctions, filling the m_doubleDispatch table mem = btAlignedAlloc(sizeof(btConvexConvexAlgorithm::CreateFunc),16); - m_convexConvexCreateFunc = new(mem) btConvexConvexAlgorithm::CreateFunc(m_simplexSolver,m_pdSolver); + m_convexConvexCreateFunc = new(mem) btConvexConvexAlgorithm::CreateFunc(m_pdSolver); mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc),16); m_convexConcaveCreateFunc = new (mem)btConvexConcaveCollisionAlgorithm::CreateFunc; mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc),16); @@ -105,12 +103,12 @@ btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefault int maxSize = sizeof(btConvexConvexAlgorithm); int maxSize2 = sizeof(btConvexConcaveCollisionAlgorithm); int maxSize3 = sizeof(btCompoundCollisionAlgorithm); - int sl = sizeof(btConvexSeparatingDistanceUtil); - sl = sizeof(btGjkPairDetector); + int maxSize4 = sizeof(btCompoundCompoundCollisionAlgorithm); + int collisionAlgorithmMaxElementSize = btMax(maxSize,constructionInfo.m_customCollisionAlgorithmMaxElementSize); collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize2); collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize3); - + collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize4); if (constructionInfo.m_persistentManifoldPool) { @@ -123,6 +121,7 @@ btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefault m_persistentManifoldPool = new (mem) btPoolAllocator(sizeof(btPersistentManifold),constructionInfo.m_defaultMaxPersistentManifoldPoolSize); } + collisionAlgorithmMaxElementSize = (collisionAlgorithmMaxElementSize+16)&0xffffffffffff0; if (constructionInfo.m_collisionAlgorithmPool) { m_ownsCollisionAlgorithmPool = false; @@ -192,9 +191,6 @@ btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration() m_planeConvexCF->~btCollisionAlgorithmCreateFunc(); btAlignedFree( m_planeConvexCF); - m_simplexSolver->~btVoronoiSimplexSolver(); - btAlignedFree(m_simplexSolver); - m_pdSolver->~btConvexPenetrationDepthSolver(); btAlignedFree(m_pdSolver); @@ -202,6 +198,86 @@ btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration() } +btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1) +{ + + + if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE)) + { + return m_sphereSphereCF; + } +#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM + if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == BOX_SHAPE_PROXYTYPE)) + { + return m_sphereBoxCF; + } + + if ((proxyType0 == BOX_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE)) + { + return m_boxSphereCF; + } +#endif //USE_BUGGY_SPHERE_BOX_ALGORITHM + + + if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1 == TRIANGLE_SHAPE_PROXYTYPE)) + { + return m_sphereTriangleCF; + } + + if ((proxyType0 == TRIANGLE_SHAPE_PROXYTYPE) && (proxyType1 == SPHERE_SHAPE_PROXYTYPE)) + { + return m_triangleSphereCF; + } + + if (btBroadphaseProxy::isConvex(proxyType0) && (proxyType1 == STATIC_PLANE_PROXYTYPE)) + { + return m_convexPlaneCF; + } + + if (btBroadphaseProxy::isConvex(proxyType1) && (proxyType0 == STATIC_PLANE_PROXYTYPE)) + { + return m_planeConvexCF; + } + + + + if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1)) + { + return m_convexConvexCreateFunc; + } + + if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1)) + { + return m_convexConcaveCreateFunc; + } + + if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0)) + { + return m_swappedConvexConcaveCreateFunc; + } + + + if (btBroadphaseProxy::isCompound(proxyType0) && btBroadphaseProxy::isCompound(proxyType1)) + { + return m_compoundCompoundCreateFunc; + } + + if (btBroadphaseProxy::isCompound(proxyType0)) + { + return m_compoundCreateFunc; + } + else + { + if (btBroadphaseProxy::isCompound(proxyType1)) + { + return m_swappedCompoundCreateFunc; + } + } + + //failed to find an algorithm + return m_emptyCreateFunc; + +} btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1) { diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h index 2078420e1..17c7596cf 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h @@ -60,8 +60,7 @@ protected: btPoolAllocator* m_collisionAlgorithmPool; bool m_ownsCollisionAlgorithmPool; - //default simplex/penetration depth solvers - btVoronoiSimplexSolver* m_simplexSolver; + //default penetration depth solver btConvexPenetrationDepthSolver* m_pdSolver; //default CreationFunctions, filling the m_doubleDispatch table @@ -102,14 +101,10 @@ public: } - virtual btVoronoiSimplexSolver* getSimplexSolver() - { - return m_simplexSolver; - } - - virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1); + virtual btCollisionAlgorithmCreateFunc* getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1); + ///Use this method to allow to generate multiple contact points between at once, between two objects using the generic convex-convex algorithm. ///By default, this feature is disabled for best performance. ///@param numPerturbationIterations controls the number of collision queries. Set it to zero to disable the feature. diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp index cfcca5654..8c8a7c3c1 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp @@ -28,9 +28,7 @@ int gFindSimplePairs =0; -btHashedSimplePairCache::btHashedSimplePairCache(): - m_blockedForChanges(false) -{ +btHashedSimplePairCache::btHashedSimplePairCache() { int initialAllocatedSize= 2; m_overlappingPairArray.reserve(initialAllocatedSize); growTables(); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h index e88ef97e9..186964d72 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h @@ -55,9 +55,7 @@ extern int gFindSimplePairs; class btHashedSimplePairCache { btSimplePairArray m_overlappingPairArray; - - bool m_blockedForChanges; - + protected: diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp index 73fa4e87e..6cba442ca 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp @@ -193,7 +193,7 @@ struct btConnectivityProcessor : public btTriangleCallback btScalar len2 = calculatedEdge.length2(); btScalar correctedAngle(0); - btVector3 calculatedNormalB = normalA; + //btVector3 calculatedNormalB = normalA; bool isConvex = false; if (len2m_planarEpsilon) @@ -213,10 +213,6 @@ struct btConnectivityProcessor : public btTriangleCallback isConvex = (dotA<0.); correctedAngle = isConvex ? ang4 : -ang4; - btQuaternion orn2(calculatedEdge,-correctedAngle); - calculatedNormalB = btMatrix3x3(orn2)*normalA; - - } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp index 4b2986a00..be8e51d52 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp @@ -24,10 +24,9 @@ ContactAddedCallback gContactAddedCallback=0; -///User can override this material combiner by implementing gContactAddedCallback and setting body0->m_collisionFlags |= btCollisionObject::customMaterialCallback; -inline btScalar calculateCombinedRollingFriction(const btCollisionObject* body0,const btCollisionObject* body1) +btScalar btManifoldResult::calculateCombinedRollingFriction(const btCollisionObject* body0,const btCollisionObject* body1) { - btScalar friction = body0->getRollingFriction() * body1->getRollingFriction(); + btScalar friction = body0->getRollingFriction() * body1->getFriction() + body1->getRollingFriction() * body0->getFriction(); const btScalar MAX_FRICTION = btScalar(10.); if (friction < -MAX_FRICTION) @@ -38,6 +37,17 @@ inline btScalar calculateCombinedRollingFriction(const btCollisionObject* body0, } +btScalar btManifoldResult::calculateCombinedSpinningFriction(const btCollisionObject* body0,const btCollisionObject* body1) +{ + btScalar friction = body0->getSpinningFriction() * body1->getFriction() + body1->getSpinningFriction() * body0->getFriction(); + + const btScalar MAX_FRICTION = btScalar(10.); + if (friction < -MAX_FRICTION) + friction = -MAX_FRICTION; + if (friction > MAX_FRICTION) + friction = MAX_FRICTION; + return friction; +} ///User can override this material combiner by implementing gContactAddedCallback and setting body0->m_collisionFlags |= btCollisionObject::customMaterialCallback; btScalar btManifoldResult::calculateCombinedFriction(const btCollisionObject* body0,const btCollisionObject* body1) @@ -58,6 +68,22 @@ btScalar btManifoldResult::calculateCombinedRestitution(const btCollisionObject* return body0->getRestitution() * body1->getRestitution(); } +btScalar btManifoldResult::calculateCombinedContactDamping(const btCollisionObject* body0,const btCollisionObject* body1) +{ + return body0->getContactDamping() + body1->getContactDamping(); +} + +btScalar btManifoldResult::calculateCombinedContactStiffness(const btCollisionObject* body0,const btCollisionObject* body1) +{ + + btScalar s0 = body0->getContactStiffness(); + btScalar s1 = body1->getContactStiffness(); + + btScalar tmp0 = btScalar(1)/s0; + btScalar tmp1 = btScalar(1)/s1; + btScalar combinedStiffness = btScalar(1) / (tmp0+tmp1); + return combinedStiffness; +} btManifoldResult::btManifoldResult(const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap) @@ -70,6 +96,7 @@ btManifoldResult::btManifoldResult(const btCollisionObjectWrapper* body0Wrap,con m_index0(-1), m_index1(-1) #endif //DEBUG_PART_INDEX + , m_closestPointDistanceThreshold(0) { } @@ -109,6 +136,16 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b newPt.m_combinedFriction = calculateCombinedFriction(m_body0Wrap->getCollisionObject(),m_body1Wrap->getCollisionObject()); newPt.m_combinedRestitution = calculateCombinedRestitution(m_body0Wrap->getCollisionObject(),m_body1Wrap->getCollisionObject()); newPt.m_combinedRollingFriction = calculateCombinedRollingFriction(m_body0Wrap->getCollisionObject(),m_body1Wrap->getCollisionObject()); + newPt.m_combinedSpinningFriction = calculateCombinedSpinningFriction(m_body0Wrap->getCollisionObject(),m_body1Wrap->getCollisionObject()); + + if ( (m_body0Wrap->getCollisionObject()->getCollisionFlags()& btCollisionObject::CF_HAS_CONTACT_STIFFNESS_DAMPING) || + (m_body1Wrap->getCollisionObject()->getCollisionFlags()& btCollisionObject::CF_HAS_CONTACT_STIFFNESS_DAMPING)) + { + newPt.m_combinedContactDamping1 = calculateCombinedContactDamping(m_body0Wrap->getCollisionObject(),m_body1Wrap->getCollisionObject()); + newPt.m_combinedContactStiffness1 = calculateCombinedContactStiffness(m_body0Wrap->getCollisionObject(),m_body1Wrap->getCollisionObject()); + newPt.m_contactPointFlags |= BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING; + } + btPlaneSpace1(newPt.m_normalWorldOnB,newPt.m_lateralFrictionDir1,newPt.m_lateralFrictionDir2); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h index 977b9a02f..86bbc3f72 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h @@ -49,17 +49,19 @@ protected: int m_index0; int m_index1; - + public: btManifoldResult() -#ifdef DEBUG_PART_INDEX : +#ifdef DEBUG_PART_INDEX + m_partId0(-1), m_partId1(-1), m_index0(-1), m_index1(-1) #endif //DEBUG_PART_INDEX + m_closestPointDistanceThreshold(0) { } @@ -142,9 +144,15 @@ public: return m_body1Wrap->getCollisionObject(); } + btScalar m_closestPointDistanceThreshold; + /// in the future we can let the user override the methods to combine restitution and friction static btScalar calculateCombinedRestitution(const btCollisionObject* body0,const btCollisionObject* body1); static btScalar calculateCombinedFriction(const btCollisionObject* body0,const btCollisionObject* body1); + static btScalar calculateCombinedRollingFriction(const btCollisionObject* body0,const btCollisionObject* body1); + static btScalar calculateCombinedSpinningFriction(const btCollisionObject* body0,const btCollisionObject* body1); + static btScalar calculateCombinedContactDamping(const btCollisionObject* body0,const btCollisionObject* body1); + static btScalar calculateCombinedContactStiffness(const btCollisionObject* body0,const btCollisionObject* body1); }; #endif //BT_MANIFOLD_RESULT_H diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp index 36ba21f5b..27eaec305 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp @@ -12,6 +12,7 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ +#define CLEAR_MANIFOLD 1 #include "btSphereSphereCollisionAlgorithm.h" #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" @@ -62,7 +63,7 @@ void btSphereSphereCollisionAlgorithm::processCollision (const btCollisionObject #endif ///iff distance positive, don't generate a new contact - if ( len > (radius0+radius1)) + if ( len > (radius0+radius1+resultOut->m_closestPointDistanceThreshold)) { #ifndef CLEAR_MANIFOLD resultOut->refreshContactPoints(); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp index 280a4d355..86d4e7440 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp @@ -56,7 +56,7 @@ void btSphereTriangleCollisionAlgorithm::processCollision (const btCollisionObje /// report a contact. internally this will be kept persistent, and contact reduction is done resultOut->setPersistentManifold(m_manifoldPtr); - SphereTriangleDetector detector(sphere,triangle, m_manifoldPtr->getContactBreakingThreshold()); + SphereTriangleDetector detector(sphere,triangle, m_manifoldPtr->getContactBreakingThreshold()+ resultOut->m_closestPointDistanceThreshold); btDiscreteCollisionDetectorInterface::ClosestPointInput input; input.m_maximumDistanceSquared = btScalar(BT_LARGE_FLOAT);///@todo: tighter bounds diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp index ace4cfa26..0940da1a4 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp @@ -245,16 +245,18 @@ void btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,co btStridingMeshInterface* m_meshInterface; btTriangleCallback* m_callback; btVector3 m_triangle[3]; - + int m_numOverlap; MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface) :m_meshInterface(meshInterface), - m_callback(callback) + m_callback(callback), + m_numOverlap(0) { } virtual void processNode(int nodeSubPart, int nodeTriangleIndex) { + m_numOverlap++; const unsigned char *vertexbase; int numverts; PHY_ScalarType type; @@ -321,8 +323,7 @@ void btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,co MyNodeOverlapCallback myNodeCallback(callback,m_meshInterface); m_bvh->reportAabbOverlappingNodex(&myNodeCallback,aabbMin,aabbMax); - - + #endif//DISABLE_BVH diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h index 493d63553..1fa4995d1 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h @@ -39,7 +39,11 @@ ATTRIBUTE_ALIGNED16(class) btBvhTriangleMeshShape : public btTriangleMeshShape bool m_useQuantizedAabbCompression; bool m_ownsBvh; +#ifdef __clang__ + bool m_pad[11] __attribute__((unused));////need padding due to alignment +#else bool m_pad[11];////need padding due to alignment +#endif public: diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h index 7578bb258..f8c55ace4 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h @@ -117,6 +117,7 @@ public: ///fills the dataBuffer and returns the struct name (and 0 on failure) virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const; + SIMD_FORCE_INLINE void deSerializeFloat(struct btCapsuleShapeData* dataBuffer); }; @@ -181,4 +182,13 @@ SIMD_FORCE_INLINE const char* btCapsuleShape::serialize(void* dataBuffer, btSeri return "btCapsuleShapeData"; } +SIMD_FORCE_INLINE void btCapsuleShape::deSerializeFloat(btCapsuleShapeData* dataBuffer) +{ + m_implicitShapeDimensions.deSerializeFloat(dataBuffer->m_convexInternalShapeData.m_implicitShapeDimensions); + m_collisionMargin = dataBuffer->m_convexInternalShapeData.m_collisionMargin; + m_localScaling.deSerializeFloat(dataBuffer->m_convexInternalShapeData.m_localScaling); + //it is best to already pre-allocate the matching btCapsuleShape*(X/Z) version to match m_upAxis + m_upAxis = dataBuffer->m_upAxis; +} + #endif //BT_CAPSULE_SHAPE_H diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h index ff017a206..6c4916fbd 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h @@ -29,12 +29,13 @@ ATTRIBUTE_ALIGNED16(class) btCollisionShape protected: int m_shapeType; void* m_userPointer; + int m_userIndex; public: BT_DECLARE_ALIGNED_ALLOCATOR(); - btCollisionShape() : m_shapeType (INVALID_SHAPE_PROXYTYPE), m_userPointer(0) + btCollisionShape() : m_shapeType (INVALID_SHAPE_PROXYTYPE), m_userPointer(0), m_userIndex(-1) { } @@ -47,7 +48,7 @@ public: virtual void getBoundingSphere(btVector3& center,btScalar& radius) const; - ///getAngularMotionDisc returns the maximus radius needed for Conservative Advancement to handle time-of-impact with rotations. + ///getAngularMotionDisc returns the maximum radius needed for Conservative Advancement to handle time-of-impact with rotations. virtual btScalar getAngularMotionDisc() const; virtual btScalar getContactBreakingThreshold(btScalar defaultContactThresholdFactor) const; @@ -130,6 +131,16 @@ public: { return m_userPointer; } + void setUserIndex(int index) + { + m_userIndex = index; + } + + int getUserIndex() const + { + return m_userIndex; + } + virtual int calculateSerializeBufferSize() const; diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.cpp index 0aa75f2bf..e8c8c336c 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.cpp @@ -18,7 +18,7 @@ subject to the following restrictions: #include "BulletCollision/BroadphaseCollision/btDbvt.h" #include "LinearMath/btSerializer.h" -btCompoundShape::btCompoundShape(bool enableDynamicAabbTree) +btCompoundShape::btCompoundShape(bool enableDynamicAabbTree, const int initialChildCapacity) : m_localAabbMin(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT)), m_localAabbMax(btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT)), m_dynamicAabbTree(0), @@ -34,6 +34,8 @@ m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)) m_dynamicAabbTree = new(mem) btDbvt(); btAssert(mem==m_dynamicAabbTree); } + + m_children.reserve(initialChildCapacity); } @@ -77,8 +79,8 @@ void btCompoundShape::addChildShape(const btTransform& localTransform,btCollisio if (m_dynamicAabbTree) { const btDbvtVolume bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax); - int index = m_children.size(); - child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index); + size_t index = m_children.size(); + child.m_node = m_dynamicAabbTree->insert(bounds,reinterpret_cast(index) ); } m_children.push_back(child); @@ -312,7 +314,8 @@ void btCompoundShape::createAabbTreeFromChildren() child.m_childShape->getAabb(child.m_transform,localAabbMin,localAabbMax); const btDbvtVolume bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax); - child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index); + size_t index2 = index; + child.m_node = m_dynamicAabbTree->insert(bounds, reinterpret_cast(index2) ); } } } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h index 141034a8e..4eef8dba3 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h @@ -53,6 +53,7 @@ SIMD_FORCE_INLINE bool operator==(const btCompoundShapeChild& c1, const btCompou /// Currently, removal of child shapes is only supported when disabling the aabb tree (pass 'false' in the constructor of btCompoundShape) ATTRIBUTE_ALIGNED16(class) btCompoundShape : public btCollisionShape { +protected: btAlignedObjectArray m_children; btVector3 m_localAabbMin; btVector3 m_localAabbMax; @@ -64,13 +65,12 @@ ATTRIBUTE_ALIGNED16(class) btCompoundShape : public btCollisionShape btScalar m_collisionMargin; -protected: btVector3 m_localScaling; public: BT_DECLARE_ALIGNED_ALLOCATOR(); - btCompoundShape(bool enableDynamicAabbTree = true); + explicit btCompoundShape(bool enableDynamicAabbTree = true, const int initialChildCapacity = 0); virtual ~btCompoundShape(); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConeShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConeShape.h index 4a0df0d55..46d78d148 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConeShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConeShape.h @@ -43,6 +43,15 @@ public: btScalar getRadius() const { return m_radius;} btScalar getHeight() const { return m_height;} + void setRadius(const btScalar radius) + { + m_radius = radius; + } + void setHeight(const btScalar height) + { + m_height = height; + } + virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const { diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp index 0623e351a..c1aa6ca46 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp @@ -22,6 +22,8 @@ subject to the following restrictions: #include "LinearMath/btQuaternion.h" #include "LinearMath/btSerializer.h" +#include "btConvexPolyhedron.h" +#include "LinearMath/btConvexHullComputer.h" btConvexHullShape ::btConvexHullShape (const btScalar* points,int numPoints,int stride) : btPolyhedralConvexAabbCachingShape () { @@ -121,10 +123,17 @@ btVector3 btConvexHullShape::localGetSupportingVertex(const btVector3& vec)const } - - - - +void btConvexHullShape::optimizeConvexHull() +{ + btConvexHullComputer conv; + conv.compute(&m_unscaledPoints[0].getX(), sizeof(btVector3),m_unscaledPoints.size(),0.f,0.f); + int numVerts = conv.vertices.size(); + m_unscaledPoints.resize(0); + for (int i=0;i1e-6 || fabsf(v.y())>1e-6 || fabsf(v.z())>1e-6) return false; + if(btFabs(v.x())>1e-6 || btFabs(v.y())>1e-6 || btFabs(v.z())>1e-6) return false; return true; } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.cpp index f03d0b21e..b56d72917 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.cpp @@ -48,7 +48,7 @@ btConvexShape::~btConvexShape() } -void btConvexShape::project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const +void btConvexShape::project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max, btVector3& witnesPtMin,btVector3& witnesPtMax) const { btVector3 localAxis = dir*trans.getBasis(); btVector3 vtx1 = trans(localGetSupportingVertex(localAxis)); @@ -56,12 +56,16 @@ void btConvexShape::project(const btTransform& trans, const btVector3& dir, btSc min = vtx1.dot(dir); max = vtx2.dot(dir); - + witnesPtMax = vtx2; + witnesPtMin = vtx1; + if(min>max) { btScalar tmp = min; min = max; max = tmp; + witnesPtMax = vtx1; + witnesPtMin = vtx2; } } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.h index 290cd9fd1..875f2ac19 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btConvexShape.h @@ -52,7 +52,8 @@ public: btScalar getMarginNonVirtual () const; void getAabbNonVirtual (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const; - virtual void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const; + + virtual void project(const btTransform& trans, const btVector3& dir, btScalar& minProj, btScalar& maxProj, btVector3& witnesPtMin,btVector3& witnesPtMax) const; //notice that the vectors should be unit length diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp index 26322791d..441a89c6b 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp @@ -59,15 +59,13 @@ PHY_ScalarType hdt, bool flipQuadEdges ) { // validation - btAssert(heightStickWidth > 1 && "bad width"); - btAssert(heightStickLength > 1 && "bad length"); - btAssert(heightfieldData && "null heightfield data"); + btAssert(heightStickWidth > 1);// && "bad width"); + btAssert(heightStickLength > 1);// && "bad length"); + btAssert(heightfieldData);// && "null heightfield data"); // btAssert(heightScale) -- do we care? Trust caller here - btAssert(minHeight <= maxHeight && "bad min/max height"); - btAssert(upAxis >= 0 && upAxis < 3 && - "bad upAxis--should be in range [0,2]"); - btAssert(hdt != PHY_UCHAR || hdt != PHY_FLOAT || hdt != PHY_SHORT && - "Bad height data type enum"); + btAssert(minHeight <= maxHeight);// && "bad min/max height"); + btAssert(upAxis >= 0 && upAxis < 3);// && "bad upAxis--should be in range [0,2]"); + btAssert(hdt != PHY_UCHAR || hdt != PHY_FLOAT || hdt != PHY_SHORT);// && "Bad height data type enum"); // initialize member variables m_shapeType = TERRAIN_SHAPE_PROXYTYPE; @@ -110,7 +108,7 @@ PHY_ScalarType hdt, bool flipQuadEdges default: { //need to get valid m_upAxis - btAssert(0 && "Bad m_upAxis"); + btAssert(0);// && "Bad m_upAxis"); } } @@ -365,14 +363,15 @@ void btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback { //first triangle getVertex(x,j,vertices[0]); - getVertex(x+1,j,vertices[1]); - getVertex(x+1,j+1,vertices[2]); + getVertex(x, j + 1, vertices[1]); + getVertex(x + 1, j + 1, vertices[2]); callback->processTriangle(vertices,x,j); //second triangle // getVertex(x,j,vertices[0]);//already got this vertex before, thanks to Danny Chapman getVertex(x+1,j+1,vertices[1]); - getVertex(x,j+1,vertices[2]); - callback->processTriangle(vertices,x,j); + getVertex(x + 1, j, vertices[2]); + callback->processTriangle(vertices, x, j); + } else { //first triangle diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index a7362ea01..88f6c4dcb 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -75,7 +75,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3* positions,const btScala int inner_count = MIN( numSpheres - k, 128 ); for( long i = 0; i < inner_count; i++ ) { - temp[i] = (*pos) +vec*m_localScaling*(*rad) - vec * getMargin(); + temp[i] = (*pos)*m_localScaling +vec*m_localScaling*(*rad) - vec * getMargin(); pos++; rad++; } @@ -113,7 +113,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3* positions,const btScala int inner_count = MIN( numSpheres - k, 128 ); for( long i = 0; i < inner_count; i++ ) { - temp[i] = (*pos) +vec*m_localScaling*(*rad) - vec * getMargin(); + temp[i] = (*pos)*m_localScaling +vec*m_localScaling*(*rad) - vec * getMargin(); pos++; rad++; } diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h index 2b92ab7d1..5ebaede4a 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h @@ -25,7 +25,6 @@ subject to the following restrictions: ATTRIBUTE_ALIGNED16(class) btMultimaterialTriangleMeshShape : public btBvhTriangleMeshShape { btAlignedObjectArray m_materialList; - int ** m_triangleMaterials; public: diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp index 38ef8f037..d17141e3f 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp @@ -21,7 +21,7 @@ subject to the following restrictions: btStaticPlaneShape::btStaticPlaneShape(const btVector3& planeNormal,btScalar planeConstant) : btConcaveShape (), m_planeNormal(planeNormal.normalized()), m_planeConstant(planeConstant), -m_localScaling(btScalar(0.),btScalar(0.),btScalar(0.)) +m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)) { m_shapeType = STATIC_PLANE_PROXYTYPE; // btAssert( btFuzzyZero(m_planeNormal.length() - btScalar(1.)) ); diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp index 5fbed334e..e4de73209 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp @@ -75,6 +75,13 @@ void btTriangleMesh::addIndex(int index) } } +void btTriangleMesh::addTriangleIndices(int index1, int index2, int index3 ) +{ + m_indexedMeshes[0].m_numTriangles++; + addIndex( index1 ); + addIndex( index2 ); + addIndex( index3 ); +} int btTriangleMesh::findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices) { diff --git a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.h index 0afc2321f..ac4afa7f6 100644 --- a/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.h +++ b/Engine/lib/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.h @@ -52,7 +52,10 @@ class btTriangleMesh : public btTriangleIndexVertexArray ///By default addTriangle won't search for duplicate vertices, because the search is very slow for large triangle meshes. ///In general it is better to directly use btTriangleIndexVertexArray instead. void addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2, bool removeDuplicateVertices=false); - + + ///Add a triangle using its indices. Make sure the indices are pointing within the vertices array, so add the vertices first (and to be sure, avoid removal of duplicate vertices) + void addTriangleIndices(int index1, int index2, int index3 ); + int getNumTriangles() const; virtual void preallocateVertices(int numverts); diff --git a/Engine/lib/bullet/src/BulletCollision/Doxyfile b/Engine/lib/bullet/src/BulletCollision/Doxyfile deleted file mode 100644 index 4ecb6acb6..000000000 --- a/Engine/lib/bullet/src/BulletCollision/Doxyfile +++ /dev/null @@ -1,746 +0,0 @@ -# Doxyfile 1.2.4 - -# This file describes the settings to be used by doxygen for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# General configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. -PROJECT_NAME = "Bullet Continuous Collision Detection Library" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, -# Korean, Hungarian, Norwegian, Spanish, Romanian, Russian, Croatian, -# Polish, Portuguese and Slovene. - -OUTPUT_LANGUAGE = English - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these class will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. It is allowed to use relative paths in the argument list. - -STRIP_FROM_PATH = - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a class diagram (in Html and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. - -CLASS_DIAGRAMS = YES - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower case letters. If set to YES upper case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# users are adviced to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explict @brief command for a brief description. - -JAVADOC_AUTOBRIEF = YES - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# reimplements. - -INHERIT_DOCS = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# The ENABLE_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = . - - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -FILE_PATTERNS = *.h *.cpp *.c - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. - -EXCLUDE_PATTERNS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. - -INPUT_FILTER = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse. - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side pannel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript and frames is required (for instance Netscape 4.0+ -# or Internet explorer 4.0+). - -GENERATE_TREEVIEW = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimised for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using a WORD or other. -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assigments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. Warning: This feature -# is still experimental and very incomplete. - -GENERATE_XML = NO - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = ../../generic/extern - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES tag can be used to specify one or more tagfiles. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the ENABLE_PREPROCESSING, INCLUDE_GRAPH, and HAVE_DOT tags are set to -# YES then doxygen will generate a graph for each documented file showing -# the direct and indirect include dependencies of the file with other -# documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, INCLUDED_BY_GRAPH, and HAVE_DOT tags are set to -# YES then doxygen will generate a graph for each documented header file showing -# the documented files that directly or indirectly include this file - -INCLUDED_BY_GRAPH = YES - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. - -DOT_PATH = - -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO - -# The CGI_NAME tag should be the name of the CGI script that -# starts the search engine (doxysearch) with the correct parameters. -# A script with this name will be generated by doxygen. - -CGI_NAME = search.cgi - -# The CGI_URL tag should be the absolute URL to the directory where the -# cgi binaries are located. See the documentation of your http daemon for -# details. - -CGI_URL = - -# The DOC_URL tag should be the absolute URL to the directory where the -# documentation is located. If left blank the absolute path to the -# documentation, with file:// prepended to it, will be used. - -DOC_URL = - -# The DOC_ABSPATH tag should be the absolute path to the directory where the -# documentation is located. If left blank the directory on the local machine -# will be used. - -DOC_ABSPATH = - -# The BIN_ABSPATH tag must point to the directory where the doxysearch binary -# is installed. - -BIN_ABSPATH = c:\program files\doxygen\bin - -# The EXT_DOC_PATHS tag can be used to specify one or more paths to -# documentation generated for other projects. This allows doxysearch to search -# the documentation for these projects as well. - -EXT_DOC_PATHS = diff --git a/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h b/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h index f85a94cb4..3e5675f72 100644 --- a/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h +++ b/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h @@ -122,7 +122,7 @@ protected: checkManifold(body0Wrap,body1Wrap); btCollisionAlgorithm * convex_algorithm = m_dispatcher->findAlgorithm( - body0Wrap,body1Wrap,getLastManifold()); + body0Wrap,body1Wrap,getLastManifold(), BT_CONTACT_POINT_ALGORITHMS); return convex_algorithm ; } diff --git a/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.cpp b/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.cpp index ac8efdf38..30c85e3ff 100644 --- a/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.cpp +++ b/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.cpp @@ -23,6 +23,59 @@ subject to the following restrictions: #include "btGImpactMassUtil.h" +btGImpactMeshShapePart::btGImpactMeshShapePart( btStridingMeshInterface * meshInterface, int part ) +{ + // moved from .h to .cpp because of conditional compilation + // (The setting of BT_THREADSAFE may differ between various cpp files, so it is best to + // avoid using it in h files) + m_primitive_manager.m_meshInterface = meshInterface; + m_primitive_manager.m_part = part; + m_box_set.setPrimitiveManager( &m_primitive_manager ); +#if BT_THREADSAFE + // If threadsafe is requested, this object uses a different lock/unlock + // model with the btStridingMeshInterface -- lock once when the object is constructed + // and unlock once in the destructor. + // The other way of locking and unlocking for each collision check in the narrowphase + // is not threadsafe. Note these are not thread-locks, they are calls to the meshInterface's + // getLockedReadOnlyVertexIndexBase virtual function, which by default just returns a couple of + // pointers. In theory a client could override the lock function to do all sorts of + // things like reading data from GPU memory, or decompressing data on the fly, but such things + // do not seem all that likely or useful, given the performance cost. + m_primitive_manager.lock(); +#endif +} + +btGImpactMeshShapePart::~btGImpactMeshShapePart() +{ + // moved from .h to .cpp because of conditional compilation +#if BT_THREADSAFE + m_primitive_manager.unlock(); +#endif +} + +void btGImpactMeshShapePart::lockChildShapes() const +{ + // moved from .h to .cpp because of conditional compilation +#if ! BT_THREADSAFE + // called in the narrowphase -- not threadsafe! + void * dummy = (void*) ( m_box_set.getPrimitiveManager() ); + TrimeshPrimitiveManager * dummymanager = static_cast( dummy ); + dummymanager->lock(); +#endif +} + +void btGImpactMeshShapePart::unlockChildShapes() const +{ + // moved from .h to .cpp because of conditional compilation +#if ! BT_THREADSAFE + // called in the narrowphase -- not threadsafe! + void * dummy = (void*) ( m_box_set.getPrimitiveManager() ); + TrimeshPrimitiveManager * dummymanager = static_cast( dummy ); + dummymanager->unlock(); +#endif +} + + #define CALC_EXACT_INERTIA 1 diff --git a/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.h b/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.h index 3d1f48d47..9d7e40562 100644 --- a/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.h +++ b/Engine/lib/bullet/src/BulletCollision/Gimpact/btGImpactShape.h @@ -722,17 +722,8 @@ public: m_box_set.setPrimitiveManager(&m_primitive_manager); } - - btGImpactMeshShapePart(btStridingMeshInterface * meshInterface, int part) - { - m_primitive_manager.m_meshInterface = meshInterface; - m_primitive_manager.m_part = part; - m_box_set.setPrimitiveManager(&m_primitive_manager); - } - - virtual ~btGImpactMeshShapePart() - { - } + btGImpactMeshShapePart( btStridingMeshInterface * meshInterface, int part ); + virtual ~btGImpactMeshShapePart(); //! if true, then its children must get transforms. virtual bool childrenHasTransform() const @@ -742,19 +733,8 @@ public: //! call when reading child shapes - virtual void lockChildShapes() const - { - void * dummy = (void*)(m_box_set.getPrimitiveManager()); - TrimeshPrimitiveManager * dummymanager = static_cast(dummy); - dummymanager->lock(); - } - - virtual void unlockChildShapes() const - { - void * dummy = (void*)(m_box_set.getPrimitiveManager()); - TrimeshPrimitiveManager * dummymanager = static_cast(dummy); - dummymanager->unlock(); - } + virtual void lockChildShapes() const; + virtual void unlockChildShapes() const; //! Gets the number of children virtual int getNumChildShapes() const diff --git a/Engine/lib/bullet/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h b/Engine/lib/bullet/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h index 915277404..d98051da3 100644 --- a/Engine/lib/bullet/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h +++ b/Engine/lib/bullet/src/BulletCollision/Gimpact/gim_basic_geometry_operations.h @@ -404,12 +404,12 @@ SIMD_FORCE_INLINE void SEGMENT_COLLISION( CLASS_POINT & vPointA, CLASS_POINT & vPointB) { - CLASS_POINT _AD,_BD,_N; + CLASS_POINT _AD,_BD,n; vec4f _M;//plane VEC_DIFF(_AD,vA2,vA1); VEC_DIFF(_BD,vB2,vB1); - VEC_CROSS(_N,_AD,_BD); - GREAL _tp = VEC_DOT(_N,_N); + VEC_CROSS(n,_AD,_BD); + GREAL _tp = VEC_DOT(n,n); if(_tp +bool btGjkEpaCalcPenDepth(const btConvexTemplate& a, const btConvexTemplate& b, + const btGjkCollisionDescription& colDesc, + btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB) +{ + (void)v; + + // const btScalar radialmargin(btScalar(0.)); + + btVector3 guessVector(b.getWorldTransform().getOrigin()-a.getWorldTransform().getOrigin());//?? why not use the GJK input? + + btGjkEpaSolver3::sResults results; + + + if(btGjkEpaSolver3_Penetration(a,b,guessVector,results)) + + { + // debugDraw->drawLine(results.witnesses[1],results.witnesses[1]+results.normal,btVector3(255,0,0)); + //resultOut->addContactPoint(results.normal,results.witnesses[1],-results.depth); + wWitnessOnA = results.witnesses[0]; + wWitnessOnB = results.witnesses[1]; + v = results.normal; + return true; + } else + { + if(btGjkEpaSolver3_Distance(a,b,guessVector,results)) + { + wWitnessOnA = results.witnesses[0]; + wWitnessOnB = results.witnesses[1]; + v = results.normal; + return false; + } + } + return false; +} + +template +int btComputeGjkEpaPenetration(const btConvexTemplate& a, const btConvexTemplate& b, const btGjkCollisionDescription& colDesc, btVoronoiSimplexSolver& simplexSolver, btGjkDistanceTemplate* distInfo) +{ + + bool m_catchDegeneracies = true; + btScalar m_cachedSeparatingDistance = 0.f; + + btScalar distance=btScalar(0.); + btVector3 normalInB(btScalar(0.),btScalar(0.),btScalar(0.)); + + btVector3 pointOnA,pointOnB; + btTransform localTransA = a.getWorldTransform(); + btTransform localTransB = b.getWorldTransform(); + + btScalar marginA = a.getMargin(); + btScalar marginB = b.getMargin(); + + int m_curIter = 0; + int gGjkMaxIter = colDesc.m_maxGjkIterations;//this is to catch invalid input, perhaps check for #NaN? + btVector3 m_cachedSeparatingAxis = colDesc.m_firstDir; + + bool isValid = false; + bool checkSimplex = false; + bool checkPenetration = true; + int m_degenerateSimplex = 0; + + int m_lastUsedMethod = -1; + + { + btScalar squaredDistance = BT_LARGE_FLOAT; + btScalar delta = btScalar(0.); + + btScalar margin = marginA + marginB; + + + + simplexSolver.reset(); + + for ( ; ; ) + //while (true) + { + + btVector3 seperatingAxisInA = (-m_cachedSeparatingAxis)* localTransA.getBasis(); + btVector3 seperatingAxisInB = m_cachedSeparatingAxis* localTransB.getBasis(); + + btVector3 pInA = a.getLocalSupportWithoutMargin(seperatingAxisInA); + btVector3 qInB = b.getLocalSupportWithoutMargin(seperatingAxisInB); + + btVector3 pWorld = localTransA(pInA); + btVector3 qWorld = localTransB(qInB); + + + + btVector3 w = pWorld - qWorld; + delta = m_cachedSeparatingAxis.dot(w); + + // potential exit, they don't overlap + if ((delta > btScalar(0.0)) && (delta * delta > squaredDistance * colDesc.m_maximumDistanceSquared)) + { + m_degenerateSimplex = 10; + checkSimplex=true; + //checkPenetration = false; + break; + } + + //exit 0: the new point is already in the simplex, or we didn't come any closer + if (simplexSolver.inSimplex(w)) + { + m_degenerateSimplex = 1; + checkSimplex = true; + break; + } + // are we getting any closer ? + btScalar f0 = squaredDistance - delta; + btScalar f1 = squaredDistance * colDesc.m_gjkRelError2; + + if (f0 <= f1) + { + if (f0 <= btScalar(0.)) + { + m_degenerateSimplex = 2; + } else + { + m_degenerateSimplex = 11; + } + checkSimplex = true; + break; + } + + //add current vertex to simplex + simplexSolver.addVertex(w, pWorld, qWorld); + btVector3 newCachedSeparatingAxis; + + //calculate the closest point to the origin (update vector v) + if (!simplexSolver.closest(newCachedSeparatingAxis)) + { + m_degenerateSimplex = 3; + checkSimplex = true; + break; + } + + if(newCachedSeparatingAxis.length2()previousSquaredDistance) + { + m_degenerateSimplex = 7; + squaredDistance = previousSquaredDistance; + checkSimplex = false; + break; + } +#endif // + + + //redundant m_simplexSolver->compute_points(pointOnA, pointOnB); + + //are we getting any closer ? + if (previousSquaredDistance - squaredDistance <= SIMD_EPSILON * previousSquaredDistance) + { + // m_simplexSolver->backup_closest(m_cachedSeparatingAxis); + checkSimplex = true; + m_degenerateSimplex = 12; + + break; + } + + m_cachedSeparatingAxis = newCachedSeparatingAxis; + + //degeneracy, this is typically due to invalid/uninitialized worldtransforms for a btCollisionObject + if (m_curIter++ > gGjkMaxIter) + { +#if defined(DEBUG) || defined (_DEBUG) + + printf("btGjkPairDetector maxIter exceeded:%i\n",m_curIter); + printf("sepAxis=(%f,%f,%f), squaredDistance = %f\n", + m_cachedSeparatingAxis.getX(), + m_cachedSeparatingAxis.getY(), + m_cachedSeparatingAxis.getZ(), + squaredDistance); +#endif + + break; + + } + + + bool check = (!simplexSolver.fullSimplex()); + //bool check = (!m_simplexSolver->fullSimplex() && squaredDistance > SIMD_EPSILON * m_simplexSolver->maxVertex()); + + if (!check) + { + //do we need this backup_closest here ? + // m_simplexSolver->backup_closest(m_cachedSeparatingAxis); + m_degenerateSimplex = 13; + break; + } + } + + if (checkSimplex) + { + simplexSolver.compute_points(pointOnA, pointOnB); + normalInB = m_cachedSeparatingAxis; + + btScalar lenSqr =m_cachedSeparatingAxis.length2(); + + //valid normal + if (lenSqr < 0.0001) + { + m_degenerateSimplex = 5; + } + if (lenSqr > SIMD_EPSILON*SIMD_EPSILON) + { + btScalar rlen = btScalar(1.) / btSqrt(lenSqr ); + normalInB *= rlen; //normalize + + btScalar s = btSqrt(squaredDistance); + + btAssert(s > btScalar(0.0)); + pointOnA -= m_cachedSeparatingAxis * (marginA / s); + pointOnB += m_cachedSeparatingAxis * (marginB / s); + distance = ((btScalar(1.)/rlen) - margin); + isValid = true; + + m_lastUsedMethod = 1; + } else + { + m_lastUsedMethod = 2; + } + } + + bool catchDegeneratePenetrationCase = + (m_catchDegeneracies && m_degenerateSimplex && ((distance+margin) < 0.01)); + + //if (checkPenetration && !isValid) + if (checkPenetration && (!isValid || catchDegeneratePenetrationCase )) + { + //penetration case + + //if there is no way to handle penetrations, bail out + + // Penetration depth case. + btVector3 tmpPointOnA,tmpPointOnB; + + m_cachedSeparatingAxis.setZero(); + + bool isValid2 = btGjkEpaCalcPenDepth(a,b, + colDesc, + m_cachedSeparatingAxis, tmpPointOnA, tmpPointOnB); + + if (isValid2) + { + btVector3 tmpNormalInB = tmpPointOnB-tmpPointOnA; + btScalar lenSqr = tmpNormalInB.length2(); + if (lenSqr <= (SIMD_EPSILON*SIMD_EPSILON)) + { + tmpNormalInB = m_cachedSeparatingAxis; + lenSqr = m_cachedSeparatingAxis.length2(); + } + + if (lenSqr > (SIMD_EPSILON*SIMD_EPSILON)) + { + tmpNormalInB /= btSqrt(lenSqr); + btScalar distance2 = -(tmpPointOnA-tmpPointOnB).length(); + //only replace valid penetrations when the result is deeper (check) + if (!isValid || (distance2 < distance)) + { + distance = distance2; + pointOnA = tmpPointOnA; + pointOnB = tmpPointOnB; + normalInB = tmpNormalInB; + + isValid = true; + m_lastUsedMethod = 3; + } else + { + m_lastUsedMethod = 8; + } + } else + { + m_lastUsedMethod = 9; + } + } else + + { + ///this is another degenerate case, where the initial GJK calculation reports a degenerate case + ///EPA reports no penetration, and the second GJK (using the supporting vector without margin) + ///reports a valid positive distance. Use the results of the second GJK instead of failing. + ///thanks to Jacob.Langford for the reproduction case + ///http://code.google.com/p/bullet/issues/detail?id=250 + + + if (m_cachedSeparatingAxis.length2() > btScalar(0.)) + { + btScalar distance2 = (tmpPointOnA-tmpPointOnB).length()-margin; + //only replace valid distances when the distance is less + if (!isValid || (distance2 < distance)) + { + distance = distance2; + pointOnA = tmpPointOnA; + pointOnB = tmpPointOnB; + pointOnA -= m_cachedSeparatingAxis * marginA ; + pointOnB += m_cachedSeparatingAxis * marginB ; + normalInB = m_cachedSeparatingAxis; + normalInB.normalize(); + + isValid = true; + m_lastUsedMethod = 6; + } else + { + m_lastUsedMethod = 5; + } + } + } + } + } + + + + if (isValid && ((distance < 0) || (distance*distance < colDesc.m_maximumDistanceSquared))) + { + + m_cachedSeparatingAxis = normalInB; + m_cachedSeparatingDistance = distance; + distInfo->m_distance = distance; + distInfo->m_normalBtoA = normalInB; + distInfo->m_pointOnB = pointOnB; + distInfo->m_pointOnA = pointOnB+normalInB*distance; + return 0; + } + return -m_lastUsedMethod; +} + + + + +#endif //BT_GJK_EPA_PENETATION_CONVEX_COLLISION_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/PpuAddressSpace.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h similarity index 60% rename from Engine/lib/bullet/src/BulletMultiThreaded/PpuAddressSpace.h rename to Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h index 6f2282745..0b49b0ecc 100644 --- a/Engine/lib/bullet/src/BulletMultiThreaded/PpuAddressSpace.h +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkCollisionDescription.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2010 Erwin Coumans http://bulletphysics.org +Copyright (c) 2003-2014 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -14,24 +14,28 @@ subject to the following restrictions: */ -#ifndef BT_PPU_ADDRESS_SPACE_H -#define BT_PPU_ADDRESS_SPACE_H +#ifndef GJK_COLLISION_DESCRIPTION_H +#define GJK_COLLISION_DESCRIPTION_H +#include "LinearMath/btVector3.h" -#ifdef _WIN32 -//stop those casting warnings until we have a better solution for ppu_address_t / void* / uint64 conversions -#pragma warning (disable: 4311) -#pragma warning (disable: 4312) -#endif //_WIN32 +struct btGjkCollisionDescription +{ + btVector3 m_firstDir; + int m_maxGjkIterations; + btScalar m_maximumDistanceSquared; + btScalar m_gjkRelError2; + btGjkCollisionDescription() + :m_firstDir(0,1,0), + m_maxGjkIterations(1000), + m_maximumDistanceSquared(1e30f), + m_gjkRelError2(1.0e-6) + { + } + virtual ~btGjkCollisionDescription() + { + } +}; - -#if defined(_WIN64) - typedef unsigned __int64 ppu_address_t; -#elif defined(__LP64__) || defined(__x86_64__) - typedef uint64_t ppu_address_t; -#else - typedef uint32_t ppu_address_t; -#endif //defined(_WIN64) - -#endif //BT_PPU_ADDRESS_SPACE_H +#endif //GJK_COLLISION_DESCRIPTION_H diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp index 3268f06c2..eefb974bb 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp @@ -41,21 +41,38 @@ namespace gjkepa2_impl /* GJK */ #define GJK_MAX_ITERATIONS 128 -#define GJK_ACCURARY ((btScalar)0.0001) -#define GJK_MIN_DISTANCE ((btScalar)0.0001) -#define GJK_DUPLICATED_EPS ((btScalar)0.0001) + +#ifdef BT_USE_DOUBLE_PRECISION + #define GJK_ACCURACY ((btScalar)1e-12) + #define GJK_MIN_DISTANCE ((btScalar)1e-12) + #define GJK_DUPLICATED_EPS ((btScalar)1e-12) +#else + #define GJK_ACCURACY ((btScalar)0.0001) + #define GJK_MIN_DISTANCE ((btScalar)0.0001) + #define GJK_DUPLICATED_EPS ((btScalar)0.0001) +#endif //BT_USE_DOUBLE_PRECISION + + #define GJK_SIMPLEX2_EPS ((btScalar)0.0) #define GJK_SIMPLEX3_EPS ((btScalar)0.0) #define GJK_SIMPLEX4_EPS ((btScalar)0.0) /* EPA */ -#define EPA_MAX_VERTICES 64 -#define EPA_MAX_FACES (EPA_MAX_VERTICES*2) +#define EPA_MAX_VERTICES 128 #define EPA_MAX_ITERATIONS 255 -#define EPA_ACCURACY ((btScalar)0.0001) -#define EPA_FALLBACK (10*EPA_ACCURACY) -#define EPA_PLANE_EPS ((btScalar)0.00001) -#define EPA_INSIDE_EPS ((btScalar)0.01) + +#ifdef BT_USE_DOUBLE_PRECISION + #define EPA_ACCURACY ((btScalar)1e-12) + #define EPA_PLANE_EPS ((btScalar)1e-14) + #define EPA_INSIDE_EPS ((btScalar)1e-9) +#else + #define EPA_ACCURACY ((btScalar)0.0001) + #define EPA_PLANE_EPS ((btScalar)0.00001) + #define EPA_INSIDE_EPS ((btScalar)0.01) +#endif + +#define EPA_FALLBACK (10*EPA_ACCURACY) +#define EPA_MAX_FACES (EPA_MAX_VERTICES*2) // Shorthands @@ -242,7 +259,7 @@ namespace gjkepa2_impl /* Check for termination */ const btScalar omega=btDot(m_ray,w)/rl; alpha=btMax(omega,alpha); - if(((rl-alpha)-(GJK_ACCURARY*rl))<=0) + if(((rl-alpha)-(GJK_ACCURACY*rl))<=0) {/* Return old simplex */ removevertice(m_simplices[m_current]); break; @@ -1015,7 +1032,7 @@ bool btGjkEpaSolver2::SignedDistance(const btConvexShape* shape0, /* Symbols cleanup */ #undef GJK_MAX_ITERATIONS -#undef GJK_ACCURARY +#undef GJK_ACCURACY #undef GJK_MIN_DISTANCE #undef GJK_DUPLICATED_EPS #undef GJK_SIMPLEX2_EPS diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h new file mode 100644 index 000000000..ce1f24bc5 --- /dev/null +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa3.h @@ -0,0 +1,1035 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2014 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the +use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not +claim that you wrote the original software. If you use this software in a +product, an acknowledgment in the product documentation would be appreciated +but is not required. +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +/* +Initial GJK-EPA collision solver by Nathanael Presson, 2008 +Improvements and refactoring by Erwin Coumans, 2008-2014 +*/ +#ifndef BT_GJK_EPA3_H +#define BT_GJK_EPA3_H + +#include "LinearMath/btTransform.h" +#include "btGjkCollisionDescription.h" + + + +struct btGjkEpaSolver3 +{ +struct sResults + { + enum eStatus + { + Separated, /* Shapes doesnt penetrate */ + Penetrating, /* Shapes are penetrating */ + GJK_Failed, /* GJK phase fail, no big issue, shapes are probably just 'touching' */ + EPA_Failed /* EPA phase fail, bigger problem, need to save parameters, and debug */ + } status; + btVector3 witnesses[2]; + btVector3 normal; + btScalar distance; + }; + + +}; + + + +#if defined(DEBUG) || defined (_DEBUG) +#include //for debug printf +#ifdef __SPU__ +#include +#define printf spu_printf +#endif //__SPU__ +#endif + + + + // Config + + /* GJK */ +#define GJK_MAX_ITERATIONS 128 +#define GJK_ACCURARY ((btScalar)0.0001) +#define GJK_MIN_DISTANCE ((btScalar)0.0001) +#define GJK_DUPLICATED_EPS ((btScalar)0.0001) +#define GJK_SIMPLEX2_EPS ((btScalar)0.0) +#define GJK_SIMPLEX3_EPS ((btScalar)0.0) +#define GJK_SIMPLEX4_EPS ((btScalar)0.0) + + /* EPA */ +#define EPA_MAX_VERTICES 64 +#define EPA_MAX_FACES (EPA_MAX_VERTICES*2) +#define EPA_MAX_ITERATIONS 255 +#define EPA_ACCURACY ((btScalar)0.0001) +#define EPA_FALLBACK (10*EPA_ACCURACY) +#define EPA_PLANE_EPS ((btScalar)0.00001) +#define EPA_INSIDE_EPS ((btScalar)0.01) + + + // Shorthands + typedef unsigned int U; + typedef unsigned char U1; + + // MinkowskiDiff + template + struct MinkowskiDiff + { + const btConvexTemplate* m_convexAPtr; + const btConvexTemplate* m_convexBPtr; + + btMatrix3x3 m_toshape1; + btTransform m_toshape0; + + bool m_enableMargin; + + + MinkowskiDiff(const btConvexTemplate& a, const btConvexTemplate& b) + :m_convexAPtr(&a), + m_convexBPtr(&b) + { + } + + void EnableMargin(bool enable) + { + m_enableMargin = enable; + } + inline btVector3 Support0(const btVector3& d) const + { + return m_convexAPtr->getLocalSupportWithMargin(d); + } + inline btVector3 Support1(const btVector3& d) const + { + return m_toshape0*m_convexBPtr->getLocalSupportWithMargin(m_toshape1*d); + } + + + inline btVector3 Support(const btVector3& d) const + { + return(Support0(d)-Support1(-d)); + } + btVector3 Support(const btVector3& d,U index) const + { + if(index) + return(Support1(d)); + else + return(Support0(d)); + } + }; + +enum eGjkStatus +{ + eGjkValid, + eGjkInside, + eGjkFailed +}; + + // GJK + template + struct GJK + { + /* Types */ + struct sSV + { + btVector3 d,w; + }; + struct sSimplex + { + sSV* c[4]; + btScalar p[4]; + U rank; + }; + + /* Fields */ + + MinkowskiDiff m_shape; + btVector3 m_ray; + btScalar m_distance; + sSimplex m_simplices[2]; + sSV m_store[4]; + sSV* m_free[4]; + U m_nfree; + U m_current; + sSimplex* m_simplex; + eGjkStatus m_status; + /* Methods */ + + GJK(const btConvexTemplate& a, const btConvexTemplate& b) + :m_shape(a,b) + { + Initialize(); + } + void Initialize() + { + m_ray = btVector3(0,0,0); + m_nfree = 0; + m_status = eGjkFailed; + m_current = 0; + m_distance = 0; + } + eGjkStatus Evaluate(const MinkowskiDiff& shapearg,const btVector3& guess) + { + U iterations=0; + btScalar sqdist=0; + btScalar alpha=0; + btVector3 lastw[4]; + U clastw=0; + /* Initialize solver */ + m_free[0] = &m_store[0]; + m_free[1] = &m_store[1]; + m_free[2] = &m_store[2]; + m_free[3] = &m_store[3]; + m_nfree = 4; + m_current = 0; + m_status = eGjkValid; + m_shape = shapearg; + m_distance = 0; + /* Initialize simplex */ + m_simplices[0].rank = 0; + m_ray = guess; + const btScalar sqrl= m_ray.length2(); + appendvertice(m_simplices[0],sqrl>0?-m_ray:btVector3(1,0,0)); + m_simplices[0].p[0] = 1; + m_ray = m_simplices[0].c[0]->w; + sqdist = sqrl; + lastw[0] = + lastw[1] = + lastw[2] = + lastw[3] = m_ray; + /* Loop */ + do { + const U next=1-m_current; + sSimplex& cs=m_simplices[m_current]; + sSimplex& ns=m_simplices[next]; + /* Check zero */ + const btScalar rl=m_ray.length(); + if(rlw; + bool found=false; + for(U i=0;i<4;++i) + { + if((w-lastw[i]).length2()w, + cs.c[1]->w, + weights,mask);break; + case 3: sqdist=projectorigin( cs.c[0]->w, + cs.c[1]->w, + cs.c[2]->w, + weights,mask);break; + case 4: sqdist=projectorigin( cs.c[0]->w, + cs.c[1]->w, + cs.c[2]->w, + cs.c[3]->w, + weights,mask);break; + } + if(sqdist>=0) + {/* Valid */ + ns.rank = 0; + m_ray = btVector3(0,0,0); + m_current = next; + for(U i=0,ni=cs.rank;iw*weights[i]; + } + else + { + m_free[m_nfree++] = cs.c[i]; + } + } + if(mask==15) m_status=eGjkInside; + } + else + {/* Return old simplex */ + removevertice(m_simplices[m_current]); + break; + } + m_status=((++iterations)rank) + { + case 1: + { + for(U i=0;i<3;++i) + { + btVector3 axis=btVector3(0,0,0); + axis[i]=1; + appendvertice(*m_simplex, axis); + if(EncloseOrigin()) return(true); + removevertice(*m_simplex); + appendvertice(*m_simplex,-axis); + if(EncloseOrigin()) return(true); + removevertice(*m_simplex); + } + } + break; + case 2: + { + const btVector3 d=m_simplex->c[1]->w-m_simplex->c[0]->w; + for(U i=0;i<3;++i) + { + btVector3 axis=btVector3(0,0,0); + axis[i]=1; + const btVector3 p=btCross(d,axis); + if(p.length2()>0) + { + appendvertice(*m_simplex, p); + if(EncloseOrigin()) return(true); + removevertice(*m_simplex); + appendvertice(*m_simplex,-p); + if(EncloseOrigin()) return(true); + removevertice(*m_simplex); + } + } + } + break; + case 3: + { + const btVector3 n=btCross(m_simplex->c[1]->w-m_simplex->c[0]->w, + m_simplex->c[2]->w-m_simplex->c[0]->w); + if(n.length2()>0) + { + appendvertice(*m_simplex,n); + if(EncloseOrigin()) return(true); + removevertice(*m_simplex); + appendvertice(*m_simplex,-n); + if(EncloseOrigin()) return(true); + removevertice(*m_simplex); + } + } + break; + case 4: + { + if(btFabs(det( m_simplex->c[0]->w-m_simplex->c[3]->w, + m_simplex->c[1]->w-m_simplex->c[3]->w, + m_simplex->c[2]->w-m_simplex->c[3]->w))>0) + return(true); + } + break; + } + return(false); + } + /* Internals */ + void getsupport(const btVector3& d,sSV& sv) const + { + sv.d = d/d.length(); + sv.w = m_shape.Support(sv.d); + } + void removevertice(sSimplex& simplex) + { + m_free[m_nfree++]=simplex.c[--simplex.rank]; + } + void appendvertice(sSimplex& simplex,const btVector3& v) + { + simplex.p[simplex.rank]=0; + simplex.c[simplex.rank]=m_free[--m_nfree]; + getsupport(v,*simplex.c[simplex.rank++]); + } + static btScalar det(const btVector3& a,const btVector3& b,const btVector3& c) + { + return( a.y()*b.z()*c.x()+a.z()*b.x()*c.y()- + a.x()*b.z()*c.y()-a.y()*b.x()*c.z()+ + a.x()*b.y()*c.z()-a.z()*b.y()*c.x()); + } + static btScalar projectorigin( const btVector3& a, + const btVector3& b, + btScalar* w,U& m) + { + const btVector3 d=b-a; + const btScalar l=d.length2(); + if(l>GJK_SIMPLEX2_EPS) + { + const btScalar t(l>0?-btDot(a,d)/l:0); + if(t>=1) { w[0]=0;w[1]=1;m=2;return(b.length2()); } + else if(t<=0) { w[0]=1;w[1]=0;m=1;return(a.length2()); } + else { w[0]=1-(w[1]=t);m=3;return((a+d*t).length2()); } + } + return(-1); + } + static btScalar projectorigin( const btVector3& a, + const btVector3& b, + const btVector3& c, + btScalar* w,U& m) + { + static const U imd3[]={1,2,0}; + const btVector3* vt[]={&a,&b,&c}; + const btVector3 dl[]={a-b,b-c,c-a}; + const btVector3 n=btCross(dl[0],dl[1]); + const btScalar l=n.length2(); + if(l>GJK_SIMPLEX3_EPS) + { + btScalar mindist=-1; + btScalar subw[2]={0.f,0.f}; + U subm(0); + for(U i=0;i<3;++i) + { + if(btDot(*vt[i],btCross(dl[i],n))>0) + { + const U j=imd3[i]; + const btScalar subd(projectorigin(*vt[i],*vt[j],subw,subm)); + if((mindist<0)||(subd(((subm&1)?1<GJK_SIMPLEX4_EPS)) + { + btScalar mindist=-1; + btScalar subw[3]={0.f,0.f,0.f}; + U subm(0); + for(U i=0;i<3;++i) + { + const U j=imd3[i]; + const btScalar s=vl*btDot(d,btCross(dl[i],dl[j])); + if(s>0) + { + const btScalar subd=projectorigin(*vt[i],*vt[j],d,subw,subm); + if((mindist<0)||(subd((subm&1?1< + struct EPA + { + /* Types */ + + struct sFace + { + btVector3 n; + btScalar d; + typename GJK::sSV* c[3]; + sFace* f[3]; + sFace* l[2]; + U1 e[3]; + U1 pass; + }; + struct sList + { + sFace* root; + U count; + sList() : root(0),count(0) {} + }; + struct sHorizon + { + sFace* cf; + sFace* ff; + U nf; + sHorizon() : cf(0),ff(0),nf(0) {} + }; + + /* Fields */ + eEpaStatus m_status; + typename GJK::sSimplex m_result; + btVector3 m_normal; + btScalar m_depth; + typename GJK::sSV m_sv_store[EPA_MAX_VERTICES]; + sFace m_fc_store[EPA_MAX_FACES]; + U m_nextsv; + sList m_hull; + sList m_stock; + /* Methods */ + EPA() + { + Initialize(); + } + + + static inline void bind(sFace* fa,U ea,sFace* fb,U eb) + { + fa->e[ea]=(U1)eb;fa->f[ea]=fb; + fb->e[eb]=(U1)ea;fb->f[eb]=fa; + } + static inline void append(sList& list,sFace* face) + { + face->l[0] = 0; + face->l[1] = list.root; + if(list.root) list.root->l[0]=face; + list.root = face; + ++list.count; + } + static inline void remove(sList& list,sFace* face) + { + if(face->l[1]) face->l[1]->l[0]=face->l[0]; + if(face->l[0]) face->l[0]->l[1]=face->l[1]; + if(face==list.root) list.root=face->l[1]; + --list.count; + } + + + void Initialize() + { + m_status = eEpaFailed; + m_normal = btVector3(0,0,0); + m_depth = 0; + m_nextsv = 0; + for(U i=0;i& gjk,const btVector3& guess) + { + typename GJK::sSimplex& simplex=*gjk.m_simplex; + if((simplex.rank>1)&&gjk.EncloseOrigin()) + { + + /* Clean up */ + while(m_hull.root) + { + sFace* f = m_hull.root; + remove(m_hull,f); + append(m_stock,f); + } + m_status = eEpaValid; + m_nextsv = 0; + /* Orient simplex */ + if(gjk.det( simplex.c[0]->w-simplex.c[3]->w, + simplex.c[1]->w-simplex.c[3]->w, + simplex.c[2]->w-simplex.c[3]->w)<0) + { + btSwap(simplex.c[0],simplex.c[1]); + btSwap(simplex.p[0],simplex.p[1]); + } + /* Build initial hull */ + sFace* tetra[]={newface(simplex.c[0],simplex.c[1],simplex.c[2],true), + newface(simplex.c[1],simplex.c[0],simplex.c[3],true), + newface(simplex.c[2],simplex.c[1],simplex.c[3],true), + newface(simplex.c[0],simplex.c[2],simplex.c[3],true)}; + if(m_hull.count==4) + { + sFace* best=findbest(); + sFace outer=*best; + U pass=0; + U iterations=0; + bind(tetra[0],0,tetra[1],0); + bind(tetra[0],1,tetra[2],0); + bind(tetra[0],2,tetra[3],0); + bind(tetra[1],1,tetra[3],2); + bind(tetra[1],2,tetra[2],1); + bind(tetra[2],2,tetra[3],1); + m_status=eEpaValid; + for(;iterations::sSV* w=&m_sv_store[m_nextsv++]; + bool valid=true; + best->pass = (U1)(++pass); + gjk.getsupport(best->n,*w); + const btScalar wdist=btDot(best->n,w->w)-best->d; + if(wdist>EPA_ACCURACY) + { + for(U j=0;(j<3)&&valid;++j) + { + valid&=expand( pass,w, + best->f[j],best->e[j], + horizon); + } + if(valid&&(horizon.nf>=3)) + { + bind(horizon.cf,1,horizon.ff,2); + remove(m_hull,best); + append(m_stock,best); + best=findbest(); + outer=*best; + } else { m_status=eEpaInvalidHull;break; } + } else { m_status=eEpaAccuraryReached;break; } + } else { m_status=eEpaOutOfVertices;break; } + } + const btVector3 projection=outer.n*outer.d; + m_normal = outer.n; + m_depth = outer.d; + m_result.rank = 3; + m_result.c[0] = outer.c[0]; + m_result.c[1] = outer.c[1]; + m_result.c[2] = outer.c[2]; + m_result.p[0] = btCross( outer.c[1]->w-projection, + outer.c[2]->w-projection).length(); + m_result.p[1] = btCross( outer.c[2]->w-projection, + outer.c[0]->w-projection).length(); + m_result.p[2] = btCross( outer.c[0]->w-projection, + outer.c[1]->w-projection).length(); + const btScalar sum=m_result.p[0]+m_result.p[1]+m_result.p[2]; + m_result.p[0] /= sum; + m_result.p[1] /= sum; + m_result.p[2] /= sum; + return(m_status); + } + } + /* Fallback */ + m_status = eEpaFallBack; + m_normal = -guess; + const btScalar nl=m_normal.length(); + if(nl>0) + m_normal = m_normal/nl; + else + m_normal = btVector3(1,0,0); + m_depth = 0; + m_result.rank=1; + m_result.c[0]=simplex.c[0]; + m_result.p[0]=1; + return(m_status); + } + bool getedgedist(sFace* face, typename GJK::sSV* a, typename GJK::sSV* b, btScalar& dist) + { + const btVector3 ba = b->w - a->w; + const btVector3 n_ab = btCross(ba, face->n); // Outward facing edge normal direction, on triangle plane + const btScalar a_dot_nab = btDot(a->w, n_ab); // Only care about the sign to determine inside/outside, so not normalization required + + if(a_dot_nab < 0) + { + // Outside of edge a->b + + const btScalar ba_l2 = ba.length2(); + const btScalar a_dot_ba = btDot(a->w, ba); + const btScalar b_dot_ba = btDot(b->w, ba); + + if(a_dot_ba > 0) + { + // Pick distance vertex a + dist = a->w.length(); + } + else if(b_dot_ba < 0) + { + // Pick distance vertex b + dist = b->w.length(); + } + else + { + // Pick distance to edge a->b + const btScalar a_dot_b = btDot(a->w, b->w); + dist = btSqrt(btMax((a->w.length2() * b->w.length2() - a_dot_b * a_dot_b) / ba_l2, (btScalar)0)); + } + + return true; + } + + return false; + } + sFace* newface(typename GJK::sSV* a,typename GJK::sSV* b,typename GJK::sSV* c,bool forced) + { + if(m_stock.root) + { + sFace* face=m_stock.root; + remove(m_stock,face); + append(m_hull,face); + face->pass = 0; + face->c[0] = a; + face->c[1] = b; + face->c[2] = c; + face->n = btCross(b->w-a->w,c->w-a->w); + const btScalar l=face->n.length(); + const bool v=l>EPA_ACCURACY; + + if(v) + { + if(!(getedgedist(face, a, b, face->d) || + getedgedist(face, b, c, face->d) || + getedgedist(face, c, a, face->d))) + { + // Origin projects to the interior of the triangle + // Use distance to triangle plane + face->d = btDot(a->w, face->n) / l; + } + + face->n /= l; + if(forced || (face->d >= -EPA_PLANE_EPS)) + { + return face; + } + else + m_status=eEpaNonConvex; + } + else + m_status=eEpaDegenerated; + + remove(m_hull, face); + append(m_stock, face); + return 0; + + } + m_status = m_stock.root ? eEpaOutOfVertices : eEpaOutOfFaces; + return 0; + } + sFace* findbest() + { + sFace* minf=m_hull.root; + btScalar mind=minf->d*minf->d; + for(sFace* f=minf->l[1];f;f=f->l[1]) + { + const btScalar sqd=f->d*f->d; + if(sqd::sSV* w,sFace* f,U e,sHorizon& horizon) + { + static const U i1m3[]={1,2,0}; + static const U i2m3[]={2,0,1}; + if(f->pass!=pass) + { + const U e1=i1m3[e]; + if((btDot(f->n,w->w)-f->d)<-EPA_PLANE_EPS) + { + sFace* nf=newface(f->c[e1],f->c[e],w,false); + if(nf) + { + bind(nf,0,f,e); + if(horizon.cf) bind(horizon.cf,1,nf,2); else horizon.ff=nf; + horizon.cf=nf; + ++horizon.nf; + return(true); + } + } + else + { + const U e2=i2m3[e]; + f->pass = (U1)pass; + if( expand(pass,w,f->f[e1],f->e[e1],horizon)&& + expand(pass,w,f->f[e2],f->e[e2],horizon)) + { + remove(m_hull,f); + append(m_stock,f); + return(true); + } + } + } + return(false); + } + + }; + + template + static void Initialize( const btConvexTemplate& a, const btConvexTemplate& b, + btGjkEpaSolver3::sResults& results, + MinkowskiDiff& shape) + { + /* Results */ + results.witnesses[0] = + results.witnesses[1] = btVector3(0,0,0); + results.status = btGjkEpaSolver3::sResults::Separated; + /* Shape */ + + shape.m_toshape1 = b.getWorldTransform().getBasis().transposeTimes(a.getWorldTransform().getBasis()); + shape.m_toshape0 = a.getWorldTransform().inverseTimes(b.getWorldTransform()); + + } + + +// +// Api +// + + + +// +template +bool btGjkEpaSolver3_Distance(const btConvexTemplate& a, const btConvexTemplate& b, + const btVector3& guess, + btGjkEpaSolver3::sResults& results) +{ + MinkowskiDiff shape(a,b); + Initialize(a,b,results,shape); + GJK gjk(a,b); + eGjkStatus gjk_status=gjk.Evaluate(shape,guess); + if(gjk_status==eGjkValid) + { + btVector3 w0=btVector3(0,0,0); + btVector3 w1=btVector3(0,0,0); + for(U i=0;irank;++i) + { + const btScalar p=gjk.m_simplex->p[i]; + w0+=shape.Support( gjk.m_simplex->c[i]->d,0)*p; + w1+=shape.Support(-gjk.m_simplex->c[i]->d,1)*p; + } + results.witnesses[0] = a.getWorldTransform()*w0; + results.witnesses[1] = a.getWorldTransform()*w1; + results.normal = w0-w1; + results.distance = results.normal.length(); + results.normal /= results.distance>GJK_MIN_DISTANCE?results.distance:1; + return(true); + } + else + { + results.status = gjk_status==eGjkInside? + btGjkEpaSolver3::sResults::Penetrating : + btGjkEpaSolver3::sResults::GJK_Failed ; + return(false); + } +} + + +template +bool btGjkEpaSolver3_Penetration(const btConvexTemplate& a, + const btConvexTemplate& b, + const btVector3& guess, + btGjkEpaSolver3::sResults& results) +{ + MinkowskiDiff shape(a,b); + Initialize(a,b,results,shape); + GJK gjk(a,b); + eGjkStatus gjk_status=gjk.Evaluate(shape,-guess); + switch(gjk_status) + { + case eGjkInside: + { + EPA epa; + eEpaStatus epa_status=epa.Evaluate(gjk,-guess); + if(epa_status!=eEpaFailed) + { + btVector3 w0=btVector3(0,0,0); + for(U i=0;id,0)*epa.m_result.p[i]; + } + results.status = btGjkEpaSolver3::sResults::Penetrating; + results.witnesses[0] = a.getWorldTransform()*w0; + results.witnesses[1] = a.getWorldTransform()*(w0-epa.m_normal*epa.m_depth); + results.normal = -epa.m_normal; + results.distance = -epa.m_depth; + return(true); + } else results.status=btGjkEpaSolver3::sResults::EPA_Failed; + } + break; + case eGjkFailed: + results.status=btGjkEpaSolver3::sResults::GJK_Failed; + break; + default: + { + } + } + return(false); +} + +#if 0 +int btComputeGjkEpaPenetration2(const btCollisionDescription& colDesc, btDistanceInfo* distInfo) +{ + btGjkEpaSolver3::sResults results; + btVector3 guess = colDesc.m_firstDir; + + bool res = btGjkEpaSolver3::Penetration(colDesc.m_objA,colDesc.m_objB, + colDesc.m_transformA,colDesc.m_transformB, + colDesc.m_localSupportFuncA,colDesc.m_localSupportFuncB, + guess, + results); + if (res) + { + if ((results.status==btGjkEpaSolver3::sResults::Penetrating) || results.status==GJK::eStatus::Inside) + { + //normal could be 'swapped' + + distInfo->m_distance = results.distance; + distInfo->m_normalBtoA = results.normal; + btVector3 tmpNormalInB = results.witnesses[1]-results.witnesses[0]; + btScalar lenSqr = tmpNormalInB.length2(); + if (lenSqr <= (SIMD_EPSILON*SIMD_EPSILON)) + { + tmpNormalInB = results.normal; + lenSqr = results.normal.length2(); + } + + if (lenSqr > (SIMD_EPSILON*SIMD_EPSILON)) + { + tmpNormalInB /= btSqrt(lenSqr); + btScalar distance2 = -(results.witnesses[0]-results.witnesses[1]).length(); + //only replace valid penetrations when the result is deeper (check) + //if ((distance2 < results.distance)) + { + distInfo->m_distance = distance2; + distInfo->m_pointOnA= results.witnesses[0]; + distInfo->m_pointOnB= results.witnesses[1]; + distInfo->m_normalBtoA= tmpNormalInB; + return 0; + } + } + } + + } + + return -1; +} +#endif + +template +int btComputeGjkDistance(const btConvexTemplate& a, const btConvexTemplate& b, + const btGjkCollisionDescription& colDesc, btDistanceInfoTemplate* distInfo) +{ + btGjkEpaSolver3::sResults results; + btVector3 guess = colDesc.m_firstDir; + + bool isSeparated = btGjkEpaSolver3_Distance( a,b, + guess, + results); + if (isSeparated) + { + distInfo->m_distance = results.distance; + distInfo->m_pointOnA= results.witnesses[0]; + distInfo->m_pointOnB= results.witnesses[1]; + distInfo->m_normalBtoA= results.normal; + return 0; + } + + return -1; +} + +/* Symbols cleanup */ + +#undef GJK_MAX_ITERATIONS +#undef GJK_ACCURARY +#undef GJK_MIN_DISTANCE +#undef GJK_DUPLICATED_EPS +#undef GJK_SIMPLEX2_EPS +#undef GJK_SIMPLEX3_EPS +#undef GJK_SIMPLEX4_EPS + +#undef EPA_MAX_VERTICES +#undef EPA_MAX_FACES +#undef EPA_MAX_ITERATIONS +#undef EPA_ACCURACY +#undef EPA_FALLBACK +#undef EPA_PLANE_EPS +#undef EPA_INSIDE_EPS + + + +#endif //BT_GJK_EPA3_H + diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp index 887757949..257b026d9 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp @@ -26,12 +26,17 @@ subject to the following restrictions: #ifdef __SPU__ #include #define printf spu_printf -//#define DEBUG_SPU_COLLISION_DETECTION 1 #endif //__SPU__ #endif //must be above the machine epsilon -#define REL_ERROR2 btScalar(1.0e-6) +#ifdef BT_USE_DOUBLE_PRECISION + #define REL_ERROR2 btScalar(1.0e-12) + btScalar gGjkEpaPenetrationTolerance = 1e-7; +#else + #define REL_ERROR2 btScalar(1.0e-6) + btScalar gGjkEpaPenetrationTolerance = 0.001; +#endif //temp globals, to improve GJK/EPA/penetration calculations int gNumDeepPenetrationChecks = 0; @@ -81,17 +86,18 @@ void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result& #ifdef __SPU__ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw) #else -void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw) +void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw) #endif { m_cachedSeparatingDistance = 0.f; btScalar distance=btScalar(0.); btVector3 normalInB(btScalar(0.),btScalar(0.),btScalar(0.)); + btVector3 pointOnA,pointOnB; btTransform localTransA = input.m_transformA; btTransform localTransB = input.m_transformB; - btVector3 positionOffset = (localTransA.getOrigin() + localTransB.getOrigin()) * btScalar(0.5); + btVector3 positionOffset=(localTransA.getOrigin() + localTransB.getOrigin()) * btScalar(0.5); localTransA.getOrigin() -= positionOffset; localTransB.getOrigin() -= positionOffset; @@ -102,17 +108,11 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu gNumGjkChecks++; -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("inside gjk\n"); -#endif //for CCD we don't use margins if (m_ignoreMargin) { marginA = btScalar(0.); marginB = btScalar(0.); -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("ignoring margin\n"); -#endif } m_curIter = 0; @@ -143,37 +143,13 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu btVector3 seperatingAxisInA = (-m_cachedSeparatingAxis)* input.m_transformA.getBasis(); btVector3 seperatingAxisInB = m_cachedSeparatingAxis* input.m_transformB.getBasis(); -#if 1 btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInA); btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInB); -// btVector3 pInA = localGetSupportingVertexWithoutMargin(m_shapeTypeA, m_minkowskiA, seperatingAxisInA,input.m_convexVertexData[0]);//, &featureIndexA); -// btVector3 qInB = localGetSupportingVertexWithoutMargin(m_shapeTypeB, m_minkowskiB, seperatingAxisInB,input.m_convexVertexData[1]);//, &featureIndexB); - -#else -#ifdef __SPU__ - btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInA); - btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInB); -#else - btVector3 pInA = m_minkowskiA->localGetSupportingVertexWithoutMargin(seperatingAxisInA); - btVector3 qInB = m_minkowskiB->localGetSupportingVertexWithoutMargin(seperatingAxisInB); -#ifdef TEST_NON_VIRTUAL - btVector3 pInAv = m_minkowskiA->localGetSupportingVertexWithoutMargin(seperatingAxisInA); - btVector3 qInBv = m_minkowskiB->localGetSupportingVertexWithoutMargin(seperatingAxisInB); - btAssert((pInAv-pInA).length() < 0.0001); - btAssert((qInBv-qInB).length() < 0.0001); -#endif // -#endif //__SPU__ -#endif - - btVector3 pWorld = localTransA(pInA); btVector3 qWorld = localTransB(qInB); -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("got local supporting vertices\n"); -#endif if (check2d) { @@ -217,14 +193,8 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu break; } -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("addVertex 1\n"); -#endif //add current vertex to simplex m_simplexSolver->addVertex(w, pWorld, qWorld); -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("addVertex 2\n"); -#endif btVector3 newCachedSeparatingAxis; //calculate the closest point to the origin (update vector v) @@ -274,7 +244,7 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu //degeneracy, this is typically due to invalid/uninitialized worldtransforms for a btCollisionObject if (m_curIter++ > gGjkMaxIter) { - #if defined(DEBUG) || defined (_DEBUG) || defined (DEBUG_SPU_COLLISION_DETECTION) + #if defined(DEBUG) || defined (_DEBUG) printf("btGjkPairDetector maxIter exceeded:%i\n",m_curIter); printf("sepAxis=(%f,%f,%f), squaredDistance = %f, shapeTypeA=%i,shapeTypeB=%i\n", @@ -307,10 +277,11 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu { m_simplexSolver->compute_points(pointOnA, pointOnB); normalInB = m_cachedSeparatingAxis; + btScalar lenSqr =m_cachedSeparatingAxis.length2(); //valid normal - if (lenSqr < 0.0001) + if (lenSqr < REL_ERROR2) { m_degenerateSimplex = 5; } @@ -318,6 +289,7 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu { btScalar rlen = btScalar(1.) / btSqrt(lenSqr ); normalInB *= rlen; //normalize + btScalar s = btSqrt(squaredDistance); btAssert(s > btScalar(0.0)); @@ -334,7 +306,7 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu } bool catchDegeneratePenetrationCase = - (m_catchDegeneracies && m_penetrationDepthSolver && m_degenerateSimplex && ((distance+margin) < 0.01)); + (m_catchDegeneracies && m_penetrationDepthSolver && m_degenerateSimplex && ((distance+margin) < gGjkEpaPenetrationTolerance)); //if (checkPenetration && !isValid) if (checkPenetration && (!isValid || catchDegeneratePenetrationCase )) @@ -373,6 +345,7 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu { tmpNormalInB /= btSqrt(lenSqr); btScalar distance2 = -(tmpPointOnA-tmpPointOnB).length(); + m_lastUsedMethod = 3; //only replace valid penetrations when the result is deeper (check) if (!isValid || (distance2 < distance)) { @@ -380,8 +353,9 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu pointOnA = tmpPointOnA; pointOnB = tmpPointOnB; normalInB = tmpNormalInB; + isValid = true; - m_lastUsedMethod = 3; + } else { m_lastUsedMethod = 8; @@ -413,6 +387,7 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu pointOnB += m_cachedSeparatingAxis * marginB ; normalInB = m_cachedSeparatingAxis; normalInB.normalize(); + isValid = true; m_lastUsedMethod = 6; } else @@ -431,39 +406,51 @@ void btGjkPairDetector::getClosestPointsNonVirtual(const ClosestPointInput& inpu if (isValid && ((distance < 0) || (distance*distance < input.m_maximumDistanceSquared))) { -#if 0 -///some debugging -// if (check2d) - { - printf("n = %2.3f,%2.3f,%2.3f. ",normalInB[0],normalInB[1],normalInB[2]); - printf("distance = %2.3f exit=%d deg=%d\n",distance,m_lastUsedMethod,m_degenerateSimplex); - } -#endif - if (m_fixContactNormalDirection) - { - ///@workaround for sticky convex collisions - //in some degenerate cases (usually when the use uses very small margins) - //the contact normal is pointing the wrong direction - //so fix it now (until we can deal with all degenerate cases in GJK and EPA) - //contact normals need to point from B to A in all cases, so we can simply check if the contact normal really points from B to A - //We like to use a dot product of the normal against the difference of the centroids, - //once the centroid is available in the API - //until then we use the center of the aabb to approximate the centroid - btVector3 aabbMin,aabbMax; - m_minkowskiA->getAabb(localTransA,aabbMin,aabbMax); - btVector3 posA = (aabbMax+aabbMin)*btScalar(0.5); - - m_minkowskiB->getAabb(localTransB,aabbMin,aabbMax); - btVector3 posB = (aabbMin+aabbMax)*btScalar(0.5); - - btVector3 diff = posA-posB; - if (diff.dot(normalInB) < 0.f) - normalInB *= -1.f; - } m_cachedSeparatingAxis = normalInB; m_cachedSeparatingDistance = distance; + { + ///todo: need to track down this EPA penetration solver degeneracy + ///the penetration solver reports penetration but the contact normal + ///connecting the contact points is pointing in the opposite direction + ///until then, detect the issue and revert the normal + + btScalar d1=0; + { + btVector3 seperatingAxisInA = (normalInB)* input.m_transformA.getBasis(); + btVector3 seperatingAxisInB = -normalInB* input.m_transformB.getBasis(); + + + btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInA); + btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInB); + + btVector3 pWorld = localTransA(pInA); + btVector3 qWorld = localTransB(qInB); + btVector3 w = pWorld - qWorld; + d1 = (-normalInB).dot(w); + } + btScalar d0 = 0.f; + { + btVector3 seperatingAxisInA = (-normalInB)* input.m_transformA.getBasis(); + btVector3 seperatingAxisInB = normalInB* input.m_transformB.getBasis(); + + + btVector3 pInA = m_minkowskiA->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInA); + btVector3 qInB = m_minkowskiB->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInB); + + btVector3 pWorld = localTransA(pInA); + btVector3 qWorld = localTransB(qInB); + btVector3 w = pWorld - qWorld; + d0 = normalInB.dot(w); + } + if (d1>d0) + { + m_lastUsedMethod = 10; + normalInB*=-1; + } + + } output.addContactPoint( normalInB, pointOnB+positionOffset, diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h index e40fb1d3d..04ab54ed9 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h @@ -35,7 +35,13 @@ typedef sce::PhysicsEffects::PfxConstraintRow btConstraintRow; typedef btConstraintRow PfxConstraintRow; #endif //PFX_USE_FREE_VECTORMATH - +enum btContactPointFlags +{ + BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED=1, + BT_CONTACT_FLAG_HAS_CONTACT_CFM=2, + BT_CONTACT_FLAG_HAS_CONTACT_ERP=4, + BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING = 8, +}; /// ManifoldContactPoint collects and maintains persistent contactpoints. /// used to improve stability and performance of rigidbody dynamics response. @@ -44,14 +50,15 @@ class btManifoldPoint public: btManifoldPoint() :m_userPersistentData(0), - m_lateralFrictionInitialized(false), - m_appliedImpulse(0.f), + m_contactPointFlags(0), + m_appliedImpulse(0.f), m_appliedImpulseLateral1(0.f), m_appliedImpulseLateral2(0.f), m_contactMotion1(0.f), m_contactMotion2(0.f), - m_contactCFM1(0.f), - m_contactCFM2(0.f), + m_contactCFM(0.f), + m_contactERP(0.f), + m_frictionCFM(0.f), m_lifeTime(0) { } @@ -65,16 +72,18 @@ class btManifoldPoint m_distance1( distance ), m_combinedFriction(btScalar(0.)), m_combinedRollingFriction(btScalar(0.)), - m_combinedRestitution(btScalar(0.)), + m_combinedSpinningFriction(btScalar(0.)), + m_combinedRestitution(btScalar(0.)), m_userPersistentData(0), - m_lateralFrictionInitialized(false), - m_appliedImpulse(0.f), + m_contactPointFlags(0), + m_appliedImpulse(0.f), m_appliedImpulseLateral1(0.f), m_appliedImpulseLateral2(0.f), m_contactMotion1(0.f), m_contactMotion2(0.f), - m_contactCFM1(0.f), - m_contactCFM2(0.f), + m_contactCFM(0.f), + m_contactERP(0.f), + m_frictionCFM(0.f), m_lifeTime(0) { @@ -91,8 +100,9 @@ class btManifoldPoint btScalar m_distance1; btScalar m_combinedFriction; - btScalar m_combinedRollingFriction; - btScalar m_combinedRestitution; + btScalar m_combinedRollingFriction;//torsional friction orthogonal to contact normal, useful to make spheres stop rolling forever + btScalar m_combinedSpinningFriction;//torsional friction around contact normal, useful for grasping objects + btScalar m_combinedRestitution; //BP mod, store contact triangles. int m_partId0; @@ -101,15 +111,28 @@ class btManifoldPoint int m_index1; mutable void* m_userPersistentData; - bool m_lateralFrictionInitialized; - + //bool m_lateralFrictionInitialized; + int m_contactPointFlags; + btScalar m_appliedImpulse; btScalar m_appliedImpulseLateral1; btScalar m_appliedImpulseLateral2; btScalar m_contactMotion1; btScalar m_contactMotion2; - btScalar m_contactCFM1; - btScalar m_contactCFM2; + + union + { + btScalar m_contactCFM; + btScalar m_combinedContactStiffness1; + }; + + union + { + btScalar m_contactERP; + btScalar m_combinedContactDamping1; + }; + + btScalar m_frictionCFM; int m_lifeTime;//lifetime of the contactpoint in frames diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h new file mode 100644 index 000000000..a22a0bae6 --- /dev/null +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btMprPenetration.h @@ -0,0 +1,908 @@ + +/*** + * --------------------------------- + * Copyright (c)2012 Daniel Fiser + * + * This file was ported from mpr.c file, part of libccd. + * The Minkoski Portal Refinement implementation was ported + * to OpenCL by Erwin Coumans for the Bullet 3 Physics library. + * The original MPR idea and implementation is by Gary Snethen + * in XenoCollide, see http://github.com/erwincoumans/xenocollide + * + * Distributed under the OSI-approved BSD License (the "License"); + * see . + * This software is distributed WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the License for more information. + */ + +///2014 Oct, Erwin Coumans, Use templates to avoid void* casts + +#ifndef BT_MPR_PENETRATION_H +#define BT_MPR_PENETRATION_H + +#define BT_DEBUG_MPR1 + +#include "LinearMath/btTransform.h" +#include "LinearMath/btAlignedObjectArray.h" + +//#define MPR_AVERAGE_CONTACT_POSITIONS + + +struct btMprCollisionDescription +{ + btVector3 m_firstDir; + int m_maxGjkIterations; + btScalar m_maximumDistanceSquared; + btScalar m_gjkRelError2; + + btMprCollisionDescription() + : m_firstDir(0,1,0), + m_maxGjkIterations(1000), + m_maximumDistanceSquared(1e30f), + m_gjkRelError2(1.0e-6) + { + } + virtual ~btMprCollisionDescription() + { + } +}; + +struct btMprDistanceInfo +{ + btVector3 m_pointOnA; + btVector3 m_pointOnB; + btVector3 m_normalBtoA; + btScalar m_distance; +}; + +#ifdef __cplusplus +#define BT_MPR_SQRT sqrtf +#else +#define BT_MPR_SQRT sqrt +#endif +#define BT_MPR_FMIN(x, y) ((x) < (y) ? (x) : (y)) +#define BT_MPR_FABS fabs + +#define BT_MPR_TOLERANCE 1E-6f +#define BT_MPR_MAX_ITERATIONS 1000 + +struct _btMprSupport_t +{ + btVector3 v; //!< Support point in minkowski sum + btVector3 v1; //!< Support point in obj1 + btVector3 v2; //!< Support point in obj2 +}; +typedef struct _btMprSupport_t btMprSupport_t; + +struct _btMprSimplex_t +{ + btMprSupport_t ps[4]; + int last; //!< index of last added point +}; +typedef struct _btMprSimplex_t btMprSimplex_t; + +inline btMprSupport_t* btMprSimplexPointW(btMprSimplex_t *s, int idx) +{ + return &s->ps[idx]; +} + +inline void btMprSimplexSetSize(btMprSimplex_t *s, int size) +{ + s->last = size - 1; +} + +#ifdef DEBUG_MPR +inline void btPrintPortalVertex(_btMprSimplex_t* portal, int index) +{ + printf("portal[%d].v = %f,%f,%f, v1=%f,%f,%f, v2=%f,%f,%f\n", index, portal->ps[index].v.x(),portal->ps[index].v.y(),portal->ps[index].v.z(), + portal->ps[index].v1.x(),portal->ps[index].v1.y(),portal->ps[index].v1.z(), + portal->ps[index].v2.x(),portal->ps[index].v2.y(),portal->ps[index].v2.z()); +} +#endif //DEBUG_MPR + + + + +inline int btMprSimplexSize(const btMprSimplex_t *s) +{ + return s->last + 1; +} + + +inline const btMprSupport_t* btMprSimplexPoint(const btMprSimplex_t* s, int idx) +{ + // here is no check on boundaries + return &s->ps[idx]; +} + +inline void btMprSupportCopy(btMprSupport_t *d, const btMprSupport_t *s) +{ + *d = *s; +} + +inline void btMprSimplexSet(btMprSimplex_t *s, size_t pos, const btMprSupport_t *a) +{ + btMprSupportCopy(s->ps + pos, a); +} + + +inline void btMprSimplexSwap(btMprSimplex_t *s, size_t pos1, size_t pos2) +{ + btMprSupport_t supp; + + btMprSupportCopy(&supp, &s->ps[pos1]); + btMprSupportCopy(&s->ps[pos1], &s->ps[pos2]); + btMprSupportCopy(&s->ps[pos2], &supp); +} + + +inline int btMprIsZero(float val) +{ + return BT_MPR_FABS(val) < FLT_EPSILON; +} + + + +inline int btMprEq(float _a, float _b) +{ + float ab; + float a, b; + + ab = BT_MPR_FABS(_a - _b); + if (BT_MPR_FABS(ab) < FLT_EPSILON) + return 1; + + a = BT_MPR_FABS(_a); + b = BT_MPR_FABS(_b); + if (b > a){ + return ab < FLT_EPSILON * b; + }else{ + return ab < FLT_EPSILON * a; + } +} + + +inline int btMprVec3Eq(const btVector3* a, const btVector3 *b) +{ + return btMprEq((*a).x(), (*b).x()) + && btMprEq((*a).y(), (*b).y()) + && btMprEq((*a).z(), (*b).z()); +} + + + + + + + + + + + +template +inline void btFindOrigin(const btConvexTemplate& a, const btConvexTemplate& b, const btMprCollisionDescription& colDesc,btMprSupport_t *center) +{ + + center->v1 = a.getObjectCenterInWorld(); + center->v2 = b.getObjectCenterInWorld(); + center->v = center->v1 - center->v2; +} + +inline void btMprVec3Set(btVector3 *v, float x, float y, float z) +{ + v->setValue(x,y,z); +} + +inline void btMprVec3Add(btVector3 *v, const btVector3 *w) +{ + *v += *w; +} + +inline void btMprVec3Copy(btVector3 *v, const btVector3 *w) +{ + *v = *w; +} + +inline void btMprVec3Scale(btVector3 *d, float k) +{ + *d *= k; +} + +inline float btMprVec3Dot(const btVector3 *a, const btVector3 *b) +{ + float dot; + + dot = btDot(*a,*b); + return dot; +} + + +inline float btMprVec3Len2(const btVector3 *v) +{ + return btMprVec3Dot(v, v); +} + +inline void btMprVec3Normalize(btVector3 *d) +{ + float k = 1.f / BT_MPR_SQRT(btMprVec3Len2(d)); + btMprVec3Scale(d, k); +} + +inline void btMprVec3Cross(btVector3 *d, const btVector3 *a, const btVector3 *b) +{ + *d = btCross(*a,*b); + +} + + +inline void btMprVec3Sub2(btVector3 *d, const btVector3 *v, const btVector3 *w) +{ + *d = *v - *w; +} + +inline void btPortalDir(const btMprSimplex_t *portal, btVector3 *dir) +{ + btVector3 v2v1, v3v1; + + btMprVec3Sub2(&v2v1, &btMprSimplexPoint(portal, 2)->v, + &btMprSimplexPoint(portal, 1)->v); + btMprVec3Sub2(&v3v1, &btMprSimplexPoint(portal, 3)->v, + &btMprSimplexPoint(portal, 1)->v); + btMprVec3Cross(dir, &v2v1, &v3v1); + btMprVec3Normalize(dir); +} + + +inline int portalEncapsulesOrigin(const btMprSimplex_t *portal, + const btVector3 *dir) +{ + float dot; + dot = btMprVec3Dot(dir, &btMprSimplexPoint(portal, 1)->v); + return btMprIsZero(dot) || dot > 0.f; +} + +inline int portalReachTolerance(const btMprSimplex_t *portal, + const btMprSupport_t *v4, + const btVector3 *dir) +{ + float dv1, dv2, dv3, dv4; + float dot1, dot2, dot3; + + // find the smallest dot product of dir and {v1-v4, v2-v4, v3-v4} + + dv1 = btMprVec3Dot(&btMprSimplexPoint(portal, 1)->v, dir); + dv2 = btMprVec3Dot(&btMprSimplexPoint(portal, 2)->v, dir); + dv3 = btMprVec3Dot(&btMprSimplexPoint(portal, 3)->v, dir); + dv4 = btMprVec3Dot(&v4->v, dir); + + dot1 = dv4 - dv1; + dot2 = dv4 - dv2; + dot3 = dv4 - dv3; + + dot1 = BT_MPR_FMIN(dot1, dot2); + dot1 = BT_MPR_FMIN(dot1, dot3); + + return btMprEq(dot1, BT_MPR_TOLERANCE) || dot1 < BT_MPR_TOLERANCE; +} + +inline int portalCanEncapsuleOrigin(const btMprSimplex_t *portal, + const btMprSupport_t *v4, + const btVector3 *dir) +{ + float dot; + dot = btMprVec3Dot(&v4->v, dir); + return btMprIsZero(dot) || dot > 0.f; +} + +inline void btExpandPortal(btMprSimplex_t *portal, + const btMprSupport_t *v4) +{ + float dot; + btVector3 v4v0; + + btMprVec3Cross(&v4v0, &v4->v, &btMprSimplexPoint(portal, 0)->v); + dot = btMprVec3Dot(&btMprSimplexPoint(portal, 1)->v, &v4v0); + if (dot > 0.f){ + dot = btMprVec3Dot(&btMprSimplexPoint(portal, 2)->v, &v4v0); + if (dot > 0.f){ + btMprSimplexSet(portal, 1, v4); + }else{ + btMprSimplexSet(portal, 3, v4); + } + }else{ + dot = btMprVec3Dot(&btMprSimplexPoint(portal, 3)->v, &v4v0); + if (dot > 0.f){ + btMprSimplexSet(portal, 2, v4); + }else{ + btMprSimplexSet(portal, 1, v4); + } + } +} +template +inline void btMprSupport(const btConvexTemplate& a, const btConvexTemplate& b, + const btMprCollisionDescription& colDesc, + const btVector3& dir, btMprSupport_t *supp) +{ + btVector3 seperatingAxisInA = dir* a.getWorldTransform().getBasis(); + btVector3 seperatingAxisInB = -dir* b.getWorldTransform().getBasis(); + + btVector3 pInA = a.getLocalSupportWithMargin(seperatingAxisInA); + btVector3 qInB = b.getLocalSupportWithMargin(seperatingAxisInB); + + supp->v1 = a.getWorldTransform()(pInA); + supp->v2 = b.getWorldTransform()(qInB); + supp->v = supp->v1 - supp->v2; +} + + +template +static int btDiscoverPortal(const btConvexTemplate& a, const btConvexTemplate& b, + const btMprCollisionDescription& colDesc, + btMprSimplex_t *portal) +{ + btVector3 dir, va, vb; + float dot; + int cont; + + + + // vertex 0 is center of portal + btFindOrigin(a,b,colDesc, btMprSimplexPointW(portal, 0)); + + + // vertex 0 is center of portal + btMprSimplexSetSize(portal, 1); + + + + btVector3 zero = btVector3(0,0,0); + btVector3* org = &zero; + + if (btMprVec3Eq(&btMprSimplexPoint(portal, 0)->v, org)){ + // Portal's center lies on origin (0,0,0) => we know that objects + // intersect but we would need to know penetration info. + // So move center little bit... + btMprVec3Set(&va, FLT_EPSILON * 10.f, 0.f, 0.f); + btMprVec3Add(&btMprSimplexPointW(portal, 0)->v, &va); + } + + + // vertex 1 = support in direction of origin + btMprVec3Copy(&dir, &btMprSimplexPoint(portal, 0)->v); + btMprVec3Scale(&dir, -1.f); + btMprVec3Normalize(&dir); + + + btMprSupport(a,b,colDesc, dir, btMprSimplexPointW(portal, 1)); + + btMprSimplexSetSize(portal, 2); + + // test if origin isn't outside of v1 + dot = btMprVec3Dot(&btMprSimplexPoint(portal, 1)->v, &dir); + + + if (btMprIsZero(dot) || dot < 0.f) + return -1; + + + // vertex 2 + btMprVec3Cross(&dir, &btMprSimplexPoint(portal, 0)->v, + &btMprSimplexPoint(portal, 1)->v); + if (btMprIsZero(btMprVec3Len2(&dir))){ + if (btMprVec3Eq(&btMprSimplexPoint(portal, 1)->v, org)){ + // origin lies on v1 + return 1; + }else{ + // origin lies on v0-v1 segment + return 2; + } + } + + btMprVec3Normalize(&dir); + btMprSupport(a,b,colDesc, dir, btMprSimplexPointW(portal, 2)); + + + + dot = btMprVec3Dot(&btMprSimplexPoint(portal, 2)->v, &dir); + if (btMprIsZero(dot) || dot < 0.f) + return -1; + + btMprSimplexSetSize(portal, 3); + + // vertex 3 direction + btMprVec3Sub2(&va, &btMprSimplexPoint(portal, 1)->v, + &btMprSimplexPoint(portal, 0)->v); + btMprVec3Sub2(&vb, &btMprSimplexPoint(portal, 2)->v, + &btMprSimplexPoint(portal, 0)->v); + btMprVec3Cross(&dir, &va, &vb); + btMprVec3Normalize(&dir); + + // it is better to form portal faces to be oriented "outside" origin + dot = btMprVec3Dot(&dir, &btMprSimplexPoint(portal, 0)->v); + if (dot > 0.f){ + btMprSimplexSwap(portal, 1, 2); + btMprVec3Scale(&dir, -1.f); + } + + while (btMprSimplexSize(portal) < 4){ + btMprSupport(a,b,colDesc, dir, btMprSimplexPointW(portal, 3)); + + dot = btMprVec3Dot(&btMprSimplexPoint(portal, 3)->v, &dir); + if (btMprIsZero(dot) || dot < 0.f) + return -1; + + cont = 0; + + // test if origin is outside (v1, v0, v3) - set v2 as v3 and + // continue + btMprVec3Cross(&va, &btMprSimplexPoint(portal, 1)->v, + &btMprSimplexPoint(portal, 3)->v); + dot = btMprVec3Dot(&va, &btMprSimplexPoint(portal, 0)->v); + if (dot < 0.f && !btMprIsZero(dot)){ + btMprSimplexSet(portal, 2, btMprSimplexPoint(portal, 3)); + cont = 1; + } + + if (!cont){ + // test if origin is outside (v3, v0, v2) - set v1 as v3 and + // continue + btMprVec3Cross(&va, &btMprSimplexPoint(portal, 3)->v, + &btMprSimplexPoint(portal, 2)->v); + dot = btMprVec3Dot(&va, &btMprSimplexPoint(portal, 0)->v); + if (dot < 0.f && !btMprIsZero(dot)){ + btMprSimplexSet(portal, 1, btMprSimplexPoint(portal, 3)); + cont = 1; + } + } + + if (cont){ + btMprVec3Sub2(&va, &btMprSimplexPoint(portal, 1)->v, + &btMprSimplexPoint(portal, 0)->v); + btMprVec3Sub2(&vb, &btMprSimplexPoint(portal, 2)->v, + &btMprSimplexPoint(portal, 0)->v); + btMprVec3Cross(&dir, &va, &vb); + btMprVec3Normalize(&dir); + }else{ + btMprSimplexSetSize(portal, 4); + } + } + + return 0; +} + +template +static int btRefinePortal(const btConvexTemplate& a, const btConvexTemplate& b,const btMprCollisionDescription& colDesc, + btMprSimplex_t *portal) +{ + btVector3 dir; + btMprSupport_t v4; + + for (int i=0;iv, + &btMprSimplexPoint(portal, 2)->v); + b[0] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 3)->v); + + btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 3)->v, + &btMprSimplexPoint(portal, 2)->v); + b[1] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 0)->v); + + btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 0)->v, + &btMprSimplexPoint(portal, 1)->v); + b[2] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 3)->v); + + btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 2)->v, + &btMprSimplexPoint(portal, 1)->v); + b[3] = btMprVec3Dot(&vec, &btMprSimplexPoint(portal, 0)->v); + + sum = b[0] + b[1] + b[2] + b[3]; + + if (btMprIsZero(sum) || sum < 0.f){ + b[0] = 0.f; + + btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 2)->v, + &btMprSimplexPoint(portal, 3)->v); + b[1] = btMprVec3Dot(&vec, &dir); + btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 3)->v, + &btMprSimplexPoint(portal, 1)->v); + b[2] = btMprVec3Dot(&vec, &dir); + btMprVec3Cross(&vec, &btMprSimplexPoint(portal, 1)->v, + &btMprSimplexPoint(portal, 2)->v); + b[3] = btMprVec3Dot(&vec, &dir); + + sum = b[1] + b[2] + b[3]; + } + + inv = 1.f / sum; + + btMprVec3Copy(&p1, origin); + btMprVec3Copy(&p2, origin); + for (i = 0; i < 4; i++){ + btMprVec3Copy(&vec, &btMprSimplexPoint(portal, i)->v1); + btMprVec3Scale(&vec, b[i]); + btMprVec3Add(&p1, &vec); + + btMprVec3Copy(&vec, &btMprSimplexPoint(portal, i)->v2); + btMprVec3Scale(&vec, b[i]); + btMprVec3Add(&p2, &vec); + } + btMprVec3Scale(&p1, inv); + btMprVec3Scale(&p2, inv); +#ifdef MPR_AVERAGE_CONTACT_POSITIONS + btMprVec3Copy(pos, &p1); + btMprVec3Add(pos, &p2); + btMprVec3Scale(pos, 0.5); +#else + btMprVec3Copy(pos, &p2); +#endif//MPR_AVERAGE_CONTACT_POSITIONS +} + +inline float btMprVec3Dist2(const btVector3 *a, const btVector3 *b) +{ + btVector3 ab; + btMprVec3Sub2(&ab, a, b); + return btMprVec3Len2(&ab); +} + +inline float _btMprVec3PointSegmentDist2(const btVector3 *P, + const btVector3 *x0, + const btVector3 *b, + btVector3 *witness) +{ + // The computation comes from solving equation of segment: + // S(t) = x0 + t.d + // where - x0 is initial point of segment + // - d is direction of segment from x0 (|d| > 0) + // - t belongs to <0, 1> interval + // + // Than, distance from a segment to some point P can be expressed: + // D(t) = |x0 + t.d - P|^2 + // which is distance from any point on segment. Minimization + // of this function brings distance from P to segment. + // Minimization of D(t) leads to simple quadratic equation that's + // solving is straightforward. + // + // Bonus of this method is witness point for free. + + float dist, t; + btVector3 d, a; + + // direction of segment + btMprVec3Sub2(&d, b, x0); + + // precompute vector from P to x0 + btMprVec3Sub2(&a, x0, P); + + t = -1.f * btMprVec3Dot(&a, &d); + t /= btMprVec3Len2(&d); + + if (t < 0.f || btMprIsZero(t)){ + dist = btMprVec3Dist2(x0, P); + if (witness) + btMprVec3Copy(witness, x0); + }else if (t > 1.f || btMprEq(t, 1.f)){ + dist = btMprVec3Dist2(b, P); + if (witness) + btMprVec3Copy(witness, b); + }else{ + if (witness){ + btMprVec3Copy(witness, &d); + btMprVec3Scale(witness, t); + btMprVec3Add(witness, x0); + dist = btMprVec3Dist2(witness, P); + }else{ + // recycling variables + btMprVec3Scale(&d, t); + btMprVec3Add(&d, &a); + dist = btMprVec3Len2(&d); + } + } + + return dist; +} + + + +inline float btMprVec3PointTriDist2(const btVector3 *P, + const btVector3 *x0, const btVector3 *B, + const btVector3 *C, + btVector3 *witness) +{ + // Computation comes from analytic expression for triangle (x0, B, C) + // T(s, t) = x0 + s.d1 + t.d2, where d1 = B - x0 and d2 = C - x0 and + // Then equation for distance is: + // D(s, t) = | T(s, t) - P |^2 + // This leads to minimization of quadratic function of two variables. + // The solution from is taken only if s is between 0 and 1, t is + // between 0 and 1 and t + s < 1, otherwise distance from segment is + // computed. + + btVector3 d1, d2, a; + float u, v, w, p, q, r; + float s, t, dist, dist2; + btVector3 witness2; + + btMprVec3Sub2(&d1, B, x0); + btMprVec3Sub2(&d2, C, x0); + btMprVec3Sub2(&a, x0, P); + + u = btMprVec3Dot(&a, &a); + v = btMprVec3Dot(&d1, &d1); + w = btMprVec3Dot(&d2, &d2); + p = btMprVec3Dot(&a, &d1); + q = btMprVec3Dot(&a, &d2); + r = btMprVec3Dot(&d1, &d2); + + btScalar div = (w * v - r * r); + if (btMprIsZero(div)) + { + s=-1; + } else + { + s = (q * r - w * p) / div; + t = (-s * r - q) / w; + } + + if ((btMprIsZero(s) || s > 0.f) + && (btMprEq(s, 1.f) || s < 1.f) + && (btMprIsZero(t) || t > 0.f) + && (btMprEq(t, 1.f) || t < 1.f) + && (btMprEq(t + s, 1.f) || t + s < 1.f)){ + + if (witness){ + btMprVec3Scale(&d1, s); + btMprVec3Scale(&d2, t); + btMprVec3Copy(witness, x0); + btMprVec3Add(witness, &d1); + btMprVec3Add(witness, &d2); + + dist = btMprVec3Dist2(witness, P); + }else{ + dist = s * s * v; + dist += t * t * w; + dist += 2.f * s * t * r; + dist += 2.f * s * p; + dist += 2.f * t * q; + dist += u; + } + }else{ + dist = _btMprVec3PointSegmentDist2(P, x0, B, witness); + + dist2 = _btMprVec3PointSegmentDist2(P, x0, C, &witness2); + if (dist2 < dist){ + dist = dist2; + if (witness) + btMprVec3Copy(witness, &witness2); + } + + dist2 = _btMprVec3PointSegmentDist2(P, B, C, &witness2); + if (dist2 < dist){ + dist = dist2; + if (witness) + btMprVec3Copy(witness, &witness2); + } + } + + return dist; +} + +template +static void btFindPenetr(const btConvexTemplate& a, const btConvexTemplate& b, + const btMprCollisionDescription& colDesc, + btMprSimplex_t *portal, + float *depth, btVector3 *pdir, btVector3 *pos) +{ + btVector3 dir; + btMprSupport_t v4; + unsigned long iterations; + + btVector3 zero = btVector3(0,0,0); + btVector3* origin = &zero; + + + iterations = 1UL; + for (int i=0;i find penetration info + if (portalReachTolerance(portal, &v4, &dir) + || iterations ==BT_MPR_MAX_ITERATIONS) + { + *depth = btMprVec3PointTriDist2(origin,&btMprSimplexPoint(portal, 1)->v,&btMprSimplexPoint(portal, 2)->v,&btMprSimplexPoint(portal, 3)->v,pdir); + *depth = BT_MPR_SQRT(*depth); + + if (btMprIsZero((*pdir).x()) && btMprIsZero((*pdir).y()) && btMprIsZero((*pdir).z())) + { + + *pdir = dir; + } + btMprVec3Normalize(pdir); + + // barycentric coordinates: + btFindPos(portal, pos); + + + return; + } + + btExpandPortal(portal, &v4); + + iterations++; + } +} + +static void btFindPenetrTouch(btMprSimplex_t *portal,float *depth, btVector3 *dir, btVector3 *pos) +{ + // Touching contact on portal's v1 - so depth is zero and direction + // is unimportant and pos can be guessed + *depth = 0.f; + btVector3 zero = btVector3(0,0,0); + btVector3* origin = &zero; + + + btMprVec3Copy(dir, origin); +#ifdef MPR_AVERAGE_CONTACT_POSITIONS + btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v1); + btMprVec3Add(pos, &btMprSimplexPoint(portal, 1)->v2); + btMprVec3Scale(pos, 0.5); +#else + btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v2); +#endif +} + +static void btFindPenetrSegment(btMprSimplex_t *portal, + float *depth, btVector3 *dir, btVector3 *pos) +{ + + // Origin lies on v0-v1 segment. + // Depth is distance to v1, direction also and position must be + // computed +#ifdef MPR_AVERAGE_CONTACT_POSITIONS + btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v1); + btMprVec3Add(pos, &btMprSimplexPoint(portal, 1)->v2); + btMprVec3Scale(pos, 0.5f); +#else + btMprVec3Copy(pos, &btMprSimplexPoint(portal, 1)->v2); +#endif//MPR_AVERAGE_CONTACT_POSITIONS + + btMprVec3Copy(dir, &btMprSimplexPoint(portal, 1)->v); + *depth = BT_MPR_SQRT(btMprVec3Len2(dir)); + btMprVec3Normalize(dir); + + +} + + +template +inline int btMprPenetration( const btConvexTemplate& a, const btConvexTemplate& b, + const btMprCollisionDescription& colDesc, + float *depthOut, btVector3* dirOut, btVector3* posOut) +{ + + btMprSimplex_t portal; + + + // Phase 1: Portal discovery + int result = btDiscoverPortal(a,b,colDesc, &portal); + + + //sepAxis[pairIndex] = *pdir;//or -dir? + + switch (result) + { + case 0: + { + // Phase 2: Portal refinement + + result = btRefinePortal(a,b,colDesc, &portal); + if (result < 0) + return -1; + + // Phase 3. Penetration info + btFindPenetr(a,b,colDesc, &portal, depthOut, dirOut, posOut); + + + break; + } + case 1: + { + // Touching contact on portal's v1. + btFindPenetrTouch(&portal, depthOut, dirOut, posOut); + result=0; + break; + } + case 2: + { + + btFindPenetrSegment( &portal, depthOut, dirOut, posOut); + result=0; + break; + } + default: + { + //if (res < 0) + //{ + // Origin isn't inside portal - no collision. + result = -1; + //} + } + }; + + return result; +}; + + +template +inline int btComputeMprPenetration( const btConvexTemplate& a, const btConvexTemplate& b, const + btMprCollisionDescription& colDesc, btMprDistanceTemplate* distInfo) +{ + btVector3 dir,pos; + float depth; + + int res = btMprPenetration(a,b,colDesc,&depth, &dir, &pos); + if (res==0) + { + distInfo->m_distance = -depth; + distInfo->m_pointOnB = pos; + distInfo->m_normalBtoA = -dir; + distInfo->m_pointOnA = pos-distInfo->m_distance*dir; + return 0; + } + + return -1; +} + + + +#endif //BT_MPR_PENETRATION_H diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h index 2ceaab750..d220f2993 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h @@ -163,7 +163,7 @@ public: //get rid of duplicated userPersistentData pointer m_pointCache[lastUsedIndex].m_userPersistentData = 0; m_pointCache[lastUsedIndex].m_appliedImpulse = 0.f; - m_pointCache[lastUsedIndex].m_lateralFrictionInitialized = false; + m_pointCache[lastUsedIndex].m_contactPointFlags = 0; m_pointCache[lastUsedIndex].m_appliedImpulseLateral1 = 0.f; m_pointCache[lastUsedIndex].m_appliedImpulseLateral2 = 0.f; m_pointCache[lastUsedIndex].m_lifeTime = 0; @@ -190,16 +190,11 @@ public: void* cache = m_pointCache[insertIndex].m_userPersistentData; m_pointCache[insertIndex] = newPoint; - m_pointCache[insertIndex].m_userPersistentData = cache; m_pointCache[insertIndex].m_appliedImpulse = appliedImpulse; m_pointCache[insertIndex].m_appliedImpulseLateral1 = appliedLateralImpulse1; m_pointCache[insertIndex].m_appliedImpulseLateral2 = appliedLateralImpulse2; - m_pointCache[insertIndex].m_appliedImpulse = appliedImpulse; - m_pointCache[insertIndex].m_appliedImpulseLateral1 = appliedLateralImpulse1; - m_pointCache[insertIndex].m_appliedImpulseLateral2 = appliedLateralImpulse2; - m_pointCache[insertIndex].m_lifeTime = lifeTime; #else diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp index b08205e84..ea380bc5f 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp @@ -116,7 +116,7 @@ static int gActualSATPairTests=0; inline bool IsAlmostZero(const btVector3& v) { - if(fabsf(v.x())>1e-6 || fabsf(v.y())>1e-6 || fabsf(v.z())>1e-6) return false; + if(btFabs(v.x())>1e-6 || btFabs(v.y())>1e-6 || btFabs(v.z())>1e-6) return false; return true; } @@ -313,7 +313,7 @@ bool btPolyhedralContactClipping::findSeparatingAxis( const btConvexPolyhedron& int edgeB=-1; btVector3 worldEdgeA; btVector3 worldEdgeB; - btVector3 witnessPointA,witnessPointB; + btVector3 witnessPointA(0,0,0),witnessPointB(0,0,0); int curEdgeEdge = 0; @@ -411,9 +411,9 @@ bool btPolyhedralContactClipping::findSeparatingAxis( const btConvexPolyhedron& return true; } -void btPolyhedralContactClipping::clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btTransform& transA, btVertexArray& worldVertsB1, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut) +void btPolyhedralContactClipping::clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btTransform& transA, btVertexArray& worldVertsB1,btVertexArray& worldVertsB2, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut) { - btVertexArray worldVertsB2; + worldVertsB2.resize(0); btVertexArray* pVtxIn = &worldVertsB1; btVertexArray* pVtxOut = &worldVertsB2; pVtxOut->reserve(pVtxIn->size()); @@ -527,7 +527,7 @@ void btPolyhedralContactClipping::clipFaceAgainstHull(const btVector3& separatin -void btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatingNormal1, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut) +void btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatingNormal1, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btScalar minDist, btScalar maxDist,btVertexArray& worldVertsB1,btVertexArray& worldVertsB2,btDiscreteCollisionDetectorInterface::Result& resultOut) { btVector3 separatingNormal = separatingNormal1.normalized(); @@ -552,7 +552,7 @@ void btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatin } } } - btVertexArray worldVertsB1; + worldVertsB1.resize(0); { const btFace& polyB = hullB.m_faces[closestFaceB]; const int numVertices = polyB.m_indices.size(); @@ -565,6 +565,6 @@ void btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatin if (closestFaceB>=0) - clipFaceAgainstHull(separatingNormal, hullA, transA,worldVertsB1, minDist, maxDist,resultOut); + clipFaceAgainstHull(separatingNormal, hullA, transA,worldVertsB1, worldVertsB2,minDist, maxDist,resultOut); } diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h index b87bd4f32..30e3db687 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h @@ -32,8 +32,11 @@ typedef btAlignedObjectArray btVertexArray; // Clips a face to the back of a plane struct btPolyhedralContactClipping { - static void clipHullAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btScalar minDist, btScalar maxDist, btDiscreteCollisionDetectorInterface::Result& resultOut); - static void clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btTransform& transA, btVertexArray& worldVertsB1, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut); + + static void clipHullAgainstHull(const btVector3& separatingNormal1, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btScalar minDist, btScalar maxDist,btVertexArray& worldVertsB1,btVertexArray& worldVertsB2,btDiscreteCollisionDetectorInterface::Result& resultOut); + + static void clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btTransform& transA, btVertexArray& worldVertsB1,btVertexArray& worldVertsB2, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut); + static bool findSeparatingAxis( const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, btVector3& sep, btDiscreteCollisionDetectorInterface::Result& resultOut); diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h index 3999d4005..f2ed0cd39 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h @@ -32,10 +32,12 @@ public: //@BP Mod - allow backface filtering and unflipped normals enum EFlags { - kF_None = 0, + kF_None = 0, kF_FilterBackfaces = 1 << 0, kF_KeepUnflippedNormal = 1 << 1, // Prevents returned face normal getting flipped when a ray hits a back-facing triangle - kF_UseSubSimplexConvexCastRaytest = 1 << 2, // Uses an approximate but faster ray versus convex intersection algorithm + ///SubSimplexConvexCastRaytest is the default, even if kF_None is set. + kF_UseSubSimplexConvexCastRaytest = 1 << 2, // Uses an approximate but faster ray versus convex intersection algorithm + kF_UseGjkConvexCastRaytest = 1 << 3, kF_Terminator = 0xFFFFFFFF }; unsigned int m_flags; diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp index 18eb662de..ec638f60b 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp @@ -65,10 +65,10 @@ bool btSubsimplexConvexCast::calcTimeOfImpact( btVector3 n; n.setValue(btScalar(0.),btScalar(0.),btScalar(0.)); - bool hasResult = false; + btVector3 c; - btScalar lastLambda = lambda; + btScalar dist2 = v.length2(); @@ -109,9 +109,9 @@ bool btSubsimplexConvexCast::calcTimeOfImpact( //m_simplexSolver->reset(); //check next line w = supVertexA-supVertexB; - lastLambda = lambda; + n = v; - hasResult = true; + } } ///Just like regular GJK only add the vertex if it isn't already (close) to current vertex, it would lead to divisions by zero and NaN etc. @@ -121,7 +121,7 @@ bool btSubsimplexConvexCast::calcTimeOfImpact( if (m_simplexSolver->closest(v)) { dist2 = v.length2(); - hasResult = true; + //todo: check this normal for validity //n=v; //printf("V=%f , %f, %f\n",v[0],v[1],v[2]); diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp index a775198ab..23b4f79cf 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp @@ -294,7 +294,10 @@ bool btVoronoiSimplexSolver::inSimplex(const btVector3& w) #else if (m_simplexVectorW[i] == w) #endif + { found = true; + break; + } } //check in case lastW is already removed diff --git a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h index 2f389e27e..80fd490f4 100644 --- a/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h +++ b/Engine/lib/bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h @@ -26,8 +26,12 @@ subject to the following restrictions: ///disable next define, or use defaultCollisionConfiguration->getSimplexSolver()->setEqualVertexThreshold(0.f) to disable/configure #define BT_USE_EQUAL_VERTEX_THRESHOLD -#define VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD 0.0001f +#ifdef BT_USE_DOUBLE_PRECISION +#define VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD 1e-12f +#else +#define VORONOI_DEFAULT_EQUAL_VERTEX_THRESHOLD 0.0001f +#endif//BT_USE_DOUBLE_PRECISION struct btUsageBitfield{ btUsageBitfield() diff --git a/Engine/lib/bullet/src/BulletCollision/premake4.lua b/Engine/lib/bullet/src/BulletCollision/premake4.lua index 9bc0a9e60..70019df8f 100644 --- a/Engine/lib/bullet/src/BulletCollision/premake4.lua +++ b/Engine/lib/bullet/src/BulletCollision/premake4.lua @@ -1,11 +1,20 @@ project "BulletCollision" - + kind "StaticLib" - targetdir "../../lib" includedirs { "..", } files { - "**.cpp", - "**.h" - } \ No newline at end of file + "*.cpp", + "*.h", + "BroadphaseCollision/*.cpp", + "BroadphaseCollision/*.h", + "CollisionDispatch/*.cpp", + "CollisionDispatch/*.h", + "CollisionShapes/*.cpp", + "CollisionShapes/*.h", + "Gimpact/*.cpp", + "Gimpact/*.h", + "NarrowPhaseCollision/*.cpp", + "NarrowPhaseCollision/*.h", + } diff --git a/Engine/lib/bullet/src/BulletDynamics/CMakeLists.txt b/Engine/lib/bullet/src/BulletDynamics/CMakeLists.txt index cc4727639..4023d721e 100644 --- a/Engine/lib/bullet/src/BulletDynamics/CMakeLists.txt +++ b/Engine/lib/bullet/src/BulletDynamics/CMakeLists.txt @@ -10,18 +10,22 @@ SET(BulletDynamics_SRCS ConstraintSolver/btGearConstraint.cpp ConstraintSolver/btGeneric6DofConstraint.cpp ConstraintSolver/btGeneric6DofSpringConstraint.cpp + ConstraintSolver/btGeneric6DofSpring2Constraint.cpp ConstraintSolver/btHinge2Constraint.cpp ConstraintSolver/btHingeConstraint.cpp ConstraintSolver/btPoint2PointConstraint.cpp ConstraintSolver/btSequentialImpulseConstraintSolver.cpp + ConstraintSolver/btNNCGConstraintSolver.cpp ConstraintSolver/btSliderConstraint.cpp ConstraintSolver/btSolve2LinearConstraint.cpp ConstraintSolver/btTypedConstraint.cpp ConstraintSolver/btUniversalConstraint.cpp Dynamics/btDiscreteDynamicsWorld.cpp + Dynamics/btDiscreteDynamicsWorldMt.cpp + Dynamics/btSimulationIslandManagerMt.cpp Dynamics/btRigidBody.cpp Dynamics/btSimpleDynamicsWorld.cpp - Dynamics/Bullet-C-API.cpp +# Dynamics/Bullet-C-API.cpp Vehicle/btRaycastVehicle.cpp Vehicle/btWheelInfo.cpp Featherstone/btMultiBody.cpp @@ -30,9 +34,12 @@ SET(BulletDynamics_SRCS Featherstone/btMultiBodyJointLimitConstraint.cpp Featherstone/btMultiBodyConstraint.cpp Featherstone/btMultiBodyPoint2Point.cpp + Featherstone/btMultiBodyFixedConstraint.cpp + Featherstone/btMultiBodySliderConstraint.cpp Featherstone/btMultiBodyJointMotor.cpp MLCPSolvers/btDantzigLCP.cpp MLCPSolvers/btMLCPSolver.cpp + MLCPSolvers/btLemkeAlgorithm.cpp ) SET(Root_HDRS @@ -48,11 +55,13 @@ SET(ConstraintSolver_HDRS ConstraintSolver/btGearConstraint.h ConstraintSolver/btGeneric6DofConstraint.h ConstraintSolver/btGeneric6DofSpringConstraint.h + ConstraintSolver/btGeneric6DofSpring2Constraint.h ConstraintSolver/btHinge2Constraint.h ConstraintSolver/btHingeConstraint.h ConstraintSolver/btJacobianEntry.h ConstraintSolver/btPoint2PointConstraint.h ConstraintSolver/btSequentialImpulseConstraintSolver.h + ConstraintSolver/btNNCGConstraintSolver.h ConstraintSolver/btSliderConstraint.h ConstraintSolver/btSolve2LinearConstraint.h ConstraintSolver/btSolverBody.h @@ -63,6 +72,8 @@ SET(ConstraintSolver_HDRS SET(Dynamics_HDRS Dynamics/btActionInterface.h Dynamics/btDiscreteDynamicsWorld.h + Dynamics/btDiscreteDynamicsWorldMt.h + Dynamics/btSimulationIslandManagerMt.h Dynamics/btDynamicsWorld.h Dynamics/btSimpleDynamicsWorld.h Dynamics/btRigidBody.h @@ -84,6 +95,8 @@ SET(Featherstone_HDRS Featherstone/btMultiBodyJointLimitConstraint.h Featherstone/btMultiBodyConstraint.h Featherstone/btMultiBodyPoint2Point.h + Featherstone/btMultiBodyFixedConstraint.h + Featherstone/btMultiBodySliderConstraint.h Featherstone/btMultiBodyJointMotor.h ) @@ -93,7 +106,9 @@ SET(MLCPSolvers_HDRS MLCPSolvers/btMLCPSolver.h MLCPSolvers/btMLCPSolverInterface.h MLCPSolvers/btPATHSolver.h - MLCPSolvers/btSolveProjectedGaussSeidel.h + MLCPSolvers/btSolveProjectedGaussSeidel.h + MLCPSolvers/btLemkeSolver.h + MLCPSolvers/btLemkeAlgorithm.h ) SET(Character_HDRS diff --git a/Engine/lib/bullet/src/BulletDynamics/Character/btCharacterControllerInterface.h b/Engine/lib/bullet/src/BulletDynamics/Character/btCharacterControllerInterface.h index dffb06dfe..c3a3ac6c8 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Character/btCharacterControllerInterface.h +++ b/Engine/lib/bullet/src/BulletDynamics/Character/btCharacterControllerInterface.h @@ -37,7 +37,7 @@ public: virtual void preStep ( btCollisionWorld* collisionWorld) = 0; virtual void playerStep (btCollisionWorld* collisionWorld, btScalar dt) = 0; virtual bool canJump () const = 0; - virtual void jump () = 0; + virtual void jump(const btVector3& dir = btVector3()) = 0; virtual bool onGround () const = 0; virtual void setUpInterpolate (bool value) = 0; diff --git a/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.cpp index 8f1cd20bf..68fa5206c 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.cpp @@ -29,9 +29,10 @@ subject to the following restrictions: static btVector3 getNormalizedVector(const btVector3& v) { - btVector3 n = v.normalized(); - if (n.length() < SIMD_EPSILON) { - n.setValue(0, 0, 0); + btVector3 n(0, 0, 0); + + if (v.length() > SIMD_EPSILON) { + n = v.normalized(); } return n; } @@ -131,30 +132,37 @@ btVector3 btKinematicCharacterController::perpindicularComponent (const btVector return direction - parallelComponent(direction, normal); } -btKinematicCharacterController::btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, int upAxis) +btKinematicCharacterController::btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, const btVector3& up) { - m_upAxis = upAxis; - m_addedMargin = 0.02; - m_walkDirection.setValue(0,0,0); - m_useGhostObjectSweepTest = true; m_ghostObject = ghostObject; - m_stepHeight = stepHeight; + m_up.setValue(0.0f, 0.0f, 1.0f); + m_jumpAxis.setValue(0.0f, 0.0f, 1.0f); + setUp(up); + setStepHeight(stepHeight); + m_addedMargin = 0.02; + m_walkDirection.setValue(0.0,0.0,0.0); + m_AngVel.setValue(0.0, 0.0, 0.0); + m_useGhostObjectSweepTest = true; m_turnAngle = btScalar(0.0); m_convexShape=convexShape; m_useWalkDirection = true; // use walk direction by default, legacy behavior m_velocityTimeInterval = 0.0; m_verticalVelocity = 0.0; m_verticalOffset = 0.0; - m_gravity = 9.8 * 3 ; // 3G acceleration. + m_gravity = 9.8 * 3.0 ; // 3G acceleration. m_fallSpeed = 55.0; // Terminal velocity of a sky diver in m/s. m_jumpSpeed = 10.0; // ? + m_SetjumpSpeed = m_jumpSpeed; m_wasOnGround = false; m_wasJumping = false; m_interpolateUp = true; setMaxSlope(btRadians(45.0)); - m_currentStepOffset = 0; + m_currentStepOffset = 0.0; + m_maxPenetrationDepth = 0.2; full_drop = false; bounce_fix = false; + m_linearDamping = btScalar(0.0); + m_angularDamping = btScalar(0.0); } btKinematicCharacterController::~btKinematicCharacterController () @@ -189,7 +197,7 @@ bool btKinematicCharacterController::recoverFromPenetration ( btCollisionWorld* m_currentPosition = m_ghostObject->getWorldTransform().getOrigin(); - btScalar maxPen = btScalar(0.0); +// btScalar maxPen = btScalar(0.0); for (int i = 0; i < m_ghostObject->getOverlappingPairCache()->getNumOverlappingPairs(); i++) { m_manifoldArray.resize(0); @@ -197,10 +205,13 @@ bool btKinematicCharacterController::recoverFromPenetration ( btCollisionWorld* btBroadphasePair* collisionPair = &m_ghostObject->getOverlappingPairCache()->getOverlappingPairArray()[i]; btCollisionObject* obj0 = static_cast(collisionPair->m_pProxy0->m_clientObject); - btCollisionObject* obj1 = static_cast(collisionPair->m_pProxy1->m_clientObject); + btCollisionObject* obj1 = static_cast(collisionPair->m_pProxy1->m_clientObject); if ((obj0 && !obj0->hasContactResponse()) || (obj1 && !obj1->hasContactResponse())) continue; + + if (!needsCollision(obj0, obj1)) + continue; if (collisionPair->m_algorithm) collisionPair->m_algorithm->getAllContactManifolds(m_manifoldArray); @@ -216,14 +227,15 @@ bool btKinematicCharacterController::recoverFromPenetration ( btCollisionWorld* btScalar dist = pt.getDistance(); - if (dist < 0.0) + if (dist < -m_maxPenetrationDepth) { - if (dist < maxPen) - { - maxPen = dist; - m_touchingNormal = pt.m_normalWorldOnB * directionSign;//?? + // TODO: cause problems on slopes, not sure if it is needed + //if (dist < maxPen) + //{ + // maxPen = dist; + // m_touchingNormal = pt.m_normalWorldOnB * directionSign;//?? - } + //} m_currentPosition += pt.m_normalWorldOnB * directionSign * dist * btScalar(0.2); penetration = true; } else { @@ -243,18 +255,28 @@ bool btKinematicCharacterController::recoverFromPenetration ( btCollisionWorld* void btKinematicCharacterController::stepUp ( btCollisionWorld* world) { + btScalar stepHeight = 0.0f; + if (m_verticalVelocity < 0.0) + stepHeight = m_stepHeight; + // phase 1: up btTransform start, end; - m_targetPosition = m_currentPosition + getUpAxisDirections()[m_upAxis] * (m_stepHeight + (m_verticalOffset > 0.f?m_verticalOffset:0.f)); start.setIdentity (); end.setIdentity (); /* FIXME: Handle penetration properly */ - start.setOrigin (m_currentPosition + getUpAxisDirections()[m_upAxis] * (m_convexShape->getMargin() + m_addedMargin)); + start.setOrigin(m_currentPosition); + + m_targetPosition = m_currentPosition + m_up * (stepHeight) + m_jumpAxis * ((m_verticalOffset > 0.f ? m_verticalOffset : 0.f)); + m_currentPosition = m_targetPosition; + end.setOrigin (m_targetPosition); - btKinematicClosestNotMeConvexResultCallback callback (m_ghostObject, -getUpAxisDirections()[m_upAxis], btScalar(0.7071)); + start.setRotation(m_currentOrientation); + end.setRotation(m_targetOrientation); + + btKinematicClosestNotMeConvexResultCallback callback(m_ghostObject, -m_up, m_maxSlopeCosine); callback.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup; callback.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask; @@ -264,29 +286,61 @@ void btKinematicCharacterController::stepUp ( btCollisionWorld* world) } else { - world->convexSweepTest (m_convexShape, start, end, callback); + world->convexSweepTest(m_convexShape, start, end, callback, world->getDispatchInfo().m_allowedCcdPenetration); } - - if (callback.hasHit()) + + if (callback.hasHit() && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback.m_hitCollisionObject)) { // Only modify the position if the hit was a slope and not a wall or ceiling. - if(callback.m_hitNormalWorld.dot(getUpAxisDirections()[m_upAxis]) > 0.0) + if (callback.m_hitNormalWorld.dot(m_up) > 0.0) { // we moved up only a fraction of the step height - m_currentStepOffset = m_stepHeight * callback.m_closestHitFraction; + m_currentStepOffset = stepHeight * callback.m_closestHitFraction; if (m_interpolateUp == true) m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction); else m_currentPosition = m_targetPosition; } - m_verticalVelocity = 0.0; - m_verticalOffset = 0.0; + + btTransform& xform = m_ghostObject->getWorldTransform(); + xform.setOrigin(m_currentPosition); + m_ghostObject->setWorldTransform(xform); + + // fix penetration if we hit a ceiling for example + int numPenetrationLoops = 0; + m_touchingContact = false; + while (recoverFromPenetration(world)) + { + numPenetrationLoops++; + m_touchingContact = true; + if (numPenetrationLoops > 4) + { + //printf("character could not recover from penetration = %d\n", numPenetrationLoops); + break; + } + } + m_targetPosition = m_ghostObject->getWorldTransform().getOrigin(); + m_currentPosition = m_targetPosition; + + if (m_verticalOffset > 0) + { + m_verticalOffset = 0.0; + m_verticalVelocity = 0.0; + m_currentStepOffset = m_stepHeight; + } } else { - m_currentStepOffset = m_stepHeight; + m_currentStepOffset = stepHeight; m_currentPosition = m_targetPosition; } } +bool btKinematicCharacterController::needsCollision(const btCollisionObject* body0, const btCollisionObject* body1) +{ + bool collides = (body0->getBroadphaseHandle()->m_collisionFilterGroup & body1->getBroadphaseHandle()->m_collisionFilterMask) != 0; + collides = collides && (body1->getBroadphaseHandle()->m_collisionFilterGroup & body0->getBroadphaseHandle()->m_collisionFilterMask); + return collides; +} + void btKinematicCharacterController::updateTargetPositionBasedOnCollision (const btVector3& hitNormal, btScalar tangentMag, btScalar normalMag) { btVector3 movementDirection = m_targetPosition - m_currentPosition; @@ -329,6 +383,7 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co // m_normalizedDirection[0],m_normalizedDirection[1],m_normalizedDirection[2]); // phase 2: forward and strafe btTransform start, end; + m_targetPosition = m_currentPosition + walkMove; start.setIdentity (); @@ -338,15 +393,6 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co btScalar distance2 = (m_currentPosition-m_targetPosition).length2(); // printf("distance2=%f\n",distance2); - if (m_touchingContact) - { - if (m_normalizedDirection.dot(m_touchingNormal) > btScalar(0.0)) - { - //interferes with step movement - //updateTargetPositionBasedOnCollision (m_touchingNormal); - } - } - int maxIter = 10; while (fraction > btScalar(0.01) && maxIter-- > 0) @@ -355,6 +401,9 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co end.setOrigin (m_targetPosition); btVector3 sweepDirNegative(m_currentPosition - m_targetPosition); + start.setRotation(m_currentOrientation); + end.setRotation(m_targetOrientation); + btKinematicClosestNotMeConvexResultCallback callback (m_ghostObject, sweepDirNegative, btScalar(0.0)); callback.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup; callback.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask; @@ -363,25 +412,27 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co btScalar margin = m_convexShape->getMargin(); m_convexShape->setMargin(margin + m_addedMargin); - - if (m_useGhostObjectSweepTest) + if (!(start == end)) { - m_ghostObject->convexSweepTest (m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); - } else - { - collisionWorld->convexSweepTest (m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); + if (m_useGhostObjectSweepTest) + { + m_ghostObject->convexSweepTest(m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); + } + else + { + collisionWorld->convexSweepTest(m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); + } } - m_convexShape->setMargin(margin); fraction -= callback.m_closestHitFraction; - if (callback.hasHit()) + if (callback.hasHit() && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback.m_hitCollisionObject)) { // we moved only a fraction - btScalar hitDistance; - hitDistance = (callback.m_hitPointWorld - m_currentPosition).length(); + //btScalar hitDistance; + //hitDistance = (callback.m_hitPointWorld - m_currentPosition).length(); // m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction); @@ -402,14 +453,11 @@ void btKinematicCharacterController::stepForwardAndStrafe ( btCollisionWorld* co break; } - } else { - // we moved whole way - m_currentPosition = m_targetPosition; } - - // if (callback.m_closestHitFraction == 0.f) - // break; - + else + { + m_currentPosition = m_targetPosition; + } } } @@ -420,27 +468,30 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld // phase 3: down /*btScalar additionalDownStep = (m_wasOnGround && !onGround()) ? m_stepHeight : 0.0; - btVector3 step_drop = getUpAxisDirections()[m_upAxis] * (m_currentStepOffset + additionalDownStep); + btVector3 step_drop = m_up * (m_currentStepOffset + additionalDownStep); btScalar downVelocity = (additionalDownStep == 0.0 && m_verticalVelocity<0.0?-m_verticalVelocity:0.0) * dt; - btVector3 gravity_drop = getUpAxisDirections()[m_upAxis] * downVelocity; + btVector3 gravity_drop = m_up * downVelocity; m_targetPosition -= (step_drop + gravity_drop);*/ btVector3 orig_position = m_targetPosition; btScalar downVelocity = (m_verticalVelocity<0.f?-m_verticalVelocity:0.f) * dt; + if (m_verticalVelocity > 0.0) + return; + if(downVelocity > 0.0 && downVelocity > m_fallSpeed && (m_wasOnGround || !m_wasJumping)) downVelocity = m_fallSpeed; - btVector3 step_drop = getUpAxisDirections()[m_upAxis] * (m_currentStepOffset + downVelocity); + btVector3 step_drop = m_up * (m_currentStepOffset + downVelocity); m_targetPosition -= step_drop; - btKinematicClosestNotMeConvexResultCallback callback (m_ghostObject, getUpAxisDirections()[m_upAxis], m_maxSlopeCosine); + btKinematicClosestNotMeConvexResultCallback callback(m_ghostObject, m_up, m_maxSlopeCosine); callback.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup; callback.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask; - btKinematicClosestNotMeConvexResultCallback callback2 (m_ghostObject, getUpAxisDirections()[m_upAxis], m_maxSlopeCosine); + btKinematicClosestNotMeConvexResultCallback callback2(m_ghostObject, m_up, m_maxSlopeCosine); callback2.m_collisionFilterGroup = getGhostObject()->getBroadphaseHandle()->m_collisionFilterGroup; callback2.m_collisionFilterMask = getGhostObject()->getBroadphaseHandle()->m_collisionFilterMask; @@ -454,6 +505,9 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld start.setOrigin (m_currentPosition); end.setOrigin (m_targetPosition); + start.setRotation(m_currentOrientation); + end.setRotation(m_targetOrientation); + //set double test for 2x the step drop, to check for a large drop vs small drop end_double.setOrigin (m_targetPosition - step_drop); @@ -461,7 +515,7 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld { m_ghostObject->convexSweepTest (m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); - if (!callback.hasHit()) + if (!callback.hasHit() && m_ghostObject->hasContactResponse()) { //test a double fall height, to see if the character should interpolate it's fall (full) or not (partial) m_ghostObject->convexSweepTest (m_convexShape, start, end_double, callback2, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); @@ -470,30 +524,34 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld { collisionWorld->convexSweepTest (m_convexShape, start, end, callback, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); - if (!callback.hasHit()) - { - //test a double fall height, to see if the character should interpolate it's fall (large) or not (small) - collisionWorld->convexSweepTest (m_convexShape, start, end_double, callback2, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); - } + if (!callback.hasHit() && m_ghostObject->hasContactResponse()) + { + //test a double fall height, to see if the character should interpolate it's fall (large) or not (small) + collisionWorld->convexSweepTest (m_convexShape, start, end_double, callback2, collisionWorld->getDispatchInfo().m_allowedCcdPenetration); + } } btScalar downVelocity2 = (m_verticalVelocity<0.f?-m_verticalVelocity:0.f) * dt; - bool has_hit = false; + bool has_hit; if (bounce_fix == true) - has_hit = callback.hasHit() || callback2.hasHit(); + has_hit = (callback.hasHit() || callback2.hasHit()) && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback.m_hitCollisionObject); else - has_hit = callback2.hasHit(); + has_hit = callback2.hasHit() && m_ghostObject->hasContactResponse() && needsCollision(m_ghostObject, callback2.m_hitCollisionObject); - if(downVelocity2 > 0.0 && downVelocity2 < m_stepHeight && has_hit == true && runonce == false + btScalar stepHeight = 0.0f; + if (m_verticalVelocity < 0.0) + stepHeight = m_stepHeight; + + if (downVelocity2 > 0.0 && downVelocity2 < stepHeight && has_hit == true && runonce == false && (m_wasOnGround || !m_wasJumping)) { //redo the velocity calculation when falling a small amount, for fast stairs motion //for larger falls, use the smoother/slower interpolated movement by not touching the target position m_targetPosition = orig_position; - downVelocity = m_stepHeight; + downVelocity = stepHeight; - btVector3 step_drop = getUpAxisDirections()[m_upAxis] * (m_currentStepOffset + downVelocity); + step_drop = m_up * (m_currentStepOffset + downVelocity); m_targetPosition -= step_drop; runonce = true; continue; //re-run previous tests @@ -501,10 +559,9 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld break; } - if (callback.hasHit() || runonce == true) + if (m_ghostObject->hasContactResponse() && (callback.hasHit() && needsCollision(m_ghostObject, callback.m_hitCollisionObject)) || runonce == true) { // we dropped a fraction of the height -> hit floor - btScalar fraction = (m_currentPosition.getY() - callback.m_hitPointWorld.getY()) / 2; //printf("hitpoint: %g - pos %g\n", callback.m_hitPointWorld.getY(), m_currentPosition.getY()); @@ -512,10 +569,10 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld if (bounce_fix == true) { if (full_drop == true) - m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction); - else - //due to errors in the closestHitFraction variable when used with large polygons, calculate the hit fraction manually - m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, fraction); + m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction); + else + //due to errors in the closestHitFraction variable when used with large polygons, calculate the hit fraction manually + m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, fraction); } else m_currentPosition.setInterpolate3 (m_currentPosition, m_targetPosition, callback.m_closestHitFraction); @@ -527,7 +584,7 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld m_wasJumping = false; } else { // we dropped the full height - + full_drop = true; if (bounce_fix == true) @@ -537,7 +594,7 @@ void btKinematicCharacterController::stepDown ( btCollisionWorld* collisionWorld { m_targetPosition += step_drop; //undo previous target change downVelocity = m_fallSpeed; - step_drop = getUpAxisDirections()[m_upAxis] * (m_currentStepOffset + downVelocity); + step_drop = m_up * (m_currentStepOffset + downVelocity); m_targetPosition -= step_drop; } } @@ -578,21 +635,63 @@ btScalar timeInterval m_velocityTimeInterval += timeInterval; } +void btKinematicCharacterController::setAngularVelocity(const btVector3& velocity) +{ + m_AngVel = velocity; +} + +const btVector3& btKinematicCharacterController::getAngularVelocity() const +{ + return m_AngVel; +} + +void btKinematicCharacterController::setLinearVelocity(const btVector3& velocity) +{ + m_walkDirection = velocity; + + // HACK: if we are moving in the direction of the up, treat it as a jump :( + if (m_walkDirection.length2() > 0) + { + btVector3 w = velocity.normalized(); + btScalar c = w.dot(m_up); + if (c != 0) + { + //there is a component in walkdirection for vertical velocity + btVector3 upComponent = m_up * (sinf(SIMD_HALF_PI - acosf(c)) * m_walkDirection.length()); + m_walkDirection -= upComponent; + m_verticalVelocity = (c < 0.0f ? -1 : 1) * upComponent.length(); + + if (c > 0.0f) + { + m_wasJumping = true; + m_jumpPosition = m_ghostObject->getWorldTransform().getOrigin(); + } + } + } + else + m_verticalVelocity = 0.0f; +} + +btVector3 btKinematicCharacterController::getLinearVelocity() const +{ + return m_walkDirection + (m_verticalVelocity * m_up); +} + void btKinematicCharacterController::reset ( btCollisionWorld* collisionWorld ) { - m_verticalVelocity = 0.0; - m_verticalOffset = 0.0; - m_wasOnGround = false; - m_wasJumping = false; - m_walkDirection.setValue(0,0,0); - m_velocityTimeInterval = 0.0; + m_verticalVelocity = 0.0; + m_verticalOffset = 0.0; + m_wasOnGround = false; + m_wasJumping = false; + m_walkDirection.setValue(0,0,0); + m_velocityTimeInterval = 0.0; - //clear pair cache - btHashedOverlappingPairCache *cache = m_ghostObject->getOverlappingPairCache(); - while (cache->getOverlappingPairArray().size() > 0) - { - cache->removeOverlappingPair(cache->getOverlappingPairArray()[0].m_pProxy0, cache->getOverlappingPairArray()[0].m_pProxy1, collisionWorld->getDispatcher()); - } + //clear pair cache + btHashedOverlappingPairCache *cache = m_ghostObject->getOverlappingPairCache(); + while (cache->getOverlappingPairArray().size() > 0) + { + cache->removeOverlappingPair(cache->getOverlappingPairArray()[0].m_pProxy0, cache->getOverlappingPairArray()[0].m_pProxy1, collisionWorld->getDispatcher()); + } } void btKinematicCharacterController::warp (const btVector3& origin) @@ -606,62 +705,99 @@ void btKinematicCharacterController::warp (const btVector3& origin) void btKinematicCharacterController::preStep ( btCollisionWorld* collisionWorld) { - - int numPenetrationLoops = 0; - m_touchingContact = false; - while (recoverFromPenetration (collisionWorld)) - { - numPenetrationLoops++; - m_touchingContact = true; - if (numPenetrationLoops > 4) - { - //printf("character could not recover from penetration = %d\n", numPenetrationLoops); - break; - } - } - m_currentPosition = m_ghostObject->getWorldTransform().getOrigin(); m_targetPosition = m_currentPosition; + + m_currentOrientation = m_ghostObject->getWorldTransform().getRotation(); + m_targetOrientation = m_currentOrientation; // printf("m_targetPosition=%f,%f,%f\n",m_targetPosition[0],m_targetPosition[1],m_targetPosition[2]); - - } -#include - void btKinematicCharacterController::playerStep ( btCollisionWorld* collisionWorld, btScalar dt) { // printf("playerStep(): "); // printf(" dt = %f", dt); + if (m_AngVel.length2() > 0.0f) + { + m_AngVel *= btPow(btScalar(1) - m_angularDamping, dt); + } + + // integrate for angular velocity + if (m_AngVel.length2() > 0.0f) + { + btTransform xform; + xform = m_ghostObject->getWorldTransform(); + + btQuaternion rot(m_AngVel.normalized(), m_AngVel.length() * dt); + + btQuaternion orn = rot * xform.getRotation(); + + xform.setRotation(orn); + m_ghostObject->setWorldTransform(xform); + + m_currentPosition = m_ghostObject->getWorldTransform().getOrigin(); + m_targetPosition = m_currentPosition; + m_currentOrientation = m_ghostObject->getWorldTransform().getRotation(); + m_targetOrientation = m_currentOrientation; + } + // quick check... - if (!m_useWalkDirection && m_velocityTimeInterval <= 0.0) { + if (!m_useWalkDirection && (m_velocityTimeInterval <= 0.0)) { // printf("\n"); return; // no motion } m_wasOnGround = onGround(); + //btVector3 lvel = m_walkDirection; + btScalar c = 0.0f; + + if (m_walkDirection.length2() > 0) + { + // apply damping + m_walkDirection *= btPow(btScalar(1) - m_linearDamping, dt); + } + + m_verticalVelocity *= btPow(btScalar(1) - m_linearDamping, dt); + // Update fall velocity. m_verticalVelocity -= m_gravity * dt; - if(m_verticalVelocity > 0.0 && m_verticalVelocity > m_jumpSpeed) + if (m_verticalVelocity > 0.0 && m_verticalVelocity > m_jumpSpeed) { m_verticalVelocity = m_jumpSpeed; } - if(m_verticalVelocity < 0.0 && btFabs(m_verticalVelocity) > btFabs(m_fallSpeed)) + if (m_verticalVelocity < 0.0 && btFabs(m_verticalVelocity) > btFabs(m_fallSpeed)) { m_verticalVelocity = -btFabs(m_fallSpeed); } m_verticalOffset = m_verticalVelocity * dt; - btTransform xform; - xform = m_ghostObject->getWorldTransform (); + xform = m_ghostObject->getWorldTransform(); // printf("walkDirection(%f,%f,%f)\n",walkDirection[0],walkDirection[1],walkDirection[2]); // printf("walkSpeed=%f\n",walkSpeed); - stepUp (collisionWorld); + stepUp(collisionWorld); + //todo: Experimenting with behavior of controller when it hits a ceiling.. + //bool hitUp = stepUp (collisionWorld); + //if (hitUp) + //{ + // m_verticalVelocity -= m_gravity * dt; + // if (m_verticalVelocity > 0.0 && m_verticalVelocity > m_jumpSpeed) + // { + // m_verticalVelocity = m_jumpSpeed; + // } + // if (m_verticalVelocity < 0.0 && btFabs(m_verticalVelocity) > btFabs(m_fallSpeed)) + // { + // m_verticalVelocity = -btFabs(m_fallSpeed); + // } + // m_verticalOffset = m_verticalVelocity * dt; + + // xform = m_ghostObject->getWorldTransform(); + //} + if (m_useWalkDirection) { stepForwardAndStrafe (collisionWorld, m_walkDirection); } else { @@ -681,10 +817,38 @@ void btKinematicCharacterController::playerStep ( btCollisionWorld* collisionWo } stepDown (collisionWorld, dt); + //todo: Experimenting with max jump height + //if (m_wasJumping) + //{ + // btScalar ds = m_currentPosition[m_upAxis] - m_jumpPosition[m_upAxis]; + // if (ds > m_maxJumpHeight) + // { + // // substract the overshoot + // m_currentPosition[m_upAxis] -= ds - m_maxJumpHeight; + + // // max height was reached, so potential energy is at max + // // and kinematic energy is 0, thus velocity is 0. + // if (m_verticalVelocity > 0.0) + // m_verticalVelocity = 0.0; + // } + //} // printf("\n"); xform.setOrigin (m_currentPosition); m_ghostObject->setWorldTransform (xform); + + int numPenetrationLoops = 0; + m_touchingContact = false; + while (recoverFromPenetration(collisionWorld)) + { + numPenetrationLoops++; + m_touchingContact = true; + if (numPenetrationLoops > 4) + { + //printf("character could not recover from penetration = %d\n", numPenetrationLoops); + break; + } + } } void btKinematicCharacterController::setFallSpeed (btScalar fallSpeed) @@ -695,6 +859,7 @@ void btKinematicCharacterController::setFallSpeed (btScalar fallSpeed) void btKinematicCharacterController::setJumpSpeed (btScalar jumpSpeed) { m_jumpSpeed = jumpSpeed; + m_SetjumpSpeed = m_jumpSpeed; } void btKinematicCharacterController::setMaxJumpHeight (btScalar maxJumpHeight) @@ -707,14 +872,16 @@ bool btKinematicCharacterController::canJump () const return onGround(); } -void btKinematicCharacterController::jump () +void btKinematicCharacterController::jump(const btVector3& v) { - if (!canJump()) - return; - + m_jumpSpeed = v.length2() == 0 ? m_SetjumpSpeed : v.length(); m_verticalVelocity = m_jumpSpeed; m_wasJumping = true; + m_jumpAxis = v.length2() == 0 ? m_up : v.normalized(); + + m_jumpPosition = m_ghostObject->getWorldTransform().getOrigin(); + #if 0 currently no jumping. btTransform xform; @@ -726,14 +893,16 @@ void btKinematicCharacterController::jump () #endif } -void btKinematicCharacterController::setGravity(btScalar gravity) +void btKinematicCharacterController::setGravity(const btVector3& gravity) { - m_gravity = gravity; + if (gravity.length2() > 0) setUpVector(-gravity); + + m_gravity = gravity.length(); } -btScalar btKinematicCharacterController::getGravity() const +btVector3 btKinematicCharacterController::getGravity() const { - return m_gravity; + return -m_gravity * m_up; } void btKinematicCharacterController::setMaxSlope(btScalar slopeRadians) @@ -747,11 +916,25 @@ btScalar btKinematicCharacterController::getMaxSlope() const return m_maxSlopeRadians; } -bool btKinematicCharacterController::onGround () const +void btKinematicCharacterController::setMaxPenetrationDepth(btScalar d) { - return m_verticalVelocity == 0.0 && m_verticalOffset == 0.0; + m_maxPenetrationDepth = d; } +btScalar btKinematicCharacterController::getMaxPenetrationDepth() const +{ + return m_maxPenetrationDepth; +} + +bool btKinematicCharacterController::onGround () const +{ + return (fabs(m_verticalVelocity) < SIMD_EPSILON) && (fabs(m_verticalOffset) < SIMD_EPSILON); +} + +void btKinematicCharacterController::setStepHeight(btScalar h) +{ + m_stepHeight = h; +} btVector3* btKinematicCharacterController::getUpAxisDirections() { @@ -768,3 +951,49 @@ void btKinematicCharacterController::setUpInterpolate(bool value) { m_interpolateUp = value; } + +void btKinematicCharacterController::setUp(const btVector3& up) +{ + if (up.length2() > 0 && m_gravity > 0.0f) + { + setGravity(-m_gravity * up.normalized()); + return; + } + + setUpVector(up); +} + +void btKinematicCharacterController::setUpVector(const btVector3& up) +{ + if (m_up == up) + return; + + btVector3 u = m_up; + + if (up.length2() > 0) + m_up = up.normalized(); + else + m_up = btVector3(0.0, 0.0, 0.0); + + if (!m_ghostObject) return; + btQuaternion rot = getRotation(m_up, u); + + //set orientation with new up + btTransform xform; + xform = m_ghostObject->getWorldTransform(); + btQuaternion orn = rot.inverse() * xform.getRotation(); + xform.setRotation(orn); + m_ghostObject->setWorldTransform(xform); +} + +btQuaternion btKinematicCharacterController::getRotation(btVector3& v0, btVector3& v1) const +{ + if (v0.length2() == 0.0f || v1.length2() == 0.0f) + { + btQuaternion q; + return q; + } + + return shortestArcQuatNormalize2(v0, v1); +} + diff --git a/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.h b/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.h index add6f30a6..3d677e647 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.h +++ b/Engine/lib/bullet/src/BulletDynamics/Character/btKinematicCharacterController.h @@ -43,10 +43,12 @@ protected: btPairCachingGhostObject* m_ghostObject; btConvexShape* m_convexShape;//is also in m_ghostObject, but it needs to be convex, so we store it here to avoid upcast + btScalar m_maxPenetrationDepth; btScalar m_verticalVelocity; btScalar m_verticalOffset; btScalar m_fallSpeed; btScalar m_jumpSpeed; + btScalar m_SetjumpSpeed; btScalar m_maxJumpHeight; btScalar m_maxSlopeRadians; // Slope angle that is set (used for returning the exact value) btScalar m_maxSlopeCosine; // Cosine equivalent of m_maxSlopeRadians (calculated once when set, for optimization) @@ -61,24 +63,34 @@ protected: ///this is the desired walk direction, set by the user btVector3 m_walkDirection; btVector3 m_normalizedDirection; + btVector3 m_AngVel; + + btVector3 m_jumpPosition; //some internal variables btVector3 m_currentPosition; btScalar m_currentStepOffset; btVector3 m_targetPosition; + btQuaternion m_currentOrientation; + btQuaternion m_targetOrientation; + ///keep track of the contact manifolds btManifoldArray m_manifoldArray; bool m_touchingContact; btVector3 m_touchingNormal; + btScalar m_linearDamping; + btScalar m_angularDamping; + bool m_wasOnGround; bool m_wasJumping; bool m_useGhostObjectSweepTest; bool m_useWalkDirection; btScalar m_velocityTimeInterval; - int m_upAxis; + btVector3 m_up; + btVector3 m_jumpAxis; static btVector3* getUpAxisDirections(); bool m_interpolateUp; @@ -94,11 +106,18 @@ protected: void updateTargetPositionBasedOnCollision (const btVector3& hit_normal, btScalar tangentMag = btScalar(0.0), btScalar normalMag = btScalar(1.0)); void stepForwardAndStrafe (btCollisionWorld* collisionWorld, const btVector3& walkMove); void stepDown (btCollisionWorld* collisionWorld, btScalar dt); + + virtual bool needsCollision(const btCollisionObject* body0, const btCollisionObject* body1); + + void setUpVector(const btVector3& up); + + btQuaternion getRotation(btVector3& v0, btVector3& v1) const; + public: BT_DECLARE_ALIGNED_ALLOCATOR(); - btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, int upAxis = 1); + btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, const btVector3& up = btVector3(1.0,0.0,0.0)); ~btKinematicCharacterController (); @@ -112,14 +131,9 @@ public: ///btActionInterface interface void debugDraw(btIDebugDraw* debugDrawer); - void setUpAxis (int axis) - { - if (axis < 0) - axis = 0; - if (axis > 2) - axis = 2; - m_upAxis = axis; - } + void setUp(const btVector3& up); + + const btVector3& getUp() { return m_up; } /// This should probably be called setPositionIncrementPerSimulatorStep. /// This is neither a direction nor a velocity, but the amount to @@ -136,27 +150,47 @@ public: virtual void setVelocityForTimeInterval(const btVector3& velocity, btScalar timeInterval); + virtual void setAngularVelocity(const btVector3& velocity); + virtual const btVector3& getAngularVelocity() const; + + virtual void setLinearVelocity(const btVector3& velocity); + virtual btVector3 getLinearVelocity() const; + + void setLinearDamping(btScalar d) { m_linearDamping = btClamped(d, (btScalar)btScalar(0.0), (btScalar)btScalar(1.0)); } + btScalar getLinearDamping() const { return m_linearDamping; } + void setAngularDamping(btScalar d) { m_angularDamping = btClamped(d, (btScalar)btScalar(0.0), (btScalar)btScalar(1.0)); } + btScalar getAngularDamping() const { return m_angularDamping; } + void reset ( btCollisionWorld* collisionWorld ); void warp (const btVector3& origin); void preStep ( btCollisionWorld* collisionWorld); void playerStep ( btCollisionWorld* collisionWorld, btScalar dt); + void setStepHeight(btScalar h); + btScalar getStepHeight() const { return m_stepHeight; } void setFallSpeed (btScalar fallSpeed); + btScalar getFallSpeed() const { return m_fallSpeed; } void setJumpSpeed (btScalar jumpSpeed); + btScalar getJumpSpeed() const { return m_jumpSpeed; } void setMaxJumpHeight (btScalar maxJumpHeight); bool canJump () const; - void jump (); + void jump(const btVector3& v = btVector3()); - void setGravity(btScalar gravity); - btScalar getGravity() const; + void applyImpulse(const btVector3& v) { jump(v); } + + void setGravity(const btVector3& gravity); + btVector3 getGravity() const; /// The max slope determines the maximum angle that the controller can walk up. /// The slope angle is measured in radians. void setMaxSlope(btScalar slopeRadians); btScalar getMaxSlope() const; + void setMaxPenetrationDepth(btScalar d); + btScalar getMaxPenetrationDepth() const; + btPairCachingGhostObject* getGhostObject(); void setUseGhostSweepTest(bool useGhostObjectSweepTest) { diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp index 15a4c92de..09b7388b6 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp @@ -214,7 +214,7 @@ void btConeTwistConstraint::getInfo2NonVirtual (btConstraintInfo2* info,const bt } // m_swingCorrection is always positive or 0 info->m_lowerLimit[srow] = 0; - info->m_upperLimit[srow] = SIMD_INFINITY; + info->m_upperLimit[srow] = (m_bMotorEnabled && m_maxMotorImpulse >= 0.0f) ? m_maxMotorImpulse : SIMD_INFINITY; srow += info->rowskip; } } @@ -540,8 +540,8 @@ void btConeTwistConstraint::calcAngleInfo() m_solveTwistLimit = false; m_solveSwingLimit = false; - btVector3 b1Axis1,b1Axis2,b1Axis3; - btVector3 b2Axis1,b2Axis2; + btVector3 b1Axis1(0,0,0),b1Axis2(0,0,0),b1Axis3(0,0,0); + btVector3 b2Axis1(0,0,0),b2Axis2(0,0,0); b1Axis1 = getRigidBodyA().getCenterOfMassTransform().getBasis() * this->m_rbAFrame.getBasis().getColumn(0); b2Axis1 = getRigidBodyB().getCenterOfMassTransform().getBasis() * this->m_rbBFrame.getBasis().getColumn(0); @@ -778,8 +778,10 @@ void btConeTwistConstraint::calcAngleInfo2(const btTransform& transA, const btTr target[2] = x * ivA[2] + y * jvA[2] + z * kvA[2]; target.normalize(); m_swingAxis = -ivB.cross(target); - m_swingCorrection = m_swingAxis.length(); - m_swingAxis.normalize(); + m_swingCorrection = m_swingAxis.length(); + + if (!btFuzzyZero(m_swingCorrection)) + m_swingAxis.normalize(); } } @@ -983,8 +985,8 @@ void btConeTwistConstraint::adjustSwingAxisToUseEllipseNormal(btVector3& vSwingA void btConeTwistConstraint::setMotorTarget(const btQuaternion &q) { - btTransform trACur = m_rbA.getCenterOfMassTransform(); - btTransform trBCur = m_rbB.getCenterOfMassTransform(); + //btTransform trACur = m_rbA.getCenterOfMassTransform(); + //btTransform trBCur = m_rbB.getCenterOfMassTransform(); // btTransform trABCur = trBCur.inverse() * trACur; // btQuaternion qABCur = trABCur.getRotation(); // btTransform trConstraintCur = (trBCur * m_rbBFrame).inverse() * (trACur * m_rbAFrame); diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h index 1735b524d..b7636180c 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h @@ -170,6 +170,11 @@ public: { m_angularOnly = angularOnly; } + + bool getAngularOnly() const + { + return m_angularOnly; + } void setLimit(int limitIndex,btScalar limitValue) { @@ -196,6 +201,33 @@ public: }; } + btScalar getLimit(int limitIndex) const + { + switch (limitIndex) + { + case 3: + { + return m_twistSpan; + break; + } + case 4: + { + return m_swingSpan2; + break; + } + case 5: + { + return m_swingSpan1; + break; + } + default: + { + btAssert(0 && "Invalid limitIndex specified for btConeTwistConstraint"); + return 0.0; + } + }; + } + // setLimit(), a few notes: // _softness: // 0->1, recommend ~0.8->1. @@ -218,8 +250,8 @@ public: m_relaxationFactor = _relaxationFactor; } - const btTransform& getAFrame() { return m_rbAFrame; }; - const btTransform& getBFrame() { return m_rbBFrame; }; + const btTransform& getAFrame() const { return m_rbAFrame; }; + const btTransform& getBFrame() const { return m_rbBFrame; }; inline int getSolveTwistLimit() { @@ -239,27 +271,43 @@ public: void calcAngleInfo(); void calcAngleInfo2(const btTransform& transA, const btTransform& transB,const btMatrix3x3& invInertiaWorldA,const btMatrix3x3& invInertiaWorldB); - inline btScalar getSwingSpan1() + inline btScalar getSwingSpan1() const { return m_swingSpan1; } - inline btScalar getSwingSpan2() + inline btScalar getSwingSpan2() const { return m_swingSpan2; } - inline btScalar getTwistSpan() + inline btScalar getTwistSpan() const { return m_twistSpan; } - inline btScalar getTwistAngle() + inline btScalar getLimitSoftness() const + { + return m_limitSoftness; + } + inline btScalar getBiasFactor() const + { + return m_biasFactor; + } + inline btScalar getRelaxationFactor() const + { + return m_relaxationFactor; + } + inline btScalar getTwistAngle() const { return m_twistAngle; } bool isPastSwingLimit() { return m_solveSwingLimit; } + btScalar getDamping() const { return m_damping; } void setDamping(btScalar damping) { m_damping = damping; } void enableMotor(bool b) { m_bMotorEnabled = b; } + bool isMotorEnabled() const { return m_bMotorEnabled; } + btScalar getMaxMotorImpulse() const { return m_maxMotorImpulse; } + bool isMaxMotorImpulseNormalized() const { return m_bNormalizedMotorStrength; } void setMaxMotorImpulse(btScalar maxMotorImpulse) { m_maxMotorImpulse = maxMotorImpulse; m_bNormalizedMotorStrength = false; } void setMaxMotorImpulseNormalized(btScalar maxMotorImpulse) { m_maxMotorImpulse = maxMotorImpulse; m_bNormalizedMotorStrength = true; } @@ -271,6 +319,7 @@ public: // note: if q violates the joint limits, the internal target is clamped to avoid conflicting impulses (very bad for stability) // note: don't forget to enableMotor() void setMotorTarget(const btQuaternion &q); + const btQuaternion& getMotorTarget() const { return m_qTarget; } // same as above, but q is the desired rotation of frameA wrt frameB in constraint space void setMotorTargetInConstraintSpace(const btQuaternion &q); @@ -297,6 +346,11 @@ public: ///return the local value of parameter virtual btScalar getParam(int num, int axis = -1) const; + int getFlags() const + { + return m_flags; + } + virtual int calculateSerializeBufferSize() const; ///fills the dataBuffer and returns the struct name (and 0 on failure) diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h index 1ba1cd1e8..890afe6da 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h @@ -33,7 +33,8 @@ class btDispatcher; enum btConstraintSolverType { BT_SEQUENTIAL_IMPULSE_SOLVER=1, - BT_MLCP_SOLVER=2 + BT_MLCP_SOLVER=2, + BT_NNCG_SOLVER=4 }; class btConstraintSolver diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp index 9d60d9957..1098d0c96 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp @@ -155,8 +155,7 @@ void resolveSingleBilateral(btRigidBody& body1, const btVector3& pos1, body1.getCenterOfMassTransform().getBasis().transpose() * body1.getAngularVelocity(), body2.getLinearVelocity(), body2.getCenterOfMassTransform().getBasis().transpose() * body2.getAngularVelocity()); - btScalar a; - a=jacDiagABInv; + rel_vel = normal.dot(vel); diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h index c07e9bbd8..739b066fe 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h @@ -58,7 +58,7 @@ struct btContactSolverInfoData int m_minimumSolverBatchSize; btScalar m_maxGyroscopicForce; btScalar m_singleAxisRollingFrictionThreshold; - + btScalar m_leastSquaresResidualThreshold; }; @@ -77,7 +77,7 @@ struct btContactSolverInfo : public btContactSolverInfoData m_maxErrorReduction = btScalar(20.); m_numIterations = 10; m_erp = btScalar(0.2); - m_erp2 = btScalar(0.8); + m_erp2 = btScalar(0.2); m_globalCfm = btScalar(0.); m_sor = btScalar(1.); m_splitImpulse = true; @@ -89,8 +89,9 @@ struct btContactSolverInfo : public btContactSolverInfoData m_solverMode = SOLVER_USE_WARMSTARTING | SOLVER_SIMD;// | SOLVER_RANDMIZE_ORDER; m_restingContactRestitutionThreshold = 2;//unused as of 2.81 m_minimumSolverBatchSize = 128; //try to combine islands until the amount of constraints reaches this limit - m_maxGyroscopicForce = 100.f; ///only used to clamp forces for bodies that have their BT_ENABLE_GYROPSCOPIC_FORCE flag set (using btRigidBody::setFlag) + m_maxGyroscopicForce = 100.f; ///it is only used for 'explicit' version of gyroscopic force m_singleAxisRollingFrictionThreshold = 1e30f;///if the velocity is above this threshold, it will use a single constraint row (axis), otherwise 3 rows. + m_leastSquaresResidualThreshold = 0.f; } }; @@ -111,7 +112,7 @@ struct btContactSolverInfoDoubleData double m_splitImpulseTurnErp; double m_linearSlop; double m_warmstartingFactor; - double m_maxGyroscopicForce; + double m_maxGyroscopicForce;///it is only used for 'explicit' version of gyroscopic force double m_singleAxisRollingFrictionThreshold; int m_numIterations; diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp index f93a3280f..75d81cc08 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp @@ -21,109 +21,17 @@ subject to the following restrictions: btFixedConstraint::btFixedConstraint(btRigidBody& rbA,btRigidBody& rbB, const btTransform& frameInA,const btTransform& frameInB) -:btTypedConstraint(FIXED_CONSTRAINT_TYPE,rbA,rbB) +:btGeneric6DofSpring2Constraint(rbA,rbB,frameInA,frameInB) { - m_pivotInA = frameInA.getOrigin(); - m_pivotInB = frameInB.getOrigin(); - m_relTargetAB = frameInA.getRotation()*frameInB.getRotation().inverse(); - + setAngularLowerLimit(btVector3(0,0,0)); + setAngularUpperLimit(btVector3(0,0,0)); + setLinearLowerLimit(btVector3(0,0,0)); + setLinearUpperLimit(btVector3(0,0,0)); } + + + btFixedConstraint::~btFixedConstraint () { } - - -void btFixedConstraint::getInfo1 (btConstraintInfo1* info) -{ - info->m_numConstraintRows = 6; - info->nub = 6; -} - -void btFixedConstraint::getInfo2 (btConstraintInfo2* info) -{ - //fix the 3 linear degrees of freedom - - - const btVector3& worldPosA = m_rbA.getCenterOfMassTransform().getOrigin(); - const btMatrix3x3& worldOrnA = m_rbA.getCenterOfMassTransform().getBasis(); - const btVector3& worldPosB= m_rbB.getCenterOfMassTransform().getOrigin(); - const btMatrix3x3& worldOrnB = m_rbB.getCenterOfMassTransform().getBasis(); - - - info->m_J1linearAxis[0] = 1; - info->m_J1linearAxis[info->rowskip+1] = 1; - info->m_J1linearAxis[2*info->rowskip+2] = 1; - - btVector3 a1 = worldOrnA*m_pivotInA; - { - btVector3* angular0 = (btVector3*)(info->m_J1angularAxis); - btVector3* angular1 = (btVector3*)(info->m_J1angularAxis+info->rowskip); - btVector3* angular2 = (btVector3*)(info->m_J1angularAxis+2*info->rowskip); - btVector3 a1neg = -a1; - a1neg.getSkewSymmetricMatrix(angular0,angular1,angular2); - } - - if (info->m_J2linearAxis) - { - info->m_J2linearAxis[0] = -1; - info->m_J2linearAxis[info->rowskip+1] = -1; - info->m_J2linearAxis[2*info->rowskip+2] = -1; - } - - btVector3 a2 = worldOrnB*m_pivotInB; - - { - // btVector3 a2n = -a2; - btVector3* angular0 = (btVector3*)(info->m_J2angularAxis); - btVector3* angular1 = (btVector3*)(info->m_J2angularAxis+info->rowskip); - btVector3* angular2 = (btVector3*)(info->m_J2angularAxis+2*info->rowskip); - a2.getSkewSymmetricMatrix(angular0,angular1,angular2); - } - - // set right hand side for the linear dofs - btScalar k = info->fps * info->erp; - - btVector3 linearError = k*(a2+worldPosB-a1-worldPosA); - int j; - for (j=0; j<3; j++) - { - - - - info->m_constraintError[j*info->rowskip] = linearError[j]; - //printf("info->m_constraintError[%d]=%f\n",j,info->m_constraintError[j]); - } - - //fix the 3 angular degrees of freedom - - int start_row = 3; - int s = info->rowskip; - int start_index = start_row * s; - - // 3 rows to make body rotations equal - info->m_J1angularAxis[start_index] = 1; - info->m_J1angularAxis[start_index + s + 1] = 1; - info->m_J1angularAxis[start_index + s*2+2] = 1; - if ( info->m_J2angularAxis) - { - info->m_J2angularAxis[start_index] = -1; - info->m_J2angularAxis[start_index + s+1] = -1; - info->m_J2angularAxis[start_index + s*2+2] = -1; - } - - // set right hand side for the angular dofs - - btVector3 diff; - btScalar angle; - btMatrix3x3 mrelCur = worldOrnA *worldOrnB.inverse(); - btQuaternion qrelCur; - mrelCur.getRotation(qrelCur); - btTransformUtil::calculateDiffAxisAngleQuaternion(m_relTargetAB,qrelCur,diff,angle); - diff*=-angle; - for (j=0; j<3; j++) - { - info->m_constraintError[(3+j)*info->rowskip] = k * diff[j]; - } - -} \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h index 697e319e2..bff2008b2 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h @@ -16,34 +16,18 @@ subject to the following restrictions: #ifndef BT_FIXED_CONSTRAINT_H #define BT_FIXED_CONSTRAINT_H -#include "btTypedConstraint.h" +#include "btGeneric6DofSpring2Constraint.h" -ATTRIBUTE_ALIGNED16(class) btFixedConstraint : public btTypedConstraint + +ATTRIBUTE_ALIGNED16(class) btFixedConstraint : public btGeneric6DofSpring2Constraint { - btVector3 m_pivotInA; - btVector3 m_pivotInB; - btQuaternion m_relTargetAB; public: btFixedConstraint(btRigidBody& rbA,btRigidBody& rbB, const btTransform& frameInA,const btTransform& frameInB); + virtual ~btFixedConstraint(); - - virtual void getInfo1 (btConstraintInfo1* info); - - virtual void getInfo2 (btConstraintInfo2* info); - - virtual void setParam(int num, btScalar value, int axis = -1) - { - btAssert(0); - } - virtual btScalar getParam(int num, int axis = -1) const - { - btAssert(0); - return 0.f; - } - }; #endif //BT_FIXED_CONSTRAINT_H diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h index 431a52416..bea8629c3 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h @@ -111,14 +111,14 @@ public: //! Is limited - bool isLimited() + bool isLimited() const { if(m_loLimit > m_hiLimit) return false; return true; } //! Need apply correction - bool needApplyTorques() + bool needApplyTorques() const { if(m_currentLimit == 0 && m_enableMotor == false) return false; return true; @@ -207,11 +207,11 @@ public: - limited means upper > lower - limitIndex: first 3 are linear, next 3 are angular */ - inline bool isLimited(int limitIndex) + inline bool isLimited(int limitIndex) const { return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]); } - inline bool needApplyForce(int limitIndex) + inline bool needApplyForce(int limitIndex) const { if(m_currentLimit[limitIndex] == 0 && m_enableMotor[limitIndex] == false) return false; return true; @@ -457,7 +457,7 @@ public: m_linearLimits.m_lowerLimit = linearLower; } - void getLinearLowerLimit(btVector3& linearLower) + void getLinearLowerLimit(btVector3& linearLower) const { linearLower = m_linearLimits.m_lowerLimit; } @@ -467,7 +467,7 @@ public: m_linearLimits.m_upperLimit = linearUpper; } - void getLinearUpperLimit(btVector3& linearUpper) + void getLinearUpperLimit(btVector3& linearUpper) const { linearUpper = m_linearLimits.m_upperLimit; } @@ -478,7 +478,7 @@ public: m_angularLimits[i].m_loLimit = btNormalizeAngle(angularLower[i]); } - void getAngularLowerLimit(btVector3& angularLower) + void getAngularLowerLimit(btVector3& angularLower) const { for(int i = 0; i < 3; i++) angularLower[i] = m_angularLimits[i].m_loLimit; @@ -490,7 +490,7 @@ public: m_angularLimits[i].m_hiLimit = btNormalizeAngle(angularUpper[i]); } - void getAngularUpperLimit(btVector3& angularUpper) + void getAngularUpperLimit(btVector3& angularUpper) const { for(int i = 0; i < 3; i++) angularUpper[i] = m_angularLimits[i].m_hiLimit; @@ -532,7 +532,7 @@ public: - limited means upper > lower - limitIndex: first 3 are linear, next 3 are angular */ - bool isLimited(int limitIndex) + bool isLimited(int limitIndex) const { if(limitIndex<3) { @@ -549,8 +549,11 @@ public: btConstraintInfo2 *info, int row, btVector3& ax1, int rotational, int rotAllowed = false); // access for UseFrameOffset - bool getUseFrameOffset() { return m_useOffsetForConstraintFrame; } + bool getUseFrameOffset() const { return m_useOffsetForConstraintFrame; } void setUseFrameOffset(bool frameOffsetOnOff) { m_useOffsetForConstraintFrame = frameOffsetOnOff; } + + bool getUseLinearReferenceFrameA() const { return m_useLinearReferenceFrameA; } + void setUseLinearReferenceFrameA(bool linearReferenceFrameA) { m_useLinearReferenceFrameA = linearReferenceFrameA; } ///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5). ///If no axis is provided, it uses the default axis for this constraint. @@ -560,6 +563,10 @@ public: void setAxis( const btVector3& axis1, const btVector3& axis2); + virtual int getFlags() const + { + return m_flags; + } virtual int calculateSerializeBufferSize() const; diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp new file mode 100644 index 000000000..49ff78c26 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp @@ -0,0 +1,1121 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +/* +2014 May: btGeneric6DofSpring2Constraint is created from the original (2.82.2712) btGeneric6DofConstraint by Gabor Puhr and Tamas Umenhoffer +Pros: +- Much more accurate and stable in a lot of situation. (Especially when a sleeping chain of RBs connected with 6dof2 is pulled) +- Stable and accurate spring with minimal energy loss that works with all of the solvers. (latter is not true for the original 6dof spring) +- Servo motor functionality +- Much more accurate bouncing. 0 really means zero bouncing (not true for the original 6odf) and there is only a minimal energy loss when the value is 1 (because of the solvers' precision) +- Rotation order for the Euler system can be set. (One axis' freedom is still limited to pi/2) + +Cons: +- It is slower than the original 6dof. There is no exact ratio, but half speed is a good estimation. (with PGS) +- At bouncing the correct velocity is calculated, but not the correct position. (it is because of the solver can correct position or velocity, but not both.) +*/ + +/// 2009 March: btGeneric6DofConstraint refactored by Roman Ponomarev +/// Added support for generic constraint solver through getInfo1/getInfo2 methods + +/* +2007-09-09 +btGeneric6DofConstraint Refactored by Francisco Le?n +email: projectileman@yahoo.com +http://gimpact.sf.net +*/ + + + +#include "btGeneric6DofSpring2Constraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "LinearMath/btTransformUtil.h" +#include + + + +btGeneric6DofSpring2Constraint::btGeneric6DofSpring2Constraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, RotateOrder rotOrder) + : btTypedConstraint(D6_SPRING_2_CONSTRAINT_TYPE, rbA, rbB) + , m_frameInA(frameInA) + , m_frameInB(frameInB) + , m_rotateOrder(rotOrder) + , m_flags(0) +{ + calculateTransforms(); +} + + +btGeneric6DofSpring2Constraint::btGeneric6DofSpring2Constraint(btRigidBody& rbB, const btTransform& frameInB, RotateOrder rotOrder) + : btTypedConstraint(D6_SPRING_2_CONSTRAINT_TYPE, getFixedBody(), rbB) + , m_frameInB(frameInB) + , m_rotateOrder(rotOrder) + , m_flags(0) +{ + ///not providing rigidbody A means implicitly using worldspace for body A + m_frameInA = rbB.getCenterOfMassTransform() * m_frameInB; + calculateTransforms(); +} + + +btScalar btGeneric6DofSpring2Constraint::btGetMatrixElem(const btMatrix3x3& mat, int index) +{ + int i = index%3; + int j = index/3; + return mat[i][j]; +} + +// MatrixToEulerXYZ from http://www.geometrictools.com/LibFoundation/Mathematics/Wm4Matrix3.inl.html + +bool btGeneric6DofSpring2Constraint::matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz) +{ + // rot = cy*cz -cy*sz sy + // cz*sx*sy+cx*sz cx*cz-sx*sy*sz -cy*sx + // -cx*cz*sy+sx*sz cz*sx+cx*sy*sz cx*cy + + btScalar fi = btGetMatrixElem(mat,2); + if (fi < btScalar(1.0f)) + { + if (fi > btScalar(-1.0f)) + { + xyz[0] = btAtan2(-btGetMatrixElem(mat,5),btGetMatrixElem(mat,8)); + xyz[1] = btAsin(btGetMatrixElem(mat,2)); + xyz[2] = btAtan2(-btGetMatrixElem(mat,1),btGetMatrixElem(mat,0)); + return true; + } + else + { + // WARNING. Not unique. XA - ZA = -atan2(r10,r11) + xyz[0] = -btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4)); + xyz[1] = -SIMD_HALF_PI; + xyz[2] = btScalar(0.0); + return false; + } + } + else + { + // WARNING. Not unique. XAngle + ZAngle = atan2(r10,r11) + xyz[0] = btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4)); + xyz[1] = SIMD_HALF_PI; + xyz[2] = 0.0; + } + return false; +} + +bool btGeneric6DofSpring2Constraint::matrixToEulerXZY(const btMatrix3x3& mat,btVector3& xyz) +{ + // rot = cy*cz -sz sy*cz + // cy*cx*sz+sx*sy cx*cz sy*cx*sz-cy*sx + // cy*sx*sz-cx*sy sx*cz sy*sx*sz+cx*cy + + btScalar fi = btGetMatrixElem(mat,1); + if (fi < btScalar(1.0f)) + { + if (fi > btScalar(-1.0f)) + { + xyz[0] = btAtan2(btGetMatrixElem(mat,7),btGetMatrixElem(mat,4)); + xyz[1] = btAtan2(btGetMatrixElem(mat,2),btGetMatrixElem(mat,0)); + xyz[2] = btAsin(-btGetMatrixElem(mat,1)); + return true; + } + else + { + xyz[0] = -btAtan2(-btGetMatrixElem(mat,6),btGetMatrixElem(mat,8)); + xyz[1] = btScalar(0.0); + xyz[2] = SIMD_HALF_PI; + return false; + } + } + else + { + xyz[0] = btAtan2(-btGetMatrixElem(mat,6),btGetMatrixElem(mat,8)); + xyz[1] = 0.0; + xyz[2] = -SIMD_HALF_PI; + } + return false; +} + +bool btGeneric6DofSpring2Constraint::matrixToEulerYXZ(const btMatrix3x3& mat,btVector3& xyz) +{ + // rot = cy*cz+sy*sx*sz cz*sy*sx-cy*sz cx*sy + // cx*sz cx*cz -sx + // cy*sx*sz-cz*sy sy*sz+cy*cz*sx cy*cx + + btScalar fi = btGetMatrixElem(mat,5); + if (fi < btScalar(1.0f)) + { + if (fi > btScalar(-1.0f)) + { + xyz[0] = btAsin(-btGetMatrixElem(mat,5)); + xyz[1] = btAtan2(btGetMatrixElem(mat,2),btGetMatrixElem(mat,8)); + xyz[2] = btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4)); + return true; + } + else + { + xyz[0] = SIMD_HALF_PI; + xyz[1] = -btAtan2(-btGetMatrixElem(mat,1),btGetMatrixElem(mat,0)); + xyz[2] = btScalar(0.0); + return false; + } + } + else + { + xyz[0] = -SIMD_HALF_PI; + xyz[1] = btAtan2(-btGetMatrixElem(mat,1),btGetMatrixElem(mat,0)); + xyz[2] = 0.0; + } + return false; +} + +bool btGeneric6DofSpring2Constraint::matrixToEulerYZX(const btMatrix3x3& mat,btVector3& xyz) +{ + // rot = cy*cz sy*sx-cy*cx*sz cx*sy+cy*sz*sx + // sz cz*cx -cz*sx + // -cz*sy cy*sx+cx*sy*sz cy*cx-sy*sz*sx + + btScalar fi = btGetMatrixElem(mat,3); + if (fi < btScalar(1.0f)) + { + if (fi > btScalar(-1.0f)) + { + xyz[0] = btAtan2(-btGetMatrixElem(mat,5),btGetMatrixElem(mat,4)); + xyz[1] = btAtan2(-btGetMatrixElem(mat,6),btGetMatrixElem(mat,0)); + xyz[2] = btAsin(btGetMatrixElem(mat,3)); + return true; + } + else + { + xyz[0] = btScalar(0.0); + xyz[1] = -btAtan2(btGetMatrixElem(mat,7),btGetMatrixElem(mat,8)); + xyz[2] = -SIMD_HALF_PI; + return false; + } + } + else + { + xyz[0] = btScalar(0.0); + xyz[1] = btAtan2(btGetMatrixElem(mat,7),btGetMatrixElem(mat,8)); + xyz[2] = SIMD_HALF_PI; + } + return false; +} + +bool btGeneric6DofSpring2Constraint::matrixToEulerZXY(const btMatrix3x3& mat,btVector3& xyz) +{ + // rot = cz*cy-sz*sx*sy -cx*sz cz*sy+cy*sz*sx + // cy*sz+cz*sx*sy cz*cx sz*sy-cz*xy*sx + // -cx*sy sx cx*cy + + btScalar fi = btGetMatrixElem(mat,7); + if (fi < btScalar(1.0f)) + { + if (fi > btScalar(-1.0f)) + { + xyz[0] = btAsin(btGetMatrixElem(mat,7)); + xyz[1] = btAtan2(-btGetMatrixElem(mat,6),btGetMatrixElem(mat,8)); + xyz[2] = btAtan2(-btGetMatrixElem(mat,1),btGetMatrixElem(mat,4)); + return true; + } + else + { + xyz[0] = -SIMD_HALF_PI; + xyz[1] = btScalar(0.0); + xyz[2] = -btAtan2(btGetMatrixElem(mat,2),btGetMatrixElem(mat,0)); + return false; + } + } + else + { + xyz[0] = SIMD_HALF_PI; + xyz[1] = btScalar(0.0); + xyz[2] = btAtan2(btGetMatrixElem(mat,2),btGetMatrixElem(mat,0)); + } + return false; +} + +bool btGeneric6DofSpring2Constraint::matrixToEulerZYX(const btMatrix3x3& mat,btVector3& xyz) +{ + // rot = cz*cy cz*sy*sx-cx*sz sz*sx+cz*cx*sy + // cy*sz cz*cx+sz*sy*sx cx*sz*sy-cz*sx + // -sy cy*sx cy*cx + + btScalar fi = btGetMatrixElem(mat,6); + if (fi < btScalar(1.0f)) + { + if (fi > btScalar(-1.0f)) + { + xyz[0] = btAtan2(btGetMatrixElem(mat,7), btGetMatrixElem(mat,8)); + xyz[1] = btAsin(-btGetMatrixElem(mat,6)); + xyz[2] = btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,0)); + return true; + } + else + { + xyz[0] = btScalar(0.0); + xyz[1] = SIMD_HALF_PI; + xyz[2] = -btAtan2(btGetMatrixElem(mat,1),btGetMatrixElem(mat,2)); + return false; + } + } + else + { + xyz[0] = btScalar(0.0); + xyz[1] = -SIMD_HALF_PI; + xyz[2] = btAtan2(-btGetMatrixElem(mat,1),-btGetMatrixElem(mat,2)); + } + return false; +} + +void btGeneric6DofSpring2Constraint::calculateAngleInfo() +{ + btMatrix3x3 relative_frame = m_calculatedTransformA.getBasis().inverse()*m_calculatedTransformB.getBasis(); + switch (m_rotateOrder) + { + case RO_XYZ : matrixToEulerXYZ(relative_frame,m_calculatedAxisAngleDiff); break; + case RO_XZY : matrixToEulerXZY(relative_frame,m_calculatedAxisAngleDiff); break; + case RO_YXZ : matrixToEulerYXZ(relative_frame,m_calculatedAxisAngleDiff); break; + case RO_YZX : matrixToEulerYZX(relative_frame,m_calculatedAxisAngleDiff); break; + case RO_ZXY : matrixToEulerZXY(relative_frame,m_calculatedAxisAngleDiff); break; + case RO_ZYX : matrixToEulerZYX(relative_frame,m_calculatedAxisAngleDiff); break; + default : btAssert(false); + } + // in euler angle mode we do not actually constrain the angular velocity + // along the axes axis[0] and axis[2] (although we do use axis[1]) : + // + // to get constrain w2-w1 along ...not + // ------ --------------------- ------ + // d(angle[0])/dt = 0 ax[1] x ax[2] ax[0] + // d(angle[1])/dt = 0 ax[1] + // d(angle[2])/dt = 0 ax[0] x ax[1] ax[2] + // + // constraining w2-w1 along an axis 'a' means that a'*(w2-w1)=0. + // to prove the result for angle[0], write the expression for angle[0] from + // GetInfo1 then take the derivative. to prove this for angle[2] it is + // easier to take the euler rate expression for d(angle[2])/dt with respect + // to the components of w and set that to 0. + switch (m_rotateOrder) + { + case RO_XYZ : + { + //Is this the "line of nodes" calculation choosing planes YZ (B coordinate system) and xy (A coordinate system)? (http://en.wikipedia.org/wiki/Euler_angles) + //The two planes are non-homologous, so this is a Tait–Bryan angle formalism and not a proper Euler + //Extrinsic rotations are equal to the reversed order intrinsic rotations so the above xyz extrinsic rotations (axes are fixed) are the same as the zy'x" intrinsic rotations (axes are refreshed after each rotation) + //that is why xy and YZ planes are chosen (this will describe a zy'x" intrinsic rotation) (see the figure on the left at http://en.wikipedia.org/wiki/Euler_angles under Tait–Bryan angles) + // x' = Nperp = N.cross(axis2) + // y' = N = axis2.cross(axis0) + // z' = z + // + // x" = X + // y" = y' + // z" = ?? + //in other words: + //first rotate around z + //second rotate around y'= z.cross(X) + //third rotate around x" = X + //Original XYZ extrinsic rotation order. + //Planes: xy and YZ normals: z, X. Plane intersection (N) is z.cross(X) + btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0); + btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2); + m_calculatedAxis[1] = axis2.cross(axis0); + m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2); + m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]); + break; + } + case RO_XZY : + { + //planes: xz,ZY normals: y, X + //first rotate around y + //second rotate around z'= y.cross(X) + //third rotate around x" = X + btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0); + btVector3 axis1 = m_calculatedTransformA.getBasis().getColumn(1); + m_calculatedAxis[2] = axis0.cross(axis1); + m_calculatedAxis[0] = axis1.cross(m_calculatedAxis[2]); + m_calculatedAxis[1] = m_calculatedAxis[2].cross(axis0); + break; + } + case RO_YXZ : + { + //planes: yx,XZ normals: z, Y + //first rotate around z + //second rotate around x'= z.cross(Y) + //third rotate around y" = Y + btVector3 axis1 = m_calculatedTransformB.getBasis().getColumn(1); + btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2); + m_calculatedAxis[0] = axis1.cross(axis2); + m_calculatedAxis[1] = axis2.cross(m_calculatedAxis[0]); + m_calculatedAxis[2] = m_calculatedAxis[0].cross(axis1); + break; + } + case RO_YZX : + { + //planes: yz,ZX normals: x, Y + //first rotate around x + //second rotate around z'= x.cross(Y) + //third rotate around y" = Y + btVector3 axis0 = m_calculatedTransformA.getBasis().getColumn(0); + btVector3 axis1 = m_calculatedTransformB.getBasis().getColumn(1); + m_calculatedAxis[2] = axis0.cross(axis1); + m_calculatedAxis[0] = axis1.cross(m_calculatedAxis[2]); + m_calculatedAxis[1] = m_calculatedAxis[2].cross(axis0); + break; + } + case RO_ZXY : + { + //planes: zx,XY normals: y, Z + //first rotate around y + //second rotate around x'= y.cross(Z) + //third rotate around z" = Z + btVector3 axis1 = m_calculatedTransformA.getBasis().getColumn(1); + btVector3 axis2 = m_calculatedTransformB.getBasis().getColumn(2); + m_calculatedAxis[0] = axis1.cross(axis2); + m_calculatedAxis[1] = axis2.cross(m_calculatedAxis[0]); + m_calculatedAxis[2] = m_calculatedAxis[0].cross(axis1); + break; + } + case RO_ZYX : + { + //planes: zy,YX normals: x, Z + //first rotate around x + //second rotate around y' = x.cross(Z) + //third rotate around z" = Z + btVector3 axis0 = m_calculatedTransformA.getBasis().getColumn(0); + btVector3 axis2 = m_calculatedTransformB.getBasis().getColumn(2); + m_calculatedAxis[1] = axis2.cross(axis0); + m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2); + m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]); + break; + } + default: + btAssert(false); + } + + m_calculatedAxis[0].normalize(); + m_calculatedAxis[1].normalize(); + m_calculatedAxis[2].normalize(); + +} + +void btGeneric6DofSpring2Constraint::calculateTransforms() +{ + calculateTransforms(m_rbA.getCenterOfMassTransform(),m_rbB.getCenterOfMassTransform()); +} + +void btGeneric6DofSpring2Constraint::calculateTransforms(const btTransform& transA,const btTransform& transB) +{ + m_calculatedTransformA = transA * m_frameInA; + m_calculatedTransformB = transB * m_frameInB; + calculateLinearInfo(); + calculateAngleInfo(); + + btScalar miA = getRigidBodyA().getInvMass(); + btScalar miB = getRigidBodyB().getInvMass(); + m_hasStaticBody = (miA < SIMD_EPSILON) || (miB < SIMD_EPSILON); + btScalar miS = miA + miB; + if(miS > btScalar(0.f)) + { + m_factA = miB / miS; + } + else + { + m_factA = btScalar(0.5f); + } + m_factB = btScalar(1.0f) - m_factA; +} + + +void btGeneric6DofSpring2Constraint::testAngularLimitMotor(int axis_index) +{ + btScalar angle = m_calculatedAxisAngleDiff[axis_index]; + angle = btAdjustAngleToLimits(angle, m_angularLimits[axis_index].m_loLimit, m_angularLimits[axis_index].m_hiLimit); + m_angularLimits[axis_index].m_currentPosition = angle; + m_angularLimits[axis_index].testLimitValue(angle); +} + + +void btGeneric6DofSpring2Constraint::getInfo1 (btConstraintInfo1* info) +{ + //prepare constraint + calculateTransforms(m_rbA.getCenterOfMassTransform(),m_rbB.getCenterOfMassTransform()); + info->m_numConstraintRows = 0; + info->nub = 0; + int i; + //test linear limits + for(i = 0; i < 3; i++) + { + if (m_linearLimits.m_currentLimit[i]==4) info->m_numConstraintRows += 2; + else if (m_linearLimits.m_currentLimit[i]!=0) info->m_numConstraintRows += 1; + if (m_linearLimits.m_enableMotor[i] ) info->m_numConstraintRows += 1; + if (m_linearLimits.m_enableSpring[i]) info->m_numConstraintRows += 1; + } + //test angular limits + for (i=0;i<3 ;i++ ) + { + testAngularLimitMotor(i); + if (m_angularLimits[i].m_currentLimit==4) info->m_numConstraintRows += 2; + else if (m_angularLimits[i].m_currentLimit!=0) info->m_numConstraintRows += 1; + if (m_angularLimits[i].m_enableMotor ) info->m_numConstraintRows += 1; + if (m_angularLimits[i].m_enableSpring) info->m_numConstraintRows += 1; + } +} + + +void btGeneric6DofSpring2Constraint::getInfo2 (btConstraintInfo2* info) +{ + const btTransform& transA = m_rbA.getCenterOfMassTransform(); + const btTransform& transB = m_rbB.getCenterOfMassTransform(); + const btVector3& linVelA = m_rbA.getLinearVelocity(); + const btVector3& linVelB = m_rbB.getLinearVelocity(); + const btVector3& angVelA = m_rbA.getAngularVelocity(); + const btVector3& angVelB = m_rbB.getAngularVelocity(); + + // for stability better to solve angular limits first + int row = setAngularLimits(info, 0,transA,transB,linVelA,linVelB,angVelA,angVelB); + setLinearLimits(info, row, transA,transB,linVelA,linVelB,angVelA,angVelB); +} + + +int btGeneric6DofSpring2Constraint::setLinearLimits(btConstraintInfo2* info, int row, const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB) +{ + //solve linear limits + btRotationalLimitMotor2 limot; + for (int i=0;i<3 ;i++ ) + { + if(m_linearLimits.m_currentLimit[i] || m_linearLimits.m_enableMotor[i] || m_linearLimits.m_enableSpring[i]) + { // re-use rotational motor code + limot.m_bounce = m_linearLimits.m_bounce[i]; + limot.m_currentLimit = m_linearLimits.m_currentLimit[i]; + limot.m_currentPosition = m_linearLimits.m_currentLinearDiff[i]; + limot.m_currentLimitError = m_linearLimits.m_currentLimitError[i]; + limot.m_currentLimitErrorHi = m_linearLimits.m_currentLimitErrorHi[i]; + limot.m_enableMotor = m_linearLimits.m_enableMotor[i]; + limot.m_servoMotor = m_linearLimits.m_servoMotor[i]; + limot.m_servoTarget = m_linearLimits.m_servoTarget[i]; + limot.m_enableSpring = m_linearLimits.m_enableSpring[i]; + limot.m_springStiffness = m_linearLimits.m_springStiffness[i]; + limot.m_springStiffnessLimited = m_linearLimits.m_springStiffnessLimited[i]; + limot.m_springDamping = m_linearLimits.m_springDamping[i]; + limot.m_springDampingLimited = m_linearLimits.m_springDampingLimited[i]; + limot.m_equilibriumPoint = m_linearLimits.m_equilibriumPoint[i]; + limot.m_hiLimit = m_linearLimits.m_upperLimit[i]; + limot.m_loLimit = m_linearLimits.m_lowerLimit[i]; + limot.m_maxMotorForce = m_linearLimits.m_maxMotorForce[i]; + limot.m_targetVelocity = m_linearLimits.m_targetVelocity[i]; + btVector3 axis = m_calculatedTransformA.getBasis().getColumn(i); + int flags = m_flags >> (i * BT_6DOF_FLAGS_AXIS_SHIFT2); + limot.m_stopCFM = (flags & BT_6DOF_FLAGS_CFM_STOP2) ? m_linearLimits.m_stopCFM[i] : info->cfm[0]; + limot.m_stopERP = (flags & BT_6DOF_FLAGS_ERP_STOP2) ? m_linearLimits.m_stopERP[i] : info->erp; + limot.m_motorCFM = (flags & BT_6DOF_FLAGS_CFM_MOTO2) ? m_linearLimits.m_motorCFM[i] : info->cfm[0]; + limot.m_motorERP = (flags & BT_6DOF_FLAGS_ERP_MOTO2) ? m_linearLimits.m_motorERP[i] : info->erp; + + //rotAllowed is a bit of a magic from the original 6dof. The calculation of it here is something that imitates the original behavior as much as possible. + int indx1 = (i + 1) % 3; + int indx2 = (i + 2) % 3; + int rotAllowed = 1; // rotations around orthos to current axis (it is used only when one of the body is static) + #define D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION 1.0e-3 + bool indx1Violated = m_angularLimits[indx1].m_currentLimit == 1 || + m_angularLimits[indx1].m_currentLimit == 2 || + ( m_angularLimits[indx1].m_currentLimit == 3 && ( m_angularLimits[indx1].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx1].m_currentLimitError > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION ) ) || + ( m_angularLimits[indx1].m_currentLimit == 4 && ( m_angularLimits[indx1].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx1].m_currentLimitErrorHi > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION ) ); + bool indx2Violated = m_angularLimits[indx2].m_currentLimit == 1 || + m_angularLimits[indx2].m_currentLimit == 2 || + ( m_angularLimits[indx2].m_currentLimit == 3 && ( m_angularLimits[indx2].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx2].m_currentLimitError > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION ) ) || + ( m_angularLimits[indx2].m_currentLimit == 4 && ( m_angularLimits[indx2].m_currentLimitError < -D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION || m_angularLimits[indx2].m_currentLimitErrorHi > D6_LIMIT_ERROR_THRESHOLD_FOR_ROTATION ) ); + if( indx1Violated && indx2Violated ) + { + rotAllowed = 0; + } + row += get_limit_motor_info2(&limot, transA,transB,linVelA,linVelB,angVelA,angVelB, info, row, axis, 0, rotAllowed); + + } + } + return row; +} + + + +int btGeneric6DofSpring2Constraint::setAngularLimits(btConstraintInfo2 *info, int row_offset, const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB) +{ + int row = row_offset; + + //order of rotational constraint rows + int cIdx[] = {0, 1, 2}; + switch(m_rotateOrder) + { + case RO_XYZ : cIdx[0] = 0; cIdx[1] = 1; cIdx[2] = 2; break; + case RO_XZY : cIdx[0] = 0; cIdx[1] = 2; cIdx[2] = 1; break; + case RO_YXZ : cIdx[0] = 1; cIdx[1] = 0; cIdx[2] = 2; break; + case RO_YZX : cIdx[0] = 1; cIdx[1] = 2; cIdx[2] = 0; break; + case RO_ZXY : cIdx[0] = 2; cIdx[1] = 0; cIdx[2] = 1; break; + case RO_ZYX : cIdx[0] = 2; cIdx[1] = 1; cIdx[2] = 0; break; + default : btAssert(false); + } + + for (int ii = 0; ii < 3 ; ii++ ) + { + int i = cIdx[ii]; + if(m_angularLimits[i].m_currentLimit || m_angularLimits[i].m_enableMotor || m_angularLimits[i].m_enableSpring) + { + btVector3 axis = getAxis(i); + int flags = m_flags >> ((i + 3) * BT_6DOF_FLAGS_AXIS_SHIFT2); + if(!(flags & BT_6DOF_FLAGS_CFM_STOP2)) + { + m_angularLimits[i].m_stopCFM = info->cfm[0]; + } + if(!(flags & BT_6DOF_FLAGS_ERP_STOP2)) + { + m_angularLimits[i].m_stopERP = info->erp; + } + if(!(flags & BT_6DOF_FLAGS_CFM_MOTO2)) + { + m_angularLimits[i].m_motorCFM = info->cfm[0]; + } + if(!(flags & BT_6DOF_FLAGS_ERP_MOTO2)) + { + m_angularLimits[i].m_motorERP = info->erp; + } + row += get_limit_motor_info2(&m_angularLimits[i],transA,transB,linVelA,linVelB,angVelA,angVelB, info,row,axis,1); + } + } + + return row; +} + + +void btGeneric6DofSpring2Constraint::setFrames(const btTransform& frameA, const btTransform& frameB) +{ + m_frameInA = frameA; + m_frameInB = frameB; + buildJacobian(); + calculateTransforms(); +} + + +void btGeneric6DofSpring2Constraint::calculateLinearInfo() +{ + m_calculatedLinearDiff = m_calculatedTransformB.getOrigin() - m_calculatedTransformA.getOrigin(); + m_calculatedLinearDiff = m_calculatedTransformA.getBasis().inverse() * m_calculatedLinearDiff; + for(int i = 0; i < 3; i++) + { + m_linearLimits.m_currentLinearDiff[i] = m_calculatedLinearDiff[i]; + m_linearLimits.testLimitValue(i, m_calculatedLinearDiff[i]); + } +} + +void btGeneric6DofSpring2Constraint::calculateJacobi(btRotationalLimitMotor2 * limot, const btTransform& transA,const btTransform& transB, btConstraintInfo2 *info, int srow, btVector3& ax1, int rotational, int rotAllowed) +{ + btScalar *J1 = rotational ? info->m_J1angularAxis : info->m_J1linearAxis; + btScalar *J2 = rotational ? info->m_J2angularAxis : info->m_J2linearAxis; + + J1[srow+0] = ax1[0]; + J1[srow+1] = ax1[1]; + J1[srow+2] = ax1[2]; + + J2[srow+0] = -ax1[0]; + J2[srow+1] = -ax1[1]; + J2[srow+2] = -ax1[2]; + + if(!rotational) + { + btVector3 tmpA, tmpB, relA, relB; + // get vector from bodyB to frameB in WCS + relB = m_calculatedTransformB.getOrigin() - transB.getOrigin(); + // same for bodyA + relA = m_calculatedTransformA.getOrigin() - transA.getOrigin(); + tmpA = relA.cross(ax1); + tmpB = relB.cross(ax1); + if(m_hasStaticBody && (!rotAllowed)) + { + tmpA *= m_factA; + tmpB *= m_factB; + } + int i; + for (i=0; i<3; i++) info->m_J1angularAxis[srow+i] = tmpA[i]; + for (i=0; i<3; i++) info->m_J2angularAxis[srow+i] = -tmpB[i]; + } +} + + +int btGeneric6DofSpring2Constraint::get_limit_motor_info2( + btRotationalLimitMotor2 * limot, + const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB, + btConstraintInfo2 *info, int row, btVector3& ax1, int rotational,int rotAllowed) +{ + int count = 0; + int srow = row * info->rowskip; + + if (limot->m_currentLimit==4) + { + btScalar vel = rotational ? angVelA.dot(ax1) - angVelB.dot(ax1) : linVelA.dot(ax1) - linVelB.dot(ax1); + + calculateJacobi(limot,transA,transB,info,srow,ax1,rotational,rotAllowed); + info->m_constraintError[srow] = info->fps * limot->m_stopERP * limot->m_currentLimitError * (rotational ? -1 : 1); + if (rotational) { + if (info->m_constraintError[srow]-vel*limot->m_stopERP > 0) { + btScalar bounceerror = -limot->m_bounce* vel; + if (bounceerror > info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror; + } + } else { + if (info->m_constraintError[srow]-vel*limot->m_stopERP < 0) { + btScalar bounceerror = -limot->m_bounce* vel; + if (bounceerror < info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror; + } + } + info->m_lowerLimit[srow] = rotational ? 0 : -SIMD_INFINITY; + info->m_upperLimit[srow] = rotational ? SIMD_INFINITY : 0; + info->cfm[srow] = limot->m_stopCFM; + srow += info->rowskip; + ++count; + + calculateJacobi(limot,transA,transB,info,srow,ax1,rotational,rotAllowed); + info->m_constraintError[srow] = info->fps * limot->m_stopERP * limot->m_currentLimitErrorHi * (rotational ? -1 : 1); + if (rotational) { + if (info->m_constraintError[srow]-vel*limot->m_stopERP < 0) { + btScalar bounceerror = -limot->m_bounce* vel; + if (bounceerror < info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror; + } + } else { + if (info->m_constraintError[srow]-vel*limot->m_stopERP > 0) { + btScalar bounceerror = -limot->m_bounce* vel; + if (bounceerror > info->m_constraintError[srow]) info->m_constraintError[srow] = bounceerror; + } + } + info->m_lowerLimit[srow] = rotational ? -SIMD_INFINITY : 0; + info->m_upperLimit[srow] = rotational ? 0 : SIMD_INFINITY; + info->cfm[srow] = limot->m_stopCFM; + srow += info->rowskip; + ++count; + } else + if (limot->m_currentLimit==3) + { + calculateJacobi(limot,transA,transB,info,srow,ax1,rotational,rotAllowed); + info->m_constraintError[srow] = info->fps * limot->m_stopERP * limot->m_currentLimitError * (rotational ? -1 : 1); + info->m_lowerLimit[srow] = -SIMD_INFINITY; + info->m_upperLimit[srow] = SIMD_INFINITY; + info->cfm[srow] = limot->m_stopCFM; + srow += info->rowskip; + ++count; + } + + if (limot->m_enableMotor && !limot->m_servoMotor) + { + calculateJacobi(limot,transA,transB,info,srow,ax1,rotational,rotAllowed); + btScalar tag_vel = rotational ? limot->m_targetVelocity : -limot->m_targetVelocity; + btScalar mot_fact = getMotorFactor(limot->m_currentPosition, + limot->m_loLimit, + limot->m_hiLimit, + tag_vel, + info->fps * limot->m_motorERP); + info->m_constraintError[srow] = mot_fact * limot->m_targetVelocity; + info->m_lowerLimit[srow] = -limot->m_maxMotorForce; + info->m_upperLimit[srow] = limot->m_maxMotorForce; + info->cfm[srow] = limot->m_motorCFM; + srow += info->rowskip; + ++count; + } + + if (limot->m_enableMotor && limot->m_servoMotor) + { + btScalar error = limot->m_currentPosition - limot->m_servoTarget; + calculateJacobi(limot,transA,transB,info,srow,ax1,rotational,rotAllowed); + btScalar targetvelocity = error<0 ? -limot->m_targetVelocity : limot->m_targetVelocity; + btScalar tag_vel = -targetvelocity; + btScalar mot_fact; + if(error != 0) + { + btScalar lowLimit; + btScalar hiLimit; + if(limot->m_loLimit > limot->m_hiLimit) + { + lowLimit = error > 0 ? limot->m_servoTarget : -SIMD_INFINITY; + hiLimit = error < 0 ? limot->m_servoTarget : SIMD_INFINITY; + } + else + { + lowLimit = error > 0 && limot->m_servoTarget>limot->m_loLimit ? limot->m_servoTarget : limot->m_loLimit; + hiLimit = error < 0 && limot->m_servoTargetm_hiLimit ? limot->m_servoTarget : limot->m_hiLimit; + } + mot_fact = getMotorFactor(limot->m_currentPosition, lowLimit, hiLimit, tag_vel, info->fps * limot->m_motorERP); + } + else + { + mot_fact = 0; + } + info->m_constraintError[srow] = mot_fact * targetvelocity * (rotational ? -1 : 1); + info->m_lowerLimit[srow] = -limot->m_maxMotorForce; + info->m_upperLimit[srow] = limot->m_maxMotorForce; + info->cfm[srow] = limot->m_motorCFM; + srow += info->rowskip; + ++count; + } + + if (limot->m_enableSpring) + { + btScalar error = limot->m_currentPosition - limot->m_equilibriumPoint; + calculateJacobi(limot,transA,transB,info,srow,ax1,rotational,rotAllowed); + + //btScalar cfm = 1.0 / ((1.0/info->fps)*limot->m_springStiffness+ limot->m_springDamping); + //if(cfm > 0.99999) + // cfm = 0.99999; + //btScalar erp = (1.0/info->fps)*limot->m_springStiffness / ((1.0/info->fps)*limot->m_springStiffness + limot->m_springDamping); + //info->m_constraintError[srow] = info->fps * erp * error * (rotational ? -1.0 : 1.0); + //info->m_lowerLimit[srow] = -SIMD_INFINITY; + //info->m_upperLimit[srow] = SIMD_INFINITY; + + btScalar dt = BT_ONE / info->fps; + btScalar kd = limot->m_springDamping; + btScalar ks = limot->m_springStiffness; + btScalar vel = rotational ? angVelA.dot(ax1) - angVelB.dot(ax1) : linVelA.dot(ax1) - linVelB.dot(ax1); +// btScalar erp = 0.1; + btScalar cfm = BT_ZERO; + btScalar mA = BT_ONE / m_rbA.getInvMass(); + btScalar mB = BT_ONE / m_rbB.getInvMass(); + btScalar m = mA > mB ? mB : mA; + btScalar angularfreq = sqrt(ks / m); + + + //limit stiffness (the spring should not be sampled faster that the quarter of its angular frequency) + if(limot->m_springStiffnessLimited && 0.25 < angularfreq * dt) + { + ks = BT_ONE / dt / dt / btScalar(16.0) * m; + } + //avoid damping that would blow up the spring + if(limot->m_springDampingLimited && kd * dt > m) + { + kd = m / dt; + } + btScalar fs = ks * error * dt; + btScalar fd = -kd * (vel) * (rotational ? -1 : 1) * dt; + btScalar f = (fs+fd); + + info->m_constraintError[srow] = (vel + f * (rotational ? -1 : 1)) ; + + btScalar minf = f < fd ? f : fd; + btScalar maxf = f < fd ? fd : f; + if(!rotational) + { + info->m_lowerLimit[srow] = minf > 0 ? 0 : minf; + info->m_upperLimit[srow] = maxf < 0 ? 0 : maxf; + } + else + { + info->m_lowerLimit[srow] = -maxf > 0 ? 0 : -maxf; + info->m_upperLimit[srow] = -minf < 0 ? 0 : -minf; + } + + info->cfm[srow] = cfm; + srow += info->rowskip; + ++count; + } + + return count; +} + + +//override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5). +//If no axis is provided, it uses the default axis for this constraint. +void btGeneric6DofSpring2Constraint::setParam(int num, btScalar value, int axis) +{ + if((axis >= 0) && (axis < 3)) + { + switch(num) + { + case BT_CONSTRAINT_STOP_ERP : + m_linearLimits.m_stopERP[axis] = value; + m_flags |= BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + case BT_CONSTRAINT_STOP_CFM : + m_linearLimits.m_stopCFM[axis] = value; + m_flags |= BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + case BT_CONSTRAINT_ERP : + m_linearLimits.m_motorERP[axis] = value; + m_flags |= BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + case BT_CONSTRAINT_CFM : + m_linearLimits.m_motorCFM[axis] = value; + m_flags |= BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + default : + btAssertConstrParams(0); + } + } + else if((axis >=3) && (axis < 6)) + { + switch(num) + { + case BT_CONSTRAINT_STOP_ERP : + m_angularLimits[axis - 3].m_stopERP = value; + m_flags |= BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + case BT_CONSTRAINT_STOP_CFM : + m_angularLimits[axis - 3].m_stopCFM = value; + m_flags |= BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + case BT_CONSTRAINT_ERP : + m_angularLimits[axis - 3].m_motorERP = value; + m_flags |= BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + case BT_CONSTRAINT_CFM : + m_angularLimits[axis - 3].m_motorCFM = value; + m_flags |= BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2); + break; + default : + btAssertConstrParams(0); + } + } + else + { + btAssertConstrParams(0); + } +} + +//return the local value of parameter +btScalar btGeneric6DofSpring2Constraint::getParam(int num, int axis) const +{ + btScalar retVal = 0; + if((axis >= 0) && (axis < 3)) + { + switch(num) + { + case BT_CONSTRAINT_STOP_ERP : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_linearLimits.m_stopERP[axis]; + break; + case BT_CONSTRAINT_STOP_CFM : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_linearLimits.m_stopCFM[axis]; + break; + case BT_CONSTRAINT_ERP : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_linearLimits.m_motorERP[axis]; + break; + case BT_CONSTRAINT_CFM : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_linearLimits.m_motorCFM[axis]; + break; + default : + btAssertConstrParams(0); + } + } + else if((axis >=3) && (axis < 6)) + { + switch(num) + { + case BT_CONSTRAINT_STOP_ERP : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_angularLimits[axis - 3].m_stopERP; + break; + case BT_CONSTRAINT_STOP_CFM : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_STOP2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_angularLimits[axis - 3].m_stopCFM; + break; + case BT_CONSTRAINT_ERP : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_ERP_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_angularLimits[axis - 3].m_motorERP; + break; + case BT_CONSTRAINT_CFM : + btAssertConstrParams(m_flags & (BT_6DOF_FLAGS_CFM_MOTO2 << (axis * BT_6DOF_FLAGS_AXIS_SHIFT2))); + retVal = m_angularLimits[axis - 3].m_motorCFM; + break; + default : + btAssertConstrParams(0); + } + } + else + { + btAssertConstrParams(0); + } + return retVal; +} + + + +void btGeneric6DofSpring2Constraint::setAxis(const btVector3& axis1,const btVector3& axis2) +{ + btVector3 zAxis = axis1.normalized(); + btVector3 yAxis = axis2.normalized(); + btVector3 xAxis = yAxis.cross(zAxis); // we want right coordinate system + + btTransform frameInW; + frameInW.setIdentity(); + frameInW.getBasis().setValue( xAxis[0], yAxis[0], zAxis[0], + xAxis[1], yAxis[1], zAxis[1], + xAxis[2], yAxis[2], zAxis[2]); + + // now get constraint frame in local coordinate systems + m_frameInA = m_rbA.getCenterOfMassTransform().inverse() * frameInW; + m_frameInB = m_rbB.getCenterOfMassTransform().inverse() * frameInW; + + calculateTransforms(); +} + +void btGeneric6DofSpring2Constraint::setBounce(int index, btScalar bounce) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_bounce[index] = bounce; + else + m_angularLimits[index - 3].m_bounce = bounce; +} + +void btGeneric6DofSpring2Constraint::enableMotor(int index, bool onOff) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_enableMotor[index] = onOff; + else + m_angularLimits[index - 3].m_enableMotor = onOff; +} + +void btGeneric6DofSpring2Constraint::setServo(int index, bool onOff) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_servoMotor[index] = onOff; + else + m_angularLimits[index - 3].m_servoMotor = onOff; +} + +void btGeneric6DofSpring2Constraint::setTargetVelocity(int index, btScalar velocity) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_targetVelocity[index] = velocity; + else + m_angularLimits[index - 3].m_targetVelocity = velocity; +} + +void btGeneric6DofSpring2Constraint::setServoTarget(int index, btScalar target) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_servoTarget[index] = target; + else + m_angularLimits[index - 3].m_servoTarget = target; +} + +void btGeneric6DofSpring2Constraint::setMaxMotorForce(int index, btScalar force) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_maxMotorForce[index] = force; + else + m_angularLimits[index - 3].m_maxMotorForce = force; +} + +void btGeneric6DofSpring2Constraint::enableSpring(int index, bool onOff) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_enableSpring[index] = onOff; + else + m_angularLimits[index - 3] .m_enableSpring = onOff; +} + +void btGeneric6DofSpring2Constraint::setStiffness(int index, btScalar stiffness, bool limitIfNeeded) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) { + m_linearLimits.m_springStiffness[index] = stiffness; + m_linearLimits.m_springStiffnessLimited[index] = limitIfNeeded; + } else { + m_angularLimits[index - 3].m_springStiffness = stiffness; + m_angularLimits[index - 3].m_springStiffnessLimited = limitIfNeeded; + } +} + +void btGeneric6DofSpring2Constraint::setDamping(int index, btScalar damping, bool limitIfNeeded) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) { + m_linearLimits.m_springDamping[index] = damping; + m_linearLimits.m_springDampingLimited[index] = limitIfNeeded; + } else { + m_angularLimits[index - 3].m_springDamping = damping; + m_angularLimits[index - 3].m_springDampingLimited = limitIfNeeded; + } +} + +void btGeneric6DofSpring2Constraint::setEquilibriumPoint() +{ + calculateTransforms(); + int i; + for( i = 0; i < 3; i++) + m_linearLimits.m_equilibriumPoint[i] = m_calculatedLinearDiff[i]; + for(i = 0; i < 3; i++) + m_angularLimits[i].m_equilibriumPoint = m_calculatedAxisAngleDiff[i]; +} + +void btGeneric6DofSpring2Constraint::setEquilibriumPoint(int index) +{ + btAssert((index >= 0) && (index < 6)); + calculateTransforms(); + if (index<3) + m_linearLimits.m_equilibriumPoint[index] = m_calculatedLinearDiff[index]; + else + m_angularLimits[index - 3] .m_equilibriumPoint = m_calculatedAxisAngleDiff[index - 3]; +} + +void btGeneric6DofSpring2Constraint::setEquilibriumPoint(int index, btScalar val) +{ + btAssert((index >= 0) && (index < 6)); + if (index<3) + m_linearLimits.m_equilibriumPoint[index] = val; + else + m_angularLimits[index - 3] .m_equilibriumPoint = val; +} + + +//////////////////////////// btRotationalLimitMotor2 //////////////////////////////////// + +void btRotationalLimitMotor2::testLimitValue(btScalar test_value) +{ + //we can't normalize the angles here because we would lost the sign that we use later, but it doesn't seem to be a problem + if(m_loLimit > m_hiLimit) { + m_currentLimit = 0; + m_currentLimitError = btScalar(0.f); + } + else if(m_loLimit == m_hiLimit) { + m_currentLimitError = test_value - m_loLimit; + m_currentLimit = 3; + } else { + m_currentLimitError = test_value - m_loLimit; + m_currentLimitErrorHi = test_value - m_hiLimit; + m_currentLimit = 4; + } +} + +//////////////////////////// btTranslationalLimitMotor2 //////////////////////////////////// + +void btTranslationalLimitMotor2::testLimitValue(int limitIndex, btScalar test_value) +{ + btScalar loLimit = m_lowerLimit[limitIndex]; + btScalar hiLimit = m_upperLimit[limitIndex]; + if(loLimit > hiLimit) { + m_currentLimitError[limitIndex] = 0; + m_currentLimit[limitIndex] = 0; + } + else if(loLimit == hiLimit) { + m_currentLimitError[limitIndex] = test_value - loLimit; + m_currentLimit[limitIndex] = 3; + } else { + m_currentLimitError[limitIndex] = test_value - loLimit; + m_currentLimitErrorHi[limitIndex] = test_value - hiLimit; + m_currentLimit[limitIndex] = 4; + } +} + + diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h new file mode 100644 index 000000000..193e51e3b --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h @@ -0,0 +1,674 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +/* +2014 May: btGeneric6DofSpring2Constraint is created from the original (2.82.2712) btGeneric6DofConstraint by Gabor Puhr and Tamas Umenhoffer +Pros: +- Much more accurate and stable in a lot of situation. (Especially when a sleeping chain of RBs connected with 6dof2 is pulled) +- Stable and accurate spring with minimal energy loss that works with all of the solvers. (latter is not true for the original 6dof spring) +- Servo motor functionality +- Much more accurate bouncing. 0 really means zero bouncing (not true for the original 6odf) and there is only a minimal energy loss when the value is 1 (because of the solvers' precision) +- Rotation order for the Euler system can be set. (One axis' freedom is still limited to pi/2) + +Cons: +- It is slower than the original 6dof. There is no exact ratio, but half speed is a good estimation. +- At bouncing the correct velocity is calculated, but not the correct position. (it is because of the solver can correct position or velocity, but not both.) +*/ + +/// 2009 March: btGeneric6DofConstraint refactored by Roman Ponomarev +/// Added support for generic constraint solver through getInfo1/getInfo2 methods + +/* +2007-09-09 +btGeneric6DofConstraint Refactored by Francisco Le?n +email: projectileman@yahoo.com +http://gimpact.sf.net +*/ + + +#ifndef BT_GENERIC_6DOF_CONSTRAINT2_H +#define BT_GENERIC_6DOF_CONSTRAINT2_H + +#include "LinearMath/btVector3.h" +#include "btJacobianEntry.h" +#include "btTypedConstraint.h" + +class btRigidBody; + + +#ifdef BT_USE_DOUBLE_PRECISION +#define btGeneric6DofSpring2ConstraintData2 btGeneric6DofSpring2ConstraintDoubleData2 +#define btGeneric6DofSpring2ConstraintDataName "btGeneric6DofSpring2ConstraintDoubleData2" +#else +#define btGeneric6DofSpring2ConstraintData2 btGeneric6DofSpring2ConstraintData +#define btGeneric6DofSpring2ConstraintDataName "btGeneric6DofSpring2ConstraintData" +#endif //BT_USE_DOUBLE_PRECISION + +enum RotateOrder +{ + RO_XYZ=0, + RO_XZY, + RO_YXZ, + RO_YZX, + RO_ZXY, + RO_ZYX +}; + +class btRotationalLimitMotor2 +{ +public: +// upper < lower means free +// upper == lower means locked +// upper > lower means limited + btScalar m_loLimit; + btScalar m_hiLimit; + btScalar m_bounce; + btScalar m_stopERP; + btScalar m_stopCFM; + btScalar m_motorERP; + btScalar m_motorCFM; + bool m_enableMotor; + btScalar m_targetVelocity; + btScalar m_maxMotorForce; + bool m_servoMotor; + btScalar m_servoTarget; + bool m_enableSpring; + btScalar m_springStiffness; + bool m_springStiffnessLimited; + btScalar m_springDamping; + bool m_springDampingLimited; + btScalar m_equilibriumPoint; + + btScalar m_currentLimitError; + btScalar m_currentLimitErrorHi; + btScalar m_currentPosition; + int m_currentLimit; + + btRotationalLimitMotor2() + { + m_loLimit = 1.0f; + m_hiLimit = -1.0f; + m_bounce = 0.0f; + m_stopERP = 0.2f; + m_stopCFM = 0.f; + m_motorERP = 0.9f; + m_motorCFM = 0.f; + m_enableMotor = false; + m_targetVelocity = 0; + m_maxMotorForce = 0.1f; + m_servoMotor = false; + m_servoTarget = 0; + m_enableSpring = false; + m_springStiffness = 0; + m_springStiffnessLimited = false; + m_springDamping = 0; + m_springDampingLimited = false; + m_equilibriumPoint = 0; + + m_currentLimitError = 0; + m_currentLimitErrorHi = 0; + m_currentPosition = 0; + m_currentLimit = 0; + } + + btRotationalLimitMotor2(const btRotationalLimitMotor2 & limot) + { + m_loLimit = limot.m_loLimit; + m_hiLimit = limot.m_hiLimit; + m_bounce = limot.m_bounce; + m_stopERP = limot.m_stopERP; + m_stopCFM = limot.m_stopCFM; + m_motorERP = limot.m_motorERP; + m_motorCFM = limot.m_motorCFM; + m_enableMotor = limot.m_enableMotor; + m_targetVelocity = limot.m_targetVelocity; + m_maxMotorForce = limot.m_maxMotorForce; + m_servoMotor = limot.m_servoMotor; + m_servoTarget = limot.m_servoTarget; + m_enableSpring = limot.m_enableSpring; + m_springStiffness = limot.m_springStiffness; + m_springStiffnessLimited = limot.m_springStiffnessLimited; + m_springDamping = limot.m_springDamping; + m_springDampingLimited = limot.m_springDampingLimited; + m_equilibriumPoint = limot.m_equilibriumPoint; + + m_currentLimitError = limot.m_currentLimitError; + m_currentLimitErrorHi = limot.m_currentLimitErrorHi; + m_currentPosition = limot.m_currentPosition; + m_currentLimit = limot.m_currentLimit; + } + + + bool isLimited() + { + if(m_loLimit > m_hiLimit) return false; + return true; + } + + void testLimitValue(btScalar test_value); +}; + + + +class btTranslationalLimitMotor2 +{ +public: +// upper < lower means free +// upper == lower means locked +// upper > lower means limited + btVector3 m_lowerLimit; + btVector3 m_upperLimit; + btVector3 m_bounce; + btVector3 m_stopERP; + btVector3 m_stopCFM; + btVector3 m_motorERP; + btVector3 m_motorCFM; + bool m_enableMotor[3]; + bool m_servoMotor[3]; + bool m_enableSpring[3]; + btVector3 m_servoTarget; + btVector3 m_springStiffness; + bool m_springStiffnessLimited[3]; + btVector3 m_springDamping; + bool m_springDampingLimited[3]; + btVector3 m_equilibriumPoint; + btVector3 m_targetVelocity; + btVector3 m_maxMotorForce; + + btVector3 m_currentLimitError; + btVector3 m_currentLimitErrorHi; + btVector3 m_currentLinearDiff; + int m_currentLimit[3]; + + btTranslationalLimitMotor2() + { + m_lowerLimit .setValue(0.f , 0.f , 0.f ); + m_upperLimit .setValue(0.f , 0.f , 0.f ); + m_bounce .setValue(0.f , 0.f , 0.f ); + m_stopERP .setValue(0.2f, 0.2f, 0.2f); + m_stopCFM .setValue(0.f , 0.f , 0.f ); + m_motorERP .setValue(0.9f, 0.9f, 0.9f); + m_motorCFM .setValue(0.f , 0.f , 0.f ); + + m_currentLimitError .setValue(0.f , 0.f , 0.f ); + m_currentLimitErrorHi.setValue(0.f , 0.f , 0.f ); + m_currentLinearDiff .setValue(0.f , 0.f , 0.f ); + + for(int i=0; i < 3; i++) + { + m_enableMotor[i] = false; + m_servoMotor[i] = false; + m_enableSpring[i] = false; + m_servoTarget[i] = btScalar(0.f); + m_springStiffness[i] = btScalar(0.f); + m_springStiffnessLimited[i] = false; + m_springDamping[i] = btScalar(0.f); + m_springDampingLimited[i] = false; + m_equilibriumPoint[i] = btScalar(0.f); + m_targetVelocity[i] = btScalar(0.f); + m_maxMotorForce[i] = btScalar(0.f); + + m_currentLimit[i] = 0; + } + } + + btTranslationalLimitMotor2(const btTranslationalLimitMotor2 & other ) + { + m_lowerLimit = other.m_lowerLimit; + m_upperLimit = other.m_upperLimit; + m_bounce = other.m_bounce; + m_stopERP = other.m_stopERP; + m_stopCFM = other.m_stopCFM; + m_motorERP = other.m_motorERP; + m_motorCFM = other.m_motorCFM; + + m_currentLimitError = other.m_currentLimitError; + m_currentLimitErrorHi = other.m_currentLimitErrorHi; + m_currentLinearDiff = other.m_currentLinearDiff; + + for(int i=0; i < 3; i++) + { + m_enableMotor[i] = other.m_enableMotor[i]; + m_servoMotor[i] = other.m_servoMotor[i]; + m_enableSpring[i] = other.m_enableSpring[i]; + m_servoTarget[i] = other.m_servoTarget[i]; + m_springStiffness[i] = other.m_springStiffness[i]; + m_springStiffnessLimited[i] = other.m_springStiffnessLimited[i]; + m_springDamping[i] = other.m_springDamping[i]; + m_springDampingLimited[i] = other.m_springDampingLimited[i]; + m_equilibriumPoint[i] = other.m_equilibriumPoint[i]; + m_targetVelocity[i] = other.m_targetVelocity[i]; + m_maxMotorForce[i] = other.m_maxMotorForce[i]; + + m_currentLimit[i] = other.m_currentLimit[i]; + } + } + + inline bool isLimited(int limitIndex) + { + return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]); + } + + void testLimitValue(int limitIndex, btScalar test_value); +}; + +enum bt6DofFlags2 +{ + BT_6DOF_FLAGS_CFM_STOP2 = 1, + BT_6DOF_FLAGS_ERP_STOP2 = 2, + BT_6DOF_FLAGS_CFM_MOTO2 = 4, + BT_6DOF_FLAGS_ERP_MOTO2 = 8 +}; +#define BT_6DOF_FLAGS_AXIS_SHIFT2 4 // bits per axis + + +ATTRIBUTE_ALIGNED16(class) btGeneric6DofSpring2Constraint : public btTypedConstraint +{ +protected: + + btTransform m_frameInA; + btTransform m_frameInB; + + btJacobianEntry m_jacLinear[3]; + btJacobianEntry m_jacAng[3]; + + btTranslationalLimitMotor2 m_linearLimits; + btRotationalLimitMotor2 m_angularLimits[3]; + + RotateOrder m_rotateOrder; + +protected: + + btTransform m_calculatedTransformA; + btTransform m_calculatedTransformB; + btVector3 m_calculatedAxisAngleDiff; + btVector3 m_calculatedAxis[3]; + btVector3 m_calculatedLinearDiff; + btScalar m_factA; + btScalar m_factB; + bool m_hasStaticBody; + int m_flags; + + btGeneric6DofSpring2Constraint& operator=(btGeneric6DofSpring2Constraint&) + { + btAssert(0); + return *this; + } + + int setAngularLimits(btConstraintInfo2 *info, int row_offset,const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB); + int setLinearLimits(btConstraintInfo2 *info, int row, const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB); + + void calculateLinearInfo(); + void calculateAngleInfo(); + void testAngularLimitMotor(int axis_index); + + void calculateJacobi(btRotationalLimitMotor2* limot, const btTransform& transA,const btTransform& transB, btConstraintInfo2* info, int srow, btVector3& ax1, int rotational, int rotAllowed); + int get_limit_motor_info2(btRotationalLimitMotor2* limot, + const btTransform& transA,const btTransform& transB,const btVector3& linVelA,const btVector3& linVelB,const btVector3& angVelA,const btVector3& angVelB, + btConstraintInfo2* info, int row, btVector3& ax1, int rotational, int rotAllowed = false); + +public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + + btGeneric6DofSpring2Constraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, RotateOrder rotOrder = RO_XYZ); + btGeneric6DofSpring2Constraint(btRigidBody& rbB, const btTransform& frameInB, RotateOrder rotOrder = RO_XYZ); + + virtual void buildJacobian() {} + virtual void getInfo1 (btConstraintInfo1* info); + virtual void getInfo2 (btConstraintInfo2* info); + virtual int calculateSerializeBufferSize() const; + virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const; + + btRotationalLimitMotor2* getRotationalLimitMotor(int index) { return &m_angularLimits[index]; } + btTranslationalLimitMotor2* getTranslationalLimitMotor() { return &m_linearLimits; } + + // Calculates the global transform for the joint offset for body A an B, and also calculates the angle differences between the bodies. + void calculateTransforms(const btTransform& transA,const btTransform& transB); + void calculateTransforms(); + + // Gets the global transform of the offset for body A + const btTransform & getCalculatedTransformA() const { return m_calculatedTransformA; } + // Gets the global transform of the offset for body B + const btTransform & getCalculatedTransformB() const { return m_calculatedTransformB; } + + const btTransform & getFrameOffsetA() const { return m_frameInA; } + const btTransform & getFrameOffsetB() const { return m_frameInB; } + + btTransform & getFrameOffsetA() { return m_frameInA; } + btTransform & getFrameOffsetB() { return m_frameInB; } + + // Get the rotation axis in global coordinates ( btGeneric6DofSpring2Constraint::calculateTransforms() must be called previously ) + btVector3 getAxis(int axis_index) const { return m_calculatedAxis[axis_index]; } + + // Get the relative Euler angle ( btGeneric6DofSpring2Constraint::calculateTransforms() must be called previously ) + btScalar getAngle(int axis_index) const { return m_calculatedAxisAngleDiff[axis_index]; } + + // Get the relative position of the constraint pivot ( btGeneric6DofSpring2Constraint::calculateTransforms() must be called previously ) + btScalar getRelativePivotPosition(int axis_index) const { return m_calculatedLinearDiff[axis_index]; } + + void setFrames(const btTransform & frameA, const btTransform & frameB); + + void setLinearLowerLimit(const btVector3& linearLower) { m_linearLimits.m_lowerLimit = linearLower; } + void getLinearLowerLimit(btVector3& linearLower) { linearLower = m_linearLimits.m_lowerLimit; } + void setLinearUpperLimit(const btVector3& linearUpper) { m_linearLimits.m_upperLimit = linearUpper; } + void getLinearUpperLimit(btVector3& linearUpper) { linearUpper = m_linearLimits.m_upperLimit; } + + void setAngularLowerLimit(const btVector3& angularLower) + { + for(int i = 0; i < 3; i++) + m_angularLimits[i].m_loLimit = btNormalizeAngle(angularLower[i]); + } + + void setAngularLowerLimitReversed(const btVector3& angularLower) + { + for(int i = 0; i < 3; i++) + m_angularLimits[i].m_hiLimit = btNormalizeAngle(-angularLower[i]); + } + + void getAngularLowerLimit(btVector3& angularLower) + { + for(int i = 0; i < 3; i++) + angularLower[i] = m_angularLimits[i].m_loLimit; + } + + void getAngularLowerLimitReversed(btVector3& angularLower) + { + for(int i = 0; i < 3; i++) + angularLower[i] = -m_angularLimits[i].m_hiLimit; + } + + void setAngularUpperLimit(const btVector3& angularUpper) + { + for(int i = 0; i < 3; i++) + m_angularLimits[i].m_hiLimit = btNormalizeAngle(angularUpper[i]); + } + + void setAngularUpperLimitReversed(const btVector3& angularUpper) + { + for(int i = 0; i < 3; i++) + m_angularLimits[i].m_loLimit = btNormalizeAngle(-angularUpper[i]); + } + + void getAngularUpperLimit(btVector3& angularUpper) + { + for(int i = 0; i < 3; i++) + angularUpper[i] = m_angularLimits[i].m_hiLimit; + } + + void getAngularUpperLimitReversed(btVector3& angularUpper) + { + for(int i = 0; i < 3; i++) + angularUpper[i] = -m_angularLimits[i].m_loLimit; + } + + //first 3 are linear, next 3 are angular + + void setLimit(int axis, btScalar lo, btScalar hi) + { + if(axis<3) + { + m_linearLimits.m_lowerLimit[axis] = lo; + m_linearLimits.m_upperLimit[axis] = hi; + } + else + { + lo = btNormalizeAngle(lo); + hi = btNormalizeAngle(hi); + m_angularLimits[axis-3].m_loLimit = lo; + m_angularLimits[axis-3].m_hiLimit = hi; + } + } + + void setLimitReversed(int axis, btScalar lo, btScalar hi) + { + if(axis<3) + { + m_linearLimits.m_lowerLimit[axis] = lo; + m_linearLimits.m_upperLimit[axis] = hi; + } + else + { + lo = btNormalizeAngle(lo); + hi = btNormalizeAngle(hi); + m_angularLimits[axis-3].m_hiLimit = -lo; + m_angularLimits[axis-3].m_loLimit = -hi; + } + } + + bool isLimited(int limitIndex) + { + if(limitIndex<3) + { + return m_linearLimits.isLimited(limitIndex); + } + return m_angularLimits[limitIndex-3].isLimited(); + } + + void setRotationOrder(RotateOrder order) { m_rotateOrder = order; } + RotateOrder getRotationOrder() { return m_rotateOrder; } + + void setAxis( const btVector3& axis1, const btVector3& axis2); + + void setBounce(int index, btScalar bounce); + + void enableMotor(int index, bool onOff); + void setServo(int index, bool onOff); // set the type of the motor (servo or not) (the motor has to be turned on for servo also) + void setTargetVelocity(int index, btScalar velocity); + void setServoTarget(int index, btScalar target); + void setMaxMotorForce(int index, btScalar force); + + void enableSpring(int index, bool onOff); + void setStiffness(int index, btScalar stiffness, bool limitIfNeeded = true); // if limitIfNeeded is true the system will automatically limit the stiffness in necessary situations where otherwise the spring would move unrealistically too widely + void setDamping(int index, btScalar damping, bool limitIfNeeded = true); // if limitIfNeeded is true the system will automatically limit the damping in necessary situations where otherwise the spring would blow up + void setEquilibriumPoint(); // set the current constraint position/orientation as an equilibrium point for all DOF + void setEquilibriumPoint(int index); // set the current constraint position/orientation as an equilibrium point for given DOF + void setEquilibriumPoint(int index, btScalar val); + + //override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5). + //If no axis is provided, it uses the default axis for this constraint. + virtual void setParam(int num, btScalar value, int axis = -1); + virtual btScalar getParam(int num, int axis = -1) const; + + static btScalar btGetMatrixElem(const btMatrix3x3& mat, int index); + static bool matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz); + static bool matrixToEulerXZY(const btMatrix3x3& mat,btVector3& xyz); + static bool matrixToEulerYXZ(const btMatrix3x3& mat,btVector3& xyz); + static bool matrixToEulerYZX(const btMatrix3x3& mat,btVector3& xyz); + static bool matrixToEulerZXY(const btMatrix3x3& mat,btVector3& xyz); + static bool matrixToEulerZYX(const btMatrix3x3& mat,btVector3& xyz); +}; + + +struct btGeneric6DofSpring2ConstraintData +{ + btTypedConstraintData m_typeConstraintData; + btTransformFloatData m_rbAFrame; + btTransformFloatData m_rbBFrame; + + btVector3FloatData m_linearUpperLimit; + btVector3FloatData m_linearLowerLimit; + btVector3FloatData m_linearBounce; + btVector3FloatData m_linearStopERP; + btVector3FloatData m_linearStopCFM; + btVector3FloatData m_linearMotorERP; + btVector3FloatData m_linearMotorCFM; + btVector3FloatData m_linearTargetVelocity; + btVector3FloatData m_linearMaxMotorForce; + btVector3FloatData m_linearServoTarget; + btVector3FloatData m_linearSpringStiffness; + btVector3FloatData m_linearSpringDamping; + btVector3FloatData m_linearEquilibriumPoint; + char m_linearEnableMotor[4]; + char m_linearServoMotor[4]; + char m_linearEnableSpring[4]; + char m_linearSpringStiffnessLimited[4]; + char m_linearSpringDampingLimited[4]; + char m_padding1[4]; + + btVector3FloatData m_angularUpperLimit; + btVector3FloatData m_angularLowerLimit; + btVector3FloatData m_angularBounce; + btVector3FloatData m_angularStopERP; + btVector3FloatData m_angularStopCFM; + btVector3FloatData m_angularMotorERP; + btVector3FloatData m_angularMotorCFM; + btVector3FloatData m_angularTargetVelocity; + btVector3FloatData m_angularMaxMotorForce; + btVector3FloatData m_angularServoTarget; + btVector3FloatData m_angularSpringStiffness; + btVector3FloatData m_angularSpringDamping; + btVector3FloatData m_angularEquilibriumPoint; + char m_angularEnableMotor[4]; + char m_angularServoMotor[4]; + char m_angularEnableSpring[4]; + char m_angularSpringStiffnessLimited[4]; + char m_angularSpringDampingLimited[4]; + + int m_rotateOrder; +}; + +struct btGeneric6DofSpring2ConstraintDoubleData2 +{ + btTypedConstraintDoubleData m_typeConstraintData; + btTransformDoubleData m_rbAFrame; + btTransformDoubleData m_rbBFrame; + + btVector3DoubleData m_linearUpperLimit; + btVector3DoubleData m_linearLowerLimit; + btVector3DoubleData m_linearBounce; + btVector3DoubleData m_linearStopERP; + btVector3DoubleData m_linearStopCFM; + btVector3DoubleData m_linearMotorERP; + btVector3DoubleData m_linearMotorCFM; + btVector3DoubleData m_linearTargetVelocity; + btVector3DoubleData m_linearMaxMotorForce; + btVector3DoubleData m_linearServoTarget; + btVector3DoubleData m_linearSpringStiffness; + btVector3DoubleData m_linearSpringDamping; + btVector3DoubleData m_linearEquilibriumPoint; + char m_linearEnableMotor[4]; + char m_linearServoMotor[4]; + char m_linearEnableSpring[4]; + char m_linearSpringStiffnessLimited[4]; + char m_linearSpringDampingLimited[4]; + char m_padding1[4]; + + btVector3DoubleData m_angularUpperLimit; + btVector3DoubleData m_angularLowerLimit; + btVector3DoubleData m_angularBounce; + btVector3DoubleData m_angularStopERP; + btVector3DoubleData m_angularStopCFM; + btVector3DoubleData m_angularMotorERP; + btVector3DoubleData m_angularMotorCFM; + btVector3DoubleData m_angularTargetVelocity; + btVector3DoubleData m_angularMaxMotorForce; + btVector3DoubleData m_angularServoTarget; + btVector3DoubleData m_angularSpringStiffness; + btVector3DoubleData m_angularSpringDamping; + btVector3DoubleData m_angularEquilibriumPoint; + char m_angularEnableMotor[4]; + char m_angularServoMotor[4]; + char m_angularEnableSpring[4]; + char m_angularSpringStiffnessLimited[4]; + char m_angularSpringDampingLimited[4]; + + int m_rotateOrder; +}; + +SIMD_FORCE_INLINE int btGeneric6DofSpring2Constraint::calculateSerializeBufferSize() const +{ + return sizeof(btGeneric6DofSpring2ConstraintData2); +} + +SIMD_FORCE_INLINE const char* btGeneric6DofSpring2Constraint::serialize(void* dataBuffer, btSerializer* serializer) const +{ + btGeneric6DofSpring2ConstraintData2* dof = (btGeneric6DofSpring2ConstraintData2*)dataBuffer; + btTypedConstraint::serialize(&dof->m_typeConstraintData,serializer); + + m_frameInA.serialize(dof->m_rbAFrame); + m_frameInB.serialize(dof->m_rbBFrame); + + int i; + for (i=0;i<3;i++) + { + dof->m_angularLowerLimit.m_floats[i] = m_angularLimits[i].m_loLimit; + dof->m_angularUpperLimit.m_floats[i] = m_angularLimits[i].m_hiLimit; + dof->m_angularBounce.m_floats[i] = m_angularLimits[i].m_bounce; + dof->m_angularStopERP.m_floats[i] = m_angularLimits[i].m_stopERP; + dof->m_angularStopCFM.m_floats[i] = m_angularLimits[i].m_stopCFM; + dof->m_angularMotorERP.m_floats[i] = m_angularLimits[i].m_motorERP; + dof->m_angularMotorCFM.m_floats[i] = m_angularLimits[i].m_motorCFM; + dof->m_angularTargetVelocity.m_floats[i] = m_angularLimits[i].m_targetVelocity; + dof->m_angularMaxMotorForce.m_floats[i] = m_angularLimits[i].m_maxMotorForce; + dof->m_angularServoTarget.m_floats[i] = m_angularLimits[i].m_servoTarget; + dof->m_angularSpringStiffness.m_floats[i] = m_angularLimits[i].m_springStiffness; + dof->m_angularSpringDamping.m_floats[i] = m_angularLimits[i].m_springDamping; + dof->m_angularEquilibriumPoint.m_floats[i] = m_angularLimits[i].m_equilibriumPoint; + } + dof->m_angularLowerLimit.m_floats[3] = 0; + dof->m_angularUpperLimit.m_floats[3] = 0; + dof->m_angularBounce.m_floats[3] = 0; + dof->m_angularStopERP.m_floats[3] = 0; + dof->m_angularStopCFM.m_floats[3] = 0; + dof->m_angularMotorERP.m_floats[3] = 0; + dof->m_angularMotorCFM.m_floats[3] = 0; + dof->m_angularTargetVelocity.m_floats[3] = 0; + dof->m_angularMaxMotorForce.m_floats[3] = 0; + dof->m_angularServoTarget.m_floats[3] = 0; + dof->m_angularSpringStiffness.m_floats[3] = 0; + dof->m_angularSpringDamping.m_floats[3] = 0; + dof->m_angularEquilibriumPoint.m_floats[3] = 0; + for (i=0;i<4;i++) + { + dof->m_angularEnableMotor[i] = i < 3 ? ( m_angularLimits[i].m_enableMotor ? 1 : 0 ) : 0; + dof->m_angularServoMotor[i] = i < 3 ? ( m_angularLimits[i].m_servoMotor ? 1 : 0 ) : 0; + dof->m_angularEnableSpring[i] = i < 3 ? ( m_angularLimits[i].m_enableSpring ? 1 : 0 ) : 0; + dof->m_angularSpringStiffnessLimited[i] = i < 3 ? ( m_angularLimits[i].m_springStiffnessLimited ? 1 : 0 ) : 0; + dof->m_angularSpringDampingLimited[i] = i < 3 ? ( m_angularLimits[i].m_springDampingLimited ? 1 : 0 ) : 0; + } + + m_linearLimits.m_lowerLimit.serialize( dof->m_linearLowerLimit ); + m_linearLimits.m_upperLimit.serialize( dof->m_linearUpperLimit ); + m_linearLimits.m_bounce.serialize( dof->m_linearBounce ); + m_linearLimits.m_stopERP.serialize( dof->m_linearStopERP ); + m_linearLimits.m_stopCFM.serialize( dof->m_linearStopCFM ); + m_linearLimits.m_motorERP.serialize( dof->m_linearMotorERP ); + m_linearLimits.m_motorCFM.serialize( dof->m_linearMotorCFM ); + m_linearLimits.m_targetVelocity.serialize( dof->m_linearTargetVelocity ); + m_linearLimits.m_maxMotorForce.serialize( dof->m_linearMaxMotorForce ); + m_linearLimits.m_servoTarget.serialize( dof->m_linearServoTarget ); + m_linearLimits.m_springStiffness.serialize( dof->m_linearSpringStiffness ); + m_linearLimits.m_springDamping.serialize( dof->m_linearSpringDamping ); + m_linearLimits.m_equilibriumPoint.serialize( dof->m_linearEquilibriumPoint ); + for (i=0;i<4;i++) + { + dof->m_linearEnableMotor[i] = i < 3 ? ( m_linearLimits.m_enableMotor[i] ? 1 : 0 ) : 0; + dof->m_linearServoMotor[i] = i < 3 ? ( m_linearLimits.m_servoMotor[i] ? 1 : 0 ) : 0; + dof->m_linearEnableSpring[i] = i < 3 ? ( m_linearLimits.m_enableSpring[i] ? 1 : 0 ) : 0; + dof->m_linearSpringStiffnessLimited[i] = i < 3 ? ( m_linearLimits.m_springStiffnessLimited[i] ? 1 : 0 ) : 0; + dof->m_linearSpringDampingLimited[i] = i < 3 ? ( m_linearLimits.m_springDampingLimited[i] ? 1 : 0 ) : 0; + } + + dof->m_rotateOrder = m_rotateOrder; + + return btGeneric6DofSpring2ConstraintDataName; +} + + + + + +#endif //BT_GENERIC_6DOF_CONSTRAINT_H diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h index 1b2e0f62c..dac59c688 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h @@ -63,6 +63,26 @@ public: void setEquilibriumPoint(int index); // set the current constraint position/orientation as an equilibrium point for given DOF void setEquilibriumPoint(int index, btScalar val); + bool isSpringEnabled(int index) const + { + return m_springEnabled[index]; + } + + btScalar getStiffness(int index) const + { + return m_springStiffness[index]; + } + + btScalar getDamping(int index) const + { + return m_springDamping[index]; + } + + btScalar getEquilibriumPoint(int index) const + { + return m_equilibriumPoint[index]; + } + virtual void setAxis( const btVector3& axis1, const btVector3& axis2); virtual void getInfo2 (btConstraintInfo2* info); diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp index 29123d526..4be2aabe4 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp @@ -25,7 +25,7 @@ subject to the following restrictions: // anchor, axis1 and axis2 are in world coordinate system // axis1 must be orthogonal to axis2 btHinge2Constraint::btHinge2Constraint(btRigidBody& rbA, btRigidBody& rbB, btVector3& anchor, btVector3& axis1, btVector3& axis2) -: btGeneric6DofSpringConstraint(rbA, rbB, btTransform::getIdentity(), btTransform::getIdentity(), true), +: btGeneric6DofSpring2Constraint(rbA, rbB, btTransform::getIdentity(), btTransform::getIdentity(),RO_XYZ), m_anchor(anchor), m_axis1(axis1), m_axis2(axis2) @@ -59,7 +59,7 @@ btHinge2Constraint::btHinge2Constraint(btRigidBody& rbA, btRigidBody& rbB, btVec setAngularUpperLimit(btVector3(-1.f, 0.f, SIMD_HALF_PI * 0.5f)); // enable suspension enableSpring(2, true); - setStiffness(2, SIMD_PI * SIMD_PI * 4.f); // period 1 sec for 1 kilogramm weel :-) + setStiffness(2, SIMD_PI * SIMD_PI * 4.f); setDamping(2, 0.01f); setEquilibriumPoint(); } diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h index 9a0049869..06a8e3ecd 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h @@ -20,7 +20,7 @@ subject to the following restrictions: #include "LinearMath/btVector3.h" #include "btTypedConstraint.h" -#include "btGeneric6DofSpringConstraint.h" +#include "btGeneric6DofSpring2Constraint.h" @@ -29,7 +29,7 @@ subject to the following restrictions: // 2 rotational degrees of freedom, similar to Euler rotations around Z (axis 1) and X (axis 2) // 1 translational (along axis Z) with suspension spring -ATTRIBUTE_ALIGNED16(class) btHinge2Constraint : public btGeneric6DofSpringConstraint +ATTRIBUTE_ALIGNED16(class) btHinge2Constraint : public btGeneric6DofSpring2Constraint { protected: btVector3 m_anchor; diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp index c18974130..76a150947 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp @@ -45,7 +45,11 @@ btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const bt m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER), m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET), m_useReferenceFrameA(useReferenceFrameA), - m_flags(0) + m_flags(0), + m_normalCFM(0), + m_normalERP(0), + m_stopCFM(0), + m_stopERP(0) { m_rbAFrame.getOrigin() = pivotInA; @@ -101,7 +105,11 @@ m_angularOnly(false), m_enableAngularMotor(false), m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER), m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET), m_useReferenceFrameA(useReferenceFrameA), -m_flags(0) +m_flags(0), +m_normalCFM(0), +m_normalERP(0), +m_stopCFM(0), +m_stopERP(0) { // since no frame is given, assume this to be zero angle and just pick rb transform axis @@ -151,7 +159,11 @@ m_enableAngularMotor(false), m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER), m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET), m_useReferenceFrameA(useReferenceFrameA), -m_flags(0) +m_flags(0), +m_normalCFM(0), +m_normalERP(0), +m_stopCFM(0), +m_stopERP(0) { #ifndef _BT_USE_CENTER_LIMIT_ //start with free @@ -177,7 +189,11 @@ m_enableAngularMotor(false), m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER), m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET), m_useReferenceFrameA(useReferenceFrameA), -m_flags(0) +m_flags(0), +m_normalCFM(0), +m_normalERP(0), +m_stopCFM(0), +m_stopERP(0) { ///not providing rigidbody B means implicitly using worldspace for body B @@ -285,8 +301,60 @@ void btHingeConstraint::buildJacobian() #endif //__SPU__ +static inline btScalar btNormalizeAnglePositive(btScalar angle) +{ + return btFmod(btFmod(angle, btScalar(2.0*SIMD_PI)) + btScalar(2.0*SIMD_PI), btScalar(2.0*SIMD_PI)); +} + + + +static btScalar btShortestAngularDistance(btScalar accAngle, btScalar curAngle) +{ + btScalar result = btNormalizeAngle(btNormalizeAnglePositive(btNormalizeAnglePositive(curAngle) - + btNormalizeAnglePositive(accAngle))); + return result; +} + +static btScalar btShortestAngleUpdate(btScalar accAngle, btScalar curAngle) +{ + btScalar tol(0.3); + btScalar result = btShortestAngularDistance(accAngle, curAngle); + + if (btFabs(result) > tol) + return curAngle; + else + return accAngle + result; + + return curAngle; +} + + +btScalar btHingeAccumulatedAngleConstraint::getAccumulatedHingeAngle() +{ + btScalar hingeAngle = getHingeAngle(); + m_accumulatedAngle = btShortestAngleUpdate(m_accumulatedAngle,hingeAngle); + return m_accumulatedAngle; +} +void btHingeAccumulatedAngleConstraint::setAccumulatedHingeAngle(btScalar accAngle) +{ + m_accumulatedAngle = accAngle; +} + +void btHingeAccumulatedAngleConstraint::getInfo1(btConstraintInfo1* info) +{ + //update m_accumulatedAngle + btScalar curHingeAngle = getHingeAngle(); + m_accumulatedAngle = btShortestAngleUpdate(m_accumulatedAngle,curHingeAngle); + + btHingeConstraint::getInfo1(info); + +} + + void btHingeConstraint::getInfo1(btConstraintInfo1* info) { + + if (m_useSolveConstraintObsolete) { info->m_numConstraintRows = 0; @@ -413,7 +481,9 @@ void btHingeConstraint::getInfo2Internal(btConstraintInfo2* info, const btTransf a2.getSkewSymmetricMatrix(angular0,angular1,angular2); } // linear RHS - btScalar k = info->fps * info->erp; + btScalar normalErp = (m_flags & BT_HINGE_FLAGS_ERP_NORM) ? m_normalERP : info->erp; + + btScalar k = info->fps * normalErp; if (!m_angularOnly) { for(i = 0; i < 3; i++) @@ -510,7 +580,7 @@ void btHingeConstraint::getInfo2Internal(btConstraintInfo2* info, const btTransf powered = 0; } info->m_constraintError[srow] = btScalar(0.0f); - btScalar currERP = (m_flags & BT_HINGE_FLAGS_ERP_STOP) ? m_stopERP : info->erp; + btScalar currERP = (m_flags & BT_HINGE_FLAGS_ERP_STOP) ? m_stopERP : normalErp; if(powered) { if(m_flags & BT_HINGE_FLAGS_CFM_NORM) @@ -606,6 +676,8 @@ void btHingeConstraint::updateRHS(btScalar timeStep) } + + btScalar btHingeConstraint::getHingeAngle() { return getHingeAngle(m_rbA.getCenterOfMassTransform(),m_rbB.getCenterOfMassTransform()); @@ -798,7 +870,8 @@ void btHingeConstraint::getInfo2InternalUsingFrameOffset(btConstraintInfo2* info for (i=0; i<3; i++) info->m_J1angularAxis[s2+i] = tmpA[i]; for (i=0; i<3; i++) info->m_J2angularAxis[s2+i] = -tmpB[i]; - btScalar k = info->fps * info->erp; + btScalar normalErp = (m_flags & BT_HINGE_FLAGS_ERP_NORM)? m_normalERP : info->erp; + btScalar k = info->fps * normalErp; if (!m_angularOnly) { @@ -856,7 +929,8 @@ void btHingeConstraint::getInfo2InternalUsingFrameOffset(btConstraintInfo2* info // angular_velocity = (erp*fps) * (ax1 x ax2) // ax1 x ax2 is in the plane space of ax1, so we project the angular // velocity to p and q to find the right hand side. - k = info->fps * info->erp; + k = info->fps * normalErp;//?? + btVector3 u = ax1A.cross(ax1B); info->m_constraintError[s3] = k * u.dot(p); info->m_constraintError[s4] = k * u.dot(q); @@ -901,7 +975,7 @@ void btHingeConstraint::getInfo2InternalUsingFrameOffset(btConstraintInfo2* info powered = 0; } info->m_constraintError[srow] = btScalar(0.0f); - btScalar currERP = (m_flags & BT_HINGE_FLAGS_ERP_STOP) ? m_stopERP : info->erp; + btScalar currERP = (m_flags & BT_HINGE_FLAGS_ERP_STOP) ? m_stopERP : normalErp; if(powered) { if(m_flags & BT_HINGE_FLAGS_CFM_NORM) @@ -1002,6 +1076,10 @@ void btHingeConstraint::setParam(int num, btScalar value, int axis) m_normalCFM = value; m_flags |= BT_HINGE_FLAGS_CFM_NORM; break; + case BT_CONSTRAINT_ERP: + m_normalERP = value; + m_flags |= BT_HINGE_FLAGS_ERP_NORM; + break; default : btAssertConstrParams(0); } @@ -1032,6 +1110,10 @@ btScalar btHingeConstraint::getParam(int num, int axis) const btAssertConstrParams(m_flags & BT_HINGE_FLAGS_CFM_NORM); retVal = m_normalCFM; break; + case BT_CONSTRAINT_ERP: + btAssertConstrParams(m_flags & BT_HINGE_FLAGS_ERP_NORM); + retVal = m_normalERP; + break; default : btAssertConstrParams(0); } diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h index 7c33ac24e..f26e72105 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h @@ -41,7 +41,8 @@ enum btHingeFlags { BT_HINGE_FLAGS_CFM_STOP = 1, BT_HINGE_FLAGS_ERP_STOP = 2, - BT_HINGE_FLAGS_CFM_NORM = 4 + BT_HINGE_FLAGS_CFM_NORM = 4, + BT_HINGE_FLAGS_ERP_NORM = 8 }; @@ -94,6 +95,7 @@ public: int m_flags; btScalar m_normalCFM; + btScalar m_normalERP; btScalar m_stopCFM; btScalar m_stopERP; @@ -175,6 +177,7 @@ public: // maintain a given angular target. void enableMotor(bool enableMotor) { m_enableAngularMotor = enableMotor; } void setMaxMotorImpulse(btScalar maxMotorImpulse) { m_maxMotorImpulse = maxMotorImpulse; } + void setMotorTargetVelocity(btScalar motorTargetVelocity) { m_motorTargetVelocity = motorTargetVelocity; } void setMotorTarget(const btQuaternion& qAinB, btScalar dt); // qAinB is rotation of body A wrt body B. void setMotorTarget(btScalar targetAngle, btScalar dt); @@ -191,6 +194,33 @@ public: m_relaxationFactor = _relaxationFactor; #endif } + + btScalar getLimitSoftness() const + { +#ifdef _BT_USE_CENTER_LIMIT_ + return m_limit.getSoftness(); +#else + return m_limitSoftness; +#endif + } + + btScalar getLimitBiasFactor() const + { +#ifdef _BT_USE_CENTER_LIMIT_ + return m_limit.getBiasFactor(); +#else + return m_biasFactor; +#endif + } + + btScalar getLimitRelaxationFactor() const + { +#ifdef _BT_USE_CENTER_LIMIT_ + return m_limit.getRelaxationFactor(); +#else + return m_relaxationFactor; +#endif + } void setAxis(btVector3& axisInA) { @@ -217,6 +247,14 @@ public: } + bool hasLimit() const { +#ifdef _BT_USE_CENTER_LIMIT_ + return m_limit.getHalfRange() > 0; +#else + return m_lowerLimit <= m_upperLimit; +#endif + } + btScalar getLowerLimit() const { #ifdef _BT_USE_CENTER_LIMIT_ @@ -236,6 +274,7 @@ public: } + ///The getHingeAngle gives the hinge angle in range [-PI,PI] btScalar getHingeAngle(); btScalar getHingeAngle(const btTransform& transA,const btTransform& transB); @@ -286,13 +325,20 @@ public: // access for UseFrameOffset bool getUseFrameOffset() { return m_useOffsetForConstraintFrame; } void setUseFrameOffset(bool frameOffsetOnOff) { m_useOffsetForConstraintFrame = frameOffsetOnOff; } - + // access for UseReferenceFrameA + bool getUseReferenceFrameA() const { return m_useReferenceFrameA; } + void setUseReferenceFrameA(bool useReferenceFrameA) { m_useReferenceFrameA = useReferenceFrameA; } ///override the default global value of a parameter (such as ERP or CFM), optionally provide the axis (0..5). ///If no axis is provided, it uses the default axis for this constraint. virtual void setParam(int num, btScalar value, int axis = -1); ///return the local value of parameter virtual btScalar getParam(int num, int axis = -1) const; + + virtual int getFlags() const + { + return m_flags; + } virtual int calculateSerializeBufferSize() const; @@ -326,6 +372,43 @@ struct btHingeConstraintDoubleData }; #endif //BT_BACKWARDS_COMPATIBLE_SERIALIZATION +///The getAccumulatedHingeAngle returns the accumulated hinge angle, taking rotation across the -PI/PI boundary into account +ATTRIBUTE_ALIGNED16(class) btHingeAccumulatedAngleConstraint : public btHingeConstraint +{ +protected: + btScalar m_accumulatedAngle; +public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + + btHingeAccumulatedAngleConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB, const btVector3& axisInA,const btVector3& axisInB, bool useReferenceFrameA = false) + :btHingeConstraint(rbA,rbB,pivotInA,pivotInB, axisInA,axisInB, useReferenceFrameA ) + { + m_accumulatedAngle=getHingeAngle(); + } + + btHingeAccumulatedAngleConstraint(btRigidBody& rbA,const btVector3& pivotInA,const btVector3& axisInA, bool useReferenceFrameA = false) + :btHingeConstraint(rbA,pivotInA,axisInA, useReferenceFrameA) + { + m_accumulatedAngle=getHingeAngle(); + } + + btHingeAccumulatedAngleConstraint(btRigidBody& rbA,btRigidBody& rbB, const btTransform& rbAFrame, const btTransform& rbBFrame, bool useReferenceFrameA = false) + :btHingeConstraint(rbA,rbB, rbAFrame, rbBFrame, useReferenceFrameA ) + { + m_accumulatedAngle=getHingeAngle(); + } + + btHingeAccumulatedAngleConstraint(btRigidBody& rbA,const btTransform& rbAFrame, bool useReferenceFrameA = false) + :btHingeConstraint(rbA,rbAFrame, useReferenceFrameA ) + { + m_accumulatedAngle=getHingeAngle(); + } + btScalar getAccumulatedHingeAngle(); + void setAccumulatedHingeAngle(btScalar accAngle); + virtual void getInfo1 (btConstraintInfo1* info); + +}; struct btHingeConstraintFloatData { diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp new file mode 100644 index 000000000..f110cd480 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp @@ -0,0 +1,463 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#include "btNNCGConstraintSolver.h" + + + + + + +btScalar btNNCGConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer) +{ + btScalar val = btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup( bodies,numBodies,manifoldPtr, numManifolds, constraints,numConstraints,infoGlobal,debugDrawer); + + m_pNC.resizeNoInitialize(m_tmpSolverNonContactConstraintPool.size()); + m_pC.resizeNoInitialize(m_tmpSolverContactConstraintPool.size()); + m_pCF.resizeNoInitialize(m_tmpSolverContactFrictionConstraintPool.size()); + m_pCRF.resizeNoInitialize(m_tmpSolverContactRollingFrictionConstraintPool.size()); + + m_deltafNC.resizeNoInitialize(m_tmpSolverNonContactConstraintPool.size()); + m_deltafC.resizeNoInitialize(m_tmpSolverContactConstraintPool.size()); + m_deltafCF.resizeNoInitialize(m_tmpSolverContactFrictionConstraintPool.size()); + m_deltafCRF.resizeNoInitialize(m_tmpSolverContactRollingFrictionConstraintPool.size()); + + return val; +} + +btScalar btNNCGConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** /*bodies */,int /*numBodies*/,btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* /*debugDrawer*/) +{ + + int numNonContactPool = m_tmpSolverNonContactConstraintPool.size(); + int numConstraintPool = m_tmpSolverContactConstraintPool.size(); + int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size(); + + if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER) + { + if (1) // uncomment this for a bit less random ((iteration & 7) == 0) + { + + for (int j=0; j0 ? deltaflengthsqr / m_deltafLengthSqrPrev : 2; + if (beta>1) + { + for (int j=0;jisEnabled()) + { + int bodyAid = getOrInitSolverBody(constraints[j]->getRigidBodyA(),infoGlobal.m_timeStep); + int bodyBid = getOrInitSolverBody(constraints[j]->getRigidBodyB(),infoGlobal.m_timeStep); + btSolverBody& bodyA = m_tmpSolverBodyPool[bodyAid]; + btSolverBody& bodyB = m_tmpSolverBodyPool[bodyBid]; + constraints[j]->solveConstraintObsolete(bodyA,bodyB,infoGlobal.m_timeStep); + } + } + + ///solve all contact constraints using SIMD, if available + if (infoGlobal.m_solverMode & SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS) + { + int numPoolConstraints = m_tmpSolverContactConstraintPool.size(); + int multiplier = (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)? 2 : 1; + + for (int c=0;cbtScalar(0)) + { + solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse); + solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse; + btScalar deltaf = resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + m_deltafCF[c*multiplier] = deltaf; + deltaflengthsqr += deltaf*deltaf; + } else { + m_deltafCF[c*multiplier] = 0; + } + } + + if (infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) + { + + btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[c*multiplier+1]]; + + if (totalImpulse>btScalar(0)) + { + solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse); + solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse; + btScalar deltaf = resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + m_deltafCF[c*multiplier+1] = deltaf; + deltaflengthsqr += deltaf*deltaf; + } else { + m_deltafCF[c*multiplier+1] = 0; + } + } + } + } + + } + else//SOLVER_INTERLEAVE_CONTACT_AND_FRICTION_CONSTRAINTS + { + //solve the friction constraints after all contact constraints, don't interleave them + int numPoolConstraints = m_tmpSolverContactConstraintPool.size(); + int j; + + for (j=0;jbtScalar(0)) + { + solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse); + solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse; + + //resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + m_deltafCF[j] = deltaf; + deltaflengthsqr += deltaf*deltaf; + } else { + m_deltafCF[j] = 0; + } + } + + + int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size(); + for (j=0;jbtScalar(0)) + { + btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction*totalImpulse; + if (rollingFrictionMagnitude>rollingFrictionConstraint.m_friction) + rollingFrictionMagnitude = rollingFrictionConstraint.m_friction; + + rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude; + rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude; + + btScalar deltaf = resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA],m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB],rollingFrictionConstraint); + m_deltafCRF[j] = deltaf; + deltaflengthsqr += deltaf*deltaf; + } else { + m_deltafCRF[j] = 0; + } + } + + + } + } + + + + } else + { + + if (iteration< infoGlobal.m_numIterations) + { + for (int j=0;jisEnabled()) + { + int bodyAid = getOrInitSolverBody(constraints[j]->getRigidBodyA(),infoGlobal.m_timeStep); + int bodyBid = getOrInitSolverBody(constraints[j]->getRigidBodyB(),infoGlobal.m_timeStep); + btSolverBody& bodyA = m_tmpSolverBodyPool[bodyAid]; + btSolverBody& bodyB = m_tmpSolverBodyPool[bodyBid]; + constraints[j]->solveConstraintObsolete(bodyA,bodyB,infoGlobal.m_timeStep); + } + } + ///solve all contact constraints + int numPoolConstraints = m_tmpSolverContactConstraintPool.size(); + for (int j=0;jbtScalar(0)) + { + solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse); + solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse; + + btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + m_deltafCF[j] = deltaf; + deltaflengthsqr += deltaf*deltaf; + } else { + m_deltafCF[j] = 0; + } + } + + int numRollingFrictionPoolConstraints = m_tmpSolverContactRollingFrictionConstraintPool.size(); + for (int j=0;jbtScalar(0)) + { + btScalar rollingFrictionMagnitude = rollingFrictionConstraint.m_friction*totalImpulse; + if (rollingFrictionMagnitude>rollingFrictionConstraint.m_friction) + rollingFrictionMagnitude = rollingFrictionConstraint.m_friction; + + rollingFrictionConstraint.m_lowerLimit = -rollingFrictionMagnitude; + rollingFrictionConstraint.m_upperLimit = rollingFrictionMagnitude; + + btScalar deltaf = resolveSingleConstraintRowGeneric(m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdA],m_tmpSolverBodyPool[rollingFrictionConstraint.m_solverBodyIdB],rollingFrictionConstraint); + m_deltafCRF[j] = deltaf; + deltaflengthsqr += deltaf*deltaf; + } else { + m_deltafCRF[j] = 0; + } + } + } + } + + + + + if (!m_onlyForNoneContact) + { + if (iteration==0) + { + for (int j=0;j0 ? deltaflengthsqr / m_deltafLengthSqrPrev : 2; + if (beta>1) { + for (int j=0;j m_pNC; // p for None Contact constraints + btAlignedObjectArray m_pC; // p for Contact constraints + btAlignedObjectArray m_pCF; // p for ContactFriction constraints + btAlignedObjectArray m_pCRF; // p for ContactRollingFriction constraints + + //These are recalculated in every iterations. We just keep these to prevent reallocation in each iteration. + btAlignedObjectArray m_deltafNC; // deltaf for NoneContact constraints + btAlignedObjectArray m_deltafC; // deltaf for Contact constraints + btAlignedObjectArray m_deltafCF; // deltaf for ContactFriction constraints + btAlignedObjectArray m_deltafCRF; // deltaf for ContactRollingFriction constraints + + +protected: + + virtual btScalar solveGroupCacheFriendlyFinish(btCollisionObject** bodies,int numBodies,const btContactSolverInfo& infoGlobal); + virtual btScalar solveSingleIteration(int iteration, btCollisionObject** bodies ,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); + + virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); + +public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + + btNNCGConstraintSolver() : btSequentialImpulseConstraintSolver(), m_onlyForNoneContact(false) {} + + virtual btConstraintSolverType getSolverType() const + { + return BT_NNCG_SOLVER; + } + + bool m_onlyForNoneContact; +}; + + + + +#endif //BT_NNCG_CONSTRAINT_SOLVER_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h index 912189494..8fa03d719 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h @@ -116,6 +116,11 @@ public: virtual void setParam(int num, btScalar value, int axis = -1); ///return the local value of parameter virtual btScalar getParam(int num, int axis = -1) const; + + virtual int getFlags() const + { + return m_flags; + } virtual int calculateSerializeBufferSize() const; diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index be93e3543..c14999112 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -22,6 +22,8 @@ subject to the following restrictions: #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" #include "LinearMath/btIDebugDraw.h" +#include "LinearMath/btCpuFeatureUtility.h" + //#include "btJacobianEntry.h" #include "LinearMath/btMinMax.h" #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" @@ -37,80 +39,28 @@ int gNumSplitImpulseRecoveries = 0; #include "BulletDynamics/Dynamics/btRigidBody.h" -btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver() -:m_btSeed2(0) +//#define VERBOSE_RESIDUAL_PRINTF 1 +///This is the scalar reference implementation of solving a single constraint row, the innerloop of the Projected Gauss Seidel/Sequential Impulse constraint solver +///Below are optional SSE2 and SSE4/FMA3 versions. We assume most hardware has SSE2. For SSE4/FMA3 we perform a CPU feature check. +static btSimdScalar gResolveSingleConstraintRowGeneric_scalar_reference(btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) { + btScalar deltaImpulse = c.m_rhs - btScalar(c.m_appliedImpulse)*c.m_cfm; + const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(body1.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetDeltaAngularVelocity()); + const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(body2.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetDeltaAngularVelocity()); -} - -btSequentialImpulseConstraintSolver::~btSequentialImpulseConstraintSolver() -{ -} - -#ifdef USE_SIMD -#include -#define btVecSplat(x, e) _mm_shuffle_ps(x, x, _MM_SHUFFLE(e,e,e,e)) -static inline __m128 btSimdDot3( __m128 vec0, __m128 vec1 ) -{ - __m128 result = _mm_mul_ps( vec0, vec1); - return _mm_add_ps( btVecSplat( result, 0 ), _mm_add_ps( btVecSplat( result, 1 ), btVecSplat( result, 2 ) ) ); -} -#endif//USE_SIMD - -// Project Gauss Seidel or the equivalent Sequential Impulse -void btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGenericSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) -{ -#ifdef USE_SIMD - __m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse); - __m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit); - __m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit); - __m128 deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse),_mm_set1_ps(c.m_cfm))); - __m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128,body1.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128,body1.internalGetDeltaAngularVelocity().mVec128)); - __m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128,body2.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128,body2.internalGetDeltaAngularVelocity().mVec128)); - deltaImpulse = _mm_sub_ps(deltaImpulse,_mm_mul_ps(deltaVel1Dotn,_mm_set1_ps(c.m_jacDiagABInv))); - deltaImpulse = _mm_sub_ps(deltaImpulse,_mm_mul_ps(deltaVel2Dotn,_mm_set1_ps(c.m_jacDiagABInv))); - btSimdScalar sum = _mm_add_ps(cpAppliedImp,deltaImpulse); - btSimdScalar resultLowerLess,resultUpperLess; - resultLowerLess = _mm_cmplt_ps(sum,lowerLimit1); - resultUpperLess = _mm_cmplt_ps(sum,upperLimit1); - __m128 lowMinApplied = _mm_sub_ps(lowerLimit1,cpAppliedImp); - deltaImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse) ); - c.m_appliedImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum) ); - __m128 upperMinApplied = _mm_sub_ps(upperLimit1,cpAppliedImp); - deltaImpulse = _mm_or_ps( _mm_and_ps(resultUpperLess, deltaImpulse), _mm_andnot_ps(resultUpperLess, upperMinApplied) ); - c.m_appliedImpulse = _mm_or_ps( _mm_and_ps(resultUpperLess, c.m_appliedImpulse), _mm_andnot_ps(resultUpperLess, upperLimit1) ); - __m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128,body1.internalGetInvMass().mVec128); - __m128 linearComponentB = _mm_mul_ps((c.m_contactNormal2).mVec128,body2.internalGetInvMass().mVec128); - __m128 impulseMagnitude = deltaImpulse; - body1.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaLinearVelocity().mVec128,_mm_mul_ps(linearComponentA,impulseMagnitude)); - body1.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaAngularVelocity().mVec128 ,_mm_mul_ps(c.m_angularComponentA.mVec128,impulseMagnitude)); - body2.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaLinearVelocity().mVec128,_mm_mul_ps(linearComponentB,impulseMagnitude)); - body2.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaAngularVelocity().mVec128 ,_mm_mul_ps(c.m_angularComponentB.mVec128,impulseMagnitude)); -#else - resolveSingleConstraintRowGeneric(body1,body2,c); -#endif -} - -// Project Gauss Seidel or the equivalent Sequential Impulse - void btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGeneric(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) -{ - btScalar deltaImpulse = c.m_rhs-btScalar(c.m_appliedImpulse)*c.m_cfm; - const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(body1.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetDeltaAngularVelocity()); - const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(body2.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetDeltaAngularVelocity()); - -// const btScalar delta_rel_vel = deltaVel1Dotn-deltaVel2Dotn; - deltaImpulse -= deltaVel1Dotn*c.m_jacDiagABInv; - deltaImpulse -= deltaVel2Dotn*c.m_jacDiagABInv; + // const btScalar delta_rel_vel = deltaVel1Dotn-deltaVel2Dotn; + deltaImpulse -= deltaVel1Dotn*c.m_jacDiagABInv; + deltaImpulse -= deltaVel2Dotn*c.m_jacDiagABInv; const btScalar sum = btScalar(c.m_appliedImpulse) + deltaImpulse; if (sum < c.m_lowerLimit) { - deltaImpulse = c.m_lowerLimit-c.m_appliedImpulse; + deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse; c.m_appliedImpulse = c.m_lowerLimit; } - else if (sum > c.m_upperLimit) + else if (sum > c.m_upperLimit) { - deltaImpulse = c.m_upperLimit-c.m_appliedImpulse; + deltaImpulse = c.m_upperLimit - c.m_appliedImpulse; c.m_appliedImpulse = c.m_upperLimit; } else @@ -118,73 +68,247 @@ void btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGenericSIMD( c.m_appliedImpulse = sum; } - body1.internalApplyImpulse(c.m_contactNormal1*body1.internalGetInvMass(),c.m_angularComponentA,deltaImpulse); - body2.internalApplyImpulse(c.m_contactNormal2*body2.internalGetInvMass(),c.m_angularComponentB,deltaImpulse); + body1.internalApplyImpulse(c.m_contactNormal1*body1.internalGetInvMass(), c.m_angularComponentA, deltaImpulse); + body2.internalApplyImpulse(c.m_contactNormal2*body2.internalGetInvMass(), c.m_angularComponentB, deltaImpulse); + + return deltaImpulse; } - void btSequentialImpulseConstraintSolver::resolveSingleConstraintRowLowerLimitSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) -{ -#ifdef USE_SIMD - __m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse); - __m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit); - __m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit); - __m128 deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse),_mm_set1_ps(c.m_cfm))); - __m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128,body1.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128,body1.internalGetDeltaAngularVelocity().mVec128)); - __m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128,body2.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128,body2.internalGetDeltaAngularVelocity().mVec128)); - deltaImpulse = _mm_sub_ps(deltaImpulse,_mm_mul_ps(deltaVel1Dotn,_mm_set1_ps(c.m_jacDiagABInv))); - deltaImpulse = _mm_sub_ps(deltaImpulse,_mm_mul_ps(deltaVel2Dotn,_mm_set1_ps(c.m_jacDiagABInv))); - btSimdScalar sum = _mm_add_ps(cpAppliedImp,deltaImpulse); - btSimdScalar resultLowerLess,resultUpperLess; - resultLowerLess = _mm_cmplt_ps(sum,lowerLimit1); - resultUpperLess = _mm_cmplt_ps(sum,upperLimit1); - __m128 lowMinApplied = _mm_sub_ps(lowerLimit1,cpAppliedImp); - deltaImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse) ); - c.m_appliedImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum) ); - __m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128,body1.internalGetInvMass().mVec128); - __m128 linearComponentB = _mm_mul_ps(c.m_contactNormal2.mVec128,body2.internalGetInvMass().mVec128); - __m128 impulseMagnitude = deltaImpulse; - body1.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaLinearVelocity().mVec128,_mm_mul_ps(linearComponentA,impulseMagnitude)); - body1.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaAngularVelocity().mVec128 ,_mm_mul_ps(c.m_angularComponentA.mVec128,impulseMagnitude)); - body2.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaLinearVelocity().mVec128,_mm_mul_ps(linearComponentB,impulseMagnitude)); - body2.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaAngularVelocity().mVec128 ,_mm_mul_ps(c.m_angularComponentB.mVec128,impulseMagnitude)); -#else - resolveSingleConstraintRowLowerLimit(body1,body2,c); -#endif -} -// Projected Gauss Seidel or the equivalent Sequential Impulse - void btSequentialImpulseConstraintSolver::resolveSingleConstraintRowLowerLimit(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) +static btSimdScalar gResolveSingleConstraintRowLowerLimit_scalar_reference(btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) { - btScalar deltaImpulse = c.m_rhs-btScalar(c.m_appliedImpulse)*c.m_cfm; - const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(body1.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetDeltaAngularVelocity()); - const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(body2.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetDeltaAngularVelocity()); + btScalar deltaImpulse = c.m_rhs - btScalar(c.m_appliedImpulse)*c.m_cfm; + const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(body1.internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetDeltaAngularVelocity()); + const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(body2.internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetDeltaAngularVelocity()); - deltaImpulse -= deltaVel1Dotn*c.m_jacDiagABInv; - deltaImpulse -= deltaVel2Dotn*c.m_jacDiagABInv; + deltaImpulse -= deltaVel1Dotn*c.m_jacDiagABInv; + deltaImpulse -= deltaVel2Dotn*c.m_jacDiagABInv; const btScalar sum = btScalar(c.m_appliedImpulse) + deltaImpulse; if (sum < c.m_lowerLimit) { - deltaImpulse = c.m_lowerLimit-c.m_appliedImpulse; + deltaImpulse = c.m_lowerLimit - c.m_appliedImpulse; c.m_appliedImpulse = c.m_lowerLimit; } else { c.m_appliedImpulse = sum; } - body1.internalApplyImpulse(c.m_contactNormal1*body1.internalGetInvMass(),c.m_angularComponentA,deltaImpulse); - body2.internalApplyImpulse(c.m_contactNormal2*body2.internalGetInvMass(),c.m_angularComponentB,deltaImpulse); + body1.internalApplyImpulse(c.m_contactNormal1*body1.internalGetInvMass(), c.m_angularComponentA, deltaImpulse); + body2.internalApplyImpulse(c.m_contactNormal2*body2.internalGetInvMass(), c.m_angularComponentB, deltaImpulse); + + return deltaImpulse; } -void btSequentialImpulseConstraintSolver::resolveSplitPenetrationImpulseCacheFriendly( + +#ifdef USE_SIMD +#include + + +#define btVecSplat(x, e) _mm_shuffle_ps(x, x, _MM_SHUFFLE(e,e,e,e)) +static inline __m128 btSimdDot3( __m128 vec0, __m128 vec1 ) +{ + __m128 result = _mm_mul_ps( vec0, vec1); + return _mm_add_ps( btVecSplat( result, 0 ), _mm_add_ps( btVecSplat( result, 1 ), btVecSplat( result, 2 ) ) ); +} + +#if defined (BT_ALLOW_SSE4) +#include + +#define USE_FMA 1 +#define USE_FMA3_INSTEAD_FMA4 1 +#define USE_SSE4_DOT 1 + +#define SSE4_DP(a, b) _mm_dp_ps(a, b, 0x7f) +#define SSE4_DP_FP(a, b) _mm_cvtss_f32(_mm_dp_ps(a, b, 0x7f)) + +#if USE_SSE4_DOT +#define DOT_PRODUCT(a, b) SSE4_DP(a, b) +#else +#define DOT_PRODUCT(a, b) btSimdDot3(a, b) +#endif + +#if USE_FMA +#if USE_FMA3_INSTEAD_FMA4 +// a*b + c +#define FMADD(a, b, c) _mm_fmadd_ps(a, b, c) +// -(a*b) + c +#define FMNADD(a, b, c) _mm_fnmadd_ps(a, b, c) +#else // USE_FMA3 +// a*b + c +#define FMADD(a, b, c) _mm_macc_ps(a, b, c) +// -(a*b) + c +#define FMNADD(a, b, c) _mm_nmacc_ps(a, b, c) +#endif +#else // USE_FMA +// c + a*b +#define FMADD(a, b, c) _mm_add_ps(c, _mm_mul_ps(a, b)) +// c - a*b +#define FMNADD(a, b, c) _mm_sub_ps(c, _mm_mul_ps(a, b)) +#endif +#endif + +// Project Gauss Seidel or the equivalent Sequential Impulse +static btSimdScalar gResolveSingleConstraintRowGeneric_sse2(btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) +{ + __m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse); + __m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit); + __m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit); + btSimdScalar deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse), _mm_set1_ps(c.m_cfm))); + __m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128, body1.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128, body1.internalGetDeltaAngularVelocity().mVec128)); + __m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128, body2.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128, body2.internalGetDeltaAngularVelocity().mVec128)); + deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv))); + deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv))); + btSimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse); + btSimdScalar resultLowerLess, resultUpperLess; + resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1); + resultUpperLess = _mm_cmplt_ps(sum, upperLimit1); + __m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp); + deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse)); + c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum)); + __m128 upperMinApplied = _mm_sub_ps(upperLimit1, cpAppliedImp); + deltaImpulse = _mm_or_ps(_mm_and_ps(resultUpperLess, deltaImpulse), _mm_andnot_ps(resultUpperLess, upperMinApplied)); + c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultUpperLess, c.m_appliedImpulse), _mm_andnot_ps(resultUpperLess, upperLimit1)); + __m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128, body1.internalGetInvMass().mVec128); + __m128 linearComponentB = _mm_mul_ps((c.m_contactNormal2).mVec128, body2.internalGetInvMass().mVec128); + __m128 impulseMagnitude = deltaImpulse; + body1.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude)); + body1.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude)); + body2.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude)); + body2.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude)); + return deltaImpulse; +} + + +// Enhanced version of gResolveSingleConstraintRowGeneric_sse2 with SSE4.1 and FMA3 +static btSimdScalar gResolveSingleConstraintRowGeneric_sse4_1_fma3(btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) +{ +#if defined (BT_ALLOW_SSE4) + __m128 tmp = _mm_set_ps1(c.m_jacDiagABInv); + __m128 deltaImpulse = _mm_set_ps1(c.m_rhs - btScalar(c.m_appliedImpulse)*c.m_cfm); + const __m128 lowerLimit = _mm_set_ps1(c.m_lowerLimit); + const __m128 upperLimit = _mm_set_ps1(c.m_upperLimit); + const __m128 deltaVel1Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal1.mVec128, body1.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos1CrossNormal.mVec128, body1.internalGetDeltaAngularVelocity().mVec128)); + const __m128 deltaVel2Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal2.mVec128, body2.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos2CrossNormal.mVec128, body2.internalGetDeltaAngularVelocity().mVec128)); + deltaImpulse = FMNADD(deltaVel1Dotn, tmp, deltaImpulse); + deltaImpulse = FMNADD(deltaVel2Dotn, tmp, deltaImpulse); + tmp = _mm_add_ps(c.m_appliedImpulse, deltaImpulse); // sum + const __m128 maskLower = _mm_cmpgt_ps(tmp, lowerLimit); + const __m128 maskUpper = _mm_cmpgt_ps(upperLimit, tmp); + deltaImpulse = _mm_blendv_ps(_mm_sub_ps(lowerLimit, c.m_appliedImpulse), _mm_blendv_ps(_mm_sub_ps(upperLimit, c.m_appliedImpulse), deltaImpulse, maskUpper), maskLower); + c.m_appliedImpulse = _mm_blendv_ps(lowerLimit, _mm_blendv_ps(upperLimit, tmp, maskUpper), maskLower); + body1.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal1.mVec128, body1.internalGetInvMass().mVec128), deltaImpulse, body1.internalGetDeltaLinearVelocity().mVec128); + body1.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentA.mVec128, deltaImpulse, body1.internalGetDeltaAngularVelocity().mVec128); + body2.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal2.mVec128, body2.internalGetInvMass().mVec128), deltaImpulse, body2.internalGetDeltaLinearVelocity().mVec128); + body2.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentB.mVec128, deltaImpulse, body2.internalGetDeltaAngularVelocity().mVec128); + return deltaImpulse; +#else + return gResolveSingleConstraintRowGeneric_sse2(body1,body2,c); +#endif +} + + + +static btSimdScalar gResolveSingleConstraintRowLowerLimit_sse2(btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) +{ + __m128 cpAppliedImp = _mm_set1_ps(c.m_appliedImpulse); + __m128 lowerLimit1 = _mm_set1_ps(c.m_lowerLimit); + __m128 upperLimit1 = _mm_set1_ps(c.m_upperLimit); + btSimdScalar deltaImpulse = _mm_sub_ps(_mm_set1_ps(c.m_rhs), _mm_mul_ps(_mm_set1_ps(c.m_appliedImpulse), _mm_set1_ps(c.m_cfm))); + __m128 deltaVel1Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal1.mVec128, body1.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos1CrossNormal.mVec128, body1.internalGetDeltaAngularVelocity().mVec128)); + __m128 deltaVel2Dotn = _mm_add_ps(btSimdDot3(c.m_contactNormal2.mVec128, body2.internalGetDeltaLinearVelocity().mVec128), btSimdDot3(c.m_relpos2CrossNormal.mVec128, body2.internalGetDeltaAngularVelocity().mVec128)); + deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel1Dotn, _mm_set1_ps(c.m_jacDiagABInv))); + deltaImpulse = _mm_sub_ps(deltaImpulse, _mm_mul_ps(deltaVel2Dotn, _mm_set1_ps(c.m_jacDiagABInv))); + btSimdScalar sum = _mm_add_ps(cpAppliedImp, deltaImpulse); + btSimdScalar resultLowerLess, resultUpperLess; + resultLowerLess = _mm_cmplt_ps(sum, lowerLimit1); + resultUpperLess = _mm_cmplt_ps(sum, upperLimit1); + __m128 lowMinApplied = _mm_sub_ps(lowerLimit1, cpAppliedImp); + deltaImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse)); + c.m_appliedImpulse = _mm_or_ps(_mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum)); + __m128 linearComponentA = _mm_mul_ps(c.m_contactNormal1.mVec128, body1.internalGetInvMass().mVec128); + __m128 linearComponentB = _mm_mul_ps(c.m_contactNormal2.mVec128, body2.internalGetInvMass().mVec128); + __m128 impulseMagnitude = deltaImpulse; + body1.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentA, impulseMagnitude)); + body1.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body1.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentA.mVec128, impulseMagnitude)); + body2.internalGetDeltaLinearVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaLinearVelocity().mVec128, _mm_mul_ps(linearComponentB, impulseMagnitude)); + body2.internalGetDeltaAngularVelocity().mVec128 = _mm_add_ps(body2.internalGetDeltaAngularVelocity().mVec128, _mm_mul_ps(c.m_angularComponentB.mVec128, impulseMagnitude)); + return deltaImpulse; +} + + +// Enhanced version of gResolveSingleConstraintRowGeneric_sse2 with SSE4.1 and FMA3 +static btSimdScalar gResolveSingleConstraintRowLowerLimit_sse4_1_fma3(btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) +{ +#ifdef BT_ALLOW_SSE4 + __m128 tmp = _mm_set_ps1(c.m_jacDiagABInv); + __m128 deltaImpulse = _mm_set_ps1(c.m_rhs - btScalar(c.m_appliedImpulse)*c.m_cfm); + const __m128 lowerLimit = _mm_set_ps1(c.m_lowerLimit); + const __m128 deltaVel1Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal1.mVec128, body1.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos1CrossNormal.mVec128, body1.internalGetDeltaAngularVelocity().mVec128)); + const __m128 deltaVel2Dotn = _mm_add_ps(DOT_PRODUCT(c.m_contactNormal2.mVec128, body2.internalGetDeltaLinearVelocity().mVec128), DOT_PRODUCT(c.m_relpos2CrossNormal.mVec128, body2.internalGetDeltaAngularVelocity().mVec128)); + deltaImpulse = FMNADD(deltaVel1Dotn, tmp, deltaImpulse); + deltaImpulse = FMNADD(deltaVel2Dotn, tmp, deltaImpulse); + tmp = _mm_add_ps(c.m_appliedImpulse, deltaImpulse); + const __m128 mask = _mm_cmpgt_ps(tmp, lowerLimit); + deltaImpulse = _mm_blendv_ps(_mm_sub_ps(lowerLimit, c.m_appliedImpulse), deltaImpulse, mask); + c.m_appliedImpulse = _mm_blendv_ps(lowerLimit, tmp, mask); + body1.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal1.mVec128, body1.internalGetInvMass().mVec128), deltaImpulse, body1.internalGetDeltaLinearVelocity().mVec128); + body1.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentA.mVec128, deltaImpulse, body1.internalGetDeltaAngularVelocity().mVec128); + body2.internalGetDeltaLinearVelocity().mVec128 = FMADD(_mm_mul_ps(c.m_contactNormal2.mVec128, body2.internalGetInvMass().mVec128), deltaImpulse, body2.internalGetDeltaLinearVelocity().mVec128); + body2.internalGetDeltaAngularVelocity().mVec128 = FMADD(c.m_angularComponentB.mVec128, deltaImpulse, body2.internalGetDeltaAngularVelocity().mVec128); + return deltaImpulse; +#else + return gResolveSingleConstraintRowLowerLimit_sse2(body1,body2,c); +#endif //BT_ALLOW_SSE4 +} + + +#endif //USE_SIMD + + + +btSimdScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGenericSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) +{ +#ifdef USE_SIMD + return m_resolveSingleConstraintRowGeneric(body1, body2, c); +#else + return resolveSingleConstraintRowGeneric(body1,body2,c); +#endif +} + +// Project Gauss Seidel or the equivalent Sequential Impulse +btSimdScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowGeneric(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) +{ + return gResolveSingleConstraintRowGeneric_scalar_reference(body1, body2, c); +} + +btSimdScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowLowerLimitSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) +{ +#ifdef USE_SIMD + return m_resolveSingleConstraintRowLowerLimit(body1, body2, c); +#else + return resolveSingleConstraintRowLowerLimit(body1,body2,c); +#endif +} + + +btSimdScalar btSequentialImpulseConstraintSolver::resolveSingleConstraintRowLowerLimit(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) +{ + return gResolveSingleConstraintRowLowerLimit_scalar_reference(body1,body2,c); +} + + +btScalar btSequentialImpulseConstraintSolver::resolveSplitPenetrationImpulseCacheFriendly( btSolverBody& body1, btSolverBody& body2, const btSolverConstraint& c) { + btScalar deltaImpulse = 0.f; + if (c.m_rhsPenetration) { gNumSplitImpulseRecoveries++; - btScalar deltaImpulse = c.m_rhsPenetration-btScalar(c.m_appliedPushImpulse)*c.m_cfm; + deltaImpulse = c.m_rhsPenetration-btScalar(c.m_appliedPushImpulse)*c.m_cfm; const btScalar deltaVel1Dotn = c.m_contactNormal1.dot(body1.internalGetPushVelocity()) + c.m_relpos1CrossNormal.dot(body1.internalGetTurnVelocity()); const btScalar deltaVel2Dotn = c.m_contactNormal2.dot(body2.internalGetPushVelocity()) + c.m_relpos2CrossNormal.dot(body2.internalGetTurnVelocity()); @@ -203,13 +327,14 @@ void btSequentialImpulseConstraintSolver::resolveSplitPenetrationImpulseCacheFri body1.internalApplyPushImpulse(c.m_contactNormal1*body1.internalGetInvMass(),c.m_angularComponentA,deltaImpulse); body2.internalApplyPushImpulse(c.m_contactNormal2*body2.internalGetInvMass(),c.m_angularComponentB,deltaImpulse); } + return deltaImpulse; } - void btSequentialImpulseConstraintSolver::resolveSplitPenetrationSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) +btSimdScalar btSequentialImpulseConstraintSolver::resolveSplitPenetrationSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) { #ifdef USE_SIMD if (!c.m_rhsPenetration) - return; + return 0.f; gNumSplitImpulseRecoveries++; @@ -235,12 +360,70 @@ void btSequentialImpulseConstraintSolver::resolveSplitPenetrationImpulseCacheFri body1.internalGetTurnVelocity().mVec128 = _mm_add_ps(body1.internalGetTurnVelocity().mVec128 ,_mm_mul_ps(c.m_angularComponentA.mVec128,impulseMagnitude)); body2.internalGetPushVelocity().mVec128 = _mm_add_ps(body2.internalGetPushVelocity().mVec128,_mm_mul_ps(linearComponentB,impulseMagnitude)); body2.internalGetTurnVelocity().mVec128 = _mm_add_ps(body2.internalGetTurnVelocity().mVec128 ,_mm_mul_ps(c.m_angularComponentB.mVec128,impulseMagnitude)); + return deltaImpulse; #else - resolveSplitPenetrationImpulseCacheFriendly(body1,body2,c); + return resolveSplitPenetrationImpulseCacheFriendly(body1,body2,c); #endif } + btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver() + : m_resolveSingleConstraintRowGeneric(gResolveSingleConstraintRowGeneric_scalar_reference), + m_resolveSingleConstraintRowLowerLimit(gResolveSingleConstraintRowLowerLimit_scalar_reference), + m_btSeed2(0) + { + +#ifdef USE_SIMD + m_resolveSingleConstraintRowGeneric = gResolveSingleConstraintRowGeneric_sse2; + m_resolveSingleConstraintRowLowerLimit=gResolveSingleConstraintRowLowerLimit_sse2; +#endif //USE_SIMD + +#ifdef BT_ALLOW_SSE4 + int cpuFeatures = btCpuFeatureUtility::getCpuFeatures(); + if ((cpuFeatures & btCpuFeatureUtility::CPU_FEATURE_FMA3) && (cpuFeatures & btCpuFeatureUtility::CPU_FEATURE_SSE4_1)) + { + m_resolveSingleConstraintRowGeneric = gResolveSingleConstraintRowGeneric_sse4_1_fma3; + m_resolveSingleConstraintRowLowerLimit = gResolveSingleConstraintRowLowerLimit_sse4_1_fma3; + } +#endif//BT_ALLOW_SSE4 + + } + + btSequentialImpulseConstraintSolver::~btSequentialImpulseConstraintSolver() + { + } + + btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getScalarConstraintRowSolverGeneric() + { + return gResolveSingleConstraintRowGeneric_scalar_reference; + } + + btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getScalarConstraintRowSolverLowerLimit() + { + return gResolveSingleConstraintRowLowerLimit_scalar_reference; + } + + +#ifdef USE_SIMD + btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE2ConstraintRowSolverGeneric() + { + return gResolveSingleConstraintRowGeneric_sse2; + } + btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE2ConstraintRowSolverLowerLimit() + { + return gResolveSingleConstraintRowLowerLimit_sse2; + } +#ifdef BT_ALLOW_SSE4 + btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE4_1ConstraintRowSolverGeneric() + { + return gResolveSingleConstraintRowGeneric_sse4_1_fma3; + } + btSingleConstraintRowSolver btSequentialImpulseConstraintSolver::getSSE4_1ConstraintRowSolverLowerLimit() + { + return gResolveSingleConstraintRowLowerLimit_sse4_1_fma3; + } +#endif //BT_ALLOW_SSE4 +#endif //USE_SIMD unsigned long btSequentialImpulseConstraintSolver::btRand2() { @@ -301,7 +484,7 @@ void btSequentialImpulseConstraintSolver::initSolverBody(btSolverBody* solverBod solverBody->m_angularVelocity = rb->getAngularVelocity(); solverBody->m_externalForceImpulse = rb->getTotalForce()*rb->getInvMass()*timeStep; solverBody->m_externalTorqueImpulse = rb->getTotalTorque()*rb->getInvInertiaTensorWorld()*timeStep ; - + } else { solverBody->m_worldTransform.setIdentity(); @@ -333,7 +516,7 @@ btScalar btSequentialImpulseConstraintSolver::restitutionCurve(btScalar rel_vel, void btSequentialImpulseConstraintSolver::applyAnisotropicFriction(btCollisionObject* colObj,btVector3& frictionDirection, int frictionMode) { - + if (colObj && colObj->hasAnisotropicFriction(frictionMode)) { @@ -354,7 +537,7 @@ void btSequentialImpulseConstraintSolver::applyAnisotropicFriction(btCollisionOb void btSequentialImpulseConstraintSolver::setupFrictionConstraint(btSolverConstraint& solverConstraint, const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity, btScalar cfmSlip) { - + btSolverBody& solverBodyA = m_tmpSolverBodyPool[solverBodyIdA]; btSolverBody& solverBodyB = m_tmpSolverBodyPool[solverBodyIdB]; @@ -415,25 +598,26 @@ void btSequentialImpulseConstraintSolver::setupFrictionConstraint(btSolverConstr } { - + btScalar rel_vel; - btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(body0?solverBodyA.m_linearVelocity+solverBodyA.m_externalForceImpulse:btVector3(0,0,0)) + btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(body0?solverBodyA.m_linearVelocity+solverBodyA.m_externalForceImpulse:btVector3(0,0,0)) + solverConstraint.m_relpos1CrossNormal.dot(body0?solverBodyA.m_angularVelocity:btVector3(0,0,0)); - btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(body1?solverBodyB.m_linearVelocity+solverBodyB.m_externalForceImpulse:btVector3(0,0,0)) + btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(body1?solverBodyB.m_linearVelocity+solverBodyB.m_externalForceImpulse:btVector3(0,0,0)) + solverConstraint.m_relpos2CrossNormal.dot(body1?solverBodyB.m_angularVelocity:btVector3(0,0,0)); rel_vel = vel1Dotn+vel2Dotn; // btScalar positionalError = 0.f; - btSimdScalar velocityError = desiredVelocity - rel_vel; - btSimdScalar velocityImpulse = velocityError * btSimdScalar(solverConstraint.m_jacDiagABInv); + btScalar velocityError = desiredVelocity - rel_vel; + btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv; solverConstraint.m_rhs = velocityImpulse; + solverConstraint.m_rhsPenetration = 0.f; solverConstraint.m_cfm = cfmSlip; solverConstraint.m_lowerLimit = -solverConstraint.m_friction; solverConstraint.m_upperLimit = solverConstraint.m_friction; - + } } @@ -441,15 +625,15 @@ btSolverConstraint& btSequentialImpulseConstraintSolver::addFrictionConstraint(c { btSolverConstraint& solverConstraint = m_tmpSolverContactFrictionConstraintPool.expandNonInitializing(); solverConstraint.m_frictionIndex = frictionIndex; - setupFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, + setupFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, colObj0, colObj1, relaxation, desiredVelocity, cfmSlip); return solverConstraint; } -void btSequentialImpulseConstraintSolver::setupRollingFrictionConstraint( btSolverConstraint& solverConstraint, const btVector3& normalAxis1,int solverBodyIdA,int solverBodyIdB, - btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2, - btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, +void btSequentialImpulseConstraintSolver::setupTorsionalFrictionConstraint( btSolverConstraint& solverConstraint, const btVector3& normalAxis1,int solverBodyIdA,int solverBodyIdB, + btManifoldPoint& cp,btScalar combinedTorsionalFriction, const btVector3& rel_pos1,const btVector3& rel_pos2, + btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity, btScalar cfmSlip) { @@ -467,8 +651,8 @@ void btSequentialImpulseConstraintSolver::setupRollingFrictionConstraint( btSolv solverConstraint.m_solverBodyIdA = solverBodyIdA; solverConstraint.m_solverBodyIdB = solverBodyIdB; - solverConstraint.m_friction = cp.m_combinedRollingFriction; - solverConstraint.m_originalContactPoint = 0; + solverConstraint.m_friction = combinedTorsionalFriction; + solverConstraint.m_originalContactPoint = 0; solverConstraint.m_appliedImpulse = 0.f; solverConstraint.m_appliedPushImpulse = 0.f; @@ -495,12 +679,12 @@ void btSequentialImpulseConstraintSolver::setupRollingFrictionConstraint( btSolv } { - + btScalar rel_vel; - btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(body0?solverBodyA.m_linearVelocity+solverBodyA.m_externalForceImpulse:btVector3(0,0,0)) + btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(body0?solverBodyA.m_linearVelocity+solverBodyA.m_externalForceImpulse:btVector3(0,0,0)) + solverConstraint.m_relpos1CrossNormal.dot(body0?solverBodyA.m_angularVelocity:btVector3(0,0,0)); - btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(body1?solverBodyB.m_linearVelocity+solverBodyB.m_externalForceImpulse:btVector3(0,0,0)) + btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(body1?solverBodyB.m_linearVelocity+solverBodyB.m_externalForceImpulse:btVector3(0,0,0)) + solverConstraint.m_relpos2CrossNormal.dot(body1?solverBodyB.m_angularVelocity:btVector3(0,0,0)); rel_vel = vel1Dotn+vel2Dotn; @@ -513,7 +697,7 @@ void btSequentialImpulseConstraintSolver::setupRollingFrictionConstraint( btSolv solverConstraint.m_cfm = cfmSlip; solverConstraint.m_lowerLimit = -solverConstraint.m_friction; solverConstraint.m_upperLimit = solverConstraint.m_friction; - + } } @@ -524,11 +708,11 @@ void btSequentialImpulseConstraintSolver::setupRollingFrictionConstraint( btSolv -btSolverConstraint& btSequentialImpulseConstraintSolver::addRollingFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity, btScalar cfmSlip) +btSolverConstraint& btSequentialImpulseConstraintSolver::addTorsionalFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,btScalar combinedTorsionalFriction, const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity, btScalar cfmSlip) { btSolverConstraint& solverConstraint = m_tmpSolverContactRollingFrictionConstraintPool.expandNonInitializing(); solverConstraint.m_frictionIndex = frictionIndex; - setupRollingFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, rel_pos1, rel_pos2, + setupTorsionalFrictionConstraint(solverConstraint, normalAxis, solverBodyIdA, solverBodyIdB, cp, combinedTorsionalFriction,rel_pos1, rel_pos2, colObj0, colObj1, relaxation, desiredVelocity, cfmSlip); return solverConstraint; } @@ -536,8 +720,67 @@ btSolverConstraint& btSequentialImpulseConstraintSolver::addRollingFrictionConst int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject& body,btScalar timeStep) { +#if BT_THREADSAFE + int solverBodyId = -1; + if ( !body.isStaticOrKinematicObject() ) + { + // dynamic body + // Dynamic bodies can only be in one island, so it's safe to write to the companionId + solverBodyId = body.getCompanionId(); + if ( solverBodyId < 0 ) + { + if ( btRigidBody* rb = btRigidBody::upcast( &body ) ) + { + solverBodyId = m_tmpSolverBodyPool.size(); + btSolverBody& solverBody = m_tmpSolverBodyPool.expand(); + initSolverBody( &solverBody, &body, timeStep ); + body.setCompanionId( solverBodyId ); + } + } + } + else if (body.isKinematicObject()) + { + // + // NOTE: must test for kinematic before static because some kinematic objects also + // identify as "static" + // + // Kinematic bodies can be in multiple islands at once, so it is a + // race condition to write to them, so we use an alternate method + // to record the solverBodyId + int uniqueId = body.getWorldArrayIndex(); + const int INVALID_SOLVER_BODY_ID = -1; + if (uniqueId >= m_kinematicBodyUniqueIdToSolverBodyTable.size()) + { + m_kinematicBodyUniqueIdToSolverBodyTable.resize(uniqueId + 1, INVALID_SOLVER_BODY_ID); + } + solverBodyId = m_kinematicBodyUniqueIdToSolverBodyTable[ uniqueId ]; + // if no table entry yet, + if ( solverBodyId == INVALID_SOLVER_BODY_ID ) + { + // create a table entry for this body + btRigidBody* rb = btRigidBody::upcast( &body ); + solverBodyId = m_tmpSolverBodyPool.size(); + btSolverBody& solverBody = m_tmpSolverBodyPool.expand(); + initSolverBody( &solverBody, &body, timeStep ); + m_kinematicBodyUniqueIdToSolverBodyTable[ uniqueId ] = solverBodyId; + } + } + else + { + // all fixed bodies (inf mass) get mapped to a single solver id + if ( m_fixedBodyId < 0 ) + { + m_fixedBodyId = m_tmpSolverBodyPool.size(); + btSolverBody& fixedBody = m_tmpSolverBodyPool.expand(); + initSolverBody( &fixedBody, 0, timeStep ); + } + solverBodyId = m_fixedBodyId; + } + btAssert( solverBodyId < m_tmpSolverBodyPool.size() ); + return solverBodyId; +#else // BT_THREADSAFE - int solverBodyIdA = -1; + int solverBodyIdA = -1; if (body.getCompanionId() >= 0) { @@ -556,7 +799,7 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject& body.setCompanionId(solverBodyIdA); } else { - + if (m_fixedBodyId<0) { m_fixedBodyId = m_tmpSolverBodyPool.size(); @@ -569,20 +812,21 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject& } return solverBodyIdA; +#endif // BT_THREADSAFE } #include -void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstraint& solverConstraint, +void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstraint& solverConstraint, int solverBodyIdA, int solverBodyIdB, btManifoldPoint& cp, const btContactSolverInfo& infoGlobal, btScalar& relaxation, const btVector3& rel_pos1, const btVector3& rel_pos2) { - - const btVector3& pos1 = cp.getPositionWorldOnA(); - const btVector3& pos2 = cp.getPositionWorldOnB(); + + // const btVector3& pos1 = cp.getPositionWorldOnA(); + // const btVector3& pos2 = cp.getPositionWorldOnB(); btSolverBody* bodyA = &m_tmpSolverBodyPool[solverBodyIdA]; btSolverBody* bodyB = &m_tmpSolverBodyPool[solverBodyIdB]; @@ -590,23 +834,53 @@ void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstra btRigidBody* rb0 = bodyA->m_originalBody; btRigidBody* rb1 = bodyB->m_originalBody; -// btVector3 rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin(); +// btVector3 rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin(); // btVector3 rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin(); - //rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin(); + //rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin(); //rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin(); - relaxation = 1.f; + relaxation = infoGlobal.m_sor; + btScalar invTimeStep = btScalar(1)/infoGlobal.m_timeStep; + + //cfm = 1 / ( dt * kp + kd ) + //erp = dt * kp / ( dt * kp + kd ) + + btScalar cfm = infoGlobal.m_globalCfm; + btScalar erp = infoGlobal.m_erp2; + + if ((cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_CFM) || (cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_ERP)) + { + if (cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_CFM) + cfm = cp.m_contactCFM; + if (cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_ERP) + erp = cp.m_contactERP; + } else + { + if (cp.m_contactPointFlags & BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING) + { + btScalar denom = ( infoGlobal.m_timeStep * cp.m_combinedContactStiffness1 + cp.m_combinedContactDamping1 ); + if (denom < SIMD_EPSILON) + { + denom = SIMD_EPSILON; + } + cfm = btScalar(1) / denom; + erp = (infoGlobal.m_timeStep * cp.m_combinedContactStiffness1) / denom; + } + } + + cfm *= invTimeStep; + btVector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB); solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0*rb0->getAngularFactor() : btVector3(0,0,0); - btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB); + btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB); solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*-torqueAxis1*rb1->getAngularFactor() : btVector3(0,0,0); { #ifdef COMPUTE_IMPULSE_DENOM btScalar denom0 = rb0->computeImpulseDenominator(pos1,cp.m_normalWorldOnB); btScalar denom1 = rb1->computeImpulseDenominator(pos2,cp.m_normalWorldOnB); -#else +#else btVector3 vec; btScalar denom0 = 0.f; btScalar denom1 = 0.f; @@ -620,9 +894,9 @@ void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstra vec = ( -solverConstraint.m_angularComponentB).cross(rel_pos2); denom1 = rb1->getInvMass() + cp.m_normalWorldOnB.dot(vec); } -#endif //COMPUTE_IMPULSE_DENOM +#endif //COMPUTE_IMPULSE_DENOM - btScalar denom = relaxation/(denom0+denom1); + btScalar denom = relaxation/(denom0+denom1+cfm); solverConstraint.m_jacDiagABInv = denom; } @@ -658,11 +932,11 @@ void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstra btVector3 vel = vel1 - vel2; btScalar rel_vel = cp.m_normalWorldOnB.dot(vel); - + solverConstraint.m_friction = cp.m_combinedFriction; - + restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution); if (restitution <= btScalar(0.)) { @@ -692,32 +966,28 @@ void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstra btVector3 externalTorqueImpulseA = bodyA->m_originalBody ? bodyA->m_externalTorqueImpulse: btVector3(0,0,0); btVector3 externalForceImpulseB = bodyB->m_originalBody ? bodyB->m_externalForceImpulse: btVector3(0,0,0); btVector3 externalTorqueImpulseB = bodyB->m_originalBody ?bodyB->m_externalTorqueImpulse : btVector3(0,0,0); - - btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(bodyA->m_linearVelocity+externalForceImpulseA) + + btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(bodyA->m_linearVelocity+externalForceImpulseA) + solverConstraint.m_relpos1CrossNormal.dot(bodyA->m_angularVelocity+externalTorqueImpulseA); - btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(bodyB->m_linearVelocity+externalForceImpulseB) + btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(bodyB->m_linearVelocity+externalForceImpulseB) + solverConstraint.m_relpos2CrossNormal.dot(bodyB->m_angularVelocity+externalTorqueImpulseB); btScalar rel_vel = vel1Dotn+vel2Dotn; btScalar positionalError = 0.f; btScalar velocityError = restitution - rel_vel;// * damping; - - btScalar erp = infoGlobal.m_erp2; - if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) - { - erp = infoGlobal.m_erp; - } + if (penetration>0) { positionalError = 0; - velocityError -= penetration / infoGlobal.m_timeStep; + velocityError -= penetration *invTimeStep; } else { - positionalError = -penetration * erp/infoGlobal.m_timeStep; + positionalError = -penetration * erp*invTimeStep; + } btScalar penetrationImpulse = positionalError*solverConstraint.m_jacDiagABInv; @@ -735,7 +1005,7 @@ void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstra solverConstraint.m_rhs = velocityImpulse; solverConstraint.m_rhsPenetration = penetrationImpulse; } - solverConstraint.m_cfm = 0.f; + solverConstraint.m_cfm = cfm*solverConstraint.m_jacDiagABInv; solverConstraint.m_lowerLimit = 0; solverConstraint.m_upperLimit = 1e10f; } @@ -747,7 +1017,7 @@ void btSequentialImpulseConstraintSolver::setupContactConstraint(btSolverConstra -void btSequentialImpulseConstraintSolver::setFrictionConstraintImpulse( btSolverConstraint& solverConstraint, +void btSequentialImpulseConstraintSolver::setFrictionConstraintImpulse( btSolverConstraint& solverConstraint, int solverBodyIdA, int solverBodyIdB, btManifoldPoint& cp, const btContactSolverInfo& infoGlobal) { @@ -812,7 +1082,7 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m ///avoid collision response between two static objects - if (!solverBodyA || (solverBodyA->m_invMass.isZero() && (!solverBodyB || solverBodyB->m_invMass.isZero()))) + if (!solverBodyA || (solverBodyA->m_invMass.fuzzyZero() && (!solverBodyB || solverBodyB->m_invMass.fuzzyZero()))) return; int rollingFriction=1; @@ -826,7 +1096,7 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m btVector3 rel_pos1; btVector3 rel_pos2; btScalar relaxation; - + int frictionIndex = m_tmpSolverContactConstraintPool.size(); btSolverConstraint& solverConstraint = m_tmpSolverContactConstraintPool.expandNonInitializing(); @@ -840,7 +1110,7 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m const btVector3& pos1 = cp.getPositionWorldOnA(); const btVector3& pos2 = cp.getPositionWorldOnB(); - rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin(); + rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin(); rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin(); btVector3 vel1;// = rb0 ? rb0->getVelocityInLocalPoint(rel_pos1) : btVector3(0,0,0); @@ -848,13 +1118,13 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m solverBodyA->getVelocityInLocalPointNoDelta(rel_pos1,vel1); solverBodyB->getVelocityInLocalPointNoDelta(rel_pos2,vel2 ); - + btVector3 vel = vel1 - vel2; btScalar rel_vel = cp.m_normalWorldOnB.dot(vel); setupContactConstraint(solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal, relaxation, rel_pos1, rel_pos2); - + // const btVector3& pos1 = cp.getPositionWorldOnA(); // const btVector3& pos2 = cp.getPositionWorldOnB(); @@ -863,58 +1133,46 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m solverConstraint.m_frictionIndex = m_tmpSolverContactFrictionConstraintPool.size(); - btVector3 angVelA(0,0,0),angVelB(0,0,0); - if (rb0) - angVelA = rb0->getAngularVelocity(); - if (rb1) - angVelB = rb1->getAngularVelocity(); - btVector3 relAngVel = angVelB-angVelA; - if ((cp.m_combinedRollingFriction>0.f) && (rollingFriction>0)) { - //only a single rollingFriction per manifold - rollingFriction--; - if (relAngVel.length()>infoGlobal.m_singleAxisRollingFrictionThreshold) + { - relAngVel.normalize(); - applyAnisotropicFriction(colObj0,relAngVel,btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION); - applyAnisotropicFriction(colObj1,relAngVel,btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION); - if (relAngVel.length()>0.001) - addRollingFrictionConstraint(relAngVel,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation); - - } else - { - addRollingFrictionConstraint(cp.m_normalWorldOnB,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation); + addTorsionalFrictionConstraint(cp.m_normalWorldOnB,solverBodyIdA,solverBodyIdB,frictionIndex,cp,cp.m_combinedSpinningFriction, rel_pos1,rel_pos2,colObj0,colObj1, relaxation); btVector3 axis0,axis1; btPlaneSpace1(cp.m_normalWorldOnB,axis0,axis1); + axis0.normalize(); + axis1.normalize(); + applyAnisotropicFriction(colObj0,axis0,btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION); applyAnisotropicFriction(colObj1,axis0,btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION); applyAnisotropicFriction(colObj0,axis1,btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION); applyAnisotropicFriction(colObj1,axis1,btCollisionObject::CF_ANISOTROPIC_ROLLING_FRICTION); if (axis0.length()>0.001) - addRollingFrictionConstraint(axis0,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation); + addTorsionalFrictionConstraint(axis0,solverBodyIdA,solverBodyIdB,frictionIndex,cp, + cp.m_combinedRollingFriction, rel_pos1,rel_pos2,colObj0,colObj1, relaxation); if (axis1.length()>0.001) - addRollingFrictionConstraint(axis1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation); - + addTorsionalFrictionConstraint(axis1,solverBodyIdA,solverBodyIdB,frictionIndex,cp, + cp.m_combinedRollingFriction, rel_pos1,rel_pos2,colObj0,colObj1, relaxation); + } } ///Bullet has several options to set the friction directions - ///By default, each contact has only a single friction direction that is recomputed automatically very frame + ///By default, each contact has only a single friction direction that is recomputed automatically very frame ///based on the relative linear velocity. ///If the relative velocity it zero, it will automatically compute a friction direction. - + ///You can also enable two friction directions, using the SOLVER_USE_2_FRICTION_DIRECTIONS. ///In that case, the second friction direction will be orthogonal to both contact normal and first friction direction. /// ///If you choose SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION, then the friction will be independent from the relative projected velocity. /// - ///The user can manually override the friction directions for certain contacts using a contact callback, + ///The user can manually override the friction directions for certain contacts using a contact callback, ///and set the cp.m_lateralFrictionInitialized to true ///In that case, you can set the target relative motion in each friction direction (cp.m_contactMotion1 and cp.m_contactMotion2) ///this will give a conveyor belt effect /// - if (!(infoGlobal.m_solverMode & SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !cp.m_lateralFrictionInitialized) + if (!(infoGlobal.m_solverMode & SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !(cp.m_contactPointFlags&BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED)) { cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel; btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2(); @@ -952,22 +1210,22 @@ void btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION)) { - cp.m_lateralFrictionInitialized = true; + cp.m_contactPointFlags|=BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED; } } } else { - addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation,cp.m_contactMotion1, cp.m_contactCFM1); + addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation,cp.m_contactMotion1, cp.m_frictionCFM); if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)) - addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation, cp.m_contactMotion2, cp.m_contactCFM2); + addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation, cp.m_contactMotion2, cp.m_frictionCFM); } setFrictionConstraintImpulse( solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal); - - + + } } @@ -1007,7 +1265,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol bool found=false; for (int b=0;bgetRigidBodyA()==bodies[b]) { found = true; @@ -1039,7 +1297,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol bool found=false; for (int b=0;bgetBody0()==bodies[b]) { found = true; @@ -1063,13 +1321,15 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol } } #endif //BT_ADDITIONAL_DEBUG - - + + for (int i = 0; i < numBodies; i++) { bodies[i]->setCompanionId(-1); } - +#if BT_THREADSAFE + m_kinematicBodyUniqueIdToSolverBodyTable.resize( 0 ); +#endif // BT_THREADSAFE m_tmpSolverBodyPool.reserve(numBodies+1); m_tmpSolverBodyPool.resize(0); @@ -1079,6 +1339,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol //convert all bodies + for (int i=0;igetFlags()&BT_ENABLE_GYROPSCOPIC_FORCE) + if (body->getFlags()&BT_ENABLE_GYROSCOPIC_FORCE_EXPLICIT) { - gyroForce = body->computeGyroscopicForce(infoGlobal.m_maxGyroscopicForce); + gyroForce = body->computeGyroscopicForceExplicit(infoGlobal.m_maxGyroscopicForce); solverBody.m_externalTorqueImpulse -= gyroForce*body->getInvInertiaTensorWorld()*infoGlobal.m_timeStep; } + if (body->getFlags()&BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_WORLD) + { + gyroForce = body->computeGyroscopicImpulseImplicit_World(infoGlobal.m_timeStep); + solverBody.m_externalTorqueImpulse += gyroForce; + } + if (body->getFlags()&BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY) + { + gyroForce = body->computeGyroscopicImpulseImplicit_Body(infoGlobal.m_timeStep); + solverBody.m_externalTorqueImpulse += gyroForce; + + } + + } } - + if (1) { int j; @@ -1115,7 +1389,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol int totalNumRows = 0; int i; - + m_tmpConstraintSizesPool.resizeNoInitialize(numConstraints); //calculate the total number of contraint rows for (i=0;im_originalBody ? bodyAPtr->m_externalForceImpulse : btVector3(0,0,0); @@ -1268,11 +1542,11 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol btVector3 externalForceImpulseB = bodyBPtr->m_originalBody ? bodyBPtr->m_externalForceImpulse : btVector3(0,0,0); btVector3 externalTorqueImpulseB = bodyBPtr->m_originalBody ?bodyBPtr->m_externalTorqueImpulse : btVector3(0,0,0); - - btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(rbA.getLinearVelocity()+externalForceImpulseA) + + btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(rbA.getLinearVelocity()+externalForceImpulseA) + solverConstraint.m_relpos1CrossNormal.dot(rbA.getAngularVelocity()+externalTorqueImpulseA); - - btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(rbB.getLinearVelocity()+externalForceImpulseB) + + btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(rbB.getLinearVelocity()+externalForceImpulseB) + solverConstraint.m_relpos2CrossNormal.dot(rbB.getAngularVelocity()+externalTorqueImpulseB); rel_vel = vel1Dotn+vel2Dotn; @@ -1334,11 +1608,12 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** /*bodies */,int /*numBodies*/,btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* /*debugDrawer*/) { + btScalar leastSquaresResidual = 0.f; int numNonContactPool = m_tmpSolverNonContactConstraintPool.size(); int numConstraintPool = m_tmpSolverContactConstraintPool.size(); int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size(); - + if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER) { if (1) // uncomment this for a bit less random ((iteration & 7) == 0) @@ -1351,7 +1626,7 @@ btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration m_orderNonContactConstraintPool[swapi] = tmp; } - //contact/friction constraints are not solved more than + //contact/friction constraints are not solved more than if (iteration< infoGlobal.m_numIterations) { for (int j=0; jbtScalar(0)) { solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse); solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse; - resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + btScalar residual = resolveSingleConstraintRowGenericSIMD(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold); + leastSquaresResidual += residual*residual; } } } @@ -1452,12 +1734,11 @@ btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration for (j=0;j=(infoGlobal.m_numIterations-1)) + { +#ifdef VERBOSE_RESIDUAL_PRINTF + printf("residual = %f at iteration #%d\n",leastSquaresResidual,iteration); +#endif + break; + } } } else { for ( iteration = 0;iteration=(infoGlobal.m_numIterations-1)) + { +#ifdef VERBOSE_RESIDUAL_PRINTF + printf("residual = %f at iteration #%d\n",leastSquaresResidual,iteration); +#endif + break; } } } @@ -1622,10 +1928,18 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations( for ( int iteration = 0 ; iteration< maxIterations ; iteration++) //for ( int iteration = maxIterations-1 ; iteration >= 0;iteration--) - { - solveSingleIteration(iteration, bodies ,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer); + { + m_leastSquaresResidual = solveSingleIteration(iteration, bodies ,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer); + + if (m_leastSquaresResidual <= infoGlobal.m_leastSquaresResidualThreshold || (iteration>= (maxIterations-1))) + { +#ifdef VERBOSE_RESIDUAL_PRINTF + printf("residual = %f at iteration #%d\n",m_leastSquaresResidual,iteration); +#endif + break; + } } - + } return 0.f; } @@ -1667,7 +1981,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(btCo fb->m_appliedForceBodyB += solverConstr.m_contactNormal2*solverConstr.m_appliedImpulse*constr->getRigidBodyB().getLinearFactor()/infoGlobal.m_timeStep; fb->m_appliedTorqueBodyA += solverConstr.m_relpos1CrossNormal* constr->getRigidBodyA().getAngularFactor()*solverConstr.m_appliedImpulse/infoGlobal.m_timeStep; fb->m_appliedTorqueBodyB += solverConstr.m_relpos2CrossNormal* constr->getRigidBodyB().getAngularFactor()*solverConstr.m_appliedImpulse/infoGlobal.m_timeStep; /*RGM ???? */ - + } constr->internalSetAppliedImpulse(solverConstr.m_appliedImpulse); @@ -1688,7 +2002,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(btCo m_tmpSolverBodyPool[i].writebackVelocityAndTransform(infoGlobal.m_timeStep, infoGlobal.m_splitImpulseTurnErp); else m_tmpSolverBodyPool[i].writebackVelocity(); - + m_tmpSolverBodyPool[i].m_originalBody->setLinearVelocity( m_tmpSolverBodyPool[i].m_linearVelocity+ m_tmpSolverBodyPool[i].m_externalForceImpulse); @@ -1721,13 +2035,13 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod BT_PROFILE("solveGroup"); //you need to provide at least some bodies - + solveGroupCacheFriendlySetup( bodies, numBodies, manifoldPtr, numManifolds,constraints, numConstraints,infoGlobal,debugDrawer); solveGroupCacheFriendlyIterations(bodies, numBodies, manifoldPtr, numManifolds,constraints, numConstraints,infoGlobal,debugDrawer); solveGroupCacheFriendlyFinish(bodies, numBodies, infoGlobal); - + return 0.f; } @@ -1735,5 +2049,3 @@ void btSequentialImpulseConstraintSolver::reset() { m_btSeed2 = 0; } - - diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h index 180d2a385..0dd31d142 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h @@ -27,6 +27,8 @@ class btCollisionObject; #include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" #include "BulletDynamics/ConstraintSolver/btConstraintSolver.h" +typedef btSimdScalar(*btSingleConstraintRowSolver)(btSolverBody&, btSolverBody&, const btSolverConstraint&); + ///The btSequentialImpulseConstraintSolver is a fast SIMD implementation of the Projected Gauss Seidel (iterative LCP) method. ATTRIBUTE_ALIGNED16(class) btSequentialImpulseConstraintSolver : public btConstraintSolver { @@ -43,18 +45,32 @@ protected: btAlignedObjectArray m_tmpConstraintSizesPool; int m_maxOverrideNumSolverIterations; int m_fixedBodyId; + // When running solvers on multiple threads, a race condition exists for Kinematic objects that + // participate in more than one solver. + // The getOrInitSolverBody() function writes the companionId of each body (storing the index of the solver body + // for the current solver). For normal dynamic bodies it isn't an issue because they can only be in one island + // (and therefore one thread) at a time. But kinematic bodies can be in multiple islands at once. + // To avoid this race condition, this solver does not write the companionId, instead it stores the solver body + // index in this solver-local table, indexed by the uniqueId of the body. + btAlignedObjectArray m_kinematicBodyUniqueIdToSolverBodyTable; // only used for multithreading + + btSingleConstraintRowSolver m_resolveSingleConstraintRowGeneric; + btSingleConstraintRowSolver m_resolveSingleConstraintRowLowerLimit; + + btScalar m_leastSquaresResidual; + void setupFrictionConstraint( btSolverConstraint& solverConstraint, const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB, btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2, btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity=0., btScalar cfmSlip=0.); - void setupRollingFrictionConstraint( btSolverConstraint& solverConstraint, const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB, - btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2, + void setupTorsionalFrictionConstraint( btSolverConstraint& solverConstraint, const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB, + btManifoldPoint& cp,btScalar combinedTorsionalFriction, const btVector3& rel_pos1,const btVector3& rel_pos2, btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity=0., btScalar cfmSlip=0.); btSolverConstraint& addFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity=0., btScalar cfmSlip=0.); - btSolverConstraint& addRollingFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity=0, btScalar cfmSlip=0.f); + btSolverConstraint& addTorsionalFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,btScalar torsionalFriction, const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, btScalar desiredVelocity=0, btScalar cfmSlip=0.f); void setupContactConstraint(btSolverConstraint& solverConstraint, int solverBodyIdA, int solverBodyIdB, btManifoldPoint& cp, @@ -76,11 +92,11 @@ protected: void convertContact(btPersistentManifold* manifold,const btContactSolverInfo& infoGlobal); - void resolveSplitPenetrationSIMD( + btSimdScalar resolveSplitPenetrationSIMD( btSolverBody& bodyA,btSolverBody& bodyB, const btSolverConstraint& contactConstraint); - void resolveSplitPenetrationImpulseCacheFriendly( + btScalar resolveSplitPenetrationImpulseCacheFriendly( btSolverBody& bodyA,btSolverBody& bodyB, const btSolverConstraint& contactConstraint); @@ -88,13 +104,10 @@ protected: int getOrInitSolverBody(btCollisionObject& body,btScalar timeStep); void initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject, btScalar timeStep); - void resolveSingleConstraintRowGeneric(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); - - void resolveSingleConstraintRowGenericSIMD(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); - - void resolveSingleConstraintRowLowerLimit(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); - - void resolveSingleConstraintRowLowerLimitSIMD(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); + btSimdScalar resolveSingleConstraintRowGeneric(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); + btSimdScalar resolveSingleConstraintRowGenericSIMD(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); + btSimdScalar resolveSingleConstraintRowLowerLimit(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); + btSimdScalar resolveSingleConstraintRowLowerLimitSIMD(btSolverBody& bodyA,btSolverBody& bodyB,const btSolverConstraint& contactConstraint); protected: @@ -115,9 +128,7 @@ public: virtual ~btSequentialImpulseConstraintSolver(); virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer,btDispatcher* dispatcher); - - - + ///clear internal cached data and reset random seed virtual void reset(); @@ -139,6 +150,33 @@ public: { return BT_SEQUENTIAL_IMPULSE_SOLVER; } + + btSingleConstraintRowSolver getActiveConstraintRowSolverGeneric() + { + return m_resolveSingleConstraintRowGeneric; + } + void setConstraintRowSolverGeneric(btSingleConstraintRowSolver rowSolver) + { + m_resolveSingleConstraintRowGeneric = rowSolver; + } + btSingleConstraintRowSolver getActiveConstraintRowSolverLowerLimit() + { + return m_resolveSingleConstraintRowLowerLimit; + } + void setConstraintRowSolverLowerLimit(btSingleConstraintRowSolver rowSolver) + { + m_resolveSingleConstraintRowLowerLimit = rowSolver; + } + + ///Various implementations of solving a single constraint row using a generic equality constraint, using scalar reference, SSE2 or SSE4 + btSingleConstraintRowSolver getScalarConstraintRowSolverGeneric(); + btSingleConstraintRowSolver getSSE2ConstraintRowSolverGeneric(); + btSingleConstraintRowSolver getSSE4_1ConstraintRowSolverGeneric(); + + ///Various implementations of solving a single constraint row using an inequality (lower limit) constraint, using scalar reference, SSE2 or SSE4 + btSingleConstraintRowSolver getScalarConstraintRowSolverLowerLimit(); + btSingleConstraintRowSolver getSSE2ConstraintRowSolverLowerLimit(); + btSingleConstraintRowSolver getSSE4_1ConstraintRowSolverLowerLimit(); }; diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp index aff9f27f5..f8f81bfe6 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp @@ -539,8 +539,8 @@ void btSliderConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTra btScalar tag_vel = getTargetLinMotorVelocity(); btScalar mot_fact = getMotorFactor(m_linPos, m_lowerLinLimit, m_upperLinLimit, tag_vel, info->fps * currERP); info->m_constraintError[srow] -= signFact * mot_fact * getTargetLinMotorVelocity(); - info->m_lowerLimit[srow] += -getMaxLinMotorForce() * info->fps; - info->m_upperLimit[srow] += getMaxLinMotorForce() * info->fps; + info->m_lowerLimit[srow] += -getMaxLinMotorForce() / info->fps; + info->m_upperLimit[srow] += getMaxLinMotorForce() / info->fps; } if(limit) { @@ -641,8 +641,8 @@ void btSliderConstraint::getInfo2NonVirtual(btConstraintInfo2* info, const btTra } btScalar mot_fact = getMotorFactor(m_angPos, m_lowerAngLimit, m_upperAngLimit, getTargetAngMotorVelocity(), info->fps * currERP); info->m_constraintError[srow] = mot_fact * getTargetAngMotorVelocity(); - info->m_lowerLimit[srow] = -getMaxAngMotorForce() * info->fps; - info->m_upperLimit[srow] = getMaxAngMotorForce() * info->fps; + info->m_lowerLimit[srow] = -getMaxAngMotorForce() / info->fps; + info->m_upperLimit[srow] = getMaxAngMotorForce() / info->fps; } if(limit) { diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h index 57ebb47d8..1957f08a9 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h @@ -25,6 +25,8 @@ TODO: #ifndef BT_SLIDER_CONSTRAINT_H #define BT_SLIDER_CONSTRAINT_H +#include "LinearMath/btScalar.h"//for BT_USE_DOUBLE_PRECISION + #ifdef BT_USE_DOUBLE_PRECISION #define btSliderConstraintData2 btSliderConstraintDoubleData #define btSliderConstraintDataName "btSliderConstraintDoubleData" @@ -280,6 +282,11 @@ public: virtual void setParam(int num, btScalar value, int axis = -1); ///return the local value of parameter virtual btScalar getParam(int num, int axis = -1) const; + + virtual int getFlags() const + { + return m_flags; + } virtual int calculateSerializeBufferSize() const; diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp index 27fdd9d3d..736a64a1c 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp @@ -24,7 +24,7 @@ subject to the following restrictions: btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA) :btTypedObject(type), m_userConstraintType(-1), -m_userConstraintId(-1), +m_userConstraintPtr((void*)-1), m_breakingImpulseThreshold(SIMD_INFINITY), m_isEnabled(true), m_needsFeedback(false), @@ -41,7 +41,7 @@ m_jointFeedback(0) btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB) :btTypedObject(type), m_userConstraintType(-1), -m_userConstraintId(-1), +m_userConstraintPtr((void*)-1), m_breakingImpulseThreshold(SIMD_INFINITY), m_isEnabled(true), m_needsFeedback(false), diff --git a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h index b58f984d0..8a2a2d1ae 100644 --- a/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h +++ b/Engine/lib/bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h @@ -44,6 +44,7 @@ enum btTypedConstraintType D6_SPRING_CONSTRAINT_TYPE, GEAR_CONSTRAINT_TYPE, FIXED_CONSTRAINT_TYPE, + D6_SPRING_2_CONSTRAINT_TYPE, MAX_CONSTRAINT_TYPE }; @@ -65,6 +66,7 @@ enum btConstraintParams ATTRIBUTE_ALIGNED16(struct) btJointFeedback { + BT_DECLARE_ALIGNED_ALLOCATOR(); btVector3 m_appliedForceBodyA; btVector3 m_appliedTorqueBodyA; btVector3 m_appliedForceBodyB; @@ -143,11 +145,6 @@ public: // lo and hi limits for variables (set to -/+ infinity on entry). btScalar *m_lowerLimit,*m_upperLimit; - // findex vector for variables. see the LCP solver interface for a - // description of what this does. this is set to -1 on entry. - // note that the returned indexes are relative to the first index of - // the constraint. - int *findex; // number of solver iterations int m_numIterations; diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/Bullet-C-API.cpp b/Engine/lib/bullet/src/BulletDynamics/Dynamics/Bullet-C-API.cpp deleted file mode 100644 index bd8e27483..000000000 --- a/Engine/lib/bullet/src/BulletDynamics/Dynamics/Bullet-C-API.cpp +++ /dev/null @@ -1,405 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -/* - Draft high-level generic physics C-API. For low-level access, use the physics SDK native API's. - Work in progress, functionality will be added on demand. - - If possible, use the richer Bullet C++ API, by including -*/ - -#include "Bullet-C-Api.h" -#include "btBulletDynamicsCommon.h" -#include "LinearMath/btAlignedAllocator.h" - - - -#include "LinearMath/btVector3.h" -#include "LinearMath/btScalar.h" -#include "LinearMath/btMatrix3x3.h" -#include "LinearMath/btTransform.h" -#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" -#include "BulletCollision/CollisionShapes/btTriangleShape.h" - -#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" -#include "BulletCollision/NarrowPhaseCollision/btPointCollector.h" -#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" -#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" -#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h" -#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" -#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" -#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h" - - -/* - Create and Delete a Physics SDK -*/ - -struct btPhysicsSdk -{ - -// btDispatcher* m_dispatcher; -// btOverlappingPairCache* m_pairCache; -// btConstraintSolver* m_constraintSolver - - btVector3 m_worldAabbMin; - btVector3 m_worldAabbMax; - - - //todo: version, hardware/optimization settings etc? - btPhysicsSdk() - :m_worldAabbMin(-1000,-1000,-1000), - m_worldAabbMax(1000,1000,1000) - { - - } - - -}; - -plPhysicsSdkHandle plNewBulletSdk() -{ - void* mem = btAlignedAlloc(sizeof(btPhysicsSdk),16); - return (plPhysicsSdkHandle)new (mem)btPhysicsSdk; -} - -void plDeletePhysicsSdk(plPhysicsSdkHandle physicsSdk) -{ - btPhysicsSdk* phys = reinterpret_cast(physicsSdk); - btAlignedFree(phys); -} - - -/* Dynamics World */ -plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdkHandle) -{ - btPhysicsSdk* physicsSdk = reinterpret_cast(physicsSdkHandle); - void* mem = btAlignedAlloc(sizeof(btDefaultCollisionConfiguration),16); - btDefaultCollisionConfiguration* collisionConfiguration = new (mem)btDefaultCollisionConfiguration(); - mem = btAlignedAlloc(sizeof(btCollisionDispatcher),16); - btDispatcher* dispatcher = new (mem)btCollisionDispatcher(collisionConfiguration); - mem = btAlignedAlloc(sizeof(btAxisSweep3),16); - btBroadphaseInterface* pairCache = new (mem)btAxisSweep3(physicsSdk->m_worldAabbMin,physicsSdk->m_worldAabbMax); - mem = btAlignedAlloc(sizeof(btSequentialImpulseConstraintSolver),16); - btConstraintSolver* constraintSolver = new(mem) btSequentialImpulseConstraintSolver(); - - mem = btAlignedAlloc(sizeof(btDiscreteDynamicsWorld),16); - return (plDynamicsWorldHandle) new (mem)btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration); -} -void plDeleteDynamicsWorld(plDynamicsWorldHandle world) -{ - //todo: also clean up the other allocations, axisSweep, pairCache,dispatcher,constraintSolver,collisionConfiguration - btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world); - btAlignedFree(dynamicsWorld); -} - -void plStepSimulation(plDynamicsWorldHandle world, plReal timeStep) -{ - btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world); - btAssert(dynamicsWorld); - dynamicsWorld->stepSimulation(timeStep); -} - -void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object) -{ - btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world); - btAssert(dynamicsWorld); - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - - dynamicsWorld->addRigidBody(body); -} - -void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object) -{ - btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world); - btAssert(dynamicsWorld); - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - - dynamicsWorld->removeRigidBody(body); -} - -/* Rigid Body */ - -plRigidBodyHandle plCreateRigidBody( void* user_data, float mass, plCollisionShapeHandle cshape ) -{ - btTransform trans; - trans.setIdentity(); - btVector3 localInertia(0,0,0); - btCollisionShape* shape = reinterpret_cast( cshape); - btAssert(shape); - if (mass) - { - shape->calculateLocalInertia(mass,localInertia); - } - void* mem = btAlignedAlloc(sizeof(btRigidBody),16); - btRigidBody::btRigidBodyConstructionInfo rbci(mass, 0,shape,localInertia); - btRigidBody* body = new (mem)btRigidBody(rbci); - body->setWorldTransform(trans); - body->setUserPointer(user_data); - return (plRigidBodyHandle) body; -} - -void plDeleteRigidBody(plRigidBodyHandle cbody) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(cbody); - btAssert(body); - btAlignedFree( body); -} - - -/* Collision Shape definition */ - -plCollisionShapeHandle plNewSphereShape(plReal radius) -{ - void* mem = btAlignedAlloc(sizeof(btSphereShape),16); - return (plCollisionShapeHandle) new (mem)btSphereShape(radius); - -} - -plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z) -{ - void* mem = btAlignedAlloc(sizeof(btBoxShape),16); - return (plCollisionShapeHandle) new (mem)btBoxShape(btVector3(x,y,z)); -} - -plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height) -{ - //capsule is convex hull of 2 spheres, so use btMultiSphereShape - - const int numSpheres = 2; - btVector3 positions[numSpheres] = {btVector3(0,height,0),btVector3(0,-height,0)}; - btScalar radi[numSpheres] = {radius,radius}; - void* mem = btAlignedAlloc(sizeof(btMultiSphereShape),16); - return (plCollisionShapeHandle) new (mem)btMultiSphereShape(positions,radi,numSpheres); -} -plCollisionShapeHandle plNewConeShape(plReal radius, plReal height) -{ - void* mem = btAlignedAlloc(sizeof(btConeShape),16); - return (plCollisionShapeHandle) new (mem)btConeShape(radius,height); -} - -plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height) -{ - void* mem = btAlignedAlloc(sizeof(btCylinderShape),16); - return (plCollisionShapeHandle) new (mem)btCylinderShape(btVector3(radius,height,radius)); -} - -/* Convex Meshes */ -plCollisionShapeHandle plNewConvexHullShape() -{ - void* mem = btAlignedAlloc(sizeof(btConvexHullShape),16); - return (plCollisionShapeHandle) new (mem)btConvexHullShape(); -} - - -/* Concave static triangle meshes */ -plMeshInterfaceHandle plNewMeshInterface() -{ - return 0; -} - -plCollisionShapeHandle plNewCompoundShape() -{ - void* mem = btAlignedAlloc(sizeof(btCompoundShape),16); - return (plCollisionShapeHandle) new (mem)btCompoundShape(); -} - -void plAddChildShape(plCollisionShapeHandle compoundShapeHandle,plCollisionShapeHandle childShapeHandle, plVector3 childPos,plQuaternion childOrn) -{ - btCollisionShape* colShape = reinterpret_cast(compoundShapeHandle); - btAssert(colShape->getShapeType() == COMPOUND_SHAPE_PROXYTYPE); - btCompoundShape* compoundShape = reinterpret_cast(colShape); - btCollisionShape* childShape = reinterpret_cast(childShapeHandle); - btTransform localTrans; - localTrans.setIdentity(); - localTrans.setOrigin(btVector3(childPos[0],childPos[1],childPos[2])); - localTrans.setRotation(btQuaternion(childOrn[0],childOrn[1],childOrn[2],childOrn[3])); - compoundShape->addChildShape(localTrans,childShape); -} - -void plSetEuler(plReal yaw,plReal pitch,plReal roll, plQuaternion orient) -{ - btQuaternion orn; - orn.setEuler(yaw,pitch,roll); - orient[0] = orn.getX(); - orient[1] = orn.getY(); - orient[2] = orn.getZ(); - orient[3] = orn.getW(); - -} - - -// extern void plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2); -// extern plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle); - - -void plAddVertex(plCollisionShapeHandle cshape, plReal x,plReal y,plReal z) -{ - btCollisionShape* colShape = reinterpret_cast( cshape); - (void)colShape; - btAssert(colShape->getShapeType()==CONVEX_HULL_SHAPE_PROXYTYPE); - btConvexHullShape* convexHullShape = reinterpret_cast( cshape); - convexHullShape->addPoint(btVector3(x,y,z)); - -} - -void plDeleteShape(plCollisionShapeHandle cshape) -{ - btCollisionShape* shape = reinterpret_cast( cshape); - btAssert(shape); - btAlignedFree(shape); -} -void plSetScaling(plCollisionShapeHandle cshape, plVector3 cscaling) -{ - btCollisionShape* shape = reinterpret_cast( cshape); - btAssert(shape); - btVector3 scaling(cscaling[0],cscaling[1],cscaling[2]); - shape->setLocalScaling(scaling); -} - - - -void plSetPosition(plRigidBodyHandle object, const plVector3 position) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - btVector3 pos(position[0],position[1],position[2]); - btTransform worldTrans = body->getWorldTransform(); - worldTrans.setOrigin(pos); - body->setWorldTransform(worldTrans); -} - -void plSetOrientation(plRigidBodyHandle object, const plQuaternion orientation) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - btQuaternion orn(orientation[0],orientation[1],orientation[2],orientation[3]); - btTransform worldTrans = body->getWorldTransform(); - worldTrans.setRotation(orn); - body->setWorldTransform(worldTrans); -} - -void plSetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - btTransform& worldTrans = body->getWorldTransform(); - worldTrans.setFromOpenGLMatrix(matrix); -} - -void plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - body->getWorldTransform().getOpenGLMatrix(matrix); - -} - -void plGetPosition(plRigidBodyHandle object,plVector3 position) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - const btVector3& pos = body->getWorldTransform().getOrigin(); - position[0] = pos.getX(); - position[1] = pos.getY(); - position[2] = pos.getZ(); -} - -void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation) -{ - btRigidBody* body = reinterpret_cast< btRigidBody* >(object); - btAssert(body); - const btQuaternion& orn = body->getWorldTransform().getRotation(); - orientation[0] = orn.getX(); - orientation[1] = orn.getY(); - orientation[2] = orn.getZ(); - orientation[3] = orn.getW(); -} - - - -//plRigidBodyHandle plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal); - -// extern plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal); - -double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]) -{ - btVector3 vp(p1[0], p1[1], p1[2]); - btTriangleShape trishapeA(vp, - btVector3(p2[0], p2[1], p2[2]), - btVector3(p3[0], p3[1], p3[2])); - trishapeA.setMargin(0.000001f); - btVector3 vq(q1[0], q1[1], q1[2]); - btTriangleShape trishapeB(vq, - btVector3(q2[0], q2[1], q2[2]), - btVector3(q3[0], q3[1], q3[2])); - trishapeB.setMargin(0.000001f); - - // btVoronoiSimplexSolver sGjkSimplexSolver; - // btGjkEpaPenetrationDepthSolver penSolverPtr; - - static btSimplexSolverInterface sGjkSimplexSolver; - sGjkSimplexSolver.reset(); - - static btGjkEpaPenetrationDepthSolver Solver0; - static btMinkowskiPenetrationDepthSolver Solver1; - - btConvexPenetrationDepthSolver* Solver = NULL; - - Solver = &Solver1; - - btGjkPairDetector convexConvex(&trishapeA ,&trishapeB,&sGjkSimplexSolver,Solver); - - convexConvex.m_catchDegeneracies = 1; - - // btGjkPairDetector convexConvex(&trishapeA ,&trishapeB,&sGjkSimplexSolver,0); - - btPointCollector gjkOutput; - btGjkPairDetector::ClosestPointInput input; - - - btTransform tr; - tr.setIdentity(); - - input.m_transformA = tr; - input.m_transformB = tr; - - convexConvex.getClosestPoints(input, gjkOutput, 0); - - - if (gjkOutput.m_hasResult) - { - - pb[0] = pa[0] = gjkOutput.m_pointInWorld[0]; - pb[1] = pa[1] = gjkOutput.m_pointInWorld[1]; - pb[2] = pa[2] = gjkOutput.m_pointInWorld[2]; - - pb[0]+= gjkOutput.m_normalOnBInWorld[0] * gjkOutput.m_distance; - pb[1]+= gjkOutput.m_normalOnBInWorld[1] * gjkOutput.m_distance; - pb[2]+= gjkOutput.m_normalOnBInWorld[2] * gjkOutput.m_distance; - - normal[0] = gjkOutput.m_normalOnBInWorld[0]; - normal[1] = gjkOutput.m_normalOnBInWorld[1]; - normal[2] = gjkOutput.m_normalOnBInWorld[2]; - - return gjkOutput.m_distance; - } - return -1.0f; -} - diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp index fb8a4068e..808f2720c 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp @@ -4,8 +4,8 @@ Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -34,6 +34,7 @@ subject to the following restrictions: #include "BulletDynamics/ConstraintSolver/btHingeConstraint.h" #include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h" #include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" +#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h" #include "BulletDynamics/ConstraintSolver/btSliderConstraint.h" #include "BulletDynamics/ConstraintSolver/btContactConstraint.h" @@ -58,7 +59,7 @@ int firstHit=startHit; SIMD_FORCE_INLINE int btGetConstraintIslandId(const btTypedConstraint* lhs) { int islandId; - + const btCollisionObject& rcolObj0 = lhs->getRigidBodyA(); const btCollisionObject& rcolObj1 = lhs->getRigidBodyB(); islandId= rcolObj0.getIslandTag()>=0?rcolObj0.getIslandTag():rcolObj1.getIslandTag(); @@ -88,7 +89,7 @@ struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCal int m_numConstraints; btIDebugDraw* m_debugDrawer; btDispatcher* m_dispatcher; - + btAlignedObjectArray m_bodies; btAlignedObjectArray m_manifolds; btAlignedObjectArray m_constraints; @@ -127,7 +128,7 @@ struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCal m_constraints.resize (0); } - + virtual void processIsland(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifolds,int numManifolds, int islandId) { if (islandId<0) @@ -140,7 +141,7 @@ struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCal btTypedConstraint** startConstraint = 0; int numCurConstraints = 0; int i; - + //find the first constraint for this island for (i=0;isolveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,*m_solverInfo,m_debugDrawer,m_dispatcher); } else { - + for (i=0;isolveGroup( bodies,m_bodies.size(),manifold, m_manifolds.size(),constraints, m_constraints.size() ,*m_solverInfo,m_debugDrawer,m_dispatcher); m_bodies.resize(0); m_manifolds.resize(0); @@ -206,10 +207,10 @@ m_solverIslandCallback ( NULL ), m_constraintSolver(constraintSolver), m_gravity(0,-10,0), m_localTime(0), +m_fixedTimeStep(0), m_synchronizeAllMotionStates(false), m_applySpeculativeContactRestitution(false), m_profileTimings(0), -m_fixedTimeStep(0), m_latencyMotionStateInterpolation(true) { @@ -317,6 +318,9 @@ void btDiscreteDynamicsWorld::debugDrawWorld() } } } + if (getDebugDrawer()) + getDebugDrawer()->flushLines(); + } void btDiscreteDynamicsWorld::clearForces() @@ -329,7 +333,7 @@ void btDiscreteDynamicsWorld::clearForces() //it might break backward compatibility (people applying forces on sleeping objects get never cleared and accumulate on wake-up body->clearForces(); } -} +} ///apply gravity, call this once per timestep void btDiscreteDynamicsWorld::applyGravity() @@ -445,7 +449,7 @@ int btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, applyGravity(); - + for (int i=0;iupdateAction( this, timeStep); } } - - + + void btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep) { BT_PROFILE("updateActivationState"); @@ -634,7 +638,7 @@ void btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep) { if (body->getActivationState() == ACTIVE_TAG) body->setActivationState( WANTS_DEACTIVATION ); - if (body->getActivationState() == ISLAND_SLEEPING) + if (body->getActivationState() == ISLAND_SLEEPING) { body->setAngularVelocity(btVector3(0,0,0)); body->setLinearVelocity(btVector3(0,0,0)); @@ -653,6 +657,9 @@ void btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep) void btDiscreteDynamicsWorld::addConstraint(btTypedConstraint* constraint,bool disableCollisionsBetweenLinkedBodies) { m_constraints.push_back(constraint); + //Make sure the two bodies of a type constraint are different (possibly add this to the btTypedConstraint constructor?) + btAssert(&constraint->getRigidBodyA()!=&constraint->getRigidBodyB()); + if (disableCollisionsBetweenLinkedBodies) { constraint->getRigidBodyA().addConstraintRef(constraint); @@ -704,25 +711,25 @@ void btDiscreteDynamicsWorld::removeCharacter(btActionInterface* character) void btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo) { BT_PROFILE("solveConstraints"); - + m_sortedConstraints.resize( m_constraints.size()); - int i; + int i; for (i=0;isetup(&solverInfo,constraintsPtr,m_sortedConstraints.size(),getDebugDrawer()); m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds()); - + /// solve all the constraints for this island m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld(),m_solverIslandCallback); @@ -743,10 +750,10 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands() for (int i=0;im_predictiveManifolds.size();i++) { btPersistentManifold* manifold = m_predictiveManifolds[i]; - + const btCollisionObject* colObj0 = manifold->getBody0(); const btCollisionObject* colObj1 = manifold->getBody1(); - + if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) && ((colObj1) && (!(colObj1)->isStaticOrKinematicObject()))) { @@ -754,7 +761,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands() } } } - + { int i; int numConstraints = int(m_constraints.size()); @@ -778,7 +785,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands() //Store the island id in each body getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld()); - + } @@ -794,7 +801,7 @@ public: btDispatcher* m_dispatcher; public: - btClosestNotMeConvexResultCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : + btClosestNotMeConvexResultCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : btCollisionWorld::ClosestConvexResultCallback(fromA,toA), m_me(me), m_allowedPenetration(0.0f), @@ -871,32 +878,19 @@ public: int gNumClampedCcdMotions=0; -void btDiscreteDynamicsWorld::createPredictiveContacts(btScalar timeStep) +void btDiscreteDynamicsWorld::createPredictiveContactsInternal( btRigidBody** bodies, int numBodies, btScalar timeStep) { - BT_PROFILE("createPredictiveContacts"); - - { - BT_PROFILE("release predictive contact manifolds"); - - for (int i=0;im_dispatcher1->releaseManifold(manifold); - } - m_predictiveManifolds.clear(); - } - btTransform predictedTrans; - for ( int i=0;isetHitFraction(1.f); if (body->isActive() && (!body->isStaticOrKinematicObject())) { body->predictIntegratedTransform(timeStep, predictedTrans); - + btScalar squareMotion = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin()).length2(); if (getDispatchInfo().m_useContinuous && body->getCcdSquareMotionThreshold() && body->getCcdSquareMotionThreshold() < squareMotion) @@ -910,7 +904,7 @@ void btDiscreteDynamicsWorld::createPredictiveContacts(btScalar timeStep) { public: - StaticOnlyCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : + StaticOnlyCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : btClosestNotMeConvexResultCallback(me,fromA,toA,pairCache,dispatcher) { } @@ -940,14 +934,16 @@ void btDiscreteDynamicsWorld::createPredictiveContacts(btScalar timeStep) convexSweepTest(&tmpSphere,body->getWorldTransform(),modifiedPredictedTrans,sweepResults); if (sweepResults.hasHit() && (sweepResults.m_closestHitFraction < 1.f)) { - + btVector3 distVec = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin())*sweepResults.m_closestHitFraction; btScalar distance = distVec.dot(-sweepResults.m_hitNormalWorld); - + btPersistentManifold* manifold = m_dispatcher1->getNewManifold(body,sweepResults.m_hitCollisionObject); + btMutexLock( &m_predictiveManifoldsMutex ); m_predictiveManifolds.push_back(manifold); - + btMutexUnlock( &m_predictiveManifoldsMutex ); + btVector3 worldPointB = body->getWorldTransform().getOrigin()+distVec; btVector3 localPointB = sweepResults.m_hitCollisionObject->getWorldTransform().inverse()*worldPointB; @@ -967,23 +963,45 @@ void btDiscreteDynamicsWorld::createPredictiveContacts(btScalar timeStep) } } } -void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) + +void btDiscreteDynamicsWorld::releasePredictiveContacts() +{ + BT_PROFILE( "release predictive contact manifolds" ); + + for ( int i = 0; i < m_predictiveManifolds.size(); i++ ) + { + btPersistentManifold* manifold = m_predictiveManifolds[ i ]; + this->m_dispatcher1->releaseManifold( manifold ); + } + m_predictiveManifolds.clear(); +} + +void btDiscreteDynamicsWorld::createPredictiveContacts(btScalar timeStep) +{ + BT_PROFILE("createPredictiveContacts"); + releasePredictiveContacts(); + if (m_nonStaticRigidBodies.size() > 0) + { + createPredictiveContactsInternal( &m_nonStaticRigidBodies[ 0 ], m_nonStaticRigidBodies.size(), timeStep ); + } +} + +void btDiscreteDynamicsWorld::integrateTransformsInternal( btRigidBody** bodies, int numBodies, btScalar timeStep ) { - BT_PROFILE("integrateTransforms"); btTransform predictedTrans; - for ( int i=0;isetHitFraction(1.f); if (body->isActive() && (!body->isStaticOrKinematicObject())) { body->predictIntegratedTransform(timeStep, predictedTrans); - + btScalar squareMotion = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin()).length2(); - + if (getDispatchInfo().m_useContinuous && body->getCcdSquareMotionThreshold() && body->getCcdSquareMotionThreshold() < squareMotion) { @@ -996,7 +1014,7 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) { public: - StaticOnlyCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : + StaticOnlyCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : btClosestNotMeConvexResultCallback(me,fromA,toA,pairCache,dispatcher) { } @@ -1026,7 +1044,7 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) convexSweepTest(&tmpSphere,body->getWorldTransform(),modifiedPredictedTrans,sweepResults); if (sweepResults.hasHit() && (sweepResults.m_closestHitFraction < 1.f)) { - + //printf("clamped integration to hit fraction = %f\n",fraction); body->setHitFraction(sweepResults.m_closestHitFraction); body->predictIntegratedTransform(timeStep*body->getHitFraction(), predictedTrans); @@ -1051,13 +1069,13 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) printf("sm2=%f\n",sm2); } #else - + //don't apply the collision response right now, it will happen next frame //if you really need to, you can uncomment next 3 lines. Note that is uses zero restitution. //btScalar appliedImpulse = 0.f; //btScalar depth = 0.f; //appliedImpulse = resolveSingleCollision(body,(btCollisionObject*)sweepResults.m_hitCollisionObject,sweepResults.m_hitPointWorld,sweepResults.m_hitNormalWorld,getSolverInfo(), depth); - + #endif @@ -1065,15 +1083,25 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) } } } - + body->proceedToTransform( predictedTrans); - + } } - ///this should probably be switched on by default, but it is not well tested yet +} + +void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) +{ + BT_PROFILE("integrateTransforms"); + if (m_nonStaticRigidBodies.size() > 0) + { + integrateTransformsInternal(&m_nonStaticRigidBodies[0], m_nonStaticRigidBodies.size(), timeStep); + } + + ///this should probably be switched on by default, but it is not well tested yet if (m_applySpeculativeContactRestitution) { BT_PROFILE("apply speculative contact restitution"); @@ -1082,7 +1110,7 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) btPersistentManifold* manifold = m_predictiveManifolds[i]; btRigidBody* body0 = btRigidBody::upcast((btCollisionObject*)manifold->getBody0()); btRigidBody* body1 = btRigidBody::upcast((btCollisionObject*)manifold->getBody1()); - + for (int p=0;pgetNumContacts();p++) { const btManifoldPoint& pt = manifold->getContactPoint(p); @@ -1092,11 +1120,11 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) //if (pt.getDistance()>0 && combinedRestitution>0 && pt.m_appliedImpulse != 0.f) { btVector3 imp = -pt.m_normalWorldOnB * pt.m_appliedImpulse* combinedRestitution; - + const btVector3& pos1 = pt.getPositionWorldOnA(); const btVector3& pos2 = pt.getPositionWorldOnB(); - btVector3 rel_pos0 = pos1 - body0->getWorldTransform().getOrigin(); + btVector3 rel_pos0 = pos1 - body0->getWorldTransform().getOrigin(); btVector3 rel_pos1 = pos2 - body1->getWorldTransform().getOrigin(); if (body0) @@ -1107,14 +1135,12 @@ void btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep) } } } - } - void btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep) { BT_PROFILE("predictUnconstraintMotion"); @@ -1146,7 +1172,7 @@ void btDiscreteDynamicsWorld::startProfiling(btScalar timeStep) - + void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) { @@ -1166,12 +1192,12 @@ void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) btTransform tr; tr.setIdentity(); btVector3 pivot = p2pC->getPivotInA(); - pivot = p2pC->getRigidBodyA().getCenterOfMassTransform() * pivot; + pivot = p2pC->getRigidBodyA().getCenterOfMassTransform() * pivot; tr.setOrigin(pivot); getDebugDrawer()->drawTransform(tr, dbgDrawSize); - // that ideally should draw the same frame + // that ideally should draw the same frame pivot = p2pC->getPivotInB(); - pivot = p2pC->getRigidBodyB().getCenterOfMassTransform() * pivot; + pivot = p2pC->getRigidBodyB().getCenterOfMassTransform() * pivot; tr.setOrigin(pivot); if(drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize); } @@ -1190,13 +1216,13 @@ void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) break; } bool drawSect = true; - if(minAng > maxAng) + if(!pHinge->hasLimit()) { minAng = btScalar(0.f); maxAng = SIMD_2_PI; drawSect = false; } - if(drawLimits) + if(drawLimits) { btVector3& center = tr.getOrigin(); btVector3 normal = tr.getBasis().getColumn(2); @@ -1231,7 +1257,7 @@ void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) getDebugDrawer()->drawLine(tr.getOrigin(), pCur, btVector3(0,0,0)); pPrev = pCur; - } + } btScalar tws = pCT->getTwistSpan(); btScalar twa = pCT->getTwistAngle(); bool useFrameB = (pCT->getRigidBodyB().getInvMass() > btScalar(0.f)); @@ -1259,7 +1285,7 @@ void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) if(drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize); tr = p6DOF->getCalculatedTransformB(); if(drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize); - if(drawLimits) + if(drawLimits) { tr = p6DOF->getCalculatedTransformA(); const btVector3& center = p6DOF->getCalculatedTransformB().getOrigin(); @@ -1300,6 +1326,57 @@ void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) } } break; + ///note: the code for D6_SPRING_2_CONSTRAINT_TYPE is identical to D6_CONSTRAINT_TYPE, the D6_CONSTRAINT_TYPE+D6_SPRING_CONSTRAINT_TYPE will likely become obsolete/deprecated at some stage + case D6_SPRING_2_CONSTRAINT_TYPE: + { + { + btGeneric6DofSpring2Constraint* p6DOF = (btGeneric6DofSpring2Constraint*)constraint; + btTransform tr = p6DOF->getCalculatedTransformA(); + if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize); + tr = p6DOF->getCalculatedTransformB(); + if (drawFrames) getDebugDrawer()->drawTransform(tr, dbgDrawSize); + if (drawLimits) + { + tr = p6DOF->getCalculatedTransformA(); + const btVector3& center = p6DOF->getCalculatedTransformB().getOrigin(); + btVector3 up = tr.getBasis().getColumn(2); + btVector3 axis = tr.getBasis().getColumn(0); + btScalar minTh = p6DOF->getRotationalLimitMotor(1)->m_loLimit; + btScalar maxTh = p6DOF->getRotationalLimitMotor(1)->m_hiLimit; + btScalar minPs = p6DOF->getRotationalLimitMotor(2)->m_loLimit; + btScalar maxPs = p6DOF->getRotationalLimitMotor(2)->m_hiLimit; + getDebugDrawer()->drawSpherePatch(center, up, axis, dbgDrawSize * btScalar(.9f), minTh, maxTh, minPs, maxPs, btVector3(0, 0, 0)); + axis = tr.getBasis().getColumn(1); + btScalar ay = p6DOF->getAngle(1); + btScalar az = p6DOF->getAngle(2); + btScalar cy = btCos(ay); + btScalar sy = btSin(ay); + btScalar cz = btCos(az); + btScalar sz = btSin(az); + btVector3 ref; + ref[0] = cy*cz*axis[0] + cy*sz*axis[1] - sy*axis[2]; + ref[1] = -sz*axis[0] + cz*axis[1]; + ref[2] = cz*sy*axis[0] + sz*sy*axis[1] + cy*axis[2]; + tr = p6DOF->getCalculatedTransformB(); + btVector3 normal = -tr.getBasis().getColumn(0); + btScalar minFi = p6DOF->getRotationalLimitMotor(0)->m_loLimit; + btScalar maxFi = p6DOF->getRotationalLimitMotor(0)->m_hiLimit; + if (minFi > maxFi) + { + getDebugDrawer()->drawArc(center, normal, ref, dbgDrawSize, dbgDrawSize, -SIMD_PI, SIMD_PI, btVector3(0, 0, 0), false); + } + else if (minFi < maxFi) + { + getDebugDrawer()->drawArc(center, normal, ref, dbgDrawSize, dbgDrawSize, minFi, maxFi, btVector3(0, 0, 0), true); + } + tr = p6DOF->getCalculatedTransformA(); + btVector3 bbMin = p6DOF->getTranslationalLimitMotor()->m_lowerLimit; + btVector3 bbMax = p6DOF->getTranslationalLimitMotor()->m_upperLimit; + getDebugDrawer()->drawBox(bbMin, bbMax, tr, btVector3(0, 0, 0)); + } + } + break; + } case SLIDER_CONSTRAINT_TYPE: { btSliderConstraint* pSlider = (btSliderConstraint*)constraint; @@ -1322,7 +1399,7 @@ void btDiscreteDynamicsWorld::debugDrawConstraint(btTypedConstraint* constraint) } } break; - default : + default : break; } return; @@ -1422,19 +1499,19 @@ void btDiscreteDynamicsWorld::serializeDynamicsWorldInfo(btSerializer* serialize worldInfo->m_solverInfo.m_globalCfm = getSolverInfo().m_globalCfm; worldInfo->m_solverInfo.m_splitImpulsePenetrationThreshold = getSolverInfo().m_splitImpulsePenetrationThreshold; worldInfo->m_solverInfo.m_splitImpulseTurnErp = getSolverInfo().m_splitImpulseTurnErp; - + worldInfo->m_solverInfo.m_linearSlop = getSolverInfo().m_linearSlop; worldInfo->m_solverInfo.m_warmstartingFactor = getSolverInfo().m_warmstartingFactor; worldInfo->m_solverInfo.m_maxGyroscopicForce = getSolverInfo().m_maxGyroscopicForce; worldInfo->m_solverInfo.m_singleAxisRollingFrictionThreshold = getSolverInfo().m_singleAxisRollingFrictionThreshold; - + worldInfo->m_solverInfo.m_numIterations = getSolverInfo().m_numIterations; worldInfo->m_solverInfo.m_solverMode = getSolverInfo().m_solverMode; worldInfo->m_solverInfo.m_restingContactRestitutionThreshold = getSolverInfo().m_restingContactRestitutionThreshold; worldInfo->m_solverInfo.m_minimumSolverBatchSize = getSolverInfo().m_minimumSolverBatchSize; - + worldInfo->m_solverInfo.m_splitImpulse = getSolverInfo().m_splitImpulse; - + #ifdef BT_USE_DOUBLE_PRECISION const char* structType = "btDynamicsWorldDoubleData"; #else//BT_USE_DOUBLE_PRECISION @@ -1450,10 +1527,10 @@ void btDiscreteDynamicsWorld::serialize(btSerializer* serializer) serializeDynamicsWorldInfo(serializer); - serializeRigidBodies(serializer); - serializeCollisionObjects(serializer); + serializeRigidBodies(serializer); + serializer->finishSerialization(); } diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h index d8a34b7da..d2789cc6b 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h @@ -30,6 +30,7 @@ class btIDebugDraw; struct InplaceSolverIslandCallback; #include "LinearMath/btAlignedObjectArray.h" +#include "LinearMath/btThreads.h" ///btDiscreteDynamicsWorld provides discrete rigid body simulation @@ -68,9 +69,11 @@ protected: bool m_latencyMotionStateInterpolation; btAlignedObjectArray m_predictiveManifolds; + btSpinMutex m_predictiveManifoldsMutex; // used to synchronize threads creating predictive contacts virtual void predictUnconstraintMotion(btScalar timeStep); + void integrateTransformsInternal( btRigidBody** bodies, int numBodies, btScalar timeStep ); // can be called in parallel virtual void integrateTransforms(btScalar timeStep); virtual void calculateSimulationIslands(); @@ -85,7 +88,9 @@ protected: virtual void internalSingleStepSimulation( btScalar timeStep); - void createPredictiveContacts(btScalar timeStep); + void releasePredictiveContacts(); + void createPredictiveContactsInternal( btRigidBody** bodies, int numBodies, btScalar timeStep ); // can be called in parallel + virtual void createPredictiveContacts(btScalar timeStep); virtual void saveKinematicState(btScalar timeStep); @@ -151,7 +156,7 @@ public: virtual void removeCollisionObject(btCollisionObject* collisionObject); - void debugDrawConstraint(btTypedConstraint* constraint); + virtual void debugDrawConstraint(btTypedConstraint* constraint); virtual void debugDrawWorld(); diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp new file mode 100644 index 000000000..5e51a994c --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp @@ -0,0 +1,162 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#include "btDiscreteDynamicsWorldMt.h" + +//collision detection +#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" +#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" +#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +#include "BulletCollision/CollisionShapes/btCollisionShape.h" +#include "btSimulationIslandManagerMt.h" +#include "LinearMath/btTransformUtil.h" +#include "LinearMath/btQuickprof.h" + +//rigidbody & constraints +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" +#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" +#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" +#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" +#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h" +#include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h" +#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" +#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h" +#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h" +#include "BulletDynamics/ConstraintSolver/btContactConstraint.h" + + +#include "LinearMath/btIDebugDraw.h" +#include "BulletCollision/CollisionShapes/btSphereShape.h" + + +#include "BulletDynamics/Dynamics/btActionInterface.h" +#include "LinearMath/btQuickprof.h" +#include "LinearMath/btMotionState.h" + +#include "LinearMath/btSerializer.h" + + +struct InplaceSolverIslandCallbackMt : public btSimulationIslandManagerMt::IslandCallback +{ + btContactSolverInfo* m_solverInfo; + btConstraintSolver* m_solver; + btIDebugDraw* m_debugDrawer; + btDispatcher* m_dispatcher; + + InplaceSolverIslandCallbackMt( + btConstraintSolver* solver, + btStackAlloc* stackAlloc, + btDispatcher* dispatcher) + :m_solverInfo(NULL), + m_solver(solver), + m_debugDrawer(NULL), + m_dispatcher(dispatcher) + { + + } + + InplaceSolverIslandCallbackMt& operator=(InplaceSolverIslandCallbackMt& other) + { + btAssert(0); + (void)other; + return *this; + } + + SIMD_FORCE_INLINE void setup ( btContactSolverInfo* solverInfo, btIDebugDraw* debugDrawer) + { + btAssert(solverInfo); + m_solverInfo = solverInfo; + m_debugDrawer = debugDrawer; + } + + + virtual void processIsland( btCollisionObject** bodies, + int numBodies, + btPersistentManifold** manifolds, + int numManifolds, + btTypedConstraint** constraints, + int numConstraints, + int islandId + ) + { + m_solver->solveGroup( bodies, + numBodies, + manifolds, + numManifolds, + constraints, + numConstraints, + *m_solverInfo, + m_debugDrawer, + m_dispatcher + ); + } + +}; + + + +btDiscreteDynamicsWorldMt::btDiscreteDynamicsWorldMt(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration) +: btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration) +{ + if (m_ownsIslandManager) + { + m_islandManager->~btSimulationIslandManager(); + btAlignedFree( m_islandManager); + } + { + void* mem = btAlignedAlloc(sizeof(InplaceSolverIslandCallbackMt),16); + m_solverIslandCallbackMt = new (mem) InplaceSolverIslandCallbackMt (m_constraintSolver, 0, dispatcher); + } + { + void* mem = btAlignedAlloc(sizeof(btSimulationIslandManagerMt),16); + btSimulationIslandManagerMt* im = new (mem) btSimulationIslandManagerMt(); + m_islandManager = im; + im->setMinimumSolverBatchSize( m_solverInfo.m_minimumSolverBatchSize ); + } +} + + +btDiscreteDynamicsWorldMt::~btDiscreteDynamicsWorldMt() +{ + if (m_solverIslandCallbackMt) + { + m_solverIslandCallbackMt->~InplaceSolverIslandCallbackMt(); + btAlignedFree(m_solverIslandCallbackMt); + } + if (m_ownsConstraintSolver) + { + m_constraintSolver->~btConstraintSolver(); + btAlignedFree(m_constraintSolver); + } +} + + +void btDiscreteDynamicsWorldMt::solveConstraints(btContactSolverInfo& solverInfo) +{ + BT_PROFILE("solveConstraints"); + + m_solverIslandCallbackMt->setup(&solverInfo, getDebugDrawer()); + m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds()); + + /// solve all the constraints for this island + btSimulationIslandManagerMt* im = static_cast(m_islandManager); + im->buildAndProcessIslands( getCollisionWorld()->getDispatcher(), getCollisionWorld(), m_constraints, m_solverIslandCallbackMt ); + + m_constraintSolver->allSolved(solverInfo, m_debugDrawer); +} + + diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h new file mode 100644 index 000000000..b28371b51 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h @@ -0,0 +1,42 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#ifndef BT_DISCRETE_DYNAMICS_WORLD_MT_H +#define BT_DISCRETE_DYNAMICS_WORLD_MT_H + +#include "btDiscreteDynamicsWorld.h" + +struct InplaceSolverIslandCallbackMt; + +/// +/// btDiscreteDynamicsWorldMt -- a version of DiscreteDynamicsWorld with some minor changes to support +/// solving simulation islands on multiple threads. +/// +ATTRIBUTE_ALIGNED16(class) btDiscreteDynamicsWorldMt : public btDiscreteDynamicsWorld +{ +protected: + InplaceSolverIslandCallbackMt* m_solverIslandCallbackMt; + + virtual void solveConstraints(btContactSolverInfo& solverInfo); + +public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + + btDiscreteDynamicsWorldMt(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration); + virtual ~btDiscreteDynamicsWorldMt(); +}; + +#endif //BT_DISCRETE_DYNAMICS_WORLD_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h index 35dd1400f..4d65f5489 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h @@ -34,7 +34,8 @@ enum btDynamicsWorldType BT_DISCRETE_DYNAMICS_WORLD=2, BT_CONTINUOUS_DYNAMICS_WORLD=3, BT_SOFT_RIGID_DYNAMICS_WORLD=4, - BT_GPU_DYNAMICS_WORLD=5 + BT_GPU_DYNAMICS_WORLD=5, + BT_SOFT_MULTIBODY_DYNAMICS_WORLD=6 }; ///The btDynamicsWorld is the interface class for several dynamics implementation, basic, discrete, parallel, and continuous etc. diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp index 222f90066..9402a658c 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp @@ -79,6 +79,8 @@ void btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo& //moved to btCollisionObject m_friction = constructionInfo.m_friction; m_rollingFriction = constructionInfo.m_rollingFriction; + m_spinningFriction = constructionInfo.m_spinningFriction; + m_restitution = constructionInfo.m_restitution; setCollisionShape( constructionInfo.m_collisionShape ); @@ -87,7 +89,7 @@ void btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo& setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia); updateInertiaTensor(); - m_rigidbodyFlags = 0; + m_rigidbodyFlags = BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY; m_deltaLinearVelocity.setZero(); @@ -257,12 +259,41 @@ void btRigidBody::updateInertiaTensor() } -btVector3 btRigidBody::computeGyroscopicForce(btScalar maxGyroscopicForce) const + +btVector3 btRigidBody::getLocalInertia() const { + btVector3 inertiaLocal; - inertiaLocal[0] = 1.f/getInvInertiaDiagLocal()[0]; - inertiaLocal[1] = 1.f/getInvInertiaDiagLocal()[1]; - inertiaLocal[2] = 1.f/getInvInertiaDiagLocal()[2]; + const btVector3 inertia = m_invInertiaLocal; + inertiaLocal.setValue(inertia.x() != btScalar(0.0) ? btScalar(1.0) / inertia.x() : btScalar(0.0), + inertia.y() != btScalar(0.0) ? btScalar(1.0) / inertia.y() : btScalar(0.0), + inertia.z() != btScalar(0.0) ? btScalar(1.0) / inertia.z() : btScalar(0.0)); + return inertiaLocal; +} + +inline btVector3 evalEulerEqn(const btVector3& w1, const btVector3& w0, const btVector3& T, const btScalar dt, + const btMatrix3x3 &I) +{ + const btVector3 w2 = I*w1 + w1.cross(I*w1)*dt - (T*dt + I*w0); + return w2; +} + +inline btMatrix3x3 evalEulerEqnDeriv(const btVector3& w1, const btVector3& w0, const btScalar dt, + const btMatrix3x3 &I) +{ + + btMatrix3x3 w1x, Iw1x; + const btVector3 Iwi = (I*w1); + w1.getSkewSymmetricMatrix(&w1x[0], &w1x[1], &w1x[2]); + Iwi.getSkewSymmetricMatrix(&Iw1x[0], &Iw1x[1], &Iw1x[2]); + + const btMatrix3x3 dfw1 = I + (w1x*I - Iw1x)*dt; + return dfw1; +} + +btVector3 btRigidBody::computeGyroscopicForceExplicit(btScalar maxGyroscopicForce) const +{ + btVector3 inertiaLocal = getLocalInertia(); btMatrix3x3 inertiaTensorWorld = getWorldTransform().getBasis().scaled(inertiaLocal) * getWorldTransform().getBasis().transpose(); btVector3 tmp = inertiaTensorWorld*getAngularVelocity(); btVector3 gf = getAngularVelocity().cross(tmp); @@ -274,6 +305,85 @@ btVector3 btRigidBody::computeGyroscopicForce(btScalar maxGyroscopicForce) const return gf; } + +btVector3 btRigidBody::computeGyroscopicImpulseImplicit_Body(btScalar step) const +{ + btVector3 idl = getLocalInertia(); + btVector3 omega1 = getAngularVelocity(); + btQuaternion q = getWorldTransform().getRotation(); + + // Convert to body coordinates + btVector3 omegab = quatRotate(q.inverse(), omega1); + btMatrix3x3 Ib; + Ib.setValue(idl.x(),0,0, + 0,idl.y(),0, + 0,0,idl.z()); + + btVector3 ibo = Ib*omegab; + + // Residual vector + btVector3 f = step * omegab.cross(ibo); + + btMatrix3x3 skew0; + omegab.getSkewSymmetricMatrix(&skew0[0], &skew0[1], &skew0[2]); + btVector3 om = Ib*omegab; + btMatrix3x3 skew1; + om.getSkewSymmetricMatrix(&skew1[0],&skew1[1],&skew1[2]); + + // Jacobian + btMatrix3x3 J = Ib + (skew0*Ib - skew1)*step; + +// btMatrix3x3 Jinv = J.inverse(); +// btVector3 omega_div = Jinv*f; + btVector3 omega_div = J.solve33(f); + + // Single Newton-Raphson update + omegab = omegab - omega_div;//Solve33(J, f); + // Back to world coordinates + btVector3 omega2 = quatRotate(q,omegab); + btVector3 gf = omega2-omega1; + return gf; +} + + + +btVector3 btRigidBody::computeGyroscopicImpulseImplicit_World(btScalar step) const +{ + // use full newton-euler equations. common practice to drop the wxIw term. want it for better tumbling behavior. + // calculate using implicit euler step so it's stable. + + const btVector3 inertiaLocal = getLocalInertia(); + const btVector3 w0 = getAngularVelocity(); + + btMatrix3x3 I; + + I = m_worldTransform.getBasis().scaled(inertiaLocal) * + m_worldTransform.getBasis().transpose(); + + // use newtons method to find implicit solution for new angular velocity (w') + // f(w') = -(T*step + Iw) + Iw' + w' + w'xIw'*step = 0 + // df/dw' = I + 1xIw'*step + w'xI*step + + btVector3 w1 = w0; + + // one step of newton's method + { + const btVector3 fw = evalEulerEqn(w1, w0, btVector3(0, 0, 0), step, I); + const btMatrix3x3 dfw = evalEulerEqnDeriv(w1, w0, step, I); + + btVector3 dw; + dw = dfw.solve33(fw); + //const btMatrix3x3 dfw_inv = dfw.inverse(); + //dw = dfw_inv*fw; + + w1 -= dw; + } + + btVector3 gf = (w1 - w0); + return gf; +} + + void btRigidBody::integrateVelocities(btScalar step) { if (isStaticOrKinematicObject()) @@ -317,38 +427,50 @@ void btRigidBody::setCenterOfMassTransform(const btTransform& xform) } -bool btRigidBody::checkCollideWithOverride(const btCollisionObject* co) const -{ - const btRigidBody* otherRb = btRigidBody::upcast(co); - if (!otherRb) - return true; - - for (int i = 0; i < m_constraintRefs.size(); ++i) - { - const btTypedConstraint* c = m_constraintRefs[i]; - if (c->isEnabled()) - if (&c->getRigidBodyA() == otherRb || &c->getRigidBodyB() == otherRb) - return false; - } - - return true; -} void btRigidBody::addConstraintRef(btTypedConstraint* c) { - int index = m_constraintRefs.findLinearSearch(c); - if (index == m_constraintRefs.size()) - m_constraintRefs.push_back(c); + ///disable collision with the 'other' body - m_checkCollideWith = true; + int index = m_constraintRefs.findLinearSearch(c); + //don't add constraints that are already referenced + //btAssert(index == m_constraintRefs.size()); + if (index == m_constraintRefs.size()) + { + m_constraintRefs.push_back(c); + btCollisionObject* colObjA = &c->getRigidBodyA(); + btCollisionObject* colObjB = &c->getRigidBodyB(); + if (colObjA == this) + { + colObjA->setIgnoreCollisionCheck(colObjB, true); + } + else + { + colObjB->setIgnoreCollisionCheck(colObjA, true); + } + } } void btRigidBody::removeConstraintRef(btTypedConstraint* c) { - m_constraintRefs.remove(c); - m_checkCollideWith = m_constraintRefs.size() > 0; + int index = m_constraintRefs.findLinearSearch(c); + //don't remove constraints that are not referenced + if(index < m_constraintRefs.size()) + { + m_constraintRefs.remove(c); + btCollisionObject* colObjA = &c->getRigidBodyA(); + btCollisionObject* colObjB = &c->getRigidBodyB(); + if (colObjA == this) + { + colObjA->setIgnoreCollisionCheck(colObjB, false); + } + else + { + colObjB->setIgnoreCollisionCheck(colObjA, false); + } + } } int btRigidBody::calculateSerializeBufferSize() const diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h index ed90fb441..372245031 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btRigidBody.h @@ -41,10 +41,13 @@ extern bool gDisableDeactivation; enum btRigidBodyFlags { BT_DISABLE_WORLD_GRAVITY = 1, - ///The BT_ENABLE_GYROPSCOPIC_FORCE can easily introduce instability - ///So generally it is best to not enable it. - ///If really needed, run at a high frequency like 1000 Hertz: ///See Demos/GyroscopicDemo for an example use - BT_ENABLE_GYROPSCOPIC_FORCE = 2 + ///BT_ENABLE_GYROPSCOPIC_FORCE flags is enabled by default in Bullet 2.83 and onwards. + ///and it BT_ENABLE_GYROPSCOPIC_FORCE becomes equivalent to BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY + ///See Demos/GyroscopicDemo and computeGyroscopicImpulseImplicit + BT_ENABLE_GYROSCOPIC_FORCE_EXPLICIT = 2, + BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_WORLD=4, + BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY=8, + BT_ENABLE_GYROPSCOPIC_FORCE = BT_ENABLE_GYROSCOPIC_FORCE_IMPLICIT_BODY, }; @@ -87,7 +90,7 @@ class btRigidBody : public btCollisionObject //m_optionalMotionState allows to automatic synchronize the world transform for active objects btMotionState* m_optionalMotionState; - //keep track of typed constraints referencing this rigid body + //keep track of typed constraints referencing this rigid body, to disable collision between linked bodies btAlignedObjectArray m_constraintRefs; int m_rigidbodyFlags; @@ -132,6 +135,8 @@ public: ///the m_rollingFriction prevents rounded shapes, such as spheres, cylinders and capsules from rolling forever. ///See Bullet/Demos/RollingFrictionDemo for usage btScalar m_rollingFriction; + btScalar m_spinningFriction;//torsional friction around contact normal + ///best simulation results using zero restitution. btScalar m_restitution; @@ -155,6 +160,7 @@ public: m_angularDamping(btScalar(0.)), m_friction(btScalar(0.5)), m_rollingFriction(btScalar(0)), + m_spinningFriction(btScalar(0)), m_restitution(btScalar(0.)), m_linearSleepingThreshold(btScalar(0.8)), m_angularSleepingThreshold(btScalar(1.f)), @@ -506,8 +512,6 @@ public: return (getBroadphaseProxy() != 0); } - virtual bool checkCollideWithOverride(const btCollisionObject* co) const; - void addConstraintRef(btTypedConstraint* c); void removeConstraintRef(btTypedConstraint* c); @@ -531,7 +535,18 @@ public: return m_rigidbodyFlags; } - btVector3 computeGyroscopicForce(btScalar maxGyroscopicForce) const; + + + + ///perform implicit force computation in world space + btVector3 computeGyroscopicImpulseImplicit_World(btScalar dt) const; + + ///perform implicit force computation in body space (inertial frame) + btVector3 computeGyroscopicImpulseImplicit_Body(btScalar step) const; + + ///explicit version is best avoided, it gains energy + btVector3 computeGyroscopicForceExplicit(btScalar maxGyroscopicForce) const; + btVector3 getLocalInertia() const; /////////////////////////////////////////////// diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp new file mode 100644 index 000000000..ad63b6ee0 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp @@ -0,0 +1,641 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#include "LinearMath/btScalar.h" +#include "btSimulationIslandManagerMt.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "BulletCollision/CollisionDispatch/btCollisionWorld.h" +#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" + +//#include +#include "LinearMath/btQuickprof.h" + + +SIMD_FORCE_INLINE int calcBatchCost( int bodies, int manifolds, int constraints ) +{ + // rough estimate of the cost of a batch, used for merging + int batchCost = bodies + 8 * manifolds + 4 * constraints; + return batchCost; +} + + +SIMD_FORCE_INLINE int calcBatchCost( const btSimulationIslandManagerMt::Island* island ) +{ + return calcBatchCost( island->bodyArray.size(), island->manifoldArray.size(), island->constraintArray.size() ); +} + + +btSimulationIslandManagerMt::btSimulationIslandManagerMt() +{ + m_minimumSolverBatchSize = calcBatchCost(0, 128, 0); + m_batchIslandMinBodyCount = 32; + m_islandDispatch = defaultIslandDispatch; + m_batchIsland = NULL; +} + + +btSimulationIslandManagerMt::~btSimulationIslandManagerMt() +{ + for ( int i = 0; i < m_allocatedIslands.size(); ++i ) + { + delete m_allocatedIslands[ i ]; + } + m_allocatedIslands.resize( 0 ); + m_activeIslands.resize( 0 ); + m_freeIslands.resize( 0 ); +} + + +inline int getIslandId(const btPersistentManifold* lhs) +{ + const btCollisionObject* rcolObj0 = static_cast(lhs->getBody0()); + const btCollisionObject* rcolObj1 = static_cast(lhs->getBody1()); + int islandId = rcolObj0->getIslandTag() >= 0 ? rcolObj0->getIslandTag() : rcolObj1->getIslandTag(); + return islandId; +} + + +SIMD_FORCE_INLINE int btGetConstraintIslandId( const btTypedConstraint* lhs ) +{ + const btCollisionObject& rcolObj0 = lhs->getRigidBodyA(); + const btCollisionObject& rcolObj1 = lhs->getRigidBodyB(); + int islandId = rcolObj0.getIslandTag() >= 0 ? rcolObj0.getIslandTag() : rcolObj1.getIslandTag(); + return islandId; +} + +/// function object that routes calls to operator< +class IslandBatchSizeSortPredicate +{ +public: + bool operator() ( const btSimulationIslandManagerMt::Island* lhs, const btSimulationIslandManagerMt::Island* rhs ) const + { + int lCost = calcBatchCost( lhs ); + int rCost = calcBatchCost( rhs ); + return lCost > rCost; + } +}; + + +class IslandBodyCapacitySortPredicate +{ +public: + bool operator() ( const btSimulationIslandManagerMt::Island* lhs, const btSimulationIslandManagerMt::Island* rhs ) const + { + return lhs->bodyArray.capacity() > rhs->bodyArray.capacity(); + } +}; + + +void btSimulationIslandManagerMt::Island::append( const Island& other ) +{ + // append bodies + for ( int i = 0; i < other.bodyArray.size(); ++i ) + { + bodyArray.push_back( other.bodyArray[ i ] ); + } + // append manifolds + for ( int i = 0; i < other.manifoldArray.size(); ++i ) + { + manifoldArray.push_back( other.manifoldArray[ i ] ); + } + // append constraints + for ( int i = 0; i < other.constraintArray.size(); ++i ) + { + constraintArray.push_back( other.constraintArray[ i ] ); + } +} + + +bool btIsBodyInIsland( const btSimulationIslandManagerMt::Island& island, const btCollisionObject* obj ) +{ + for ( int i = 0; i < island.bodyArray.size(); ++i ) + { + if ( island.bodyArray[ i ] == obj ) + { + return true; + } + } + return false; +} + + +void btSimulationIslandManagerMt::initIslandPools() +{ + // reset island pools + int numElem = getUnionFind().getNumElements(); + m_lookupIslandFromId.resize( numElem ); + for ( int i = 0; i < m_lookupIslandFromId.size(); ++i ) + { + m_lookupIslandFromId[ i ] = NULL; + } + m_activeIslands.resize( 0 ); + m_freeIslands.resize( 0 ); + // check whether allocated islands are sorted by body capacity (largest to smallest) + int lastCapacity = 0; + bool isSorted = true; + for ( int i = 0; i < m_allocatedIslands.size(); ++i ) + { + Island* island = m_allocatedIslands[ i ]; + int cap = island->bodyArray.capacity(); + if ( cap > lastCapacity ) + { + isSorted = false; + break; + } + lastCapacity = cap; + } + if ( !isSorted ) + { + m_allocatedIslands.quickSort( IslandBodyCapacitySortPredicate() ); + } + + m_batchIsland = NULL; + // mark all islands free (but avoid deallocation) + for ( int i = 0; i < m_allocatedIslands.size(); ++i ) + { + Island* island = m_allocatedIslands[ i ]; + island->bodyArray.resize( 0 ); + island->manifoldArray.resize( 0 ); + island->constraintArray.resize( 0 ); + island->id = -1; + island->isSleeping = true; + m_freeIslands.push_back( island ); + } +} + + +btSimulationIslandManagerMt::Island* btSimulationIslandManagerMt::getIsland( int id ) +{ + Island* island = m_lookupIslandFromId[ id ]; + if ( island == NULL ) + { + // search for existing island + for ( int i = 0; i < m_activeIslands.size(); ++i ) + { + if ( m_activeIslands[ i ]->id == id ) + { + island = m_activeIslands[ i ]; + break; + } + } + m_lookupIslandFromId[ id ] = island; + } + return island; +} + + +btSimulationIslandManagerMt::Island* btSimulationIslandManagerMt::allocateIsland( int id, int numBodies ) +{ + Island* island = NULL; + int allocSize = numBodies; + if ( numBodies < m_batchIslandMinBodyCount ) + { + if ( m_batchIsland ) + { + island = m_batchIsland; + m_lookupIslandFromId[ id ] = island; + // if we've made a large enough batch, + if ( island->bodyArray.size() + numBodies >= m_batchIslandMinBodyCount ) + { + // next time start a new batch + m_batchIsland = NULL; + } + return island; + } + else + { + // need to allocate a batch island + allocSize = m_batchIslandMinBodyCount * 2; + } + } + btAlignedObjectArray& freeIslands = m_freeIslands; + + // search for free island + if ( freeIslands.size() > 0 ) + { + // try to reuse a previously allocated island + int iFound = freeIslands.size(); + // linear search for smallest island that can hold our bodies + for ( int i = freeIslands.size() - 1; i >= 0; --i ) + { + if ( freeIslands[ i ]->bodyArray.capacity() >= allocSize ) + { + iFound = i; + island = freeIslands[ i ]; + island->id = id; + break; + } + } + // if found, shrink array while maintaining ordering + if ( island ) + { + int iDest = iFound; + int iSrc = iDest + 1; + while ( iSrc < freeIslands.size() ) + { + freeIslands[ iDest++ ] = freeIslands[ iSrc++ ]; + } + freeIslands.pop_back(); + } + } + if ( island == NULL ) + { + // no free island found, allocate + island = new Island(); // TODO: change this to use the pool allocator + island->id = id; + island->bodyArray.reserve( allocSize ); + m_allocatedIslands.push_back( island ); + } + m_lookupIslandFromId[ id ] = island; + if ( numBodies < m_batchIslandMinBodyCount ) + { + m_batchIsland = island; + } + m_activeIslands.push_back( island ); + return island; +} + + +void btSimulationIslandManagerMt::buildIslands( btDispatcher* dispatcher, btCollisionWorld* collisionWorld ) +{ + + BT_PROFILE("islandUnionFindAndQuickSort"); + + btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray(); + + //we are going to sort the unionfind array, and store the element id in the size + //afterwards, we clean unionfind, to make sure no-one uses it anymore + + getUnionFind().sortIslands(); + int numElem = getUnionFind().getNumElements(); + + int endIslandIndex=1; + int startIslandIndex; + + //update the sleeping state for bodies, if all are sleeping + for ( startIslandIndex=0;startIslandIndexgetIslandTag() != islandId) && (colObj0->getIslandTag() != -1)) + { +// printf("error in island management\n"); + } + + btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1)); + if (colObj0->getIslandTag() == islandId) + { + if (colObj0->getActivationState()== ACTIVE_TAG) + { + allSleeping = false; + } + if (colObj0->getActivationState()== DISABLE_DEACTIVATION) + { + allSleeping = false; + } + } + } + + if (allSleeping) + { + int idx; + for (idx=startIslandIndex;idxgetIslandTag() != islandId) && (colObj0->getIslandTag() != -1)) + { +// printf("error in island management\n"); + } + + btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1)); + + if (colObj0->getIslandTag() == islandId) + { + colObj0->setActivationState( ISLAND_SLEEPING ); + } + } + } else + { + + int idx; + for (idx=startIslandIndex;idxgetIslandTag() != islandId) && (colObj0->getIslandTag() != -1)) + { +// printf("error in island management\n"); + } + + btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1)); + + if (colObj0->getIslandTag() == islandId) + { + if ( colObj0->getActivationState() == ISLAND_SLEEPING) + { + colObj0->setActivationState( WANTS_DEACTIVATION); + colObj0->setDeactivationTime(0.f); + } + } + } + } + } +} + + +void btSimulationIslandManagerMt::addBodiesToIslands( btCollisionWorld* collisionWorld ) +{ + btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray(); + int endIslandIndex = 1; + int startIslandIndex; + int numElem = getUnionFind().getNumElements(); + + // create explicit islands and add bodies to each + for ( startIslandIndex = 0; startIslandIndex < numElem; startIslandIndex = endIslandIndex ) + { + int islandId = getUnionFind().getElement( startIslandIndex ).m_id; + + // find end index + for ( endIslandIndex = startIslandIndex; ( endIslandIndex < numElem ) && ( getUnionFind().getElement( endIslandIndex ).m_id == islandId ); endIslandIndex++ ) + { + } + // check if island is sleeping + bool islandSleeping = true; + for ( int iElem = startIslandIndex; iElem < endIslandIndex; iElem++ ) + { + int i = getUnionFind().getElement( iElem ).m_sz; + btCollisionObject* colObj = collisionObjects[ i ]; + if ( colObj->isActive() ) + { + islandSleeping = false; + } + } + if ( !islandSleeping ) + { + // want to count the number of bodies before allocating the island to optimize memory usage of the Island structures + int numBodies = endIslandIndex - startIslandIndex; + Island* island = allocateIsland( islandId, numBodies ); + island->isSleeping = false; + + // add bodies to island + for ( int iElem = startIslandIndex; iElem < endIslandIndex; iElem++ ) + { + int i = getUnionFind().getElement( iElem ).m_sz; + btCollisionObject* colObj = collisionObjects[ i ]; + island->bodyArray.push_back( colObj ); + } + } + } + +} + + +void btSimulationIslandManagerMt::addManifoldsToIslands( btDispatcher* dispatcher ) +{ + // walk all the manifolds, activating bodies touched by kinematic objects, and add each manifold to its Island + int maxNumManifolds = dispatcher->getNumManifolds(); + for ( int i = 0; i < maxNumManifolds; i++ ) + { + btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal( i ); + + const btCollisionObject* colObj0 = static_cast( manifold->getBody0() ); + const btCollisionObject* colObj1 = static_cast( manifold->getBody1() ); + + ///@todo: check sleeping conditions! + if ( ( ( colObj0 ) && colObj0->getActivationState() != ISLAND_SLEEPING ) || + ( ( colObj1 ) && colObj1->getActivationState() != ISLAND_SLEEPING ) ) + { + + //kinematic objects don't merge islands, but wake up all connected objects + if ( colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING ) + { + if ( colObj0->hasContactResponse() ) + colObj1->activate(); + } + if ( colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING ) + { + if ( colObj1->hasContactResponse() ) + colObj0->activate(); + } + //filtering for response + if ( dispatcher->needsResponse( colObj0, colObj1 ) ) + { + // scatter manifolds into various islands + int islandId = getIslandId( manifold ); + // if island not sleeping, + if ( Island* island = getIsland( islandId ) ) + { + island->manifoldArray.push_back( manifold ); + } + } + } + } +} + + +void btSimulationIslandManagerMt::addConstraintsToIslands( btAlignedObjectArray& constraints ) +{ + // walk constraints + for ( int i = 0; i < constraints.size(); i++ ) + { + // scatter constraints into various islands + btTypedConstraint* constraint = constraints[ i ]; + if ( constraint->isEnabled() ) + { + int islandId = btGetConstraintIslandId( constraint ); + // if island is not sleeping, + if ( Island* island = getIsland( islandId ) ) + { + island->constraintArray.push_back( constraint ); + } + } + } +} + + +void btSimulationIslandManagerMt::mergeIslands() +{ + // sort islands in order of decreasing batch size + m_activeIslands.quickSort( IslandBatchSizeSortPredicate() ); + + // merge small islands to satisfy minimum batch size + // find first small batch island + int destIslandIndex = m_activeIslands.size(); + for ( int i = 0; i < m_activeIslands.size(); ++i ) + { + Island* island = m_activeIslands[ i ]; + int batchSize = calcBatchCost( island ); + if ( batchSize < m_minimumSolverBatchSize ) + { + destIslandIndex = i; + break; + } + } + int lastIndex = m_activeIslands.size() - 1; + while ( destIslandIndex < lastIndex ) + { + // merge islands from the back of the list + Island* island = m_activeIslands[ destIslandIndex ]; + int numBodies = island->bodyArray.size(); + int numManifolds = island->manifoldArray.size(); + int numConstraints = island->constraintArray.size(); + int firstIndex = lastIndex; + // figure out how many islands we want to merge and find out how many bodies, manifolds and constraints we will have + while ( true ) + { + Island* src = m_activeIslands[ firstIndex ]; + numBodies += src->bodyArray.size(); + numManifolds += src->manifoldArray.size(); + numConstraints += src->constraintArray.size(); + int batchCost = calcBatchCost( numBodies, numManifolds, numConstraints ); + if ( batchCost >= m_minimumSolverBatchSize ) + { + break; + } + if ( firstIndex - 1 == destIslandIndex ) + { + break; + } + firstIndex--; + } + // reserve space for these pointers to minimize reallocation + island->bodyArray.reserve( numBodies ); + island->manifoldArray.reserve( numManifolds ); + island->constraintArray.reserve( numConstraints ); + // merge islands + for ( int i = firstIndex; i <= lastIndex; ++i ) + { + island->append( *m_activeIslands[ i ] ); + } + // shrink array to exclude the islands that were merged from + m_activeIslands.resize( firstIndex ); + lastIndex = firstIndex - 1; + destIslandIndex++; + } +} + + +void btSimulationIslandManagerMt::defaultIslandDispatch( btAlignedObjectArray* islandsPtr, IslandCallback* callback ) +{ + // serial dispatch + btAlignedObjectArray& islands = *islandsPtr; + for ( int i = 0; i < islands.size(); ++i ) + { + Island* island = islands[ i ]; + btPersistentManifold** manifolds = island->manifoldArray.size() ? &island->manifoldArray[ 0 ] : NULL; + btTypedConstraint** constraintsPtr = island->constraintArray.size() ? &island->constraintArray[ 0 ] : NULL; + callback->processIsland( &island->bodyArray[ 0 ], + island->bodyArray.size(), + manifolds, + island->manifoldArray.size(), + constraintsPtr, + island->constraintArray.size(), + island->id + ); + } +} + +///@todo: this is random access, it can be walked 'cache friendly'! +void btSimulationIslandManagerMt::buildAndProcessIslands( btDispatcher* dispatcher, + btCollisionWorld* collisionWorld, + btAlignedObjectArray& constraints, + IslandCallback* callback + ) +{ + btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray(); + + buildIslands(dispatcher,collisionWorld); + + BT_PROFILE("processIslands"); + + if(!getSplitIslands()) + { + btPersistentManifold** manifolds = dispatcher->getInternalManifoldPointer(); + int maxNumManifolds = dispatcher->getNumManifolds(); + + for ( int i = 0; i < maxNumManifolds; i++ ) + { + btPersistentManifold* manifold = manifolds[ i ]; + + const btCollisionObject* colObj0 = static_cast( manifold->getBody0() ); + const btCollisionObject* colObj1 = static_cast( manifold->getBody1() ); + + ///@todo: check sleeping conditions! + if ( ( ( colObj0 ) && colObj0->getActivationState() != ISLAND_SLEEPING ) || + ( ( colObj1 ) && colObj1->getActivationState() != ISLAND_SLEEPING ) ) + { + + //kinematic objects don't merge islands, but wake up all connected objects + if ( colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING ) + { + if ( colObj0->hasContactResponse() ) + colObj1->activate(); + } + if ( colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING ) + { + if ( colObj1->hasContactResponse() ) + colObj0->activate(); + } + } + } + btTypedConstraint** constraintsPtr = constraints.size() ? &constraints[ 0 ] : NULL; + callback->processIsland(&collisionObjects[0], + collisionObjects.size(), + manifolds, + maxNumManifolds, + constraintsPtr, + constraints.size(), + -1 + ); + } + else + { + initIslandPools(); + + //traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated + addBodiesToIslands( collisionWorld ); + addManifoldsToIslands( dispatcher ); + addConstraintsToIslands( constraints ); + + // m_activeIslands array should now contain all non-sleeping Islands, and each Island should + // have all the necessary bodies, manifolds and constraints. + + // if we want to merge islands with small batch counts, + if ( m_minimumSolverBatchSize > 1 ) + { + mergeIslands(); + } + // dispatch islands to solver + m_islandDispatch( &m_activeIslands, callback ); + } +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h new file mode 100644 index 000000000..117061623 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h @@ -0,0 +1,109 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_SIMULATION_ISLAND_MANAGER_MT_H +#define BT_SIMULATION_ISLAND_MANAGER_MT_H + +#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" + +class btTypedConstraint; + + +/// +/// SimulationIslandManagerMt -- Multithread capable version of SimulationIslandManager +/// Splits the world up into islands which can be solved in parallel. +/// In order to solve islands in parallel, an IslandDispatch function +/// must be provided which will dispatch calls to multiple threads. +/// The amount of parallelism that can be achieved depends on the number +/// of islands. If only a single island exists, then no parallelism is +/// possible. +/// +class btSimulationIslandManagerMt : public btSimulationIslandManager +{ +public: + struct Island + { + // a simulation island consisting of bodies, manifolds and constraints, + // to be passed into a constraint solver. + btAlignedObjectArray bodyArray; + btAlignedObjectArray manifoldArray; + btAlignedObjectArray constraintArray; + int id; // island id + bool isSleeping; + + void append( const Island& other ); // add bodies, manifolds, constraints to my own + }; + struct IslandCallback + { + virtual ~IslandCallback() {}; + + virtual void processIsland( btCollisionObject** bodies, + int numBodies, + btPersistentManifold** manifolds, + int numManifolds, + btTypedConstraint** constraints, + int numConstraints, + int islandId + ) = 0; + }; + typedef void( *IslandDispatchFunc ) ( btAlignedObjectArray* islands, IslandCallback* callback ); + static void defaultIslandDispatch( btAlignedObjectArray* islands, IslandCallback* callback ); +protected: + btAlignedObjectArray m_allocatedIslands; // owner of all Islands + btAlignedObjectArray m_activeIslands; // islands actively in use + btAlignedObjectArray m_freeIslands; // islands ready to be reused + btAlignedObjectArray m_lookupIslandFromId; // big lookup table to map islandId to Island pointer + Island* m_batchIsland; + int m_minimumSolverBatchSize; + int m_batchIslandMinBodyCount; + IslandDispatchFunc m_islandDispatch; + + Island* getIsland( int id ); + virtual Island* allocateIsland( int id, int numBodies ); + virtual void initIslandPools(); + virtual void addBodiesToIslands( btCollisionWorld* collisionWorld ); + virtual void addManifoldsToIslands( btDispatcher* dispatcher ); + virtual void addConstraintsToIslands( btAlignedObjectArray& constraints ); + virtual void mergeIslands(); + +public: + btSimulationIslandManagerMt(); + virtual ~btSimulationIslandManagerMt(); + + virtual void buildAndProcessIslands( btDispatcher* dispatcher, btCollisionWorld* collisionWorld, btAlignedObjectArray& constraints, IslandCallback* callback ); + + virtual void buildIslands(btDispatcher* dispatcher,btCollisionWorld* colWorld); + + int getMinimumSolverBatchSize() const + { + return m_minimumSolverBatchSize; + } + void setMinimumSolverBatchSize( int sz ) + { + m_minimumSolverBatchSize = sz; + } + IslandDispatchFunc getIslandDispatchFunction() const + { + return m_islandDispatch; + } + // allow users to set their own dispatch function for multithreaded dispatch + void setIslandDispatchFunction( IslandDispatchFunc func ) + { + m_islandDispatch = func; + } +}; + +#endif //BT_SIMULATION_ISLAND_MANAGER_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBody.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBody.cpp new file mode 100644 index 000000000..fbc2bbec4 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBody.cpp @@ -0,0 +1,1982 @@ +/* + * PURPOSE: + * Class representing an articulated rigid body. Stores the body's + * current state, allows forces and torques to be set, handles + * timestepping and implements Featherstone's algorithm. + * + * COPYRIGHT: + * Copyright (C) Stephen Thompson, , 2011-2013 + * Portions written By Erwin Coumans: connection to LCP solver, various multibody constraints, replacing Eigen math library by Bullet LinearMath and a dedicated 6x6 matrix inverse (solveImatrix) + * Portions written By Jakub Stepien: support for multi-DOF constraints, introduction of spatial algebra and several other improvements + + This software is provided 'as-is', without any express or implied warranty. + In no event will the authors be held liable for any damages arising from the use of this software. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it freely, + subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + */ + + +#include "btMultiBody.h" +#include "btMultiBodyLink.h" +#include "btMultiBodyLinkCollider.h" +#include "btMultiBodyJointFeedback.h" +#include "LinearMath/btTransformUtil.h" +#include "LinearMath/btSerializer.h" +//#include "Bullet3Common/b3Logging.h" +// #define INCLUDE_GYRO_TERM + +///todo: determine if we need these options. If so, make a proper API, otherwise delete those globals +bool gJointFeedbackInWorldSpace = false; +bool gJointFeedbackInJointFrame = false; + +namespace { + const btScalar SLEEP_EPSILON = btScalar(0.05); // this is a squared velocity (m^2 s^-2) + const btScalar SLEEP_TIMEOUT = btScalar(2); // in seconds +} + +namespace { + void SpatialTransform(const btMatrix3x3 &rotation_matrix, // rotates vectors in 'from' frame to vectors in 'to' frame + const btVector3 &displacement, // vector from origin of 'from' frame to origin of 'to' frame, in 'to' coordinates + const btVector3 &top_in, // top part of input vector + const btVector3 &bottom_in, // bottom part of input vector + btVector3 &top_out, // top part of output vector + btVector3 &bottom_out) // bottom part of output vector + { + top_out = rotation_matrix * top_in; + bottom_out = -displacement.cross(top_out) + rotation_matrix * bottom_in; + } + + void InverseSpatialTransform(const btMatrix3x3 &rotation_matrix, + const btVector3 &displacement, + const btVector3 &top_in, + const btVector3 &bottom_in, + btVector3 &top_out, + btVector3 &bottom_out) + { + top_out = rotation_matrix.transpose() * top_in; + bottom_out = rotation_matrix.transpose() * (bottom_in + displacement.cross(top_in)); + } + + btScalar SpatialDotProduct(const btVector3 &a_top, + const btVector3 &a_bottom, + const btVector3 &b_top, + const btVector3 &b_bottom) + { + return a_bottom.dot(b_top) + a_top.dot(b_bottom); + } + + void SpatialCrossProduct(const btVector3 &a_top, + const btVector3 &a_bottom, + const btVector3 &b_top, + const btVector3 &b_bottom, + btVector3 &top_out, + btVector3 &bottom_out) + { + top_out = a_top.cross(b_top); + bottom_out = a_bottom.cross(b_top) + a_top.cross(b_bottom); + } +} + + +// +// Implementation of class btMultiBody +// + +btMultiBody::btMultiBody(int n_links, + btScalar mass, + const btVector3 &inertia, + bool fixedBase, + bool canSleep, + bool /*deprecatedUseMultiDof*/) + : + m_baseCollider(0), + m_baseName(0), + m_basePos(0,0,0), + m_baseQuat(0, 0, 0, 1), + m_baseMass(mass), + m_baseInertia(inertia), + + m_fixedBase(fixedBase), + m_awake(true), + m_canSleep(canSleep), + m_sleepTimer(0), + m_userObjectPointer(0), + m_userIndex2(-1), + m_userIndex(-1), + m_linearDamping(0.04f), + m_angularDamping(0.04f), + m_useGyroTerm(true), + m_maxAppliedImpulse(1000.f), + m_maxCoordinateVelocity(100.f), + m_hasSelfCollision(true), + __posUpdated(false), + m_dofCount(0), + m_posVarCnt(0), + m_useRK4(false), + m_useGlobalVelocities(false), + m_internalNeedsJointFeedback(false) +{ + m_cachedInertiaTopLeft.setValue(0,0,0,0,0,0,0,0,0); + m_cachedInertiaTopRight.setValue(0,0,0,0,0,0,0,0,0); + m_cachedInertiaLowerLeft.setValue(0,0,0,0,0,0,0,0,0); + m_cachedInertiaLowerRight.setValue(0,0,0,0,0,0,0,0,0); + m_cachedInertiaValid=false; + + m_links.resize(n_links); + m_matrixBuf.resize(n_links + 1); + + m_baseForce.setValue(0, 0, 0); + m_baseTorque.setValue(0, 0, 0); +} + +btMultiBody::~btMultiBody() +{ +} + +void btMultiBody::setupFixed(int i, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &parentComToThisPivotOffset, + const btVector3 &thisPivotToThisComOffset, bool /*deprecatedDisableParentCollision*/) +{ + + m_links[i].m_mass = mass; + m_links[i].m_inertiaLocal = inertia; + m_links[i].m_parent = parent; + m_links[i].m_zeroRotParentToThis = rotParentToThis; + m_links[i].m_dVector = thisPivotToThisComOffset; + m_links[i].m_eVector = parentComToThisPivotOffset; + + m_links[i].m_jointType = btMultibodyLink::eFixed; + m_links[i].m_dofCount = 0; + m_links[i].m_posVarCount = 0; + + m_links[i].m_flags |=BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION; + + m_links[i].updateCacheMultiDof(); + + updateLinksDofOffsets(); + +} + + +void btMultiBody::setupPrismatic(int i, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &jointAxis, + const btVector3 &parentComToThisPivotOffset, + const btVector3 &thisPivotToThisComOffset, + bool disableParentCollision) +{ + m_dofCount += 1; + m_posVarCnt += 1; + + m_links[i].m_mass = mass; + m_links[i].m_inertiaLocal = inertia; + m_links[i].m_parent = parent; + m_links[i].m_zeroRotParentToThis = rotParentToThis; + m_links[i].setAxisTop(0, 0., 0., 0.); + m_links[i].setAxisBottom(0, jointAxis); + m_links[i].m_eVector = parentComToThisPivotOffset; + m_links[i].m_dVector = thisPivotToThisComOffset; + m_links[i].m_cachedRotParentToThis = rotParentToThis; + + m_links[i].m_jointType = btMultibodyLink::ePrismatic; + m_links[i].m_dofCount = 1; + m_links[i].m_posVarCount = 1; + m_links[i].m_jointPos[0] = 0.f; + m_links[i].m_jointTorque[0] = 0.f; + + if (disableParentCollision) + m_links[i].m_flags |=BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION; + // + + m_links[i].updateCacheMultiDof(); + + updateLinksDofOffsets(); +} + +void btMultiBody::setupRevolute(int i, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &jointAxis, + const btVector3 &parentComToThisPivotOffset, + const btVector3 &thisPivotToThisComOffset, + bool disableParentCollision) +{ + m_dofCount += 1; + m_posVarCnt += 1; + + m_links[i].m_mass = mass; + m_links[i].m_inertiaLocal = inertia; + m_links[i].m_parent = parent; + m_links[i].m_zeroRotParentToThis = rotParentToThis; + m_links[i].setAxisTop(0, jointAxis); + m_links[i].setAxisBottom(0, jointAxis.cross(thisPivotToThisComOffset)); + m_links[i].m_dVector = thisPivotToThisComOffset; + m_links[i].m_eVector = parentComToThisPivotOffset; + + m_links[i].m_jointType = btMultibodyLink::eRevolute; + m_links[i].m_dofCount = 1; + m_links[i].m_posVarCount = 1; + m_links[i].m_jointPos[0] = 0.f; + m_links[i].m_jointTorque[0] = 0.f; + + if (disableParentCollision) + m_links[i].m_flags |=BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION; + // + m_links[i].updateCacheMultiDof(); + // + updateLinksDofOffsets(); +} + + + +void btMultiBody::setupSpherical(int i, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &parentComToThisPivotOffset, + const btVector3 &thisPivotToThisComOffset, + bool disableParentCollision) +{ + + m_dofCount += 3; + m_posVarCnt += 4; + + m_links[i].m_mass = mass; + m_links[i].m_inertiaLocal = inertia; + m_links[i].m_parent = parent; + m_links[i].m_zeroRotParentToThis = rotParentToThis; + m_links[i].m_dVector = thisPivotToThisComOffset; + m_links[i].m_eVector = parentComToThisPivotOffset; + + m_links[i].m_jointType = btMultibodyLink::eSpherical; + m_links[i].m_dofCount = 3; + m_links[i].m_posVarCount = 4; + m_links[i].setAxisTop(0, 1.f, 0.f, 0.f); + m_links[i].setAxisTop(1, 0.f, 1.f, 0.f); + m_links[i].setAxisTop(2, 0.f, 0.f, 1.f); + m_links[i].setAxisBottom(0, m_links[i].getAxisTop(0).cross(thisPivotToThisComOffset)); + m_links[i].setAxisBottom(1, m_links[i].getAxisTop(1).cross(thisPivotToThisComOffset)); + m_links[i].setAxisBottom(2, m_links[i].getAxisTop(2).cross(thisPivotToThisComOffset)); + m_links[i].m_jointPos[0] = m_links[i].m_jointPos[1] = m_links[i].m_jointPos[2] = 0.f; m_links[i].m_jointPos[3] = 1.f; + m_links[i].m_jointTorque[0] = m_links[i].m_jointTorque[1] = m_links[i].m_jointTorque[2] = 0.f; + + + if (disableParentCollision) + m_links[i].m_flags |=BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION; + // + m_links[i].updateCacheMultiDof(); + // + updateLinksDofOffsets(); +} + +void btMultiBody::setupPlanar(int i, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &rotationAxis, + const btVector3 &parentComToThisComOffset, + bool disableParentCollision) +{ + + m_dofCount += 3; + m_posVarCnt += 3; + + m_links[i].m_mass = mass; + m_links[i].m_inertiaLocal = inertia; + m_links[i].m_parent = parent; + m_links[i].m_zeroRotParentToThis = rotParentToThis; + m_links[i].m_dVector.setZero(); + m_links[i].m_eVector = parentComToThisComOffset; + + // + btVector3 vecNonParallelToRotAxis(1, 0, 0); + if(rotationAxis.normalized().dot(vecNonParallelToRotAxis) > 0.999) + vecNonParallelToRotAxis.setValue(0, 1, 0); + // + + m_links[i].m_jointType = btMultibodyLink::ePlanar; + m_links[i].m_dofCount = 3; + m_links[i].m_posVarCount = 3; + btVector3 n=rotationAxis.normalized(); + m_links[i].setAxisTop(0, n[0],n[1],n[2]); + m_links[i].setAxisTop(1,0,0,0); + m_links[i].setAxisTop(2,0,0,0); + m_links[i].setAxisBottom(0,0,0,0); + btVector3 cr = m_links[i].getAxisTop(0).cross(vecNonParallelToRotAxis); + m_links[i].setAxisBottom(1,cr[0],cr[1],cr[2]); + cr = m_links[i].getAxisBottom(1).cross(m_links[i].getAxisTop(0)); + m_links[i].setAxisBottom(2,cr[0],cr[1],cr[2]); + m_links[i].m_jointPos[0] = m_links[i].m_jointPos[1] = m_links[i].m_jointPos[2] = 0.f; + m_links[i].m_jointTorque[0] = m_links[i].m_jointTorque[1] = m_links[i].m_jointTorque[2] = 0.f; + + if (disableParentCollision) + m_links[i].m_flags |=BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION; + // + m_links[i].updateCacheMultiDof(); + // + updateLinksDofOffsets(); +} + +void btMultiBody::finalizeMultiDof() +{ + m_deltaV.resize(0); + m_deltaV.resize(6 + m_dofCount); + m_realBuf.resize(6 + m_dofCount + m_dofCount*m_dofCount + 6 + m_dofCount); //m_dofCount for joint-space vels + m_dofCount^2 for "D" matrices + delta-pos vector (6 base "vels" + joint "vels") + m_vectorBuf.resize(2 * m_dofCount); //two 3-vectors (i.e. one six-vector) for each system dof ("h" matrices) + + updateLinksDofOffsets(); +} + +int btMultiBody::getParent(int i) const +{ + return m_links[i].m_parent; +} + +btScalar btMultiBody::getLinkMass(int i) const +{ + return m_links[i].m_mass; +} + +const btVector3 & btMultiBody::getLinkInertia(int i) const +{ + return m_links[i].m_inertiaLocal; +} + +btScalar btMultiBody::getJointPos(int i) const +{ + return m_links[i].m_jointPos[0]; +} + +btScalar btMultiBody::getJointVel(int i) const +{ + return m_realBuf[6 + m_links[i].m_dofOffset]; +} + +btScalar * btMultiBody::getJointPosMultiDof(int i) +{ + return &m_links[i].m_jointPos[0]; +} + +btScalar * btMultiBody::getJointVelMultiDof(int i) +{ + return &m_realBuf[6 + m_links[i].m_dofOffset]; +} + +const btScalar * btMultiBody::getJointPosMultiDof(int i) const +{ + return &m_links[i].m_jointPos[0]; +} + +const btScalar * btMultiBody::getJointVelMultiDof(int i) const +{ + return &m_realBuf[6 + m_links[i].m_dofOffset]; +} + + +void btMultiBody::setJointPos(int i, btScalar q) +{ + m_links[i].m_jointPos[0] = q; + m_links[i].updateCacheMultiDof(); +} + +void btMultiBody::setJointPosMultiDof(int i, btScalar *q) +{ + for(int pos = 0; pos < m_links[i].m_posVarCount; ++pos) + m_links[i].m_jointPos[pos] = q[pos]; + + m_links[i].updateCacheMultiDof(); +} + +void btMultiBody::setJointVel(int i, btScalar qdot) +{ + m_realBuf[6 + m_links[i].m_dofOffset] = qdot; +} + +void btMultiBody::setJointVelMultiDof(int i, btScalar *qdot) +{ + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + m_realBuf[6 + m_links[i].m_dofOffset + dof] = qdot[dof]; +} + +const btVector3 & btMultiBody::getRVector(int i) const +{ + return m_links[i].m_cachedRVector; +} + +const btQuaternion & btMultiBody::getParentToLocalRot(int i) const +{ + return m_links[i].m_cachedRotParentToThis; +} + +btVector3 btMultiBody::localPosToWorld(int i, const btVector3 &local_pos) const +{ + btVector3 result = local_pos; + while (i != -1) { + // 'result' is in frame i. transform it to frame parent(i) + result += getRVector(i); + result = quatRotate(getParentToLocalRot(i).inverse(),result); + i = getParent(i); + } + + // 'result' is now in the base frame. transform it to world frame + result = quatRotate(getWorldToBaseRot().inverse() ,result); + result += getBasePos(); + + return result; +} + +btVector3 btMultiBody::worldPosToLocal(int i, const btVector3 &world_pos) const +{ + if (i == -1) { + // world to base + return quatRotate(getWorldToBaseRot(),(world_pos - getBasePos())); + } else { + // find position in parent frame, then transform to current frame + return quatRotate(getParentToLocalRot(i),worldPosToLocal(getParent(i), world_pos)) - getRVector(i); + } +} + +btVector3 btMultiBody::localDirToWorld(int i, const btVector3 &local_dir) const +{ + btVector3 result = local_dir; + while (i != -1) { + result = quatRotate(getParentToLocalRot(i).inverse() , result); + i = getParent(i); + } + result = quatRotate(getWorldToBaseRot().inverse() , result); + return result; +} + +btVector3 btMultiBody::worldDirToLocal(int i, const btVector3 &world_dir) const +{ + if (i == -1) { + return quatRotate(getWorldToBaseRot(), world_dir); + } else { + return quatRotate(getParentToLocalRot(i) ,worldDirToLocal(getParent(i), world_dir)); + } +} + +btMatrix3x3 btMultiBody::localFrameToWorld(int i, const btMatrix3x3 &local_frame) const +{ + btMatrix3x3 result = local_frame; + btVector3 frameInWorld0 = localDirToWorld(i, local_frame.getColumn(0)); + btVector3 frameInWorld1 = localDirToWorld(i, local_frame.getColumn(1)); + btVector3 frameInWorld2 = localDirToWorld(i, local_frame.getColumn(2)); + result.setValue(frameInWorld0[0], frameInWorld1[0], frameInWorld2[0], frameInWorld0[1], frameInWorld1[1], frameInWorld2[1], frameInWorld0[2], frameInWorld1[2], frameInWorld2[2]); + return result; +} + +void btMultiBody::compTreeLinkVelocities(btVector3 *omega, btVector3 *vel) const +{ + int num_links = getNumLinks(); + // Calculates the velocities of each link (and the base) in its local frame + omega[0] = quatRotate(m_baseQuat ,getBaseOmega()); + vel[0] = quatRotate(m_baseQuat ,getBaseVel()); + + for (int i = 0; i < num_links; ++i) { + const int parent = m_links[i].m_parent; + + // transform parent vel into this frame, store in omega[i+1], vel[i+1] + SpatialTransform(btMatrix3x3(m_links[i].m_cachedRotParentToThis), m_links[i].m_cachedRVector, + omega[parent+1], vel[parent+1], + omega[i+1], vel[i+1]); + + // now add qidot * shat_i + omega[i+1] += getJointVel(i) * m_links[i].getAxisTop(0); + vel[i+1] += getJointVel(i) * m_links[i].getAxisBottom(0); + } +} + +btScalar btMultiBody::getKineticEnergy() const +{ + int num_links = getNumLinks(); + // TODO: would be better not to allocate memory here + btAlignedObjectArray omega;omega.resize(num_links+1); + btAlignedObjectArray vel;vel.resize(num_links+1); + compTreeLinkVelocities(&omega[0], &vel[0]); + + // we will do the factor of 0.5 at the end + btScalar result = m_baseMass * vel[0].dot(vel[0]); + result += omega[0].dot(m_baseInertia * omega[0]); + + for (int i = 0; i < num_links; ++i) { + result += m_links[i].m_mass * vel[i+1].dot(vel[i+1]); + result += omega[i+1].dot(m_links[i].m_inertiaLocal * omega[i+1]); + } + + return 0.5f * result; +} + +btVector3 btMultiBody::getAngularMomentum() const +{ + int num_links = getNumLinks(); + // TODO: would be better not to allocate memory here + btAlignedObjectArray omega;omega.resize(num_links+1); + btAlignedObjectArray vel;vel.resize(num_links+1); + btAlignedObjectArray rot_from_world;rot_from_world.resize(num_links+1); + compTreeLinkVelocities(&omega[0], &vel[0]); + + rot_from_world[0] = m_baseQuat; + btVector3 result = quatRotate(rot_from_world[0].inverse() , (m_baseInertia * omega[0])); + + for (int i = 0; i < num_links; ++i) { + rot_from_world[i+1] = m_links[i].m_cachedRotParentToThis * rot_from_world[m_links[i].m_parent+1]; + result += (quatRotate(rot_from_world[i+1].inverse() , (m_links[i].m_inertiaLocal * omega[i+1]))); + } + + return result; +} + +void btMultiBody::clearConstraintForces() +{ + m_baseConstraintForce.setValue(0, 0, 0); + m_baseConstraintTorque.setValue(0, 0, 0); + + + for (int i = 0; i < getNumLinks(); ++i) { + m_links[i].m_appliedConstraintForce.setValue(0, 0, 0); + m_links[i].m_appliedConstraintTorque.setValue(0, 0, 0); + } +} +void btMultiBody::clearForcesAndTorques() +{ + m_baseForce.setValue(0, 0, 0); + m_baseTorque.setValue(0, 0, 0); + + + for (int i = 0; i < getNumLinks(); ++i) { + m_links[i].m_appliedForce.setValue(0, 0, 0); + m_links[i].m_appliedTorque.setValue(0, 0, 0); + m_links[i].m_jointTorque[0] = m_links[i].m_jointTorque[1] = m_links[i].m_jointTorque[2] = m_links[i].m_jointTorque[3] = m_links[i].m_jointTorque[4] = m_links[i].m_jointTorque[5] = 0.f; + } +} + +void btMultiBody::clearVelocities() +{ + for (int i = 0; i < 6 + getNumDofs(); ++i) + { + m_realBuf[i] = 0.f; + } +} +void btMultiBody::addLinkForce(int i, const btVector3 &f) +{ + m_links[i].m_appliedForce += f; +} + +void btMultiBody::addLinkTorque(int i, const btVector3 &t) +{ + m_links[i].m_appliedTorque += t; +} + +void btMultiBody::addLinkConstraintForce(int i, const btVector3 &f) +{ + m_links[i].m_appliedConstraintForce += f; +} + +void btMultiBody::addLinkConstraintTorque(int i, const btVector3 &t) +{ + m_links[i].m_appliedConstraintTorque += t; +} + + + +void btMultiBody::addJointTorque(int i, btScalar Q) +{ + m_links[i].m_jointTorque[0] += Q; +} + +void btMultiBody::addJointTorqueMultiDof(int i, int dof, btScalar Q) +{ + m_links[i].m_jointTorque[dof] += Q; +} + +void btMultiBody::addJointTorqueMultiDof(int i, const btScalar *Q) +{ + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + m_links[i].m_jointTorque[dof] = Q[dof]; +} + +const btVector3 & btMultiBody::getLinkForce(int i) const +{ + return m_links[i].m_appliedForce; +} + +const btVector3 & btMultiBody::getLinkTorque(int i) const +{ + return m_links[i].m_appliedTorque; +} + +btScalar btMultiBody::getJointTorque(int i) const +{ + return m_links[i].m_jointTorque[0]; +} + +btScalar * btMultiBody::getJointTorqueMultiDof(int i) +{ + return &m_links[i].m_jointTorque[0]; +} + +inline btMatrix3x3 outerProduct(const btVector3& v0, const btVector3& v1) //renamed it from vecMulVecTranspose (http://en.wikipedia.org/wiki/Outer_product); maybe it should be moved to btVector3 like dot and cross? +{ + btVector3 row0 = btVector3( + v0.x() * v1.x(), + v0.x() * v1.y(), + v0.x() * v1.z()); + btVector3 row1 = btVector3( + v0.y() * v1.x(), + v0.y() * v1.y(), + v0.y() * v1.z()); + btVector3 row2 = btVector3( + v0.z() * v1.x(), + v0.z() * v1.y(), + v0.z() * v1.z()); + + btMatrix3x3 m(row0[0],row0[1],row0[2], + row1[0],row1[1],row1[2], + row2[0],row2[1],row2[2]); + return m; +} + +#define vecMulVecTranspose(v0, v1Transposed) outerProduct(v0, v1Transposed) +// + +void btMultiBody::computeAccelerationsArticulatedBodyAlgorithmMultiDof(btScalar dt, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v, + btAlignedObjectArray &scratch_m, + bool isConstraintPass) +{ + // Implement Featherstone's algorithm to calculate joint accelerations (q_double_dot) + // and the base linear & angular accelerations. + + // We apply damping forces in this routine as well as any external forces specified by the + // caller (via addBaseForce etc). + + // output should point to an array of 6 + num_links reals. + // Format is: 3 angular accelerations (in world frame), 3 linear accelerations (in world frame), + // num_links joint acceleration values. + + // We added support for multi degree of freedom (multi dof) joints. + // In addition we also can compute the joint reaction forces. This is performed in a second pass, + // so that we can include the effect of the constraint solver forces (computed in the PGS LCP solver) + + m_internalNeedsJointFeedback = false; + + int num_links = getNumLinks(); + + const btScalar DAMPING_K1_LINEAR = m_linearDamping; + const btScalar DAMPING_K2_LINEAR = m_linearDamping; + + const btScalar DAMPING_K1_ANGULAR = m_angularDamping; + const btScalar DAMPING_K2_ANGULAR= m_angularDamping; + + btVector3 base_vel = getBaseVel(); + btVector3 base_omega = getBaseOmega(); + + // Temporary matrices/vectors -- use scratch space from caller + // so that we don't have to keep reallocating every frame + + scratch_r.resize(2*m_dofCount + 6); //multidof? ("Y"s use it and it is used to store qdd) => 2 x m_dofCount + scratch_v.resize(8*num_links + 6); + scratch_m.resize(4*num_links + 4); + + //btScalar * r_ptr = &scratch_r[0]; + btScalar * output = &scratch_r[m_dofCount]; // "output" holds the q_double_dot results + btVector3 * v_ptr = &scratch_v[0]; + + // vhat_i (top = angular, bottom = linear part) + btSpatialMotionVector *spatVel = (btSpatialMotionVector *)v_ptr; + v_ptr += num_links * 2 + 2; + // + // zhat_i^A + btSpatialForceVector * zeroAccSpatFrc = (btSpatialForceVector *)v_ptr; + v_ptr += num_links * 2 + 2; + // + // chat_i (note NOT defined for the base) + btSpatialMotionVector * spatCoriolisAcc = (btSpatialMotionVector *)v_ptr; + v_ptr += num_links * 2; + // + // Ihat_i^A. + btSymmetricSpatialDyad * spatInertia = (btSymmetricSpatialDyad *)&scratch_m[num_links + 1]; + + // Cached 3x3 rotation matrices from parent frame to this frame. + btMatrix3x3 * rot_from_parent = &m_matrixBuf[0]; + btMatrix3x3 * rot_from_world = &scratch_m[0]; + + // hhat_i, ahat_i + // hhat is NOT stored for the base (but ahat is) + btSpatialForceVector * h = (btSpatialForceVector *)(m_dofCount > 0 ? &m_vectorBuf[0] : 0); + btSpatialMotionVector * spatAcc = (btSpatialMotionVector *)v_ptr; + v_ptr += num_links * 2 + 2; + // + // Y_i, invD_i + btScalar * invD = m_dofCount > 0 ? &m_realBuf[6 + m_dofCount] : 0; + btScalar * Y = &scratch_r[0]; + // + //aux variables + btSpatialMotionVector spatJointVel; //spatial velocity due to the joint motion (i.e. without predecessors' influence) + btScalar D[36]; //"D" matrix; it's dofxdof for each body so asingle 6x6 D matrix will do + btScalar invD_times_Y[6]; //D^{-1} * Y [dofxdof x dofx1 = dofx1] <=> D^{-1} * u; better moved to buffers since it is recalced in calcAccelerationDeltasMultiDof; num_dof of btScalar would cover all bodies + btSpatialMotionVector result; //holds results of the SolveImatrix op; it is a spatial motion vector (accel) + btScalar Y_minus_hT_a[6]; //Y - h^{T} * a; it's dofx1 for each body so a single 6x1 temp is enough + btSpatialForceVector spatForceVecTemps[6]; //6 temporary spatial force vectors + btSpatialTransformationMatrix fromParent; //spatial transform from parent to child + btSymmetricSpatialDyad dyadTemp; //inertia matrix temp + btSpatialTransformationMatrix fromWorld; + fromWorld.m_trnVec.setZero(); + ///////////////// + + // ptr to the joint accel part of the output + btScalar * joint_accel = output + 6; + + // Start of the algorithm proper. + + // First 'upward' loop. + // Combines CompTreeLinkVelocities and InitTreeLinks from Mirtich. + + rot_from_parent[0] = btMatrix3x3(m_baseQuat); //m_baseQuat assumed to be alias!? + + //create the vector of spatial velocity of the base by transforming global-coor linear and angular velocities into base-local coordinates + spatVel[0].setVector(rot_from_parent[0] * base_omega, rot_from_parent[0] * base_vel); + + if (m_fixedBase) + { + zeroAccSpatFrc[0].setZero(); + } + else + { + btVector3 baseForce = isConstraintPass? m_baseConstraintForce : m_baseForce; + btVector3 baseTorque = isConstraintPass? m_baseConstraintTorque : m_baseTorque; + //external forces + zeroAccSpatFrc[0].setVector(-(rot_from_parent[0] * baseTorque), -(rot_from_parent[0] * baseForce)); + + //adding damping terms (only) + btScalar linDampMult = 1., angDampMult = 1.; + zeroAccSpatFrc[0].addVector(angDampMult * m_baseInertia * spatVel[0].getAngular() * (DAMPING_K1_ANGULAR + DAMPING_K2_ANGULAR * spatVel[0].getAngular().safeNorm()), + linDampMult * m_baseMass * spatVel[0].getLinear() * (DAMPING_K1_LINEAR + DAMPING_K2_LINEAR * spatVel[0].getLinear().safeNorm())); + + // + //p += vhat x Ihat vhat - done in a simpler way + if (m_useGyroTerm) + zeroAccSpatFrc[0].addAngular(spatVel[0].getAngular().cross(m_baseInertia * spatVel[0].getAngular())); + // + zeroAccSpatFrc[0].addLinear(m_baseMass * spatVel[0].getAngular().cross(spatVel[0].getLinear())); + } + + + //init the spatial AB inertia (it has the simple form thanks to choosing local body frames origins at their COMs) + spatInertia[0].setMatrix( btMatrix3x3(0,0,0,0,0,0,0,0,0), + // + btMatrix3x3(m_baseMass, 0, 0, + 0, m_baseMass, 0, + 0, 0, m_baseMass), + // + btMatrix3x3(m_baseInertia[0], 0, 0, + 0, m_baseInertia[1], 0, + 0, 0, m_baseInertia[2]) + ); + + rot_from_world[0] = rot_from_parent[0]; + + // + for (int i = 0; i < num_links; ++i) { + const int parent = m_links[i].m_parent; + rot_from_parent[i+1] = btMatrix3x3(m_links[i].m_cachedRotParentToThis); + rot_from_world[i+1] = rot_from_parent[i+1] * rot_from_world[parent+1]; + + fromParent.m_rotMat = rot_from_parent[i+1]; fromParent.m_trnVec = m_links[i].m_cachedRVector; + fromWorld.m_rotMat = rot_from_world[i+1]; + fromParent.transform(spatVel[parent+1], spatVel[i+1]); + + // now set vhat_i to its true value by doing + // vhat_i += qidot * shat_i + if(!m_useGlobalVelocities) + { + spatJointVel.setZero(); + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + spatJointVel += m_links[i].m_axes[dof] * getJointVelMultiDof(i)[dof]; + + // remember vhat_i is really vhat_p(i) (but in current frame) at this point => we need to add velocity across the inboard joint + spatVel[i+1] += spatJointVel; + + // + // vhat_i is vhat_p(i) transformed to local coors + the velocity across the i-th inboard joint + //spatVel[i+1] = fromParent * spatVel[parent+1] + spatJointVel; + + } + else + { + fromWorld.transformRotationOnly(m_links[i].m_absFrameTotVelocity, spatVel[i+1]); + fromWorld.transformRotationOnly(m_links[i].m_absFrameLocVelocity, spatJointVel); + } + + // we can now calculate chat_i + spatVel[i+1].cross(spatJointVel, spatCoriolisAcc[i]); + + // calculate zhat_i^A + // + //external forces + btVector3 linkAppliedForce = isConstraintPass? m_links[i].m_appliedConstraintForce : m_links[i].m_appliedForce; + btVector3 linkAppliedTorque =isConstraintPass ? m_links[i].m_appliedConstraintTorque : m_links[i].m_appliedTorque; + + zeroAccSpatFrc[i+1].setVector(-(rot_from_world[i+1] * linkAppliedTorque), -(rot_from_world[i+1] * linkAppliedForce )); + +#if 0 + { + + b3Printf("stepVelocitiesMultiDof zeroAccSpatFrc[%d] linear:%f,%f,%f, angular:%f,%f,%f", + i+1, + zeroAccSpatFrc[i+1].m_topVec[0], + zeroAccSpatFrc[i+1].m_topVec[1], + zeroAccSpatFrc[i+1].m_topVec[2], + + zeroAccSpatFrc[i+1].m_bottomVec[0], + zeroAccSpatFrc[i+1].m_bottomVec[1], + zeroAccSpatFrc[i+1].m_bottomVec[2]); + } +#endif + // + //adding damping terms (only) + btScalar linDampMult = 1., angDampMult = 1.; + zeroAccSpatFrc[i+1].addVector(angDampMult * m_links[i].m_inertiaLocal * spatVel[i+1].getAngular() * (DAMPING_K1_ANGULAR + DAMPING_K2_ANGULAR * spatVel[i+1].getAngular().safeNorm()), + linDampMult * m_links[i].m_mass * spatVel[i+1].getLinear() * (DAMPING_K1_LINEAR + DAMPING_K2_LINEAR * spatVel[i+1].getLinear().safeNorm())); + + // calculate Ihat_i^A + //init the spatial AB inertia (it has the simple form thanks to choosing local body frames origins at their COMs) + spatInertia[i+1].setMatrix( btMatrix3x3(0,0,0,0,0,0,0,0,0), + // + btMatrix3x3(m_links[i].m_mass, 0, 0, + 0, m_links[i].m_mass, 0, + 0, 0, m_links[i].m_mass), + // + btMatrix3x3(m_links[i].m_inertiaLocal[0], 0, 0, + 0, m_links[i].m_inertiaLocal[1], 0, + 0, 0, m_links[i].m_inertiaLocal[2]) + ); + // + //p += vhat x Ihat vhat - done in a simpler way + if(m_useGyroTerm) + zeroAccSpatFrc[i+1].addAngular(spatVel[i+1].getAngular().cross(m_links[i].m_inertiaLocal * spatVel[i+1].getAngular())); + // + zeroAccSpatFrc[i+1].addLinear(m_links[i].m_mass * spatVel[i+1].getAngular().cross(spatVel[i+1].getLinear())); + //btVector3 temp = m_links[i].m_mass * spatVel[i+1].getAngular().cross(spatVel[i+1].getLinear()); + ////clamp parent's omega + //btScalar parOmegaMod = temp.length(); + //btScalar parOmegaModMax = 1000; + //if(parOmegaMod > parOmegaModMax) + // temp *= parOmegaModMax / parOmegaMod; + //zeroAccSpatFrc[i+1].addLinear(temp); + //printf("|zeroAccSpatFrc[%d]| = %.4f\n", i+1, temp.length()); + //temp = spatCoriolisAcc[i].getLinear(); + //printf("|spatCoriolisAcc[%d]| = %.4f\n", i+1, temp.length()); + + + + //printf("w[%d] = [%.4f %.4f %.4f]\n", i, vel_top_angular[i+1].x(), vel_top_angular[i+1].y(), vel_top_angular[i+1].z()); + //printf("v[%d] = [%.4f %.4f %.4f]\n", i, vel_bottom_linear[i+1].x(), vel_bottom_linear[i+1].y(), vel_bottom_linear[i+1].z()); + //printf("c[%d] = [%.4f %.4f %.4f]\n", i, coriolis_bottom_linear[i].x(), coriolis_bottom_linear[i].y(), coriolis_bottom_linear[i].z()); + } + + // 'Downward' loop. + // (part of TreeForwardDynamics in Mirtich.) + for (int i = num_links - 1; i >= 0; --i) + { + const int parent = m_links[i].m_parent; + fromParent.m_rotMat = rot_from_parent[i+1]; fromParent.m_trnVec = m_links[i].m_cachedRVector; + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof]; + // + hDof = spatInertia[i+1] * m_links[i].m_axes[dof]; + // + Y[m_links[i].m_dofOffset + dof] = m_links[i].m_jointTorque[dof] + - m_links[i].m_axes[dof].dot(zeroAccSpatFrc[i+1]) + - spatCoriolisAcc[i].dot(hDof) + ; + } + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + btScalar *D_row = &D[dof * m_links[i].m_dofCount]; + for(int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2) + { + btSpatialForceVector &hDof2 = h[m_links[i].m_dofOffset + dof2]; + D_row[dof2] = m_links[i].m_axes[dof].dot(hDof2); + } + } + + btScalar *invDi = &invD[m_links[i].m_dofOffset*m_links[i].m_dofOffset]; + switch(m_links[i].m_jointType) + { + case btMultibodyLink::ePrismatic: + case btMultibodyLink::eRevolute: + { + invDi[0] = 1.0f / D[0]; + break; + } + case btMultibodyLink::eSpherical: + case btMultibodyLink::ePlanar: + { + btMatrix3x3 D3x3; D3x3.setValue(D[0], D[1], D[2], D[3], D[4], D[5], D[6], D[7], D[8]); + btMatrix3x3 invD3x3; invD3x3 = D3x3.inverse(); + + //unroll the loop? + for(int row = 0; row < 3; ++row) + { + for(int col = 0; col < 3; ++col) + { + invDi[row * 3 + col] = invD3x3[row][col]; + } + } + + break; + } + default: + { + + } + } + + //determine h*D^{-1} + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + spatForceVecTemps[dof].setZero(); + + for(int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2) + { + btSpatialForceVector &hDof2 = h[m_links[i].m_dofOffset + dof2]; + // + spatForceVecTemps[dof] += hDof2 * invDi[dof2 * m_links[i].m_dofCount + dof]; + } + } + + dyadTemp = spatInertia[i+1]; + + //determine (h*D^{-1}) * h^{T} + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof]; + // + dyadTemp -= symmetricSpatialOuterProduct(hDof, spatForceVecTemps[dof]); + } + + fromParent.transformInverse(dyadTemp, spatInertia[parent+1], btSpatialTransformationMatrix::Add); + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + invD_times_Y[dof] = 0.f; + + for(int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2) + { + invD_times_Y[dof] += invDi[dof * m_links[i].m_dofCount + dof2] * Y[m_links[i].m_dofOffset + dof2]; + } + } + + spatForceVecTemps[0] = zeroAccSpatFrc[i+1] + spatInertia[i+1] * spatCoriolisAcc[i]; + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof]; + // + spatForceVecTemps[0] += hDof * invD_times_Y[dof]; + } + + fromParent.transformInverse(spatForceVecTemps[0], spatForceVecTemps[1]); + + zeroAccSpatFrc[parent+1] += spatForceVecTemps[1]; + } + + + // Second 'upward' loop + // (part of TreeForwardDynamics in Mirtich) + + if (m_fixedBase) + { + spatAcc[0].setZero(); + } + else + { + if (num_links > 0) + { + m_cachedInertiaValid = true; + m_cachedInertiaTopLeft = spatInertia[0].m_topLeftMat; + m_cachedInertiaTopRight = spatInertia[0].m_topRightMat; + m_cachedInertiaLowerLeft = spatInertia[0].m_bottomLeftMat; + m_cachedInertiaLowerRight= spatInertia[0].m_topLeftMat.transpose(); + + } + + solveImatrix(zeroAccSpatFrc[0], result); + spatAcc[0] = -result; + } + + + // now do the loop over the m_links + for (int i = 0; i < num_links; ++i) + { + // qdd = D^{-1} * (Y - h^{T}*apar) = (S^{T}*I*S)^{-1} * (tau - S^{T}*I*cor - S^{T}*zeroAccFrc - S^{T}*I*apar) + // a = apar + cor + Sqdd + //or + // qdd = D^{-1} * (Y - h^{T}*(apar+cor)) + // a = apar + Sqdd + + const int parent = m_links[i].m_parent; + fromParent.m_rotMat = rot_from_parent[i+1]; fromParent.m_trnVec = m_links[i].m_cachedRVector; + + fromParent.transform(spatAcc[parent+1], spatAcc[i+1]); + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof]; + // + Y_minus_hT_a[dof] = Y[m_links[i].m_dofOffset + dof] - spatAcc[i+1].dot(hDof); + } + + btScalar *invDi = &invD[m_links[i].m_dofOffset*m_links[i].m_dofOffset]; + //D^{-1} * (Y - h^{T}*apar) + mulMatrix(invDi, Y_minus_hT_a, m_links[i].m_dofCount, m_links[i].m_dofCount, m_links[i].m_dofCount, 1, &joint_accel[m_links[i].m_dofOffset]); + + spatAcc[i+1] += spatCoriolisAcc[i]; + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + spatAcc[i+1] += m_links[i].m_axes[dof] * joint_accel[m_links[i].m_dofOffset + dof]; + + if (m_links[i].m_jointFeedback) + { + m_internalNeedsJointFeedback = true; + + btVector3 angularBotVec = (spatInertia[i+1]*spatAcc[i+1]+zeroAccSpatFrc[i+1]).m_bottomVec; + btVector3 linearTopVec = (spatInertia[i+1]*spatAcc[i+1]+zeroAccSpatFrc[i+1]).m_topVec; + + if (gJointFeedbackInJointFrame) + { + //shift the reaction forces to the joint frame + //linear (force) component is the same + //shift the angular (torque, moment) component using the relative position, m_links[i].m_dVector + angularBotVec = angularBotVec - linearTopVec.cross(m_links[i].m_dVector); + } + + + if (gJointFeedbackInWorldSpace) + { + if (isConstraintPass) + { + m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec += m_links[i].m_cachedWorldTransform.getBasis()*angularBotVec; + m_links[i].m_jointFeedback->m_reactionForces.m_topVec += m_links[i].m_cachedWorldTransform.getBasis()*linearTopVec; + } else + { + m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec = m_links[i].m_cachedWorldTransform.getBasis()*angularBotVec; + m_links[i].m_jointFeedback->m_reactionForces.m_topVec = m_links[i].m_cachedWorldTransform.getBasis()*linearTopVec; + } + } else + { + if (isConstraintPass) + { + m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec += angularBotVec; + m_links[i].m_jointFeedback->m_reactionForces.m_topVec += linearTopVec; + + } + else + { + m_links[i].m_jointFeedback->m_reactionForces.m_bottomVec = angularBotVec; + m_links[i].m_jointFeedback->m_reactionForces.m_topVec = linearTopVec; + } + } + } + + } + + // transform base accelerations back to the world frame. + btVector3 omegadot_out = rot_from_parent[0].transpose() * spatAcc[0].getAngular(); + output[0] = omegadot_out[0]; + output[1] = omegadot_out[1]; + output[2] = omegadot_out[2]; + + btVector3 vdot_out = rot_from_parent[0].transpose() * (spatAcc[0].getLinear() + spatVel[0].getAngular().cross(spatVel[0].getLinear())); + output[3] = vdot_out[0]; + output[4] = vdot_out[1]; + output[5] = vdot_out[2]; + + ///////////////// + //printf("q = ["); + //printf("%.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f ", m_baseQuat.x(), m_baseQuat.y(), m_baseQuat.z(), m_baseQuat.w(), m_basePos.x(), m_basePos.y(), m_basePos.z()); + //for(int link = 0; link < getNumLinks(); ++link) + // for(int dof = 0; dof < m_links[link].m_dofCount; ++dof) + // printf("%.6f ", m_links[link].m_jointPos[dof]); + //printf("]\n"); + //// + //printf("qd = ["); + //for(int dof = 0; dof < getNumDofs() + 6; ++dof) + // printf("%.6f ", m_realBuf[dof]); + //printf("]\n"); + //printf("qdd = ["); + //for(int dof = 0; dof < getNumDofs() + 6; ++dof) + // printf("%.6f ", output[dof]); + //printf("]\n"); + ///////////////// + + // Final step: add the accelerations (times dt) to the velocities. + + if (!isConstraintPass) + { + if(dt > 0.) + applyDeltaVeeMultiDof(output, dt); + + } + ///// + //btScalar angularThres = 1; + //btScalar maxAngVel = 0.; + //bool scaleDown = 1.; + //for(int link = 0; link < m_links.size(); ++link) + //{ + // if(spatVel[link+1].getAngular().length() > maxAngVel) + // { + // maxAngVel = spatVel[link+1].getAngular().length(); + // scaleDown = angularThres / spatVel[link+1].getAngular().length(); + // break; + // } + //} + + //if(scaleDown != 1.) + //{ + // for(int link = 0; link < m_links.size(); ++link) + // { + // if(m_links[link].m_jointType == btMultibodyLink::eRevolute || m_links[link].m_jointType == btMultibodyLink::eSpherical) + // { + // for(int dof = 0; dof < m_links[link].m_dofCount; ++dof) + // getJointVelMultiDof(link)[dof] *= scaleDown; + // } + // } + //} + ///// + + ///////////////////// + if(m_useGlobalVelocities) + { + for (int i = 0; i < num_links; ++i) + { + const int parent = m_links[i].m_parent; + //rot_from_parent[i+1] = btMatrix3x3(m_links[i].m_cachedRotParentToThis); /// <- done + //rot_from_world[i+1] = rot_from_parent[i+1] * rot_from_world[parent+1]; /// <- done + + fromParent.m_rotMat = rot_from_parent[i+1]; fromParent.m_trnVec = m_links[i].m_cachedRVector; + fromWorld.m_rotMat = rot_from_world[i+1]; + + // vhat_i = i_xhat_p(i) * vhat_p(i) + fromParent.transform(spatVel[parent+1], spatVel[i+1]); + //nice alternative below (using operator *) but it generates temps + ///////////////////////////////////////////////////////////// + + // now set vhat_i to its true value by doing + // vhat_i += qidot * shat_i + spatJointVel.setZero(); + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + spatJointVel += m_links[i].m_axes[dof] * getJointVelMultiDof(i)[dof]; + + // remember vhat_i is really vhat_p(i) (but in current frame) at this point => we need to add velocity across the inboard joint + spatVel[i+1] += spatJointVel; + + + fromWorld.transformInverseRotationOnly(spatVel[i+1], m_links[i].m_absFrameTotVelocity); + fromWorld.transformInverseRotationOnly(spatJointVel, m_links[i].m_absFrameLocVelocity); + } + } + +} + + + +void btMultiBody::solveImatrix(const btVector3& rhs_top, const btVector3& rhs_bot, float result[6]) const +{ + int num_links = getNumLinks(); + ///solve I * x = rhs, so the result = invI * rhs + if (num_links == 0) + { + // in the case of 0 m_links (i.e. a plain rigid body, not a multibody) rhs * invI is easier + result[0] = rhs_bot[0] / m_baseInertia[0]; + result[1] = rhs_bot[1] / m_baseInertia[1]; + result[2] = rhs_bot[2] / m_baseInertia[2]; + result[3] = rhs_top[0] / m_baseMass; + result[4] = rhs_top[1] / m_baseMass; + result[5] = rhs_top[2] / m_baseMass; + } else + { + if (!m_cachedInertiaValid) + { + for (int i=0;i<6;i++) + { + result[i] = 0.f; + } + return; + } + /// Special routine for calculating the inverse of a spatial inertia matrix + ///the 6x6 matrix is stored as 4 blocks of 3x3 matrices + btMatrix3x3 Binv = m_cachedInertiaTopRight.inverse()*-1.f; + btMatrix3x3 tmp = m_cachedInertiaLowerRight * Binv; + btMatrix3x3 invIupper_right = (tmp * m_cachedInertiaTopLeft + m_cachedInertiaLowerLeft).inverse(); + tmp = invIupper_right * m_cachedInertiaLowerRight; + btMatrix3x3 invI_upper_left = (tmp * Binv); + btMatrix3x3 invI_lower_right = (invI_upper_left).transpose(); + tmp = m_cachedInertiaTopLeft * invI_upper_left; + tmp[0][0]-= 1.0; + tmp[1][1]-= 1.0; + tmp[2][2]-= 1.0; + btMatrix3x3 invI_lower_left = (Binv * tmp); + + //multiply result = invI * rhs + { + btVector3 vtop = invI_upper_left*rhs_top; + btVector3 tmp; + tmp = invIupper_right * rhs_bot; + vtop += tmp; + btVector3 vbot = invI_lower_left*rhs_top; + tmp = invI_lower_right * rhs_bot; + vbot += tmp; + result[0] = vtop[0]; + result[1] = vtop[1]; + result[2] = vtop[2]; + result[3] = vbot[0]; + result[4] = vbot[1]; + result[5] = vbot[2]; + } + + } +} +void btMultiBody::solveImatrix(const btSpatialForceVector &rhs, btSpatialMotionVector &result) const +{ + int num_links = getNumLinks(); + ///solve I * x = rhs, so the result = invI * rhs + if (num_links == 0) + { + // in the case of 0 m_links (i.e. a plain rigid body, not a multibody) rhs * invI is easier + result.setAngular(rhs.getAngular() / m_baseInertia); + result.setLinear(rhs.getLinear() / m_baseMass); + } else + { + /// Special routine for calculating the inverse of a spatial inertia matrix + ///the 6x6 matrix is stored as 4 blocks of 3x3 matrices + if (!m_cachedInertiaValid) + { + result.setLinear(btVector3(0,0,0)); + result.setAngular(btVector3(0,0,0)); + result.setVector(btVector3(0,0,0),btVector3(0,0,0)); + return; + } + btMatrix3x3 Binv = m_cachedInertiaTopRight.inverse()*-1.f; + btMatrix3x3 tmp = m_cachedInertiaLowerRight * Binv; + btMatrix3x3 invIupper_right = (tmp * m_cachedInertiaTopLeft + m_cachedInertiaLowerLeft).inverse(); + tmp = invIupper_right * m_cachedInertiaLowerRight; + btMatrix3x3 invI_upper_left = (tmp * Binv); + btMatrix3x3 invI_lower_right = (invI_upper_left).transpose(); + tmp = m_cachedInertiaTopLeft * invI_upper_left; + tmp[0][0]-= 1.0; + tmp[1][1]-= 1.0; + tmp[2][2]-= 1.0; + btMatrix3x3 invI_lower_left = (Binv * tmp); + + //multiply result = invI * rhs + { + btVector3 vtop = invI_upper_left*rhs.getLinear(); + btVector3 tmp; + tmp = invIupper_right * rhs.getAngular(); + vtop += tmp; + btVector3 vbot = invI_lower_left*rhs.getLinear(); + tmp = invI_lower_right * rhs.getAngular(); + vbot += tmp; + result.setVector(vtop, vbot); + } + + } +} + +void btMultiBody::mulMatrix(btScalar *pA, btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const +{ + for (int row = 0; row < rowsA; row++) + { + for (int col = 0; col < colsB; col++) + { + pC[row * colsB + col] = 0.f; + for (int inner = 0; inner < rowsB; inner++) + { + pC[row * colsB + col] += pA[row * colsA + inner] * pB[col + inner * colsB]; + } + } + } +} + +void btMultiBody::calcAccelerationDeltasMultiDof(const btScalar *force, btScalar *output, + btAlignedObjectArray &scratch_r, btAlignedObjectArray &scratch_v) const +{ + // Temporary matrices/vectors -- use scratch space from caller + // so that we don't have to keep reallocating every frame + + + int num_links = getNumLinks(); + scratch_r.resize(m_dofCount); + scratch_v.resize(4*num_links + 4); + + btScalar * r_ptr = m_dofCount ? &scratch_r[0] : 0; + btVector3 * v_ptr = &scratch_v[0]; + + // zhat_i^A (scratch space) + btSpatialForceVector * zeroAccSpatFrc = (btSpatialForceVector *)v_ptr; + v_ptr += num_links * 2 + 2; + + // rot_from_parent (cached from calcAccelerations) + const btMatrix3x3 * rot_from_parent = &m_matrixBuf[0]; + + // hhat (cached), accel (scratch) + // hhat is NOT stored for the base (but ahat is) + const btSpatialForceVector * h = (btSpatialForceVector *)(m_dofCount > 0 ? &m_vectorBuf[0] : 0); + btSpatialMotionVector * spatAcc = (btSpatialMotionVector *)v_ptr; + v_ptr += num_links * 2 + 2; + + // Y_i (scratch), invD_i (cached) + const btScalar * invD = m_dofCount > 0 ? &m_realBuf[6 + m_dofCount] : 0; + btScalar * Y = r_ptr; + //////////////// + //aux variables + btScalar invD_times_Y[6]; //D^{-1} * Y [dofxdof x dofx1 = dofx1] <=> D^{-1} * u; better moved to buffers since it is recalced in calcAccelerationDeltasMultiDof; num_dof of btScalar would cover all bodies + btSpatialMotionVector result; //holds results of the SolveImatrix op; it is a spatial motion vector (accel) + btScalar Y_minus_hT_a[6]; //Y - h^{T} * a; it's dofx1 for each body so a single 6x1 temp is enough + btSpatialForceVector spatForceVecTemps[6]; //6 temporary spatial force vectors + btSpatialTransformationMatrix fromParent; + ///////////////// + + // First 'upward' loop. + // Combines CompTreeLinkVelocities and InitTreeLinks from Mirtich. + + // Fill in zero_acc + // -- set to force/torque on the base, zero otherwise + if (m_fixedBase) + { + zeroAccSpatFrc[0].setZero(); + } else + { + //test forces + fromParent.m_rotMat = rot_from_parent[0]; + fromParent.transformRotationOnly(btSpatialForceVector(-force[0],-force[1],-force[2], -force[3],-force[4],-force[5]), zeroAccSpatFrc[0]); + } + for (int i = 0; i < num_links; ++i) + { + zeroAccSpatFrc[i+1].setZero(); + } + + // 'Downward' loop. + // (part of TreeForwardDynamics in Mirtich.) + for (int i = num_links - 1; i >= 0; --i) + { + const int parent = m_links[i].m_parent; + fromParent.m_rotMat = rot_from_parent[i+1]; fromParent.m_trnVec = m_links[i].m_cachedRVector; + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + Y[m_links[i].m_dofOffset + dof] = force[6 + m_links[i].m_dofOffset + dof] + - m_links[i].m_axes[dof].dot(zeroAccSpatFrc[i+1]) + ; + } + + btVector3 in_top, in_bottom, out_top, out_bottom; + const btScalar *invDi = &invD[m_links[i].m_dofOffset*m_links[i].m_dofOffset]; + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + invD_times_Y[dof] = 0.f; + + for(int dof2 = 0; dof2 < m_links[i].m_dofCount; ++dof2) + { + invD_times_Y[dof] += invDi[dof * m_links[i].m_dofCount + dof2] * Y[m_links[i].m_dofOffset + dof2]; + } + } + + // Zp += pXi * (Zi + hi*Yi/Di) + spatForceVecTemps[0] = zeroAccSpatFrc[i+1]; + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof]; + // + spatForceVecTemps[0] += hDof * invD_times_Y[dof]; + } + + + fromParent.transformInverse(spatForceVecTemps[0], spatForceVecTemps[1]); + + zeroAccSpatFrc[parent+1] += spatForceVecTemps[1]; + } + + // ptr to the joint accel part of the output + btScalar * joint_accel = output + 6; + + + // Second 'upward' loop + // (part of TreeForwardDynamics in Mirtich) + + if (m_fixedBase) + { + spatAcc[0].setZero(); + } + else + { + solveImatrix(zeroAccSpatFrc[0], result); + spatAcc[0] = -result; + + } + + // now do the loop over the m_links + for (int i = 0; i < num_links; ++i) + { + const int parent = m_links[i].m_parent; + fromParent.m_rotMat = rot_from_parent[i+1]; fromParent.m_trnVec = m_links[i].m_cachedRVector; + + fromParent.transform(spatAcc[parent+1], spatAcc[i+1]); + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + { + const btSpatialForceVector &hDof = h[m_links[i].m_dofOffset + dof]; + // + Y_minus_hT_a[dof] = Y[m_links[i].m_dofOffset + dof] - spatAcc[i+1].dot(hDof); + } + + const btScalar *invDi = &invD[m_links[i].m_dofOffset*m_links[i].m_dofOffset]; + mulMatrix(const_cast(invDi), Y_minus_hT_a, m_links[i].m_dofCount, m_links[i].m_dofCount, m_links[i].m_dofCount, 1, &joint_accel[m_links[i].m_dofOffset]); + + for(int dof = 0; dof < m_links[i].m_dofCount; ++dof) + spatAcc[i+1] += m_links[i].m_axes[dof] * joint_accel[m_links[i].m_dofOffset + dof]; + } + + // transform base accelerations back to the world frame. + btVector3 omegadot_out; + omegadot_out = rot_from_parent[0].transpose() * spatAcc[0].getAngular(); + output[0] = omegadot_out[0]; + output[1] = omegadot_out[1]; + output[2] = omegadot_out[2]; + + btVector3 vdot_out; + vdot_out = rot_from_parent[0].transpose() * spatAcc[0].getLinear(); + output[3] = vdot_out[0]; + output[4] = vdot_out[1]; + output[5] = vdot_out[2]; + + ///////////////// + //printf("delta = ["); + //for(int dof = 0; dof < getNumDofs() + 6; ++dof) + // printf("%.2f ", output[dof]); + //printf("]\n"); + ///////////////// +} + + + + +void btMultiBody::stepPositionsMultiDof(btScalar dt, btScalar *pq, btScalar *pqd) +{ + int num_links = getNumLinks(); + // step position by adding dt * velocity + //btVector3 v = getBaseVel(); + //m_basePos += dt * v; + // + btScalar *pBasePos = (pq ? &pq[4] : m_basePos); + btScalar *pBaseVel = (pqd ? &pqd[3] : &m_realBuf[3]); //note: the !pqd case assumes m_realBuf holds with base velocity at 3,4,5 (should be wrapped for safety) + // + pBasePos[0] += dt * pBaseVel[0]; + pBasePos[1] += dt * pBaseVel[1]; + pBasePos[2] += dt * pBaseVel[2]; + + /////////////////////////////// + //local functor for quaternion integration (to avoid error prone redundancy) + struct + { + //"exponential map" based on btTransformUtil::integrateTransform(..) + void operator() (const btVector3 &omega, btQuaternion &quat, bool baseBody, btScalar dt) + { + //baseBody => quat is alias and omega is global coor + //!baseBody => quat is alibi and omega is local coor + + btVector3 axis; + btVector3 angvel; + + if(!baseBody) + angvel = quatRotate(quat, omega); //if quat is not m_baseQuat, it is alibi => ok + else + angvel = omega; + + btScalar fAngle = angvel.length(); + //limit the angular motion + if (fAngle * dt > ANGULAR_MOTION_THRESHOLD) + { + fAngle = btScalar(0.5)*SIMD_HALF_PI / dt; + } + + if ( fAngle < btScalar(0.001) ) + { + // use Taylor's expansions of sync function + axis = angvel*( btScalar(0.5)*dt-(dt*dt*dt)*(btScalar(0.020833333333))*fAngle*fAngle ); + } + else + { + // sync(fAngle) = sin(c*fAngle)/t + axis = angvel*( btSin(btScalar(0.5)*fAngle*dt)/fAngle ); + } + + if(!baseBody) + quat = btQuaternion(axis.x(),axis.y(),axis.z(),btCos( fAngle*dt*btScalar(0.5) )) * quat; + else + quat = quat * btQuaternion(-axis.x(),-axis.y(),-axis.z(),btCos( fAngle*dt*btScalar(0.5) )); + //equivalent to: quat = (btQuaternion(axis.x(),axis.y(),axis.z(),btCos( fAngle*dt*btScalar(0.5) )) * quat.inverse()).inverse(); + + quat.normalize(); + } + } pQuatUpdateFun; + /////////////////////////////// + + //pQuatUpdateFun(getBaseOmega(), m_baseQuat, true, dt); + // + btScalar *pBaseQuat = pq ? pq : m_baseQuat; + btScalar *pBaseOmega = pqd ? pqd : &m_realBuf[0]; //note: the !pqd case assumes m_realBuf starts with base omega (should be wrapped for safety) + // + btQuaternion baseQuat; baseQuat.setValue(pBaseQuat[0], pBaseQuat[1], pBaseQuat[2], pBaseQuat[3]); + btVector3 baseOmega; baseOmega.setValue(pBaseOmega[0], pBaseOmega[1], pBaseOmega[2]); + pQuatUpdateFun(baseOmega, baseQuat, true, dt); + pBaseQuat[0] = baseQuat.x(); + pBaseQuat[1] = baseQuat.y(); + pBaseQuat[2] = baseQuat.z(); + pBaseQuat[3] = baseQuat.w(); + + + //printf("pBaseOmega = %.4f %.4f %.4f\n", pBaseOmega->x(), pBaseOmega->y(), pBaseOmega->z()); + //printf("pBaseVel = %.4f %.4f %.4f\n", pBaseVel->x(), pBaseVel->y(), pBaseVel->z()); + //printf("baseQuat = %.4f %.4f %.4f %.4f\n", pBaseQuat->x(), pBaseQuat->y(), pBaseQuat->z(), pBaseQuat->w()); + + if(pq) + pq += 7; + if(pqd) + pqd += 6; + + // Finally we can update m_jointPos for each of the m_links + for (int i = 0; i < num_links; ++i) + { + btScalar *pJointPos = (pq ? pq : &m_links[i].m_jointPos[0]); + btScalar *pJointVel = (pqd ? pqd : getJointVelMultiDof(i)); + + switch(m_links[i].m_jointType) + { + case btMultibodyLink::ePrismatic: + case btMultibodyLink::eRevolute: + { + btScalar jointVel = pJointVel[0]; + pJointPos[0] += dt * jointVel; + break; + } + case btMultibodyLink::eSpherical: + { + btVector3 jointVel; jointVel.setValue(pJointVel[0], pJointVel[1], pJointVel[2]); + btQuaternion jointOri; jointOri.setValue(pJointPos[0], pJointPos[1], pJointPos[2], pJointPos[3]); + pQuatUpdateFun(jointVel, jointOri, false, dt); + pJointPos[0] = jointOri.x(); pJointPos[1] = jointOri.y(); pJointPos[2] = jointOri.z(); pJointPos[3] = jointOri.w(); + break; + } + case btMultibodyLink::ePlanar: + { + pJointPos[0] += dt * getJointVelMultiDof(i)[0]; + + btVector3 q0_coors_qd1qd2 = getJointVelMultiDof(i)[1] * m_links[i].getAxisBottom(1) + getJointVelMultiDof(i)[2] * m_links[i].getAxisBottom(2); + btVector3 no_q0_coors_qd1qd2 = quatRotate(btQuaternion(m_links[i].getAxisTop(0), pJointPos[0]), q0_coors_qd1qd2); + pJointPos[1] += m_links[i].getAxisBottom(1).dot(no_q0_coors_qd1qd2) * dt; + pJointPos[2] += m_links[i].getAxisBottom(2).dot(no_q0_coors_qd1qd2) * dt; + + break; + } + default: + { + } + + } + + m_links[i].updateCacheMultiDof(pq); + + if(pq) + pq += m_links[i].m_posVarCount; + if(pqd) + pqd += m_links[i].m_dofCount; + } +} + +void btMultiBody::fillConstraintJacobianMultiDof(int link, + const btVector3 &contact_point, + const btVector3 &normal_ang, + const btVector3 &normal_lin, + btScalar *jac, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v, + btAlignedObjectArray &scratch_m) const +{ + // temporary space + int num_links = getNumLinks(); + int m_dofCount = getNumDofs(); + scratch_v.resize(3*num_links + 3); //(num_links + base) offsets + (num_links + base) normals_lin + (num_links + base) normals_ang + scratch_m.resize(num_links + 1); + + btVector3 * v_ptr = &scratch_v[0]; + btVector3 * p_minus_com_local = v_ptr; v_ptr += num_links + 1; + btVector3 * n_local_lin = v_ptr; v_ptr += num_links + 1; + btVector3 * n_local_ang = v_ptr; v_ptr += num_links + 1; + btAssert(v_ptr - &scratch_v[0] == scratch_v.size()); + + scratch_r.resize(m_dofCount); + btScalar * results = m_dofCount > 0 ? &scratch_r[0] : 0; + + btMatrix3x3 * rot_from_world = &scratch_m[0]; + + const btVector3 p_minus_com_world = contact_point - m_basePos; + const btVector3 &normal_lin_world = normal_lin; //convenience + const btVector3 &normal_ang_world = normal_ang; + + rot_from_world[0] = btMatrix3x3(m_baseQuat); + + // omega coeffients first. + btVector3 omega_coeffs_world; + omega_coeffs_world = p_minus_com_world.cross(normal_lin_world); + jac[0] = omega_coeffs_world[0] + normal_ang_world[0]; + jac[1] = omega_coeffs_world[1] + normal_ang_world[1]; + jac[2] = omega_coeffs_world[2] + normal_ang_world[2]; + // then v coefficients + jac[3] = normal_lin_world[0]; + jac[4] = normal_lin_world[1]; + jac[5] = normal_lin_world[2]; + + //create link-local versions of p_minus_com and normal + p_minus_com_local[0] = rot_from_world[0] * p_minus_com_world; + n_local_lin[0] = rot_from_world[0] * normal_lin_world; + n_local_ang[0] = rot_from_world[0] * normal_ang_world; + + // Set remaining jac values to zero for now. + for (int i = 6; i < 6 + m_dofCount; ++i) + { + jac[i] = 0; + } + + // Qdot coefficients, if necessary. + if (num_links > 0 && link > -1) { + + // TODO: speed this up -- don't calculate for m_links we don't need. + // (Also, we are making 3 separate calls to this function, for the normal & the 2 friction directions, + // which is resulting in repeated work being done...) + + // calculate required normals & positions in the local frames. + for (int i = 0; i < num_links; ++i) { + + // transform to local frame + const int parent = m_links[i].m_parent; + const btMatrix3x3 mtx(m_links[i].m_cachedRotParentToThis); + rot_from_world[i+1] = mtx * rot_from_world[parent+1]; + + n_local_lin[i+1] = mtx * n_local_lin[parent+1]; + n_local_ang[i+1] = mtx * n_local_ang[parent+1]; + p_minus_com_local[i+1] = mtx * p_minus_com_local[parent+1] - m_links[i].m_cachedRVector; + + // calculate the jacobian entry + switch(m_links[i].m_jointType) + { + case btMultibodyLink::eRevolute: + { + results[m_links[i].m_dofOffset] = n_local_lin[i+1].dot(m_links[i].getAxisTop(0).cross(p_minus_com_local[i+1]) + m_links[i].getAxisBottom(0)); + results[m_links[i].m_dofOffset] += n_local_ang[i+1].dot(m_links[i].getAxisTop(0)); + break; + } + case btMultibodyLink::ePrismatic: + { + results[m_links[i].m_dofOffset] = n_local_lin[i+1].dot(m_links[i].getAxisBottom(0)); + break; + } + case btMultibodyLink::eSpherical: + { + results[m_links[i].m_dofOffset + 0] = n_local_lin[i+1].dot(m_links[i].getAxisTop(0).cross(p_minus_com_local[i+1]) + m_links[i].getAxisBottom(0)); + results[m_links[i].m_dofOffset + 1] = n_local_lin[i+1].dot(m_links[i].getAxisTop(1).cross(p_minus_com_local[i+1]) + m_links[i].getAxisBottom(1)); + results[m_links[i].m_dofOffset + 2] = n_local_lin[i+1].dot(m_links[i].getAxisTop(2).cross(p_minus_com_local[i+1]) + m_links[i].getAxisBottom(2)); + + results[m_links[i].m_dofOffset + 0] += n_local_ang[i+1].dot(m_links[i].getAxisTop(0)); + results[m_links[i].m_dofOffset + 1] += n_local_ang[i+1].dot(m_links[i].getAxisTop(1)); + results[m_links[i].m_dofOffset + 2] += n_local_ang[i+1].dot(m_links[i].getAxisTop(2)); + + break; + } + case btMultibodyLink::ePlanar: + { + results[m_links[i].m_dofOffset + 0] = n_local_lin[i+1].dot(m_links[i].getAxisTop(0).cross(p_minus_com_local[i+1]));// + m_links[i].getAxisBottom(0)); + results[m_links[i].m_dofOffset + 1] = n_local_lin[i+1].dot(m_links[i].getAxisBottom(1)); + results[m_links[i].m_dofOffset + 2] = n_local_lin[i+1].dot(m_links[i].getAxisBottom(2)); + + break; + } + default: + { + } + } + + } + + // Now copy through to output. + //printf("jac[%d] = ", link); + while (link != -1) + { + for(int dof = 0; dof < m_links[link].m_dofCount; ++dof) + { + jac[6 + m_links[link].m_dofOffset + dof] = results[m_links[link].m_dofOffset + dof]; + //printf("%.2f\t", jac[6 + m_links[link].m_dofOffset + dof]); + } + + link = m_links[link].m_parent; + } + //printf("]\n"); + } +} + + +void btMultiBody::wakeUp() +{ + m_awake = true; +} + +void btMultiBody::goToSleep() +{ + m_awake = false; +} + +void btMultiBody::checkMotionAndSleepIfRequired(btScalar timestep) +{ + int num_links = getNumLinks(); + extern bool gDisableDeactivation; + if (!m_canSleep || gDisableDeactivation) + { + m_awake = true; + m_sleepTimer = 0; + return; + } + + // motion is computed as omega^2 + v^2 + (sum of squares of joint velocities) + btScalar motion = 0; + { + for (int i = 0; i < 6 + m_dofCount; ++i) + motion += m_realBuf[i] * m_realBuf[i]; + } + + + if (motion < SLEEP_EPSILON) { + m_sleepTimer += timestep; + if (m_sleepTimer > SLEEP_TIMEOUT) { + goToSleep(); + } + } else { + m_sleepTimer = 0; + if (!m_awake) + wakeUp(); + } +} + + +void btMultiBody::forwardKinematics(btAlignedObjectArray& world_to_local,btAlignedObjectArray& local_origin) +{ + + int num_links = getNumLinks(); + + // Cached 3x3 rotation matrices from parent frame to this frame. + btMatrix3x3* rot_from_parent =(btMatrix3x3 *) &m_matrixBuf[0]; + + rot_from_parent[0] = btMatrix3x3(m_baseQuat); //m_baseQuat assumed to be alias!? + + for (int i = 0; i < num_links; ++i) + { + rot_from_parent[i+1] = btMatrix3x3(m_links[i].m_cachedRotParentToThis); + } + + int nLinks = getNumLinks(); + ///base + num m_links + world_to_local.resize(nLinks+1); + local_origin.resize(nLinks+1); + + world_to_local[0] = getWorldToBaseRot(); + local_origin[0] = getBasePos(); + + for (int k=0;k& world_to_local,btAlignedObjectArray& local_origin) +{ + world_to_local.resize(getNumLinks()+1); + local_origin.resize(getNumLinks()+1); + + world_to_local[0] = getWorldToBaseRot(); + local_origin[0] = getBasePos(); + + if (getBaseCollider()) + { + btVector3 posr = local_origin[0]; + // float pos[4]={posr.x(),posr.y(),posr.z(),1}; + btScalar quat[4]={-world_to_local[0].x(),-world_to_local[0].y(),-world_to_local[0].z(),world_to_local[0].w()}; + btTransform tr; + tr.setIdentity(); + tr.setOrigin(posr); + tr.setRotation(btQuaternion(quat[0],quat[1],quat[2],quat[3])); + + getBaseCollider()->setWorldTransform(tr); + + } + + for (int k=0;km_link; + btAssert(link == m); + + int index = link+1; + + btVector3 posr = local_origin[index]; + // float pos[4]={posr.x(),posr.y(),posr.z(),1}; + btScalar quat[4]={-world_to_local[index].x(),-world_to_local[index].y(),-world_to_local[index].z(),world_to_local[index].w()}; + btTransform tr; + tr.setIdentity(); + tr.setOrigin(posr); + tr.setRotation(btQuaternion(quat[0],quat[1],quat[2],quat[3])); + + col->setWorldTransform(tr); + } + } +} + +int btMultiBody::calculateSerializeBufferSize() const +{ + int sz = sizeof(btMultiBodyData); + return sz; +} + + ///fills the dataBuffer and returns the struct name (and 0 on failure) +const char* btMultiBody::serialize(void* dataBuffer, class btSerializer* serializer) const +{ + btMultiBodyData* mbd = (btMultiBodyData*) dataBuffer; + getBaseWorldTransform().serialize(mbd->m_baseWorldTransform); + mbd->m_baseMass = this->getBaseMass(); + getBaseInertia().serialize(mbd->m_baseInertia); + { + char* name = (char*) serializer->findNameForPointer(m_baseName); + mbd->m_baseName = (char*)serializer->getUniquePointer(name); + if (mbd->m_baseName) + { + serializer->serializeName(name); + } + } + mbd->m_numLinks = this->getNumLinks(); + if (mbd->m_numLinks) + { + int sz = sizeof(btMultiBodyLinkData); + int numElem = mbd->m_numLinks; + btChunk* chunk = serializer->allocate(sz,numElem); + btMultiBodyLinkData* memPtr = (btMultiBodyLinkData*)chunk->m_oldPtr; + for (int i=0;im_jointType = getLink(i).m_jointType; + memPtr->m_dofCount = getLink(i).m_dofCount; + memPtr->m_posVarCount = getLink(i).m_posVarCount; + + getLink(i).m_inertiaLocal.serialize(memPtr->m_linkInertia); + memPtr->m_linkMass = getLink(i).m_mass; + memPtr->m_parentIndex = getLink(i).m_parent; + memPtr->m_jointDamping = getLink(i).m_jointDamping; + memPtr->m_jointFriction = getLink(i).m_jointFriction; + + getLink(i).m_eVector.serialize(memPtr->m_parentComToThisComOffset); + getLink(i).m_dVector.serialize(memPtr->m_thisPivotToThisComOffset); + getLink(i).m_zeroRotParentToThis.serialize(memPtr->m_zeroRotParentToThis); + btAssert(memPtr->m_dofCount<=3); + for (int dof = 0;dofm_jointAxisBottom[dof]); + getLink(i).getAxisTop(dof).serialize(memPtr->m_jointAxisTop[dof]); + + memPtr->m_jointTorque[dof] = getLink(i).m_jointTorque[dof]; + memPtr->m_jointVel[dof] = getJointVelMultiDof(i)[dof]; + + } + int numPosVar = getLink(i).m_posVarCount; + for (int posvar = 0; posvar < numPosVar;posvar++) + { + memPtr->m_jointPos[posvar] = getLink(i).m_jointPos[posvar]; + } + + + { + char* name = (char*) serializer->findNameForPointer(m_links[i].m_linkName); + memPtr->m_linkName = (char*)serializer->getUniquePointer(name); + if (memPtr->m_linkName) + { + serializer->serializeName(name); + } + } + { + char* name = (char*) serializer->findNameForPointer(m_links[i].m_jointName); + memPtr->m_jointName = (char*)serializer->getUniquePointer(name); + if (memPtr->m_jointName) + { + serializer->serializeName(name); + } + } + memPtr->m_linkCollider = (btCollisionObjectData*)serializer->getUniquePointer(getLink(i).m_collider); + + } + serializer->finalizeChunk(chunk,btMultiBodyLinkDataName,BT_ARRAY_CODE,(void*) &m_links[0]); + } + mbd->m_links = mbd->m_numLinks? (btMultiBodyLinkData*) serializer->getUniquePointer((void*)&m_links[0]):0; + + return btMultiBodyDataName; +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBody.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBody.h new file mode 100644 index 000000000..43aacbc44 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBody.h @@ -0,0 +1,797 @@ +/* + * PURPOSE: + * Class representing an articulated rigid body. Stores the body's + * current state, allows forces and torques to be set, handles + * timestepping and implements Featherstone's algorithm. + * + * COPYRIGHT: + * Copyright (C) Stephen Thompson, , 2011-2013 + * Portions written By Erwin Coumans: connection to LCP solver, various multibody constraints, replacing Eigen math library by Bullet LinearMath and a dedicated 6x6 matrix inverse (solveImatrix) + * Portions written By Jakub Stepien: support for multi-DOF constraints, introduction of spatial algebra and several other improvements + + This software is provided 'as-is', without any express or implied warranty. + In no event will the authors be held liable for any damages arising from the use of this software. + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it freely, + subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + */ + + +#ifndef BT_MULTIBODY_H +#define BT_MULTIBODY_H + +#include "LinearMath/btScalar.h" +#include "LinearMath/btVector3.h" +#include "LinearMath/btQuaternion.h" +#include "LinearMath/btMatrix3x3.h" +#include "LinearMath/btAlignedObjectArray.h" + + +///serialization data, don't change them if you are not familiar with the details of the serialization mechanisms +#ifdef BT_USE_DOUBLE_PRECISION + #define btMultiBodyData btMultiBodyDoubleData + #define btMultiBodyDataName "btMultiBodyDoubleData" + #define btMultiBodyLinkData btMultiBodyLinkDoubleData + #define btMultiBodyLinkDataName "btMultiBodyLinkDoubleData" +#else + #define btMultiBodyData btMultiBodyFloatData + #define btMultiBodyDataName "btMultiBodyFloatData" + #define btMultiBodyLinkData btMultiBodyLinkFloatData + #define btMultiBodyLinkDataName "btMultiBodyLinkFloatData" +#endif //BT_USE_DOUBLE_PRECISION + +#include "btMultiBodyLink.h" +class btMultiBodyLinkCollider; + +ATTRIBUTE_ALIGNED16(class) btMultiBody +{ +public: + + + BT_DECLARE_ALIGNED_ALLOCATOR(); + + // + // initialization + // + + btMultiBody(int n_links, // NOT including the base + btScalar mass, // mass of base + const btVector3 &inertia, // inertia of base, in base frame; assumed diagonal + bool fixedBase, // whether the base is fixed (true) or can move (false) + bool canSleep, bool deprecatedMultiDof=true); + + + virtual ~btMultiBody(); + + //note: fixed link collision with parent is always disabled + void setupFixed(int linkIndex, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &parentComToThisPivotOffset, + const btVector3 &thisPivotToThisComOffset, bool deprecatedDisableParentCollision=true); + + + void setupPrismatic(int i, + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, + const btVector3 &jointAxis, + const btVector3 &parentComToThisPivotOffset, + const btVector3 &thisPivotToThisComOffset, + bool disableParentCollision); + + void setupRevolute(int linkIndex, // 0 to num_links-1 + btScalar mass, + const btVector3 &inertia, + int parentIndex, + const btQuaternion &rotParentToThis, // rotate points in parent frame to this frame, when q = 0 + const btVector3 &jointAxis, // in my frame + const btVector3 &parentComToThisPivotOffset, // vector from parent COM to joint axis, in PARENT frame + const btVector3 &thisPivotToThisComOffset, // vector from joint axis to my COM, in MY frame + bool disableParentCollision=false); + + void setupSpherical(int linkIndex, // 0 to num_links-1 + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, // rotate points in parent frame to this frame, when q = 0 + const btVector3 &parentComToThisPivotOffset, // vector from parent COM to joint axis, in PARENT frame + const btVector3 &thisPivotToThisComOffset, // vector from joint axis to my COM, in MY frame + bool disableParentCollision=false); + + void setupPlanar(int i, // 0 to num_links-1 + btScalar mass, + const btVector3 &inertia, + int parent, + const btQuaternion &rotParentToThis, // rotate points in parent frame to this frame, when q = 0 + const btVector3 &rotationAxis, + const btVector3 &parentComToThisComOffset, // vector from parent COM to this COM, in PARENT frame + bool disableParentCollision=false); + + const btMultibodyLink& getLink(int index) const + { + return m_links[index]; + } + + btMultibodyLink& getLink(int index) + { + return m_links[index]; + } + + + void setBaseCollider(btMultiBodyLinkCollider* collider)//collider can be NULL to disable collision for the base + { + m_baseCollider = collider; + } + const btMultiBodyLinkCollider* getBaseCollider() const + { + return m_baseCollider; + } + btMultiBodyLinkCollider* getBaseCollider() + { + return m_baseCollider; + } + + // + // get parent + // input: link num from 0 to num_links-1 + // output: link num from 0 to num_links-1, OR -1 to mean the base. + // + int getParent(int link_num) const; + + + // + // get number of m_links, masses, moments of inertia + // + + int getNumLinks() const { return m_links.size(); } + int getNumDofs() const { return m_dofCount; } + int getNumPosVars() const { return m_posVarCnt; } + btScalar getBaseMass() const { return m_baseMass; } + const btVector3 & getBaseInertia() const { return m_baseInertia; } + btScalar getLinkMass(int i) const; + const btVector3 & getLinkInertia(int i) const; + + + + // + // change mass (incomplete: can only change base mass and inertia at present) + // + + void setBaseMass(btScalar mass) { m_baseMass = mass; } + void setBaseInertia(const btVector3 &inertia) { m_baseInertia = inertia; } + + + // + // get/set pos/vel/rot/omega for the base link + // + + const btVector3 & getBasePos() const { return m_basePos; } // in world frame + const btVector3 getBaseVel() const + { + return btVector3(m_realBuf[3],m_realBuf[4],m_realBuf[5]); + } // in world frame + const btQuaternion & getWorldToBaseRot() const + { + return m_baseQuat; + } // rotates world vectors into base frame + btVector3 getBaseOmega() const { return btVector3(m_realBuf[0],m_realBuf[1],m_realBuf[2]); } // in world frame + + void setBasePos(const btVector3 &pos) + { + m_basePos = pos; + } + + void setBaseWorldTransform(const btTransform& tr) + { + setBasePos(tr.getOrigin()); + setWorldToBaseRot(tr.getRotation().inverse()); + + } + + btTransform getBaseWorldTransform() const + { + btTransform tr; + tr.setOrigin(getBasePos()); + tr.setRotation(getWorldToBaseRot().inverse()); + return tr; + } + + void setBaseVel(const btVector3 &vel) + { + + m_realBuf[3]=vel[0]; m_realBuf[4]=vel[1]; m_realBuf[5]=vel[2]; + } + void setWorldToBaseRot(const btQuaternion &rot) + { + m_baseQuat = rot; //m_baseQuat asumed to ba alias!? + } + void setBaseOmega(const btVector3 &omega) + { + m_realBuf[0]=omega[0]; + m_realBuf[1]=omega[1]; + m_realBuf[2]=omega[2]; + } + + + // + // get/set pos/vel for child m_links (i = 0 to num_links-1) + // + + btScalar getJointPos(int i) const; + btScalar getJointVel(int i) const; + + btScalar * getJointVelMultiDof(int i); + btScalar * getJointPosMultiDof(int i); + + const btScalar * getJointVelMultiDof(int i) const ; + const btScalar * getJointPosMultiDof(int i) const ; + + void setJointPos(int i, btScalar q); + void setJointVel(int i, btScalar qdot); + void setJointPosMultiDof(int i, btScalar *q); + void setJointVelMultiDof(int i, btScalar *qdot); + + + + // + // direct access to velocities as a vector of 6 + num_links elements. + // (omega first, then v, then joint velocities.) + // + const btScalar * getVelocityVector() const + { + return &m_realBuf[0]; + } +/* btScalar * getVelocityVector() + { + return &real_buf[0]; + } + */ + + // + // get the frames of reference (positions and orientations) of the child m_links + // (i = 0 to num_links-1) + // + + const btVector3 & getRVector(int i) const; // vector from COM(parent(i)) to COM(i), in frame i's coords + const btQuaternion & getParentToLocalRot(int i) const; // rotates vectors in frame parent(i) to vectors in frame i. + + + // + // transform vectors in local frame of link i to world frame (or vice versa) + // + btVector3 localPosToWorld(int i, const btVector3 &vec) const; + btVector3 localDirToWorld(int i, const btVector3 &vec) const; + btVector3 worldPosToLocal(int i, const btVector3 &vec) const; + btVector3 worldDirToLocal(int i, const btVector3 &vec) const; + + // + // transform a frame in local coordinate to a frame in world coordinate + // + btMatrix3x3 localFrameToWorld(int i, const btMatrix3x3 &mat) const; + + // + // calculate kinetic energy and angular momentum + // useful for debugging. + // + + btScalar getKineticEnergy() const; + btVector3 getAngularMomentum() const; + + + // + // set external forces and torques. Note all external forces/torques are given in the WORLD frame. + // + + void clearForcesAndTorques(); + void clearConstraintForces(); + + void clearVelocities(); + + void addBaseForce(const btVector3 &f) + { + m_baseForce += f; + } + void addBaseTorque(const btVector3 &t) { m_baseTorque += t; } + void addLinkForce(int i, const btVector3 &f); + void addLinkTorque(int i, const btVector3 &t); + + void addBaseConstraintForce(const btVector3 &f) + { + m_baseConstraintForce += f; + } + void addBaseConstraintTorque(const btVector3 &t) { m_baseConstraintTorque += t; } + void addLinkConstraintForce(int i, const btVector3 &f); + void addLinkConstraintTorque(int i, const btVector3 &t); + + +void addJointTorque(int i, btScalar Q); + void addJointTorqueMultiDof(int i, int dof, btScalar Q); + void addJointTorqueMultiDof(int i, const btScalar *Q); + + const btVector3 & getBaseForce() const { return m_baseForce; } + const btVector3 & getBaseTorque() const { return m_baseTorque; } + const btVector3 & getLinkForce(int i) const; + const btVector3 & getLinkTorque(int i) const; + btScalar getJointTorque(int i) const; + btScalar * getJointTorqueMultiDof(int i); + + + // + // dynamics routines. + // + + // timestep the velocities (given the external forces/torques set using addBaseForce etc). + // also sets up caches for calcAccelerationDeltas. + // + // Note: the caller must provide three vectors which are used as + // temporary scratch space. The idea here is to reduce dynamic + // memory allocation: the same scratch vectors can be re-used + // again and again for different Multibodies, instead of each + // btMultiBody allocating (and then deallocating) their own + // individual scratch buffers. This gives a considerable speed + // improvement, at least on Windows (where dynamic memory + // allocation appears to be fairly slow). + // + + + void computeAccelerationsArticulatedBodyAlgorithmMultiDof(btScalar dt, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v, + btAlignedObjectArray &scratch_m, + bool isConstraintPass=false + ); + +///stepVelocitiesMultiDof is deprecated, use computeAccelerationsArticulatedBodyAlgorithmMultiDof instead + void stepVelocitiesMultiDof(btScalar dt, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v, + btAlignedObjectArray &scratch_m, + bool isConstraintPass=false) + { + computeAccelerationsArticulatedBodyAlgorithmMultiDof(dt,scratch_r,scratch_v,scratch_m,isConstraintPass); + } + + // calcAccelerationDeltasMultiDof + // input: force vector (in same format as jacobian, i.e.: + // 3 torque values, 3 force values, num_links joint torque values) + // output: 3 omegadot values, 3 vdot values, num_links q_double_dot values + // (existing contents of output array are replaced) + // calcAccelerationDeltasMultiDof must have been called first. + void calcAccelerationDeltasMultiDof(const btScalar *force, btScalar *output, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v) const; + + + void applyDeltaVeeMultiDof2(const btScalar * delta_vee, btScalar multiplier) + { + for (int dof = 0; dof < 6 + getNumDofs(); ++dof) + { + m_deltaV[dof] += delta_vee[dof] * multiplier; + } + } + void processDeltaVeeMultiDof2() + { + applyDeltaVeeMultiDof(&m_deltaV[0],1); + + for (int dof = 0; dof < 6 + getNumDofs(); ++dof) + { + m_deltaV[dof] = 0.f; + } + } + + void applyDeltaVeeMultiDof(const btScalar * delta_vee, btScalar multiplier) + { + //for (int dof = 0; dof < 6 + getNumDofs(); ++dof) + // printf("%.4f ", delta_vee[dof]*multiplier); + //printf("\n"); + + //btScalar sum = 0; + //for (int dof = 0; dof < 6 + getNumDofs(); ++dof) + //{ + // sum += delta_vee[dof]*multiplier*delta_vee[dof]*multiplier; + //} + //btScalar l = btSqrt(sum); + + //if (l>m_maxAppliedImpulse) + //{ + // multiplier *= m_maxAppliedImpulse/l; + //} + + for (int dof = 0; dof < 6 + getNumDofs(); ++dof) + { + m_realBuf[dof] += delta_vee[dof] * multiplier; + btClamp(m_realBuf[dof],-m_maxCoordinateVelocity,m_maxCoordinateVelocity); + } + } + + + + // timestep the positions (given current velocities). + void stepPositionsMultiDof(btScalar dt, btScalar *pq = 0, btScalar *pqd = 0); + + + // + // contacts + // + + // This routine fills out a contact constraint jacobian for this body. + // the 'normal' supplied must be -n for body1 or +n for body2 of the contact. + // 'normal' & 'contact_point' are both given in world coordinates. + + void fillContactJacobianMultiDof(int link, + const btVector3 &contact_point, + const btVector3 &normal, + btScalar *jac, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v, + btAlignedObjectArray &scratch_m) const { fillConstraintJacobianMultiDof(link, contact_point, btVector3(0, 0, 0), normal, jac, scratch_r, scratch_v, scratch_m); } + + //a more general version of fillContactJacobianMultiDof which does not assume.. + //.. that the constraint in question is contact or, to be more precise, constrains linear velocity only + void fillConstraintJacobianMultiDof(int link, + const btVector3 &contact_point, + const btVector3 &normal_ang, + const btVector3 &normal_lin, + btScalar *jac, + btAlignedObjectArray &scratch_r, + btAlignedObjectArray &scratch_v, + btAlignedObjectArray &scratch_m) const; + + + // + // sleeping + // + void setCanSleep(bool canSleep) + { + m_canSleep = canSleep; + } + + bool getCanSleep()const + { + return m_canSleep; + } + + bool isAwake() const { return m_awake; } + void wakeUp(); + void goToSleep(); + void checkMotionAndSleepIfRequired(btScalar timestep); + + bool hasFixedBase() const + { + return m_fixedBase; + } + + int getCompanionId() const + { + return m_companionId; + } + void setCompanionId(int id) + { + //printf("for %p setCompanionId(%d)\n",this, id); + m_companionId = id; + } + + void setNumLinks(int numLinks)//careful: when changing the number of m_links, make sure to re-initialize or update existing m_links + { + m_links.resize(numLinks); + } + + btScalar getLinearDamping() const + { + return m_linearDamping; + } + void setLinearDamping( btScalar damp) + { + m_linearDamping = damp; + } + btScalar getAngularDamping() const + { + return m_angularDamping; + } + void setAngularDamping( btScalar damp) + { + m_angularDamping = damp; + } + + bool getUseGyroTerm() const + { + return m_useGyroTerm; + } + void setUseGyroTerm(bool useGyro) + { + m_useGyroTerm = useGyro; + } + btScalar getMaxCoordinateVelocity() const + { + return m_maxCoordinateVelocity ; + } + void setMaxCoordinateVelocity(btScalar maxVel) + { + m_maxCoordinateVelocity = maxVel; + } + + btScalar getMaxAppliedImpulse() const + { + return m_maxAppliedImpulse; + } + void setMaxAppliedImpulse(btScalar maxImp) + { + m_maxAppliedImpulse = maxImp; + } + void setHasSelfCollision(bool hasSelfCollision) + { + m_hasSelfCollision = hasSelfCollision; + } + bool hasSelfCollision() const + { + return m_hasSelfCollision; + } + + + void finalizeMultiDof(); + + void useRK4Integration(bool use) { m_useRK4 = use; } + bool isUsingRK4Integration() const { return m_useRK4; } + void useGlobalVelocities(bool use) { m_useGlobalVelocities = use; } + bool isUsingGlobalVelocities() const { return m_useGlobalVelocities; } + + bool isPosUpdated() const + { + return __posUpdated; + } + void setPosUpdated(bool updated) + { + __posUpdated = updated; + } + + //internalNeedsJointFeedback is for internal use only + bool internalNeedsJointFeedback() const + { + return m_internalNeedsJointFeedback; + } + void forwardKinematics(btAlignedObjectArray& scratch_q,btAlignedObjectArray& scratch_m); + + void updateCollisionObjectWorldTransforms(btAlignedObjectArray& scratch_q,btAlignedObjectArray& scratch_m); + + virtual int calculateSerializeBufferSize() const; + + ///fills the dataBuffer and returns the struct name (and 0 on failure) + virtual const char* serialize(void* dataBuffer, class btSerializer* serializer) const; + + const char* getBaseName() const + { + return m_baseName; + } + ///memory of setBaseName needs to be manager by user + void setBaseName(const char* name) + { + m_baseName = name; + } + + ///users can point to their objects, userPointer is not used by Bullet + void* getUserPointer() const + { + return m_userObjectPointer; + } + + int getUserIndex() const + { + return m_userIndex; + } + + int getUserIndex2() const + { + return m_userIndex2; + } + ///users can point to their objects, userPointer is not used by Bullet + void setUserPointer(void* userPointer) + { + m_userObjectPointer = userPointer; + } + + ///users can point to their objects, userPointer is not used by Bullet + void setUserIndex(int index) + { + m_userIndex = index; + } + + void setUserIndex2(int index) + { + m_userIndex2 = index; + } + +private: + btMultiBody(const btMultiBody &); // not implemented + void operator=(const btMultiBody &); // not implemented + + void compTreeLinkVelocities(btVector3 *omega, btVector3 *vel) const; + + void solveImatrix(const btVector3& rhs_top, const btVector3& rhs_bot, float result[6]) const; + void solveImatrix(const btSpatialForceVector &rhs, btSpatialMotionVector &result) const; + + void updateLinksDofOffsets() + { + int dofOffset = 0, cfgOffset = 0; + for(int bidx = 0; bidx < m_links.size(); ++bidx) + { + m_links[bidx].m_dofOffset = dofOffset; m_links[bidx].m_cfgOffset = cfgOffset; + dofOffset += m_links[bidx].m_dofCount; cfgOffset += m_links[bidx].m_posVarCount; + } + } + + void mulMatrix(btScalar *pA, btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const; + + +private: + + btMultiBodyLinkCollider* m_baseCollider;//can be NULL + const char* m_baseName;//memory needs to be manager by user! + + btVector3 m_basePos; // position of COM of base (world frame) + btQuaternion m_baseQuat; // rotates world points into base frame + + btScalar m_baseMass; // mass of the base + btVector3 m_baseInertia; // inertia of the base (in local frame; diagonal) + + btVector3 m_baseForce; // external force applied to base. World frame. + btVector3 m_baseTorque; // external torque applied to base. World frame. + + btVector3 m_baseConstraintForce; // external force applied to base. World frame. + btVector3 m_baseConstraintTorque; // external torque applied to base. World frame. + + btAlignedObjectArray m_links; // array of m_links, excluding the base. index from 0 to num_links-1. + btAlignedObjectArray m_colliders; + + + // + // realBuf: + // offset size array + // 0 6 + num_links v (base_omega; base_vel; joint_vels) MULTIDOF [sysdof x sysdof for D matrices (TOO MUCH!) + pos_delta which is sys-cfg sized] + // 6+num_links num_links D + // + // vectorBuf: + // offset size array + // 0 num_links h_top + // num_links num_links h_bottom + // + // matrixBuf: + // offset size array + // 0 num_links+1 rot_from_parent + // + btAlignedObjectArray m_deltaV; + btAlignedObjectArray m_realBuf; + btAlignedObjectArray m_vectorBuf; + btAlignedObjectArray m_matrixBuf; + + + btMatrix3x3 m_cachedInertiaTopLeft; + btMatrix3x3 m_cachedInertiaTopRight; + btMatrix3x3 m_cachedInertiaLowerLeft; + btMatrix3x3 m_cachedInertiaLowerRight; + bool m_cachedInertiaValid; + + bool m_fixedBase; + + // Sleep parameters. + bool m_awake; + bool m_canSleep; + btScalar m_sleepTimer; + + void* m_userObjectPointer; + int m_userIndex2; + int m_userIndex; + + int m_companionId; + btScalar m_linearDamping; + btScalar m_angularDamping; + bool m_useGyroTerm; + btScalar m_maxAppliedImpulse; + btScalar m_maxCoordinateVelocity; + bool m_hasSelfCollision; + + bool __posUpdated; + int m_dofCount, m_posVarCnt; + bool m_useRK4, m_useGlobalVelocities; + + ///the m_needsJointFeedback gets updated/computed during the stepVelocitiesMultiDof and it for internal usage only + bool m_internalNeedsJointFeedback; +}; + +struct btMultiBodyLinkDoubleData +{ + btQuaternionDoubleData m_zeroRotParentToThis; + btVector3DoubleData m_parentComToThisComOffset; + btVector3DoubleData m_thisPivotToThisComOffset; + btVector3DoubleData m_jointAxisTop[6]; + btVector3DoubleData m_jointAxisBottom[6]; + + btVector3DoubleData m_linkInertia; // inertia of the base (in local frame; diagonal) + double m_linkMass; + int m_parentIndex; + int m_jointType; + + int m_dofCount; + int m_posVarCount; + double m_jointPos[7]; + double m_jointVel[6]; + double m_jointTorque[6]; + + double m_jointDamping; + double m_jointFriction; + + char *m_linkName; + char *m_jointName; + btCollisionObjectDoubleData *m_linkCollider; + char *m_paddingPtr; + +}; + +struct btMultiBodyLinkFloatData +{ + btQuaternionFloatData m_zeroRotParentToThis; + btVector3FloatData m_parentComToThisComOffset; + btVector3FloatData m_thisPivotToThisComOffset; + btVector3FloatData m_jointAxisTop[6]; + btVector3FloatData m_jointAxisBottom[6]; + btVector3FloatData m_linkInertia; // inertia of the base (in local frame; diagonal) + int m_dofCount; + float m_linkMass; + int m_parentIndex; + int m_jointType; + + + + float m_jointPos[7]; + float m_jointVel[6]; + float m_jointTorque[6]; + int m_posVarCount; + float m_jointDamping; + float m_jointFriction; + + char *m_linkName; + char *m_jointName; + btCollisionObjectFloatData *m_linkCollider; + char *m_paddingPtr; + +}; + +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 +struct btMultiBodyDoubleData +{ + btTransformDoubleData m_baseWorldTransform; + btVector3DoubleData m_baseInertia; // inertia of the base (in local frame; diagonal) + double m_baseMass; + + char *m_baseName; + btMultiBodyLinkDoubleData *m_links; + btCollisionObjectDoubleData *m_baseCollider; + char *m_paddingPtr; + int m_numLinks; + char m_padding[4]; +}; + +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 +struct btMultiBodyFloatData +{ + char *m_baseName; + btMultiBodyLinkFloatData *m_links; + btCollisionObjectFloatData *m_baseCollider; + btTransformFloatData m_baseWorldTransform; + btVector3FloatData m_baseInertia; // inertia of the base (in local frame; diagonal) + + float m_baseMass; + int m_numLinks; +}; + + + +#endif diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp new file mode 100644 index 000000000..d52852dd8 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp @@ -0,0 +1,417 @@ +#include "btMultiBodyConstraint.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "btMultiBodyPoint2Point.h" //for testing (BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST macro) + + + +btMultiBodyConstraint::btMultiBodyConstraint(btMultiBody* bodyA,btMultiBody* bodyB,int linkA, int linkB, int numRows, bool isUnilateral) + :m_bodyA(bodyA), + m_bodyB(bodyB), + m_linkA(linkA), + m_linkB(linkB), + m_numRows(numRows), + m_jacSizeA(0), + m_jacSizeBoth(0), + m_isUnilateral(isUnilateral), + m_numDofsFinalized(-1), + m_maxAppliedImpulse(100) +{ + +} + +void btMultiBodyConstraint::updateJacobianSizes() +{ + if(m_bodyA) + { + m_jacSizeA = (6 + m_bodyA->getNumDofs()); + } + + if(m_bodyB) + { + m_jacSizeBoth = m_jacSizeA + 6 + m_bodyB->getNumDofs(); + } + else + m_jacSizeBoth = m_jacSizeA; +} + +void btMultiBodyConstraint::allocateJacobiansMultiDof() +{ + updateJacobianSizes(); + + m_posOffset = ((1 + m_jacSizeBoth)*m_numRows); + m_data.resize((2 + m_jacSizeBoth) * m_numRows); +} + +btMultiBodyConstraint::~btMultiBodyConstraint() +{ +} + +void btMultiBodyConstraint::applyDeltaVee(btMultiBodyJacobianData& data, btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof) +{ + for (int i = 0; i < ndof; ++i) + data.m_deltaVelocities[velocityIndex+i] += delta_vee[i] * impulse; +} + +btScalar btMultiBodyConstraint::fillMultiBodyConstraint( btMultiBodySolverConstraint& solverConstraint, + btMultiBodyJacobianData& data, + btScalar* jacOrgA, btScalar* jacOrgB, + const btVector3& constraintNormalAng, + const btVector3& constraintNormalLin, + const btVector3& posAworld, const btVector3& posBworld, + btScalar posError, + const btContactSolverInfo& infoGlobal, + btScalar lowerLimit, btScalar upperLimit, + bool angConstraint, + btScalar relaxation, + bool isFriction, btScalar desiredVelocity, btScalar cfmSlip) +{ + solverConstraint.m_multiBodyA = m_bodyA; + solverConstraint.m_multiBodyB = m_bodyB; + solverConstraint.m_linkA = m_linkA; + solverConstraint.m_linkB = m_linkB; + + btMultiBody* multiBodyA = solverConstraint.m_multiBodyA; + btMultiBody* multiBodyB = solverConstraint.m_multiBodyB; + + btSolverBody* bodyA = multiBodyA ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdA); + btSolverBody* bodyB = multiBodyB ? 0 : &data.m_solverBodyPool->at(solverConstraint.m_solverBodyIdB); + + btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody; + btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody; + + btVector3 rel_pos1, rel_pos2; //these two used to be inited to posAworld and posBworld (respectively) but it does not seem necessary + if (bodyA) + rel_pos1 = posAworld - bodyA->getWorldTransform().getOrigin(); + if (bodyB) + rel_pos2 = posBworld - bodyB->getWorldTransform().getOrigin(); + + if (multiBodyA) + { + if (solverConstraint.m_linkA<0) + { + rel_pos1 = posAworld - multiBodyA->getBasePos(); + } else + { + rel_pos1 = posAworld - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin(); + } + + const int ndofA = multiBodyA->getNumDofs() + 6; + + solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId(); + + if (solverConstraint.m_deltaVelAindex <0) + { + solverConstraint.m_deltaVelAindex = data.m_deltaVelocities.size(); + multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex); + data.m_deltaVelocities.resize(data.m_deltaVelocities.size()+ndofA); + } else + { + btAssert(data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex+ndofA); + } + + //determine jacobian of this 1D constraint in terms of multibodyA's degrees of freedom + //resize.. + solverConstraint.m_jacAindex = data.m_jacobians.size(); + data.m_jacobians.resize(data.m_jacobians.size()+ndofA); + //copy/determine + if(jacOrgA) + { + for (int i=0;ifillContactJacobianMultiDof(solverConstraint.m_linkA, posAworld, constraintNormalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m); + multiBodyA->fillConstraintJacobianMultiDof(solverConstraint.m_linkA, posAworld, constraintNormalAng, constraintNormalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m); + } + + //determine the velocity response of multibodyA to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint) + //resize.. + data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size()+ndofA); //=> each constraint row has the constrained tree dofs allocated in m_deltaVelocitiesUnitImpulse + btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size()); + btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + //determine.. + multiBodyA->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacAindex],delta,data.scratch_r, data.scratch_v); + + btVector3 torqueAxis0; + if (angConstraint) { + torqueAxis0 = constraintNormalAng; + } + else { + torqueAxis0 = rel_pos1.cross(constraintNormalLin); + + } + solverConstraint.m_relpos1CrossNormal = torqueAxis0; + solverConstraint.m_contactNormal1 = constraintNormalLin; + } + else //if(rb0) + { + btVector3 torqueAxis0; + if (angConstraint) { + torqueAxis0 = constraintNormalAng; + } + else { + torqueAxis0 = rel_pos1.cross(constraintNormalLin); + } + solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0*rb0->getAngularFactor() : btVector3(0,0,0); + solverConstraint.m_relpos1CrossNormal = torqueAxis0; + solverConstraint.m_contactNormal1 = constraintNormalLin; + } + + if (multiBodyB) + { + if (solverConstraint.m_linkB<0) + { + rel_pos2 = posBworld - multiBodyB->getBasePos(); + } else + { + rel_pos2 = posBworld - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin(); + } + + const int ndofB = multiBodyB->getNumDofs() + 6; + + solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId(); + if (solverConstraint.m_deltaVelBindex <0) + { + solverConstraint.m_deltaVelBindex = data.m_deltaVelocities.size(); + multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex); + data.m_deltaVelocities.resize(data.m_deltaVelocities.size()+ndofB); + } + + //determine jacobian of this 1D constraint in terms of multibodyB's degrees of freedom + //resize.. + solverConstraint.m_jacBindex = data.m_jacobians.size(); + data.m_jacobians.resize(data.m_jacobians.size()+ndofB); + //copy/determine.. + if(jacOrgB) + { + for (int i=0;ifillContactJacobianMultiDof(solverConstraint.m_linkB, posBworld, -constraintNormalLin, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m); + multiBodyB->fillConstraintJacobianMultiDof(solverConstraint.m_linkB, posBworld, -constraintNormalAng, -constraintNormalLin, &data.m_jacobians[solverConstraint.m_jacBindex], data.scratch_r, data.scratch_v, data.scratch_m); + } + + //determine velocity response of multibodyB to reaction impulses of this constraint (i.e. A[i,i] for i=1,...n_con: multibody's inverse inertia with respect to this 1D constraint) + //resize.. + data.m_deltaVelocitiesUnitImpulse.resize(data.m_deltaVelocitiesUnitImpulse.size()+ndofB); + btAssert(data.m_jacobians.size() == data.m_deltaVelocitiesUnitImpulse.size()); + btScalar* delta = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; + //determine.. + multiBodyB->calcAccelerationDeltasMultiDof(&data.m_jacobians[solverConstraint.m_jacBindex],delta,data.scratch_r, data.scratch_v); + + btVector3 torqueAxis1; + if (angConstraint) { + torqueAxis1 = constraintNormalAng; + } + else { + torqueAxis1 = rel_pos2.cross(constraintNormalLin); + } + solverConstraint.m_relpos2CrossNormal = -torqueAxis1; + solverConstraint.m_contactNormal2 = -constraintNormalLin; + } + else //if(rb1) + { + btVector3 torqueAxis1; + if (angConstraint) { + torqueAxis1 = constraintNormalAng; + } + else { + torqueAxis1 = rel_pos2.cross(constraintNormalLin); + } + solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*-torqueAxis1*rb1->getAngularFactor() : btVector3(0,0,0); + solverConstraint.m_relpos2CrossNormal = -torqueAxis1; + solverConstraint.m_contactNormal2 = -constraintNormalLin; + } + { + + btVector3 vec; + btScalar denom0 = 0.f; + btScalar denom1 = 0.f; + btScalar* jacB = 0; + btScalar* jacA = 0; + btScalar* deltaVelA = 0; + btScalar* deltaVelB = 0; + int ndofA = 0; + //determine the "effective mass" of the constrained multibodyA with respect to this 1D constraint (i.e. 1/A[i,i]) + if (multiBodyA) + { + ndofA = multiBodyA->getNumDofs() + 6; + jacA = &data.m_jacobians[solverConstraint.m_jacAindex]; + deltaVelA = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + for (int i = 0; i < ndofA; ++i) + { + btScalar j = jacA[i] ; + btScalar l = deltaVelA[i]; + denom0 += j*l; + } + } + else if(rb0) + { + vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1); + if (angConstraint) { + denom0 = rb0->getInvMass() + constraintNormalAng.dot(vec); + } + else { + denom0 = rb0->getInvMass() + constraintNormalLin.dot(vec); + } + } + // + if (multiBodyB) + { + const int ndofB = multiBodyB->getNumDofs() + 6; + jacB = &data.m_jacobians[solverConstraint.m_jacBindex]; + deltaVelB = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; + for (int i = 0; i < ndofB; ++i) + { + btScalar j = jacB[i] ; + btScalar l = deltaVelB[i]; + denom1 += j*l; + } + + } + else if(rb1) + { + vec = ( -solverConstraint.m_angularComponentB).cross(rel_pos2); + if (angConstraint) { + denom1 = rb1->getInvMass() + constraintNormalAng.dot(vec); + } + else { + denom1 = rb1->getInvMass() + constraintNormalLin.dot(vec); + } + } + + // + btScalar d = denom0+denom1; + if (d>SIMD_EPSILON) + { + solverConstraint.m_jacDiagABInv = relaxation/(d); + } + else + { + //disable the constraint row to handle singularity/redundant constraint + solverConstraint.m_jacDiagABInv = 0.f; + } + } + + + //compute rhs and remaining solverConstraint fields + btScalar penetration = isFriction? 0 : posError; + + btScalar rel_vel = 0.f; + int ndofA = 0; + int ndofB = 0; + { + btVector3 vel1,vel2; + if (multiBodyA) + { + ndofA = multiBodyA->getNumDofs() + 6; + btScalar* jacA = &data.m_jacobians[solverConstraint.m_jacAindex]; + for (int i = 0; i < ndofA ; ++i) + rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i]; + } + else if(rb0) + { + rel_vel += rb0->getVelocityInLocalPoint(rel_pos1).dot(solverConstraint.m_contactNormal1); + } + if (multiBodyB) + { + ndofB = multiBodyB->getNumDofs() + 6; + btScalar* jacB = &data.m_jacobians[solverConstraint.m_jacBindex]; + for (int i = 0; i < ndofB ; ++i) + rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i]; + + } + else if(rb1) + { + rel_vel += rb1->getVelocityInLocalPoint(rel_pos2).dot(solverConstraint.m_contactNormal2); + } + + solverConstraint.m_friction = 0.f;//cp.m_combinedFriction; + } + + + ///warm starting (or zero if disabled) + /* + if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING) + { + solverConstraint.m_appliedImpulse = isFriction ? 0 : cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor; + + if (solverConstraint.m_appliedImpulse) + { + if (multiBodyA) + { + btScalar impulse = solverConstraint.m_appliedImpulse; + btScalar* deltaV = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + multiBodyA->applyDeltaVee(deltaV,impulse); + applyDeltaVee(data,deltaV,impulse,solverConstraint.m_deltaVelAindex,ndofA); + } else + { + if (rb0) + bodyA->internalApplyImpulse(solverConstraint.m_contactNormal1*bodyA->internalGetInvMass()*rb0->getLinearFactor(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse); + } + if (multiBodyB) + { + btScalar impulse = solverConstraint.m_appliedImpulse; + btScalar* deltaV = &data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; + multiBodyB->applyDeltaVee(deltaV,impulse); + applyDeltaVee(data,deltaV,impulse,solverConstraint.m_deltaVelBindex,ndofB); + } else + { + if (rb1) + bodyB->internalApplyImpulse(-solverConstraint.m_contactNormal2*bodyB->internalGetInvMass()*rb1->getLinearFactor(),-solverConstraint.m_angularComponentB,-(btScalar)solverConstraint.m_appliedImpulse); + } + } + } else + */ + + solverConstraint.m_appliedImpulse = 0.f; + solverConstraint.m_appliedPushImpulse = 0.f; + + { + + btScalar positionalError = 0.f; + btScalar velocityError = desiredVelocity - rel_vel;// * damping; + + + btScalar erp = infoGlobal.m_erp2; + + //split impulse is not implemented yet for btMultiBody* + //if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) + { + erp = infoGlobal.m_erp; + } + + positionalError = -penetration * erp/infoGlobal.m_timeStep; + + btScalar penetrationImpulse = positionalError*solverConstraint.m_jacDiagABInv; + btScalar velocityImpulse = velocityError *solverConstraint.m_jacDiagABInv; + + //split impulse is not implemented yet for btMultiBody* + + // if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) + { + //combine position and velocity into rhs + solverConstraint.m_rhs = penetrationImpulse+velocityImpulse; + solverConstraint.m_rhsPenetration = 0.f; + + } + /*else + { + //split position and velocity into rhs and m_rhsPenetration + solverConstraint.m_rhs = velocityImpulse; + solverConstraint.m_rhsPenetration = penetrationImpulse; + } + */ + + solverConstraint.m_cfm = 0.f; + solverConstraint.m_lowerLimit = lowerLimit; + solverConstraint.m_upperLimit = upperLimit; + } + + return rel_vel; + +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h new file mode 100644 index 000000000..74c6f5a81 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraint.h @@ -0,0 +1,183 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_MULTIBODY_CONSTRAINT_H +#define BT_MULTIBODY_CONSTRAINT_H + +#include "LinearMath/btScalar.h" +#include "LinearMath/btAlignedObjectArray.h" +#include "btMultiBody.h" + +class btMultiBody; +struct btSolverInfo; + +#include "btMultiBodySolverConstraint.h" + +struct btMultiBodyJacobianData +{ + btAlignedObjectArray m_jacobians; + btAlignedObjectArray m_deltaVelocitiesUnitImpulse; //holds the joint-space response of the corresp. tree to the test impulse in each constraint space dimension + btAlignedObjectArray m_deltaVelocities; //holds joint-space vectors of all the constrained trees accumulating the effect of corrective impulses applied in SI + btAlignedObjectArray scratch_r; + btAlignedObjectArray scratch_v; + btAlignedObjectArray scratch_m; + btAlignedObjectArray* m_solverBodyPool; + int m_fixedBodyId; + +}; + + +class btMultiBodyConstraint +{ +protected: + + btMultiBody* m_bodyA; + btMultiBody* m_bodyB; + int m_linkA; + int m_linkB; + + int m_numRows; + int m_jacSizeA; + int m_jacSizeBoth; + int m_posOffset; + + bool m_isUnilateral; + int m_numDofsFinalized; + btScalar m_maxAppliedImpulse; + + + // warning: the data block lay out is not consistent for all constraints + // data block laid out as follows: + // cached impulses. (one per row.) + // jacobians. (interleaved, row1 body1 then row1 body2 then row2 body 1 etc) + // positions. (one per row.) + btAlignedObjectArray m_data; + + void applyDeltaVee(btMultiBodyJacobianData& data, btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof); + + btScalar fillMultiBodyConstraint(btMultiBodySolverConstraint& solverConstraint, + btMultiBodyJacobianData& data, + btScalar* jacOrgA, btScalar* jacOrgB, + const btVector3& constraintNormalAng, + + const btVector3& constraintNormalLin, + const btVector3& posAworld, const btVector3& posBworld, + btScalar posError, + const btContactSolverInfo& infoGlobal, + btScalar lowerLimit, btScalar upperLimit, + bool angConstraint = false, + + btScalar relaxation = 1.f, + bool isFriction = false, btScalar desiredVelocity=0, btScalar cfmSlip=0); + +public: + + btMultiBodyConstraint(btMultiBody* bodyA,btMultiBody* bodyB,int linkA, int linkB, int numRows, bool isUnilateral); + virtual ~btMultiBodyConstraint(); + + void updateJacobianSizes(); + void allocateJacobiansMultiDof(); + + virtual void finalizeMultiDof()=0; + + virtual int getIslandIdA() const =0; + virtual int getIslandIdB() const =0; + + virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal)=0; + + int getNumRows() const + { + return m_numRows; + } + + btMultiBody* getMultiBodyA() + { + return m_bodyA; + } + btMultiBody* getMultiBodyB() + { + return m_bodyB; + } + + void internalSetAppliedImpulse(int dof, btScalar appliedImpulse) + { + btAssert(dof>=0); + btAssert(dof < getNumRows()); + m_data[dof] = appliedImpulse; + + } + + btScalar getAppliedImpulse(int dof) + { + btAssert(dof>=0); + btAssert(dof < getNumRows()); + return m_data[dof]; + } + // current constraint position + // constraint is pos >= 0 for unilateral, or pos = 0 for bilateral + // NOTE: ignored position for friction rows. + btScalar getPosition(int row) const + { + return m_data[m_posOffset + row]; + } + + void setPosition(int row, btScalar pos) + { + m_data[m_posOffset + row] = pos; + } + + + bool isUnilateral() const + { + return m_isUnilateral; + } + + // jacobian blocks. + // each of size 6 + num_links. (jacobian2 is null if no body2.) + // format: 3 'omega' coefficients, 3 'v' coefficients, then the 'qdot' coefficients. + btScalar* jacobianA(int row) + { + return &m_data[m_numRows + row * m_jacSizeBoth]; + } + const btScalar* jacobianA(int row) const + { + return &m_data[m_numRows + (row * m_jacSizeBoth)]; + } + btScalar* jacobianB(int row) + { + return &m_data[m_numRows + (row * m_jacSizeBoth) + m_jacSizeA]; + } + const btScalar* jacobianB(int row) const + { + return &m_data[m_numRows + (row * m_jacSizeBoth) + m_jacSizeA]; + } + + btScalar getMaxAppliedImpulse() const + { + return m_maxAppliedImpulse; + } + void setMaxAppliedImpulse(btScalar maxImp) + { + m_maxAppliedImpulse = maxImp; + } + + virtual void debugDraw(class btIDebugDraw* drawer)=0; + +}; + +#endif //BT_MULTIBODY_CONSTRAINT_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp new file mode 100644 index 000000000..70e6c9922 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp @@ -0,0 +1,1382 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#include "btMultiBodyConstraintSolver.h" +#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" +#include "btMultiBodyLinkCollider.h" + +#include "BulletDynamics/ConstraintSolver/btSolverBody.h" +#include "btMultiBodyConstraint.h" +#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" + +#include "LinearMath/btQuickprof.h" + +btScalar btMultiBodyConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** bodies ,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer) +{ + btScalar leastSquaredResidual = btSequentialImpulseConstraintSolver::solveSingleIteration(iteration, bodies ,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer); + + //solve featherstone non-contact constraints + + //printf("m_multiBodyNonContactConstraints = %d\n",m_multiBodyNonContactConstraints.size()); + + for (int j=0;jsetPosUpdated(false); + if(constraint.m_multiBodyB) + constraint.m_multiBodyB->setPosUpdated(false); + } + + //solve featherstone normal contact + for (int j=0;jsetPosUpdated(false); + if(constraint.m_multiBodyB) + constraint.m_multiBodyB->setPosUpdated(false); + } + + //solve featherstone frictional contact + + for (int j=0;jm_multiBodyFrictionContactConstraints.size();j++) + { + if (iteration < infoGlobal.m_numIterations) + { + btMultiBodySolverConstraint& frictionConstraint = m_multiBodyFrictionContactConstraints[j]; + btScalar totalImpulse = m_multiBodyNormalContactConstraints[frictionConstraint.m_frictionIndex].m_appliedImpulse; + //adjust friction limits here + if (totalImpulse>btScalar(0)) + { + frictionConstraint.m_lowerLimit = -(frictionConstraint.m_friction*totalImpulse); + frictionConstraint.m_upperLimit = frictionConstraint.m_friction*totalImpulse; + btScalar residual = resolveSingleConstraintRowGeneric(frictionConstraint); + leastSquaredResidual += residual*residual; + + if(frictionConstraint.m_multiBodyA) + frictionConstraint.m_multiBodyA->setPosUpdated(false); + if(frictionConstraint.m_multiBodyB) + frictionConstraint.m_multiBodyB->setPosUpdated(false); + } + } + } + return leastSquaredResidual; +} + +btScalar btMultiBodyConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer) +{ + m_multiBodyNonContactConstraints.resize(0); + m_multiBodyNormalContactConstraints.resize(0); + m_multiBodyFrictionContactConstraints.resize(0); + m_data.m_jacobians.resize(0); + m_data.m_deltaVelocitiesUnitImpulse.resize(0); + m_data.m_deltaVelocities.resize(0); + + for (int i=0;im_multiBody->setCompanionId(-1); + } + } + + btScalar val = btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup( bodies,numBodies,manifoldPtr, numManifolds, constraints,numConstraints,infoGlobal,debugDrawer); + + return val; +} + +void btMultiBodyConstraintSolver::applyDeltaVee(btScalar* delta_vee, btScalar impulse, int velocityIndex, int ndof) +{ + for (int i = 0; i < ndof; ++i) + m_data.m_deltaVelocities[velocityIndex+i] += delta_vee[i] * impulse; +} + +btScalar btMultiBodyConstraintSolver::resolveSingleConstraintRowGeneric(const btMultiBodySolverConstraint& c) +{ + + btScalar deltaImpulse = c.m_rhs-btScalar(c.m_appliedImpulse)*c.m_cfm; + btScalar deltaVelADotn=0; + btScalar deltaVelBDotn=0; + btSolverBody* bodyA = 0; + btSolverBody* bodyB = 0; + int ndofA=0; + int ndofB=0; + + if (c.m_multiBodyA) + { + ndofA = c.m_multiBodyA->getNumDofs() + 6; + for (int i = 0; i < ndofA; ++i) + deltaVelADotn += m_data.m_jacobians[c.m_jacAindex+i] * m_data.m_deltaVelocities[c.m_deltaVelAindex+i]; + } else if(c.m_solverBodyIdA >= 0) + { + bodyA = &m_tmpSolverBodyPool[c.m_solverBodyIdA]; + deltaVelADotn += c.m_contactNormal1.dot(bodyA->internalGetDeltaLinearVelocity()) + c.m_relpos1CrossNormal.dot(bodyA->internalGetDeltaAngularVelocity()); + } + + if (c.m_multiBodyB) + { + ndofB = c.m_multiBodyB->getNumDofs() + 6; + for (int i = 0; i < ndofB; ++i) + deltaVelBDotn += m_data.m_jacobians[c.m_jacBindex+i] * m_data.m_deltaVelocities[c.m_deltaVelBindex+i]; + } else if(c.m_solverBodyIdB >= 0) + { + bodyB = &m_tmpSolverBodyPool[c.m_solverBodyIdB]; + deltaVelBDotn += c.m_contactNormal2.dot(bodyB->internalGetDeltaLinearVelocity()) + c.m_relpos2CrossNormal.dot(bodyB->internalGetDeltaAngularVelocity()); + } + + + deltaImpulse -= deltaVelADotn*c.m_jacDiagABInv;//m_jacDiagABInv = 1./denom + deltaImpulse -= deltaVelBDotn*c.m_jacDiagABInv; + const btScalar sum = btScalar(c.m_appliedImpulse) + deltaImpulse; + + if (sum < c.m_lowerLimit) + { + deltaImpulse = c.m_lowerLimit-c.m_appliedImpulse; + c.m_appliedImpulse = c.m_lowerLimit; + } + else if (sum > c.m_upperLimit) + { + deltaImpulse = c.m_upperLimit-c.m_appliedImpulse; + c.m_appliedImpulse = c.m_upperLimit; + } + else + { + c.m_appliedImpulse = sum; + } + + if (c.m_multiBodyA) + { + applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex],deltaImpulse,c.m_deltaVelAindex,ndofA); +#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS + //note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations + //it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity + c.m_multiBodyA->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex],deltaImpulse); +#endif //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS + } else if(c.m_solverBodyIdA >= 0) + { + bodyA->internalApplyImpulse(c.m_contactNormal1*bodyA->internalGetInvMass(),c.m_angularComponentA,deltaImpulse); + + } + if (c.m_multiBodyB) + { + applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex],deltaImpulse,c.m_deltaVelBindex,ndofB); +#ifdef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS + //note: update of the actual velocities (below) in the multibody does not have to happen now since m_deltaVelocities can be applied after all iterations + //it would make the multibody solver more like the regular one with m_deltaVelocities being equivalent to btSolverBody::m_deltaLinearVelocity/m_deltaAngularVelocity + c.m_multiBodyB->applyDeltaVeeMultiDof2(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex],deltaImpulse); +#endif //DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS + } else if(c.m_solverBodyIdB >= 0) + { + bodyB->internalApplyImpulse(c.m_contactNormal2*bodyB->internalGetInvMass(),c.m_angularComponentB,deltaImpulse); + } + return deltaImpulse; +} + + + + +void btMultiBodyConstraintSolver::setupMultiBodyContactConstraint(btMultiBodySolverConstraint& solverConstraint, + const btVector3& contactNormal, + btManifoldPoint& cp, const btContactSolverInfo& infoGlobal, + btScalar& relaxation, + bool isFriction, btScalar desiredVelocity, btScalar cfmSlip) +{ + + BT_PROFILE("setupMultiBodyContactConstraint"); + btVector3 rel_pos1; + btVector3 rel_pos2; + + btMultiBody* multiBodyA = solverConstraint.m_multiBodyA; + btMultiBody* multiBodyB = solverConstraint.m_multiBodyB; + + const btVector3& pos1 = cp.getPositionWorldOnA(); + const btVector3& pos2 = cp.getPositionWorldOnB(); + + btSolverBody* bodyA = multiBodyA ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA]; + btSolverBody* bodyB = multiBodyB ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB]; + + btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody; + btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody; + + if (bodyA) + rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin(); + if (bodyB) + rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin(); + + relaxation = infoGlobal.m_sor; + + btScalar invTimeStep = btScalar(1)/infoGlobal.m_timeStep; + + //cfm = 1 / ( dt * kp + kd ) + //erp = dt * kp / ( dt * kp + kd ) + + btScalar cfm = infoGlobal.m_globalCfm; + btScalar erp = infoGlobal.m_erp2; + + if ((cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_CFM) || (cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_ERP)) + { + if (cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_CFM) + cfm = cp.m_contactCFM; + if (cp.m_contactPointFlags&BT_CONTACT_FLAG_HAS_CONTACT_ERP) + erp = cp.m_contactERP; + } else + { + if (cp.m_contactPointFlags & BT_CONTACT_FLAG_CONTACT_STIFFNESS_DAMPING) + { + btScalar denom = ( infoGlobal.m_timeStep * cp.m_combinedContactStiffness1 + cp.m_combinedContactDamping1 ); + if (denom < SIMD_EPSILON) + { + denom = SIMD_EPSILON; + } + cfm = btScalar(1) / denom; + erp = (infoGlobal.m_timeStep * cp.m_combinedContactStiffness1) / denom; + } + } + + cfm *= invTimeStep; + + + + if (multiBodyA) + { + if (solverConstraint.m_linkA<0) + { + rel_pos1 = pos1 - multiBodyA->getBasePos(); + } else + { + rel_pos1 = pos1 - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin(); + } + const int ndofA = multiBodyA->getNumDofs() + 6; + + solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId(); + + if (solverConstraint.m_deltaVelAindex <0) + { + solverConstraint.m_deltaVelAindex = m_data.m_deltaVelocities.size(); + multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex); + m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size()+ndofA); + } else + { + btAssert(m_data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex+ndofA); + } + + solverConstraint.m_jacAindex = m_data.m_jacobians.size(); + m_data.m_jacobians.resize(m_data.m_jacobians.size()+ndofA); + m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size()+ndofA); + btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size()); + + btScalar* jac1=&m_data.m_jacobians[solverConstraint.m_jacAindex]; + multiBodyA->fillContactJacobianMultiDof(solverConstraint.m_linkA, cp.getPositionWorldOnA(), contactNormal, jac1, m_data.scratch_r, m_data.scratch_v, m_data.scratch_m); + btScalar* delta = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + multiBodyA->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacAindex],delta,m_data.scratch_r, m_data.scratch_v); + + btVector3 torqueAxis0 = rel_pos1.cross(contactNormal); + solverConstraint.m_relpos1CrossNormal = torqueAxis0; + solverConstraint.m_contactNormal1 = contactNormal; + } else + { + btVector3 torqueAxis0 = rel_pos1.cross(contactNormal); + solverConstraint.m_relpos1CrossNormal = torqueAxis0; + solverConstraint.m_contactNormal1 = contactNormal; + solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0*rb0->getAngularFactor() : btVector3(0,0,0); + } + + + + if (multiBodyB) + { + if (solverConstraint.m_linkB<0) + { + rel_pos2 = pos2 - multiBodyB->getBasePos(); + } else + { + rel_pos2 = pos2 - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin(); + } + + const int ndofB = multiBodyB->getNumDofs() + 6; + + solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId(); + if (solverConstraint.m_deltaVelBindex <0) + { + solverConstraint.m_deltaVelBindex = m_data.m_deltaVelocities.size(); + multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex); + m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size()+ndofB); + } + + solverConstraint.m_jacBindex = m_data.m_jacobians.size(); + + m_data.m_jacobians.resize(m_data.m_jacobians.size()+ndofB); + m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size()+ndofB); + btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size()); + + multiBodyB->fillContactJacobianMultiDof(solverConstraint.m_linkB, cp.getPositionWorldOnB(), -contactNormal, &m_data.m_jacobians[solverConstraint.m_jacBindex], m_data.scratch_r, m_data.scratch_v, m_data.scratch_m); + multiBodyB->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacBindex],&m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex],m_data.scratch_r, m_data.scratch_v); + + btVector3 torqueAxis1 = rel_pos2.cross(contactNormal); + solverConstraint.m_relpos2CrossNormal = -torqueAxis1; + solverConstraint.m_contactNormal2 = -contactNormal; + + } else + { + btVector3 torqueAxis1 = rel_pos2.cross(contactNormal); + solverConstraint.m_relpos2CrossNormal = -torqueAxis1; + solverConstraint.m_contactNormal2 = -contactNormal; + + solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*-torqueAxis1*rb1->getAngularFactor() : btVector3(0,0,0); + } + + { + + btVector3 vec; + btScalar denom0 = 0.f; + btScalar denom1 = 0.f; + btScalar* jacB = 0; + btScalar* jacA = 0; + btScalar* lambdaA =0; + btScalar* lambdaB =0; + int ndofA = 0; + if (multiBodyA) + { + ndofA = multiBodyA->getNumDofs() + 6; + jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex]; + lambdaA = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + for (int i = 0; i < ndofA; ++i) + { + btScalar j = jacA[i] ; + btScalar l =lambdaA[i]; + denom0 += j*l; + } + } else + { + if (rb0) + { + vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1); + denom0 = rb0->getInvMass() + contactNormal.dot(vec); + } + } + if (multiBodyB) + { + const int ndofB = multiBodyB->getNumDofs() + 6; + jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex]; + lambdaB = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; + for (int i = 0; i < ndofB; ++i) + { + btScalar j = jacB[i] ; + btScalar l =lambdaB[i]; + denom1 += j*l; + } + + } else + { + if (rb1) + { + vec = ( -solverConstraint.m_angularComponentB).cross(rel_pos2); + denom1 = rb1->getInvMass() + contactNormal.dot(vec); + } + } + + + + btScalar d = denom0+denom1+cfm; + if (d>SIMD_EPSILON) + { + solverConstraint.m_jacDiagABInv = relaxation/(d); + } else + { + //disable the constraint row to handle singularity/redundant constraint + solverConstraint.m_jacDiagABInv = 0.f; + } + + } + + + //compute rhs and remaining solverConstraint fields + + + + btScalar restitution = 0.f; + btScalar penetration = isFriction? 0 : cp.getDistance()+infoGlobal.m_linearSlop; + + btScalar rel_vel = 0.f; + int ndofA = 0; + int ndofB = 0; + { + + btVector3 vel1,vel2; + if (multiBodyA) + { + ndofA = multiBodyA->getNumDofs() + 6; + btScalar* jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex]; + for (int i = 0; i < ndofA ; ++i) + rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i]; + } else + { + if (rb0) + { + rel_vel += (rb0->getVelocityInLocalPoint(rel_pos1) + + (rb0->getTotalTorque()*rb0->getInvInertiaTensorWorld()*infoGlobal.m_timeStep).cross(rel_pos1)+ + rb0->getTotalForce()*rb0->getInvMass()*infoGlobal.m_timeStep).dot(solverConstraint.m_contactNormal1); + } + } + if (multiBodyB) + { + ndofB = multiBodyB->getNumDofs() + 6; + btScalar* jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex]; + for (int i = 0; i < ndofB ; ++i) + rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i]; + + } else + { + if (rb1) + { + rel_vel += (rb1->getVelocityInLocalPoint(rel_pos2)+ + (rb1->getTotalTorque()*rb1->getInvInertiaTensorWorld()*infoGlobal.m_timeStep).cross(rel_pos2) + + rb1->getTotalForce()*rb1->getInvMass()*infoGlobal.m_timeStep).dot(solverConstraint.m_contactNormal2); + } + } + + solverConstraint.m_friction = cp.m_combinedFriction; + + if(!isFriction) + { + restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution); + if (restitution <= btScalar(0.)) + { + restitution = 0.f; + } + } + } + + + ///warm starting (or zero if disabled) + //disable warmstarting for btMultiBody, it has issues gaining energy (==explosion) + if (0)//infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING) + { + solverConstraint.m_appliedImpulse = isFriction ? 0 : cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor; + + if (solverConstraint.m_appliedImpulse) + { + if (multiBodyA) + { + btScalar impulse = solverConstraint.m_appliedImpulse; + btScalar* deltaV = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + multiBodyA->applyDeltaVeeMultiDof(deltaV,impulse); + + applyDeltaVee(deltaV,impulse,solverConstraint.m_deltaVelAindex,ndofA); + } else + { + if (rb0) + bodyA->internalApplyImpulse(solverConstraint.m_contactNormal1*bodyA->internalGetInvMass()*rb0->getLinearFactor(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse); + } + if (multiBodyB) + { + btScalar impulse = solverConstraint.m_appliedImpulse; + btScalar* deltaV = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; + multiBodyB->applyDeltaVeeMultiDof(deltaV,impulse); + applyDeltaVee(deltaV,impulse,solverConstraint.m_deltaVelBindex,ndofB); + } else + { + if (rb1) + bodyB->internalApplyImpulse(-solverConstraint.m_contactNormal2*bodyB->internalGetInvMass()*rb1->getLinearFactor(),-solverConstraint.m_angularComponentB,-(btScalar)solverConstraint.m_appliedImpulse); + } + } + } else + { + solverConstraint.m_appliedImpulse = 0.f; + } + + solverConstraint.m_appliedPushImpulse = 0.f; + + { + + btScalar positionalError = 0.f; + btScalar velocityError = restitution - rel_vel;// * damping; //note for friction restitution is always set to 0 (check above) so it is acutally velocityError = -rel_vel for friction + + if (penetration>0) + { + positionalError = 0; + velocityError -= penetration / infoGlobal.m_timeStep; + + } else + { + positionalError = -penetration * erp/infoGlobal.m_timeStep; + } + + btScalar penetrationImpulse = positionalError*solverConstraint.m_jacDiagABInv; + btScalar velocityImpulse = velocityError *solverConstraint.m_jacDiagABInv; + + if(!isFriction) + { + // if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) + { + //combine position and velocity into rhs + solverConstraint.m_rhs = penetrationImpulse+velocityImpulse; + solverConstraint.m_rhsPenetration = 0.f; + + } + /*else + { + //split position and velocity into rhs and m_rhsPenetration + solverConstraint.m_rhs = velocityImpulse; + solverConstraint.m_rhsPenetration = penetrationImpulse; + } + */ + solverConstraint.m_lowerLimit = 0; + solverConstraint.m_upperLimit = 1e10f; + } + else + { + solverConstraint.m_rhs = velocityImpulse; + solverConstraint.m_rhsPenetration = 0.f; + solverConstraint.m_lowerLimit = -solverConstraint.m_friction; + solverConstraint.m_upperLimit = solverConstraint.m_friction; + } + + solverConstraint.m_cfm = cfm*solverConstraint.m_jacDiagABInv; + + + + } + +} + +void btMultiBodyConstraintSolver::setupMultiBodyTorsionalFrictionConstraint(btMultiBodySolverConstraint& solverConstraint, + const btVector3& constraintNormal, + btManifoldPoint& cp, + btScalar combinedTorsionalFriction, + const btContactSolverInfo& infoGlobal, + btScalar& relaxation, + bool isFriction, btScalar desiredVelocity, btScalar cfmSlip) +{ + + BT_PROFILE("setupMultiBodyRollingFrictionConstraint"); + btVector3 rel_pos1; + btVector3 rel_pos2; + + btMultiBody* multiBodyA = solverConstraint.m_multiBodyA; + btMultiBody* multiBodyB = solverConstraint.m_multiBodyB; + + const btVector3& pos1 = cp.getPositionWorldOnA(); + const btVector3& pos2 = cp.getPositionWorldOnB(); + + btSolverBody* bodyA = multiBodyA ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA]; + btSolverBody* bodyB = multiBodyB ? 0 : &m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB]; + + btRigidBody* rb0 = multiBodyA ? 0 : bodyA->m_originalBody; + btRigidBody* rb1 = multiBodyB ? 0 : bodyB->m_originalBody; + + if (bodyA) + rel_pos1 = pos1 - bodyA->getWorldTransform().getOrigin(); + if (bodyB) + rel_pos2 = pos2 - bodyB->getWorldTransform().getOrigin(); + + relaxation = infoGlobal.m_sor; + + btScalar invTimeStep = btScalar(1)/infoGlobal.m_timeStep; + + + if (multiBodyA) + { + if (solverConstraint.m_linkA<0) + { + rel_pos1 = pos1 - multiBodyA->getBasePos(); + } else + { + rel_pos1 = pos1 - multiBodyA->getLink(solverConstraint.m_linkA).m_cachedWorldTransform.getOrigin(); + } + const int ndofA = multiBodyA->getNumDofs() + 6; + + solverConstraint.m_deltaVelAindex = multiBodyA->getCompanionId(); + + if (solverConstraint.m_deltaVelAindex <0) + { + solverConstraint.m_deltaVelAindex = m_data.m_deltaVelocities.size(); + multiBodyA->setCompanionId(solverConstraint.m_deltaVelAindex); + m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size()+ndofA); + } else + { + btAssert(m_data.m_deltaVelocities.size() >= solverConstraint.m_deltaVelAindex+ndofA); + } + + solverConstraint.m_jacAindex = m_data.m_jacobians.size(); + m_data.m_jacobians.resize(m_data.m_jacobians.size()+ndofA); + m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size()+ndofA); + btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size()); + + btScalar* jac1=&m_data.m_jacobians[solverConstraint.m_jacAindex]; + multiBodyA->fillConstraintJacobianMultiDof(solverConstraint.m_linkA, cp.getPositionWorldOnA(), constraintNormal, btVector3(0,0,0), jac1, m_data.scratch_r, m_data.scratch_v, m_data.scratch_m); + btScalar* delta = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + multiBodyA->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacAindex],delta,m_data.scratch_r, m_data.scratch_v); + + btVector3 torqueAxis0 = constraintNormal; + solverConstraint.m_relpos1CrossNormal = torqueAxis0; + solverConstraint.m_contactNormal1 = btVector3(0,0,0); + } else + { + btVector3 torqueAxis0 = constraintNormal; + solverConstraint.m_relpos1CrossNormal = torqueAxis0; + solverConstraint.m_contactNormal1 = btVector3(0,0,0); + solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0*rb0->getAngularFactor() : btVector3(0,0,0); + } + + + + if (multiBodyB) + { + if (solverConstraint.m_linkB<0) + { + rel_pos2 = pos2 - multiBodyB->getBasePos(); + } else + { + rel_pos2 = pos2 - multiBodyB->getLink(solverConstraint.m_linkB).m_cachedWorldTransform.getOrigin(); + } + + const int ndofB = multiBodyB->getNumDofs() + 6; + + solverConstraint.m_deltaVelBindex = multiBodyB->getCompanionId(); + if (solverConstraint.m_deltaVelBindex <0) + { + solverConstraint.m_deltaVelBindex = m_data.m_deltaVelocities.size(); + multiBodyB->setCompanionId(solverConstraint.m_deltaVelBindex); + m_data.m_deltaVelocities.resize(m_data.m_deltaVelocities.size()+ndofB); + } + + solverConstraint.m_jacBindex = m_data.m_jacobians.size(); + + m_data.m_jacobians.resize(m_data.m_jacobians.size()+ndofB); + m_data.m_deltaVelocitiesUnitImpulse.resize(m_data.m_deltaVelocitiesUnitImpulse.size()+ndofB); + btAssert(m_data.m_jacobians.size() == m_data.m_deltaVelocitiesUnitImpulse.size()); + + multiBodyB->fillConstraintJacobianMultiDof(solverConstraint.m_linkB, cp.getPositionWorldOnB(), -constraintNormal, btVector3(0,0,0), &m_data.m_jacobians[solverConstraint.m_jacBindex], m_data.scratch_r, m_data.scratch_v, m_data.scratch_m); + multiBodyB->calcAccelerationDeltasMultiDof(&m_data.m_jacobians[solverConstraint.m_jacBindex],&m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex],m_data.scratch_r, m_data.scratch_v); + + btVector3 torqueAxis1 = constraintNormal; + solverConstraint.m_relpos2CrossNormal = -torqueAxis1; + solverConstraint.m_contactNormal2 = -btVector3(0,0,0); + + } else + { + btVector3 torqueAxis1 = constraintNormal; + solverConstraint.m_relpos2CrossNormal = -torqueAxis1; + solverConstraint.m_contactNormal2 = -btVector3(0,0,0); + + solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*-torqueAxis1*rb1->getAngularFactor() : btVector3(0,0,0); + } + + { + + btVector3 vec; + btScalar denom0 = 0.f; + btScalar denom1 = 0.f; + btScalar* jacB = 0; + btScalar* jacA = 0; + btScalar* lambdaA =0; + btScalar* lambdaB =0; + int ndofA = 0; + if (multiBodyA) + { + ndofA = multiBodyA->getNumDofs() + 6; + jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex]; + lambdaA = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacAindex]; + for (int i = 0; i < ndofA; ++i) + { + btScalar j = jacA[i] ; + btScalar l =lambdaA[i]; + denom0 += j*l; + } + } else + { + if (rb0) + { + vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1); + denom0 = rb0->getInvMass() + constraintNormal.dot(vec); + } + } + if (multiBodyB) + { + const int ndofB = multiBodyB->getNumDofs() + 6; + jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex]; + lambdaB = &m_data.m_deltaVelocitiesUnitImpulse[solverConstraint.m_jacBindex]; + for (int i = 0; i < ndofB; ++i) + { + btScalar j = jacB[i] ; + btScalar l =lambdaB[i]; + denom1 += j*l; + } + + } else + { + if (rb1) + { + vec = ( -solverConstraint.m_angularComponentB).cross(rel_pos2); + denom1 = rb1->getInvMass() + constraintNormal.dot(vec); + } + } + + + + btScalar d = denom0+denom1+infoGlobal.m_globalCfm; + if (d>SIMD_EPSILON) + { + solverConstraint.m_jacDiagABInv = relaxation/(d); + } else + { + //disable the constraint row to handle singularity/redundant constraint + solverConstraint.m_jacDiagABInv = 0.f; + } + + } + + + //compute rhs and remaining solverConstraint fields + + + + btScalar restitution = 0.f; + btScalar penetration = isFriction? 0 : cp.getDistance(); + + btScalar rel_vel = 0.f; + int ndofA = 0; + int ndofB = 0; + { + + btVector3 vel1,vel2; + if (multiBodyA) + { + ndofA = multiBodyA->getNumDofs() + 6; + btScalar* jacA = &m_data.m_jacobians[solverConstraint.m_jacAindex]; + for (int i = 0; i < ndofA ; ++i) + rel_vel += multiBodyA->getVelocityVector()[i] * jacA[i]; + } else + { + if (rb0) + { + rel_vel += rb0->getVelocityInLocalPoint(rel_pos1).dot(solverConstraint.m_contactNormal1); + } + } + if (multiBodyB) + { + ndofB = multiBodyB->getNumDofs() + 6; + btScalar* jacB = &m_data.m_jacobians[solverConstraint.m_jacBindex]; + for (int i = 0; i < ndofB ; ++i) + rel_vel += multiBodyB->getVelocityVector()[i] * jacB[i]; + + } else + { + if (rb1) + { + rel_vel += rb1->getVelocityInLocalPoint(rel_pos2).dot(solverConstraint.m_contactNormal2); + } + } + + solverConstraint.m_friction =combinedTorsionalFriction; + + if(!isFriction) + { + restitution = restitutionCurve(rel_vel, cp.m_combinedRestitution); + if (restitution <= btScalar(0.)) + { + restitution = 0.f; + } + } + } + + + solverConstraint.m_appliedImpulse = 0.f; + solverConstraint.m_appliedPushImpulse = 0.f; + + { + + btScalar positionalError = 0.f; + btScalar velocityError = restitution - rel_vel;// * damping; //note for friction restitution is always set to 0 (check above) so it is acutally velocityError = -rel_vel for friction + + if (penetration>0) + { + velocityError -= penetration / infoGlobal.m_timeStep; + } + + btScalar velocityImpulse = velocityError*solverConstraint.m_jacDiagABInv; + + solverConstraint.m_rhs = velocityImpulse; + solverConstraint.m_rhsPenetration = 0.f; + solverConstraint.m_lowerLimit = -solverConstraint.m_friction; + solverConstraint.m_upperLimit = solverConstraint.m_friction; + + solverConstraint.m_cfm = infoGlobal.m_globalCfm*solverConstraint.m_jacDiagABInv; + + + + } + +} + +btMultiBodySolverConstraint& btMultiBodyConstraintSolver::addMultiBodyFrictionConstraint(const btVector3& normalAxis,btPersistentManifold* manifold,int frictionIndex,btManifoldPoint& cp,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip) +{ + BT_PROFILE("addMultiBodyFrictionConstraint"); + btMultiBodySolverConstraint& solverConstraint = m_multiBodyFrictionContactConstraints.expandNonInitializing(); + solverConstraint.m_orgConstraint = 0; + solverConstraint.m_orgDofIndex = -1; + + solverConstraint.m_frictionIndex = frictionIndex; + bool isFriction = true; + + const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0()); + const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1()); + + btMultiBody* mbA = fcA? fcA->m_multiBody : 0; + btMultiBody* mbB = fcB? fcB->m_multiBody : 0; + + int solverBodyIdA = mbA? -1 : getOrInitSolverBody(*colObj0,infoGlobal.m_timeStep); + int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1,infoGlobal.m_timeStep); + + solverConstraint.m_solverBodyIdA = solverBodyIdA; + solverConstraint.m_solverBodyIdB = solverBodyIdB; + solverConstraint.m_multiBodyA = mbA; + if (mbA) + solverConstraint.m_linkA = fcA->m_link; + + solverConstraint.m_multiBodyB = mbB; + if (mbB) + solverConstraint.m_linkB = fcB->m_link; + + solverConstraint.m_originalContactPoint = &cp; + + setupMultiBodyContactConstraint(solverConstraint, normalAxis, cp, infoGlobal,relaxation,isFriction, desiredVelocity, cfmSlip); + return solverConstraint; +} + +btMultiBodySolverConstraint& btMultiBodyConstraintSolver::addMultiBodyTorsionalFrictionConstraint(const btVector3& normalAxis,btPersistentManifold* manifold,int frictionIndex,btManifoldPoint& cp, + btScalar combinedTorsionalFriction, + btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity, btScalar cfmSlip) +{ + BT_PROFILE("addMultiBodyRollingFrictionConstraint"); + btMultiBodySolverConstraint& solverConstraint = m_multiBodyFrictionContactConstraints.expandNonInitializing(); + solverConstraint.m_orgConstraint = 0; + solverConstraint.m_orgDofIndex = -1; + + solverConstraint.m_frictionIndex = frictionIndex; + bool isFriction = true; + + const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0()); + const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1()); + + btMultiBody* mbA = fcA? fcA->m_multiBody : 0; + btMultiBody* mbB = fcB? fcB->m_multiBody : 0; + + int solverBodyIdA = mbA? -1 : getOrInitSolverBody(*colObj0,infoGlobal.m_timeStep); + int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1,infoGlobal.m_timeStep); + + solverConstraint.m_solverBodyIdA = solverBodyIdA; + solverConstraint.m_solverBodyIdB = solverBodyIdB; + solverConstraint.m_multiBodyA = mbA; + if (mbA) + solverConstraint.m_linkA = fcA->m_link; + + solverConstraint.m_multiBodyB = mbB; + if (mbB) + solverConstraint.m_linkB = fcB->m_link; + + solverConstraint.m_originalContactPoint = &cp; + + setupMultiBodyTorsionalFrictionConstraint(solverConstraint, normalAxis, cp, combinedTorsionalFriction,infoGlobal,relaxation,isFriction, desiredVelocity, cfmSlip); + return solverConstraint; +} + +void btMultiBodyConstraintSolver::convertMultiBodyContact(btPersistentManifold* manifold,const btContactSolverInfo& infoGlobal) +{ + const btMultiBodyLinkCollider* fcA = btMultiBodyLinkCollider::upcast(manifold->getBody0()); + const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1()); + + btMultiBody* mbA = fcA? fcA->m_multiBody : 0; + btMultiBody* mbB = fcB? fcB->m_multiBody : 0; + + btCollisionObject* colObj0=0,*colObj1=0; + + colObj0 = (btCollisionObject*)manifold->getBody0(); + colObj1 = (btCollisionObject*)manifold->getBody1(); + + int solverBodyIdA = mbA? -1 : getOrInitSolverBody(*colObj0,infoGlobal.m_timeStep); + int solverBodyIdB = mbB ? -1 : getOrInitSolverBody(*colObj1,infoGlobal.m_timeStep); + +// btSolverBody* solverBodyA = mbA ? 0 : &m_tmpSolverBodyPool[solverBodyIdA]; +// btSolverBody* solverBodyB = mbB ? 0 : &m_tmpSolverBodyPool[solverBodyIdB]; + + + ///avoid collision response between two static objects +// if (!solverBodyA || (solverBodyA->m_invMass.isZero() && (!solverBodyB || solverBodyB->m_invMass.isZero()))) + // return; + + //only a single rollingFriction per manifold + int rollingFriction=1; + + for (int j=0;jgetNumContacts();j++) + { + + btManifoldPoint& cp = manifold->getContactPoint(j); + + if (cp.getDistance() <= manifold->getContactProcessingThreshold()) + { + + btScalar relaxation; + + int frictionIndex = m_multiBodyNormalContactConstraints.size(); + + btMultiBodySolverConstraint& solverConstraint = m_multiBodyNormalContactConstraints.expandNonInitializing(); + + // btRigidBody* rb0 = btRigidBody::upcast(colObj0); + // btRigidBody* rb1 = btRigidBody::upcast(colObj1); + solverConstraint.m_orgConstraint = 0; + solverConstraint.m_orgDofIndex = -1; + solverConstraint.m_solverBodyIdA = solverBodyIdA; + solverConstraint.m_solverBodyIdB = solverBodyIdB; + solverConstraint.m_multiBodyA = mbA; + if (mbA) + solverConstraint.m_linkA = fcA->m_link; + + solverConstraint.m_multiBodyB = mbB; + if (mbB) + solverConstraint.m_linkB = fcB->m_link; + + solverConstraint.m_originalContactPoint = &cp; + + bool isFriction = false; + setupMultiBodyContactConstraint(solverConstraint, cp.m_normalWorldOnB,cp, infoGlobal, relaxation, isFriction); + +// const btVector3& pos1 = cp.getPositionWorldOnA(); +// const btVector3& pos2 = cp.getPositionWorldOnB(); + + /////setup the friction constraints +#define ENABLE_FRICTION +#ifdef ENABLE_FRICTION + solverConstraint.m_frictionIndex = frictionIndex; + + ///Bullet has several options to set the friction directions + ///By default, each contact has only a single friction direction that is recomputed automatically every frame + ///based on the relative linear velocity. + ///If the relative velocity is zero, it will automatically compute a friction direction. + + ///You can also enable two friction directions, using the SOLVER_USE_2_FRICTION_DIRECTIONS. + ///In that case, the second friction direction will be orthogonal to both contact normal and first friction direction. + /// + ///If you choose SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION, then the friction will be independent from the relative projected velocity. + /// + ///The user can manually override the friction directions for certain contacts using a contact callback, + ///and set the cp.m_lateralFrictionInitialized to true + ///In that case, you can set the target relative motion in each friction direction (cp.m_contactMotion1 and cp.m_contactMotion2) + ///this will give a conveyor belt effect + /// + if (!(infoGlobal.m_solverMode & SOLVER_ENABLE_FRICTION_DIRECTION_CACHING) || !(cp.m_contactPointFlags&BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED)) + {/* + cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel; + btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2(); + if (!(infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION) && lat_rel_vel > SIMD_EPSILON) + { + cp.m_lateralFrictionDir1 *= 1.f/btSqrt(lat_rel_vel); + if((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)) + { + cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB); + cp.m_lateralFrictionDir2.normalize();//?? + applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir2,btCollisionObject::CF_ANISOTROPIC_FRICTION); + applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir2,btCollisionObject::CF_ANISOTROPIC_FRICTION); + addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation); + + } + + applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir1,btCollisionObject::CF_ANISOTROPIC_FRICTION); + applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir1,btCollisionObject::CF_ANISOTROPIC_FRICTION); + addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation); + + } else + */ + { + btPlaneSpace1(cp.m_normalWorldOnB,cp.m_lateralFrictionDir1,cp.m_lateralFrictionDir2); + + applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir1,btCollisionObject::CF_ANISOTROPIC_FRICTION); + applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir1,btCollisionObject::CF_ANISOTROPIC_FRICTION); + addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir1,manifold,frictionIndex,cp,colObj0,colObj1, relaxation,infoGlobal); + + if (rollingFriction > 0) + { + addMultiBodyTorsionalFrictionConstraint(cp.m_normalWorldOnB,manifold,frictionIndex,cp,cp.m_combinedSpinningFriction, colObj0,colObj1, relaxation,infoGlobal); + addMultiBodyTorsionalFrictionConstraint(cp.m_lateralFrictionDir1,manifold,frictionIndex,cp,cp.m_combinedRollingFriction, colObj0,colObj1, relaxation,infoGlobal); + addMultiBodyTorsionalFrictionConstraint(cp.m_lateralFrictionDir2,manifold,frictionIndex,cp,cp.m_combinedRollingFriction, colObj0,colObj1, relaxation,infoGlobal); + + rollingFriction--; + } + + if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)) + { + applyAnisotropicFriction(colObj0,cp.m_lateralFrictionDir2,btCollisionObject::CF_ANISOTROPIC_FRICTION); + applyAnisotropicFriction(colObj1,cp.m_lateralFrictionDir2,btCollisionObject::CF_ANISOTROPIC_FRICTION); + addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir2,manifold,frictionIndex,cp,colObj0,colObj1, relaxation,infoGlobal); + } + + if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS) && (infoGlobal.m_solverMode & SOLVER_DISABLE_VELOCITY_DEPENDENT_FRICTION_DIRECTION)) + { + cp.m_contactPointFlags|=BT_CONTACT_FLAG_LATERAL_FRICTION_INITIALIZED; + } + } + + } else + { + addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir1,manifold,frictionIndex,cp,colObj0,colObj1, relaxation,infoGlobal,cp.m_contactMotion1, cp.m_frictionCFM); + + if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)) + addMultiBodyFrictionConstraint(cp.m_lateralFrictionDir2,manifold,frictionIndex,cp,colObj0,colObj1, relaxation, infoGlobal,cp.m_contactMotion2, cp.m_frictionCFM); + + //setMultiBodyFrictionConstraintImpulse( solverConstraint, solverBodyIdA, solverBodyIdB, cp, infoGlobal); + //todo: + solverConstraint.m_appliedImpulse = 0.f; + solverConstraint.m_appliedPushImpulse = 0.f; + } + + +#endif //ENABLE_FRICTION + + } + } +} + +void btMultiBodyConstraintSolver::convertContacts(btPersistentManifold** manifoldPtr,int numManifolds, const btContactSolverInfo& infoGlobal) +{ + //btPersistentManifold* manifold = 0; + + for (int i=0;igetBody0()); + const btMultiBodyLinkCollider* fcB = btMultiBodyLinkCollider::upcast(manifold->getBody1()); + if (!fcA && !fcB) + { + //the contact doesn't involve any Featherstone btMultiBody, so deal with the regular btRigidBody/btCollisionObject case + convertContact(manifold,infoGlobal); + } else + { + convertMultiBodyContact(manifold,infoGlobal); + } + } + + //also convert the multibody constraints, if any + + + for (int i=0;icreateConstraintRows(m_multiBodyNonContactConstraints,m_data, infoGlobal); + } + +} + + + +btScalar btMultiBodyConstraintSolver::solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer,btDispatcher* dispatcher) +{ + return btSequentialImpulseConstraintSolver::solveGroup(bodies,numBodies,manifold,numManifolds,constraints,numConstraints,info,debugDrawer,dispatcher); +} + +#if 0 +static void applyJointFeedback(btMultiBodyJacobianData& data, const btMultiBodySolverConstraint& solverConstraint, int jacIndex, btMultiBody* mb, btScalar appliedImpulse) +{ + if (appliedImpulse!=0 && mb->internalNeedsJointFeedback()) + { + //todo: get rid of those temporary memory allocations for the joint feedback + btAlignedObjectArray forceVector; + int numDofsPlusBase = 6+mb->getNumDofs(); + forceVector.resize(numDofsPlusBase); + for (int i=0;i output; + output.resize(numDofsPlusBase); + bool applyJointFeedback = true; + mb->calcAccelerationDeltasMultiDof(&forceVector[0],&output[0],data.scratch_r,data.scratch_v,applyJointFeedback); + } +} +#endif + + +void btMultiBodyConstraintSolver::writeBackSolverBodyToMultiBody(btMultiBodySolverConstraint& c, btScalar deltaTime) +{ +#if 1 + + //bod->addBaseForce(m_gravity * bod->getBaseMass()); + //bod->addLinkForce(j, m_gravity * bod->getLinkMass(j)); + + if (c.m_orgConstraint) + { + c.m_orgConstraint->internalSetAppliedImpulse(c.m_orgDofIndex,c.m_appliedImpulse); + } + + + if (c.m_multiBodyA) + { + + c.m_multiBodyA->setCompanionId(-1); + btVector3 force = c.m_contactNormal1*(c.m_appliedImpulse/deltaTime); + btVector3 torque = c.m_relpos1CrossNormal*(c.m_appliedImpulse/deltaTime); + if (c.m_linkA<0) + { + c.m_multiBodyA->addBaseConstraintForce(force); + c.m_multiBodyA->addBaseConstraintTorque(torque); + } else + { + c.m_multiBodyA->addLinkConstraintForce(c.m_linkA,force); + //b3Printf("force = %f,%f,%f\n",force[0],force[1],force[2]);//[0],torque[1],torque[2]); + c.m_multiBodyA->addLinkConstraintTorque(c.m_linkA,torque); + } + } + + if (c.m_multiBodyB) + { + { + c.m_multiBodyB->setCompanionId(-1); + btVector3 force = c.m_contactNormal2*(c.m_appliedImpulse/deltaTime); + btVector3 torque = c.m_relpos2CrossNormal*(c.m_appliedImpulse/deltaTime); + if (c.m_linkB<0) + { + c.m_multiBodyB->addBaseConstraintForce(force); + c.m_multiBodyB->addBaseConstraintTorque(torque); + } else + { + { + c.m_multiBodyB->addLinkConstraintForce(c.m_linkB,force); + //b3Printf("t = %f,%f,%f\n",force[0],force[1],force[2]);//[0],torque[1],torque[2]); + c.m_multiBodyB->addLinkConstraintTorque(c.m_linkB,torque); + } + + } + } + } +#endif + +#ifndef DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS + + if (c.m_multiBodyA) + { + + if(c.m_multiBodyA->isMultiDof()) + { + c.m_multiBodyA->applyDeltaVeeMultiDof(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex],c.m_appliedImpulse); + } + else + { + c.m_multiBodyA->applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacAindex],c.m_appliedImpulse); + } + } + + if (c.m_multiBodyB) + { + if(c.m_multiBodyB->isMultiDof()) + { + c.m_multiBodyB->applyDeltaVeeMultiDof(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex],c.m_appliedImpulse); + } + else + { + c.m_multiBodyB->applyDeltaVee(&m_data.m_deltaVelocitiesUnitImpulse[c.m_jacBindex],c.m_appliedImpulse); + } + } +#endif + + + +} + +btScalar btMultiBodyConstraintSolver::solveGroupCacheFriendlyFinish(btCollisionObject** bodies,int numBodies,const btContactSolverInfo& infoGlobal) +{ + BT_PROFILE("btMultiBodyConstraintSolver::solveGroupCacheFriendlyFinish"); + int numPoolConstraints = m_multiBodyNormalContactConstraints.size(); + + + //write back the delta v to the multi bodies, either as applied impulse (direct velocity change) + //or as applied force, so we can measure the joint reaction forces easier + for (int i=0;im_appliedImpulse = solverConstraint.m_appliedImpulse; + pt->m_appliedImpulseLateral1 = m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_appliedImpulse; + + //printf("pt->m_appliedImpulseLateral1 = %f\n", pt->m_appliedImpulseLateral1); + if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)) + { + pt->m_appliedImpulseLateral2 = m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_appliedImpulse; + } + //do a callback here? + } + } +#if 0 + //multibody joint feedback + { + BT_PROFILE("multi body joint feedback"); + for (int j=0;jisMultiDof()) + { + applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacAindex,solverConstraint.m_multiBodyA, solverConstraint.m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep)); + } + if(solverConstraint.m_multiBodyB && solverConstraint.m_multiBodyB->isMultiDof()) + { + applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacBindex,solverConstraint.m_multiBodyB,solverConstraint.m_appliedImpulse*btSimdScalar(-1./infoGlobal.m_timeStep)); + } +#if 0 + if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyA && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyA->isMultiDof()) + { + applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex], + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_jacAindex, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyA, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep)); + + } + if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyB && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyB->isMultiDof()) + { + applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex], + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_jacBindex, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_multiBodyB, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex].m_appliedImpulse*btSimdScalar(-1./infoGlobal.m_timeStep)); + } + + if ((infoGlobal.m_solverMode & SOLVER_USE_2_FRICTION_DIRECTIONS)) + { + if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyA && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyA->isMultiDof()) + { + applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1], + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_jacAindex, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyA, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep)); + } + + if (m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyB && m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyB->isMultiDof()) + { + applyJointFeedback(m_data,m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1], + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_jacBindex, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_multiBodyB, + m_multiBodyFrictionContactConstraints[solverConstraint.m_frictionIndex+1].m_appliedImpulse*btSimdScalar(-1./infoGlobal.m_timeStep)); + } + } +#endif + } + + for (int i=0;iisMultiDof()) + { + applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacAindex,solverConstraint.m_multiBodyA, solverConstraint.m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep)); + } + if(solverConstraint.m_multiBodyB && solverConstraint.m_multiBodyB->isMultiDof()) + { + applyJointFeedback(m_data,solverConstraint, solverConstraint.m_jacBindex,solverConstraint.m_multiBodyB,solverConstraint.m_appliedImpulse*btSimdScalar(1./infoGlobal.m_timeStep)); + } + } + } + + numPoolConstraints = m_multiBodyNonContactConstraints.size(); + +#if 0 + //@todo: m_originalContactPoint is not initialized for btMultiBodySolverConstraint + for (int i=0;igetJointFeedback(); + if (fb) + { + fb->m_appliedForceBodyA += c.m_contactNormal1*c.m_appliedImpulse*constr->getRigidBodyA().getLinearFactor()/infoGlobal.m_timeStep; + fb->m_appliedForceBodyB += c.m_contactNormal2*c.m_appliedImpulse*constr->getRigidBodyB().getLinearFactor()/infoGlobal.m_timeStep; + fb->m_appliedTorqueBodyA += c.m_relpos1CrossNormal* constr->getRigidBodyA().getAngularFactor()*c.m_appliedImpulse/infoGlobal.m_timeStep; + fb->m_appliedTorqueBodyB += c.m_relpos2CrossNormal* constr->getRigidBodyB().getAngularFactor()*c.m_appliedImpulse/infoGlobal.m_timeStep; /*RGM ???? */ + + } + + constr->internalSetAppliedImpulse(c.m_appliedImpulse); + if (btFabs(c.m_appliedImpulse)>=constr->getBreakingImpulseThreshold()) + { + constr->setEnabled(false); + } + + } +#endif +#endif + + return btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(bodies,numBodies,infoGlobal); +} + + +void btMultiBodyConstraintSolver::solveMultiBodyGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,btMultiBodyConstraint** multiBodyConstraints, int numMultiBodyConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer,btDispatcher* dispatcher) +{ + //printf("solveMultiBodyGroup start\n"); + m_tmpMultiBodyConstraints = multiBodyConstraints; + m_tmpNumMultiBodyConstraints = numMultiBodyConstraints; + + btSequentialImpulseConstraintSolver::solveGroup(bodies,numBodies,manifold,numManifolds,constraints,numConstraints,info,debugDrawer,dispatcher); + + m_tmpMultiBodyConstraints = 0; + m_tmpNumMultiBodyConstraints = 0; + + +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h new file mode 100644 index 000000000..489347d87 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h @@ -0,0 +1,100 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_MULTIBODY_CONSTRAINT_SOLVER_H +#define BT_MULTIBODY_CONSTRAINT_SOLVER_H + +#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" +#include "btMultiBodySolverConstraint.h" + +#define DIRECTLY_UPDATE_VELOCITY_DURING_SOLVER_ITERATIONS + +class btMultiBody; + +#include "btMultiBodyConstraint.h" + + + +ATTRIBUTE_ALIGNED16(class) btMultiBodyConstraintSolver : public btSequentialImpulseConstraintSolver +{ + +protected: + + btMultiBodyConstraintArray m_multiBodyNonContactConstraints; + + btMultiBodyConstraintArray m_multiBodyNormalContactConstraints; + btMultiBodyConstraintArray m_multiBodyFrictionContactConstraints; + + btMultiBodyJacobianData m_data; + + //temp storage for multi body constraints for a specific island/group called by 'solveGroup' + btMultiBodyConstraint** m_tmpMultiBodyConstraints; + int m_tmpNumMultiBodyConstraints; + + btScalar resolveSingleConstraintRowGeneric(const btMultiBodySolverConstraint& c); + + + void convertContacts(btPersistentManifold** manifoldPtr,int numManifolds, const btContactSolverInfo& infoGlobal); + + btMultiBodySolverConstraint& addMultiBodyFrictionConstraint(const btVector3& normalAxis,btPersistentManifold* manifold,int frictionIndex,btManifoldPoint& cp,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity=0, btScalar cfmSlip=0); + + btMultiBodySolverConstraint& addMultiBodyTorsionalFrictionConstraint(const btVector3& normalAxis,btPersistentManifold* manifold,int frictionIndex,btManifoldPoint& cp, + btScalar combinedTorsionalFriction, + btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation, const btContactSolverInfo& infoGlobal, btScalar desiredVelocity=0, btScalar cfmSlip=0); + + void setupMultiBodyJointLimitConstraint(btMultiBodySolverConstraint& constraintRow, + btScalar* jacA,btScalar* jacB, + btScalar penetration,btScalar combinedFrictionCoeff, btScalar combinedRestitutionCoeff, + const btContactSolverInfo& infoGlobal); + + void setupMultiBodyContactConstraint(btMultiBodySolverConstraint& solverConstraint, + const btVector3& contactNormal, + btManifoldPoint& cp, const btContactSolverInfo& infoGlobal, + btScalar& relaxation, + bool isFriction, btScalar desiredVelocity=0, btScalar cfmSlip=0); + + //either rolling or spinning friction + void setupMultiBodyTorsionalFrictionConstraint(btMultiBodySolverConstraint& solverConstraint, + const btVector3& contactNormal, + btManifoldPoint& cp, + btScalar combinedTorsionalFriction, + const btContactSolverInfo& infoGlobal, + btScalar& relaxation, + bool isFriction, btScalar desiredVelocity=0, btScalar cfmSlip=0); + + void convertMultiBodyContact(btPersistentManifold* manifold,const btContactSolverInfo& infoGlobal); + virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); +// virtual btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); + + virtual btScalar solveSingleIteration(int iteration, btCollisionObject** bodies ,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); + void applyDeltaVee(btScalar* deltaV, btScalar impulse, int velocityIndex, int ndof); + void writeBackSolverBodyToMultiBody(btMultiBodySolverConstraint& constraint, btScalar deltaTime); +public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + + ///this method should not be called, it was just used during porting/integration of Featherstone btMultiBody, providing backwards compatibility but no support for btMultiBodyConstraint (only contact constraints) + virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer,btDispatcher* dispatcher); + virtual btScalar solveGroupCacheFriendlyFinish(btCollisionObject** bodies,int numBodies,const btContactSolverInfo& infoGlobal); + + virtual void solveMultiBodyGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,btMultiBodyConstraint** multiBodyConstraints, int numMultiBodyConstraints, const btContactSolverInfo& info, btIDebugDraw* debugDrawer,btDispatcher* dispatcher); +}; + + + + + +#endif //BT_MULTIBODY_CONSTRAINT_SOLVER_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp new file mode 100644 index 000000000..4b33cf69d --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp @@ -0,0 +1,989 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#include "btMultiBodyDynamicsWorld.h" +#include "btMultiBodyConstraintSolver.h" +#include "btMultiBody.h" +#include "btMultiBodyLinkCollider.h" +#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h" +#include "LinearMath/btQuickprof.h" +#include "btMultiBodyConstraint.h" +#include "LinearMath/btIDebugDraw.h" +#include "LinearMath/btSerializer.h" + + +void btMultiBodyDynamicsWorld::addMultiBody(btMultiBody* body, short group, short mask) +{ + m_multiBodies.push_back(body); + +} + +void btMultiBodyDynamicsWorld::removeMultiBody(btMultiBody* body) +{ + m_multiBodies.remove(body); +} + +void btMultiBodyDynamicsWorld::calculateSimulationIslands() +{ + BT_PROFILE("calculateSimulationIslands"); + + getSimulationIslandManager()->updateActivationState(getCollisionWorld(),getCollisionWorld()->getDispatcher()); + + { + //merge islands based on speculative contact manifolds too + for (int i=0;im_predictiveManifolds.size();i++) + { + btPersistentManifold* manifold = m_predictiveManifolds[i]; + + const btCollisionObject* colObj0 = manifold->getBody0(); + const btCollisionObject* colObj1 = manifold->getBody1(); + + if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) && + ((colObj1) && (!(colObj1)->isStaticOrKinematicObject()))) + { + getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),(colObj1)->getIslandTag()); + } + } + } + + { + int i; + int numConstraints = int(m_constraints.size()); + for (i=0;i< numConstraints ; i++ ) + { + btTypedConstraint* constraint = m_constraints[i]; + if (constraint->isEnabled()) + { + const btRigidBody* colObj0 = &constraint->getRigidBodyA(); + const btRigidBody* colObj1 = &constraint->getRigidBodyB(); + + if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) && + ((colObj1) && (!(colObj1)->isStaticOrKinematicObject()))) + { + getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),(colObj1)->getIslandTag()); + } + } + } + } + + //merge islands linked by Featherstone link colliders + for (int i=0;igetBaseCollider(); + + for (int b=0;bgetNumLinks();b++) + { + btMultiBodyLinkCollider* cur = body->getLink(b).m_collider; + + if (((cur) && (!(cur)->isStaticOrKinematicObject())) && + ((prev) && (!(prev)->isStaticOrKinematicObject()))) + { + int tagPrev = prev->getIslandTag(); + int tagCur = cur->getIslandTag(); + getSimulationIslandManager()->getUnionFind().unite(tagPrev, tagCur); + } + if (cur && !cur->isStaticOrKinematicObject()) + prev = cur; + + } + } + } + + //merge islands linked by multibody constraints + { + for (int i=0;im_multiBodyConstraints.size();i++) + { + btMultiBodyConstraint* c = m_multiBodyConstraints[i]; + int tagA = c->getIslandIdA(); + int tagB = c->getIslandIdB(); + if (tagA>=0 && tagB>=0) + getSimulationIslandManager()->getUnionFind().unite(tagA, tagB); + } + } + + //Store the island id in each body + getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld()); + +} + + +void btMultiBodyDynamicsWorld::updateActivationState(btScalar timeStep) +{ + BT_PROFILE("btMultiBodyDynamicsWorld::updateActivationState"); + + + + for ( int i=0;icheckMotionAndSleepIfRequired(timeStep); + if (!body->isAwake()) + { + btMultiBodyLinkCollider* col = body->getBaseCollider(); + if (col && col->getActivationState() == ACTIVE_TAG) + { + col->setActivationState( WANTS_DEACTIVATION); + col->setDeactivationTime(0.f); + } + for (int b=0;bgetNumLinks();b++) + { + btMultiBodyLinkCollider* col = body->getLink(b).m_collider; + if (col && col->getActivationState() == ACTIVE_TAG) + { + col->setActivationState( WANTS_DEACTIVATION); + col->setDeactivationTime(0.f); + } + } + } else + { + btMultiBodyLinkCollider* col = body->getBaseCollider(); + if (col && col->getActivationState() != DISABLE_DEACTIVATION) + col->setActivationState( ACTIVE_TAG ); + + for (int b=0;bgetNumLinks();b++) + { + btMultiBodyLinkCollider* col = body->getLink(b).m_collider; + if (col && col->getActivationState() != DISABLE_DEACTIVATION) + col->setActivationState( ACTIVE_TAG ); + } + } + + } + } + + btDiscreteDynamicsWorld::updateActivationState(timeStep); +} + + +SIMD_FORCE_INLINE int btGetConstraintIslandId2(const btTypedConstraint* lhs) +{ + int islandId; + + const btCollisionObject& rcolObj0 = lhs->getRigidBodyA(); + const btCollisionObject& rcolObj1 = lhs->getRigidBodyB(); + islandId= rcolObj0.getIslandTag()>=0?rcolObj0.getIslandTag():rcolObj1.getIslandTag(); + return islandId; + +} + + +class btSortConstraintOnIslandPredicate2 +{ + public: + + bool operator() ( const btTypedConstraint* lhs, const btTypedConstraint* rhs ) const + { + int rIslandId0,lIslandId0; + rIslandId0 = btGetConstraintIslandId2(rhs); + lIslandId0 = btGetConstraintIslandId2(lhs); + return lIslandId0 < rIslandId0; + } +}; + + + +SIMD_FORCE_INLINE int btGetMultiBodyConstraintIslandId(const btMultiBodyConstraint* lhs) +{ + int islandId; + + int islandTagA = lhs->getIslandIdA(); + int islandTagB = lhs->getIslandIdB(); + islandId= islandTagA>=0?islandTagA:islandTagB; + return islandId; + +} + + +class btSortMultiBodyConstraintOnIslandPredicate +{ + public: + + bool operator() ( const btMultiBodyConstraint* lhs, const btMultiBodyConstraint* rhs ) const + { + int rIslandId0,lIslandId0; + rIslandId0 = btGetMultiBodyConstraintIslandId(rhs); + lIslandId0 = btGetMultiBodyConstraintIslandId(lhs); + return lIslandId0 < rIslandId0; + } +}; + +struct MultiBodyInplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback +{ + btContactSolverInfo* m_solverInfo; + btMultiBodyConstraintSolver* m_solver; + btMultiBodyConstraint** m_multiBodySortedConstraints; + int m_numMultiBodyConstraints; + + btTypedConstraint** m_sortedConstraints; + int m_numConstraints; + btIDebugDraw* m_debugDrawer; + btDispatcher* m_dispatcher; + + btAlignedObjectArray m_bodies; + btAlignedObjectArray m_manifolds; + btAlignedObjectArray m_constraints; + btAlignedObjectArray m_multiBodyConstraints; + + + MultiBodyInplaceSolverIslandCallback( btMultiBodyConstraintSolver* solver, + btDispatcher* dispatcher) + :m_solverInfo(NULL), + m_solver(solver), + m_multiBodySortedConstraints(NULL), + m_numConstraints(0), + m_debugDrawer(NULL), + m_dispatcher(dispatcher) + { + + } + + MultiBodyInplaceSolverIslandCallback& operator=(MultiBodyInplaceSolverIslandCallback& other) + { + btAssert(0); + (void)other; + return *this; + } + + SIMD_FORCE_INLINE void setup ( btContactSolverInfo* solverInfo, btTypedConstraint** sortedConstraints, int numConstraints, btMultiBodyConstraint** sortedMultiBodyConstraints, int numMultiBodyConstraints, btIDebugDraw* debugDrawer) + { + btAssert(solverInfo); + m_solverInfo = solverInfo; + + m_multiBodySortedConstraints = sortedMultiBodyConstraints; + m_numMultiBodyConstraints = numMultiBodyConstraints; + m_sortedConstraints = sortedConstraints; + m_numConstraints = numConstraints; + + m_debugDrawer = debugDrawer; + m_bodies.resize (0); + m_manifolds.resize (0); + m_constraints.resize (0); + m_multiBodyConstraints.resize(0); + } + + + virtual void processIsland(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifolds,int numManifolds, int islandId) + { + if (islandId<0) + { + ///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id + m_solver->solveMultiBodyGroup( bodies,numBodies,manifolds, numManifolds,m_sortedConstraints, m_numConstraints, &m_multiBodySortedConstraints[0],m_numConstraints,*m_solverInfo,m_debugDrawer,m_dispatcher); + } else + { + //also add all non-contact constraints/joints for this island + btTypedConstraint** startConstraint = 0; + btMultiBodyConstraint** startMultiBodyConstraint = 0; + + int numCurConstraints = 0; + int numCurMultiBodyConstraints = 0; + + int i; + + //find the first constraint for this island + + for (i=0;im_minimumSolverBatchSize<=1) + { + m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,*m_solverInfo,m_debugDrawer,m_dispatcher); + } else + { + + for (i=0;im_solverInfo->m_minimumSolverBatchSize) + { + processConstraints(); + } else + { + //printf("deferred\n"); + } + } + } + } + void processConstraints() + { + + btCollisionObject** bodies = m_bodies.size()? &m_bodies[0]:0; + btPersistentManifold** manifold = m_manifolds.size()?&m_manifolds[0]:0; + btTypedConstraint** constraints = m_constraints.size()?&m_constraints[0]:0; + btMultiBodyConstraint** multiBodyConstraints = m_multiBodyConstraints.size() ? &m_multiBodyConstraints[0] : 0; + + //printf("mb contacts = %d, mb constraints = %d\n", mbContacts, m_multiBodyConstraints.size()); + + m_solver->solveMultiBodyGroup( bodies,m_bodies.size(),manifold, m_manifolds.size(),constraints, m_constraints.size() ,multiBodyConstraints, m_multiBodyConstraints.size(), *m_solverInfo,m_debugDrawer,m_dispatcher); + m_bodies.resize(0); + m_manifolds.resize(0); + m_constraints.resize(0); + m_multiBodyConstraints.resize(0); + } + +}; + + + +btMultiBodyDynamicsWorld::btMultiBodyDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btMultiBodyConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration) + :btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration), + m_multiBodyConstraintSolver(constraintSolver) +{ + //split impulse is not yet supported for Featherstone hierarchies +// getSolverInfo().m_splitImpulse = false; + getSolverInfo().m_solverMode |=SOLVER_USE_2_FRICTION_DIRECTIONS; + m_solverMultiBodyIslandCallback = new MultiBodyInplaceSolverIslandCallback(constraintSolver,dispatcher); +} + +btMultiBodyDynamicsWorld::~btMultiBodyDynamicsWorld () +{ + delete m_solverMultiBodyIslandCallback; +} + +void btMultiBodyDynamicsWorld::forwardKinematics() +{ + + for (int b=0;bforwardKinematics(m_scratch_world_to_local,m_scratch_local_origin); + } +} +void btMultiBodyDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo) +{ + forwardKinematics(); + + + + BT_PROFILE("solveConstraints"); + + m_sortedConstraints.resize( m_constraints.size()); + int i; + for (i=0;isetup(&solverInfo,constraintsPtr,m_sortedConstraints.size(),sortedMultiBodyConstraints,m_sortedMultiBodyConstraints.size(), getDebugDrawer()); + m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds()); + + /// solve all the constraints for this island + m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld(),m_solverMultiBodyIslandCallback); + +#ifndef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + { + BT_PROFILE("btMultiBody addForce"); + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + + bool isSleeping = false; + + if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING) + { + isSleeping = true; + } + for (int b=0;bgetNumLinks();b++) + { + if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState()==ISLAND_SLEEPING) + isSleeping = true; + } + + if (!isSleeping) + { + //useless? they get resized in stepVelocities once again (AND DIFFERENTLY) + m_scratch_r.resize(bod->getNumLinks()+1); //multidof? ("Y"s use it and it is used to store qdd) + m_scratch_v.resize(bod->getNumLinks()+1); + m_scratch_m.resize(bod->getNumLinks()+1); + + bod->addBaseForce(m_gravity * bod->getBaseMass()); + + for (int j = 0; j < bod->getNumLinks(); ++j) + { + bod->addLinkForce(j, m_gravity * bod->getLinkMass(j)); + } + }//if (!isSleeping) + } + } +#endif //BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + + + { + BT_PROFILE("btMultiBody stepVelocities"); + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + + bool isSleeping = false; + + if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING) + { + isSleeping = true; + } + for (int b=0;bgetNumLinks();b++) + { + if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState()==ISLAND_SLEEPING) + isSleeping = true; + } + + if (!isSleeping) + { + //useless? they get resized in stepVelocities once again (AND DIFFERENTLY) + m_scratch_r.resize(bod->getNumLinks()+1); //multidof? ("Y"s use it and it is used to store qdd) + m_scratch_v.resize(bod->getNumLinks()+1); + m_scratch_m.resize(bod->getNumLinks()+1); + bool doNotUpdatePos = false; + + { + if(!bod->isUsingRK4Integration()) + { + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(solverInfo.m_timeStep, m_scratch_r, m_scratch_v, m_scratch_m); + } + else + { + // + int numDofs = bod->getNumDofs() + 6; + int numPosVars = bod->getNumPosVars() + 7; + btAlignedObjectArray scratch_r2; scratch_r2.resize(2*numPosVars + 8*numDofs); + //convenience + btScalar *pMem = &scratch_r2[0]; + btScalar *scratch_q0 = pMem; pMem += numPosVars; + btScalar *scratch_qx = pMem; pMem += numPosVars; + btScalar *scratch_qd0 = pMem; pMem += numDofs; + btScalar *scratch_qd1 = pMem; pMem += numDofs; + btScalar *scratch_qd2 = pMem; pMem += numDofs; + btScalar *scratch_qd3 = pMem; pMem += numDofs; + btScalar *scratch_qdd0 = pMem; pMem += numDofs; + btScalar *scratch_qdd1 = pMem; pMem += numDofs; + btScalar *scratch_qdd2 = pMem; pMem += numDofs; + btScalar *scratch_qdd3 = pMem; pMem += numDofs; + btAssert((pMem - (2*numPosVars + 8*numDofs)) == &scratch_r2[0]); + + ///// + //copy q0 to scratch_q0 and qd0 to scratch_qd0 + scratch_q0[0] = bod->getWorldToBaseRot().x(); + scratch_q0[1] = bod->getWorldToBaseRot().y(); + scratch_q0[2] = bod->getWorldToBaseRot().z(); + scratch_q0[3] = bod->getWorldToBaseRot().w(); + scratch_q0[4] = bod->getBasePos().x(); + scratch_q0[5] = bod->getBasePos().y(); + scratch_q0[6] = bod->getBasePos().z(); + // + for(int link = 0; link < bod->getNumLinks(); ++link) + { + for(int dof = 0; dof < bod->getLink(link).m_posVarCount; ++dof) + scratch_q0[7 + bod->getLink(link).m_cfgOffset + dof] = bod->getLink(link).m_jointPos[dof]; + } + // + for(int dof = 0; dof < numDofs; ++dof) + scratch_qd0[dof] = bod->getVelocityVector()[dof]; + //// + struct + { + btMultiBody *bod; + btScalar *scratch_qx, *scratch_q0; + + void operator()() + { + for(int dof = 0; dof < bod->getNumPosVars() + 7; ++dof) + scratch_qx[dof] = scratch_q0[dof]; + } + } pResetQx = {bod, scratch_qx, scratch_q0}; + // + struct + { + void operator()(btScalar dt, const btScalar *pDer, const btScalar *pCurVal, btScalar *pVal, int size) + { + for(int i = 0; i < size; ++i) + pVal[i] = pCurVal[i] + dt * pDer[i]; + } + + } pEulerIntegrate; + // + struct + { + void operator()(btMultiBody *pBody, const btScalar *pData) + { + btScalar *pVel = const_cast(pBody->getVelocityVector()); + + for(int i = 0; i < pBody->getNumDofs() + 6; ++i) + pVel[i] = pData[i]; + + } + } pCopyToVelocityVector; + // + struct + { + void operator()(const btScalar *pSrc, btScalar *pDst, int start, int size) + { + for(int i = 0; i < size; ++i) + pDst[i] = pSrc[start + i]; + } + } pCopy; + // + + btScalar h = solverInfo.m_timeStep; + #define output &m_scratch_r[bod->getNumDofs()] + //calc qdd0 from: q0 & qd0 + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m); + pCopy(output, scratch_qdd0, 0, numDofs); + //calc q1 = q0 + h/2 * qd0 + pResetQx(); + bod->stepPositionsMultiDof(btScalar(.5)*h, scratch_qx, scratch_qd0); + //calc qd1 = qd0 + h/2 * qdd0 + pEulerIntegrate(btScalar(.5)*h, scratch_qdd0, scratch_qd0, scratch_qd1, numDofs); + // + //calc qdd1 from: q1 & qd1 + pCopyToVelocityVector(bod, scratch_qd1); + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m); + pCopy(output, scratch_qdd1, 0, numDofs); + //calc q2 = q0 + h/2 * qd1 + pResetQx(); + bod->stepPositionsMultiDof(btScalar(.5)*h, scratch_qx, scratch_qd1); + //calc qd2 = qd0 + h/2 * qdd1 + pEulerIntegrate(btScalar(.5)*h, scratch_qdd1, scratch_qd0, scratch_qd2, numDofs); + // + //calc qdd2 from: q2 & qd2 + pCopyToVelocityVector(bod, scratch_qd2); + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m); + pCopy(output, scratch_qdd2, 0, numDofs); + //calc q3 = q0 + h * qd2 + pResetQx(); + bod->stepPositionsMultiDof(h, scratch_qx, scratch_qd2); + //calc qd3 = qd0 + h * qdd2 + pEulerIntegrate(h, scratch_qdd2, scratch_qd0, scratch_qd3, numDofs); + // + //calc qdd3 from: q3 & qd3 + pCopyToVelocityVector(bod, scratch_qd3); + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0., m_scratch_r, m_scratch_v, m_scratch_m); + pCopy(output, scratch_qdd3, 0, numDofs); + + // + //calc q = q0 + h/6(qd0 + 2*(qd1 + qd2) + qd3) + //calc qd = qd0 + h/6(qdd0 + 2*(qdd1 + qdd2) + qdd3) + btAlignedObjectArray delta_q; delta_q.resize(numDofs); + btAlignedObjectArray delta_qd; delta_qd.resize(numDofs); + for(int i = 0; i < numDofs; ++i) + { + delta_q[i] = h/btScalar(6.)*(scratch_qd0[i] + 2*scratch_qd1[i] + 2*scratch_qd2[i] + scratch_qd3[i]); + delta_qd[i] = h/btScalar(6.)*(scratch_qdd0[i] + 2*scratch_qdd1[i] + 2*scratch_qdd2[i] + scratch_qdd3[i]); + //delta_q[i] = h*scratch_qd0[i]; + //delta_qd[i] = h*scratch_qdd0[i]; + } + // + pCopyToVelocityVector(bod, scratch_qd0); + bod->applyDeltaVeeMultiDof(&delta_qd[0], 1); + // + if(!doNotUpdatePos) + { + btScalar *pRealBuf = const_cast(bod->getVelocityVector()); + pRealBuf += 6 + bod->getNumDofs() + bod->getNumDofs()*bod->getNumDofs(); + + for(int i = 0; i < numDofs; ++i) + pRealBuf[i] = delta_q[i]; + + //bod->stepPositionsMultiDof(1, 0, &delta_q[0]); + bod->setPosUpdated(true); + } + + //ugly hack which resets the cached data to t0 (needed for constraint solver) + { + for(int link = 0; link < bod->getNumLinks(); ++link) + bod->getLink(link).updateCacheMultiDof(); + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(0, m_scratch_r, m_scratch_v, m_scratch_m); + } + + } + } + +#ifndef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + bod->clearForcesAndTorques(); +#endif //BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + }//if (!isSleeping) + } + } + + clearMultiBodyConstraintForces(); + + m_solverMultiBodyIslandCallback->processConstraints(); + + m_constraintSolver->allSolved(solverInfo, m_debugDrawer); + + { + BT_PROFILE("btMultiBody stepVelocities"); + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + + bool isSleeping = false; + + if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING) + { + isSleeping = true; + } + for (int b=0;bgetNumLinks();b++) + { + if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState()==ISLAND_SLEEPING) + isSleeping = true; + } + + if (!isSleeping) + { + //useless? they get resized in stepVelocities once again (AND DIFFERENTLY) + m_scratch_r.resize(bod->getNumLinks()+1); //multidof? ("Y"s use it and it is used to store qdd) + m_scratch_v.resize(bod->getNumLinks()+1); + m_scratch_m.resize(bod->getNumLinks()+1); + + + { + if(!bod->isUsingRK4Integration()) + { + bool isConstraintPass = true; + bod->computeAccelerationsArticulatedBodyAlgorithmMultiDof(solverInfo.m_timeStep, m_scratch_r, m_scratch_v, m_scratch_m, isConstraintPass); + } + } + } + } + } + + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + bod->processDeltaVeeMultiDof2(); + } + +} + +void btMultiBodyDynamicsWorld::integrateTransforms(btScalar timeStep) +{ + btDiscreteDynamicsWorld::integrateTransforms(timeStep); + + { + BT_PROFILE("btMultiBody stepPositions"); + //integrate and update the Featherstone hierarchies + + for (int b=0;bgetBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING) + { + isSleeping = true; + } + for (int b=0;bgetNumLinks();b++) + { + if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState()==ISLAND_SLEEPING) + isSleeping = true; + } + + + if (!isSleeping) + { + int nLinks = bod->getNumLinks(); + + ///base + num m_links + + + { + if(!bod->isPosUpdated()) + bod->stepPositionsMultiDof(timeStep); + else + { + btScalar *pRealBuf = const_cast(bod->getVelocityVector()); + pRealBuf += 6 + bod->getNumDofs() + bod->getNumDofs()*bod->getNumDofs(); + + bod->stepPositionsMultiDof(1, 0, pRealBuf); + bod->setPosUpdated(false); + } + } + + m_scratch_world_to_local.resize(nLinks+1); + m_scratch_local_origin.resize(nLinks+1); + + bod->updateCollisionObjectWorldTransforms(m_scratch_world_to_local,m_scratch_local_origin); + + } else + { + bod->clearVelocities(); + } + } + } +} + + + +void btMultiBodyDynamicsWorld::addMultiBodyConstraint( btMultiBodyConstraint* constraint) +{ + m_multiBodyConstraints.push_back(constraint); +} + +void btMultiBodyDynamicsWorld::removeMultiBodyConstraint( btMultiBodyConstraint* constraint) +{ + m_multiBodyConstraints.remove(constraint); +} + +void btMultiBodyDynamicsWorld::debugDrawMultiBodyConstraint(btMultiBodyConstraint* constraint) +{ + constraint->debugDraw(getDebugDrawer()); +} + + +void btMultiBodyDynamicsWorld::debugDrawWorld() +{ + BT_PROFILE("btMultiBodyDynamicsWorld debugDrawWorld"); + + bool drawConstraints = false; + if (getDebugDrawer()) + { + int mode = getDebugDrawer()->getDebugMode(); + if (mode & (btIDebugDraw::DBG_DrawConstraints | btIDebugDraw::DBG_DrawConstraintLimits)) + { + drawConstraints = true; + } + + if (drawConstraints) + { + BT_PROFILE("btMultiBody debugDrawWorld"); + + + for (int c=0;cforwardKinematics(m_scratch_world_to_local1,m_scratch_local_origin1); + + getDebugDrawer()->drawTransform(bod->getBaseWorldTransform(), 0.1); + + + for (int m = 0; mgetNumLinks(); m++) + { + + const btTransform& tr = bod->getLink(m).m_cachedWorldTransform; + + getDebugDrawer()->drawTransform(tr, 0.1); + + //draw the joint axis + if (bod->getLink(m).m_jointType==btMultibodyLink::eRevolute) + { + btVector3 vec = quatRotate(tr.getRotation(),bod->getLink(m).m_axes[0].m_topVec); + + btVector4 color(0,0,0,1);//1,1,1); + btVector3 from = vec+tr.getOrigin()-quatRotate(tr.getRotation(),bod->getLink(m).m_dVector); + btVector3 to = tr.getOrigin()-quatRotate(tr.getRotation(),bod->getLink(m).m_dVector); + getDebugDrawer()->drawLine(from,to,color); + } + if (bod->getLink(m).m_jointType==btMultibodyLink::eFixed) + { + btVector3 vec = quatRotate(tr.getRotation(),bod->getLink(m).m_axes[0].m_bottomVec); + + btVector4 color(0,0,0,1);//1,1,1); + btVector3 from = vec+tr.getOrigin()-quatRotate(tr.getRotation(),bod->getLink(m).m_dVector); + btVector3 to = tr.getOrigin()-quatRotate(tr.getRotation(),bod->getLink(m).m_dVector); + getDebugDrawer()->drawLine(from,to,color); + } + if (bod->getLink(m).m_jointType==btMultibodyLink::ePrismatic) + { + btVector3 vec = quatRotate(tr.getRotation(),bod->getLink(m).m_axes[0].m_bottomVec); + + btVector4 color(0,0,0,1);//1,1,1); + btVector3 from = vec+tr.getOrigin()-quatRotate(tr.getRotation(),bod->getLink(m).m_dVector); + btVector3 to = tr.getOrigin()-quatRotate(tr.getRotation(),bod->getLink(m).m_dVector); + getDebugDrawer()->drawLine(from,to,color); + } + + } + } + } + } + + btDiscreteDynamicsWorld::debugDrawWorld(); +} + + + +void btMultiBodyDynamicsWorld::applyGravity() +{ + btDiscreteDynamicsWorld::applyGravity(); +#ifdef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + BT_PROFILE("btMultiBody addGravity"); + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + + bool isSleeping = false; + + if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING) + { + isSleeping = true; + } + for (int b=0;bgetNumLinks();b++) + { + if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState()==ISLAND_SLEEPING) + isSleeping = true; + } + + if (!isSleeping) + { + bod->addBaseForce(m_gravity * bod->getBaseMass()); + + for (int j = 0; j < bod->getNumLinks(); ++j) + { + bod->addLinkForce(j, m_gravity * bod->getLinkMass(j)); + } + }//if (!isSleeping) + } +#endif //BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY +} + +void btMultiBodyDynamicsWorld::clearMultiBodyConstraintForces() +{ + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + bod->clearConstraintForces(); + } +} +void btMultiBodyDynamicsWorld::clearMultiBodyForces() +{ + { + BT_PROFILE("clearMultiBodyForces"); + for (int i=0;im_multiBodies.size();i++) + { + btMultiBody* bod = m_multiBodies[i]; + + bool isSleeping = false; + + if (bod->getBaseCollider() && bod->getBaseCollider()->getActivationState() == ISLAND_SLEEPING) + { + isSleeping = true; + } + for (int b=0;bgetNumLinks();b++) + { + if (bod->getLink(b).m_collider && bod->getLink(b).m_collider->getActivationState()==ISLAND_SLEEPING) + isSleeping = true; + } + + if (!isSleeping) + { + btMultiBody* bod = m_multiBodies[i]; + bod->clearForcesAndTorques(); + } + } + } + +} +void btMultiBodyDynamicsWorld::clearForces() +{ + btDiscreteDynamicsWorld::clearForces(); + +#ifdef BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + clearMultiBodyForces(); +#endif +} + + + + +void btMultiBodyDynamicsWorld::serialize(btSerializer* serializer) +{ + + serializer->startSerialization(); + + serializeDynamicsWorldInfo( serializer); + + serializeMultiBodies(serializer); + + serializeRigidBodies(serializer); + + serializeCollisionObjects(serializer); + + serializer->finishSerialization(); +} + +void btMultiBodyDynamicsWorld::serializeMultiBodies(btSerializer* serializer) +{ + int i; + //serialize all collision objects + for (i=0;icalculateSerializeBufferSize(); + btChunk* chunk = serializer->allocate(len,1); + const char* structType = mb->serialize(chunk->m_oldPtr, serializer); + serializer->finalizeChunk(chunk,structType,BT_MULTIBODY_CODE,mb); + } + } + +} \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h new file mode 100644 index 000000000..2c912da5c --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h @@ -0,0 +1,109 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_MULTIBODY_DYNAMICS_WORLD_H +#define BT_MULTIBODY_DYNAMICS_WORLD_H + +#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" + +#define BT_USE_VIRTUAL_CLEARFORCES_AND_GRAVITY + +class btMultiBody; +class btMultiBodyConstraint; +class btMultiBodyConstraintSolver; +struct MultiBodyInplaceSolverIslandCallback; + +///The btMultiBodyDynamicsWorld adds Featherstone multi body dynamics to Bullet +///This implementation is still preliminary/experimental. +class btMultiBodyDynamicsWorld : public btDiscreteDynamicsWorld +{ +protected: + btAlignedObjectArray m_multiBodies; + btAlignedObjectArray m_multiBodyConstraints; + btAlignedObjectArray m_sortedMultiBodyConstraints; + btMultiBodyConstraintSolver* m_multiBodyConstraintSolver; + MultiBodyInplaceSolverIslandCallback* m_solverMultiBodyIslandCallback; + + //cached data to avoid memory allocations + btAlignedObjectArray m_scratch_world_to_local; + btAlignedObjectArray m_scratch_local_origin; + btAlignedObjectArray m_scratch_world_to_local1; + btAlignedObjectArray m_scratch_local_origin1; + btAlignedObjectArray m_scratch_r; + btAlignedObjectArray m_scratch_v; + btAlignedObjectArray m_scratch_m; + + + virtual void calculateSimulationIslands(); + virtual void updateActivationState(btScalar timeStep); + virtual void solveConstraints(btContactSolverInfo& solverInfo); + + virtual void serializeMultiBodies(btSerializer* serializer); + +public: + + btMultiBodyDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btMultiBodyConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration); + + virtual ~btMultiBodyDynamicsWorld (); + + virtual void addMultiBody(btMultiBody* body, short group= btBroadphaseProxy::DefaultFilter, short mask=btBroadphaseProxy::AllFilter); + + virtual void removeMultiBody(btMultiBody* body); + + virtual int getNumMultibodies() const + { + return m_multiBodies.size(); + } + + btMultiBody* getMultiBody(int mbIndex) + { + return m_multiBodies[mbIndex]; + } + + virtual void addMultiBodyConstraint( btMultiBodyConstraint* constraint); + + virtual int getNumMultiBodyConstraints() const + { + return m_multiBodyConstraints.size(); + } + + virtual btMultiBodyConstraint* getMultiBodyConstraint( int constraintIndex) + { + return m_multiBodyConstraints[constraintIndex]; + } + + virtual const btMultiBodyConstraint* getMultiBodyConstraint( int constraintIndex) const + { + return m_multiBodyConstraints[constraintIndex]; + } + + virtual void removeMultiBodyConstraint( btMultiBodyConstraint* constraint); + + virtual void integrateTransforms(btScalar timeStep); + + virtual void debugDrawWorld(); + + virtual void debugDrawMultiBodyConstraint(btMultiBodyConstraint* constraint); + + void forwardKinematics(); + virtual void clearForces(); + virtual void clearMultiBodyConstraintForces(); + virtual void clearMultiBodyForces(); + virtual void applyGravity(); + + virtual void serialize(btSerializer* serializer); + +}; +#endif //BT_MULTIBODY_DYNAMICS_WORLD_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp new file mode 100644 index 000000000..6ca5b8b0d --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp @@ -0,0 +1,211 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#include "btMultiBodyFixedConstraint.h" +#include "btMultiBodyLinkCollider.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h" +#include "LinearMath/btIDebugDraw.h" + +#define BTMBFIXEDCONSTRAINT_DIM 6 + +btMultiBodyFixedConstraint::btMultiBodyFixedConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB) + :btMultiBodyConstraint(body,0,link,-1,BTMBFIXEDCONSTRAINT_DIM,false), + m_rigidBodyA(0), + m_rigidBodyB(bodyB), + m_pivotInA(pivotInA), + m_pivotInB(pivotInB), + m_frameInA(frameInA), + m_frameInB(frameInB) +{ + m_data.resize(BTMBFIXEDCONSTRAINT_DIM);//at least store the applied impulses +} + +btMultiBodyFixedConstraint::btMultiBodyFixedConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB) + :btMultiBodyConstraint(bodyA,bodyB,linkA,linkB,BTMBFIXEDCONSTRAINT_DIM,false), + m_rigidBodyA(0), + m_rigidBodyB(0), + m_pivotInA(pivotInA), + m_pivotInB(pivotInB), + m_frameInA(frameInA), + m_frameInB(frameInB) +{ + m_data.resize(BTMBFIXEDCONSTRAINT_DIM);//at least store the applied impulses +} + +void btMultiBodyFixedConstraint::finalizeMultiDof() +{ + //not implemented yet + btAssert(0); +} + +btMultiBodyFixedConstraint::~btMultiBodyFixedConstraint() +{ +} + + +int btMultiBodyFixedConstraint::getIslandIdA() const +{ + if (m_rigidBodyA) + return m_rigidBodyA->getIslandTag(); + + if (m_bodyA) + { + btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider(); + if (col) + return col->getIslandTag(); + for (int i=0;igetNumLinks();i++) + { + if (m_bodyA->getLink(i).m_collider) + return m_bodyA->getLink(i).m_collider->getIslandTag(); + } + } + return -1; +} + +int btMultiBodyFixedConstraint::getIslandIdB() const +{ + if (m_rigidBodyB) + return m_rigidBodyB->getIslandTag(); + if (m_bodyB) + { + btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider(); + if (col) + return col->getIslandTag(); + + for (int i=0;igetNumLinks();i++) + { + col = m_bodyB->getLink(i).m_collider; + if (col) + return col->getIslandTag(); + } + } + return -1; +} + +void btMultiBodyFixedConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows, btMultiBodyJacobianData& data, const btContactSolverInfo& infoGlobal) +{ + int numDim = BTMBFIXEDCONSTRAINT_DIM; + for (int i=0;igetCompanionId(); + pivotAworld = m_rigidBodyA->getCenterOfMassTransform()*m_pivotInA; + frameAworld = frameAworld.transpose()*btMatrix3x3(m_rigidBodyA->getOrientation()); + + } else + { + if (m_bodyA) { + pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA); + frameAworld = m_bodyA->localFrameToWorld(m_linkA, frameAworld); + } + } + btVector3 pivotBworld = m_pivotInB; + btMatrix3x3 frameBworld = m_frameInB; + if (m_rigidBodyB) + { + constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId(); + pivotBworld = m_rigidBodyB->getCenterOfMassTransform()*m_pivotInB; + frameBworld = frameBworld.transpose()*btMatrix3x3(m_rigidBodyB->getOrientation()); + + } else + { + if (m_bodyB) { + pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB); + frameBworld = m_bodyB->localFrameToWorld(m_linkB, frameBworld); + } + } + + btMatrix3x3 relRot = frameAworld.inverse()*frameBworld; + btVector3 angleDiff; + btGeneric6DofSpring2Constraint::matrixToEulerXYZ(relRot,angleDiff); + + btVector3 constraintNormalLin(0,0,0); + btVector3 constraintNormalAng(0,0,0); + btScalar posError = 0.0; + if (i < 3) { + constraintNormalLin[i] = -1; + posError = (pivotAworld-pivotBworld).dot(constraintNormalLin); + fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng, + constraintNormalLin, pivotAworld, pivotBworld, + posError, + infoGlobal, + -m_maxAppliedImpulse, m_maxAppliedImpulse + ); + } + else { //i>=3 + constraintNormalAng = frameAworld.getColumn(i%3); + posError = angleDiff[i%3]; + fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng, + constraintNormalLin, pivotAworld, pivotBworld, + posError, + infoGlobal, + -m_maxAppliedImpulse, m_maxAppliedImpulse, true + ); + } + } +} + +void btMultiBodyFixedConstraint::debugDraw(class btIDebugDraw* drawer) +{ + btTransform tr; + tr.setIdentity(); + + if (m_rigidBodyA) + { + btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA; + tr.setOrigin(pivot); + drawer->drawTransform(tr, 0.1); + } + if (m_bodyA) + { + btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA); + tr.setOrigin(pivotAworld); + drawer->drawTransform(tr, 0.1); + } + if (m_rigidBodyB) + { + // that ideally should draw the same frame + btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB; + tr.setOrigin(pivot); + drawer->drawTransform(tr, 0.1); + } + if (m_bodyB) + { + btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB); + tr.setOrigin(pivotBworld); + drawer->drawTransform(tr, 0.1); + } +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h new file mode 100644 index 000000000..26e28a74e --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h @@ -0,0 +1,94 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#ifndef BT_MULTIBODY_FIXED_CONSTRAINT_H +#define BT_MULTIBODY_FIXED_CONSTRAINT_H + +#include "btMultiBodyConstraint.h" + +class btMultiBodyFixedConstraint : public btMultiBodyConstraint +{ +protected: + + btRigidBody* m_rigidBodyA; + btRigidBody* m_rigidBodyB; + btVector3 m_pivotInA; + btVector3 m_pivotInB; + btMatrix3x3 m_frameInA; + btMatrix3x3 m_frameInB; + +public: + + btMultiBodyFixedConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB); + btMultiBodyFixedConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB); + + virtual ~btMultiBodyFixedConstraint(); + + virtual void finalizeMultiDof(); + + virtual int getIslandIdA() const; + virtual int getIslandIdB() const; + + virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal); + + const btVector3& getPivotInA() const + { + return m_pivotInA; + } + + void setPivotInA(const btVector3& pivotInA) + { + m_pivotInA = pivotInA; + } + + const btVector3& getPivotInB() const + { + return m_pivotInB; + } + + void setPivotInB(const btVector3& pivotInB) + { + m_pivotInB = pivotInB; + } + + const btMatrix3x3& getFrameInA() const + { + return m_frameInA; + } + + void setFrameInA(const btMatrix3x3& frameInA) + { + m_frameInA = frameInA; + } + + const btMatrix3x3& getFrameInB() const + { + return m_frameInB; + } + + void setFrameInB(const btMatrix3x3& frameInB) + { + m_frameInB = frameInB; + } + + virtual void debugDraw(class btIDebugDraw* drawer); + +}; + +#endif //BT_MULTIBODY_FIXED_CONSTRAINT_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btThreadSupportInterface.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h similarity index 75% rename from Engine/lib/bullet/src/BulletMultiThreaded/btThreadSupportInterface.cpp rename to Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h index 8192aa468..5c2fa8ed5 100644 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btThreadSupportInterface.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h @@ -1,6 +1,5 @@ /* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com +Copyright (c) 2015 Google Inc. This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -13,10 +12,16 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "btThreadSupportInterface.h" -btThreadSupportInterface::~btThreadSupportInterface() + +#ifndef BT_MULTIBODY_JOINT_FEEDBACK_H +#define BT_MULTIBODY_JOINT_FEEDBACK_H + +#include "LinearMath/btSpatialAlgebra.h" + +struct btMultiBodyJointFeedback { + btSpatialForceVector m_reactionForces; +}; -} - +#endif //BT_MULTIBODY_JOINT_FEEDBACK_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp new file mode 100644 index 000000000..707817673 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp @@ -0,0 +1,199 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#include "btMultiBodyJointLimitConstraint.h" +#include "btMultiBody.h" +#include "btMultiBodyLinkCollider.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" + + + +btMultiBodyJointLimitConstraint::btMultiBodyJointLimitConstraint(btMultiBody* body, int link, btScalar lower, btScalar upper) + //:btMultiBodyConstraint(body,0,link,-1,2,true), + :btMultiBodyConstraint(body,body,link,body->getLink(link).m_parent,2,true), + m_lowerBound(lower), + m_upperBound(upper) +{ + +} + +void btMultiBodyJointLimitConstraint::finalizeMultiDof() +{ + // the data.m_jacobians never change, so may as well + // initialize them here + + allocateJacobiansMultiDof(); + + unsigned int offset = 6 + m_bodyA->getLink(m_linkA).m_dofOffset; + + // row 0: the lower bound + jacobianA(0)[offset] = 1; + // row 1: the upper bound + //jacobianA(1)[offset] = -1; + jacobianB(1)[offset] = -1; + + m_numDofsFinalized = m_jacSizeBoth; +} + +btMultiBodyJointLimitConstraint::~btMultiBodyJointLimitConstraint() +{ +} + +int btMultiBodyJointLimitConstraint::getIslandIdA() const +{ + if(m_bodyA) + { + btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider(); + if (col) + return col->getIslandTag(); + for (int i=0;igetNumLinks();i++) + { + if (m_bodyA->getLink(i).m_collider) + return m_bodyA->getLink(i).m_collider->getIslandTag(); + } + } + return -1; +} + +int btMultiBodyJointLimitConstraint::getIslandIdB() const +{ + if(m_bodyB) + { + btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider(); + if (col) + return col->getIslandTag(); + + for (int i=0;igetNumLinks();i++) + { + col = m_bodyB->getLink(i).m_collider; + if (col) + return col->getIslandTag(); + } + } + return -1; +} + + +void btMultiBodyJointLimitConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal) +{ + + // only positions need to be updated -- data.m_jacobians and force + // directions were set in the ctor and never change. + + if (m_numDofsFinalized != m_jacSizeBoth) + { + finalizeMultiDof(); + } + + + // row 0: the lower bound + setPosition(0, m_bodyA->getJointPos(m_linkA) - m_lowerBound); //multidof: this is joint-type dependent + + // row 1: the upper bound + setPosition(1, m_upperBound - m_bodyA->getJointPos(m_linkA)); + + for (int row=0;rowgetLink(m_linkA).m_jointType == btMultibodyLink::eRevolute)||(m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::ePrismatic)); + switch (m_bodyA->getLink(m_linkA).m_jointType) + { + case btMultibodyLink::eRevolute: + { + constraintRow.m_contactNormal1.setZero(); + constraintRow.m_contactNormal2.setZero(); + btVector3 revoluteAxisInWorld = direction*quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(),m_bodyA->getLink(m_linkA).m_axes[0].m_topVec); + constraintRow.m_relpos1CrossNormal=revoluteAxisInWorld; + constraintRow.m_relpos2CrossNormal=-revoluteAxisInWorld; + + break; + } + case btMultibodyLink::ePrismatic: + { + btVector3 prismaticAxisInWorld = direction* quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(),m_bodyA->getLink(m_linkA).m_axes[0].m_bottomVec); + constraintRow.m_contactNormal1=prismaticAxisInWorld; + constraintRow.m_contactNormal2=-prismaticAxisInWorld; + constraintRow.m_relpos1CrossNormal.setZero(); + constraintRow.m_relpos2CrossNormal.setZero(); + + break; + } + default: + { + btAssert(0); + } + }; + + } + + { + btScalar penetration = getPosition(row); + btScalar positionalError = 0.f; + btScalar velocityError = - rel_vel;// * damping; + btScalar erp = infoGlobal.m_erp2; + if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) + { + erp = infoGlobal.m_erp; + } + if (penetration>0) + { + positionalError = 0; + velocityError = -penetration / infoGlobal.m_timeStep; + } else + { + positionalError = -penetration * erp/infoGlobal.m_timeStep; + } + + btScalar penetrationImpulse = positionalError*constraintRow.m_jacDiagABInv; + btScalar velocityImpulse = velocityError *constraintRow.m_jacDiagABInv; + if (!infoGlobal.m_splitImpulse || (penetration > infoGlobal.m_splitImpulsePenetrationThreshold)) + { + //combine position and velocity into rhs + constraintRow.m_rhs = penetrationImpulse+velocityImpulse; + constraintRow.m_rhsPenetration = 0.f; + + } else + { + //split position and velocity into rhs and m_rhsPenetration + constraintRow.m_rhs = velocityImpulse; + constraintRow.m_rhsPenetration = penetrationImpulse; + } + } + } + +} + + + + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h new file mode 100644 index 000000000..55b8d122b --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h @@ -0,0 +1,50 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H +#define BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H + +#include "btMultiBodyConstraint.h" +struct btSolverInfo; + +class btMultiBodyJointLimitConstraint : public btMultiBodyConstraint +{ +protected: + + btScalar m_lowerBound; + btScalar m_upperBound; +public: + + btMultiBodyJointLimitConstraint(btMultiBody* body, int link, btScalar lower, btScalar upper); + virtual ~btMultiBodyJointLimitConstraint(); + + virtual void finalizeMultiDof(); + + virtual int getIslandIdA() const; + virtual int getIslandIdB() const; + + virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal); + + virtual void debugDraw(class btIDebugDraw* drawer) + { + //todo(erwincoumans) + } + +}; + +#endif //BT_MULTIBODY_JOINT_LIMIT_CONSTRAINT_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp new file mode 100644 index 000000000..2a88d806e --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp @@ -0,0 +1,183 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#include "btMultiBodyJointMotor.h" +#include "btMultiBody.h" +#include "btMultiBodyLinkCollider.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" + + +btMultiBodyJointMotor::btMultiBodyJointMotor(btMultiBody* body, int link, btScalar desiredVelocity, btScalar maxMotorImpulse) + :btMultiBodyConstraint(body,body,link,body->getLink(link).m_parent,1,true), + m_desiredVelocity(desiredVelocity), + m_desiredPosition(0), + m_kd(1.), + m_kp(0), + m_erp(1), + m_rhsClamp(SIMD_INFINITY) +{ + + m_maxAppliedImpulse = maxMotorImpulse; + // the data.m_jacobians never change, so may as well + // initialize them here + + +} + +void btMultiBodyJointMotor::finalizeMultiDof() +{ + allocateJacobiansMultiDof(); + // note: we rely on the fact that data.m_jacobians are + // always initialized to zero by the Constraint ctor + int linkDoF = 0; + unsigned int offset = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF); + + // row 0: the lower bound + // row 0: the lower bound + jacobianA(0)[offset] = 1; + + m_numDofsFinalized = m_jacSizeBoth; +} + +btMultiBodyJointMotor::btMultiBodyJointMotor(btMultiBody* body, int link, int linkDoF, btScalar desiredVelocity, btScalar maxMotorImpulse) + //:btMultiBodyConstraint(body,0,link,-1,1,true), + :btMultiBodyConstraint(body,body,link,body->getLink(link).m_parent,1,true), + m_desiredVelocity(desiredVelocity), + m_desiredPosition(0), + m_kd(1.), + m_kp(0), + m_erp(1), + m_rhsClamp(SIMD_INFINITY) +{ + btAssert(linkDoF < body->getLink(link).m_dofCount); + + m_maxAppliedImpulse = maxMotorImpulse; + +} +btMultiBodyJointMotor::~btMultiBodyJointMotor() +{ +} + +int btMultiBodyJointMotor::getIslandIdA() const +{ + btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider(); + if (col) + return col->getIslandTag(); + for (int i=0;igetNumLinks();i++) + { + if (m_bodyA->getLink(i).m_collider) + return m_bodyA->getLink(i).m_collider->getIslandTag(); + } + return -1; +} + +int btMultiBodyJointMotor::getIslandIdB() const +{ + btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider(); + if (col) + return col->getIslandTag(); + + for (int i=0;igetNumLinks();i++) + { + col = m_bodyB->getLink(i).m_collider; + if (col) + return col->getIslandTag(); + } + return -1; +} + + +void btMultiBodyJointMotor::createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal) +{ + // only positions need to be updated -- data.m_jacobians and force + // directions were set in the ctor and never change. + + if (m_numDofsFinalized != m_jacSizeBoth) + { + finalizeMultiDof(); + } + + //don't crash + if (m_numDofsFinalized != m_jacSizeBoth) + return; + + const btScalar posError = 0; + const btVector3 dummy(0, 0, 0); + + for (int row=0;rowgetJointPosMultiDof(m_linkA)[dof]; + btScalar currentVelocity = m_bodyA->getJointVelMultiDof(m_linkA)[dof]; + btScalar positionStabiliationTerm = m_erp*(m_desiredPosition-currentPosition)/infoGlobal.m_timeStep; + + btScalar velocityError = (m_desiredVelocity - currentVelocity); + btScalar rhs = m_kp * positionStabiliationTerm + currentVelocity+m_kd * velocityError; + if (rhs>m_rhsClamp) + { + rhs=m_rhsClamp; + } + if (rhs<-m_rhsClamp) + { + rhs=-m_rhsClamp; + } + + + fillMultiBodyConstraint(constraintRow,data,jacobianA(row),jacobianB(row),dummy,dummy,dummy,dummy,posError,infoGlobal,-m_maxAppliedImpulse,m_maxAppliedImpulse,false,1,false,rhs); + constraintRow.m_orgConstraint = this; + constraintRow.m_orgDofIndex = row; + { + //expect either prismatic or revolute joint type for now + btAssert((m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::eRevolute)||(m_bodyA->getLink(m_linkA).m_jointType == btMultibodyLink::ePrismatic)); + switch (m_bodyA->getLink(m_linkA).m_jointType) + { + case btMultibodyLink::eRevolute: + { + constraintRow.m_contactNormal1.setZero(); + constraintRow.m_contactNormal2.setZero(); + btVector3 revoluteAxisInWorld = quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(),m_bodyA->getLink(m_linkA).m_axes[0].m_topVec); + constraintRow.m_relpos1CrossNormal=revoluteAxisInWorld; + constraintRow.m_relpos2CrossNormal=-revoluteAxisInWorld; + + break; + } + case btMultibodyLink::ePrismatic: + { + btVector3 prismaticAxisInWorld = quatRotate(m_bodyA->getLink(m_linkA).m_cachedWorldTransform.getRotation(),m_bodyA->getLink(m_linkA).m_axes[0].m_bottomVec); + constraintRow.m_contactNormal1=prismaticAxisInWorld; + constraintRow.m_contactNormal2=-prismaticAxisInWorld; + constraintRow.m_relpos1CrossNormal.setZero(); + constraintRow.m_relpos2CrossNormal.setZero(); + + break; + } + default: + { + btAssert(0); + } + }; + + } + + } + +} + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h new file mode 100644 index 000000000..4063bed79 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyJointMotor.h @@ -0,0 +1,81 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#ifndef BT_MULTIBODY_JOINT_MOTOR_H +#define BT_MULTIBODY_JOINT_MOTOR_H + +#include "btMultiBodyConstraint.h" +struct btSolverInfo; + +class btMultiBodyJointMotor : public btMultiBodyConstraint +{ +protected: + + btScalar m_desiredVelocity; + btScalar m_desiredPosition; + btScalar m_kd; + btScalar m_kp; + btScalar m_erp; + btScalar m_rhsClamp;//maximum error + + +public: + + btMultiBodyJointMotor(btMultiBody* body, int link, btScalar desiredVelocity, btScalar maxMotorImpulse); + btMultiBodyJointMotor(btMultiBody* body, int link, int linkDoF, btScalar desiredVelocity, btScalar maxMotorImpulse); + virtual ~btMultiBodyJointMotor(); + virtual void finalizeMultiDof(); + + virtual int getIslandIdA() const; + virtual int getIslandIdB() const; + + virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal); + + virtual void setVelocityTarget(btScalar velTarget, btScalar kd = 1.f) + { + m_desiredVelocity = velTarget; + m_kd = kd; + } + + virtual void setPositionTarget(btScalar posTarget, btScalar kp = 1.f) + { + m_desiredPosition = posTarget; + m_kp = kp; + } + + virtual void setErp(btScalar erp) + { + m_erp = erp; + } + virtual btScalar getErp() const + { + return m_erp; + } + virtual void setRhsClamp(btScalar rhsClamp) + { + m_rhsClamp = rhsClamp; + } + virtual void debugDraw(class btIDebugDraw* drawer) + { + //todo(erwincoumans) + } +}; + +#endif //BT_MULTIBODY_JOINT_MOTOR_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyLink.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyLink.h new file mode 100644 index 000000000..a25961116 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyLink.h @@ -0,0 +1,226 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_MULTIBODY_LINK_H +#define BT_MULTIBODY_LINK_H + +#include "LinearMath/btQuaternion.h" +#include "LinearMath/btVector3.h" +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" + +enum btMultiBodyLinkFlags +{ + BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION = 1 +}; + +//both defines are now permanently enabled +#define BT_MULTIBODYLINK_INCLUDE_PLANAR_JOINTS +#define TEST_SPATIAL_ALGEBRA_LAYER + +// +// Various spatial helper functions +// + +//namespace { + + +#include "LinearMath/btSpatialAlgebra.h" + +//} + +// +// Link struct +// + +struct btMultibodyLink +{ + + BT_DECLARE_ALIGNED_ALLOCATOR(); + + btScalar m_mass; // mass of link + btVector3 m_inertiaLocal; // inertia of link (local frame; diagonal) + + int m_parent; // index of the parent link (assumed to be < index of this link), or -1 if parent is the base link. + + btQuaternion m_zeroRotParentToThis; // rotates vectors in parent-frame to vectors in local-frame (when q=0). constant. + + btVector3 m_dVector; // vector from the inboard joint pos to this link's COM. (local frame.) constant. + //this is set to zero for planar joint (see also m_eVector comment) + + // m_eVector is constant, but depends on the joint type: + // revolute, fixed, prismatic, spherical: vector from parent's COM to the pivot point, in PARENT's frame. + // planar: vector from COM of parent to COM of this link, WHEN Q = 0. (local frame.) + // todo: fix the planar so it is consistent with the other joints + + btVector3 m_eVector; + + btSpatialMotionVector m_absFrameTotVelocity, m_absFrameLocVelocity; + + enum eFeatherstoneJointType + { + eRevolute = 0, + ePrismatic = 1, + eSpherical = 2, + ePlanar = 3, + eFixed = 4, + eInvalid + }; + + + + // "axis" = spatial joint axis (Mirtich Defn 9 p104). (expressed in local frame.) constant. + // for prismatic: m_axesTop[0] = zero; + // m_axesBottom[0] = unit vector along the joint axis. + // for revolute: m_axesTop[0] = unit vector along the rotation axis (u); + // m_axesBottom[0] = u cross m_dVector (i.e. COM linear motion due to the rotation at the joint) + // + // for spherical: m_axesTop[0][1][2] (u1,u2,u3) form a 3x3 identity matrix (3 rotation axes) + // m_axesBottom[0][1][2] cross u1,u2,u3 (i.e. COM linear motion due to the rotation at the joint) + // + // for planar: m_axesTop[0] = unit vector along the rotation axis (u); defines the plane of motion + // m_axesTop[1][2] = zero + // m_axesBottom[0] = zero + // m_axesBottom[1][2] = unit vectors along the translational axes on that plane + btSpatialMotionVector m_axes[6]; + void setAxisTop(int dof, const btVector3 &axis) { m_axes[dof].m_topVec = axis; } + void setAxisBottom(int dof, const btVector3 &axis) { m_axes[dof].m_bottomVec = axis; } + void setAxisTop(int dof, const btScalar &x, const btScalar &y, const btScalar &z) { m_axes[dof].m_topVec.setValue(x, y, z); } + void setAxisBottom(int dof, const btScalar &x, const btScalar &y, const btScalar &z) { m_axes[dof].m_bottomVec.setValue(x, y, z); } + const btVector3 & getAxisTop(int dof) const { return m_axes[dof].m_topVec; } + const btVector3 & getAxisBottom(int dof) const { return m_axes[dof].m_bottomVec; } + + int m_dofOffset, m_cfgOffset; + + btQuaternion m_cachedRotParentToThis; // rotates vectors in parent frame to vectors in local frame + btVector3 m_cachedRVector; // vector from COM of parent to COM of this link, in local frame. + + btVector3 m_appliedForce; // In WORLD frame + btVector3 m_appliedTorque; // In WORLD frame + +btVector3 m_appliedConstraintForce; // In WORLD frame + btVector3 m_appliedConstraintTorque; // In WORLD frame + + btScalar m_jointPos[7]; + + //m_jointTorque is the joint torque applied by the user using 'addJointTorque'. + //It gets set to zero after each internal stepSimulation call + btScalar m_jointTorque[6]; + + class btMultiBodyLinkCollider* m_collider; + int m_flags; + + + int m_dofCount, m_posVarCount; //redundant but handy + + eFeatherstoneJointType m_jointType; + + struct btMultiBodyJointFeedback* m_jointFeedback; + + btTransform m_cachedWorldTransform;//this cache is updated when calling btMultiBody::forwardKinematics + + const char* m_linkName;//m_linkName memory needs to be managed by the developer/user! + const char* m_jointName;//m_jointName memory needs to be managed by the developer/user! + const void* m_userPtr;//m_userPtr ptr needs to be managed by the developer/user! + + btScalar m_jointDamping; //todo: implement this internally. It is unused for now, it is set by a URDF loader. User can apply manual damping. + btScalar m_jointFriction; //todo: implement this internally. It is unused for now, it is set by a URDF loader. User can apply manual friction using a velocity motor. + + // ctor: set some sensible defaults + btMultibodyLink() + : m_mass(1), + m_parent(-1), + m_zeroRotParentToThis(0, 0, 0, 1), + m_cachedRotParentToThis(0, 0, 0, 1), + m_collider(0), + m_flags(0), + m_dofCount(0), + m_posVarCount(0), + m_jointType(btMultibodyLink::eInvalid), + m_jointFeedback(0), + m_linkName(0), + m_jointName(0), + m_userPtr(0), + m_jointDamping(0), + m_jointFriction(0) + { + + m_inertiaLocal.setValue(1, 1, 1); + setAxisTop(0, 0., 0., 0.); + setAxisBottom(0, 1., 0., 0.); + m_dVector.setValue(0, 0, 0); + m_eVector.setValue(0, 0, 0); + m_cachedRVector.setValue(0, 0, 0); + m_appliedForce.setValue( 0, 0, 0); + m_appliedTorque.setValue(0, 0, 0); + // + m_jointPos[0] = m_jointPos[1] = m_jointPos[2] = m_jointPos[4] = m_jointPos[5] = m_jointPos[6] = 0.f; + m_jointPos[3] = 1.f; //"quat.w" + m_jointTorque[0] = m_jointTorque[1] = m_jointTorque[2] = m_jointTorque[3] = m_jointTorque[4] = m_jointTorque[5] = 0.f; + m_cachedWorldTransform.setIdentity(); + } + + // routine to update m_cachedRotParentToThis and m_cachedRVector + void updateCacheMultiDof(btScalar *pq = 0) + { + btScalar *pJointPos = (pq ? pq : &m_jointPos[0]); + + switch(m_jointType) + { + case eRevolute: + { + m_cachedRotParentToThis = btQuaternion(getAxisTop(0),-pJointPos[0]) * m_zeroRotParentToThis; + m_cachedRVector = m_dVector + quatRotate(m_cachedRotParentToThis,m_eVector); + + break; + } + case ePrismatic: + { + // m_cachedRotParentToThis never changes, so no need to update + m_cachedRVector = m_dVector + quatRotate(m_cachedRotParentToThis,m_eVector) + pJointPos[0] * getAxisBottom(0); + + break; + } + case eSpherical: + { + m_cachedRotParentToThis = btQuaternion(pJointPos[0], pJointPos[1], pJointPos[2], -pJointPos[3]) * m_zeroRotParentToThis; + m_cachedRVector = m_dVector + quatRotate(m_cachedRotParentToThis,m_eVector); + + break; + } + case ePlanar: + { + m_cachedRotParentToThis = btQuaternion(getAxisTop(0),-pJointPos[0]) * m_zeroRotParentToThis; + m_cachedRVector = quatRotate(btQuaternion(getAxisTop(0),-pJointPos[0]), pJointPos[1] * getAxisBottom(1) + pJointPos[2] * getAxisBottom(2)) + quatRotate(m_cachedRotParentToThis,m_eVector); + + break; + } + case eFixed: + { + m_cachedRotParentToThis = m_zeroRotParentToThis; + m_cachedRVector = m_dVector + quatRotate(m_cachedRotParentToThis,m_eVector); + + break; + } + default: + { + //invalid type + btAssert(0); + } + } + } +}; + + +#endif //BT_MULTIBODY_LINK_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h new file mode 100644 index 000000000..5080ea874 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h @@ -0,0 +1,92 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_FEATHERSTONE_LINK_COLLIDER_H +#define BT_FEATHERSTONE_LINK_COLLIDER_H + +#include "BulletCollision/CollisionDispatch/btCollisionObject.h" + +#include "btMultiBody.h" + +class btMultiBodyLinkCollider : public btCollisionObject +{ +//protected: +public: + + btMultiBody* m_multiBody; + int m_link; + + + btMultiBodyLinkCollider (btMultiBody* multiBody,int link) + :m_multiBody(multiBody), + m_link(link) + { + m_checkCollideWith = true; + //we need to remove the 'CF_STATIC_OBJECT' flag, otherwise links/base doesn't merge islands + //this means that some constraints might point to bodies that are not in the islands, causing crashes + //if (link>=0 || (multiBody && !multiBody->hasFixedBase())) + { + m_collisionFlags &= (~btCollisionObject::CF_STATIC_OBJECT); + } + // else + //{ + // m_collisionFlags |= (btCollisionObject::CF_STATIC_OBJECT); + //} + + m_internalType = CO_FEATHERSTONE_LINK; + } + static btMultiBodyLinkCollider* upcast(btCollisionObject* colObj) + { + if (colObj->getInternalType()&btCollisionObject::CO_FEATHERSTONE_LINK) + return (btMultiBodyLinkCollider*)colObj; + return 0; + } + static const btMultiBodyLinkCollider* upcast(const btCollisionObject* colObj) + { + if (colObj->getInternalType()&btCollisionObject::CO_FEATHERSTONE_LINK) + return (btMultiBodyLinkCollider*)colObj; + return 0; + } + + virtual bool checkCollideWithOverride(const btCollisionObject* co) const + { + const btMultiBodyLinkCollider* other = btMultiBodyLinkCollider::upcast(co); + if (!other) + return true; + if (other->m_multiBody != this->m_multiBody) + return true; + if (!m_multiBody->hasSelfCollision()) + return false; + + //check if 'link' has collision disabled + if (m_link>=0) + { + const btMultibodyLink& link = m_multiBody->getLink(this->m_link); + if ((link.m_flags&BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION) && link.m_parent == other->m_link) + return false; + } + + if (other->m_link>=0) + { + const btMultibodyLink& otherLink = other->m_multiBody->getLink(other->m_link); + if ((otherLink.m_flags& BT_MULTIBODYLINKFLAGS_DISABLE_PARENT_COLLISION) && otherLink.m_parent == this->m_link) + return false; + } + return true; + } +}; + +#endif //BT_FEATHERSTONE_LINK_COLLIDER_H + diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp new file mode 100644 index 000000000..125d52ad0 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp @@ -0,0 +1,221 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#include "btMultiBodyPoint2Point.h" +#include "btMultiBodyLinkCollider.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "LinearMath/btIDebugDraw.h" + +#ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST + #define BTMBP2PCONSTRAINT_DIM 3 +#else + #define BTMBP2PCONSTRAINT_DIM 6 +#endif + +btMultiBodyPoint2Point::btMultiBodyPoint2Point(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB) + :btMultiBodyConstraint(body,0,link,-1,BTMBP2PCONSTRAINT_DIM,false), + m_rigidBodyA(0), + m_rigidBodyB(bodyB), + m_pivotInA(pivotInA), + m_pivotInB(pivotInB) +{ + m_data.resize(BTMBP2PCONSTRAINT_DIM);//at least store the applied impulses +} + +btMultiBodyPoint2Point::btMultiBodyPoint2Point(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB) + :btMultiBodyConstraint(bodyA,bodyB,linkA,linkB,BTMBP2PCONSTRAINT_DIM,false), + m_rigidBodyA(0), + m_rigidBodyB(0), + m_pivotInA(pivotInA), + m_pivotInB(pivotInB) +{ + m_data.resize(BTMBP2PCONSTRAINT_DIM);//at least store the applied impulses +} + +void btMultiBodyPoint2Point::finalizeMultiDof() +{ + //not implemented yet + btAssert(0); +} + +btMultiBodyPoint2Point::~btMultiBodyPoint2Point() +{ +} + + +int btMultiBodyPoint2Point::getIslandIdA() const +{ + if (m_rigidBodyA) + return m_rigidBodyA->getIslandTag(); + + if (m_bodyA) + { + btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider(); + if (col) + return col->getIslandTag(); + for (int i=0;igetNumLinks();i++) + { + if (m_bodyA->getLink(i).m_collider) + return m_bodyA->getLink(i).m_collider->getIslandTag(); + } + } + return -1; +} + +int btMultiBodyPoint2Point::getIslandIdB() const +{ + if (m_rigidBodyB) + return m_rigidBodyB->getIslandTag(); + if (m_bodyB) + { + btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider(); + if (col) + return col->getIslandTag(); + + for (int i=0;igetNumLinks();i++) + { + col = m_bodyB->getLink(i).m_collider; + if (col) + return col->getIslandTag(); + } + } + return -1; +} + + + +void btMultiBodyPoint2Point::createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal) +{ + +// int i=1; +int numDim = BTMBP2PCONSTRAINT_DIM; + for (int i=0;igetCompanionId(); + pivotAworld = m_rigidBodyA->getCenterOfMassTransform()*m_pivotInA; + } else + { + if (m_bodyA) + pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA); + } + btVector3 pivotBworld = m_pivotInB; + if (m_rigidBodyB) + { + constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId(); + pivotBworld = m_rigidBodyB->getCenterOfMassTransform()*m_pivotInB; + } else + { + if (m_bodyB) + pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB); + + } + + btScalar posError = i < 3 ? (pivotAworld-pivotBworld).dot(contactNormalOnB) : 0; + +#ifndef BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST + + + fillMultiBodyConstraint(constraintRow, data, 0, 0, btVector3(0,0,0), + contactNormalOnB, pivotAworld, pivotBworld, //sucks but let it be this way "for the time being" + posError, + infoGlobal, + -m_maxAppliedImpulse, m_maxAppliedImpulse + ); + //@todo: support the case of btMultiBody versus btRigidBody, + //see btPoint2PointConstraint::getInfo2NonVirtual +#else + const btVector3 dummy(0, 0, 0); + + btAssert(m_bodyA->isMultiDof()); + + btScalar* jac1 = jacobianA(i); + const btVector3 &normalAng = i >= 3 ? contactNormalOnB : dummy; + const btVector3 &normalLin = i < 3 ? contactNormalOnB : dummy; + + m_bodyA->filConstraintJacobianMultiDof(m_linkA, pivotAworld, normalAng, normalLin, jac1, data.scratch_r, data.scratch_v, data.scratch_m); + + fillMultiBodyConstraint(constraintRow, data, jac1, 0, + dummy, dummy, dummy, //sucks but let it be this way "for the time being" + posError, + infoGlobal, + -m_maxAppliedImpulse, m_maxAppliedImpulse + ); +#endif + } +} + +void btMultiBodyPoint2Point::debugDraw(class btIDebugDraw* drawer) +{ + btTransform tr; + tr.setIdentity(); + + if (m_rigidBodyA) + { + btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA; + tr.setOrigin(pivot); + drawer->drawTransform(tr, 0.1); + } + if (m_bodyA) + { + btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA); + tr.setOrigin(pivotAworld); + drawer->drawTransform(tr, 0.1); + } + if (m_rigidBodyB) + { + // that ideally should draw the same frame + btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB; + tr.setOrigin(pivot); + drawer->drawTransform(tr, 0.1); + } + if (m_bodyB) + { + btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB); + tr.setOrigin(pivotBworld); + drawer->drawTransform(tr, 0.1); + } +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h new file mode 100644 index 000000000..b2e219ac1 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h @@ -0,0 +1,65 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#ifndef BT_MULTIBODY_POINT2POINT_H +#define BT_MULTIBODY_POINT2POINT_H + +#include "btMultiBodyConstraint.h" + +//#define BTMBP2PCONSTRAINT_BLOCK_ANGULAR_MOTION_TEST + +class btMultiBodyPoint2Point : public btMultiBodyConstraint +{ +protected: + + btRigidBody* m_rigidBodyA; + btRigidBody* m_rigidBodyB; + btVector3 m_pivotInA; + btVector3 m_pivotInB; + + +public: + + btMultiBodyPoint2Point(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB); + btMultiBodyPoint2Point(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB); + + virtual ~btMultiBodyPoint2Point(); + + virtual void finalizeMultiDof(); + + virtual int getIslandIdA() const; + virtual int getIslandIdB() const; + + virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal); + + const btVector3& getPivotInB() const + { + return m_pivotInB; + } + + void setPivotInB(const btVector3& pivotInB) + { + m_pivotInB = pivotInB; + } + + virtual void debugDraw(class btIDebugDraw* drawer); + +}; + +#endif //BT_MULTIBODY_POINT2POINT_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp new file mode 100644 index 000000000..3b64b8183 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp @@ -0,0 +1,230 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#include "btMultiBodySliderConstraint.h" +#include "btMultiBodyLinkCollider.h" +#include "BulletDynamics/Dynamics/btRigidBody.h" +#include "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.h" +#include "LinearMath/btIDebugDraw.h" + +#define BTMBSLIDERCONSTRAINT_DIM 5 +#define EPSILON 0.000001 + +btMultiBodySliderConstraint::btMultiBodySliderConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis) + :btMultiBodyConstraint(body,0,link,-1,BTMBSLIDERCONSTRAINT_DIM,false), + m_rigidBodyA(0), + m_rigidBodyB(bodyB), + m_pivotInA(pivotInA), + m_pivotInB(pivotInB), + m_frameInA(frameInA), + m_frameInB(frameInB), + m_jointAxis(jointAxis) +{ + m_data.resize(BTMBSLIDERCONSTRAINT_DIM);//at least store the applied impulses +} + +btMultiBodySliderConstraint::btMultiBodySliderConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis) + :btMultiBodyConstraint(bodyA,bodyB,linkA,linkB,BTMBSLIDERCONSTRAINT_DIM,false), + m_rigidBodyA(0), + m_rigidBodyB(0), + m_pivotInA(pivotInA), + m_pivotInB(pivotInB), + m_frameInA(frameInA), + m_frameInB(frameInB), + m_jointAxis(jointAxis) +{ + m_data.resize(BTMBSLIDERCONSTRAINT_DIM);//at least store the applied impulses +} + +void btMultiBodySliderConstraint::finalizeMultiDof() +{ + //not implemented yet + btAssert(0); +} + +btMultiBodySliderConstraint::~btMultiBodySliderConstraint() +{ +} + + +int btMultiBodySliderConstraint::getIslandIdA() const +{ + if (m_rigidBodyA) + return m_rigidBodyA->getIslandTag(); + + if (m_bodyA) + { + btMultiBodyLinkCollider* col = m_bodyA->getBaseCollider(); + if (col) + return col->getIslandTag(); + for (int i=0;igetNumLinks();i++) + { + if (m_bodyA->getLink(i).m_collider) + return m_bodyA->getLink(i).m_collider->getIslandTag(); + } + } + return -1; +} + +int btMultiBodySliderConstraint::getIslandIdB() const +{ + if (m_rigidBodyB) + return m_rigidBodyB->getIslandTag(); + if (m_bodyB) + { + btMultiBodyLinkCollider* col = m_bodyB->getBaseCollider(); + if (col) + return col->getIslandTag(); + + for (int i=0;igetNumLinks();i++) + { + col = m_bodyB->getLink(i).m_collider; + if (col) + return col->getIslandTag(); + } + } + return -1; +} + +void btMultiBodySliderConstraint::createConstraintRows(btMultiBodyConstraintArray& constraintRows, btMultiBodyJacobianData& data, const btContactSolverInfo& infoGlobal) +{ + // Convert local points back to world + btVector3 pivotAworld = m_pivotInA; + btMatrix3x3 frameAworld = m_frameInA; + btVector3 jointAxis = m_jointAxis; + if (m_rigidBodyA) + { + pivotAworld = m_rigidBodyA->getCenterOfMassTransform()*m_pivotInA; + frameAworld = m_frameInA.transpose()*btMatrix3x3(m_rigidBodyA->getOrientation()); + jointAxis = quatRotate(m_rigidBodyA->getOrientation(),m_jointAxis); + + } else if (m_bodyA) { + pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA); + frameAworld = m_bodyA->localFrameToWorld(m_linkA, m_frameInA); + jointAxis = m_bodyA->localDirToWorld(m_linkA, m_jointAxis); + } + btVector3 pivotBworld = m_pivotInB; + btMatrix3x3 frameBworld = m_frameInB; + if (m_rigidBodyB) + { + pivotBworld = m_rigidBodyB->getCenterOfMassTransform()*m_pivotInB; + frameBworld = m_frameInB.transpose()*btMatrix3x3(m_rigidBodyB->getOrientation()); + + } else if (m_bodyB) { + pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB); + frameBworld = m_bodyB->localFrameToWorld(m_linkB, m_frameInB); + } + + btVector3 constraintAxis[2]; + for (int i = 0; i < 3; ++i) + { + constraintAxis[0] = frameAworld.getColumn(i).cross(jointAxis); + if (constraintAxis[0].safeNorm() > EPSILON) + { + constraintAxis[0] = constraintAxis[0].normalized(); + constraintAxis[1] = jointAxis.cross(constraintAxis[0]); + constraintAxis[1] = constraintAxis[1].normalized(); + break; + } + } + + btMatrix3x3 relRot = frameAworld.inverse()*frameBworld; + btVector3 angleDiff; + btGeneric6DofSpring2Constraint::matrixToEulerXYZ(relRot,angleDiff); + + int numDim = BTMBSLIDERCONSTRAINT_DIM; + for (int i=0;igetCompanionId(); + } + if (m_rigidBodyB) + { + constraintRow.m_solverBodyIdB = m_rigidBodyB->getCompanionId(); + } + + btVector3 constraintNormalLin(0,0,0); + btVector3 constraintNormalAng(0,0,0); + btScalar posError = 0.0; + if (i < 2) { + constraintNormalLin = constraintAxis[i]; + posError = (pivotAworld-pivotBworld).dot(constraintNormalLin); + fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng, + constraintNormalLin, pivotAworld, pivotBworld, + posError, + infoGlobal, + -m_maxAppliedImpulse, m_maxAppliedImpulse + ); + } + else { //i>=2 + constraintNormalAng = frameAworld.getColumn(i%3); + posError = angleDiff[i%3]; + fillMultiBodyConstraint(constraintRow, data, 0, 0, constraintNormalAng, + constraintNormalLin, pivotAworld, pivotBworld, + posError, + infoGlobal, + -m_maxAppliedImpulse, m_maxAppliedImpulse, true + ); + } + } +} + +void btMultiBodySliderConstraint::debugDraw(class btIDebugDraw* drawer) +{ + btTransform tr; + tr.setIdentity(); + + if (m_rigidBodyA) + { + btVector3 pivot = m_rigidBodyA->getCenterOfMassTransform() * m_pivotInA; + tr.setOrigin(pivot); + drawer->drawTransform(tr, 0.1); + } + if (m_bodyA) + { + btVector3 pivotAworld = m_bodyA->localPosToWorld(m_linkA, m_pivotInA); + tr.setOrigin(pivotAworld); + drawer->drawTransform(tr, 0.1); + } + if (m_rigidBodyB) + { + // that ideally should draw the same frame + btVector3 pivot = m_rigidBodyB->getCenterOfMassTransform() * m_pivotInB; + tr.setOrigin(pivot); + drawer->drawTransform(tr, 0.1); + } + if (m_bodyB) + { + btVector3 pivotBworld = m_bodyB->localPosToWorld(m_linkB, m_pivotInB); + tr.setOrigin(pivotBworld); + drawer->drawTransform(tr, 0.1); + } +} diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h new file mode 100644 index 000000000..571dcd53b --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h @@ -0,0 +1,105 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///This file was written by Erwin Coumans + +#ifndef BT_MULTIBODY_SLIDER_CONSTRAINT_H +#define BT_MULTIBODY_SLIDER_CONSTRAINT_H + +#include "btMultiBodyConstraint.h" + +class btMultiBodySliderConstraint : public btMultiBodyConstraint +{ +protected: + + btRigidBody* m_rigidBodyA; + btRigidBody* m_rigidBodyB; + btVector3 m_pivotInA; + btVector3 m_pivotInB; + btMatrix3x3 m_frameInA; + btMatrix3x3 m_frameInB; + btVector3 m_jointAxis; + +public: + + btMultiBodySliderConstraint(btMultiBody* body, int link, btRigidBody* bodyB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis); + btMultiBodySliderConstraint(btMultiBody* bodyA, int linkA, btMultiBody* bodyB, int linkB, const btVector3& pivotInA, const btVector3& pivotInB, const btMatrix3x3& frameInA, const btMatrix3x3& frameInB, const btVector3& jointAxis); + + virtual ~btMultiBodySliderConstraint(); + + virtual void finalizeMultiDof(); + + virtual int getIslandIdA() const; + virtual int getIslandIdB() const; + + virtual void createConstraintRows(btMultiBodyConstraintArray& constraintRows, + btMultiBodyJacobianData& data, + const btContactSolverInfo& infoGlobal); + + const btVector3& getPivotInA() const + { + return m_pivotInA; + } + + void setPivotInA(const btVector3& pivotInA) + { + m_pivotInA = pivotInA; + } + + const btVector3& getPivotInB() const + { + return m_pivotInB; + } + + void setPivotInB(const btVector3& pivotInB) + { + m_pivotInB = pivotInB; + } + + const btMatrix3x3& getFrameInA() const + { + return m_frameInA; + } + + void setFrameInA(const btMatrix3x3& frameInA) + { + m_frameInA = frameInA; + } + + const btMatrix3x3& getFrameInB() const + { + return m_frameInB; + } + + void setFrameInB(const btMatrix3x3& frameInB) + { + m_frameInB = frameInB; + } + + const btVector3& getJointAxis() const + { + return m_jointAxis; + } + + void setJointAxis(const btVector3& jointAxis) + { + m_jointAxis = jointAxis; + } + + virtual void debugDraw(class btIDebugDraw* drawer); + +}; + +#endif //BT_MULTIBODY_SLIDER_CONSTRAINT_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h new file mode 100644 index 000000000..6fa1550e9 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h @@ -0,0 +1,90 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_MULTIBODY_SOLVER_CONSTRAINT_H +#define BT_MULTIBODY_SOLVER_CONSTRAINT_H + +#include "LinearMath/btVector3.h" +#include "LinearMath/btAlignedObjectArray.h" + +class btMultiBody; +class btMultiBodyConstraint; +#include "BulletDynamics/ConstraintSolver/btSolverBody.h" +#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h" + +///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints. +ATTRIBUTE_ALIGNED16 (struct) btMultiBodySolverConstraint +{ + BT_DECLARE_ALIGNED_ALLOCATOR(); + + btMultiBodySolverConstraint() : m_solverBodyIdA(-1), m_multiBodyA(0), m_linkA(-1), m_solverBodyIdB(-1), m_multiBodyB(0), m_linkB(-1),m_orgConstraint(0), m_orgDofIndex(-1) + {} + + int m_deltaVelAindex;//more generic version of m_relpos1CrossNormal/m_contactNormal1 + int m_jacAindex; + int m_deltaVelBindex; + int m_jacBindex; + + btVector3 m_relpos1CrossNormal; + btVector3 m_contactNormal1; + btVector3 m_relpos2CrossNormal; + btVector3 m_contactNormal2; //usually m_contactNormal2 == -m_contactNormal1, but not always + + + btVector3 m_angularComponentA; + btVector3 m_angularComponentB; + + mutable btSimdScalar m_appliedPushImpulse; + mutable btSimdScalar m_appliedImpulse; + + btScalar m_friction; + btScalar m_jacDiagABInv; + btScalar m_rhs; + btScalar m_cfm; + + btScalar m_lowerLimit; + btScalar m_upperLimit; + btScalar m_rhsPenetration; + union + { + void* m_originalContactPoint; + btScalar m_unusedPadding4; + }; + + int m_overrideNumSolverIterations; + int m_frictionIndex; + + int m_solverBodyIdA; + btMultiBody* m_multiBodyA; + int m_linkA; + + int m_solverBodyIdB; + btMultiBody* m_multiBodyB; + int m_linkB; + + //for writing back applied impulses + btMultiBodyConstraint* m_orgConstraint; + int m_orgDofIndex; + + enum btSolverConstraintType + { + BT_SOLVER_CONTACT_1D = 0, + BT_SOLVER_FRICTION_1D + }; +}; + +typedef btAlignedObjectArray btMultiBodyConstraintArray; + +#endif //BT_MULTIBODY_SOLVER_CONSTRAINT_H diff --git a/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp new file mode 100644 index 000000000..986f21487 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp @@ -0,0 +1,2080 @@ +/************************************************************************* +* * +* Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith. * +* All rights reserved. Email: russ@q12.org Web: www.q12.org * +* * +* This library is free software; you can redistribute it and/or * +* modify it under the terms of EITHER: * +* (1) The GNU Lesser General Public License as published by the Free * +* Software Foundation; either version 2.1 of the License, or (at * +* your option) any later version. The text of the GNU Lesser * +* General Public License is included with this library in the * +* file LICENSE.TXT. * +* (2) The BSD-style license that is included with this library in * +* the file LICENSE-BSD.TXT. * +* * +* This library 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 files * +* LICENSE.TXT and LICENSE-BSD.TXT for more details. * +* * +*************************************************************************/ + +/* + + +THE ALGORITHM +------------- + +solve A*x = b+w, with x and w subject to certain LCP conditions. +each x(i),w(i) must lie on one of the three line segments in the following +diagram. each line segment corresponds to one index set : + + w(i) + /|\ | : + | | : + | |i in N : + w>0 | |state[i]=0 : + | | : + | | : i in C + w=0 + +-----------------------+ + | : | + | : | + w<0 | : |i in N + | : |state[i]=1 + | : | + | : | + +-------|-----------|-----------|----------> x(i) + lo 0 hi + +the Dantzig algorithm proceeds as follows: + for i=1:n + * if (x(i),w(i)) is not on the line, push x(i) and w(i) positive or + negative towards the line. as this is done, the other (x(j),w(j)) + for j= 0. this makes the algorithm a bit +simpler, because the starting point for x(i),w(i) is always on the dotted +line x=0 and x will only ever increase in one direction, so it can only hit +two out of the three line segments. + + +NOTES +----- + +this is an implementation of "lcp_dantzig2_ldlt.m" and "lcp_dantzig_lohi.m". +the implementation is split into an LCP problem object (btLCP) and an LCP +driver function. most optimization occurs in the btLCP object. + +a naive implementation of the algorithm requires either a lot of data motion +or a lot of permutation-array lookup, because we are constantly re-ordering +rows and columns. to avoid this and make a more optimized algorithm, a +non-trivial data structure is used to represent the matrix A (this is +implemented in the fast version of the btLCP object). + +during execution of this algorithm, some indexes in A are clamped (set C), +some are non-clamped (set N), and some are "don't care" (where x=0). +A,x,b,w (and other problem vectors) are permuted such that the clamped +indexes are first, the unclamped indexes are next, and the don't-care +indexes are last. this permutation is recorded in the array `p'. +initially p = 0..n-1, and as the rows and columns of A,x,b,w are swapped, +the corresponding elements of p are swapped. + +because the C and N elements are grouped together in the rows of A, we can do +lots of work with a fast dot product function. if A,x,etc were not permuted +and we only had a permutation array, then those dot products would be much +slower as we would have a permutation array lookup in some inner loops. + +A is accessed through an array of row pointers, so that element (i,j) of the +permuted matrix is A[i][j]. this makes row swapping fast. for column swapping +we still have to actually move the data. + +during execution of this algorithm we maintain an L*D*L' factorization of +the clamped submatrix of A (call it `AC') which is the top left nC*nC +submatrix of A. there are two ways we could arrange the rows/columns in AC. + +(1) AC is always permuted such that L*D*L' = AC. this causes a problem +when a row/column is removed from C, because then all the rows/columns of A +between the deleted index and the end of C need to be rotated downward. +this results in a lot of data motion and slows things down. +(2) L*D*L' is actually a factorization of a *permutation* of AC (which is +itself a permutation of the underlying A). this is what we do - the +permutation is recorded in the vector C. call this permutation A[C,C]. +when a row/column is removed from C, all we have to do is swap two +rows/columns and manipulate C. + +*/ + + +#include "btDantzigLCP.h" + +#include //memcpy + +bool s_error = false; + +//*************************************************************************** +// code generation parameters + + +#define btLCP_FAST // use fast btLCP object + +// option 1 : matrix row pointers (less data copying) +#define BTROWPTRS +#define BTATYPE btScalar ** +#define BTAROW(i) (m_A[i]) + +// option 2 : no matrix row pointers (slightly faster inner loops) +//#define NOROWPTRS +//#define BTATYPE btScalar * +//#define BTAROW(i) (m_A+(i)*m_nskip) + +#define BTNUB_OPTIMIZATIONS + + + +/* solve L*X=B, with B containing 1 right hand sides. + * L is an n*n lower triangular matrix with ones on the diagonal. + * L is stored by rows and its leading dimension is lskip. + * B is an n*1 matrix that contains the right hand sides. + * B is stored by columns and its leading dimension is also lskip. + * B is overwritten with X. + * this processes blocks of 2*2. + * if this is in the factorizer source file, n must be a multiple of 2. + */ + +static void btSolveL1_1 (const btScalar *L, btScalar *B, int n, int lskip1) +{ + /* declare variables - Z matrix, p and q vectors, etc */ + btScalar Z11,m11,Z21,m21,p1,q1,p2,*ex; + const btScalar *ell; + int i,j; + /* compute all 2 x 1 blocks of X */ + for (i=0; i < n; i+=2) { + /* compute all 2 x 1 block of X, from rows i..i+2-1 */ + /* set the Z matrix to 0 */ + Z11=0; + Z21=0; + ell = L + i*lskip1; + ex = B; + /* the inner loop that computes outer products and adds them to Z */ + for (j=i-2; j >= 0; j -= 2) { + /* compute outer product and add it to the Z matrix */ + p1=ell[0]; + q1=ex[0]; + m11 = p1 * q1; + p2=ell[lskip1]; + m21 = p2 * q1; + Z11 += m11; + Z21 += m21; + /* compute outer product and add it to the Z matrix */ + p1=ell[1]; + q1=ex[1]; + m11 = p1 * q1; + p2=ell[1+lskip1]; + m21 = p2 * q1; + /* advance pointers */ + ell += 2; + ex += 2; + Z11 += m11; + Z21 += m21; + /* end of inner loop */ + } + /* compute left-over iterations */ + j += 2; + for (; j > 0; j--) { + /* compute outer product and add it to the Z matrix */ + p1=ell[0]; + q1=ex[0]; + m11 = p1 * q1; + p2=ell[lskip1]; + m21 = p2 * q1; + /* advance pointers */ + ell += 1; + ex += 1; + Z11 += m11; + Z21 += m21; + } + /* finish computing the X(i) block */ + Z11 = ex[0] - Z11; + ex[0] = Z11; + p1 = ell[lskip1]; + Z21 = ex[1] - Z21 - p1*Z11; + ex[1] = Z21; + /* end of outer loop */ + } +} + +/* solve L*X=B, with B containing 2 right hand sides. + * L is an n*n lower triangular matrix with ones on the diagonal. + * L is stored by rows and its leading dimension is lskip. + * B is an n*2 matrix that contains the right hand sides. + * B is stored by columns and its leading dimension is also lskip. + * B is overwritten with X. + * this processes blocks of 2*2. + * if this is in the factorizer source file, n must be a multiple of 2. + */ + +static void btSolveL1_2 (const btScalar *L, btScalar *B, int n, int lskip1) +{ + /* declare variables - Z matrix, p and q vectors, etc */ + btScalar Z11,m11,Z12,m12,Z21,m21,Z22,m22,p1,q1,p2,q2,*ex; + const btScalar *ell; + int i,j; + /* compute all 2 x 2 blocks of X */ + for (i=0; i < n; i+=2) { + /* compute all 2 x 2 block of X, from rows i..i+2-1 */ + /* set the Z matrix to 0 */ + Z11=0; + Z12=0; + Z21=0; + Z22=0; + ell = L + i*lskip1; + ex = B; + /* the inner loop that computes outer products and adds them to Z */ + for (j=i-2; j >= 0; j -= 2) { + /* compute outer product and add it to the Z matrix */ + p1=ell[0]; + q1=ex[0]; + m11 = p1 * q1; + q2=ex[lskip1]; + m12 = p1 * q2; + p2=ell[lskip1]; + m21 = p2 * q1; + m22 = p2 * q2; + Z11 += m11; + Z12 += m12; + Z21 += m21; + Z22 += m22; + /* compute outer product and add it to the Z matrix */ + p1=ell[1]; + q1=ex[1]; + m11 = p1 * q1; + q2=ex[1+lskip1]; + m12 = p1 * q2; + p2=ell[1+lskip1]; + m21 = p2 * q1; + m22 = p2 * q2; + /* advance pointers */ + ell += 2; + ex += 2; + Z11 += m11; + Z12 += m12; + Z21 += m21; + Z22 += m22; + /* end of inner loop */ + } + /* compute left-over iterations */ + j += 2; + for (; j > 0; j--) { + /* compute outer product and add it to the Z matrix */ + p1=ell[0]; + q1=ex[0]; + m11 = p1 * q1; + q2=ex[lskip1]; + m12 = p1 * q2; + p2=ell[lskip1]; + m21 = p2 * q1; + m22 = p2 * q2; + /* advance pointers */ + ell += 1; + ex += 1; + Z11 += m11; + Z12 += m12; + Z21 += m21; + Z22 += m22; + } + /* finish computing the X(i) block */ + Z11 = ex[0] - Z11; + ex[0] = Z11; + Z12 = ex[lskip1] - Z12; + ex[lskip1] = Z12; + p1 = ell[lskip1]; + Z21 = ex[1] - Z21 - p1*Z11; + ex[1] = Z21; + Z22 = ex[1+lskip1] - Z22 - p1*Z12; + ex[1+lskip1] = Z22; + /* end of outer loop */ + } +} + + +void btFactorLDLT (btScalar *A, btScalar *d, int n, int nskip1) +{ + int i,j; + btScalar sum,*ell,*dee,dd,p1,p2,q1,q2,Z11,m11,Z21,m21,Z22,m22; + if (n < 1) return; + + for (i=0; i<=n-2; i += 2) { + /* solve L*(D*l)=a, l is scaled elements in 2 x i block at A(i,0) */ + btSolveL1_2 (A,A+i*nskip1,i,nskip1); + /* scale the elements in a 2 x i block at A(i,0), and also */ + /* compute Z = the outer product matrix that we'll need. */ + Z11 = 0; + Z21 = 0; + Z22 = 0; + ell = A+i*nskip1; + dee = d; + for (j=i-6; j >= 0; j -= 6) { + p1 = ell[0]; + p2 = ell[nskip1]; + dd = dee[0]; + q1 = p1*dd; + q2 = p2*dd; + ell[0] = q1; + ell[nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + p1 = ell[1]; + p2 = ell[1+nskip1]; + dd = dee[1]; + q1 = p1*dd; + q2 = p2*dd; + ell[1] = q1; + ell[1+nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + p1 = ell[2]; + p2 = ell[2+nskip1]; + dd = dee[2]; + q1 = p1*dd; + q2 = p2*dd; + ell[2] = q1; + ell[2+nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + p1 = ell[3]; + p2 = ell[3+nskip1]; + dd = dee[3]; + q1 = p1*dd; + q2 = p2*dd; + ell[3] = q1; + ell[3+nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + p1 = ell[4]; + p2 = ell[4+nskip1]; + dd = dee[4]; + q1 = p1*dd; + q2 = p2*dd; + ell[4] = q1; + ell[4+nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + p1 = ell[5]; + p2 = ell[5+nskip1]; + dd = dee[5]; + q1 = p1*dd; + q2 = p2*dd; + ell[5] = q1; + ell[5+nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + ell += 6; + dee += 6; + } + /* compute left-over iterations */ + j += 6; + for (; j > 0; j--) { + p1 = ell[0]; + p2 = ell[nskip1]; + dd = dee[0]; + q1 = p1*dd; + q2 = p2*dd; + ell[0] = q1; + ell[nskip1] = q2; + m11 = p1*q1; + m21 = p2*q1; + m22 = p2*q2; + Z11 += m11; + Z21 += m21; + Z22 += m22; + ell++; + dee++; + } + /* solve for diagonal 2 x 2 block at A(i,i) */ + Z11 = ell[0] - Z11; + Z21 = ell[nskip1] - Z21; + Z22 = ell[1+nskip1] - Z22; + dee = d + i; + /* factorize 2 x 2 block Z,dee */ + /* factorize row 1 */ + dee[0] = btRecip(Z11); + /* factorize row 2 */ + sum = 0; + q1 = Z21; + q2 = q1 * dee[0]; + Z21 = q2; + sum += q1*q2; + dee[1] = btRecip(Z22 - sum); + /* done factorizing 2 x 2 block */ + ell[nskip1] = Z21; + } + /* compute the (less than 2) rows at the bottom */ + switch (n-i) { + case 0: + break; + + case 1: + btSolveL1_1 (A,A+i*nskip1,i,nskip1); + /* scale the elements in a 1 x i block at A(i,0), and also */ + /* compute Z = the outer product matrix that we'll need. */ + Z11 = 0; + ell = A+i*nskip1; + dee = d; + for (j=i-6; j >= 0; j -= 6) { + p1 = ell[0]; + dd = dee[0]; + q1 = p1*dd; + ell[0] = q1; + m11 = p1*q1; + Z11 += m11; + p1 = ell[1]; + dd = dee[1]; + q1 = p1*dd; + ell[1] = q1; + m11 = p1*q1; + Z11 += m11; + p1 = ell[2]; + dd = dee[2]; + q1 = p1*dd; + ell[2] = q1; + m11 = p1*q1; + Z11 += m11; + p1 = ell[3]; + dd = dee[3]; + q1 = p1*dd; + ell[3] = q1; + m11 = p1*q1; + Z11 += m11; + p1 = ell[4]; + dd = dee[4]; + q1 = p1*dd; + ell[4] = q1; + m11 = p1*q1; + Z11 += m11; + p1 = ell[5]; + dd = dee[5]; + q1 = p1*dd; + ell[5] = q1; + m11 = p1*q1; + Z11 += m11; + ell += 6; + dee += 6; + } + /* compute left-over iterations */ + j += 6; + for (; j > 0; j--) { + p1 = ell[0]; + dd = dee[0]; + q1 = p1*dd; + ell[0] = q1; + m11 = p1*q1; + Z11 += m11; + ell++; + dee++; + } + /* solve for diagonal 1 x 1 block at A(i,i) */ + Z11 = ell[0] - Z11; + dee = d + i; + /* factorize 1 x 1 block Z,dee */ + /* factorize row 1 */ + dee[0] = btRecip(Z11); + /* done factorizing 1 x 1 block */ + break; + + //default: *((char*)0)=0; /* this should never happen! */ + } +} + +/* solve L*X=B, with B containing 1 right hand sides. + * L is an n*n lower triangular matrix with ones on the diagonal. + * L is stored by rows and its leading dimension is lskip. + * B is an n*1 matrix that contains the right hand sides. + * B is stored by columns and its leading dimension is also lskip. + * B is overwritten with X. + * this processes blocks of 4*4. + * if this is in the factorizer source file, n must be a multiple of 4. + */ + +void btSolveL1 (const btScalar *L, btScalar *B, int n, int lskip1) +{ + /* declare variables - Z matrix, p and q vectors, etc */ + btScalar Z11,Z21,Z31,Z41,p1,q1,p2,p3,p4,*ex; + const btScalar *ell; + int lskip2,lskip3,i,j; + /* compute lskip values */ + lskip2 = 2*lskip1; + lskip3 = 3*lskip1; + /* compute all 4 x 1 blocks of X */ + for (i=0; i <= n-4; i+=4) { + /* compute all 4 x 1 block of X, from rows i..i+4-1 */ + /* set the Z matrix to 0 */ + Z11=0; + Z21=0; + Z31=0; + Z41=0; + ell = L + i*lskip1; + ex = B; + /* the inner loop that computes outer products and adds them to Z */ + for (j=i-12; j >= 0; j -= 12) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + p2=ell[lskip1]; + p3=ell[lskip2]; + p4=ell[lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[1]; + q1=ex[1]; + p2=ell[1+lskip1]; + p3=ell[1+lskip2]; + p4=ell[1+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[2]; + q1=ex[2]; + p2=ell[2+lskip1]; + p3=ell[2+lskip2]; + p4=ell[2+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[3]; + q1=ex[3]; + p2=ell[3+lskip1]; + p3=ell[3+lskip2]; + p4=ell[3+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[4]; + q1=ex[4]; + p2=ell[4+lskip1]; + p3=ell[4+lskip2]; + p4=ell[4+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[5]; + q1=ex[5]; + p2=ell[5+lskip1]; + p3=ell[5+lskip2]; + p4=ell[5+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[6]; + q1=ex[6]; + p2=ell[6+lskip1]; + p3=ell[6+lskip2]; + p4=ell[6+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[7]; + q1=ex[7]; + p2=ell[7+lskip1]; + p3=ell[7+lskip2]; + p4=ell[7+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[8]; + q1=ex[8]; + p2=ell[8+lskip1]; + p3=ell[8+lskip2]; + p4=ell[8+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[9]; + q1=ex[9]; + p2=ell[9+lskip1]; + p3=ell[9+lskip2]; + p4=ell[9+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[10]; + q1=ex[10]; + p2=ell[10+lskip1]; + p3=ell[10+lskip2]; + p4=ell[10+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* load p and q values */ + p1=ell[11]; + q1=ex[11]; + p2=ell[11+lskip1]; + p3=ell[11+lskip2]; + p4=ell[11+lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* advance pointers */ + ell += 12; + ex += 12; + /* end of inner loop */ + } + /* compute left-over iterations */ + j += 12; + for (; j > 0; j--) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + p2=ell[lskip1]; + p3=ell[lskip2]; + p4=ell[lskip3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + Z21 += p2 * q1; + Z31 += p3 * q1; + Z41 += p4 * q1; + /* advance pointers */ + ell += 1; + ex += 1; + } + /* finish computing the X(i) block */ + Z11 = ex[0] - Z11; + ex[0] = Z11; + p1 = ell[lskip1]; + Z21 = ex[1] - Z21 - p1*Z11; + ex[1] = Z21; + p1 = ell[lskip2]; + p2 = ell[1+lskip2]; + Z31 = ex[2] - Z31 - p1*Z11 - p2*Z21; + ex[2] = Z31; + p1 = ell[lskip3]; + p2 = ell[1+lskip3]; + p3 = ell[2+lskip3]; + Z41 = ex[3] - Z41 - p1*Z11 - p2*Z21 - p3*Z31; + ex[3] = Z41; + /* end of outer loop */ + } + /* compute rows at end that are not a multiple of block size */ + for (; i < n; i++) { + /* compute all 1 x 1 block of X, from rows i..i+1-1 */ + /* set the Z matrix to 0 */ + Z11=0; + ell = L + i*lskip1; + ex = B; + /* the inner loop that computes outer products and adds them to Z */ + for (j=i-12; j >= 0; j -= 12) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[1]; + q1=ex[1]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[2]; + q1=ex[2]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[3]; + q1=ex[3]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[4]; + q1=ex[4]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[5]; + q1=ex[5]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[6]; + q1=ex[6]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[7]; + q1=ex[7]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[8]; + q1=ex[8]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[9]; + q1=ex[9]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[10]; + q1=ex[10]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* load p and q values */ + p1=ell[11]; + q1=ex[11]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* advance pointers */ + ell += 12; + ex += 12; + /* end of inner loop */ + } + /* compute left-over iterations */ + j += 12; + for (; j > 0; j--) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + /* compute outer product and add it to the Z matrix */ + Z11 += p1 * q1; + /* advance pointers */ + ell += 1; + ex += 1; + } + /* finish computing the X(i) block */ + Z11 = ex[0] - Z11; + ex[0] = Z11; + } +} + +/* solve L^T * x=b, with b containing 1 right hand side. + * L is an n*n lower triangular matrix with ones on the diagonal. + * L is stored by rows and its leading dimension is lskip. + * b is an n*1 matrix that contains the right hand side. + * b is overwritten with x. + * this processes blocks of 4. + */ + +void btSolveL1T (const btScalar *L, btScalar *B, int n, int lskip1) +{ + /* declare variables - Z matrix, p and q vectors, etc */ + btScalar Z11,m11,Z21,m21,Z31,m31,Z41,m41,p1,q1,p2,p3,p4,*ex; + const btScalar *ell; + int lskip2,i,j; +// int lskip3; + /* special handling for L and B because we're solving L1 *transpose* */ + L = L + (n-1)*(lskip1+1); + B = B + n-1; + lskip1 = -lskip1; + /* compute lskip values */ + lskip2 = 2*lskip1; + //lskip3 = 3*lskip1; + /* compute all 4 x 1 blocks of X */ + for (i=0; i <= n-4; i+=4) { + /* compute all 4 x 1 block of X, from rows i..i+4-1 */ + /* set the Z matrix to 0 */ + Z11=0; + Z21=0; + Z31=0; + Z41=0; + ell = L - i; + ex = B; + /* the inner loop that computes outer products and adds them to Z */ + for (j=i-4; j >= 0; j -= 4) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + p2=ell[-1]; + p3=ell[-2]; + p4=ell[-3]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + m21 = p2 * q1; + m31 = p3 * q1; + m41 = p4 * q1; + ell += lskip1; + Z11 += m11; + Z21 += m21; + Z31 += m31; + Z41 += m41; + /* load p and q values */ + p1=ell[0]; + q1=ex[-1]; + p2=ell[-1]; + p3=ell[-2]; + p4=ell[-3]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + m21 = p2 * q1; + m31 = p3 * q1; + m41 = p4 * q1; + ell += lskip1; + Z11 += m11; + Z21 += m21; + Z31 += m31; + Z41 += m41; + /* load p and q values */ + p1=ell[0]; + q1=ex[-2]; + p2=ell[-1]; + p3=ell[-2]; + p4=ell[-3]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + m21 = p2 * q1; + m31 = p3 * q1; + m41 = p4 * q1; + ell += lskip1; + Z11 += m11; + Z21 += m21; + Z31 += m31; + Z41 += m41; + /* load p and q values */ + p1=ell[0]; + q1=ex[-3]; + p2=ell[-1]; + p3=ell[-2]; + p4=ell[-3]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + m21 = p2 * q1; + m31 = p3 * q1; + m41 = p4 * q1; + ell += lskip1; + ex -= 4; + Z11 += m11; + Z21 += m21; + Z31 += m31; + Z41 += m41; + /* end of inner loop */ + } + /* compute left-over iterations */ + j += 4; + for (; j > 0; j--) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + p2=ell[-1]; + p3=ell[-2]; + p4=ell[-3]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + m21 = p2 * q1; + m31 = p3 * q1; + m41 = p4 * q1; + ell += lskip1; + ex -= 1; + Z11 += m11; + Z21 += m21; + Z31 += m31; + Z41 += m41; + } + /* finish computing the X(i) block */ + Z11 = ex[0] - Z11; + ex[0] = Z11; + p1 = ell[-1]; + Z21 = ex[-1] - Z21 - p1*Z11; + ex[-1] = Z21; + p1 = ell[-2]; + p2 = ell[-2+lskip1]; + Z31 = ex[-2] - Z31 - p1*Z11 - p2*Z21; + ex[-2] = Z31; + p1 = ell[-3]; + p2 = ell[-3+lskip1]; + p3 = ell[-3+lskip2]; + Z41 = ex[-3] - Z41 - p1*Z11 - p2*Z21 - p3*Z31; + ex[-3] = Z41; + /* end of outer loop */ + } + /* compute rows at end that are not a multiple of block size */ + for (; i < n; i++) { + /* compute all 1 x 1 block of X, from rows i..i+1-1 */ + /* set the Z matrix to 0 */ + Z11=0; + ell = L - i; + ex = B; + /* the inner loop that computes outer products and adds them to Z */ + for (j=i-4; j >= 0; j -= 4) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + ell += lskip1; + Z11 += m11; + /* load p and q values */ + p1=ell[0]; + q1=ex[-1]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + ell += lskip1; + Z11 += m11; + /* load p and q values */ + p1=ell[0]; + q1=ex[-2]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + ell += lskip1; + Z11 += m11; + /* load p and q values */ + p1=ell[0]; + q1=ex[-3]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + ell += lskip1; + ex -= 4; + Z11 += m11; + /* end of inner loop */ + } + /* compute left-over iterations */ + j += 4; + for (; j > 0; j--) { + /* load p and q values */ + p1=ell[0]; + q1=ex[0]; + /* compute outer product and add it to the Z matrix */ + m11 = p1 * q1; + ell += lskip1; + ex -= 1; + Z11 += m11; + } + /* finish computing the X(i) block */ + Z11 = ex[0] - Z11; + ex[0] = Z11; + } +} + + + +void btVectorScale (btScalar *a, const btScalar *d, int n) +{ + btAssert (a && d && n >= 0); + for (int i=0; i 0 && nskip >= n); + btSolveL1 (L,b,n,nskip); + btVectorScale (b,d,n); + btSolveL1T (L,b,n,nskip); +} + + + +//*************************************************************************** + +// swap row/column i1 with i2 in the n*n matrix A. the leading dimension of +// A is nskip. this only references and swaps the lower triangle. +// if `do_fast_row_swaps' is nonzero and row pointers are being used, then +// rows will be swapped by exchanging row pointers. otherwise the data will +// be copied. + +static void btSwapRowsAndCols (BTATYPE A, int n, int i1, int i2, int nskip, + int do_fast_row_swaps) +{ + btAssert (A && n > 0 && i1 >= 0 && i2 >= 0 && i1 < n && i2 < n && + nskip >= n && i1 < i2); + +# ifdef BTROWPTRS + btScalar *A_i1 = A[i1]; + btScalar *A_i2 = A[i2]; + for (int i=i1+1; i0 && i1 >=0 && i2 >= 0 && i1 < n && i2 < n && nskip >= n && i1 <= i2); + if (i1==i2) return; + + btSwapRowsAndCols (A,n,i1,i2,nskip,do_fast_row_swaps); + + tmpr = x[i1]; + x[i1] = x[i2]; + x[i2] = tmpr; + + tmpr = b[i1]; + b[i1] = b[i2]; + b[i2] = tmpr; + + tmpr = w[i1]; + w[i1] = w[i2]; + w[i2] = tmpr; + + tmpr = lo[i1]; + lo[i1] = lo[i2]; + lo[i2] = tmpr; + + tmpr = hi[i1]; + hi[i1] = hi[i2]; + hi[i2] = tmpr; + + tmpi = p[i1]; + p[i1] = p[i2]; + p[i2] = tmpi; + + tmpb = state[i1]; + state[i1] = state[i2]; + state[i2] = tmpb; + + if (findex) { + tmpi = findex[i1]; + findex[i1] = findex[i2]; + findex[i2] = tmpi; + } +} + + + + +//*************************************************************************** +// btLCP manipulator object. this represents an n*n LCP problem. +// +// two index sets C and N are kept. each set holds a subset of +// the variable indexes 0..n-1. an index can only be in one set. +// initially both sets are empty. +// +// the index set C is special: solutions to A(C,C)\A(C,i) can be generated. + +//*************************************************************************** +// fast implementation of btLCP. see the above definition of btLCP for +// interface comments. +// +// `p' records the permutation of A,x,b,w,etc. p is initially 1:n and is +// permuted as the other vectors/matrices are permuted. +// +// A,x,b,w,lo,hi,state,findex,p,c are permuted such that sets C,N have +// contiguous indexes. the don't-care indexes follow N. +// +// an L*D*L' factorization is maintained of A(C,C), and whenever indexes are +// added or removed from the set C the factorization is updated. +// thus L*D*L'=A[C,C], i.e. a permuted top left nC*nC submatrix of A. +// the leading dimension of the matrix L is always `nskip'. +// +// at the start there may be other indexes that are unbounded but are not +// included in `nub'. btLCP will permute the matrix so that absolutely all +// unbounded vectors are at the start. thus there may be some initial +// permutation. +// +// the algorithms here assume certain patterns, particularly with respect to +// index transfer. + +#ifdef btLCP_FAST + +struct btLCP +{ + const int m_n; + const int m_nskip; + int m_nub; + int m_nC, m_nN; // size of each index set + BTATYPE const m_A; // A rows + btScalar *const m_x, * const m_b, *const m_w, *const m_lo,* const m_hi; // permuted LCP problem data + btScalar *const m_L, *const m_d; // L*D*L' factorization of set C + btScalar *const m_Dell, *const m_ell, *const m_tmp; + bool *const m_state; + int *const m_findex, *const m_p, *const m_C; + + btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w, + btScalar *_lo, btScalar *_hi, btScalar *l, btScalar *_d, + btScalar *_Dell, btScalar *_ell, btScalar *_tmp, + bool *_state, int *_findex, int *p, int *c, btScalar **Arows); + int getNub() const { return m_nub; } + void transfer_i_to_C (int i); + void transfer_i_to_N (int i) { m_nN++; } // because we can assume C and N span 1:i-1 + void transfer_i_from_N_to_C (int i); + void transfer_i_from_C_to_N (int i, btAlignedObjectArray& scratch); + int numC() const { return m_nC; } + int numN() const { return m_nN; } + int indexC (int i) const { return i; } + int indexN (int i) const { return i+m_nC; } + btScalar Aii (int i) const { return BTAROW(i)[i]; } + btScalar AiC_times_qC (int i, btScalar *q) const { return btLargeDot (BTAROW(i), q, m_nC); } + btScalar AiN_times_qN (int i, btScalar *q) const { return btLargeDot (BTAROW(i)+m_nC, q+m_nC, m_nN); } + void pN_equals_ANC_times_qC (btScalar *p, btScalar *q); + void pN_plusequals_ANi (btScalar *p, int i, int sign=1); + void pC_plusequals_s_times_qC (btScalar *p, btScalar s, btScalar *q); + void pN_plusequals_s_times_qN (btScalar *p, btScalar s, btScalar *q); + void solve1 (btScalar *a, int i, int dir=1, int only_transfer=0); + void unpermute(); +}; + + +btLCP::btLCP (int _n, int _nskip, int _nub, btScalar *_Adata, btScalar *_x, btScalar *_b, btScalar *_w, + btScalar *_lo, btScalar *_hi, btScalar *l, btScalar *_d, + btScalar *_Dell, btScalar *_ell, btScalar *_tmp, + bool *_state, int *_findex, int *p, int *c, btScalar **Arows): + m_n(_n), m_nskip(_nskip), m_nub(_nub), m_nC(0), m_nN(0), +# ifdef BTROWPTRS + m_A(Arows), +#else + m_A(_Adata), +#endif + m_x(_x), m_b(_b), m_w(_w), m_lo(_lo), m_hi(_hi), + m_L(l), m_d(_d), m_Dell(_Dell), m_ell(_ell), m_tmp(_tmp), + m_state(_state), m_findex(_findex), m_p(p), m_C(c) +{ + { + btSetZero (m_x,m_n); + } + + { +# ifdef BTROWPTRS + // make matrix row pointers + btScalar *aptr = _Adata; + BTATYPE A = m_A; + const int n = m_n, nskip = m_nskip; + for (int k=0; k nub + { + const int n = m_n; + const int nub = m_nub; + if (nub < n) { + for (int k=0; k<100; k++) { + int i1,i2; + do { + i1 = dRandInt(n-nub)+nub; + i2 = dRandInt(n-nub)+nub; + } + while (i1 > i2); + //printf ("--> %d %d\n",i1,i2); + btSwapProblem (m_A,m_x,m_b,m_w,m_lo,m_hi,m_p,m_state,m_findex,n,i1,i2,m_nskip,0); + } + } + */ + + // permute the problem so that *all* the unbounded variables are at the + // start, i.e. look for unbounded variables not included in `nub'. we can + // potentially push up `nub' this way and get a bigger initial factorization. + // note that when we swap rows/cols here we must not just swap row pointers, + // as the initial factorization relies on the data being all in one chunk. + // variables that have findex >= 0 are *not* considered to be unbounded even + // if lo=-inf and hi=inf - this is because these limits may change during the + // solution process. + + { + int *findex = m_findex; + btScalar *lo = m_lo, *hi = m_hi; + const int n = m_n; + for (int k = m_nub; k= 0) continue; + if (lo[k]==-BT_INFINITY && hi[k]==BT_INFINITY) { + btSwapProblem (m_A,m_x,m_b,m_w,lo,hi,m_p,m_state,findex,n,m_nub,k,m_nskip,0); + m_nub++; + } + } + } + + // if there are unbounded variables at the start, factorize A up to that + // point and solve for x. this puts all indexes 0..nub-1 into C. + if (m_nub > 0) { + const int nub = m_nub; + { + btScalar *Lrow = m_L; + const int nskip = m_nskip; + for (int j=0; j nub such that all findex variables are at the end + if (m_findex) { + const int nub = m_nub; + int *findex = m_findex; + int num_at_end = 0; + for (int k=m_n-1; k >= nub; k--) { + if (findex[k] >= 0) { + btSwapProblem (m_A,m_x,m_b,m_w,m_lo,m_hi,m_p,m_state,findex,m_n,k,m_n-1-num_at_end,m_nskip,1); + num_at_end++; + } + } + } + + // print info about indexes + /* + { + const int n = m_n; + const int nub = m_nub; + for (int k=0; k 0) { + // ell,Dell were computed by solve1(). note, ell = D \ L1solve (L,A(i,C)) + { + const int nC = m_nC; + btScalar *const Ltgt = m_L + nC*m_nskip, *ell = m_ell; + for (int j=0; j 0) { + { + btScalar *const aptr = BTAROW(i); + btScalar *Dell = m_Dell; + const int *C = m_C; +# ifdef BTNUB_OPTIMIZATIONS + // if nub>0, initial part of aptr unpermuted + const int nub = m_nub; + int j=0; + for ( ; j 0 && nskip >= n && r >= 0 && r < n); + if (r >= n-1) return; + if (r > 0) { + { + const size_t move_size = (n-r-1)*sizeof(btScalar); + btScalar *Adst = A + r; + for (int i=0; i& scratch) +{ + btAssert (L && d && a && n > 0 && nskip >= n); + + if (n < 2) return; + scratch.resize(2*nskip); + btScalar *W1 = &scratch[0]; + + btScalar *W2 = W1 + nskip; + + W1[0] = btScalar(0.0); + W2[0] = btScalar(0.0); + for (int j=1; j j) ? _BTGETA(i,j) : _BTGETA(j,i)) + +inline size_t btEstimateLDLTAddTLTmpbufSize(int nskip) +{ + return nskip * 2 * sizeof(btScalar); +} + + +void btLDLTRemove (btScalar **A, const int *p, btScalar *L, btScalar *d, + int n1, int n2, int r, int nskip, btAlignedObjectArray& scratch) +{ + btAssert(A && p && L && d && n1 > 0 && n2 > 0 && r >= 0 && r < n2 && + n1 >= n2 && nskip >= n1); + #ifdef BT_DEBUG + for (int i=0; i= 0 && p[i] < n1); + #endif + + if (r==n2-1) { + return; // deleting last row/col is easy + } + else { + size_t LDLTAddTL_size = btEstimateLDLTAddTLTmpbufSize(nskip); + btAssert(LDLTAddTL_size % sizeof(btScalar) == 0); + scratch.resize(nskip * 2+n2); + btScalar *tmp = &scratch[0]; + if (r==0) { + btScalar *a = (btScalar *)((char *)tmp + LDLTAddTL_size); + const int p_0 = p[0]; + for (int i=0; i& scratch) +{ + { + int *C = m_C; + // remove a row/column from the factorization, and adjust the + // indexes (black magic!) + int last_idx = -1; + const int nC = m_nC; + int j = 0; + for ( ; j 0) { + const int nN = m_nN; + for (int j=0; j 0) { + { + btScalar *Dell = m_Dell; + int *C = m_C; + btScalar *aptr = BTAROW(i); +# ifdef BTNUB_OPTIMIZATIONS + // if nub>0, initial part of aptr[] is guaranteed unpermuted + const int nub = m_nub; + int j=0; + for ( ; j 0) { + int *C = m_C; + btScalar *tmp = m_tmp; + const int nC = m_nC; + for (int j=0; j0 && A && x && b && lo && hi && nub >= 0 && nub <= n); + btAssert(outer_w); + +#ifdef BT_DEBUG + { + // check restrictions on lo and hi + for (int k=0; k= 0); + } +# endif + + + // if all the variables are unbounded then we can just factor, solve, + // and return + if (nub >= n) + { + + + int nskip = (n); + btFactorLDLT (A, outer_w, n, nskip); + btSolveLDLT (A, outer_w, b, n, nskip); + memcpy (x, b, n*sizeof(btScalar)); + + return !s_error; + } + + const int nskip = (n); + scratchMem.L.resize(n*nskip); + + scratchMem.d.resize(n); + + btScalar *w = outer_w; + scratchMem.delta_w.resize(n); + scratchMem.delta_x.resize(n); + scratchMem.Dell.resize(n); + scratchMem.ell.resize(n); + scratchMem.Arows.resize(n); + scratchMem.p.resize(n); + scratchMem.C.resize(n); + + // for i in N, state[i] is 0 if x(i)==lo(i) or 1 if x(i)==hi(i) + scratchMem.state.resize(n); + + + // create LCP object. note that tmp is set to delta_w to save space, this + // optimization relies on knowledge of how tmp is used, so be careful! + btLCP lcp(n,nskip,nub,A,x,b,w,lo,hi,&scratchMem.L[0],&scratchMem.d[0],&scratchMem.Dell[0],&scratchMem.ell[0],&scratchMem.delta_w[0],&scratchMem.state[0],findex,&scratchMem.p[0],&scratchMem.C[0],&scratchMem.Arows[0]); + int adj_nub = lcp.getNub(); + + // loop over all indexes adj_nub..n-1. for index i, if x(i),w(i) satisfy the + // LCP conditions then i is added to the appropriate index set. otherwise + // x(i),w(i) is driven either +ve or -ve to force it to the valid region. + // as we drive x(i), x(C) is also adjusted to keep w(C) at zero. + // while driving x(i) we maintain the LCP conditions on the other variables + // 0..i-1. we do this by watching out for other x(i),w(i) values going + // outside the valid region, and then switching them between index sets + // when that happens. + + bool hit_first_friction_index = false; + for (int i=adj_nub; i= 0) { + // un-permute x into delta_w, which is not being used at the moment + for (int j=0; j= 0) { + lcp.transfer_i_to_N (i); + scratchMem.state[i] = false; + } + else if (hi[i]==0 && w[i] <= 0) { + lcp.transfer_i_to_N (i); + scratchMem.state[i] = true; + } + else if (w[i]==0) { + // this is a degenerate case. by the time we get to this test we know + // that lo != 0, which means that lo < 0 as lo is not allowed to be +ve, + // and similarly that hi > 0. this means that the line segment + // corresponding to set C is at least finite in extent, and we are on it. + // NOTE: we must call lcp.solve1() before lcp.transfer_i_to_C() + lcp.solve1 (&scratchMem.delta_x[0],i,0,1); + + lcp.transfer_i_to_C (i); + } + else { + // we must push x(i) and w(i) + for (;;) { + int dir; + btScalar dirf; + // find direction to push on x(i) + if (w[i] <= 0) { + dir = 1; + dirf = btScalar(1.0); + } + else { + dir = -1; + dirf = btScalar(-1.0); + } + + // compute: delta_x(C) = -dir*A(C,C)\A(C,i) + lcp.solve1 (&scratchMem.delta_x[0],i,dir); + + // note that delta_x[i] = dirf, but we wont bother to set it + + // compute: delta_w = A*delta_x ... note we only care about + // delta_w(N) and delta_w(i), the rest is ignored + lcp.pN_equals_ANC_times_qC (&scratchMem.delta_w[0],&scratchMem.delta_x[0]); + lcp.pN_plusequals_ANi (&scratchMem.delta_w[0],i,dir); + scratchMem.delta_w[i] = lcp.AiC_times_qC (i,&scratchMem.delta_x[0]) + lcp.Aii(i)*dirf; + + // find largest step we can take (size=s), either to drive x(i),w(i) + // to the valid LCP region or to drive an already-valid variable + // outside the valid region. + + int cmd = 1; // index switching command + int si = 0; // si = index to switch if cmd>3 + btScalar s = -w[i]/scratchMem.delta_w[i]; + if (dir > 0) { + if (hi[i] < BT_INFINITY) { + btScalar s2 = (hi[i]-x[i])*dirf; // was (hi[i]-x[i])/dirf // step to x(i)=hi(i) + if (s2 < s) { + s = s2; + cmd = 3; + } + } + } + else { + if (lo[i] > -BT_INFINITY) { + btScalar s2 = (lo[i]-x[i])*dirf; // was (lo[i]-x[i])/dirf // step to x(i)=lo(i) + if (s2 < s) { + s = s2; + cmd = 2; + } + } + } + + { + const int numN = lcp.numN(); + for (int k=0; k < numN; ++k) { + const int indexN_k = lcp.indexN(k); + if (!scratchMem.state[indexN_k] ? scratchMem.delta_w[indexN_k] < 0 : scratchMem.delta_w[indexN_k] > 0) { + // don't bother checking if lo=hi=0 + if (lo[indexN_k] == 0 && hi[indexN_k] == 0) continue; + btScalar s2 = -w[indexN_k] / scratchMem.delta_w[indexN_k]; + if (s2 < s) { + s = s2; + cmd = 4; + si = indexN_k; + } + } + } + } + + { + const int numC = lcp.numC(); + for (int k=adj_nub; k < numC; ++k) { + const int indexC_k = lcp.indexC(k); + if (scratchMem.delta_x[indexC_k] < 0 && lo[indexC_k] > -BT_INFINITY) { + btScalar s2 = (lo[indexC_k]-x[indexC_k]) / scratchMem.delta_x[indexC_k]; + if (s2 < s) { + s = s2; + cmd = 5; + si = indexC_k; + } + } + if (scratchMem.delta_x[indexC_k] > 0 && hi[indexC_k] < BT_INFINITY) { + btScalar s2 = (hi[indexC_k]-x[indexC_k]) / scratchMem.delta_x[indexC_k]; + if (s2 < s) { + s = s2; + cmd = 6; + si = indexC_k; + } + } + } + } + + //static char* cmdstring[8] = {0,"->C","->NL","->NH","N->C", + // "C->NL","C->NH"}; + //printf ("cmd=%d (%s), si=%d\n",cmd,cmdstring[cmd],(cmd>3) ? si : i); + + // if s <= 0 then we've got a problem. if we just keep going then + // we're going to get stuck in an infinite loop. instead, just cross + // our fingers and exit with the current solution. + if (s <= btScalar(0.0)) + { +// printf("LCP internal error, s <= 0 (s=%.4e)",(double)s); + if (i < n) { + btSetZero (x+i,n-i); + btSetZero (w+i,n-i); + } + s_error = true; + break; + } + + // apply x = x + s * delta_x + lcp.pC_plusequals_s_times_qC (x, s, &scratchMem.delta_x[0]); + x[i] += s * dirf; + + // apply w = w + s * delta_w + lcp.pN_plusequals_s_times_qN (w, s, &scratchMem.delta_w[0]); + w[i] += s * scratchMem.delta_w[i]; + +// void *tmpbuf; + // switch indexes between sets if necessary + switch (cmd) { + case 1: // done + w[i] = 0; + lcp.transfer_i_to_C (i); + break; + case 2: // done + x[i] = lo[i]; + scratchMem.state[i] = false; + lcp.transfer_i_to_N (i); + break; + case 3: // done + x[i] = hi[i]; + scratchMem.state[i] = true; + lcp.transfer_i_to_N (i); + break; + case 4: // keep going + w[si] = 0; + lcp.transfer_i_from_N_to_C (si); + break; + case 5: // keep going + x[si] = lo[si]; + scratchMem.state[si] = false; + lcp.transfer_i_from_C_to_N (si, scratchMem.m_scratch); + break; + case 6: // keep going + x[si] = hi[si]; + scratchMem.state[si] = true; + lcp.transfer_i_from_C_to_N (si, scratchMem.m_scratch); + break; + } + + if (cmd <= 3) break; + } // for (;;) + } // else + + if (s_error) + { + break; + } + } // for (int i=adj_nub; i= 0 + (2) x = hi, w <= 0 + (3) lo < x < hi, w = 0 +A is a matrix of dimension n*n, everything else is a vector of size n*1. +lo and hi can be +/- dInfinity as needed. the first `nub' variables are +unbounded, i.e. hi and lo are assumed to be +/- dInfinity. + +we restrict lo(i) <= 0 and hi(i) >= 0. + +the original data (A,b) may be modified by this function. + +if the `findex' (friction index) parameter is nonzero, it points to an array +of index values. in this case constraints that have findex[i] >= 0 are +special. all non-special constraints are solved for, then the lo and hi values +for the special constraints are set: + hi[i] = abs( hi[i] * x[findex[i]] ) + lo[i] = -hi[i] +and the solution continues. this mechanism allows a friction approximation +to be implemented. the first `nub' variables are assumed to have findex < 0. + +*/ + + +#ifndef _BT_LCP_H_ +#define _BT_LCP_H_ + +#include +#include +#include + + +#include "LinearMath/btScalar.h" +#include "LinearMath/btAlignedObjectArray.h" + +struct btDantzigScratchMemory +{ + btAlignedObjectArray m_scratch; + btAlignedObjectArray L; + btAlignedObjectArray d; + btAlignedObjectArray delta_w; + btAlignedObjectArray delta_x; + btAlignedObjectArray Dell; + btAlignedObjectArray ell; + btAlignedObjectArray Arows; + btAlignedObjectArray p; + btAlignedObjectArray C; + btAlignedObjectArray state; +}; + +//return false if solving failed +bool btSolveDantzigLCP (int n, btScalar *A, btScalar *x, btScalar *b, btScalar *w, + int nub, btScalar *lo, btScalar *hi, int *findex,btDantzigScratchMemory& scratch); + + + +#endif //_BT_LCP_H_ diff --git a/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h new file mode 100644 index 000000000..2a2f2d3d3 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btDantzigSolver.h @@ -0,0 +1,112 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ +///original version written by Erwin Coumans, October 2013 + +#ifndef BT_DANTZIG_SOLVER_H +#define BT_DANTZIG_SOLVER_H + +#include "btMLCPSolverInterface.h" +#include "btDantzigLCP.h" + + +class btDantzigSolver : public btMLCPSolverInterface +{ +protected: + + btScalar m_acceptableUpperLimitSolution; + + btAlignedObjectArray m_tempBuffer; + + btAlignedObjectArray m_A; + btAlignedObjectArray m_b; + btAlignedObjectArray m_x; + btAlignedObjectArray m_lo; + btAlignedObjectArray m_hi; + btAlignedObjectArray m_dependencies; + btDantzigScratchMemory m_scratchMemory; +public: + + btDantzigSolver() + :m_acceptableUpperLimitSolution(btScalar(1000)) + { + } + + virtual bool solveMLCP(const btMatrixXu & A, const btVectorXu & b, btVectorXu& x, const btVectorXu & lo,const btVectorXu & hi,const btAlignedObjectArray& limitDependency, int numIterations, bool useSparsity = true) + { + bool result = true; + int n = b.rows(); + if (n) + { + int nub = 0; + btAlignedObjectArray ww; + ww.resize(n); + + + const btScalar* Aptr = A.getBufferPointer(); + m_A.resize(n*n); + for (int i=0;i= m_acceptableUpperLimitSolution) + { + return false; + } + + if (x[i] <= -m_acceptableUpperLimitSolution) + { + return false; + } + } + + for (int i=0;i= 1) { + cout << "Dimension = " << dim << endl; + } +#endif //BT_DEBUG_OSTREAM + + btVectorXu solutionVector(2 * dim); + solutionVector.setZero(); + + //, INIT, 0.); + + btMatrixXu ident(dim, dim); + ident.setIdentity(); +#ifdef BT_DEBUG_OSTREAM + cout << m_M << std::endl; +#endif + + btMatrixXu mNeg = m_M.negative(); + + btMatrixXu A(dim, 2 * dim + 2); + // + A.setSubMatrix(0, 0, dim - 1, dim - 1,ident); + A.setSubMatrix(0, dim, dim - 1, 2 * dim - 1,mNeg); + A.setSubMatrix(0, 2 * dim, dim - 1, 2 * dim, -1.f); + A.setSubMatrix(0, 2 * dim + 1, dim - 1, 2 * dim + 1,m_q); + +#ifdef BT_DEBUG_OSTREAM + cout << A << std::endl; +#endif //BT_DEBUG_OSTREAM + + + // btVectorXu q_; + // q_ >> A(0, 2 * dim + 1, dim - 1, 2 * dim + 1); + + btAlignedObjectArray basis; + //At first, all w-values are in the basis + for (int i = 0; i < dim; i++) + basis.push_back(i); + + int pivotRowIndex = -1; + btScalar minValue = 1e30f; + bool greaterZero = true; + for (int i=0;i= 3) + { + // cout << "A: " << A << endl; + cout << "pivotRowIndex " << pivotRowIndex << endl; + cout << "pivotColIndex " << pivotColIndex << endl; + cout << "Basis: "; + for (int i = 0; i < basis.size(); i++) + cout << basis[i] << " "; + cout << endl; + } +#endif //BT_DEBUG_OSTREAM + + if (!greaterZero) + { + + if (maxloops == 0) { + maxloops = 100; +// maxloops = UINT_MAX; //TODO: not a really nice way, problem is: maxloops should be 2^dim (=1<= 3) { + // cout << "A: " << A << endl; + cout << "pivotRowIndex " << pivotRowIndex << endl; + cout << "pivotColIndex " << pivotColIndex << endl; + cout << "Basis: "; + for (int i = 0; i < basis.size(); i++) + cout << basis[i] << " "; + cout << endl; + } +#endif //BT_DEBUG_OSTREAM + + int pivotColIndexOld = pivotColIndex; + + /*find new column index */ + if (basis[pivotRowIndex] < dim) //if a w-value left the basis get in the correspondent z-value + pivotColIndex = basis[pivotRowIndex] + dim; + else + //else do it the other way round and get in the corresponding w-value + pivotColIndex = basis[pivotRowIndex] - dim; + + /*the column becomes part of the basis*/ + basis[pivotRowIndex] = pivotColIndexOld; + + pivotRowIndex = findLexicographicMinimum(A, pivotColIndex); + + if(z0Row == pivotRowIndex) { //if z0 leaves the basis the solution is found --> one last elimination step is necessary + GaussJordanEliminationStep(A, pivotRowIndex, pivotColIndex, basis); + basis[pivotRowIndex] = pivotColIndex; //update basis + break; + } + + } +#ifdef BT_DEBUG_OSTREAM + if(DEBUGLEVEL >= 1) { + cout << "Number of loops: " << steps << endl; + cout << "Number of maximal loops: " << maxloops << endl; + } +#endif //BT_DEBUG_OSTREAM + + if(!validBasis(basis)) { + info = -1; +#ifdef BT_DEBUG_OSTREAM + if(DEBUGLEVEL >= 1) + cerr << "Lemke-Algorithm ended with Ray-Termination (no valid solution)." << endl; +#endif //BT_DEBUG_OSTREAM + + return solutionVector; + } + + } +#ifdef BT_DEBUG_OSTREAM + if (DEBUGLEVEL >= 2) { + // cout << "A: " << A << endl; + cout << "pivotRowIndex " << pivotRowIndex << endl; + cout << "pivotColIndex " << pivotColIndex << endl; + } +#endif //BT_DEBUG_OSTREAM + + for (int i = 0; i < basis.size(); i++) + { + solutionVector[basis[i]] = A(i,2*dim+1);//q_[i]; + } + + info = 0; + + return solutionVector; + } + + int btLemkeAlgorithm::findLexicographicMinimum(const btMatrixXu& A, const int & pivotColIndex) { + int RowIndex = 0; + int dim = A.rows(); + btAlignedObjectArray Rows; + for (int row = 0; row < dim; row++) + { + + btVectorXu vec(dim + 1); + vec.setZero();//, INIT, 0.) + Rows.push_back(vec); + btScalar a = A(row, pivotColIndex); + if (a > 0) { + Rows[row][0] = A(row, 2 * dim + 1) / a; + Rows[row][1] = A(row, 2 * dim) / a; + for (int j = 2; j < dim + 1; j++) + Rows[row][j] = A(row, j - 1) / a; + +#ifdef BT_DEBUG_OSTREAM + // if (DEBUGLEVEL) { + // cout << "Rows(" << row << ") = " << Rows[row] << endl; + // } +#endif + } + } + + for (int i = 0; i < Rows.size(); i++) + { + if (Rows[i].nrm2() > 0.) { + + int j = 0; + for (; j < Rows.size(); j++) + { + if(i != j) + { + if(Rows[j].nrm2() > 0.) + { + btVectorXu test(dim + 1); + for (int ii=0;ii 0) + return true; + + return false; + } + +void btLemkeAlgorithm::GaussJordanEliminationStep(btMatrixXu& A, int pivotRowIndex, int pivotColumnIndex, const btAlignedObjectArray& basis) +{ + + btScalar a = -1 / A(pivotRowIndex, pivotColumnIndex); +#ifdef BT_DEBUG_OSTREAM + cout << A << std::endl; +#endif + + for (int i = 0; i < A.rows(); i++) + { + if (i != pivotRowIndex) + { + for (int j = 0; j < A.cols(); j++) + { + if (j != pivotColumnIndex) + { + btScalar v = A(i, j); + v += A(pivotRowIndex, j) * A(i, pivotColumnIndex) * a; + A.setElem(i, j, v); + } + } + } + } + +#ifdef BT_DEBUG_OSTREAM + cout << A << std::endl; +#endif //BT_DEBUG_OSTREAM + for (int i = 0; i < A.cols(); i++) + { + A.mulElem(pivotRowIndex, i,-a); + } +#ifdef BT_DEBUG_OSTREAM + cout << A << std::endl; +#endif //#ifdef BT_DEBUG_OSTREAM + + for (int i = 0; i < A.rows(); i++) + { + if (i != pivotRowIndex) + { + A.setElem(i, pivotColumnIndex,0); + } + } +#ifdef BT_DEBUG_OSTREAM + cout << A << std::endl; +#endif //#ifdef BT_DEBUG_OSTREAM + } + + bool btLemkeAlgorithm::greaterZero(const btVectorXu & vector) +{ + bool isGreater = true; + for (int i = 0; i < vector.size(); i++) { + if (vector[i] < 0) { + isGreater = false; + break; + } + } + + return isGreater; + } + + bool btLemkeAlgorithm::validBasis(const btAlignedObjectArray& basis) + { + bool isValid = true; + for (int i = 0; i < basis.size(); i++) { + if (basis[i] >= basis.size() * 2) { //then z0 is in the base + isValid = false; + break; + } + } + + return isValid; + } + + diff --git a/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h new file mode 100644 index 000000000..7555cd9d2 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btLemkeAlgorithm.h @@ -0,0 +1,108 @@ +/* Copyright (C) 2004-2013 MBSim Development Team + +Code was converted for the Bullet Continuous Collision Detection and Physics Library + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +//The original version is here +//https://code.google.com/p/mbsim-env/source/browse/trunk/kernel/mbsim/numerics/linear_complementarity_problem/lemke_algorithm.cc +//This file is re-distributed under the ZLib license, with permission of the original author (Kilian Grundl) +//Math library was replaced from fmatvec to a the file src/LinearMath/btMatrixX.h +//STL/std::vector replaced by btAlignedObjectArray + + + +#ifndef BT_NUMERICS_LEMKE_ALGORITHM_H_ +#define BT_NUMERICS_LEMKE_ALGORITHM_H_ + +#include "LinearMath/btMatrixX.h" + + +#include //todo: replace by btAlignedObjectArray + +class btLemkeAlgorithm +{ +public: + + + btLemkeAlgorithm(const btMatrixXu& M_, const btVectorXu& q_, const int & DEBUGLEVEL_ = 0) : + DEBUGLEVEL(DEBUGLEVEL_) + { + setSystem(M_, q_); + } + + /* GETTER / SETTER */ + /** + * \brief return info of solution process + */ + int getInfo() { + return info; + } + + /** + * \brief get the number of steps until the solution was found + */ + int getSteps(void) { + return steps; + } + + + + /** + * \brief set system with Matrix M and vector q + */ + void setSystem(const btMatrixXu & M_, const btVectorXu & q_) + { + m_M = M_; + m_q = q_; + } + /***************************************************/ + + /** + * \brief solve algorithm adapted from : Fast Implementation of Lemke’s Algorithm for Rigid Body Contact Simulation (John E. Lloyd) + */ + btVectorXu solve(unsigned int maxloops = 0); + + virtual ~btLemkeAlgorithm() { + } + +protected: + int findLexicographicMinimum(const btMatrixXu &A, const int & pivotColIndex); + bool LexicographicPositive(const btVectorXu & v); + void GaussJordanEliminationStep(btMatrixXu &A, int pivotRowIndex, int pivotColumnIndex, const btAlignedObjectArray& basis); + bool greaterZero(const btVectorXu & vector); + bool validBasis(const btAlignedObjectArray& basis); + + btMatrixXu m_M; + btVectorXu m_q; + + /** + * \brief number of steps until the Lemke algorithm found a solution + */ + unsigned int steps; + + /** + * \brief define level of debug output + */ + int DEBUGLEVEL; + + /** + * \brief did the algorithm find a solution + * + * -1 : not successful + * 0 : successful + */ + int info; +}; + + +#endif /* BT_NUMERICS_LEMKE_ALGORITHM_H_ */ diff --git a/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h new file mode 100644 index 000000000..98484c379 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btLemkeSolver.h @@ -0,0 +1,350 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ +///original version written by Erwin Coumans, October 2013 + +#ifndef BT_LEMKE_SOLVER_H +#define BT_LEMKE_SOLVER_H + + +#include "btMLCPSolverInterface.h" +#include "btLemkeAlgorithm.h" + + + + +///The btLemkeSolver is based on "Fast Implementation of Lemke’s Algorithm for Rigid Body Contact Simulation (John E. Lloyd) " +///It is a slower but more accurate solver. Increase the m_maxLoops for better convergence, at the cost of more CPU time. +///The original implementation of the btLemkeAlgorithm was done by Kilian Grundl from the MBSim team +class btLemkeSolver : public btMLCPSolverInterface +{ +protected: + +public: + + btScalar m_maxValue; + int m_debugLevel; + int m_maxLoops; + bool m_useLoHighBounds; + + + + btLemkeSolver() + :m_maxValue(100000), + m_debugLevel(0), + m_maxLoops(1000), + m_useLoHighBounds(true) + { + } + virtual bool solveMLCP(const btMatrixXu & A, const btVectorXu & b, btVectorXu& x, const btVectorXu & lo,const btVectorXu & hi,const btAlignedObjectArray& limitDependency, int numIterations, bool useSparsity = true) + { + + if (m_useLoHighBounds) + { + + BT_PROFILE("btLemkeSolver::solveMLCP"); + int n = A.rows(); + if (0==n) + return true; + + bool fail = false; + + btVectorXu solution(n); + btVectorXu q1; + q1.resize(n); + for (int row=0;rowm_maxValue) + { + if (x[i]> errorValueMax) + { + fail = true; + errorIndexMax = i; + errorValueMax = x[i]; + } + ////printf("x[i] = %f,",x[i]); + } + if (x[i]<-m_maxValue) + { + if (x[i]m_maxValue) + { + if (x[i]> errorValueMax) + { + fail = true; + errorIndexMax = i; + errorValueMax = x[i]; + } + ////printf("x[i] = %f,",x[i]); + } + if (x[i]<-m_maxValue) + { + if (x[i] limitDependenciesCopy = m_limitDependencies; +// printf("solve first LCP\n"); + result = m_solver->solveMLCP(m_A, m_b, m_x, m_lo,m_hi, m_limitDependencies,infoGlobal.m_numIterations ); + if (result) + result = m_solver->solveMLCP(Acopy, m_bSplit, m_xSplit, m_lo,m_hi, limitDependenciesCopy,infoGlobal.m_numIterations ); + + } else + { + result = m_solver->solveMLCP(m_A, m_b, m_x, m_lo,m_hi, m_limitDependencies,infoGlobal.m_numIterations ); + } + return result; +} + +struct btJointNode +{ + int jointIndex; // pointer to enclosing dxJoint object + int otherBodyIndex; // *other* body this joint is connected to + int nextJointNodeIndex;//-1 for null + int constraintRowIndex; +}; + + + +void btMLCPSolver::createMLCPFast(const btContactSolverInfo& infoGlobal) +{ + int numContactRows = interleaveContactAndFriction ? 3 : 1; + + int numConstraintRows = m_allConstraintPtrArray.size(); + int n = numConstraintRows; + { + BT_PROFILE("init b (rhs)"); + m_b.resize(numConstraintRows); + m_bSplit.resize(numConstraintRows); + m_b.setZero(); + m_bSplit.setZero(); + for (int i=0;im_jacDiagABInv; + if (!btFuzzyZero(jacDiag)) + { + btScalar rhs = m_allConstraintPtrArray[i]->m_rhs; + btScalar rhsPenetration = m_allConstraintPtrArray[i]->m_rhsPenetration; + m_b[i]=rhs/jacDiag; + m_bSplit[i] = rhsPenetration/jacDiag; + } + + } + } + +// btScalar* w = 0; +// int nub = 0; + + m_lo.resize(numConstraintRows); + m_hi.resize(numConstraintRows); + + { + BT_PROFILE("init lo/ho"); + + for (int i=0;i=0) + { + m_lo[i] = -BT_INFINITY; + m_hi[i] = BT_INFINITY; + } else + { + m_lo[i] = m_allConstraintPtrArray[i]->m_lowerLimit; + m_hi[i] = m_allConstraintPtrArray[i]->m_upperLimit; + } + } + } + + // + int m=m_allConstraintPtrArray.size(); + + int numBodies = m_tmpSolverBodyPool.size(); + btAlignedObjectArray bodyJointNodeArray; + { + BT_PROFILE("bodyJointNodeArray.resize"); + bodyJointNodeArray.resize(numBodies,-1); + } + btAlignedObjectArray jointNodeArray; + { + BT_PROFILE("jointNodeArray.reserve"); + jointNodeArray.reserve(2*m_allConstraintPtrArray.size()); + } + + btMatrixXu& J3 = m_scratchJ3; + { + BT_PROFILE("J3.resize"); + J3.resize(2*m,8); + } + btMatrixXu& JinvM3 = m_scratchJInvM3; + { + BT_PROFILE("JinvM3.resize/setZero"); + + JinvM3.resize(2*m,8); + JinvM3.setZero(); + J3.setZero(); + } + int cur=0; + int rowOffset = 0; + btAlignedObjectArray& ofs = m_scratchOfs; + { + BT_PROFILE("ofs resize"); + ofs.resize(0); + ofs.resizeNoInitialize(m_allConstraintPtrArray.size()); + } + { + BT_PROFILE("Compute J and JinvM"); + int c=0; + + int numRows = 0; + + for (int i=0;im_solverBodyIdA; + int sbB = m_allConstraintPtrArray[i]->m_solverBodyIdB; + btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody; + btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody; + + numRows = im_contactNormal1 * orgBodyA->getInvMass(); + btVector3 relPosCrossNormalInvInertia = m_allConstraintPtrArray[i+row]->m_relpos1CrossNormal * orgBodyA->getInvInertiaTensorWorld(); + + for (int r=0;r<3;r++) + { + J3.setElem(cur,r,m_allConstraintPtrArray[i+row]->m_contactNormal1[r]); + J3.setElem(cur,r+4,m_allConstraintPtrArray[i+row]->m_relpos1CrossNormal[r]); + JinvM3.setElem(cur,r,normalInvMass[r]); + JinvM3.setElem(cur,r+4,relPosCrossNormalInvInertia[r]); + } + J3.setElem(cur,3,0); + JinvM3.setElem(cur,3,0); + J3.setElem(cur,7,0); + JinvM3.setElem(cur,7,0); + } + } else + { + cur += numRows; + } + if (orgBodyB) + { + + { + int slotB=-1; + //find free jointNode slot for sbA + slotB =jointNodeArray.size(); + jointNodeArray.expand();//NonInitializing(); + int prevSlot = bodyJointNodeArray[sbB]; + bodyJointNodeArray[sbB] = slotB; + jointNodeArray[slotB].nextJointNodeIndex = prevSlot; + jointNodeArray[slotB].jointIndex = c; + jointNodeArray[slotB].otherBodyIndex = orgBodyA ? sbA : -1; + jointNodeArray[slotB].constraintRowIndex = i; + } + + for (int row=0;rowm_contactNormal2*orgBodyB->getInvMass(); + btVector3 relPosInvInertiaB = m_allConstraintPtrArray[i+row]->m_relpos2CrossNormal * orgBodyB->getInvInertiaTensorWorld(); + + for (int r=0;r<3;r++) + { + J3.setElem(cur,r,m_allConstraintPtrArray[i+row]->m_contactNormal2[r]); + J3.setElem(cur,r+4,m_allConstraintPtrArray[i+row]->m_relpos2CrossNormal[r]); + JinvM3.setElem(cur,r,normalInvMassB[r]); + JinvM3.setElem(cur,r+4,relPosInvInertiaB[r]); + } + J3.setElem(cur,3,0); + JinvM3.setElem(cur,3,0); + J3.setElem(cur,7,0); + JinvM3.setElem(cur,7,0); + } + } + else + { + cur += numRows; + } + rowOffset+=numRows; + + } + + } + + + //compute JinvM = J*invM. + const btScalar* JinvM = JinvM3.getBufferPointer(); + + const btScalar* Jptr = J3.getBufferPointer(); + { + BT_PROFILE("m_A.resize"); + m_A.resize(n,n); + } + + { + BT_PROFILE("m_A.setZero"); + m_A.setZero(); + } + int c=0; + { + int numRows = 0; + BT_PROFILE("Compute A"); + for (int i=0;im_solverBodyIdA; + int sbB = m_allConstraintPtrArray[i]->m_solverBodyIdB; + // btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody; + // btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody; + + numRows = i=0) + { + int j0 = jointNodeArray[startJointNodeA].jointIndex; + int cr0 = jointNodeArray[startJointNodeA].constraintRowIndex; + if (j0m_solverBodyIdB == sbA) ? 8*numRowsOther : 0; + //printf("%d joint i %d and j0: %d: ",count++,i,j0); + m_A.multiplyAdd2_p8r ( JinvMrow, + Jptr + 2*8*(size_t)ofs[j0] + ofsother, numRows, numRowsOther, row__,ofs[j0]); + } + startJointNodeA = jointNodeArray[startJointNodeA].nextJointNodeIndex; + } + } + + { + int startJointNodeB = bodyJointNodeArray[sbB]; + while (startJointNodeB>=0) + { + int j1 = jointNodeArray[startJointNodeB].jointIndex; + int cj1 = jointNodeArray[startJointNodeB].constraintRowIndex; + + if (j1m_solverBodyIdB == sbB) ? 8*numRowsOther : 0; + m_A.multiplyAdd2_p8r ( JinvMrow + 8*(size_t)numRows, + Jptr + 2*8*(size_t)ofs[j1] + ofsother, numRows, numRowsOther, row__,ofs[j1]); + } + startJointNodeB = jointNodeArray[startJointNodeB].nextJointNodeIndex; + } + } + } + + { + BT_PROFILE("compute diagonal"); + // compute diagonal blocks of m_A + + int row__ = 0; + int numJointRows = m_allConstraintPtrArray.size(); + + int jj=0; + for (;row__m_solverBodyIdA; + int sbB = m_allConstraintPtrArray[row__]->m_solverBodyIdB; + // btRigidBody* orgBodyA = m_tmpSolverBodyPool[sbA].m_originalBody; + btRigidBody* orgBodyB = m_tmpSolverBodyPool[sbB].m_originalBody; + + + const unsigned int infom = row__ < m_tmpSolverNonContactConstraintPool.size() ? m_tmpConstraintSizesPool[jj].m_numConstraintRows : numContactRows; + + const btScalar *JinvMrow = JinvM + 2*8*(size_t)row__; + const btScalar *Jrow = Jptr + 2*8*(size_t)row__; + m_A.multiply2_p8r (JinvMrow, Jrow, infom, infom, row__,row__); + if (orgBodyB) + { + m_A.multiplyAdd2_p8r (JinvMrow + 8*(size_t)infom, Jrow + 8*(size_t)infom, infom, infom, row__,row__); + } + row__ += infom; + jj++; + } + } + } + + if (1) + { + // add cfm to the diagonal of m_A + for ( int i=0; im_tmpSolverBodyPool.size(); + int numConstraintRows = m_allConstraintPtrArray.size(); + + m_b.resize(numConstraintRows); + if (infoGlobal.m_splitImpulse) + m_bSplit.resize(numConstraintRows); + + m_bSplit.setZero(); + m_b.setZero(); + + for (int i=0;im_jacDiagABInv) + { + m_b[i]=m_allConstraintPtrArray[i]->m_rhs/m_allConstraintPtrArray[i]->m_jacDiagABInv; + if (infoGlobal.m_splitImpulse) + m_bSplit[i] = m_allConstraintPtrArray[i]->m_rhsPenetration/m_allConstraintPtrArray[i]->m_jacDiagABInv; + } + } + + btMatrixXu& Minv = m_scratchMInv; + Minv.resize(6*numBodies,6*numBodies); + Minv.setZero(); + for (int i=0;igetInvInertiaTensorWorld()[r][c] : 0); + } + + btMatrixXu& J = m_scratchJ; + J.resize(numConstraintRows,6*numBodies); + J.setZero(); + + m_lo.resize(numConstraintRows); + m_hi.resize(numConstraintRows); + + for (int i=0;im_lowerLimit; + m_hi[i] = m_allConstraintPtrArray[i]->m_upperLimit; + + int bodyIndex0 = m_allConstraintPtrArray[i]->m_solverBodyIdA; + int bodyIndex1 = m_allConstraintPtrArray[i]->m_solverBodyIdB; + if (m_tmpSolverBodyPool[bodyIndex0].m_originalBody) + { + setElem(J,i,6*bodyIndex0+0,m_allConstraintPtrArray[i]->m_contactNormal1[0]); + setElem(J,i,6*bodyIndex0+1,m_allConstraintPtrArray[i]->m_contactNormal1[1]); + setElem(J,i,6*bodyIndex0+2,m_allConstraintPtrArray[i]->m_contactNormal1[2]); + setElem(J,i,6*bodyIndex0+3,m_allConstraintPtrArray[i]->m_relpos1CrossNormal[0]); + setElem(J,i,6*bodyIndex0+4,m_allConstraintPtrArray[i]->m_relpos1CrossNormal[1]); + setElem(J,i,6*bodyIndex0+5,m_allConstraintPtrArray[i]->m_relpos1CrossNormal[2]); + } + if (m_tmpSolverBodyPool[bodyIndex1].m_originalBody) + { + setElem(J,i,6*bodyIndex1+0,m_allConstraintPtrArray[i]->m_contactNormal2[0]); + setElem(J,i,6*bodyIndex1+1,m_allConstraintPtrArray[i]->m_contactNormal2[1]); + setElem(J,i,6*bodyIndex1+2,m_allConstraintPtrArray[i]->m_contactNormal2[2]); + setElem(J,i,6*bodyIndex1+3,m_allConstraintPtrArray[i]->m_relpos2CrossNormal[0]); + setElem(J,i,6*bodyIndex1+4,m_allConstraintPtrArray[i]->m_relpos2CrossNormal[1]); + setElem(J,i,6*bodyIndex1+5,m_allConstraintPtrArray[i]->m_relpos2CrossNormal[2]); + } + } + + btMatrixXu& J_transpose = m_scratchJTranspose; + J_transpose= J.transpose(); + + btMatrixXu& tmp = m_scratchTmp; + + { + { + BT_PROFILE("J*Minv"); + tmp = J*Minv; + + } + { + BT_PROFILE("J*tmp"); + m_A = tmp*J_transpose; + } + } + + if (1) + { + // add cfm to the diagonal of m_A + for ( int i=0; i m_limitDependencies; + btAlignedObjectArray m_allConstraintPtrArray; + btMLCPSolverInterface* m_solver; + int m_fallback; + + /// The following scratch variables are not stateful -- contents are cleared prior to each use. + /// They are only cached here to avoid extra memory allocations and deallocations and to ensure + /// that multiple instances of the solver can be run in parallel. + btMatrixXu m_scratchJ3; + btMatrixXu m_scratchJInvM3; + btAlignedObjectArray m_scratchOfs; + btMatrixXu m_scratchMInv; + btMatrixXu m_scratchJ; + btMatrixXu m_scratchJTranspose; + btMatrixXu m_scratchTmp; + + virtual btScalar solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); + virtual btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies ,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer); + + + virtual void createMLCP(const btContactSolverInfo& infoGlobal); + virtual void createMLCPFast(const btContactSolverInfo& infoGlobal); + + //return true is it solves the problem successfully + virtual bool solveMLCP(const btContactSolverInfo& infoGlobal); + +public: + + btMLCPSolver( btMLCPSolverInterface* solver); + virtual ~btMLCPSolver(); + + void setMLCPSolver(btMLCPSolverInterface* solver) + { + m_solver = solver; + } + + int getNumFallbacks() const + { + return m_fallback; + } + void setNumFallbacks(int num) + { + m_fallback = num; + } + + virtual btConstraintSolverType getSolverType() const + { + return BT_MLCP_SOLVER; + } + +}; + + +#endif //BT_MLCP_SOLVER_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionObjectWrapper.h b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h similarity index 57% rename from Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionObjectWrapper.h rename to Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h index f90da2775..25bb3f6d3 100644 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionObjectWrapper.h +++ b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h @@ -1,6 +1,6 @@ /* Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com +Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -12,29 +12,22 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ +///original version written by Erwin Coumans, October 2013 -#ifndef BT_SPU_COLLISION_OBJECT_WRAPPER_H -#define BT_SPU_COLLISION_OBJECT_WRAPPER_H +#ifndef BT_MLCP_SOLVER_INTERFACE_H +#define BT_MLCP_SOLVER_INTERFACE_H -#include "PlatformDefinitions.h" -#include "BulletCollision/CollisionDispatch/btCollisionObject.h" +#include "LinearMath/btMatrixX.h" -ATTRIBUTE_ALIGNED16(class) SpuCollisionObjectWrapper +class btMLCPSolverInterface { -protected: - int m_shapeType; - float m_margin; - ppu_address_t m_collisionObjectPtr; - public: - SpuCollisionObjectWrapper (); + virtual ~btMLCPSolverInterface() + { + } - SpuCollisionObjectWrapper (const btCollisionObject* collisionObject); - - int getShapeType () const; - float getCollisionMargin () const; - ppu_address_t getCollisionObjectPtr () const; + //return true is it solves the problem successfully + virtual bool solveMLCP(const btMatrixXu & A, const btVectorXu & b, btVectorXu& x, const btVectorXu & lo,const btVectorXu & hi,const btAlignedObjectArray& limitDependency, int numIterations, bool useSparsity = true)=0; }; - -#endif //BT_SPU_COLLISION_OBJECT_WRAPPER_H +#endif //BT_MLCP_SOLVER_INTERFACE_H diff --git a/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btPATHSolver.h b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btPATHSolver.h new file mode 100644 index 000000000..9ec31a6d4 --- /dev/null +++ b/Engine/lib/bullet/src/BulletDynamics/MLCPSolvers/btPATHSolver.h @@ -0,0 +1,151 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ +///original version written by Erwin Coumans, October 2013 + + +#ifndef BT_PATH_SOLVER_H +#define BT_PATH_SOLVER_H + +//#define BT_USE_PATH +#ifdef BT_USE_PATH + +extern "C" { +#include "PATH/SimpleLCP.h" +#include "PATH/License.h" +#include "PATH/Error_Interface.h" +}; + void __stdcall MyError(Void *data, Char *msg) +{ + printf("Path Error: %s\n",msg); +} + void __stdcall MyWarning(Void *data, Char *msg) +{ + printf("Path Warning: %s\n",msg); +} + +Error_Interface e; + + + +#include "btMLCPSolverInterface.h" +#include "Dantzig/lcp.h" + +class btPathSolver : public btMLCPSolverInterface +{ +public: + + btPathSolver() + { + License_SetString("2069810742&Courtesy_License&&&USR&2013&14_12_2011&1000&PATH&GEN&31_12_2013&0_0_0&0&0_0"); + e.error_data = 0; + e.warning = MyWarning; + e.error = MyError; + Error_SetInterface(&e); + } + + + virtual bool solveMLCP(const btMatrixXu & A, const btVectorXu & b, btVectorXu& x, const btVectorXu & lo,const btVectorXu & hi,const btAlignedObjectArray& limitDependency, int numIterations, bool useSparsity = true) + { + MCP_Termination status; + + + int numVariables = b.rows(); + if (0==numVariables) + return true; + + /* - variables - the number of variables in the problem + - m_nnz - the number of nonzeros in the M matrix + - m_i - a vector of size m_nnz containing the row indices for M + - m_j - a vector of size m_nnz containing the column indices for M + - m_ij - a vector of size m_nnz containing the data for M + - q - a vector of size variables + - lb - a vector of size variables containing the lower bounds on x + - ub - a vector of size variables containing the upper bounds on x + */ + btAlignedObjectArray values; + btAlignedObjectArray rowIndices; + btAlignedObjectArray colIndices; + + for (int i=0;i zResult; + zResult.resize(numVariables); + btAlignedObjectArray rhs; + btAlignedObjectArray upperBounds; + btAlignedObjectArray lowerBounds; + for (int i=0;i& limitDependency, int numIterations, bool useSparsity = true) + { + if (!A.rows()) + return true; + //the A matrix is sparse, so compute the non-zero elements + A.rowComputeNonZeroElements(); + + //A is a m-n matrix, m rows, n columns + btAssert(A.rows() == b.rows()); + + int i, j, numRows = A.rows(); + + btScalar delta; + + for (int k = 0; k =0) + { + s = x[limitDependency[i]]; + if (s<0) + s=1; + } + + if (x[i]hi[i]*s) + x[i]=hi[i]*s; + btScalar diff = x[i] - xOld; + m_leastSquaresResidual += diff*diff; + } + + btScalar eps = m_leastSquaresResidualThreshold; + if ((m_leastSquaresResidual < eps) || (k >=(numIterations-1))) + { +#ifdef VERBOSE_PRINTF_RESIDUAL + printf("totalLenSqr = %f at iteration #%d\n", m_leastSquaresResidual,k); +#endif + break; + } + } + return true; + } + +}; + +#endif //BT_SOLVE_PROJECTED_GAUSS_SEIDEL_H diff --git a/Engine/lib/bullet/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp b/Engine/lib/bullet/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp index 77b475b96..a7b168846 100644 --- a/Engine/lib/bullet/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp +++ b/Engine/lib/bullet/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp @@ -296,8 +296,9 @@ void btRaycastVehicle::updateVehicle( btScalar step ) int i=0; for (i=0;i +#define BT_ID_WO_BULLET +#define BT_ID_POW(a,b) std::pow(a,b) +#define BT_ID_SNPRINTF snprintf +#define BT_ID_PI M_PI +#define BT_ID_USE_DOUBLE_PRECISION +#else +#define BT_ID_POW(a,b) btPow(a,b) +#define BT_ID_PI SIMD_PI +#ifdef _WIN32 + #define BT_ID_SNPRINTF _snprintf +#else + #define BT_ID_SNPRINTF snprintf +#endif // +#endif +// error messages +#include "IDErrorMessages.hpp" + +#ifdef BT_CUSTOM_INVERSE_DYNAMICS_CONFIG_H +/* +#include "IDConfigEigen.hpp" +#include "IDConfigBuiltin.hpp" +*/ +#define INVDYN_INCLUDE_HELPER_2(x) #x +#define INVDYN_INCLUDE_HELPER(x) INVDYN_INCLUDE_HELPER_2(x) +#include INVDYN_INCLUDE_HELPER(BT_CUSTOM_INVERSE_DYNAMICS_CONFIG_H) +#ifndef btInverseDynamics +#error "custom inverse dynamics config, but no custom namespace defined" +#endif + +#define BT_ID_MAX(a,b) std::max(a,b) +#define BT_ID_MIN(a,b) std::min(a,b) + +#else +#define btInverseDynamics btInverseDynamicsBullet3 +// Use default configuration with bullet's types +// Use the same scalar type as rest of bullet library +#include "LinearMath/btScalar.h" +typedef btScalar idScalar; +#include "LinearMath/btMinMax.h" +#define BT_ID_MAX(a,b) btMax(a,b) +#define BT_ID_MIN(a,b) btMin(a,b) + +#ifdef BT_USE_DOUBLE_PRECISION +#define BT_ID_USE_DOUBLE_PRECISION +#endif +// use bullet types for arrays and array indices +#include "Bullet3Common/b3AlignedObjectArray.h" +// this is to make it work with C++2003, otherwise we could do this: +// template +// using idArray = b3AlignedObjectArray; +template +struct idArray { + typedef b3AlignedObjectArray type; +}; +typedef int idArrayIdx; +#define ID_DECLARE_ALIGNED_ALLOCATOR B3_DECLARE_ALIGNED_ALLOCATOR + +// use bullet's allocator functions +#define idMalloc btAllocFunc +#define idFree btFreeFunc + +#define ID_LINEAR_MATH_USE_BULLET +#include "details/IDLinearMathInterface.hpp" +#endif +#endif diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/IDConfigBuiltin.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/IDConfigBuiltin.hpp new file mode 100644 index 000000000..130c19c6d --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/IDConfigBuiltin.hpp @@ -0,0 +1,37 @@ +///@file Configuration for Inverse Dynamics Library without external dependencies +#ifndef INVDYNCONFIG_BUILTIN_HPP_ +#define INVDYNCONFIG_BUILTIN_HPP_ +#define btInverseDynamics btInverseDynamicsBuiltin +#ifdef BT_USE_DOUBLE_PRECISION +// choose double/single precision version +typedef double idScalar; +#else +typedef float idScalar; +#endif +// use std::vector for arrays +#include +// this is to make it work with C++2003, otherwise we could do this +// template +// using idArray = std::vector; +template +struct idArray { + typedef std::vector type; +}; +typedef std::vector::size_type idArrayIdx; +// default to standard malloc/free +#include +#define idMalloc ::malloc +#define idFree ::free +// currently not aligned at all... +#define ID_DECLARE_ALIGNED_ALLOCATOR() \ + inline void* operator new(std::size_t sizeInBytes) { return idMalloc(sizeInBytes); } \ + inline void operator delete(void* ptr) { idFree(ptr); } \ + inline void* operator new(std::size_t, void* ptr) { return ptr; } \ + inline void operator delete(void*, void*) {} \ + inline void* operator new[](std::size_t sizeInBytes) { return idMalloc(sizeInBytes); } \ + inline void operator delete[](void* ptr) { idFree(ptr); } \ + inline void* operator new[](std::size_t, void* ptr) { return ptr; } \ + inline void operator delete[](void*, void*) {} + +#include "details/IDMatVec.hpp" +#endif diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/IDConfigEigen.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/IDConfigEigen.hpp new file mode 100644 index 000000000..cbd7e8a9c --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/IDConfigEigen.hpp @@ -0,0 +1,31 @@ +///@file Configuration for Inverse Dynamics Library with Eigen +#ifndef INVDYNCONFIG_EIGEN_HPP_ +#define INVDYNCONFIG_EIGEN_HPP_ +#define btInverseDynamics btInverseDynamicsEigen +#ifdef BT_USE_DOUBLE_PRECISION +// choose double/single precision version +typedef double idScalar; +#else +typedef float idScalar; +#endif + +// use std::vector for arrays +#include +// this is to make it work with C++2003, otherwise we could do this +// template +// using idArray = std::vector; +template +struct idArray { + typedef std::vector type; +}; +typedef std::vector::size_type idArrayIdx; +// default to standard malloc/free +#include +#define ID_DECLARE_ALIGNED_ALLOCATOR() EIGEN_MAKE_ALIGNED_OPERATOR_NEW +// Note on interfaces: +// Eigen::Matrix has data(), to get c-array storage +// HOWEVER: default storage is column-major! +#define ID_LINEAR_MATH_USE_EIGEN +#include "Eigen/Eigen" +#include "details/IDEigenInterface.hpp" +#endif diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/IDErrorMessages.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/IDErrorMessages.hpp new file mode 100644 index 000000000..a3866edc5 --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/IDErrorMessages.hpp @@ -0,0 +1,34 @@ +///@file error message utility functions +#ifndef IDUTILS_HPP_ +#define IDUTILS_HPP_ +#include +/// name of file being compiled, without leading path components +#define __INVDYN_FILE_WO_DIR__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) + +#ifndef BT_ID_WO_BULLET +#include "Bullet3Common/b3Logging.h" +#define error_message(...) b3Error(__VA_ARGS__) +#define warning_message(...) b3Warning(__VA_ARGS__) +#define id_printf(...) b3Printf(__VA_ARGS__) +#else // BT_ID_WO_BULLET +#include +/// print error message with file/line information +#define error_message(...) \ + do { \ + fprintf(stderr, "[Error:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + } while (0) +/// print warning message with file/line information +#define warning_message(...) \ + do { \ + fprintf(stderr, "[Warning:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + } while (0) +#define warning_message(...) \ + do { \ + fprintf(stderr, "[Warning:%s:%d] ", __INVDYN_FILE_WO_DIR__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + } while (0) +#define id_printf(...) printf(__VA_ARGS__) +#endif // BT_ID_WO_BULLET +#endif diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/IDMath.cpp b/Engine/lib/bullet/src/BulletInverseDynamics/IDMath.cpp new file mode 100644 index 000000000..03452ca0c --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/IDMath.cpp @@ -0,0 +1,425 @@ +#include "IDMath.hpp" + +#include +#include + +namespace btInverseDynamics { +static const idScalar kIsZero = 5 * std::numeric_limits::epsilon(); +// requirements for axis length deviation from 1.0 +// experimentally set from random euler angle rotation matrices +static const idScalar kAxisLengthEpsilon = 10 * kIsZero; + +void setZero(vec3 &v) { + v(0) = 0; + v(1) = 0; + v(2) = 0; +} + +void setZero(vecx &v) { + for (int i = 0; i < v.size(); i++) { + v(i) = 0; + } +} + +void setZero(mat33 &m) { + m(0, 0) = 0; + m(0, 1) = 0; + m(0, 2) = 0; + m(1, 0) = 0; + m(1, 1) = 0; + m(1, 2) = 0; + m(2, 0) = 0; + m(2, 1) = 0; + m(2, 2) = 0; +} + +idScalar maxAbs(const vecx &v) { + idScalar result = 0.0; + for (int i = 0; i < v.size(); i++) { + const idScalar tmp = std::fabs(v(i)); + if (tmp > result) { + result = tmp; + } + } + return result; +} + +idScalar maxAbs(const vec3 &v) { + idScalar result = 0.0; + for (int i = 0; i < 3; i++) { + const idScalar tmp = std::fabs(v(i)); + if (tmp > result) { + result = tmp; + } + } + return result; +} + +#if (defined BT_ID_HAVE_MAT3X) +idScalar maxAbsMat3x(const mat3x &m) { + // only used for tests -- so just loop here for portability + idScalar result = 0.0; + for (idArrayIdx col = 0; col < m.cols(); col++) { + for (idArrayIdx row = 0; row < 3; row++) { + result = BT_ID_MAX(result, std::fabs(m(row, col))); + } + } + return result; +} + +void mul(const mat33 &a, const mat3x &b, mat3x *result) { + if (b.cols() != result->cols()) { + error_message("size missmatch. a.cols()= %d, b.cols()= %d\n", + static_cast(b.cols()), static_cast(result->cols())); + abort(); + } + + for (idArrayIdx col = 0; col < b.cols(); col++) { + const idScalar x = a(0,0)*b(0,col)+a(0,1)*b(1,col)+a(0,2)*b(2,col); + const idScalar y = a(1,0)*b(0,col)+a(1,1)*b(1,col)+a(1,2)*b(2,col); + const idScalar z = a(2,0)*b(0,col)+a(2,1)*b(1,col)+a(2,2)*b(2,col); + setMat3xElem(0, col, x, result); + setMat3xElem(1, col, y, result); + setMat3xElem(2, col, z, result); + } +} +void add(const mat3x &a, const mat3x &b, mat3x *result) { + if (a.cols() != b.cols()) { + error_message("size missmatch. a.cols()= %d, b.cols()= %d\n", + static_cast(a.cols()), static_cast(b.cols())); + abort(); + } + for (idArrayIdx col = 0; col < b.cols(); col++) { + for (idArrayIdx row = 0; row < 3; row++) { + setMat3xElem(row, col, a(row, col) + b(row, col), result); + } + } +} +void sub(const mat3x &a, const mat3x &b, mat3x *result) { + if (a.cols() != b.cols()) { + error_message("size missmatch. a.cols()= %d, b.cols()= %d\n", + static_cast(a.cols()), static_cast(b.cols())); + abort(); + } + for (idArrayIdx col = 0; col < b.cols(); col++) { + for (idArrayIdx row = 0; row < 3; row++) { + setMat3xElem(row, col, a(row, col) - b(row, col), result); + } + } +} +#endif + +mat33 transformX(const idScalar &alpha) { + mat33 T; + const idScalar cos_alpha = std::cos(alpha); + const idScalar sin_alpha = std::sin(alpha); + // [1 0 0] + // [0 c s] + // [0 -s c] + T(0, 0) = 1.0; + T(0, 1) = 0.0; + T(0, 2) = 0.0; + + T(1, 0) = 0.0; + T(1, 1) = cos_alpha; + T(1, 2) = sin_alpha; + + T(2, 0) = 0.0; + T(2, 1) = -sin_alpha; + T(2, 2) = cos_alpha; + + return T; +} + +mat33 transformY(const idScalar &beta) { + mat33 T; + const idScalar cos_beta = std::cos(beta); + const idScalar sin_beta = std::sin(beta); + // [c 0 -s] + // [0 1 0] + // [s 0 c] + T(0, 0) = cos_beta; + T(0, 1) = 0.0; + T(0, 2) = -sin_beta; + + T(1, 0) = 0.0; + T(1, 1) = 1.0; + T(1, 2) = 0.0; + + T(2, 0) = sin_beta; + T(2, 1) = 0.0; + T(2, 2) = cos_beta; + + return T; +} + +mat33 transformZ(const idScalar &gamma) { + mat33 T; + const idScalar cos_gamma = std::cos(gamma); + const idScalar sin_gamma = std::sin(gamma); + // [ c s 0] + // [-s c 0] + // [ 0 0 1] + T(0, 0) = cos_gamma; + T(0, 1) = sin_gamma; + T(0, 2) = 0.0; + + T(1, 0) = -sin_gamma; + T(1, 1) = cos_gamma; + T(1, 2) = 0.0; + + T(2, 0) = 0.0; + T(2, 1) = 0.0; + T(2, 2) = 1.0; + + return T; +} + +mat33 tildeOperator(const vec3 &v) { + mat33 m; + m(0, 0) = 0.0; + m(0, 1) = -v(2); + m(0, 2) = v(1); + m(1, 0) = v(2); + m(1, 1) = 0.0; + m(1, 2) = -v(0); + m(2, 0) = -v(1); + m(2, 1) = v(0); + m(2, 2) = 0.0; + return m; +} + +void getVecMatFromDH(idScalar theta, idScalar d, idScalar a, idScalar alpha, vec3 *r, mat33 *T) { + const idScalar sa = std::sin(alpha); + const idScalar ca = std::cos(alpha); + const idScalar st = std::sin(theta); + const idScalar ct = std::cos(theta); + + (*r)(0) = a; + (*r)(1) = -sa * d; + (*r)(2) = ca * d; + + (*T)(0, 0) = ct; + (*T)(0, 1) = -st; + (*T)(0, 2) = 0.0; + + (*T)(1, 0) = st * ca; + (*T)(1, 1) = ct * ca; + (*T)(1, 2) = -sa; + + (*T)(2, 0) = st * sa; + (*T)(2, 1) = ct * sa; + (*T)(2, 2) = ca; +} + +void bodyTParentFromAxisAngle(const vec3 &axis, const idScalar &angle, mat33 *T) { + const idScalar c = cos(angle); + const idScalar s = -sin(angle); + const idScalar one_m_c = 1.0 - c; + + const idScalar &x = axis(0); + const idScalar &y = axis(1); + const idScalar &z = axis(2); + + (*T)(0, 0) = x * x * one_m_c + c; + (*T)(0, 1) = x * y * one_m_c - z * s; + (*T)(0, 2) = x * z * one_m_c + y * s; + + (*T)(1, 0) = x * y * one_m_c + z * s; + (*T)(1, 1) = y * y * one_m_c + c; + (*T)(1, 2) = y * z * one_m_c - x * s; + + (*T)(2, 0) = x * z * one_m_c - y * s; + (*T)(2, 1) = y * z * one_m_c + x * s; + (*T)(2, 2) = z * z * one_m_c + c; +} + +bool isPositiveDefinite(const mat33 &m) { + // test if all upper left determinants are positive + if (m(0, 0) <= 0) { // upper 1x1 + return false; + } + if (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0) <= 0) { // upper 2x2 + return false; + } + if ((m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) - + m(0, 1) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) + + m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0))) < 0) { + return false; + } + return true; +} + +bool isPositiveSemiDefinite(const mat33 &m) { + // test if all upper left determinants are positive + if (m(0, 0) < 0) { // upper 1x1 + return false; + } + if (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0) < 0) { // upper 2x2 + return false; + } + if ((m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) - + m(0, 1) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) + + m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0))) < 0) { + return false; + } + return true; +} + +bool isPositiveSemiDefiniteFuzzy(const mat33 &m) { + // test if all upper left determinants are positive + if (m(0, 0) < -kIsZero) { // upper 1x1 + return false; + } + if (m(0, 0) * m(1, 1) - m(0, 1) * m(1, 0) < -kIsZero) { // upper 2x2 + return false; + } + if ((m(0, 0) * (m(1, 1) * m(2, 2) - m(1, 2) * m(2, 1)) - + m(0, 1) * (m(1, 0) * m(2, 2) - m(1, 2) * m(2, 0)) + + m(0, 2) * (m(1, 0) * m(2, 1) - m(1, 1) * m(2, 0))) < -kIsZero) { + return false; + } + return true; +} + +idScalar determinant(const mat33 &m) { + return m(0, 0) * m(1, 1) * m(2, 2) + m(0, 1) * m(1, 2) * m(2, 0) + m(0, 2) * m(1, 0) * m(2, 1) - + m(0, 2) * m(1, 1) * m(2, 0) - m(0, 0) * m(1, 2) * m(2, 1) - m(0, 1) * m(1, 0) * m(2, 2); +} + +bool isValidInertiaMatrix(const mat33 &I, const int index, bool has_fixed_joint) { + // TODO(Thomas) do we really want this? + // in cases where the inertia tensor about the center of mass is zero, + // the determinant of the inertia tensor about the joint axis is almost + // zero and can have a very small negative value. + if (!isPositiveSemiDefiniteFuzzy(I)) { + error_message("invalid inertia matrix for body %d, not positive definite " + "(fixed joint)\n", + index); + error_message("matrix is:\n" + "[%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e]\n", + I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1), + I(2, 2)); + + return false; + } + + // check triangle inequality, must have I(i,i)+I(j,j)>=I(k,k) + if (!has_fixed_joint) { + if (I(0, 0) + I(1, 1) < I(2, 2)) { + error_message("invalid inertia tensor for body %d, I(0,0) + I(1,1) < I(2,2)\n", index); + error_message("matrix is:\n" + "[%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e]\n", + I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1), + I(2, 2)); + return false; + } + if (I(0, 0) + I(1, 1) < I(2, 2)) { + error_message("invalid inertia tensor for body %d, I(0,0) + I(1,1) < I(2,2)\n", index); + error_message("matrix is:\n" + "[%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e]\n", + I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1), + I(2, 2)); + return false; + } + if (I(1, 1) + I(2, 2) < I(0, 0)) { + error_message("invalid inertia tensor for body %d, I(1,1) + I(2,2) < I(0,0)\n", index); + error_message("matrix is:\n" + "[%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e;\n" + "%.20e %.20e %.20e]\n", + I(0, 0), I(0, 1), I(0, 2), I(1, 0), I(1, 1), I(1, 2), I(2, 0), I(2, 1), + I(2, 2)); + return false; + } + } + // check positive/zero diagonal elements + for (int i = 0; i < 3; i++) { + if (I(i, i) < 0) { // accept zero + error_message("invalid inertia tensor, I(%d,%d)= %e <0\n", i, i, I(i, i)); + return false; + } + } + // check symmetry + if (std::fabs(I(1, 0) - I(0, 1)) > kIsZero) { + error_message("invalid inertia tensor for body %d I(1,0)!=I(0,1). I(1,0)-I(0,1)= " + "%e\n", + index, I(1, 0) - I(0, 1)); + return false; + } + if (std::fabs(I(2, 0) - I(0, 2)) > kIsZero) { + error_message("invalid inertia tensor for body %d I(2,0)!=I(0,2). I(2,0)-I(0,2)= " + "%e\n", + index, I(2, 0) - I(0, 2)); + return false; + } + if (std::fabs(I(1, 2) - I(2, 1)) > kIsZero) { + error_message("invalid inertia tensor body %d I(1,2)!=I(2,1). I(1,2)-I(2,1)= %e\n", index, + I(1, 2) - I(2, 1)); + return false; + } + return true; +} + +bool isValidTransformMatrix(const mat33 &m) { +#define print_mat(x) \ + error_message("matrix is [%e, %e, %e; %e, %e, %e; %e, %e, %e]\n", x(0, 0), x(0, 1), x(0, 2), \ + x(1, 0), x(1, 1), x(1, 2), x(2, 0), x(2, 1), x(2, 2)) + + // check for unit length column vectors + for (int i = 0; i < 3; i++) { + const idScalar length_minus_1 = + std::fabs(m(0, i) * m(0, i) + m(1, i) * m(1, i) + m(2, i) * m(2, i) - 1.0); + if (length_minus_1 > kAxisLengthEpsilon) { + error_message("Not a valid rotation matrix (column %d not unit length)\n" + "column = [%.18e %.18e %.18e]\n" + "length-1.0= %.18e\n", + i, m(0, i), m(1, i), m(2, i), length_minus_1); + print_mat(m); + return false; + } + } + // check for orthogonal column vectors + if (std::fabs(m(0, 0) * m(0, 1) + m(1, 0) * m(1, 1) + m(2, 0) * m(2, 1)) > kAxisLengthEpsilon) { + error_message("Not a valid rotation matrix (columns 0 and 1 not orthogonal)\n"); + print_mat(m); + return false; + } + if (std::fabs(m(0, 0) * m(0, 2) + m(1, 0) * m(1, 2) + m(2, 0) * m(2, 2)) > kAxisLengthEpsilon) { + error_message("Not a valid rotation matrix (columns 0 and 2 not orthogonal)\n"); + print_mat(m); + return false; + } + if (std::fabs(m(0, 1) * m(0, 2) + m(1, 1) * m(1, 2) + m(2, 1) * m(2, 2)) > kAxisLengthEpsilon) { + error_message("Not a valid rotation matrix (columns 0 and 2 not orthogonal)\n"); + print_mat(m); + return false; + } + // check determinant (rotation not reflection) + if (determinant(m) <= 0) { + error_message("Not a valid rotation matrix (determinant <=0)\n"); + print_mat(m); + return false; + } + return true; +} + +bool isUnitVector(const vec3 &vector) { + return std::fabs(vector(0) * vector(0) + vector(1) * vector(1) + vector(2) * vector(2) - 1.0) < + kIsZero; +} + +vec3 rpyFromMatrix(const mat33 &rot) { + vec3 rpy; + rpy(2) = std::atan2(-rot(1, 0), rot(0, 0)); + rpy(1) = std::atan2(rot(2, 0), std::cos(rpy(2)) * rot(0, 0) - std::sin(rpy(0)) * rot(1, 0)); + rpy(0) = std::atan2(-rot(2, 0), rot(2, 2)); + return rpy; +} +} diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/IDMath.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/IDMath.hpp new file mode 100644 index 000000000..63699712a --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/IDMath.hpp @@ -0,0 +1,98 @@ +/// @file Math utility functions used in inverse dynamics library. +/// Defined here as they may not be provided by the math library. + +#ifndef IDMATH_HPP_ +#define IDMATH_HPP_ +#include "IDConfig.hpp" + +namespace btInverseDynamics { +/// set all elements to zero +void setZero(vec3& v); +/// set all elements to zero +void setZero(vecx& v); +/// set all elements to zero +void setZero(mat33& m); + +/// return maximum absolute value +idScalar maxAbs(const vecx& v); +#ifndef ID_LINEAR_MATH_USE_EIGEN +/// return maximum absolute value +idScalar maxAbs(const vec3& v); +#endif //ID_LINEAR_MATH_USE_EIGEN + +#if (defined BT_ID_HAVE_MAT3X) +idScalar maxAbsMat3x(const mat3x& m); +void setZero(mat3x&m); +// define math functions on mat3x here to avoid allocations in operators. +void mul(const mat33&a, const mat3x&b, mat3x* result); +void add(const mat3x&a, const mat3x&b, mat3x* result); +void sub(const mat3x&a, const mat3x&b, mat3x* result); +#endif + +/// get offset vector & transform matrix from DH parameters +/// TODO: add documentation +void getVecMatFromDH(idScalar theta, idScalar d, idScalar a, idScalar alpha, vec3* r, mat33* T); + +/// Check if a 3x3 matrix is positive definite +/// @param m a 3x3 matrix +/// @return true if m>0, false otherwise +bool isPositiveDefinite(const mat33& m); + +/// Check if a 3x3 matrix is positive semi definite +/// @param m a 3x3 matrix +/// @return true if m>=0, false otherwise +bool isPositiveSemiDefinite(const mat33& m); +/// Check if a 3x3 matrix is positive semi definite within numeric limits +/// @param m a 3x3 matrix +/// @return true if m>=-eps, false otherwise +bool isPositiveSemiDefiniteFuzzy(const mat33& m); + +/// Determinant of 3x3 matrix +/// NOTE: implemented here for portability, as determinant operation +/// will be implemented differently for various matrix/vector libraries +/// @param m a 3x3 matrix +/// @return det(m) +idScalar determinant(const mat33& m); + +/// Test if a 3x3 matrix satisfies some properties of inertia matrices +/// @param I a 3x3 matrix +/// @param index body index (for error messages) +/// @param has_fixed_joint: if true, positive semi-definite matrices are accepted +/// @return true if I satisfies inertia matrix properties, false otherwise. +bool isValidInertiaMatrix(const mat33& I, int index, bool has_fixed_joint); + +/// Check if a 3x3 matrix is a valid transform (rotation) matrix +/// @param m a 3x3 matrix +/// @return true if m is a rotation matrix, false otherwise +bool isValidTransformMatrix(const mat33& m); +/// Transform matrix from parent to child frame, +/// when the child frame is rotated about @param axis by @angle +/// (mathematically positive) +/// @param axis the axis of rotation +/// @param angle rotation angle +/// @param T pointer to transform matrix +void bodyTParentFromAxisAngle(const vec3& axis, const idScalar& angle, mat33* T); + +/// Check if this is a unit vector +/// @param vector +/// @return true if |vector|=1 within numeric limits +bool isUnitVector(const vec3& vector); + +/// @input a vector in R^3 +/// @returns corresponding spin tensor +mat33 tildeOperator(const vec3& v); +/// @param alpha angle in radians +/// @returns transform matrix for ratation with @param alpha about x-axis +mat33 transformX(const idScalar& alpha); +/// @param beta angle in radians +/// @returns transform matrix for ratation with @param beta about y-axis +mat33 transformY(const idScalar& beta); +/// @param gamma angle in radians +/// @returns transform matrix for ratation with @param gamma about z-axis +mat33 transformZ(const idScalar& gamma); +///calculate rpy angles (x-y-z Euler angles) from a given rotation matrix +/// @param rot rotation matrix +/// @returns x-y-z Euler angles +vec3 rpyFromMatrix(const mat33&rot); +} +#endif // IDMATH_HPP_ diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/MultiBodyTree.cpp b/Engine/lib/bullet/src/BulletInverseDynamics/MultiBodyTree.cpp new file mode 100644 index 000000000..4235f138d --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/MultiBodyTree.cpp @@ -0,0 +1,445 @@ +#include "MultiBodyTree.hpp" + +#include +#include +#include + +#include "IDMath.hpp" +#include "details/MultiBodyTreeImpl.hpp" +#include "details/MultiBodyTreeInitCache.hpp" + +namespace btInverseDynamics { + +MultiBodyTree::MultiBodyTree() + : m_is_finalized(false), + m_mass_parameters_are_valid(true), + m_accept_invalid_mass_parameters(false), + m_impl(0x0), + m_init_cache(0x0) { + m_init_cache = new InitCache(); +} + +MultiBodyTree::~MultiBodyTree() { + delete m_impl; + delete m_init_cache; +} + +void MultiBodyTree::setAcceptInvalidMassParameters(bool flag) { + m_accept_invalid_mass_parameters = flag; +} + +bool MultiBodyTree::getAcceptInvalidMassProperties() const { + return m_accept_invalid_mass_parameters; +} + +int MultiBodyTree::getBodyOrigin(const int body_index, vec3 *world_origin) const { + return m_impl->getBodyOrigin(body_index, world_origin); +} + +int MultiBodyTree::getBodyCoM(const int body_index, vec3 *world_com) const { + return m_impl->getBodyCoM(body_index, world_com); +} + +int MultiBodyTree::getBodyTransform(const int body_index, mat33 *world_T_body) const { + return m_impl->getBodyTransform(body_index, world_T_body); +} +int MultiBodyTree::getBodyAngularVelocity(const int body_index, vec3 *world_omega) const { + return m_impl->getBodyAngularVelocity(body_index, world_omega); +} +int MultiBodyTree::getBodyLinearVelocity(const int body_index, vec3 *world_velocity) const { + return m_impl->getBodyLinearVelocity(body_index, world_velocity); +} + +int MultiBodyTree::getBodyLinearVelocityCoM(const int body_index, vec3 *world_velocity) const { + return m_impl->getBodyLinearVelocityCoM(body_index, world_velocity); +} + +int MultiBodyTree::getBodyAngularAcceleration(const int body_index, vec3 *world_dot_omega) const { + return m_impl->getBodyAngularAcceleration(body_index, world_dot_omega); +} +int MultiBodyTree::getBodyLinearAcceleration(const int body_index, vec3 *world_acceleration) const { + return m_impl->getBodyLinearAcceleration(body_index, world_acceleration); +} + +int MultiBodyTree::getParentRParentBodyRef(const int body_index, vec3* r) const { + return m_impl->getParentRParentBodyRef(body_index, r); +} + +int MultiBodyTree::getBodyTParentRef(const int body_index, mat33* T) const { + return m_impl->getBodyTParentRef(body_index, T); +} + +int MultiBodyTree::getBodyAxisOfMotion(const int body_index, vec3* axis) const { + return m_impl->getBodyAxisOfMotion(body_index, axis); +} + +void MultiBodyTree::printTree() { m_impl->printTree(); } +void MultiBodyTree::printTreeData() { m_impl->printTreeData(); } + +int MultiBodyTree::numBodies() const { return m_impl->m_num_bodies; } + +int MultiBodyTree::numDoFs() const { return m_impl->m_num_dofs; } + +int MultiBodyTree::calculateInverseDynamics(const vecx &q, const vecx &u, const vecx &dot_u, + vecx *joint_forces) { + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == m_impl->calculateInverseDynamics(q, u, dot_u, joint_forces)) { + error_message("error in inverse dynamics calculation\n"); + return -1; + } + return 0; +} + +int MultiBodyTree::calculateMassMatrix(const vecx &q, const bool update_kinematics, + const bool initialize_matrix, + const bool set_lower_triangular_matrix, matxx *mass_matrix) { + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == + m_impl->calculateMassMatrix(q, update_kinematics, initialize_matrix, + set_lower_triangular_matrix, mass_matrix)) { + error_message("error in mass matrix calculation\n"); + return -1; + } + return 0; +} + +int MultiBodyTree::calculateMassMatrix(const vecx &q, matxx *mass_matrix) { + return calculateMassMatrix(q, true, true, true, mass_matrix); +} + + + +int MultiBodyTree::calculateKinematics(const vecx& q, const vecx& u, const vecx& dot_u) { + vec3 world_gravity(m_impl->m_world_gravity); + // temporarily set gravity to zero, to ensure we get the actual accelerations + setZero(m_impl->m_world_gravity); + + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == m_impl->calculateKinematics(q, u, dot_u, + MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY_ACCELERATION)) { + error_message("error in kinematics calculation\n"); + return -1; + } + + m_impl->m_world_gravity=world_gravity; + return 0; +} + + +int MultiBodyTree::calculatePositionKinematics(const vecx& q) { + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == m_impl->calculateKinematics(q, q, q, + MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY)) { + error_message("error in kinematics calculation\n"); + return -1; + } + return 0; +} + +int MultiBodyTree::calculatePositionAndVelocityKinematics(const vecx& q, const vecx& u) { + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == m_impl->calculateKinematics(q, u, u, + MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY)) { + error_message("error in kinematics calculation\n"); + return -1; + } + return 0; +} + + +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) +int MultiBodyTree::calculateJacobians(const vecx& q, const vecx& u) { + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == m_impl->calculateJacobians(q, u, + MultiBodyTree::MultiBodyImpl::POSITION_VELOCITY)) { + error_message("error in jacobian calculation\n"); + return -1; + } + return 0; +} + +int MultiBodyTree::calculateJacobians(const vecx& q){ + if (false == m_is_finalized) { + error_message("system has not been initialized\n"); + return -1; + } + if (-1 == m_impl->calculateJacobians(q, q, + MultiBodyTree::MultiBodyImpl::POSITION_ONLY)) { + error_message("error in jacobian calculation\n"); + return -1; + } + return 0; +} + +int MultiBodyTree::getBodyDotJacobianTransU(const int body_index, vec3* world_dot_jac_trans_u) const { + return m_impl->getBodyDotJacobianTransU(body_index,world_dot_jac_trans_u); +} + +int MultiBodyTree::getBodyDotJacobianRotU(const int body_index, vec3* world_dot_jac_rot_u) const { + return m_impl->getBodyDotJacobianRotU(body_index,world_dot_jac_rot_u); +} + +int MultiBodyTree::getBodyJacobianTrans(const int body_index, mat3x* world_jac_trans) const { + return m_impl->getBodyJacobianTrans(body_index,world_jac_trans); +} + +int MultiBodyTree::getBodyJacobianRot(const int body_index, mat3x* world_jac_rot) const { + return m_impl->getBodyJacobianRot(body_index,world_jac_rot); +} + + +#endif + +int MultiBodyTree::addBody(int body_index, int parent_index, JointType joint_type, + const vec3 &parent_r_parent_body_ref, const mat33 &body_T_parent_ref, + const vec3 &body_axis_of_motion_, idScalar mass, + const vec3 &body_r_body_com, const mat33 &body_I_body, + const int user_int, void *user_ptr) { + if (body_index < 0) { + error_message("body index must be positive (got %d)\n", body_index); + return -1; + } + vec3 body_axis_of_motion(body_axis_of_motion_); + switch (joint_type) { + case REVOLUTE: + case PRISMATIC: + // check if axis is unit vector + if (!isUnitVector(body_axis_of_motion)) { + warning_message( + "axis of motion not a unit axis ([%f %f %f]), will use normalized vector\n", + body_axis_of_motion(0), body_axis_of_motion(1), body_axis_of_motion(2)); + idScalar length = std::sqrt(std::pow(body_axis_of_motion(0), 2) + + std::pow(body_axis_of_motion(1), 2) + + std::pow(body_axis_of_motion(2), 2)); + if (length < std::sqrt(std::numeric_limits::min())) { + error_message("axis of motion vector too short (%e)\n", length); + return -1; + } + body_axis_of_motion = (1.0 / length) * body_axis_of_motion; + } + break; + case FIXED: + break; + case FLOATING: + break; + default: + error_message("unknown joint type %d\n", joint_type); + return -1; + } + + // sanity check for mass properties. Zero mass is OK. + if (mass < 0) { + m_mass_parameters_are_valid = false; + error_message("Body %d has invalid mass %e\n", body_index, mass); + if (!m_accept_invalid_mass_parameters) { + return -1; + } + } + + if (!isValidInertiaMatrix(body_I_body, body_index, FIXED == joint_type)) { + m_mass_parameters_are_valid = false; + // error message printed in function call + if (!m_accept_invalid_mass_parameters) { + return -1; + } + } + + if (!isValidTransformMatrix(body_T_parent_ref)) { + return -1; + } + + return m_init_cache->addBody(body_index, parent_index, joint_type, parent_r_parent_body_ref, + body_T_parent_ref, body_axis_of_motion, mass, body_r_body_com, + body_I_body, user_int, user_ptr); +} + +int MultiBodyTree::getParentIndex(const int body_index, int *parent_index) const { + return m_impl->getParentIndex(body_index, parent_index); +} + +int MultiBodyTree::getUserInt(const int body_index, int *user_int) const { + return m_impl->getUserInt(body_index, user_int); +} + +int MultiBodyTree::getUserPtr(const int body_index, void **user_ptr) const { + return m_impl->getUserPtr(body_index, user_ptr); +} + +int MultiBodyTree::setUserInt(const int body_index, const int user_int) { + return m_impl->setUserInt(body_index, user_int); +} + +int MultiBodyTree::setUserPtr(const int body_index, void *const user_ptr) { + return m_impl->setUserPtr(body_index, user_ptr); +} + +int MultiBodyTree::finalize() { + const int &num_bodies = m_init_cache->numBodies(); + const int &num_dofs = m_init_cache->numDoFs(); + + if(num_dofs<=0) { + error_message("Need num_dofs>=1, but num_dofs= %d\n", num_dofs); + //return -1; + } + + // 1 allocate internal MultiBody structure + m_impl = new MultiBodyImpl(num_bodies, num_dofs); + + // 2 build new index set assuring index(parent) < index(child) + if (-1 == m_init_cache->buildIndexSets()) { + return -1; + } + m_init_cache->getParentIndexArray(&m_impl->m_parent_index); + + // 3 setup internal kinematic and dynamic data + for (int index = 0; index < num_bodies; index++) { + InertiaData inertia; + JointData joint; + if (-1 == m_init_cache->getInertiaData(index, &inertia)) { + return -1; + } + if (-1 == m_init_cache->getJointData(index, &joint)) { + return -1; + } + + RigidBody &rigid_body = m_impl->m_body_list[index]; + + rigid_body.m_mass = inertia.m_mass; + rigid_body.m_body_mass_com = inertia.m_mass * inertia.m_body_pos_body_com; + rigid_body.m_body_I_body = inertia.m_body_I_body; + rigid_body.m_joint_type = joint.m_type; + rigid_body.m_parent_pos_parent_body_ref = joint.m_parent_pos_parent_child_ref; + rigid_body.m_body_T_parent_ref = joint.m_child_T_parent_ref; + rigid_body.m_parent_pos_parent_body_ref = joint.m_parent_pos_parent_child_ref; + rigid_body.m_joint_type = joint.m_type; + + // Set joint Jacobians. Note that the dimension is always 3x1 here to avoid variable sized + // matrices. + switch (rigid_body.m_joint_type) { + case REVOLUTE: + rigid_body.m_Jac_JR(0) = joint.m_child_axis_of_motion(0); + rigid_body.m_Jac_JR(1) = joint.m_child_axis_of_motion(1); + rigid_body.m_Jac_JR(2) = joint.m_child_axis_of_motion(2); + rigid_body.m_Jac_JT(0) = 0.0; + rigid_body.m_Jac_JT(1) = 0.0; + rigid_body.m_Jac_JT(2) = 0.0; + break; + case PRISMATIC: + rigid_body.m_Jac_JR(0) = 0.0; + rigid_body.m_Jac_JR(1) = 0.0; + rigid_body.m_Jac_JR(2) = 0.0; + rigid_body.m_Jac_JT(0) = joint.m_child_axis_of_motion(0); + rigid_body.m_Jac_JT(1) = joint.m_child_axis_of_motion(1); + rigid_body.m_Jac_JT(2) = joint.m_child_axis_of_motion(2); + break; + case FIXED: + // NOTE/TODO: dimension really should be zero .. + rigid_body.m_Jac_JR(0) = 0.0; + rigid_body.m_Jac_JR(1) = 0.0; + rigid_body.m_Jac_JR(2) = 0.0; + rigid_body.m_Jac_JT(0) = 0.0; + rigid_body.m_Jac_JT(1) = 0.0; + rigid_body.m_Jac_JT(2) = 0.0; + break; + case FLOATING: + // NOTE/TODO: this is not really correct. + // the Jacobians should be 3x3 matrices here ! + rigid_body.m_Jac_JR(0) = 0.0; + rigid_body.m_Jac_JR(1) = 0.0; + rigid_body.m_Jac_JR(2) = 0.0; + rigid_body.m_Jac_JT(0) = 0.0; + rigid_body.m_Jac_JT(1) = 0.0; + rigid_body.m_Jac_JT(2) = 0.0; + break; + default: + error_message("unsupported joint type %d\n", rigid_body.m_joint_type); + return -1; + } + } + + // 4 assign degree of freedom indices & build per-joint-type index arrays + if (-1 == m_impl->generateIndexSets()) { + error_message("generating index sets\n"); + return -1; + } + + // 5 do some pre-computations .. + m_impl->calculateStaticData(); + + // 6. make sure all user forces are set to zero, as this might not happen + // in the vector ctors. + m_impl->clearAllUserForcesAndMoments(); + + m_is_finalized = true; + return 0; +} + +int MultiBodyTree::setGravityInWorldFrame(const vec3 &gravity) { + return m_impl->setGravityInWorldFrame(gravity); +} + +int MultiBodyTree::getJointType(const int body_index, JointType *joint_type) const { + return m_impl->getJointType(body_index, joint_type); +} + +int MultiBodyTree::getJointTypeStr(const int body_index, const char **joint_type) const { + return m_impl->getJointTypeStr(body_index, joint_type); +} + +int MultiBodyTree::getDoFOffset(const int body_index, int *q_offset) const { + return m_impl->getDoFOffset(body_index, q_offset); +} + +int MultiBodyTree::setBodyMass(const int body_index, idScalar mass) { + return m_impl->setBodyMass(body_index, mass); +} + +int MultiBodyTree::setBodyFirstMassMoment(const int body_index, const vec3& first_mass_moment) { + return m_impl->setBodyFirstMassMoment(body_index, first_mass_moment); +} + +int MultiBodyTree::setBodySecondMassMoment(const int body_index, const mat33& second_mass_moment) { + return m_impl->setBodySecondMassMoment(body_index, second_mass_moment); +} + +int MultiBodyTree::getBodyMass(const int body_index, idScalar *mass) const { + return m_impl->getBodyMass(body_index, mass); +} + +int MultiBodyTree::getBodyFirstMassMoment(const int body_index, vec3 *first_mass_moment) const { + return m_impl->getBodyFirstMassMoment(body_index, first_mass_moment); +} + +int MultiBodyTree::getBodySecondMassMoment(const int body_index, mat33 *second_mass_moment) const { + return m_impl->getBodySecondMassMoment(body_index, second_mass_moment); +} + +void MultiBodyTree::clearAllUserForcesAndMoments() { m_impl->clearAllUserForcesAndMoments(); } + +int MultiBodyTree::addUserForce(const int body_index, const vec3 &body_force) { + return m_impl->addUserForce(body_index, body_force); +} + +int MultiBodyTree::addUserMoment(const int body_index, const vec3 &body_moment) { + return m_impl->addUserMoment(body_index, body_moment); +} + +} diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/MultiBodyTree.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/MultiBodyTree.hpp new file mode 100644 index 000000000..d235aa6e7 --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/MultiBodyTree.hpp @@ -0,0 +1,363 @@ +#ifndef MULTIBODYTREE_HPP_ +#define MULTIBODYTREE_HPP_ + +#include "IDConfig.hpp" +#include "IDMath.hpp" + +namespace btInverseDynamics { + +/// Enumeration of supported joint types +enum JointType { + /// no degree of freedom, moves with parent + FIXED = 0, + /// one rotational degree of freedom relative to parent + REVOLUTE, + /// one translational degree of freedom relative to parent + PRISMATIC, + /// six degrees of freedom relative to parent + FLOATING +}; + +/// Interface class for calculating inverse dynamics for tree structured +/// multibody systems +/// +/// Note on degrees of freedom +/// The q vector contains the generalized coordinate set defining the tree's configuration. +/// Every joint adds elements that define the corresponding link's frame pose relative to +/// its parent. For the joint types that is: +/// - FIXED: none +/// - REVOLUTE: angle of rotation [rad] +/// - PRISMATIC: displacement [m] +/// - FLOATING: Euler x-y-z angles [rad] and displacement in body-fixed frame of parent [m] +/// (in that order) +/// The u vector contains the generalized speeds, which are +/// - FIXED: none +/// - REVOLUTE: time derivative of angle of rotation [rad/s] +/// - PRISMATIC: time derivative of displacement [m/s] +/// - FLOATING: angular velocity [rad/s] (*not* time derivative of rpy angles) +/// and time derivative of displacement in parent frame [m/s] +/// +/// The q and u vectors are obtained by stacking contributions of all bodies in one +/// vector in the order of body indices. +/// +/// Note on generalized forces: analogous to u, i.e., +/// - FIXED: none +/// - REVOLUTE: moment [Nm], about joint axis +/// - PRISMATIC: force [N], along joint axis +/// - FLOATING: moment vector [Nm] and force vector [N], both in body-fixed frame +/// (in that order) +/// +/// TODO - force element interface (friction, springs, dampers, etc) +/// - gears and motor inertia +class MultiBodyTree { +public: + ID_DECLARE_ALIGNED_ALLOCATOR(); + /// The contructor. + /// Initialization & allocation is via addBody and buildSystem calls. + MultiBodyTree(); + /// the destructor. This also deallocates all memory + ~MultiBodyTree(); + + /// Add body to the system. this allocates memory and not real-time safe. + /// This only adds the data to an initial cache. After all bodies have been + /// added, + /// the system is setup using the buildSystem call + /// @param body_index index of the body to be added. Must >=0, =dim(u) + /// @param dot_u time derivative of u + /// @param joint_forces this is where the resulting joint forces will be + /// stored. dim(joint_forces) = dim(u) + /// @return 0 on success, -1 on error + int calculateInverseDynamics(const vecx& q, const vecx& u, const vecx& dot_u, + vecx* joint_forces); + /// Calculate joint space mass matrix + /// @param q generalized coordinates + /// @param initialize_matrix if true, initialize mass matrix with zero. + /// If mass_matrix is initialized to zero externally and only used + /// for mass matrix computations for the same system, it is safe to + /// set this to false. + /// @param set_lower_triangular_matrix if true, the lower triangular section of mass_matrix + /// is also populated, otherwise not. + /// @param mass_matrix matrix for storing the output (should be dim(q)xdim(q)) + /// @return -1 on error, 0 on success + int calculateMassMatrix(const vecx& q, const bool update_kinematics, + const bool initialize_matrix, const bool set_lower_triangular_matrix, + matxx* mass_matrix); + + /// Calculate joint space mass matrix. + /// This version will update kinematics, initialize all mass_matrix elements to zero and + /// populate all mass matrix entries. + /// @param q generalized coordinates + /// @param mass_matrix matrix for storing the output (should be dim(q)xdim(q)) + /// @return -1 on error, 0 on success + int calculateMassMatrix(const vecx& q, matxx* mass_matrix); + + + /// Calculates kinematics also calculated in calculateInverseDynamics, + /// but not dynamics. + /// This function ensures that correct accelerations are computed that do not + /// contain gravitational acceleration terms. + /// Does not calculate Jacobians, but only vector quantities (positions, velocities & accelerations) + int calculateKinematics(const vecx& q, const vecx& u, const vecx& dot_u); + /// Calculate position kinematics + int calculatePositionKinematics(const vecx& q); + /// Calculate position and velocity kinematics + int calculatePositionAndVelocityKinematics(const vecx& q, const vecx& u); + +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + /// Calculate Jacobians (dvel/du), as well as velocity-dependent accelearation components + /// d(Jacobian)/dt*u + /// This function assumes that calculateInverseDynamics was called, or calculateKinematics, + /// or calculatePositionAndVelocityKinematics + int calculateJacobians(const vecx& q, const vecx& u); + /// Calculate Jacobians (dvel/du) + /// This function assumes that calculateInverseDynamics was called, or + /// one of the calculateKineamtics functions + int calculateJacobians(const vecx& q); +#endif // BT_ID_HAVE_MAT3X + + + /// set gravitational acceleration + /// the default is [0;0;-9.8] in the world frame + /// @param gravity the gravitational acceleration in world frame + /// @return 0 on success, -1 on error + int setGravityInWorldFrame(const vec3& gravity); + /// returns number of bodies in tree + int numBodies() const; + /// returns number of mechanical degrees of freedom (dimension of q-vector) + int numDoFs() const; + /// get origin of a body-fixed frame, represented in world frame + /// @param body_index index for frame/body + /// @param world_origin pointer for return data + /// @return 0 on success, -1 on error + int getBodyOrigin(const int body_index, vec3* world_origin) const; + /// get center of mass of a body, represented in world frame + /// @param body_index index for frame/body + /// @param world_com pointer for return data + /// @return 0 on success, -1 on error + int getBodyCoM(const int body_index, vec3* world_com) const; + /// get transform from of a body-fixed frame to the world frame + /// @param body_index index for frame/body + /// @param world_T_body pointer for return data + /// @return 0 on success, -1 on error + int getBodyTransform(const int body_index, mat33* world_T_body) const; + /// get absolute angular velocity for a body, represented in the world frame + /// @param body_index index for frame/body + /// @param world_omega pointer for return data + /// @return 0 on success, -1 on error + int getBodyAngularVelocity(const int body_index, vec3* world_omega) const; + /// get linear velocity of a body, represented in world frame + /// @param body_index index for frame/body + /// @param world_velocity pointer for return data + /// @return 0 on success, -1 on error + int getBodyLinearVelocity(const int body_index, vec3* world_velocity) const; + /// get linear velocity of a body's CoM, represented in world frame + /// (not required for inverse dynamics, provided for convenience) + /// @param body_index index for frame/body + /// @param world_vel_com pointer for return data + /// @return 0 on success, -1 on error + int getBodyLinearVelocityCoM(const int body_index, vec3* world_velocity) const; + /// get origin of a body-fixed frame, represented in world frame + /// @param body_index index for frame/body + /// @param world_origin pointer for return data + /// @return 0 on success, -1 on error + int getBodyAngularAcceleration(const int body_index, vec3* world_dot_omega) const; + /// get origin of a body-fixed frame, represented in world frame + /// NOTE: this will include the gravitational acceleration, so the actual acceleration is + /// obtainened by setting gravitational acceleration to zero, or subtracting it. + /// @param body_index index for frame/body + /// @param world_origin pointer for return data + /// @return 0 on success, -1 on error + int getBodyLinearAcceleration(const int body_index, vec3* world_acceleration) const; + +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + // get translational jacobian, in world frame (dworld_velocity/du) + int getBodyJacobianTrans(const int body_index, mat3x* world_jac_trans) const; + // get rotational jacobian, in world frame (dworld_omega/du) + int getBodyJacobianRot(const int body_index, mat3x* world_jac_rot) const; + // get product of translational jacobian derivative * generatlized velocities + int getBodyDotJacobianTransU(const int body_index, vec3* world_dot_jac_trans_u) const; + // get product of rotational jacobian derivative * generatlized velocities + int getBodyDotJacobianRotU(const int body_index, vec3* world_dot_jac_rot_u) const; +#endif // BT_ID_HAVE_MAT3X + + /// returns the (internal) index of body + /// @param body_index is the index of a body + /// @param parent_index pointer to where parent index will be stored + /// @return 0 on success, -1 on error + int getParentIndex(const int body_index, int* parent_index) const; + /// get joint type + /// @param body_index index of the body + /// @param joint_type the corresponding joint type + /// @return 0 on success, -1 on failure + int getJointType(const int body_index, JointType* joint_type) const; + /// get joint type as string + /// @param body_index index of the body + /// @param joint_type string naming the corresponding joint type + /// @return 0 on success, -1 on failure + int getJointTypeStr(const int body_index, const char** joint_type) const; + /// get offset translation to parent body (see addBody) + /// @param body_index index of the body + /// @param r the offset translation (see above) + /// @return 0 on success, -1 on failure + int getParentRParentBodyRef(const int body_index, vec3* r) const; + /// get offset rotation to parent body (see addBody) + /// @param body_index index of the body + /// @param T the transform (see above) + /// @return 0 on success, -1 on failure + int getBodyTParentRef(const int body_index, mat33* T) const; + /// get axis of motion (see addBody) + /// @param body_index index of the body + /// @param axis the axis (see above) + /// @return 0 on success, -1 on failure + int getBodyAxisOfMotion(const int body_index, vec3* axis) const; + /// get offset for degrees of freedom of this body into the q-vector + /// @param body_index index of the body + /// @param q_offset offset the q vector + /// @return -1 on error, 0 on success + int getDoFOffset(const int body_index, int* q_offset) const; + /// get user integer. not used by the library. + /// @param body_index index of the body + /// @param user_int the user integer + /// @return 0 on success, -1 on error + int getUserInt(const int body_index, int* user_int) const; + /// get user pointer. not used by the library. + /// @param body_index index of the body + /// @param user_ptr the user pointer + /// @return 0 on success, -1 on error + int getUserPtr(const int body_index, void** user_ptr) const; + /// set user integer. not used by the library. + /// @param body_index index of the body + /// @param user_int the user integer + /// @return 0 on success, -1 on error + int setUserInt(const int body_index, const int user_int); + /// set user pointer. not used by the library. + /// @param body_index index of the body + /// @param user_ptr the user pointer + /// @return 0 on success, -1 on error + int setUserPtr(const int body_index, void* const user_ptr); + /// set mass for a body + /// @param body_index index of the body + /// @param mass the mass to set + /// @return 0 on success, -1 on failure + int setBodyMass(const int body_index, const idScalar mass); + /// set first moment of mass for a body + /// (mass * center of mass, in body fixed frame, relative to joint) + /// @param body_index index of the body + /// @param first_mass_moment the vector to set + /// @return 0 on success, -1 on failure + int setBodyFirstMassMoment(const int body_index, const vec3& first_mass_moment); + /// set second moment of mass for a body + /// (moment of inertia, in body fixed frame, relative to joint) + /// @param body_index index of the body + /// @param second_mass_moment the inertia matrix + /// @return 0 on success, -1 on failure + int setBodySecondMassMoment(const int body_index, const mat33& second_mass_moment); + /// get mass for a body + /// @param body_index index of the body + /// @param mass the mass + /// @return 0 on success, -1 on failure + int getBodyMass(const int body_index, idScalar* mass) const; + /// get first moment of mass for a body + /// (mass * center of mass, in body fixed frame, relative to joint) + /// @param body_index index of the body + /// @param first_moment the vector + /// @return 0 on success, -1 on failure + int getBodyFirstMassMoment(const int body_index, vec3* first_mass_moment) const; + /// get second moment of mass for a body + /// (moment of inertia, in body fixed frame, relative to joint) + /// @param body_index index of the body + /// @param second_mass_moment the inertia matrix + /// @return 0 on success, -1 on failure + int getBodySecondMassMoment(const int body_index, mat33* second_mass_moment) const; + /// set all user forces and moments to zero + void clearAllUserForcesAndMoments(); + /// Add an external force to a body, acting at the origin of the body-fixed frame. + /// Calls to addUserForce are cumulative. Set the user force and moment to zero + /// via clearAllUserForcesAndMoments() + /// @param body_force the force represented in the body-fixed frame of reference + /// @return 0 on success, -1 on error + int addUserForce(const int body_index, const vec3& body_force); + /// Add an external moment to a body. + /// Calls to addUserMoment are cumulative. Set the user force and moment to zero + /// via clearAllUserForcesAndMoments() + /// @param body_moment the moment represented in the body-fixed frame of reference + /// @return 0 on success, -1 on error + int addUserMoment(const int body_index, const vec3& body_moment); + +private: + // flag indicating if system has been initialized + bool m_is_finalized; + // flag indicating if mass properties are physically valid + bool m_mass_parameters_are_valid; + // flag defining if unphysical mass parameters are accepted + bool m_accept_invalid_mass_parameters; + // This struct implements the inverse dynamics calculations + class MultiBodyImpl; + MultiBodyImpl* m_impl; + // cache data structure for initialization + class InitCache; + InitCache* m_init_cache; +}; +} // namespace btInverseDynamics +#endif // MULTIBODYTREE_HPP_ diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/details/IDEigenInterface.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/details/IDEigenInterface.hpp new file mode 100644 index 000000000..836395cea --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/details/IDEigenInterface.hpp @@ -0,0 +1,36 @@ +#ifndef INVDYNEIGENINTERFACE_HPP_ +#define INVDYNEIGENINTERFACE_HPP_ +#include "../IDConfig.hpp" +namespace btInverseDynamics { + +#define BT_ID_HAVE_MAT3X + +#ifdef BT_USE_DOUBLE_PRECISION +typedef Eigen::Matrix vecx; +typedef Eigen::Matrix vec3; +typedef Eigen::Matrix mat33; +typedef Eigen::Matrix matxx; +typedef Eigen::Matrix mat3x; +#else +typedef Eigen::Matrix vecx; +typedef Eigen::Matrix vec3; +typedef Eigen::Matrix mat33; +typedef Eigen::Matrix matxx; +typedef Eigen::Matrix mat3x; +#endif + +inline void resize(mat3x &m, Eigen::Index size) { + m.resize(3, size); + m.setZero(); +} + +inline void setMatxxElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, matxx*m){ + (*m)(row, col) = val; +} + +inline void setMat3xElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, mat3x*m){ + (*m)(row, col) = val; +} + +} +#endif // INVDYNEIGENINTERFACE_HPP_ diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp new file mode 100644 index 000000000..5bb4a33bd --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/details/IDLinearMathInterface.hpp @@ -0,0 +1,172 @@ +#ifndef IDLINEARMATHINTERFACE_HPP_ +#define IDLINEARMATHINTERFACE_HPP_ + +#include + +#include "../IDConfig.hpp" + +#include "../../LinearMath/btMatrix3x3.h" +#include "../../LinearMath/btVector3.h" +#include "../../LinearMath/btMatrixX.h" +#define BT_ID_HAVE_MAT3X + +namespace btInverseDynamics { +class vec3; +class vecx; +class mat33; +typedef btMatrixX matxx; + +class vec3 : public btVector3 { +public: + vec3() : btVector3() {} + vec3(const btVector3& btv) { *this = btv; } + idScalar& operator()(int i) { return (*this)[i]; } + const idScalar& operator()(int i) const { return (*this)[i]; } + int size() const { return 3; } + const vec3& operator=(const btVector3& rhs) { + *static_cast(this) = rhs; + return *this; + } +}; + +class mat33 : public btMatrix3x3 { +public: + mat33() : btMatrix3x3() {} + mat33(const btMatrix3x3& btm) { *this = btm; } + idScalar& operator()(int i, int j) { return (*this)[i][j]; } + const idScalar& operator()(int i, int j) const { return (*this)[i][j]; } + const mat33& operator=(const btMatrix3x3& rhs) { + *static_cast(this) = rhs; + return *this; + } + friend mat33 operator*(const idScalar& s, const mat33& a); + friend mat33 operator/(const mat33& a, const idScalar& s); +}; + +inline mat33 operator/(const mat33& a, const idScalar& s) { return a * (1.0 / s); } + +inline mat33 operator*(const idScalar& s, const mat33& a) { return a * s; } + +class vecx : public btVectorX { +public: + vecx(int size) : btVectorX(size) {} + const vecx& operator=(const btVectorX& rhs) { + *static_cast(this) = rhs; + return *this; + } + + idScalar& operator()(int i) { return (*this)[i]; } + const idScalar& operator()(int i) const { return (*this)[i]; } + + friend vecx operator*(const vecx& a, const idScalar& s); + friend vecx operator*(const idScalar& s, const vecx& a); + + friend vecx operator+(const vecx& a, const vecx& b); + friend vecx operator-(const vecx& a, const vecx& b); + friend vecx operator/(const vecx& a, const idScalar& s); +}; + +inline vecx operator*(const vecx& a, const idScalar& s) { + vecx result(a.size()); + for (int i = 0; i < result.size(); i++) { + result(i) = a(i) * s; + } + return result; +} +inline vecx operator*(const idScalar& s, const vecx& a) { return a * s; } +inline vecx operator+(const vecx& a, const vecx& b) { + vecx result(a.size()); + // TODO: error handling for a.size() != b.size()?? + if (a.size() != b.size()) { + error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size()); + abort(); + } + for (int i = 0; i < a.size(); i++) { + result(i) = a(i) + b(i); + } + + return result; +} + +inline vecx operator-(const vecx& a, const vecx& b) { + vecx result(a.size()); + // TODO: error handling for a.size() != b.size()?? + if (a.size() != b.size()) { + error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size()); + abort(); + } + for (int i = 0; i < a.size(); i++) { + result(i) = a(i) - b(i); + } + return result; +} +inline vecx operator/(const vecx& a, const idScalar& s) { + vecx result(a.size()); + for (int i = 0; i < result.size(); i++) { + result(i) = a(i) / s; + } + + return result; +} + +// use btMatrixX to implement 3xX matrix +class mat3x : public matxx { +public: + mat3x(){} + mat3x(const mat3x&rhs) { + matxx::resize(rhs.rows(), rhs.cols()); + *this = rhs; + } + mat3x(int rows, int cols): matxx(3,cols) { + } + void operator=(const mat3x& rhs) { + if (m_cols != rhs.m_cols) { + error_message("size missmatch, cols= %d but rhs.cols= %d\n", cols(), rhs.cols()); + abort(); + } + for(int i=0;isetElem(row, col, val); +} + +inline void setMat3xElem(const idArrayIdx row, const idArrayIdx col, const idScalar val, mat3x*m){ + m->setElem(row, col, val); +} + +} + +#endif // IDLINEARMATHINTERFACE_HPP_ diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/details/IDMatVec.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/details/IDMatVec.hpp new file mode 100644 index 000000000..4d3f6c87e --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/details/IDMatVec.hpp @@ -0,0 +1,415 @@ +/// @file Built-In Matrix-Vector functions +#ifndef IDMATVEC_HPP_ +#define IDMATVEC_HPP_ + +#include + +#include "../IDConfig.hpp" +#define BT_ID_HAVE_MAT3X + +namespace btInverseDynamics { +class vec3; +class vecx; +class mat33; +class matxx; +class mat3x; + +/// This is a very basic implementation to enable stand-alone use of the library. +/// The implementation is not really optimized and misses many features that you would +/// want from a "fully featured" linear math library. +class vec3 { +public: + idScalar& operator()(int i) { return m_data[i]; } + const idScalar& operator()(int i) const { return m_data[i]; } + const int size() const { return 3; } + const vec3& operator=(const vec3& rhs); + const vec3& operator+=(const vec3& b); + const vec3& operator-=(const vec3& b); + vec3 cross(const vec3& b) const; + idScalar dot(const vec3& b) const; + + friend vec3 operator*(const mat33& a, const vec3& b); + friend vec3 operator*(const vec3& a, const idScalar& s); + friend vec3 operator*(const idScalar& s, const vec3& a); + + friend vec3 operator+(const vec3& a, const vec3& b); + friend vec3 operator-(const vec3& a, const vec3& b); + friend vec3 operator/(const vec3& a, const idScalar& s); + +private: + idScalar m_data[3]; +}; + +class mat33 { +public: + idScalar& operator()(int i, int j) { return m_data[3 * i + j]; } + const idScalar& operator()(int i, int j) const { return m_data[3 * i + j]; } + const mat33& operator=(const mat33& rhs); + mat33 transpose() const; + const mat33& operator+=(const mat33& b); + const mat33& operator-=(const mat33& b); + + friend mat33 operator*(const mat33& a, const mat33& b); + friend vec3 operator*(const mat33& a, const vec3& b); + friend mat33 operator*(const mat33& a, const idScalar& s); + friend mat33 operator*(const idScalar& s, const mat33& a); + friend mat33 operator+(const mat33& a, const mat33& b); + friend mat33 operator-(const mat33& a, const mat33& b); + friend mat33 operator/(const mat33& a, const idScalar& s); + +private: + // layout is [0,1,2;3,4,5;6,7,8] + idScalar m_data[9]; +}; + +class vecx { +public: + vecx(int size) : m_size(size) { + m_data = static_cast(idMalloc(sizeof(idScalar) * size)); + } + ~vecx() { idFree(m_data); } + const vecx& operator=(const vecx& rhs); + idScalar& operator()(int i) { return m_data[i]; } + const idScalar& operator()(int i) const { return m_data[i]; } + const int& size() const { return m_size; } + + friend vecx operator*(const vecx& a, const idScalar& s); + friend vecx operator*(const idScalar& s, const vecx& a); + + friend vecx operator+(const vecx& a, const vecx& b); + friend vecx operator-(const vecx& a, const vecx& b); + friend vecx operator/(const vecx& a, const idScalar& s); + +private: + int m_size; + idScalar* m_data; +}; + +class matxx { +public: + matxx() { + m_data = 0x0; + m_cols=0; + m_rows=0; + } + matxx(int rows, int cols) : m_rows(rows), m_cols(cols) { + m_data = static_cast(idMalloc(sizeof(idScalar) * rows * cols)); + } + ~matxx() { idFree(m_data); } + idScalar& operator()(int row, int col) { return m_data[row * m_cols + col]; } + const idScalar& operator()(int row, int col) const { return m_data[row * m_cols + col]; } + const int& rows() const { return m_rows; } + const int& cols() const { return m_cols; } + +private: + int m_rows; + int m_cols; + idScalar* m_data; +}; + +class mat3x { +public: + mat3x() { + m_data = 0x0; + m_cols=0; + } + mat3x(const mat3x&rhs) { + m_cols=rhs.m_cols; + allocate(); + *this = rhs; + } + mat3x(int rows, int cols): m_cols(cols) { + allocate(); + }; + void operator=(const mat3x& rhs) { + if (m_cols != rhs.m_cols) { + error_message("size missmatch, cols= %d but rhs.cols= %d\n", cols(), rhs.cols()); + abort(); + } + for(int i=0;i<3*m_cols;i++) { + m_data[i] = rhs.m_data[i]; + } + } + + ~mat3x() { + free(); + } + idScalar& operator()(int row, int col) { return m_data[row * m_cols + col]; } + const idScalar& operator()(int row, int col) const { return m_data[row * m_cols + col]; } + int rows() const { return m_rows; } + const int& cols() const { return m_cols; } + void resize(int rows, int cols) { + m_cols=cols; + free(); + allocate(); + } + void setZero() { + memset(m_data,0x0,sizeof(idScalar)*m_rows*m_cols); + } + // avoid operators that would allocate -- use functions sub/add/mul in IDMath.hpp instead +private: + void allocate(){m_data = static_cast(idMalloc(sizeof(idScalar) * m_rows * m_cols));} + void free() { idFree(m_data);} + enum {m_rows=3}; + int m_cols; + idScalar* m_data; +}; + +inline void resize(mat3x &m, idArrayIdx size) { + m.resize(3, size); + m.setZero(); +} + +////////////////////////////////////////////////// +// Implementations +inline const vec3& vec3::operator=(const vec3& rhs) { + if (&rhs != this) { + memcpy(m_data, rhs.m_data, 3 * sizeof(idScalar)); + } + return *this; +} + +inline vec3 vec3::cross(const vec3& b) const { + vec3 result; + result.m_data[0] = m_data[1] * b.m_data[2] - m_data[2] * b.m_data[1]; + result.m_data[1] = m_data[2] * b.m_data[0] - m_data[0] * b.m_data[2]; + result.m_data[2] = m_data[0] * b.m_data[1] - m_data[1] * b.m_data[0]; + + return result; +} + +inline idScalar vec3::dot(const vec3& b) const { + return m_data[0] * b.m_data[0] + m_data[1] * b.m_data[1] + m_data[2] * b.m_data[2]; +} + +inline const mat33& mat33::operator=(const mat33& rhs) { + if (&rhs != this) { + memcpy(m_data, rhs.m_data, 9 * sizeof(idScalar)); + } + return *this; +} +inline mat33 mat33::transpose() const { + mat33 result; + result.m_data[0] = m_data[0]; + result.m_data[1] = m_data[3]; + result.m_data[2] = m_data[6]; + result.m_data[3] = m_data[1]; + result.m_data[4] = m_data[4]; + result.m_data[5] = m_data[7]; + result.m_data[6] = m_data[2]; + result.m_data[7] = m_data[5]; + result.m_data[8] = m_data[8]; + + return result; +} + +inline mat33 operator*(const mat33& a, const mat33& b) { + mat33 result; + result.m_data[0] = + a.m_data[0] * b.m_data[0] + a.m_data[1] * b.m_data[3] + a.m_data[2] * b.m_data[6]; + result.m_data[1] = + a.m_data[0] * b.m_data[1] + a.m_data[1] * b.m_data[4] + a.m_data[2] * b.m_data[7]; + result.m_data[2] = + a.m_data[0] * b.m_data[2] + a.m_data[1] * b.m_data[5] + a.m_data[2] * b.m_data[8]; + result.m_data[3] = + a.m_data[3] * b.m_data[0] + a.m_data[4] * b.m_data[3] + a.m_data[5] * b.m_data[6]; + result.m_data[4] = + a.m_data[3] * b.m_data[1] + a.m_data[4] * b.m_data[4] + a.m_data[5] * b.m_data[7]; + result.m_data[5] = + a.m_data[3] * b.m_data[2] + a.m_data[4] * b.m_data[5] + a.m_data[5] * b.m_data[8]; + result.m_data[6] = + a.m_data[6] * b.m_data[0] + a.m_data[7] * b.m_data[3] + a.m_data[8] * b.m_data[6]; + result.m_data[7] = + a.m_data[6] * b.m_data[1] + a.m_data[7] * b.m_data[4] + a.m_data[8] * b.m_data[7]; + result.m_data[8] = + a.m_data[6] * b.m_data[2] + a.m_data[7] * b.m_data[5] + a.m_data[8] * b.m_data[8]; + + return result; +} + +inline const mat33& mat33::operator+=(const mat33& b) { + for (int i = 0; i < 9; i++) { + m_data[i] += b.m_data[i]; + } + + return *this; +} + +inline const mat33& mat33::operator-=(const mat33& b) { + for (int i = 0; i < 9; i++) { + m_data[i] -= b.m_data[i]; + } + return *this; +} + +inline vec3 operator*(const mat33& a, const vec3& b) { + vec3 result; + + result.m_data[0] = + a.m_data[0] * b.m_data[0] + a.m_data[1] * b.m_data[1] + a.m_data[2] * b.m_data[2]; + result.m_data[1] = + a.m_data[3] * b.m_data[0] + a.m_data[4] * b.m_data[1] + a.m_data[5] * b.m_data[2]; + result.m_data[2] = + a.m_data[6] * b.m_data[0] + a.m_data[7] * b.m_data[1] + a.m_data[8] * b.m_data[2]; + + return result; +} + +inline const vec3& vec3::operator+=(const vec3& b) { + for (int i = 0; i < 3; i++) { + m_data[i] += b.m_data[i]; + } + return *this; +} + +inline const vec3& vec3::operator-=(const vec3& b) { + for (int i = 0; i < 3; i++) { + m_data[i] -= b.m_data[i]; + } + return *this; +} + +inline mat33 operator*(const mat33& a, const idScalar& s) { + mat33 result; + for (int i = 0; i < 9; i++) { + result.m_data[i] = a.m_data[i] * s; + } + return result; +} + +inline mat33 operator*(const idScalar& s, const mat33& a) { return a * s; } + +inline vec3 operator*(const vec3& a, const idScalar& s) { + vec3 result; + for (int i = 0; i < 3; i++) { + result.m_data[i] = a.m_data[i] * s; + } + return result; +} +inline vec3 operator*(const idScalar& s, const vec3& a) { return a * s; } + +inline mat33 operator+(const mat33& a, const mat33& b) { + mat33 result; + for (int i = 0; i < 9; i++) { + result.m_data[i] = a.m_data[i] + b.m_data[i]; + } + return result; +} +inline vec3 operator+(const vec3& a, const vec3& b) { + vec3 result; + for (int i = 0; i < 3; i++) { + result.m_data[i] = a.m_data[i] + b.m_data[i]; + } + return result; +} + +inline mat33 operator-(const mat33& a, const mat33& b) { + mat33 result; + for (int i = 0; i < 9; i++) { + result.m_data[i] = a.m_data[i] - b.m_data[i]; + } + return result; +} +inline vec3 operator-(const vec3& a, const vec3& b) { + vec3 result; + for (int i = 0; i < 3; i++) { + result.m_data[i] = a.m_data[i] - b.m_data[i]; + } + return result; +} + +inline mat33 operator/(const mat33& a, const idScalar& s) { + mat33 result; + for (int i = 0; i < 9; i++) { + result.m_data[i] = a.m_data[i] / s; + } + return result; +} + +inline vec3 operator/(const vec3& a, const idScalar& s) { + vec3 result; + for (int i = 0; i < 3; i++) { + result.m_data[i] = a.m_data[i] / s; + } + return result; +} + +inline const vecx& vecx::operator=(const vecx& rhs) { + if (size() != rhs.size()) { + error_message("size missmatch, size()= %d but rhs.size()= %d\n", size(), rhs.size()); + abort(); + } + if (&rhs != this) { + memcpy(m_data, rhs.m_data, rhs.size() * sizeof(idScalar)); + } + return *this; +} +inline vecx operator*(const vecx& a, const idScalar& s) { + vecx result(a.size()); + for (int i = 0; i < result.size(); i++) { + result.m_data[i] = a.m_data[i] * s; + } + return result; +} +inline vecx operator*(const idScalar& s, const vecx& a) { return a * s; } +inline vecx operator+(const vecx& a, const vecx& b) { + vecx result(a.size()); + // TODO: error handling for a.size() != b.size()?? + if (a.size() != b.size()) { + error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size()); + abort(); + } + for (int i = 0; i < a.size(); i++) { + result.m_data[i] = a.m_data[i] + b.m_data[i]; + } + + return result; +} +inline vecx operator-(const vecx& a, const vecx& b) { + vecx result(a.size()); + // TODO: error handling for a.size() != b.size()?? + if (a.size() != b.size()) { + error_message("size missmatch. a.size()= %d, b.size()= %d\n", a.size(), b.size()); + abort(); + } + for (int i = 0; i < a.size(); i++) { + result.m_data[i] = a.m_data[i] - b.m_data[i]; + } + return result; +} +inline vecx operator/(const vecx& a, const idScalar& s) { + vecx result(a.size()); + for (int i = 0; i < result.size(); i++) { + result.m_data[i] = a.m_data[i] / s; + } + + return result; +} + +inline vec3 operator*(const mat3x& a, const vecx& b) { + vec3 result; + if (a.cols() != b.size()) { + error_message("size missmatch. a.cols()= %d, b.size()= %d\n", a.cols(), b.size()); + abort(); + } + result(0)=0.0; + result(1)=0.0; + result(2)=0.0; + for(int i=0;i(i)); + id_printf("type: %s\n", jointTypeToString(body.m_joint_type)); + id_printf("q_index= %d\n", body.m_q_index); + id_printf("Jac_JR= [%f;%f;%f]\n", body.m_Jac_JR(0), body.m_Jac_JR(1), body.m_Jac_JR(2)); + id_printf("Jac_JT= [%f;%f;%f]\n", body.m_Jac_JT(0), body.m_Jac_JT(1), body.m_Jac_JT(2)); + + id_printf("mass = %f\n", body.m_mass); + id_printf("mass * com = [%f %f %f]\n", body.m_body_mass_com(0), body.m_body_mass_com(1), + body.m_body_mass_com(2)); + id_printf("I_o= [%f %f %f;\n" + " %f %f %f;\n" + " %f %f %f]\n", + body.m_body_I_body(0, 0), body.m_body_I_body(0, 1), body.m_body_I_body(0, 2), + body.m_body_I_body(1, 0), body.m_body_I_body(1, 1), body.m_body_I_body(1, 2), + body.m_body_I_body(2, 0), body.m_body_I_body(2, 1), body.m_body_I_body(2, 2)); + + id_printf("parent_pos_parent_body_ref= [%f %f %f]\n", body.m_parent_pos_parent_body_ref(0), + body.m_parent_pos_parent_body_ref(1), body.m_parent_pos_parent_body_ref(2)); + } +} +int MultiBodyTree::MultiBodyImpl::bodyNumDoFs(const JointType &type) const { + switch (type) { + case FIXED: + return 0; + case REVOLUTE: + case PRISMATIC: + return 1; + case FLOATING: + return 6; + } + error_message("unknown joint type %d\n", type); + return 0; +} + +void MultiBodyTree::MultiBodyImpl::printTree(int index, int indentation) { + // this is adapted from URDF2Bullet. + // TODO: fix this and print proper graph (similar to git --log --graph) + int num_children = m_child_indices[index].size(); + + indentation += 2; + int count = 0; + + for (int i = 0; i < num_children; i++) { + int child_index = m_child_indices[index][i]; + indent(indentation); + id_printf("body %.2d[%s]: %.2d is child no. %d (qi= %d .. %d) \n", index, + jointTypeToString(m_body_list[index].m_joint_type), child_index, (count++) + 1, + m_body_list[index].m_q_index, + m_body_list[index].m_q_index + bodyNumDoFs(m_body_list[index].m_joint_type)); + // first grandchild + printTree(child_index, indentation); + } +} + +int MultiBodyTree::MultiBodyImpl::setGravityInWorldFrame(const vec3 &gravity) { + m_world_gravity = gravity; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::generateIndexSets() { + m_body_revolute_list.resize(0); + m_body_prismatic_list.resize(0); + int q_index = 0; + for (idArrayIdx i = 0; i < m_body_list.size(); i++) { + RigidBody &body = m_body_list[i]; + body.m_q_index = -1; + switch (body.m_joint_type) { + case REVOLUTE: + m_body_revolute_list.push_back(i); + body.m_q_index = q_index; + q_index++; + break; + case PRISMATIC: + m_body_prismatic_list.push_back(i); + body.m_q_index = q_index; + q_index++; + break; + case FIXED: + // do nothing + break; + case FLOATING: + m_body_floating_list.push_back(i); + body.m_q_index = q_index; + q_index += 6; + break; + default: + error_message("unsupported joint type %d\n", body.m_joint_type); + return -1; + } + } + // sanity check + if (q_index != m_num_dofs) { + error_message("internal error, q_index= %d but num_dofs %d\n", q_index, m_num_dofs); + return -1; + } + + m_child_indices.resize(m_body_list.size()); + + for (idArrayIdx child = 1; child < m_parent_index.size(); child++) { + const int &parent = m_parent_index[child]; + if (parent >= 0 && parent < (static_cast(m_parent_index.size()) - 1)) { + m_child_indices[parent].push_back(child); + } else { + if (-1 == parent) { + // multiple bodies are directly linked to the environment, ie, not a single root + error_message("building index sets parent(%zu)= -1 (multiple roots)\n", child); + } else { + // should never happen + error_message( + "building index sets. parent_index[%zu]= %d, but m_parent_index.size()= %d\n", + child, parent, static_cast(m_parent_index.size())); + } + return -1; + } + } + + return 0; +} + +void MultiBodyTree::MultiBodyImpl::calculateStaticData() { + // relative kinematics that are not a function of q, u, dot_u + for (idArrayIdx i = 0; i < m_body_list.size(); i++) { + RigidBody &body = m_body_list[i]; + switch (body.m_joint_type) { + case REVOLUTE: + body.m_parent_vel_rel(0) = 0; + body.m_parent_vel_rel(1) = 0; + body.m_parent_vel_rel(2) = 0; + body.m_parent_acc_rel(0) = 0; + body.m_parent_acc_rel(1) = 0; + body.m_parent_acc_rel(2) = 0; + body.m_parent_pos_parent_body = body.m_parent_pos_parent_body_ref; + break; + case PRISMATIC: + body.m_body_T_parent = body.m_body_T_parent_ref; + body.m_parent_Jac_JT = body.m_body_T_parent_ref.transpose() * body.m_Jac_JT; + body.m_body_ang_vel_rel(0) = 0; + body.m_body_ang_vel_rel(1) = 0; + body.m_body_ang_vel_rel(2) = 0; + body.m_body_ang_acc_rel(0) = 0; + body.m_body_ang_acc_rel(1) = 0; + body.m_body_ang_acc_rel(2) = 0; + break; + case FIXED: + body.m_parent_pos_parent_body = body.m_parent_pos_parent_body_ref; + body.m_body_T_parent = body.m_body_T_parent_ref; + body.m_body_ang_vel_rel(0) = 0; + body.m_body_ang_vel_rel(1) = 0; + body.m_body_ang_vel_rel(2) = 0; + body.m_parent_vel_rel(0) = 0; + body.m_parent_vel_rel(1) = 0; + body.m_parent_vel_rel(2) = 0; + body.m_body_ang_acc_rel(0) = 0; + body.m_body_ang_acc_rel(1) = 0; + body.m_body_ang_acc_rel(2) = 0; + body.m_parent_acc_rel(0) = 0; + body.m_parent_acc_rel(1) = 0; + body.m_parent_acc_rel(2) = 0; + break; + case FLOATING: + // no static data + break; + } + + // resize & initialize jacobians to zero. +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + body.m_body_dot_Jac_T_u(0) = 0.0; + body.m_body_dot_Jac_T_u(1) = 0.0; + body.m_body_dot_Jac_T_u(2) = 0.0; + body.m_body_dot_Jac_R_u(0) = 0.0; + body.m_body_dot_Jac_R_u(1) = 0.0; + body.m_body_dot_Jac_R_u(2) = 0.0; + resize(body.m_body_Jac_T,m_num_dofs); + resize(body.m_body_Jac_R,m_num_dofs); + body.m_body_Jac_T.setZero(); + body.m_body_Jac_R.setZero(); +#endif // + } +} + +int MultiBodyTree::MultiBodyImpl::calculateInverseDynamics(const vecx &q, const vecx &u, + const vecx &dot_u, vecx *joint_forces) { + if (q.size() != m_num_dofs || u.size() != m_num_dofs || dot_u.size() != m_num_dofs || + joint_forces->size() != m_num_dofs) { + error_message("wrong vector dimension. system has %d DOFs,\n" + "but dim(q)= %d, dim(u)= %d, dim(dot_u)= %d, dim(joint_forces)= %d\n", + m_num_dofs, static_cast(q.size()), static_cast(u.size()), + static_cast(dot_u.size()), static_cast(joint_forces->size())); + return -1; + } + // 1. relative kinematics + if(-1 == calculateKinematics(q,u,dot_u, POSITION_VELOCITY_ACCELERATION)) { + error_message("error in calculateKinematics\n"); + return -1; + } + // 2. update contributions to equations of motion for every body. + for (idArrayIdx i = 0; i < m_body_list.size(); i++) { + RigidBody &body = m_body_list[i]; + // 3.4 update dynamic terms (rate of change of angular & linear momentum) + body.m_eom_lhs_rotational = + body.m_body_I_body * body.m_body_ang_acc + body.m_body_mass_com.cross(body.m_body_acc) + + body.m_body_ang_vel.cross(body.m_body_I_body * body.m_body_ang_vel) - + body.m_body_moment_user; + body.m_eom_lhs_translational = + body.m_body_ang_acc.cross(body.m_body_mass_com) + body.m_mass * body.m_body_acc + + body.m_body_ang_vel.cross(body.m_body_ang_vel.cross(body.m_body_mass_com)) - + body.m_body_force_user; + } + + // 3. calculate full set of forces at parent joint + // (not directly calculating the joint force along the free direction + // simplifies inclusion of fixed joints. + // An alternative would be to fuse bodies in a pre-processing step, + // but that would make changing masses online harder (eg, payload masses + // added with fixed joints to a gripper) + // Also, this enables adding zero weight bodies as a way to calculate frame poses + // for force elements, etc. + + for (int body_idx = m_body_list.size() - 1; body_idx >= 0; body_idx--) { + // sum of forces and moments acting on this body from its children + vec3 sum_f_children; + vec3 sum_m_children; + setZero(sum_f_children); + setZero(sum_m_children); + for (idArrayIdx child_list_idx = 0; child_list_idx < m_child_indices[body_idx].size(); + child_list_idx++) { + const RigidBody &child = m_body_list[m_child_indices[body_idx][child_list_idx]]; + vec3 child_joint_force_in_this_frame = + child.m_body_T_parent.transpose() * child.m_force_at_joint; + sum_f_children -= child_joint_force_in_this_frame; + sum_m_children -= child.m_body_T_parent.transpose() * child.m_moment_at_joint + + child.m_parent_pos_parent_body.cross(child_joint_force_in_this_frame); + } + RigidBody &body = m_body_list[body_idx]; + + body.m_force_at_joint = body.m_eom_lhs_translational - sum_f_children; + body.m_moment_at_joint = body.m_eom_lhs_rotational - sum_m_children; + } + + // 4. Calculate Joint forces. + // These are the components of force_at_joint/moment_at_joint + // in the free directions given by Jac_JT/Jac_JR + // 4.1 revolute joints + for (idArrayIdx i = 0; i < m_body_revolute_list.size(); i++) { + RigidBody &body = m_body_list[m_body_revolute_list[i]]; + // (*joint_forces)(body.m_q_index) = body.m_Jac_JR.transpose() * body.m_moment_at_joint; + (*joint_forces)(body.m_q_index) = body.m_Jac_JR.dot(body.m_moment_at_joint); + } + // 4.2 for prismatic joints + for (idArrayIdx i = 0; i < m_body_prismatic_list.size(); i++) { + RigidBody &body = m_body_list[m_body_prismatic_list[i]]; + // (*joint_forces)(body.m_q_index) = body.m_Jac_JT.transpose() * body.m_force_at_joint; + (*joint_forces)(body.m_q_index) = body.m_Jac_JT.dot(body.m_force_at_joint); + } + // 4.3 floating bodies (6-DoF joints) + for (idArrayIdx i = 0; i < m_body_floating_list.size(); i++) { + RigidBody &body = m_body_list[m_body_floating_list[i]]; + (*joint_forces)(body.m_q_index + 0) = body.m_moment_at_joint(0); + (*joint_forces)(body.m_q_index + 1) = body.m_moment_at_joint(1); + (*joint_forces)(body.m_q_index + 2) = body.m_moment_at_joint(2); + + (*joint_forces)(body.m_q_index + 3) = body.m_force_at_joint(0); + (*joint_forces)(body.m_q_index + 4) = body.m_force_at_joint(1); + (*joint_forces)(body.m_q_index + 5) = body.m_force_at_joint(2); + } + + return 0; +} + +int MultiBodyTree::MultiBodyImpl::calculateKinematics(const vecx &q, const vecx &u, const vecx& dot_u, + const KinUpdateType type) { + if (q.size() != m_num_dofs || u.size() != m_num_dofs || dot_u.size() != m_num_dofs ) { + error_message("wrong vector dimension. system has %d DOFs,\n" + "but dim(q)= %d, dim(u)= %d, dim(dot_u)= %d\n", + m_num_dofs, static_cast(q.size()), static_cast(u.size()), + static_cast(dot_u.size())); + return -1; + } + if(type != POSITION_ONLY && type != POSITION_VELOCITY && type != POSITION_VELOCITY_ACCELERATION) { + error_message("invalid type %d\n", type); + return -1; + } + + // 1. update relative kinematics + // 1.1 for revolute + for (idArrayIdx i = 0; i < m_body_revolute_list.size(); i++) { + RigidBody &body = m_body_list[m_body_revolute_list[i]]; + mat33 T; + bodyTParentFromAxisAngle(body.m_Jac_JR, q(body.m_q_index), &T); + body.m_body_T_parent = T * body.m_body_T_parent_ref; + if(type >= POSITION_VELOCITY) { + body.m_body_ang_vel_rel = body.m_Jac_JR * u(body.m_q_index); + } + if(type >= POSITION_VELOCITY_ACCELERATION) { + body.m_body_ang_acc_rel = body.m_Jac_JR * dot_u(body.m_q_index); + } + } + // 1.2 for prismatic + for (idArrayIdx i = 0; i < m_body_prismatic_list.size(); i++) { + RigidBody &body = m_body_list[m_body_prismatic_list[i]]; + body.m_parent_pos_parent_body = + body.m_parent_pos_parent_body_ref + body.m_parent_Jac_JT * q(body.m_q_index); + if(type >= POSITION_VELOCITY) { + body.m_parent_vel_rel = + body.m_body_T_parent_ref.transpose() * body.m_Jac_JT * u(body.m_q_index); + } + if(type >= POSITION_VELOCITY_ACCELERATION) { + body.m_parent_acc_rel = body.m_parent_Jac_JT * dot_u(body.m_q_index); + } + } + // 1.3 fixed joints: nothing to do + // 1.4 6dof joints: + for (idArrayIdx i = 0; i < m_body_floating_list.size(); i++) { + RigidBody &body = m_body_list[m_body_floating_list[i]]; + + body.m_body_T_parent = transformZ(q(body.m_q_index + 2)) * + transformY(q(body.m_q_index + 1)) * transformX(q(body.m_q_index)); + body.m_parent_pos_parent_body(0) = q(body.m_q_index + 3); + body.m_parent_pos_parent_body(1) = q(body.m_q_index + 4); + body.m_parent_pos_parent_body(2) = q(body.m_q_index + 5); + body.m_parent_pos_parent_body = body.m_body_T_parent * body.m_parent_pos_parent_body; + + if(type >= POSITION_VELOCITY) { + body.m_body_ang_vel_rel(0) = u(body.m_q_index + 0); + body.m_body_ang_vel_rel(1) = u(body.m_q_index + 1); + body.m_body_ang_vel_rel(2) = u(body.m_q_index + 2); + + body.m_parent_vel_rel(0) = u(body.m_q_index + 3); + body.m_parent_vel_rel(1) = u(body.m_q_index + 4); + body.m_parent_vel_rel(2) = u(body.m_q_index + 5); + + body.m_parent_vel_rel = body.m_body_T_parent.transpose() * body.m_parent_vel_rel; + } + if(type >= POSITION_VELOCITY_ACCELERATION) { + body.m_body_ang_acc_rel(0) = dot_u(body.m_q_index + 0); + body.m_body_ang_acc_rel(1) = dot_u(body.m_q_index + 1); + body.m_body_ang_acc_rel(2) = dot_u(body.m_q_index + 2); + + body.m_parent_acc_rel(0) = dot_u(body.m_q_index + 3); + body.m_parent_acc_rel(1) = dot_u(body.m_q_index + 4); + body.m_parent_acc_rel(2) = dot_u(body.m_q_index + 5); + + body.m_parent_acc_rel = body.m_body_T_parent.transpose() * body.m_parent_acc_rel; + } + } + + // 2. absolute kinematic quantities (vector valued) + // NOTE: this should be optimized by specializing for different body types + // (e.g., relative rotation is always zero for prismatic joints, etc.) + + // calculations for root body + { + RigidBody &body = m_body_list[0]; + // 3.1 update absolute positions and orientations: + // will be required if we add force elements (eg springs between bodies, + // or contacts) + // not required right now, added here for debugging purposes + body.m_body_pos = body.m_body_T_parent * body.m_parent_pos_parent_body; + body.m_body_T_world = body.m_body_T_parent; + + if(type >= POSITION_VELOCITY) { + // 3.2 update absolute velocities + body.m_body_ang_vel = body.m_body_ang_vel_rel; + body.m_body_vel = body.m_parent_vel_rel; + } + if(type >= POSITION_VELOCITY_ACCELERATION) { + // 3.3 update absolute accelerations + // NOTE: assumption: dot(J_JR) = 0; true here, but not for general joints + body.m_body_ang_acc = body.m_body_ang_acc_rel; + body.m_body_acc = body.m_body_T_parent * body.m_parent_acc_rel; + // add gravitational acceleration to root body + // this is an efficient way to add gravitational terms, + // but it does mean that the kinematics are no longer + // correct at the acceleration level + // NOTE: To get correct acceleration kinematics, just set world_gravity to zero + body.m_body_acc = body.m_body_acc - body.m_body_T_parent * m_world_gravity; + } + } + + for (idArrayIdx i = 1; i < m_body_list.size(); i++) { + RigidBody &body = m_body_list[i]; + RigidBody &parent = m_body_list[m_parent_index[i]]; + // 2.1 update absolute positions and orientations: + // will be required if we add force elements (eg springs between bodies, + // or contacts) not required right now added here for debugging purposes + body.m_body_pos = + body.m_body_T_parent * (parent.m_body_pos + body.m_parent_pos_parent_body); + body.m_body_T_world = body.m_body_T_parent * parent.m_body_T_world; + + if(type >= POSITION_VELOCITY) { + // 2.2 update absolute velocities + body.m_body_ang_vel = + body.m_body_T_parent * parent.m_body_ang_vel + body.m_body_ang_vel_rel; + + body.m_body_vel = + body.m_body_T_parent * + (parent.m_body_vel + parent.m_body_ang_vel.cross(body.m_parent_pos_parent_body) + + body.m_parent_vel_rel); + } + if(type >= POSITION_VELOCITY_ACCELERATION) { + // 2.3 update absolute accelerations + // NOTE: assumption: dot(J_JR) = 0; true here, but not for general joints + body.m_body_ang_acc = + body.m_body_T_parent * parent.m_body_ang_acc - + body.m_body_ang_vel_rel.cross(body.m_body_T_parent * parent.m_body_ang_vel) + + body.m_body_ang_acc_rel; + body.m_body_acc = + body.m_body_T_parent * + (parent.m_body_acc + parent.m_body_ang_acc.cross(body.m_parent_pos_parent_body) + + parent.m_body_ang_vel.cross(parent.m_body_ang_vel.cross(body.m_parent_pos_parent_body)) + + 2.0 * parent.m_body_ang_vel.cross(body.m_parent_vel_rel) + body.m_parent_acc_rel); + } + } + + return 0; +} + +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + +void MultiBodyTree::MultiBodyImpl::addRelativeJacobianComponent(RigidBody&body) { + const int& idx=body.m_q_index; + switch(body.m_joint_type) { + case FIXED: + break; + case REVOLUTE: + setMat3xElem(0,idx, body.m_Jac_JR(0), &body.m_body_Jac_R); + setMat3xElem(1,idx, body.m_Jac_JR(1), &body.m_body_Jac_R); + setMat3xElem(2,idx, body.m_Jac_JR(2), &body.m_body_Jac_R); + break; + case PRISMATIC: + setMat3xElem(0,idx, body.m_body_T_parent_ref(0,0)*body.m_Jac_JT(0) + +body.m_body_T_parent_ref(1,0)*body.m_Jac_JT(1) + +body.m_body_T_parent_ref(2,0)*body.m_Jac_JT(2), + &body.m_body_Jac_T); + setMat3xElem(1,idx,body.m_body_T_parent_ref(0,1)*body.m_Jac_JT(0) + +body.m_body_T_parent_ref(1,1)*body.m_Jac_JT(1) + +body.m_body_T_parent_ref(2,1)*body.m_Jac_JT(2), + &body.m_body_Jac_T); + setMat3xElem(2,idx, body.m_body_T_parent_ref(0,2)*body.m_Jac_JT(0) + +body.m_body_T_parent_ref(1,2)*body.m_Jac_JT(1) + +body.m_body_T_parent_ref(2,2)*body.m_Jac_JT(2), + &body.m_body_Jac_T); + break; + case FLOATING: + setMat3xElem(0,idx+0, 1.0, &body.m_body_Jac_R); + setMat3xElem(1,idx+1, 1.0, &body.m_body_Jac_R); + setMat3xElem(2,idx+2, 1.0, &body.m_body_Jac_R); + // body_Jac_T = body_T_parent.transpose(); + setMat3xElem(0,idx+3, body.m_body_T_parent(0,0), &body.m_body_Jac_T); + setMat3xElem(0,idx+4, body.m_body_T_parent(1,0), &body.m_body_Jac_T); + setMat3xElem(0,idx+5, body.m_body_T_parent(2,0), &body.m_body_Jac_T); + + setMat3xElem(1,idx+3, body.m_body_T_parent(0,1), &body.m_body_Jac_T); + setMat3xElem(1,idx+4, body.m_body_T_parent(1,1), &body.m_body_Jac_T); + setMat3xElem(1,idx+5, body.m_body_T_parent(2,1), &body.m_body_Jac_T); + + setMat3xElem(2,idx+3, body.m_body_T_parent(0,2), &body.m_body_Jac_T); + setMat3xElem(2,idx+4, body.m_body_T_parent(1,2), &body.m_body_Jac_T); + setMat3xElem(2,idx+5, body.m_body_T_parent(2,2), &body.m_body_Jac_T); + + break; + } +} + +int MultiBodyTree::MultiBodyImpl::calculateJacobians(const vecx& q, const vecx& u, const KinUpdateType type) { + if (q.size() != m_num_dofs || u.size() != m_num_dofs) { + error_message("wrong vector dimension. system has %d DOFs,\n" + "but dim(q)= %d, dim(u)= %d\n", + m_num_dofs, static_cast(q.size()), static_cast(u.size())); + return -1; + } + if(type != POSITION_ONLY && type != POSITION_VELOCITY) { + error_message("invalid type %d\n", type); + return -1; + } + + addRelativeJacobianComponent(m_body_list[0]); + for (idArrayIdx i = 1; i < m_body_list.size(); i++) { + RigidBody &body = m_body_list[i]; + RigidBody &parent = m_body_list[m_parent_index[i]]; + + mul(body.m_body_T_parent, parent.m_body_Jac_R,& body.m_body_Jac_R); + body.m_body_Jac_T = parent.m_body_Jac_T; + mul(tildeOperator(body.m_parent_pos_parent_body),parent.m_body_Jac_R,&m_m3x); + sub(body.m_body_Jac_T,m_m3x, &body.m_body_Jac_T); + + addRelativeJacobianComponent(body); + mul(body.m_body_T_parent, body.m_body_Jac_T,&body.m_body_Jac_T); + + if(type >= POSITION_VELOCITY) { + body.m_body_dot_Jac_R_u = body.m_body_T_parent * parent.m_body_dot_Jac_R_u - + body.m_body_ang_vel_rel.cross(body.m_body_T_parent * parent.m_body_ang_vel); + body.m_body_dot_Jac_T_u = body.m_body_T_parent * + (parent.m_body_dot_Jac_T_u + parent.m_body_dot_Jac_R_u.cross(body.m_parent_pos_parent_body) + + parent.m_body_ang_vel.cross(parent.m_body_ang_vel.cross(body.m_parent_pos_parent_body)) + + 2.0 * parent.m_body_ang_vel.cross(body.m_parent_vel_rel)); + } + } + return 0; +} +#endif + +static inline void setSixDoFJacobians(const int dof, vec3 &Jac_JR, vec3 &Jac_JT) { + switch (dof) { + // rotational part + case 0: + Jac_JR(0) = 1; + Jac_JR(1) = 0; + Jac_JR(2) = 0; + setZero(Jac_JT); + break; + case 1: + Jac_JR(0) = 0; + Jac_JR(1) = 1; + Jac_JR(2) = 0; + setZero(Jac_JT); + break; + case 2: + Jac_JR(0) = 0; + Jac_JR(1) = 0; + Jac_JR(2) = 1; + setZero(Jac_JT); + break; + // translational part + case 3: + setZero(Jac_JR); + Jac_JT(0) = 1; + Jac_JT(1) = 0; + Jac_JT(2) = 0; + break; + case 4: + setZero(Jac_JR); + Jac_JT(0) = 0; + Jac_JT(1) = 1; + Jac_JT(2) = 0; + break; + case 5: + setZero(Jac_JR); + Jac_JT(0) = 0; + Jac_JT(1) = 0; + Jac_JT(2) = 1; + break; + } +} + +static inline int jointNumDoFs(const JointType &type) { + switch (type) { + case FIXED: + return 0; + case REVOLUTE: + case PRISMATIC: + return 1; + case FLOATING: + return 6; + } + // this should never happen + error_message("invalid joint type\n"); + // TODO add configurable abort/crash function + abort(); + return 0; +} + +int MultiBodyTree::MultiBodyImpl::calculateMassMatrix(const vecx &q, const bool update_kinematics, + const bool initialize_matrix, + const bool set_lower_triangular_matrix, + matxx *mass_matrix) { +// This calculates the joint space mass matrix for the multibody system. +// The algorithm is essentially an implementation of "method 3" +// in "Efficient Dynamic Simulation of Robotic Mechanisms" (Walker and Orin, 1982) +// (Later named "Composite Rigid Body Algorithm" by Featherstone). +// +// This implementation, however, handles branched systems and uses a formulation centered +// on the origin of the body-fixed frame to avoid re-computing various quantities at the com. + + if (q.size() != m_num_dofs || mass_matrix->rows() != m_num_dofs || + mass_matrix->cols() != m_num_dofs) { + error_message("Dimension error. System has %d DOFs,\n" + "but dim(q)= %d, dim(mass_matrix)= %d x %d\n", + m_num_dofs, static_cast(q.size()), static_cast(mass_matrix->rows()), + static_cast(mass_matrix->cols())); + return -1; + } + + // TODO add optimized zeroing function? + if (initialize_matrix) { + for (int i = 0; i < m_num_dofs; i++) { + for (int j = 0; j < m_num_dofs; j++) { + setMatxxElem(i, j, 0.0, mass_matrix); + } + } + } + + if (update_kinematics) { + // 1. update relative kinematics + // 1.1 for revolute joints + for (idArrayIdx i = 0; i < m_body_revolute_list.size(); i++) { + RigidBody &body = m_body_list[m_body_revolute_list[i]]; + // from reference orientation (q=0) of body-fixed frame to current orientation + mat33 body_T_body_ref; + bodyTParentFromAxisAngle(body.m_Jac_JR, q(body.m_q_index), &body_T_body_ref); + body.m_body_T_parent = body_T_body_ref * body.m_body_T_parent_ref; + } + // 1.2 for prismatic joints + for (idArrayIdx i = 0; i < m_body_prismatic_list.size(); i++) { + RigidBody &body = m_body_list[m_body_prismatic_list[i]]; + // body.m_body_T_parent= fixed + body.m_parent_pos_parent_body = + body.m_parent_pos_parent_body_ref + body.m_parent_Jac_JT * q(body.m_q_index); + } + // 1.3 fixed joints: nothing to do + // 1.4 6dof joints: + for (idArrayIdx i = 0; i < m_body_floating_list.size(); i++) { + RigidBody &body = m_body_list[m_body_floating_list[i]]; + + body.m_body_T_parent = transformZ(q(body.m_q_index + 2)) * + transformY(q(body.m_q_index + 1)) * + transformX(q(body.m_q_index)); + body.m_parent_pos_parent_body(0) = q(body.m_q_index + 3); + body.m_parent_pos_parent_body(1) = q(body.m_q_index + 4); + body.m_parent_pos_parent_body(2) = q(body.m_q_index + 5); + + body.m_parent_pos_parent_body = body.m_body_T_parent * body.m_parent_pos_parent_body; + } + } + for (int i = m_body_list.size() - 1; i >= 0; i--) { + RigidBody &body = m_body_list[i]; + // calculate mass, center of mass and inertia of "composite rigid body", + // ie, sub-tree starting at current body + body.m_subtree_mass = body.m_mass; + body.m_body_subtree_mass_com = body.m_body_mass_com; + body.m_body_subtree_I_body = body.m_body_I_body; + + for (idArrayIdx c = 0; c < m_child_indices[i].size(); c++) { + RigidBody &child = m_body_list[m_child_indices[i][c]]; + mat33 body_T_child = child.m_body_T_parent.transpose(); + + body.m_subtree_mass += child.m_subtree_mass; + body.m_body_subtree_mass_com += body_T_child * child.m_body_subtree_mass_com + + child.m_parent_pos_parent_body * child.m_subtree_mass; + body.m_body_subtree_I_body += + body_T_child * child.m_body_subtree_I_body * child.m_body_T_parent; + + if (child.m_subtree_mass > 0) { + // Shift the reference point for the child subtree inertia using the + // Huygens-Steiner ("parallel axis") theorem. + // (First shift from child origin to child com, then from there to this body's + // origin) + vec3 r_com = body_T_child * child.m_body_subtree_mass_com / child.m_subtree_mass; + mat33 tilde_r_child_com = tildeOperator(r_com); + mat33 tilde_r_body_com = tildeOperator(child.m_parent_pos_parent_body + r_com); + body.m_body_subtree_I_body += + child.m_subtree_mass * + (tilde_r_child_com * tilde_r_child_com - tilde_r_body_com * tilde_r_body_com); + } + } + } + + for (int i = m_body_list.size() - 1; i >= 0; i--) { + const RigidBody &body = m_body_list[i]; + + // determine DoF-range for body + const int q_index_min = body.m_q_index; + const int q_index_max = q_index_min + jointNumDoFs(body.m_joint_type) - 1; + // loop over the DoFs used by this body + // local joint jacobians (ok as is for 1-DoF joints) + vec3 Jac_JR = body.m_Jac_JR; + vec3 Jac_JT = body.m_Jac_JT; + for (int col = q_index_max; col >= q_index_min; col--) { + // set jacobians for 6-DoF joints + if (FLOATING == body.m_joint_type) { + setSixDoFJacobians(col - q_index_min, Jac_JR, Jac_JT); + } + + vec3 body_eom_rot = + body.m_body_subtree_I_body * Jac_JR + body.m_body_subtree_mass_com.cross(Jac_JT); + vec3 body_eom_trans = + body.m_subtree_mass * Jac_JT - body.m_body_subtree_mass_com.cross(Jac_JR); + setMatxxElem(col, col, Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans), mass_matrix); + + // rest of the mass matrix column upwards + { + // 1. for multi-dof joints, rest of the dofs of this body + for (int row = col - 1; row >= q_index_min; row--) { + if (FLOATING != body.m_joint_type) { + error_message("??\n"); + return -1; + } + setSixDoFJacobians(row - q_index_min, Jac_JR, Jac_JT); + const double Mrc = Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans); + setMatxxElem(col, row, Mrc, mass_matrix); + } + // 2. ancestor dofs + int child_idx = i; + int parent_idx = m_parent_index[i]; + while (parent_idx >= 0) { + const RigidBody &child_body = m_body_list[child_idx]; + const RigidBody &parent_body = m_body_list[parent_idx]; + + const mat33 parent_T_child = child_body.m_body_T_parent.transpose(); + body_eom_rot = parent_T_child * body_eom_rot; + body_eom_trans = parent_T_child * body_eom_trans; + body_eom_rot += child_body.m_parent_pos_parent_body.cross(body_eom_trans); + + const int parent_body_q_index_min = parent_body.m_q_index; + const int parent_body_q_index_max = + parent_body_q_index_min + jointNumDoFs(parent_body.m_joint_type) - 1; + vec3 Jac_JR = parent_body.m_Jac_JR; + vec3 Jac_JT = parent_body.m_Jac_JT; + for (int row = parent_body_q_index_max; row >= parent_body_q_index_min; row--) { + // set jacobians for 6-DoF joints + if (FLOATING == parent_body.m_joint_type) { + setSixDoFJacobians(row - parent_body_q_index_min, Jac_JR, Jac_JT); + } + const double Mrc = Jac_JR.dot(body_eom_rot) + Jac_JT.dot(body_eom_trans); + setMatxxElem(col, row, Mrc, mass_matrix); + } + + child_idx = parent_idx; + parent_idx = m_parent_index[child_idx]; + } + } + } + } + + if (set_lower_triangular_matrix) { + for (int col = 0; col < m_num_dofs; col++) { + for (int row = 0; row < col; row++) { + setMatxxElem(row, col, (*mass_matrix)(col, row), mass_matrix); + } + } + } + return 0; +} + +// utility macro +#define CHECK_IF_BODY_INDEX_IS_VALID(index) \ + do { \ + if (index < 0 || index >= m_num_bodies) { \ + error_message("invalid index %d (num_bodies= %d)\n", index, m_num_bodies); \ + return -1; \ + } \ + } while (0) + +int MultiBodyTree::MultiBodyImpl::getParentIndex(const int body_index, int *p) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *p = m_parent_index[body_index]; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getUserInt(const int body_index, int *user_int) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *user_int = m_user_int[body_index]; + return 0; +} +int MultiBodyTree::MultiBodyImpl::getUserPtr(const int body_index, void **user_ptr) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *user_ptr = m_user_ptr[body_index]; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::setUserInt(const int body_index, const int user_int) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_user_int[body_index] = user_int; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::setUserPtr(const int body_index, void *const user_ptr) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_user_ptr[body_index] = user_ptr; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyOrigin(int body_index, vec3 *world_origin) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_origin = body.m_body_T_world.transpose() * body.m_body_pos; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyCoM(int body_index, vec3 *world_com) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + if (body.m_mass > 0) { + *world_com = body.m_body_T_world.transpose() * + (body.m_body_pos + body.m_body_mass_com / body.m_mass); + } else { + *world_com = body.m_body_T_world.transpose() * (body.m_body_pos); + } + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyTransform(int body_index, mat33 *world_T_body) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_T_body = body.m_body_T_world.transpose(); + return 0; +} +int MultiBodyTree::MultiBodyImpl::getBodyAngularVelocity(int body_index, vec3 *world_omega) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_omega = body.m_body_T_world.transpose() * body.m_body_ang_vel; + return 0; +} +int MultiBodyTree::MultiBodyImpl::getBodyLinearVelocity(int body_index, + vec3 *world_velocity) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_velocity = body.m_body_T_world.transpose() * body.m_body_vel; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyLinearVelocityCoM(int body_index, + vec3 *world_velocity) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + vec3 com; + if (body.m_mass > 0) { + com = body.m_body_mass_com / body.m_mass; + } else { + com(0) = 0; + com(1) = 0; + com(2) = 0; + } + + *world_velocity = + body.m_body_T_world.transpose() * (body.m_body_vel + body.m_body_ang_vel.cross(com)); + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyAngularAcceleration(int body_index, + vec3 *world_dot_omega) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_dot_omega = body.m_body_T_world.transpose() * body.m_body_ang_acc; + return 0; +} +int MultiBodyTree::MultiBodyImpl::getBodyLinearAcceleration(int body_index, + vec3 *world_acceleration) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_acceleration = body.m_body_T_world.transpose() * body.m_body_acc; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getJointType(const int body_index, JointType *joint_type) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *joint_type = m_body_list[body_index].m_joint_type; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getJointTypeStr(const int body_index, + const char **joint_type) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *joint_type = jointTypeToString(m_body_list[body_index].m_joint_type); + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getParentRParentBodyRef(const int body_index, vec3* r) const{ + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *r=m_body_list[body_index].m_parent_pos_parent_body_ref; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyTParentRef(const int body_index, mat33* T) const{ + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *T=m_body_list[body_index].m_body_T_parent_ref; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyAxisOfMotion(const int body_index, vec3* axis) const{ + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + if(m_body_list[body_index].m_joint_type == REVOLUTE) { + *axis = m_body_list[body_index].m_Jac_JR; + return 0; + } + if(m_body_list[body_index].m_joint_type == PRISMATIC) { + *axis = m_body_list[body_index].m_Jac_JT; + return 0; + } + setZero(*axis); + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getDoFOffset(const int body_index, int *q_index) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *q_index = m_body_list[body_index].m_q_index; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::setBodyMass(const int body_index, const idScalar mass) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_body_list[body_index].m_mass = mass; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::setBodyFirstMassMoment(const int body_index, + const vec3& first_mass_moment) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_body_list[body_index].m_body_mass_com = first_mass_moment; + return 0; +} +int MultiBodyTree::MultiBodyImpl::setBodySecondMassMoment(const int body_index, + const mat33& second_mass_moment) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_body_list[body_index].m_body_I_body = second_mass_moment; + return 0; +} +int MultiBodyTree::MultiBodyImpl::getBodyMass(const int body_index, idScalar *mass) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *mass = m_body_list[body_index].m_mass; + return 0; +} +int MultiBodyTree::MultiBodyImpl::getBodyFirstMassMoment(const int body_index, + vec3 *first_mass_moment) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *first_mass_moment = m_body_list[body_index].m_body_mass_com; + return 0; +} +int MultiBodyTree::MultiBodyImpl::getBodySecondMassMoment(const int body_index, + mat33 *second_mass_moment) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + *second_mass_moment = m_body_list[body_index].m_body_I_body; + return 0; +} + +void MultiBodyTree::MultiBodyImpl::clearAllUserForcesAndMoments() { + for (int index = 0; index < m_num_bodies; index++) { + RigidBody &body = m_body_list[index]; + setZero(body.m_body_force_user); + setZero(body.m_body_moment_user); + } +} + +int MultiBodyTree::MultiBodyImpl::addUserForce(const int body_index, const vec3 &body_force) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_body_list[body_index].m_body_force_user += body_force; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::addUserMoment(const int body_index, const vec3 &body_moment) { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + m_body_list[body_index].m_body_moment_user += body_moment; + return 0; +} + +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) +int MultiBodyTree::MultiBodyImpl::getBodyDotJacobianTransU(const int body_index, vec3* world_dot_jac_trans_u) const { + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_dot_jac_trans_u = body.m_body_T_world.transpose() * body.m_body_dot_Jac_T_u; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyDotJacobianRotU(const int body_index, vec3* world_dot_jac_rot_u) const{ + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + *world_dot_jac_rot_u = body.m_body_T_world.transpose() * body.m_body_dot_Jac_R_u; + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyJacobianTrans(const int body_index, mat3x* world_jac_trans) const{ + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + mul(body.m_body_T_world.transpose(), body.m_body_Jac_T,world_jac_trans); + return 0; +} + +int MultiBodyTree::MultiBodyImpl::getBodyJacobianRot(const int body_index, mat3x* world_jac_rot) const{ + CHECK_IF_BODY_INDEX_IS_VALID(body_index); + const RigidBody &body = m_body_list[body_index]; + mul(body.m_body_T_world.transpose(), body.m_body_Jac_R,world_jac_rot); + return 0; +} + +#endif +} diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp new file mode 100644 index 000000000..3efe9d049 --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeImpl.hpp @@ -0,0 +1,283 @@ +// The structs and classes defined here provide a basic inverse fynamics implementation used +// by MultiBodyTree +// User interaction should be through MultiBodyTree + +#ifndef MULTI_BODY_REFERENCE_IMPL_HPP_ +#define MULTI_BODY_REFERENCE_IMPL_HPP_ + +#include "../IDConfig.hpp" +#include "../MultiBodyTree.hpp" + +namespace btInverseDynamics { + +/// Structure for for rigid body mass properties, connectivity and kinematic state +/// all vectors and matrices are in body-fixed frame, if not indicated otherwise. +/// The body-fixed frame is located in the joint connecting the body to its parent. +struct RigidBody { + ID_DECLARE_ALIGNED_ALLOCATOR(); + // 1 Inertial properties + /// Mass + idScalar m_mass; + /// Mass times center of gravity in body-fixed frame + vec3 m_body_mass_com; + /// Moment of inertia w.r.t. body-fixed frame + mat33 m_body_I_body; + + // 2 dynamic properties + /// Left-hand side of the body equation of motion, translational part + vec3 m_eom_lhs_translational; + /// Left-hand side of the body equation of motion, rotational part + vec3 m_eom_lhs_rotational; + /// Force acting at the joint when the body is cut from its parent; + /// includes impressed joint force in J_JT direction, + /// as well as constraint force, + /// in body-fixed frame + vec3 m_force_at_joint; + /// Moment acting at the joint when the body is cut from its parent; + /// includes impressed joint moment in J_JR direction, and constraint moment + /// in body-fixed frame + vec3 m_moment_at_joint; + /// external (user provided) force acting at the body-fixed frame's origin, written in that + /// frame + vec3 m_body_force_user; + /// external (user provided) moment acting at the body-fixed frame's origin, written in that + /// frame + vec3 m_body_moment_user; + // 3 absolute kinematic properties + /// Position of body-fixed frame relative to world frame + /// this is currently only for debugging purposes + vec3 m_body_pos; + /// Absolute velocity of body-fixed frame + vec3 m_body_vel; + /// Absolute acceleration of body-fixed frame + /// NOTE: if gravitational acceleration is not zero, this is the accelation PLUS gravitational + /// acceleration! + vec3 m_body_acc; + /// Absolute angular velocity + vec3 m_body_ang_vel; + /// Absolute angular acceleration + /// NOTE: if gravitational acceleration is not zero, this is the accelation PLUS gravitational + /// acceleration! + vec3 m_body_ang_acc; + + // 4 relative kinematic properties. + // these are in the parent body frame + /// Transform from world to body-fixed frame; + /// this is currently only for debugging purposes + mat33 m_body_T_world; + /// Transform from parent to body-fixed frame + mat33 m_body_T_parent; + /// Vector from parent to child frame in parent frame + vec3 m_parent_pos_parent_body; + /// Relative angular velocity + vec3 m_body_ang_vel_rel; + /// Relative linear velocity + vec3 m_parent_vel_rel; + /// Relative angular acceleration + vec3 m_body_ang_acc_rel; + /// Relative linear acceleration + vec3 m_parent_acc_rel; + + // 5 Data describing the joint type and geometry + /// Type of joint + JointType m_joint_type; + /// Position of joint frame (body-fixed frame at q=0) relative to the parent frame + /// Components are in body-fixed frame of the parent + vec3 m_parent_pos_parent_body_ref; + /// Orientation of joint frame (body-fixed frame at q=0) relative to the parent frame + mat33 m_body_T_parent_ref; + /// Joint rotational Jacobian, ie, the partial derivative of the body-fixed frames absolute + /// angular velocity w.r.t. the generalized velocity of this body's relative degree of freedom. + /// For revolute joints this is the joint axis, for prismatic joints it is a null matrix. + /// (NOTE: dimensions will have to be dynamic for additional joint types!) + vec3 m_Jac_JR; + /// Joint translational Jacobian, ie, the partial derivative of the body-fixed frames absolute + /// linear velocity w.r.t. the generalized velocity of this body's relative degree of freedom. + /// For prismatic joints this is the joint axis, for revolute joints it is a null matrix. + /// (NOTE: dimensions might have to be dynamic for additional joint types!) + vec3 m_Jac_JT; + /// m_Jac_JT in the parent frame, it, m_body_T_parent_ref.transpose()*m_Jac_JT + vec3 m_parent_Jac_JT; + /// Start of index range for the position degree(s) of freedom describing this body's motion + /// relative to + /// its parent. The indices are wrt the multibody system's q-vector of generalized coordinates. + int m_q_index; + + // 6 Scratch data for mass matrix computation using "composite rigid body algorithm" + /// mass of the subtree rooted in this body + idScalar m_subtree_mass; + /// center of mass * mass for subtree rooted in this body, in body-fixed frame + vec3 m_body_subtree_mass_com; + /// moment of inertia of subtree rooted in this body, w.r.t. body origin, in body-fixed frame + mat33 m_body_subtree_I_body; + +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + /// translational jacobian in body-fixed frame d(m_body_vel)/du + mat3x m_body_Jac_T; + /// rotationsl jacobian in body-fixed frame d(m_body_ang_vel)/du + mat3x m_body_Jac_R; + /// components of linear acceleration depending on u + /// (same as is d(m_Jac_T)/dt*u) + vec3 m_body_dot_Jac_T_u; + /// components of angular acceleration depending on u + /// (same as is d(m_Jac_T)/dt*u) + vec3 m_body_dot_Jac_R_u; +#endif +}; + +/// The MBS implements a tree structured multibody system +class MultiBodyTree::MultiBodyImpl { + friend class MultiBodyTree; + +public: + ID_DECLARE_ALIGNED_ALLOCATOR(); + + enum KinUpdateType { + POSITION_ONLY, + POSITION_VELOCITY, + POSITION_VELOCITY_ACCELERATION + }; + + /// constructor + /// @param num_bodies the number of bodies in the system + /// @param num_dofs number of degrees of freedom in the system + MultiBodyImpl(int num_bodies_, int num_dofs_); + + /// \copydoc MultiBodyTree::calculateInverseDynamics + int calculateInverseDynamics(const vecx& q, const vecx& u, const vecx& dot_u, + vecx* joint_forces); + ///\copydoc MultiBodyTree::calculateMassMatrix + int calculateMassMatrix(const vecx& q, const bool update_kinematics, + const bool initialize_matrix, const bool set_lower_triangular_matrix, + matxx* mass_matrix); + /// calculate kinematics (vector quantities) + /// Depending on type, update positions only, positions & velocities, or positions, velocities + /// and accelerations. + int calculateKinematics(const vecx& q, const vecx& u, const vecx& dot_u, const KinUpdateType type); +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + /// calculate jacobians and (if type == POSITION_VELOCITY), also velocity-dependent accelration terms. + int calculateJacobians(const vecx& q, const vecx& u, const KinUpdateType type); + /// \copydoc MultiBodyTree::getBodyDotJacobianTransU + int getBodyDotJacobianTransU(const int body_index, vec3* world_dot_jac_trans_u) const ; + /// \copydoc MultiBodyTree::getBodyDotJacobianRotU + int getBodyDotJacobianRotU(const int body_index, vec3* world_dot_jac_rot_u) const; + /// \copydoc MultiBodyTree::getBodyJacobianTrans + int getBodyJacobianTrans(const int body_index, mat3x* world_jac_trans) const ; + /// \copydoc MultiBodyTree::getBodyJacobianRot + int getBodyJacobianRot(const int body_index, mat3x* world_jac_rot) const; + /// Add relative Jacobian component from motion relative to parent body + /// @param body the body to add the Jacobian component for + void addRelativeJacobianComponent(RigidBody&body); +#endif + /// generate additional index sets from the parent_index array + /// @return -1 on error, 0 on success + int generateIndexSets(); + /// set gravity acceleration in world frame + /// @param gravity gravity vector in the world frame + /// @return 0 on success, -1 on error + int setGravityInWorldFrame(const vec3& gravity); + /// pretty print tree + void printTree(); + /// print tree data + void printTreeData(); + /// initialize fixed data + void calculateStaticData(); + /// \copydoc MultiBodyTree::getBodyFrame + int getBodyFrame(const int index, vec3* world_origin, mat33* body_T_world) const; + /// \copydoc MultiBodyTree::getParentIndex + int getParentIndex(const int body_index, int* m_parent_index); + /// \copydoc MultiBodyTree::getJointType + int getJointType(const int body_index, JointType* joint_type) const; + /// \copydoc MultiBodyTree::getJointTypeStr + int getJointTypeStr(const int body_index, const char** joint_type) const; + /// \copydoc MultiBodyTree::getParentRParentBodyRef + int getParentRParentBodyRef(const int body_index, vec3* r) const; + /// \copydoc MultiBodyTree::getBodyTParentRef + int getBodyTParentRef(const int body_index, mat33* T) const; + /// \copydoc MultiBodyTree::getBodyAxisOfMotion + int getBodyAxisOfMotion(const int body_index, vec3* axis) const; + /// \copydoc MultiBodyTree:getDoFOffset + int getDoFOffset(const int body_index, int* q_index) const; + /// \copydoc MultiBodyTree::getBodyOrigin + int getBodyOrigin(const int body_index, vec3* world_origin) const; + /// \copydoc MultiBodyTree::getBodyCoM + int getBodyCoM(const int body_index, vec3* world_com) const; + /// \copydoc MultiBodyTree::getBodyTransform + int getBodyTransform(const int body_index, mat33* world_T_body) const; + /// \copydoc MultiBodyTree::getBodyAngularVelocity + int getBodyAngularVelocity(const int body_index, vec3* world_omega) const; + /// \copydoc MultiBodyTree::getBodyLinearVelocity + int getBodyLinearVelocity(const int body_index, vec3* world_velocity) const; + /// \copydoc MultiBodyTree::getBodyLinearVelocityCoM + int getBodyLinearVelocityCoM(const int body_index, vec3* world_velocity) const; + /// \copydoc MultiBodyTree::getBodyAngularAcceleration + int getBodyAngularAcceleration(const int body_index, vec3* world_dot_omega) const; + /// \copydoc MultiBodyTree::getBodyLinearAcceleration + int getBodyLinearAcceleration(const int body_index, vec3* world_acceleration) const; + /// \copydoc MultiBodyTree::getUserInt + int getUserInt(const int body_index, int* user_int) const; + /// \copydoc MultiBodyTree::getUserPtr + int getUserPtr(const int body_index, void** user_ptr) const; + /// \copydoc MultiBodyTree::setUserInt + int setUserInt(const int body_index, const int user_int); + /// \copydoc MultiBodyTree::setUserPtr + int setUserPtr(const int body_index, void* const user_ptr); + ///\copydoc MultiBodytTree::setBodyMass + int setBodyMass(const int body_index, const idScalar mass); + ///\copydoc MultiBodytTree::setBodyFirstMassMoment + int setBodyFirstMassMoment(const int body_index, const vec3& first_mass_moment); + ///\copydoc MultiBodytTree::setBodySecondMassMoment + int setBodySecondMassMoment(const int body_index, const mat33& second_mass_moment); + ///\copydoc MultiBodytTree::getBodyMass + int getBodyMass(const int body_index, idScalar* mass) const; + ///\copydoc MultiBodytTree::getBodyFirstMassMoment + int getBodyFirstMassMoment(const int body_index, vec3* first_mass_moment) const; + ///\copydoc MultiBodytTree::getBodySecondMassMoment + int getBodySecondMassMoment(const int body_index, mat33* second_mass_moment) const; + /// \copydoc MultiBodyTree::clearAllUserForcesAndMoments + void clearAllUserForcesAndMoments(); + /// \copydoc MultiBodyTree::addUserForce + int addUserForce(const int body_index, const vec3& body_force); + /// \copydoc MultiBodyTree::addUserMoment + int addUserMoment(const int body_index, const vec3& body_moment); + +private: + // debug function. print tree structure to stdout + void printTree(int index, int indentation); + // get string representation of JointType (for debugging) + const char* jointTypeToString(const JointType& type) const; + // get number of degrees of freedom from joint type + int bodyNumDoFs(const JointType& type) const; + // number of bodies in the system + int m_num_bodies; + // number of degrees of freedom + int m_num_dofs; + // Gravitational acceleration (in world frame) + vec3 m_world_gravity; + // vector of bodies in the system + // body 0 is used as an environment body and is allways fixed. + // The bodies are ordered such that a parent body always has an index + // smaller than its child. + idArray::type m_body_list; + // Parent_index[i] is the index for i's parent body in body_list. + // This fully describes the tree. + idArray::type m_parent_index; + // child_indices[i] contains a vector of indices of + // all children of the i-th body + idArray::type>::type m_child_indices; + // Indices of rotary joints + idArray::type m_body_revolute_list; + // Indices of prismatic joints + idArray::type m_body_prismatic_list; + // Indices of floating joints + idArray::type m_body_floating_list; + // a user-provided integer + idArray::type m_user_int; + // a user-provided pointer + idArray::type m_user_ptr; +#if (defined BT_ID_HAVE_MAT3X) && (defined BT_ID_WITH_JACOBIANS) + mat3x m_m3x; +#endif +}; +} +#endif diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp b/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp new file mode 100644 index 000000000..47b4ab389 --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp @@ -0,0 +1,113 @@ +#include "MultiBodyTreeInitCache.hpp" + +namespace btInverseDynamics { + +MultiBodyTree::InitCache::InitCache() { + m_inertias.resize(0); + m_joints.resize(0); + m_num_dofs = 0; + m_root_index=-1; +} + +int MultiBodyTree::InitCache::addBody(const int body_index, const int parent_index, + const JointType joint_type, + const vec3& parent_r_parent_body_ref, + const mat33& body_T_parent_ref, + const vec3& body_axis_of_motion, const idScalar mass, + const vec3& body_r_body_com, const mat33& body_I_body, + const int user_int, void* user_ptr) { + switch (joint_type) { + case REVOLUTE: + case PRISMATIC: + m_num_dofs += 1; + break; + case FIXED: + // does not add a degree of freedom + // m_num_dofs+=0; + break; + case FLOATING: + m_num_dofs += 6; + break; + default: + error_message("unknown joint type %d\n", joint_type); + return -1; + } + + if(-1 == parent_index) { + if(m_root_index>=0) { + error_message("trying to add body %d as root, but already added %d as root body\n", + body_index, m_root_index); + return -1; + } + m_root_index=body_index; + } + + JointData joint; + joint.m_child = body_index; + joint.m_parent = parent_index; + joint.m_type = joint_type; + joint.m_parent_pos_parent_child_ref = parent_r_parent_body_ref; + joint.m_child_T_parent_ref = body_T_parent_ref; + joint.m_child_axis_of_motion = body_axis_of_motion; + + InertiaData body; + body.m_mass = mass; + body.m_body_pos_body_com = body_r_body_com; + body.m_body_I_body = body_I_body; + + m_inertias.push_back(body); + m_joints.push_back(joint); + m_user_int.push_back(user_int); + m_user_ptr.push_back(user_ptr); + return 0; +} +int MultiBodyTree::InitCache::getInertiaData(const int index, InertiaData* inertia) const { + if (index < 0 || index > static_cast(m_inertias.size())) { + error_message("index out of range\n"); + return -1; + } + + *inertia = m_inertias[index]; + return 0; +} + +int MultiBodyTree::InitCache::getUserInt(const int index, int* user_int) const { + if (index < 0 || index > static_cast(m_user_int.size())) { + error_message("index out of range\n"); + return -1; + } + *user_int = m_user_int[index]; + return 0; +} + +int MultiBodyTree::InitCache::getUserPtr(const int index, void** user_ptr) const { + if (index < 0 || index > static_cast(m_user_ptr.size())) { + error_message("index out of range\n"); + return -1; + } + *user_ptr = m_user_ptr[index]; + return 0; +} + +int MultiBodyTree::InitCache::getJointData(const int index, JointData* joint) const { + if (index < 0 || index > static_cast(m_joints.size())) { + error_message("index out of range\n"); + return -1; + } + *joint = m_joints[index]; + return 0; +} + +int MultiBodyTree::InitCache::buildIndexSets() { + // NOTE: This function assumes that proper indices were provided + // User2InternalIndex from utils can be used to facilitate this. + + m_parent_index.resize(numBodies()); + for (idArrayIdx j = 0; j < m_joints.size(); j++) { + const JointData& joint = m_joints[j]; + m_parent_index[joint.m_child] = joint.m_parent; + } + + return 0; +} +} diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp b/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp new file mode 100644 index 000000000..0d2aa4a07 --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/details/MultiBodyTreeInitCache.hpp @@ -0,0 +1,109 @@ +#ifndef MULTIBODYTREEINITCACHE_HPP_ +#define MULTIBODYTREEINITCACHE_HPP_ + +#include "../IDConfig.hpp" +#include "../IDMath.hpp" +#include "../MultiBodyTree.hpp" + +namespace btInverseDynamics { +/// Mass properties of a rigid body +struct InertiaData { + ID_DECLARE_ALIGNED_ALLOCATOR(); + + /// mass + idScalar m_mass; + /// vector from body-fixed frame to center of mass, + /// in body-fixed frame, multiplied by the mass + vec3 m_body_pos_body_com; + /// moment of inertia w.r.t. the origin of the body-fixed + /// frame, represented in that frame + mat33 m_body_I_body; +}; + +/// Joint properties +struct JointData { + ID_DECLARE_ALIGNED_ALLOCATOR(); + + /// type of joint + JointType m_type; + /// index of parent body + int m_parent; + /// index of child body + int m_child; + /// vector from parent's body-fixed frame to child's body-fixed + /// frame for q=0, written in the parent's body fixed frame + vec3 m_parent_pos_parent_child_ref; + /// Transform matrix converting vectors written in the parent's frame + /// into vectors written in the child's frame for q=0 + /// ie, child_vector = child_T_parent_ref * parent_vector; + mat33 m_child_T_parent_ref; + /// Axis of motion for 1 degree-of-freedom joints, + /// written in the child's frame + /// For revolute joints, the q-value is positive for a positive + /// rotation about this axis. + /// For prismatic joints, the q-value is positive for a positive + /// translation is this direction. + vec3 m_child_axis_of_motion; +}; + +/// Data structure to store data passed by the user. +/// This is used in MultiBodyTree::finalize to build internal data structures. +class MultiBodyTree::InitCache { +public: + ID_DECLARE_ALIGNED_ALLOCATOR(); + /// constructor + InitCache(); + ///\copydoc MultiBodyTree::addBody + int addBody(const int body_index, const int parent_index, const JointType joint_type, + const vec3 &parent_r_parent_body_ref, const mat33 &body_T_parent_ref, + const vec3 &body_axis_of_motion, idScalar mass, const vec3 &body_r_body_com, + const mat33 &body_I_body, const int user_int, void *user_ptr); + /// build index arrays + /// @return 0 on success, -1 on failure + int buildIndexSets(); + /// @return number of degrees of freedom + int numDoFs() const { return m_num_dofs; } + /// @return number of bodies + int numBodies() const { return m_inertias.size(); } + /// get inertia data for index + /// @param index of the body + /// @param inertia pointer for return data + /// @return 0 on success, -1 on failure + int getInertiaData(const int index, InertiaData *inertia) const; + /// get joint data for index + /// @param index of the body + /// @param joint pointer for return data + /// @return 0 on success, -1 on failure + int getJointData(const int index, JointData *joint) const; + /// get parent index array (paren_index[i] is the index of the parent of i) + /// @param parent_index pointer for return data + void getParentIndexArray(idArray::type *parent_index) { *parent_index = m_parent_index; } + /// get user integer + /// @param index body index + /// @param user_int user integer + /// @return 0 on success, -1 on failure + int getUserInt(const int index, int *user_int) const; + /// get user pointer + /// @param index body index + /// @param user_int user pointer + /// @return 0 on success, -1 on failure + int getUserPtr(const int index, void **user_ptr) const; + +private: + // vector of bodies + idArray::type m_inertias; + // vector of joints + idArray::type m_joints; + // number of mechanical degrees of freedom + int m_num_dofs; + // parent index array + idArray::type m_parent_index; + // user integers + idArray::type m_user_int; + // user pointers + idArray::type m_user_ptr; + // index of root body (or -1 if not set) + int m_root_index; +}; +} +#endif // MULTIBODYTREEINITCACHE_HPP_ diff --git a/Engine/lib/bullet/src/BulletInverseDynamics/premake4.lua b/Engine/lib/bullet/src/BulletInverseDynamics/premake4.lua new file mode 100644 index 000000000..774e037b3 --- /dev/null +++ b/Engine/lib/bullet/src/BulletInverseDynamics/premake4.lua @@ -0,0 +1,12 @@ + project "BulletInverseDynamics" + + kind "StaticLib" + includedirs { + "..", + } + files { + "IDMath.cpp", + "MultiBodyTree.cpp", + "details/MultiBodyTreeInitCache.cpp", + "details/MultiBodyTreeImpl.cpp", + } diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/CMakeLists.txt deleted file mode 100644 index dcc542770..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/CMakeLists.txt +++ /dev/null @@ -1,126 +0,0 @@ -INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src - ${VECTOR_MATH_INCLUDE} -) - -SET(BulletMultiThreaded_SRCS - SpuFakeDma.cpp - SpuLibspe2Support.cpp - btThreadSupportInterface.cpp - Win32ThreadSupport.cpp - PosixThreadSupport.cpp - SequentialThreadSupport.cpp - SpuSampleTaskProcess.cpp - SpuCollisionObjectWrapper.cpp - SpuCollisionTaskProcess.cpp - SpuGatheringCollisionDispatcher.cpp - SpuContactManifoldCollisionAlgorithm.cpp - btParallelConstraintSolver.cpp - - #SPURS_PEGatherScatterTask/SpuPEGatherScatterTask.cpp - #SpuPEGatherScatterTaskProcess.cpp - - SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp - SpuNarrowPhaseCollisionTask/SpuContactResult.cpp - SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp - SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp - SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp - - #Some GPU related stuff, mainly CUDA and perhaps OpenCL - btGpu3DGridBroadphase.cpp -) - -SET(Root_HDRS - PlatformDefinitions.h - PpuAddressSpace.h - SpuFakeDma.h - SpuDoubleBuffer.h - SpuLibspe2Support.h - btThreadSupportInterface.h - Win32ThreadSupport.h - PosixThreadSupport.h - SequentialThreadSupport.h - SpuSampleTaskProcess.h - SpuCollisionObjectWrapper.cpp - SpuCollisionObjectWrapper.h - SpuCollisionTaskProcess.h - SpuGatheringCollisionDispatcher.h - SpuContactManifoldCollisionAlgorithm.h - btParallelConstraintSolver.h - - #SPURS_PEGatherScatterTask/SpuPEGatherScatterTask.h - #SpuPEGatherScatterTaskProcess.h - - #Some GPU related stuff, mainly CUDA and perhaps OpenCL - btGpu3DGridBroadphase.h - btGpu3DGridBroadphaseSharedCode.h - btGpu3DGridBroadphaseSharedDefs.h - btGpu3DGridBroadphaseSharedTypes.h - btGpuDefines.h - btGpuUtilsSharedCode.h - btGpuUtilsSharedDefs.h -) - -SET(SpuNarrowPhaseCollisionTask_HDRS - SpuNarrowPhaseCollisionTask/Box.h - SpuNarrowPhaseCollisionTask/boxBoxDistance.h - SpuNarrowPhaseCollisionTask/SpuContactResult.h - SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h - SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h - SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h - SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h - SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h -) - -SET(BulletMultiThreaded_HDRS - ${Root_HDRS} - ${SpuNarrowPhaseCollisionTask_HDRS} -) - -ADD_LIBRARY(BulletMultiThreaded ${BulletMultiThreaded_SRCS} ${BulletMultiThreaded_HDRS}) -SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES SOVERSION ${BULLET_VERSION}) - - -SUBDIRS(GpuSoftBodySolvers) - - -IF (BUILD_SHARED_LIBS) - IF (UNIX) - TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletDynamics BulletCollision pthread) - ELSE() - TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletDynamics BulletCollision) - ENDIF() -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - #INSTALL of other files requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) -# IF(INSTALL_EXTRA_LIBS) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletMultiThreaded DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletMultiThreaded - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY -${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING -PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -# ENDIF (INSTALL_EXTRA_LIBS) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES FRAMEWORK true) - - SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES PUBLIC_HEADER "${Root_HDRS}") - # Have to list out sub-directories manually: - SET_PROPERTY(SOURCE ${SpuNarrowPhaseCollisionTask_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/SpuNarrowPhaseCollisionTask) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/CMakeLists.txt deleted file mode 100644 index 224a3e0a8..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ - -INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src -) - - -SUBDIRS ( - OpenCL -) - -IF( USE_DX11 ) - SUBDIRS( DX11 ) -ENDIF( USE_DX11 ) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt deleted file mode 100644 index 52f335d23..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt +++ /dev/null @@ -1,86 +0,0 @@ - -INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src -) - -SET(DXSDK_DIR $ENV{DXSDK_DIR}) -SET(DX11_INCLUDE_PATH "${DIRECTX_SDK_BASE_DIR}/Include" CACHE DOCSTRING "Microsoft directX SDK include path") - - -INCLUDE_DIRECTORIES( -${DX11_INCLUDE_PATH} "../Shared/" -${VECTOR_MATH_INCLUDE} -) - -SET(BulletSoftBodyDX11Solvers_SRCS - btSoftBodySolver_DX11.cpp - btSoftBodySolver_DX11SIMDAware.cpp -) - -SET(BulletSoftBodyDX11Solvers_HDRS - btSoftBodySolver_DX11.h - btSoftBodySolver_DX11SIMDAware.h - ../Shared/btSoftBodySolverData.h - btSoftBodySolverVertexData_DX11.h - btSoftBodySolverTriangleData_DX11.h - btSoftBodySolverLinkData_DX11.h - btSoftBodySolverLinkData_DX11SIMDAware.h - btSoftBodySolverBuffer_DX11.h - btSoftBodySolverVertexBuffer_DX11.h - -) - -# OpenCL and HLSL Shaders. -# Build rules generated to stringify these into headers -# which are needed by some of the sources -SET(BulletSoftBodyDX11Solvers_Shaders - OutputToVertexArray - UpdateNormals - Integrate - UpdatePositions - UpdateNodes - ComputeBounds - SolvePositions - SolvePositionsSIMDBatched - SolveCollisionsAndUpdateVelocities - SolveCollisionsAndUpdateVelocitiesSIMDBatched - UpdatePositionsFromVelocities - ApplyForces - PrepareLinks - VSolveLinks -) - -foreach(f ${BulletSoftBodyDX11Solvers_Shaders}) - LIST(APPEND BulletSoftBodyDX11Solvers_HLSL "HLSL/${f}.hlsl") -endforeach(f) - - - -ADD_LIBRARY(BulletSoftBodySolvers_DX11 ${BulletSoftBodyDX11Solvers_SRCS} ${BulletSoftBodyDX11Solvers_HDRS} ${BulletSoftBodyDX11Solvers_HLSL}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_DX11 PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_DX11 PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_DX11 BulletSoftBody BulletDynamics) -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_DX11 DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_DX11 - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -#headers are already installed by BulletMultiThreaded library - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_DX11 PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_DX11 PROPERTIES PUBLIC_HEADER "${BulletSoftBodyDX11Solvers_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/ApplyForces.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/ApplyForces.hlsl deleted file mode 100644 index 37e22695b..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/ApplyForces.hlsl +++ /dev/null @@ -1,95 +0,0 @@ -MSTRINGIFY( - -cbuffer ApplyForcesCB : register( b0 ) -{ - unsigned int numNodes; - float solverdt; - float epsilon; - int padding3; -}; - - -StructuredBuffer g_vertexClothIdentifier : register( t0 ); -StructuredBuffer g_vertexNormal : register( t1 ); -StructuredBuffer g_vertexArea : register( t2 ); -StructuredBuffer g_vertexInverseMass : register( t3 ); -// TODO: These could be combined into a lift/drag factor array along with medium density -StructuredBuffer g_clothLiftFactor : register( t4 ); -StructuredBuffer g_clothDragFactor : register( t5 ); -StructuredBuffer g_clothWindVelocity : register( t6 ); -StructuredBuffer g_clothAcceleration : register( t7 ); -StructuredBuffer g_clothMediumDensity : register( t8 ); - -RWStructuredBuffer g_vertexForceAccumulator : register( u0 ); -RWStructuredBuffer g_vertexVelocity : register( u1 ); - -float3 projectOnAxis( float3 v, float3 a ) -{ - return (a*dot(v, a)); -} - -[numthreads(128, 1, 1)] -void -ApplyForcesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - unsigned int nodeID = DTid.x; - if( nodeID < numNodes ) - { - int clothId = g_vertexClothIdentifier[nodeID]; - float nodeIM = g_vertexInverseMass[nodeID]; - - if( nodeIM > 0.0f ) - { - float3 nodeV = g_vertexVelocity[nodeID].xyz; - float3 normal = g_vertexNormal[nodeID].xyz; - float area = g_vertexArea[nodeID]; - float3 nodeF = g_vertexForceAccumulator[nodeID].xyz; - - // Read per-cloth values - float3 clothAcceleration = g_clothAcceleration[clothId].xyz; - float3 clothWindVelocity = g_clothWindVelocity[clothId].xyz; - float liftFactor = g_clothLiftFactor[clothId]; - float dragFactor = g_clothDragFactor[clothId]; - float mediumDensity = g_clothMediumDensity[clothId]; - - // Apply the acceleration to the cloth rather than do this via a force - nodeV += (clothAcceleration*solverdt); - - g_vertexVelocity[nodeID] = float4(nodeV, 0.f); - - float3 relativeWindVelocity = nodeV - clothWindVelocity; - float relativeSpeedSquared = dot(relativeWindVelocity, relativeWindVelocity); - - if( relativeSpeedSquared > epsilon ) - { - // Correct direction of normal relative to wind direction and get dot product - normal = normal * (dot(normal, relativeWindVelocity) < 0 ? -1.f : 1.f); - float dvNormal = dot(normal, relativeWindVelocity); - if( dvNormal > 0 ) - { - float3 force = float3(0.f, 0.f, 0.f); - float c0 = area * dvNormal * relativeSpeedSquared / 2.f; - float c1 = c0 * mediumDensity; - force += normal * (-c1 * liftFactor); - force += normalize(relativeWindVelocity)*(-c1 * dragFactor); - - float dtim = solverdt * nodeIM; - float3 forceDTIM = force * dtim; - - float3 nodeFPlusForce = nodeF + force; - - // m_nodesf[i] -= ProjectOnAxis(m_nodesv[i], force.normalized())/dtim; - float3 nodeFMinus = nodeF - (projectOnAxis(nodeV, normalize(force))/dtim); - - nodeF = nodeFPlusForce; - if( dot(forceDTIM, forceDTIM) > dot(nodeV, nodeV) ) - nodeF = nodeFMinus; - - g_vertexForceAccumulator[nodeID] = float4(nodeF, 0.0f); - } - } - } - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/ComputeBounds.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/ComputeBounds.hlsl deleted file mode 100644 index 65ae515ca..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/ComputeBounds.hlsl +++ /dev/null @@ -1,83 +0,0 @@ -MSTRINGIFY( - -cbuffer ComputeBoundsCB : register( b0 ) -{ - int numNodes; - int numSoftBodies; - int padding1; - int padding2; -}; - -// Node indices for each link -StructuredBuffer g_vertexClothIdentifier : register( t0 ); -StructuredBuffer g_vertexPositions : register( t1 ); - -RWStructuredBuffer g_clothMinBounds : register( u0 ); -RWStructuredBuffer g_clothMaxBounds : register( u1 ); - -groupshared uint4 clothMinBounds[256]; -groupshared uint4 clothMaxBounds[256]; - -[numthreads(128, 1, 1)] -void -ComputeBoundsKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - const unsigned int UINT_MAX = 0xffffffff; - - // Init min and max bounds arrays - if( GTid.x < numSoftBodies ) - { - clothMinBounds[GTid.x] = uint4(UINT_MAX, UINT_MAX, UINT_MAX, UINT_MAX); - clothMaxBounds[GTid.x] = uint4(0,0,0,0); - } - - AllMemoryBarrierWithGroupSync(); - - int nodeID = DTid.x; - if( nodeID < numNodes ) - { - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - if( clothIdentifier >= 0 ) - { - float3 position = g_vertexPositions[nodeID].xyz; - - // Reinterpret position as uint - uint3 positionUInt = uint3(asuint(position.x), asuint(position.y), asuint(position.z)); - - // Invert sign bit of positives and whole of negatives to allow comparison as unsigned ints - //positionUInt.x ^= uint((-int(positionUInt.x >> 31) | 0x80000000)); - //positionUInt.y ^= uint((-int(positionUInt.y >> 31) | 0x80000000)); - //positionUInt.z ^= uint((-int(positionUInt.z >> 31) | 0x80000000)); - positionUInt.x ^= (1+~(positionUInt.x >> 31) | 0x80000000); - positionUInt.y ^= (1+~(positionUInt.y >> 31) | 0x80000000); - positionUInt.z ^= (1+~(positionUInt.z >> 31) | 0x80000000); - - // Min/max with the LDS values - InterlockedMin(clothMinBounds[clothIdentifier].x, positionUInt.x); - InterlockedMin(clothMinBounds[clothIdentifier].y, positionUInt.y); - InterlockedMin(clothMinBounds[clothIdentifier].z, positionUInt.z); - - InterlockedMax(clothMaxBounds[clothIdentifier].x, positionUInt.x); - InterlockedMax(clothMaxBounds[clothIdentifier].y, positionUInt.y); - InterlockedMax(clothMaxBounds[clothIdentifier].z, positionUInt.z); - } - } - - AllMemoryBarrierWithGroupSync(); - - - // Use global atomics to update the global versions of the data - if( GTid.x < numSoftBodies ) - { - InterlockedMin(g_clothMinBounds[GTid.x].x, clothMinBounds[GTid.x].x); - InterlockedMin(g_clothMinBounds[GTid.x].y, clothMinBounds[GTid.x].y); - InterlockedMin(g_clothMinBounds[GTid.x].z, clothMinBounds[GTid.x].z); - - InterlockedMax(g_clothMaxBounds[GTid.x].x, clothMaxBounds[GTid.x].x); - InterlockedMax(g_clothMaxBounds[GTid.x].y, clothMaxBounds[GTid.x].y); - InterlockedMax(g_clothMaxBounds[GTid.x].z, clothMaxBounds[GTid.x].z); - } -} - - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/Integrate.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/Integrate.hlsl deleted file mode 100644 index f85fd115c..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/Integrate.hlsl +++ /dev/null @@ -1,41 +0,0 @@ -MSTRINGIFY( - -cbuffer IntegrateCB : register( b0 ) -{ - int numNodes; - float solverdt; - int padding1; - int padding2; -}; - -// Node indices for each link -StructuredBuffer g_vertexInverseMasses : register( t0 ); - -RWStructuredBuffer g_vertexPositions : register( u0 ); -RWStructuredBuffer g_vertexVelocity : register( u1 ); -RWStructuredBuffer g_vertexPreviousPositions : register( u2 ); -RWStructuredBuffer g_vertexForceAccumulator : register( u3 ); - -[numthreads(128, 1, 1)] -void -IntegrateKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - if( nodeID < numNodes ) - { - float3 position = g_vertexPositions[nodeID].xyz; - float3 velocity = g_vertexVelocity[nodeID].xyz; - float3 force = g_vertexForceAccumulator[nodeID].xyz; - float inverseMass = g_vertexInverseMasses[nodeID]; - - g_vertexPreviousPositions[nodeID] = float4(position, 0.f); - velocity += force * inverseMass * solverdt; - position += velocity * solverdt; - - g_vertexForceAccumulator[nodeID] = float4(0.f, 0.f, 0.f, 0.0f); - g_vertexPositions[nodeID] = float4(position, 0.f); - g_vertexVelocity[nodeID] = float4(velocity, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/OutputToVertexArray.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/OutputToVertexArray.hlsl deleted file mode 100644 index a6fa7b950..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/OutputToVertexArray.hlsl +++ /dev/null @@ -1,63 +0,0 @@ -MSTRINGIFY( - -cbuffer OutputToVertexArrayCB : register( b0 ) -{ - int startNode; - int numNodes; - int positionOffset; - int positionStride; - - int normalOffset; - int normalStride; - int padding1; - int padding2; -}; - - -StructuredBuffer g_vertexPositions : register( t0 ); -StructuredBuffer g_vertexNormals : register( t1 ); - -RWBuffer g_vertexBuffer : register( u0 ); - - -[numthreads(128, 1, 1)] -void -OutputToVertexArrayWithNormalsKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID + startNode]; - float4 normal = g_vertexNormals[nodeID + startNode]; - - // Stride should account for the float->float4 conversion - int positionDestination = nodeID * positionStride + positionOffset; - g_vertexBuffer[positionDestination] = position.x; - g_vertexBuffer[positionDestination+1] = position.y; - g_vertexBuffer[positionDestination+2] = position.z; - - int normalDestination = nodeID * normalStride + normalOffset; - g_vertexBuffer[normalDestination] = normal.x; - g_vertexBuffer[normalDestination+1] = normal.y; - g_vertexBuffer[normalDestination+2] = normal.z; - } -} - -[numthreads(128, 1, 1)] -void -OutputToVertexArrayWithoutNormalsKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID + startNode]; - float4 normal = g_vertexNormals[nodeID + startNode]; - - // Stride should account for the float->float4 conversion - int positionDestination = nodeID * positionStride + positionOffset; - g_vertexBuffer[positionDestination] = position.x; - g_vertexBuffer[positionDestination+1] = position.y; - g_vertexBuffer[positionDestination+2] = position.z; - } -} -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/PrepareLinks.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/PrepareLinks.hlsl deleted file mode 100644 index 75db8d149..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/PrepareLinks.hlsl +++ /dev/null @@ -1,44 +0,0 @@ -MSTRINGIFY( - -cbuffer PrepareLinksCB : register( b0 ) -{ - int numLinks; - int padding0; - int padding1; - int padding2; -}; - -// Node indices for each link -StructuredBuffer g_linksVertexIndices : register( t0 ); -StructuredBuffer g_linksMassLSC : register( t1 ); -StructuredBuffer g_nodesPreviousPosition : register( t2 ); - -RWStructuredBuffer g_linksLengthRatio : register( u0 ); -RWStructuredBuffer g_linksCurrentLength : register( u1 ); - -[numthreads(128, 1, 1)] -void -PrepareLinksKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int linkID = DTid.x; - if( linkID < numLinks ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - - float4 nodePreviousPosition0 = g_nodesPreviousPosition[node0]; - float4 nodePreviousPosition1 = g_nodesPreviousPosition[node1]; - - float massLSC = g_linksMassLSC[linkID]; - - float4 linkCurrentLength = nodePreviousPosition1 - nodePreviousPosition0; - - float linkLengthRatio = dot(linkCurrentLength, linkCurrentLength)*massLSC; - linkLengthRatio = 1./linkLengthRatio; - - g_linksCurrentLength[linkID] = linkCurrentLength; - g_linksLengthRatio[linkID] = linkLengthRatio; - } -} -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/SolvePositions.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/SolvePositions.hlsl deleted file mode 100644 index de979d7f9..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/SolvePositions.hlsl +++ /dev/null @@ -1,55 +0,0 @@ -MSTRINGIFY( - -cbuffer SolvePositionsFromLinksKernelCB : register( b0 ) -{ - int startLink; - int numLinks; - float kst; - float ti; -}; - -// Node indices for each link -StructuredBuffer g_linksVertexIndices : register( t0 ); - -StructuredBuffer g_linksMassLSC : register( t1 ); -StructuredBuffer g_linksRestLengthSquared : register( t2 ); -StructuredBuffer g_verticesInverseMass : register( t3 ); - -RWStructuredBuffer g_vertexPositions : register( u0 ); - -[numthreads(128, 1, 1)] -void -SolvePositionsFromLinksKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int linkID = DTid.x + startLink; - if( DTid.x < numLinks ) - { - float massLSC = g_linksMassLSC[linkID]; - float restLengthSquared = g_linksRestLengthSquared[linkID]; - - if( massLSC > 0.0f ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - - float3 position0 = g_vertexPositions[node0].xyz; - float3 position1 = g_vertexPositions[node1].xyz; - - float inverseMass0 = g_verticesInverseMass[node0]; - float inverseMass1 = g_verticesInverseMass[node1]; - - float3 del = position1 - position0; - float len = dot(del, del); - float k = ((restLengthSquared - len)/(massLSC*(restLengthSquared+len)))*kst; - position0 = position0 - del*(k*inverseMass0); - position1 = position1 + del*(k*inverseMass1); - - g_vertexPositions[node0] = float4(position0, 0.f); - g_vertexPositions[node1] = float4(position1, 0.f); - - } - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/SolvePositionsSIMDBatched.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/SolvePositionsSIMDBatched.hlsl deleted file mode 100644 index 3cbb352e8..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/SolvePositionsSIMDBatched.hlsl +++ /dev/null @@ -1,147 +0,0 @@ -MSTRINGIFY( - - - -cbuffer SolvePositionsFromLinksKernelCB : register( b0 ) -{ - int startWaveInBatch; - int numWaves; - float kst; - float ti; -}; - - -// Number of batches per wavefront stored one element per logical wavefront -StructuredBuffer g_wavefrontBatchCountsVertexCounts : register( t0 ); -// Set of up to maxNumVertices vertex addresses per wavefront -StructuredBuffer g_vertexAddressesPerWavefront : register( t1 ); - -StructuredBuffer g_verticesInverseMass : register( t2 ); - -// Per-link data layed out structured in terms of sub batches within wavefronts -StructuredBuffer g_linksVertexIndices : register( t3 ); -StructuredBuffer g_linksMassLSC : register( t4 ); -StructuredBuffer g_linksRestLengthSquared : register( t5 ); - -RWStructuredBuffer g_vertexPositions : register( u0 ); - -// Data loaded on a per-wave basis -groupshared int2 wavefrontBatchCountsVertexCounts[WAVEFRONT_BLOCK_MULTIPLIER]; -groupshared float4 vertexPositionSharedData[MAX_NUM_VERTICES_PER_WAVE*WAVEFRONT_BLOCK_MULTIPLIER]; -groupshared float vertexInverseMassSharedData[MAX_NUM_VERTICES_PER_WAVE*WAVEFRONT_BLOCK_MULTIPLIER]; - -// Storing the vertex addresses actually slowed things down a little -//groupshared int vertexAddressSharedData[MAX_NUM_VERTICES_PER_WAVE*WAVEFRONT_BLOCK_MULTIPLIER]; - - -[numthreads(BLOCK_SIZE, 1, 1)] -void -SolvePositionsFromLinksKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - const int laneInWavefront = (DTid.x & (WAVEFRONT_SIZE-1)); - const int wavefront = startWaveInBatch + (DTid.x / WAVEFRONT_SIZE); - const int firstWavefrontInBlock = startWaveInBatch + Gid.x * WAVEFRONT_BLOCK_MULTIPLIER; - const int localWavefront = wavefront - firstWavefrontInBlock; - - int batchesWithinWavefront = 0; - int verticesUsedByWave = 0; - int cond = wavefront < (startWaveInBatch + numWaves); - - // Mask out in case there's a stray "wavefront" at the end that's been forced in through the multiplier - if( cond) - { - - // Load the batch counts for the wavefronts - - int2 batchesAndVerticesWithinWavefront = g_wavefrontBatchCountsVertexCounts[wavefront]; - - batchesWithinWavefront = batchesAndVerticesWithinWavefront.x; - verticesUsedByWave = batchesAndVerticesWithinWavefront.y; - - // Load the vertices for the wavefronts - for( int vertex = laneInWavefront; vertex < verticesUsedByWave; vertex+=WAVEFRONT_SIZE ) - { - int vertexAddress = g_vertexAddressesPerWavefront[wavefront*MAX_NUM_VERTICES_PER_WAVE + vertex]; - - //vertexAddressSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex] = vertexAddress; - vertexPositionSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex] = g_vertexPositions[vertexAddress]; - vertexInverseMassSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex] = g_verticesInverseMass[vertexAddress]; - } - - } - // Ensure compiler does not re-order memory operations - //AllMemoryBarrier(); - AllMemoryBarrierWithGroupSync (); - - if( cond) - { - // Loop through the batches performing the solve on each in LDS - int baseDataLocationForWave = WAVEFRONT_SIZE * wavefront * MAX_BATCHES_PER_WAVE; - - //for( int batch = 0; batch < batchesWithinWavefront; ++batch ) - - int batch = 0; - do - { - int baseDataLocation = baseDataLocationForWave + WAVEFRONT_SIZE * batch; - int locationOfValue = baseDataLocation + laneInWavefront; - - - // These loads should all be perfectly linear across the WF - int2 localVertexIndices = g_linksVertexIndices[locationOfValue]; - float massLSC = g_linksMassLSC[locationOfValue]; - float restLengthSquared = g_linksRestLengthSquared[locationOfValue]; - - - // LDS vertex addresses based on logical wavefront number in block and loaded index - int vertexAddress0 = MAX_NUM_VERTICES_PER_WAVE * localWavefront + localVertexIndices.x; - int vertexAddress1 = MAX_NUM_VERTICES_PER_WAVE * localWavefront + localVertexIndices.y; - - float3 position0 = vertexPositionSharedData[vertexAddress0].xyz; - float3 position1 = vertexPositionSharedData[vertexAddress1].xyz; - - float inverseMass0 = vertexInverseMassSharedData[vertexAddress0]; - float inverseMass1 = vertexInverseMassSharedData[vertexAddress1]; - - float3 del = position1 - position0; - float len = dot(del, del); - - float k = 0; - if( massLSC > 0.0f ) - { - k = ((restLengthSquared - len)/(massLSC*(restLengthSquared+len)))*kst; - } - - position0 = position0 - del*(k*inverseMass0); - position1 = position1 + del*(k*inverseMass1); - - // Ensure compiler does not re-order memory operations - AllMemoryBarrier(); - - vertexPositionSharedData[vertexAddress0] = float4(position0, 0.f); - vertexPositionSharedData[vertexAddress1] = float4(position1, 0.f); - - // Ensure compiler does not re-order memory operations - AllMemoryBarrier(); - - - ++batch; - } while( batch < batchesWithinWavefront ); - - // Update the global memory vertices for the wavefronts - for( int vertex = laneInWavefront; vertex < verticesUsedByWave; vertex+=WAVEFRONT_SIZE ) - { - int vertexAddress = g_vertexAddressesPerWavefront[wavefront*MAX_NUM_VERTICES_PER_WAVE + vertex]; - - g_vertexPositions[vertexAddress] = vertexPositionSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex]; - } - } - - -} - - - - -); - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateConstants.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateConstants.hlsl deleted file mode 100644 index fafd236f9..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateConstants.hlsl +++ /dev/null @@ -1,48 +0,0 @@ -MSTRINGIFY( - -cbuffer UpdateConstantsCB : register( b0 ) -{ - int numLinks; - int padding0; - int padding1; - int padding2; -}; - -// Node indices for each link -StructuredBuffer g_linksVertexIndices : register( t0 ); -StructuredBuffer g_vertexPositions : register( t1 ); -StructuredBuffer g_vertexInverseMasses : register( t2 ); -StructuredBuffer g_linksMaterialLSC : register( t3 ); - -RWStructuredBuffer g_linksMassLSC : register( u0 ); -RWStructuredBuffer g_linksRestLengthSquared : register( u1 ); -RWStructuredBuffer g_linksRestLengths : register( u2 ); - -[numthreads(128, 1, 1)] -void -UpdateConstantsKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int linkID = DTid.x; - if( linkID < numLinks ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - float linearStiffnessCoefficient = g_linksMaterialLSC[ linkID ]; - - float3 position0 = g_vertexPositions[node0].xyz; - float3 position1 = g_vertexPositions[node1].xyz; - float inverseMass0 = g_vertexInverseMasses[node0]; - float inverseMass1 = g_vertexInverseMasses[node1]; - - float3 difference = position0 - position1; - float length2 = dot(difference, difference); - float length = sqrt(length2); - - g_linksRestLengths[linkID] = length; - g_linksMassLSC[linkID] = (inverseMass0 + inverseMass1)/linearStiffnessCoefficient; - g_linksRestLengthSquared[linkID] = length*length; - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateNodes.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateNodes.hlsl deleted file mode 100644 index a16d89439..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateNodes.hlsl +++ /dev/null @@ -1,49 +0,0 @@ -MSTRINGIFY( - -cbuffer UpdateVelocitiesFromPositionsWithVelocitiesCB : register( b0 ) -{ - int numNodes; - float isolverdt; - int padding1; - int padding2; -}; - - -StructuredBuffer g_vertexPositions : register( t0 ); -StructuredBuffer g_vertexPreviousPositions : register( t1 ); -StructuredBuffer g_vertexClothIndices : register( t2 ); -StructuredBuffer g_clothVelocityCorrectionCoefficients : register( t3 ); -StructuredBuffer g_clothDampingFactor : register( t4 ); - -RWStructuredBuffer g_vertexVelocities : register( u0 ); -RWStructuredBuffer g_vertexForces : register( u1 ); - - -[numthreads(128, 1, 1)] -void -updateVelocitiesFromPositionsWithVelocitiesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - if( nodeID < numNodes ) - { - float3 position = g_vertexPositions[nodeID].xyz; - float3 previousPosition = g_vertexPreviousPositions[nodeID].xyz; - float3 velocity = g_vertexVelocities[nodeID].xyz; - int clothIndex = g_vertexClothIndices[nodeID]; - float velocityCorrectionCoefficient = g_clothVelocityCorrectionCoefficients[clothIndex]; - float dampingFactor = g_clothDampingFactor[clothIndex]; - float velocityCoefficient = (1.f - dampingFactor); - - float3 difference = position - previousPosition; - - velocity += difference*velocityCorrectionCoefficient*isolverdt; - - // Damp the velocity - velocity *= velocityCoefficient; - - g_vertexVelocities[nodeID] = float4(velocity, 0.f); - g_vertexForces[nodeID] = float4(0.f, 0.f, 0.f, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateNormals.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateNormals.hlsl deleted file mode 100644 index 54ab3ed2f..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdateNormals.hlsl +++ /dev/null @@ -1,98 +0,0 @@ -MSTRINGIFY( - -cbuffer UpdateSoftBodiesCB : register( b0 ) -{ - unsigned int numNodes; - unsigned int startFace; - unsigned int numFaces; - float epsilon; -}; - - -// Node indices for each link -StructuredBuffer g_triangleVertexIndexSet : register( t0 ); -StructuredBuffer g_vertexPositions : register( t1 ); -StructuredBuffer g_vertexTriangleCount : register( t2 ); - -RWStructuredBuffer g_vertexNormals : register( u0 ); -RWStructuredBuffer g_vertexArea : register( u1 ); -RWStructuredBuffer g_triangleNormals : register( u2 ); -RWStructuredBuffer g_triangleArea : register( u3 ); - - -[numthreads(128, 1, 1)] -void -ResetNormalsAndAreasKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - if( DTid.x < numNodes ) - { - g_vertexNormals[DTid.x] = float4(0.0f, 0.0f, 0.0f, 0.0f); - g_vertexArea[DTid.x] = 0.0f; - } -} - - -[numthreads(128, 1, 1)] -void -UpdateSoftBodiesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int faceID = DTid.x + startFace; - if( DTid.x < numFaces ) - { - int4 triangleIndexSet = g_triangleVertexIndexSet[ faceID ]; - int nodeIndex0 = triangleIndexSet.x; - int nodeIndex1 = triangleIndexSet.y; - int nodeIndex2 = triangleIndexSet.z; - - float3 node0 = g_vertexPositions[nodeIndex0].xyz; - float3 node1 = g_vertexPositions[nodeIndex1].xyz; - float3 node2 = g_vertexPositions[nodeIndex2].xyz; - float3 nodeNormal0 = g_vertexNormals[nodeIndex0].xyz; - float3 nodeNormal1 = g_vertexNormals[nodeIndex1].xyz; - float3 nodeNormal2 = g_vertexNormals[nodeIndex2].xyz; - float vertexArea0 = g_vertexArea[nodeIndex0]; - float vertexArea1 = g_vertexArea[nodeIndex1]; - float vertexArea2 = g_vertexArea[nodeIndex2]; - - float3 vector0 = node1 - node0; - float3 vector1 = node2 - node0; - - float3 faceNormal = cross(vector0.xyz, vector1.xyz); - float triangleArea = length(faceNormal); - - nodeNormal0 = nodeNormal0 + faceNormal; - nodeNormal1 = nodeNormal1 + faceNormal; - nodeNormal2 = nodeNormal2 + faceNormal; - vertexArea0 = vertexArea0 + triangleArea; - vertexArea1 = vertexArea1 + triangleArea; - vertexArea2 = vertexArea2 + triangleArea; - - g_triangleNormals[faceID] = float4(normalize(faceNormal), 0.f); - g_vertexNormals[nodeIndex0] = float4(nodeNormal0, 0.f); - g_vertexNormals[nodeIndex1] = float4(nodeNormal1, 0.f); - g_vertexNormals[nodeIndex2] = float4(nodeNormal2, 0.f); - g_triangleArea[faceID] = triangleArea; - g_vertexArea[nodeIndex0] = vertexArea0; - g_vertexArea[nodeIndex1] = vertexArea1; - g_vertexArea[nodeIndex2] = vertexArea2; - } -} - -[numthreads(128, 1, 1)] -void -NormalizeNormalsAndAreasKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - if( DTid.x < numNodes ) - { - float4 normal = g_vertexNormals[DTid.x]; - float area = g_vertexArea[DTid.x]; - int numTriangles = g_vertexTriangleCount[DTid.x]; - - float vectorLength = length(normal); - - g_vertexNormals[DTid.x] = normalize(normal); - g_vertexArea[DTid.x] = area/float(numTriangles); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdatePositions.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdatePositions.hlsl deleted file mode 100644 index 9685fa8fb..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdatePositions.hlsl +++ /dev/null @@ -1,44 +0,0 @@ -MSTRINGIFY( - -cbuffer UpdateVelocitiesFromPositionsWithoutVelocitiesCB : register( b0 ) -{ - int numNodes; - float isolverdt; - int padding1; - int padding2; -}; - - -StructuredBuffer g_vertexPositions : register( t0 ); -StructuredBuffer g_vertexPreviousPositions : register( t1 ); -StructuredBuffer g_vertexClothIndices : register( t2 ); -StructuredBuffer g_clothDampingFactor : register( t3 ); - -RWStructuredBuffer g_vertexVelocities : register( u0 ); -RWStructuredBuffer g_vertexForces : register( u1 ); - - -[numthreads(128, 1, 1)] -void -updateVelocitiesFromPositionsWithoutVelocitiesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - if( nodeID < numNodes ) - { - float3 position = g_vertexPositions[nodeID].xyz; - float3 previousPosition = g_vertexPreviousPositions[nodeID].xyz; - float3 velocity = g_vertexVelocities[nodeID].xyz; - int clothIndex = g_vertexClothIndices[nodeID]; - float dampingFactor = g_clothDampingFactor[clothIndex]; - float velocityCoefficient = (1.f - dampingFactor); - - float3 difference = position - previousPosition; - - velocity = difference*velocityCoefficient*isolverdt; - - g_vertexVelocities[nodeID] = float4(velocity, 0.f); - g_vertexForces[nodeID] = float4(0.f, 0.f, 0.f, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdatePositionsFromVelocities.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdatePositionsFromVelocities.hlsl deleted file mode 100644 index e816b1e14..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/UpdatePositionsFromVelocities.hlsl +++ /dev/null @@ -1,35 +0,0 @@ -MSTRINGIFY( - -cbuffer UpdatePositionsFromVelocitiesCB : register( b0 ) -{ - int numNodes; - float solverSDT; - int padding1; - int padding2; -}; - - -StructuredBuffer g_vertexVelocities : register( t0 ); - -RWStructuredBuffer g_vertexPreviousPositions : register( u0 ); -RWStructuredBuffer g_vertexCurrentPosition : register( u1 ); - - -[numthreads(128, 1, 1)] -void -UpdatePositionsFromVelocitiesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int vertexID = DTid.x; - if( vertexID < numNodes ) - { - float3 previousPosition = g_vertexPreviousPositions[vertexID].xyz; - float3 velocity = g_vertexVelocities[vertexID].xyz; - - float3 newPosition = previousPosition + velocity*solverSDT; - - g_vertexCurrentPosition[vertexID] = float4(newPosition, 0.f); - g_vertexPreviousPositions[vertexID] = float4(newPosition, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/VSolveLinks.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/VSolveLinks.hlsl deleted file mode 100644 index 14afca674..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/VSolveLinks.hlsl +++ /dev/null @@ -1,55 +0,0 @@ -MSTRINGIFY( - -cbuffer VSolveLinksCB : register( b0 ) -{ - int startLink; - int numLinks; - float kst; - int padding; -}; - -// Node indices for each link -StructuredBuffer g_linksVertexIndices : register( t0 ); - -StructuredBuffer g_linksLengthRatio : register( t1 ); -StructuredBuffer g_linksCurrentLength : register( t2 ); -StructuredBuffer g_vertexInverseMass : register( t3 ); - -RWStructuredBuffer g_vertexVelocity : register( u0 ); - -[numthreads(128, 1, 1)] -void -VSolveLinksKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int linkID = DTid.x + startLink; - if( DTid.x < numLinks ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - - float linkLengthRatio = g_linksLengthRatio[linkID]; - float3 linkCurrentLength = g_linksCurrentLength[linkID].xyz; - - float3 vertexVelocity0 = g_vertexVelocity[node0].xyz; - float3 vertexVelocity1 = g_vertexVelocity[node1].xyz; - - float vertexInverseMass0 = g_vertexInverseMass[node0]; - float vertexInverseMass1 = g_vertexInverseMass[node1]; - - float3 nodeDifference = vertexVelocity0 - vertexVelocity1; - float dotResult = dot(linkCurrentLength, nodeDifference); - float j = -dotResult*linkLengthRatio*kst; - - float3 velocityChange0 = linkCurrentLength*(j*vertexInverseMass0); - float3 velocityChange1 = linkCurrentLength*(j*vertexInverseMass1); - - vertexVelocity0 += velocityChange0; - vertexVelocity1 -= velocityChange1; - - g_vertexVelocity[node0] = float4(vertexVelocity0, 0.f); - g_vertexVelocity[node1] = float4(vertexVelocity1, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/solveCollisionsAndUpdateVelocities.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/solveCollisionsAndUpdateVelocities.hlsl deleted file mode 100644 index 9d46a5969..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/solveCollisionsAndUpdateVelocities.hlsl +++ /dev/null @@ -1,170 +0,0 @@ -MSTRINGIFY( - -cbuffer SolvePositionsFromLinksKernelCB : register( b0 ) -{ - unsigned int numNodes; - float isolverdt; - int padding0; - int padding1; -}; - -struct CollisionObjectIndices -{ - int firstObject; - int endObject; -}; - -struct CollisionShapeDescription -{ - float4x4 shapeTransform; - float4 linearVelocity; - float4 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - - // Shape information - // Compressed from the union - float radius; - float halfHeight; - - float margin; - float friction; - - int padding0; - int padding1; - -}; - -// From btBroadphaseProxy.h -static const int CAPSULE_SHAPE_PROXYTYPE = 10; - -// Node indices for each link -StructuredBuffer g_vertexClothIdentifier : register( t0 ); -StructuredBuffer g_vertexPreviousPositions : register( t1 ); -StructuredBuffer g_perClothFriction : register( t2 ); -StructuredBuffer g_clothDampingFactor : register( t3 ); -StructuredBuffer g_perClothCollisionObjectIndices : register( t4 ); -StructuredBuffer g_collisionObjectDetails : register( t5 ); - -RWStructuredBuffer g_vertexForces : register( u0 ); -RWStructuredBuffer g_vertexVelocities : register( u1 ); -RWStructuredBuffer g_vertexPositions : register( u2 ); - -[numthreads(128, 1, 1)] -void -SolveCollisionsAndUpdateVelocitiesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - float3 forceOnVertex = float3(0.f, 0.f, 0.f); - if( DTid.x < numNodes ) - { - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - float4 position = float4(g_vertexPositions[nodeID].xyz, 1.f); - float4 previousPosition = float4(g_vertexPreviousPositions[nodeID].xyz, 1.f); - float3 velocity; - float clothFriction = g_perClothFriction[clothIdentifier]; - float dampingFactor = g_clothDampingFactor[clothIdentifier]; - float velocityCoefficient = (1.f - dampingFactor); - CollisionObjectIndices collisionObjectIndices = g_perClothCollisionObjectIndices[clothIdentifier]; - - if( collisionObjectIndices.firstObject != collisionObjectIndices.endObject ) - { - velocity = float3(15, 0, 0); - - // We have some possible collisions to deal with - for( int collision = collisionObjectIndices.firstObject; collision < collisionObjectIndices.endObject; ++collision ) - { - CollisionShapeDescription shapeDescription = g_collisionObjectDetails[collision]; - float colliderFriction = shapeDescription.friction; - - if( shapeDescription.collisionShapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Colliding with a capsule - - float capsuleHalfHeight = shapeDescription.halfHeight; - float capsuleRadius = shapeDescription.radius; - float capsuleMargin = shapeDescription.margin; - float4x4 worldTransform = shapeDescription.shapeTransform; - - float4 c1 = float4(0.f, -capsuleHalfHeight, 0.f, 1.f); - float4 c2 = float4(0.f, +capsuleHalfHeight, 0.f, 1.f); - float4 worldC1 = mul(worldTransform, c1); - float4 worldC2 = mul(worldTransform, c2); - float3 segment = (worldC2 - worldC1).xyz; - - // compute distance of tangent to vertex along line segment in capsule - float distanceAlongSegment = -( dot( (worldC1 - position).xyz, segment ) / dot(segment, segment) ); - - float4 closestPoint = (worldC1 + float4(segment * distanceAlongSegment, 0.f)); - float distanceFromLine = length(position - closestPoint); - float distanceFromC1 = length(worldC1 - position); - float distanceFromC2 = length(worldC2 - position); - - // Final distance from collision, point to push from, direction to push in - // for impulse force - float dist; - float3 normalVector; - if( distanceAlongSegment < 0 ) - { - dist = distanceFromC1; - normalVector = normalize(position - worldC1).xyz; - } else if( distanceAlongSegment > 1.f ) { - dist = distanceFromC2; - normalVector = normalize(position - worldC2).xyz; - } else { - dist = distanceFromLine; - normalVector = normalize(position - closestPoint).xyz; - } - - float3 colliderLinearVelocity = shapeDescription.linearVelocity.xyz; - float3 colliderAngularVelocity = shapeDescription.angularVelocity.xyz; - float3 velocityOfSurfacePoint = colliderLinearVelocity + cross(colliderAngularVelocity, position.xyz - worldTransform._m03_m13_m23); - - float minDistance = capsuleRadius + capsuleMargin; - - // In case of no collision, this is the value of velocity - velocity = (position - previousPosition).xyz * velocityCoefficient * isolverdt; - - - // Check for a collision - if( dist < minDistance ) - { - // Project back to surface along normal - position = position + float4((minDistance - dist)*normalVector*0.9, 0.f); - velocity = (position - previousPosition).xyz * velocityCoefficient * isolverdt; - float3 relativeVelocity = velocity - velocityOfSurfacePoint; - - float3 p1 = normalize(cross(normalVector, segment)); - float3 p2 = normalize(cross(p1, normalVector)); - // Full friction is sum of velocities in each direction of plane - float3 frictionVector = p1*dot(relativeVelocity, p1) + p2*dot(relativeVelocity, p2); - - // Real friction is peak friction corrected by friction coefficients - frictionVector = frictionVector * (colliderFriction*clothFriction); - - float approachSpeed = dot(relativeVelocity, normalVector); - - if( approachSpeed <= 0.0 ) - forceOnVertex -= frictionVector; - } - - } - } - } else { - // Update velocity - float3 difference = position.xyz - previousPosition.xyz; - velocity = difference*velocityCoefficient*isolverdt; - } - - g_vertexVelocities[nodeID] = float4(velocity, 0.f); - - // Update external force - g_vertexForces[nodeID] = float4(forceOnVertex, 0.f); - - g_vertexPositions[nodeID] = float4(position.xyz, 0.f); - } -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/solveCollisionsAndUpdateVelocitiesSIMDBatched.hlsl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/solveCollisionsAndUpdateVelocitiesSIMDBatched.hlsl deleted file mode 100644 index 0b2a0271a..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/solveCollisionsAndUpdateVelocitiesSIMDBatched.hlsl +++ /dev/null @@ -1,191 +0,0 @@ -MSTRINGIFY( - -cbuffer SolvePositionsFromLinksKernelCB : register( b0 ) -{ - unsigned int numNodes; - float isolverdt; - int padding0; - int padding1; -}; - -struct CollisionObjectIndices -{ - int firstObject; - int endObject; -}; - -struct CollisionShapeDescription -{ - float4x4 shapeTransform; - float4 linearVelocity; - float4 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - - // Shape information - // Compressed from the union - float radius; - float halfHeight; - - float margin; - float friction; - - int padding0; - int padding1; - -}; - -// From btBroadphaseProxy.h -static const int CAPSULE_SHAPE_PROXYTYPE = 10; - -// Node indices for each link -StructuredBuffer g_vertexClothIdentifier : register( t0 ); -StructuredBuffer g_vertexPreviousPositions : register( t1 ); -StructuredBuffer g_perClothFriction : register( t2 ); -StructuredBuffer g_clothDampingFactor : register( t3 ); -StructuredBuffer g_perClothCollisionObjectIndices : register( t4 ); -StructuredBuffer g_collisionObjectDetails : register( t5 ); - -RWStructuredBuffer g_vertexForces : register( u0 ); -RWStructuredBuffer g_vertexVelocities : register( u1 ); -RWStructuredBuffer g_vertexPositions : register( u2 ); - -// A buffer of local collision shapes -// TODO: Iterate to support more than 16 -groupshared CollisionShapeDescription localCollisionShapes[16]; - -[numthreads(128, 1, 1)] -void -SolveCollisionsAndUpdateVelocitiesKernel( uint3 Gid : SV_GroupID, uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID, uint GI : SV_GroupIndex ) -{ - int nodeID = DTid.x; - float3 forceOnVertex = float3(0.f, 0.f, 0.f); - - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - float4 position = float4(g_vertexPositions[nodeID].xyz, 1.f); - float4 previousPosition = float4(g_vertexPreviousPositions[nodeID].xyz, 1.f); - float3 velocity; - float clothFriction = g_perClothFriction[clothIdentifier]; - float dampingFactor = g_clothDampingFactor[clothIdentifier]; - float velocityCoefficient = (1.f - dampingFactor); - CollisionObjectIndices collisionObjectIndices = g_perClothCollisionObjectIndices[clothIdentifier]; - - int numObjects = collisionObjectIndices.endObject - collisionObjectIndices.firstObject; - if( numObjects > 0 ) - { - // We have some possible collisions to deal with - - // First load all of the collision objects into LDS - int numObjects = collisionObjectIndices.endObject - collisionObjectIndices.firstObject; - if( GTid.x < numObjects ) - { - localCollisionShapes[GTid.x] = g_collisionObjectDetails[ collisionObjectIndices.firstObject + GTid.x ]; - } - } - - // Safe as the vertices are padded so that not more than one soft body is in a group - AllMemoryBarrierWithGroupSync(); - - // Annoyingly, even though I know the flow control is not varying, the compiler will not let me skip this - if( numObjects > 0 ) - { - velocity = float3(0, 0, 0); - - - // We have some possible collisions to deal with - for( int collision = 0; collision < numObjects; ++collision ) - { - CollisionShapeDescription shapeDescription = localCollisionShapes[collision]; - float colliderFriction = shapeDescription.friction; - - if( shapeDescription.collisionShapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Colliding with a capsule - - float capsuleHalfHeight = localCollisionShapes[collision].halfHeight; - float capsuleRadius = localCollisionShapes[collision].radius; - float capsuleMargin = localCollisionShapes[collision].margin; - - float4x4 worldTransform = localCollisionShapes[collision].shapeTransform; - - float4 c1 = float4(0.f, -capsuleHalfHeight, 0.f, 1.f); - float4 c2 = float4(0.f, +capsuleHalfHeight, 0.f, 1.f); - float4 worldC1 = mul(worldTransform, c1); - float4 worldC2 = mul(worldTransform, c2); - float3 segment = (worldC2 - worldC1).xyz; - - // compute distance of tangent to vertex along line segment in capsule - float distanceAlongSegment = -( dot( (worldC1 - position).xyz, segment ) / dot(segment, segment) ); - - float4 closestPoint = (worldC1 + float4(segment * distanceAlongSegment, 0.f)); - float distanceFromLine = length(position - closestPoint); - float distanceFromC1 = length(worldC1 - position); - float distanceFromC2 = length(worldC2 - position); - - // Final distance from collision, point to push from, direction to push in - // for impulse force - float dist; - float3 normalVector; - if( distanceAlongSegment < 0 ) - { - dist = distanceFromC1; - normalVector = normalize(position - worldC1).xyz; - } else if( distanceAlongSegment > 1.f ) { - dist = distanceFromC2; - normalVector = normalize(position - worldC2).xyz; - } else { - dist = distanceFromLine; - normalVector = normalize(position - closestPoint).xyz; - } - - float3 colliderLinearVelocity = localCollisionShapes[collision].linearVelocity.xyz; - float3 colliderAngularVelocity = localCollisionShapes[collision].angularVelocity.xyz; - float3 velocityOfSurfacePoint = colliderLinearVelocity + cross(colliderAngularVelocity, position.xyz - worldTransform._m03_m13_m23); - - float minDistance = capsuleRadius + capsuleMargin; - - // In case of no collision, this is the value of velocity - velocity = (position - previousPosition).xyz * velocityCoefficient * isolverdt; - - - // Check for a collision - if( dist < minDistance ) - { - // Project back to surface along normal - position = position + float4((minDistance - dist)*normalVector*0.9, 0.f); - velocity = (position - previousPosition).xyz * velocityCoefficient * isolverdt; - float3 relativeVelocity = velocity - velocityOfSurfacePoint; - - float3 p1 = normalize(cross(normalVector, segment)); - float3 p2 = normalize(cross(p1, normalVector)); - // Full friction is sum of velocities in each direction of plane - float3 frictionVector = p1*dot(relativeVelocity, p1) + p2*dot(relativeVelocity, p2); - - // Real friction is peak friction corrected by friction coefficients - frictionVector = frictionVector * (colliderFriction*clothFriction); - - float approachSpeed = dot(relativeVelocity, normalVector); - - if( approachSpeed <= 0.0 ) - forceOnVertex -= frictionVector; - } - - } - } - } else { - // Update velocity - float3 difference = position.xyz - previousPosition.xyz; - velocity = difference*velocityCoefficient*isolverdt; - } - - g_vertexVelocities[nodeID] = float4(velocity, 0.f); - - // Update external force - g_vertexForces[nodeID] = float4(forceOnVertex, 0.f); - - g_vertexPositions[nodeID] = float4(position.xyz, 0.f); -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverBuffer_DX11.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverBuffer_DX11.h deleted file mode 100644 index b6a99cc1d..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverBuffer_DX11.h +++ /dev/null @@ -1,323 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ -#ifndef BT_SOFT_BODY_SOLVER_BUFFER_DX11_H -#define BT_SOFT_BODY_SOLVER_BUFFER_DX11_H - -// DX11 support -#include -#include -#include -#include -#include - -#ifndef SAFE_RELEASE -#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } -#endif - -/** - * DX11 Buffer that tracks a host buffer on use to ensure size-correctness. - */ -template class btDX11Buffer -{ -protected: - ID3D11Device* m_d3dDevice; - ID3D11DeviceContext* m_d3dDeviceContext; - - ID3D11Buffer* m_Buffer; - ID3D11ShaderResourceView* m_SRV; - ID3D11UnorderedAccessView* m_UAV; - btAlignedObjectArray< ElementType >* m_CPUBuffer; - - // TODO: Separate this from the main class - // as read back buffers can be shared between buffers - ID3D11Buffer* m_readBackBuffer; - - int m_gpuSize; - bool m_onGPU; - - bool m_readOnlyOnGPU; - - bool createBuffer( ID3D11Buffer *preexistingBuffer = 0) - { - HRESULT hr = S_OK; - - // Create all CS buffers - if( preexistingBuffer ) - { - m_Buffer = preexistingBuffer; - } else { - D3D11_BUFFER_DESC buffer_desc; - ZeroMemory(&buffer_desc, sizeof(buffer_desc)); - buffer_desc.Usage = D3D11_USAGE_DEFAULT; - if( m_readOnlyOnGPU ) - buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; - else - buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS; - buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; - - buffer_desc.ByteWidth = m_CPUBuffer->size() * sizeof(ElementType); - // At a minimum the buffer must exist - if( buffer_desc.ByteWidth == 0 ) - buffer_desc.ByteWidth = sizeof(ElementType); - buffer_desc.StructureByteStride = sizeof(ElementType); - hr = m_d3dDevice->CreateBuffer(&buffer_desc, NULL, &m_Buffer); - if( FAILED( hr ) ) - return (hr==S_OK); - } - - if( m_readOnlyOnGPU ) - { - D3D11_SHADER_RESOURCE_VIEW_DESC srvbuffer_desc; - ZeroMemory(&srvbuffer_desc, sizeof(srvbuffer_desc)); - srvbuffer_desc.Format = DXGI_FORMAT_UNKNOWN; - srvbuffer_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; - - srvbuffer_desc.Buffer.ElementWidth = m_CPUBuffer->size(); - if( srvbuffer_desc.Buffer.ElementWidth == 0 ) - srvbuffer_desc.Buffer.ElementWidth = 1; - hr = m_d3dDevice->CreateShaderResourceView(m_Buffer, &srvbuffer_desc, &m_SRV); - if( FAILED( hr ) ) - return (hr==S_OK); - } else { - // Create SRV - D3D11_SHADER_RESOURCE_VIEW_DESC srvbuffer_desc; - ZeroMemory(&srvbuffer_desc, sizeof(srvbuffer_desc)); - srvbuffer_desc.Format = DXGI_FORMAT_UNKNOWN; - srvbuffer_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; - - srvbuffer_desc.Buffer.ElementWidth = m_CPUBuffer->size(); - if( srvbuffer_desc.Buffer.ElementWidth == 0 ) - srvbuffer_desc.Buffer.ElementWidth = 1; - hr = m_d3dDevice->CreateShaderResourceView(m_Buffer, &srvbuffer_desc, &m_SRV); - if( FAILED( hr ) ) - return (hr==S_OK); - - // Create UAV - D3D11_UNORDERED_ACCESS_VIEW_DESC uavbuffer_desc; - ZeroMemory(&uavbuffer_desc, sizeof(uavbuffer_desc)); - uavbuffer_desc.Format = DXGI_FORMAT_UNKNOWN; - uavbuffer_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; - - uavbuffer_desc.Buffer.NumElements = m_CPUBuffer->size(); - if( uavbuffer_desc.Buffer.NumElements == 0 ) - uavbuffer_desc.Buffer.NumElements = 1; - hr = m_d3dDevice->CreateUnorderedAccessView(m_Buffer, &uavbuffer_desc, &m_UAV); - if( FAILED( hr ) ) - return (hr==S_OK); - - // Create read back buffer - D3D11_BUFFER_DESC readback_buffer_desc; - ZeroMemory(&readback_buffer_desc, sizeof(readback_buffer_desc)); - - readback_buffer_desc.ByteWidth = m_CPUBuffer->size() * sizeof(ElementType); - readback_buffer_desc.Usage = D3D11_USAGE_STAGING; - readback_buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; - readback_buffer_desc.StructureByteStride = sizeof(ElementType); - hr = m_d3dDevice->CreateBuffer(&readback_buffer_desc, NULL, &m_readBackBuffer); - if( FAILED( hr ) ) - return (hr==S_OK); - } - - m_gpuSize = m_CPUBuffer->size(); - return true; - } - - - -public: - btDX11Buffer( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext, btAlignedObjectArray< ElementType > *CPUBuffer, bool readOnly ) - { - m_d3dDevice = d3dDevice; - m_d3dDeviceContext = d3dDeviceContext; - m_Buffer = 0; - m_SRV = 0; - m_UAV = 0; - m_readBackBuffer = 0; - - m_CPUBuffer = CPUBuffer; - - m_gpuSize = 0; - m_onGPU = false; - - m_readOnlyOnGPU = readOnly; - } - - virtual ~btDX11Buffer() - { - SAFE_RELEASE(m_Buffer); - SAFE_RELEASE(m_SRV); - SAFE_RELEASE(m_UAV); - SAFE_RELEASE(m_readBackBuffer); - } - - ID3D11ShaderResourceView* &getSRV() - { - return m_SRV; - } - - ID3D11UnorderedAccessView* &getUAV() - { - return m_UAV; - } - - ID3D11Buffer* &getBuffer() - { - return m_Buffer; - } - - /** - * Move the data to the GPU if it is not there already. - */ - bool moveToGPU() - { - // Reallocate if GPU size is too small - if( (m_CPUBuffer->size() > m_gpuSize ) ) - m_onGPU = false; - if( !m_onGPU && m_CPUBuffer->size() > 0 ) - { - // If the buffer doesn't exist or the CPU-side buffer has changed size, create - // We should really delete the old one, too, but let's leave that for later - if( !m_Buffer || (m_CPUBuffer->size() != m_gpuSize) ) - { - SAFE_RELEASE(m_Buffer); - SAFE_RELEASE(m_SRV); - SAFE_RELEASE(m_UAV); - SAFE_RELEASE(m_readBackBuffer); - if( !createBuffer() ) - { - btAssert("Buffer creation failed."); - return false; - } - } - - if( m_gpuSize > 0 ) - { - D3D11_BOX destRegion; - destRegion.left = 0; - destRegion.front = 0; - destRegion.top = 0; - destRegion.bottom = 1; - destRegion.back = 1; - destRegion.right = (m_CPUBuffer->size())*sizeof(ElementType); - m_d3dDeviceContext->UpdateSubresource(m_Buffer, 0, &destRegion, &((*m_CPUBuffer)[0]), 0, 0); - - m_onGPU = true; - } - - } - - return true; - } - - /** - * Move the data back from the GPU if it is on there and isn't read only. - */ - bool moveFromGPU() - { - if( m_CPUBuffer->size() > 0 ) - { - if( m_onGPU && !m_readOnlyOnGPU ) - { - // Copy back - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - //m_pd3dImmediateContext->CopyResource(m_phAngVelReadBackBuffer, m_phAngVel); - - D3D11_BOX destRegion; - destRegion.left = 0; - destRegion.front = 0; - destRegion.top = 0; - destRegion.bottom = 1; - destRegion.back = 1; - - destRegion.right = (m_CPUBuffer->size())*sizeof(ElementType); - m_d3dDeviceContext->CopySubresourceRegion( - m_readBackBuffer, - 0, - 0, - 0, - 0 , - m_Buffer, - 0, - &destRegion - ); - - m_d3dDeviceContext->Map(m_readBackBuffer, 0, D3D11_MAP_READ, 0, &MappedResource); - //memcpy(m_hAngVel, MappedResource.pData, (m_maxObjs * sizeof(float) )); - memcpy(&((*m_CPUBuffer)[0]), MappedResource.pData, ((m_CPUBuffer->size()) * sizeof(ElementType) )); - m_d3dDeviceContext->Unmap(m_readBackBuffer, 0); - - m_onGPU = false; - } - } - - return true; - } - - - /** - * Copy the data back from the GPU without changing its state to be CPU-side. - * Useful if we just want to view it on the host for visualization. - */ - bool copyFromGPU() - { - if( m_CPUBuffer->size() > 0 ) - { - if( m_onGPU && !m_readOnlyOnGPU ) - { - // Copy back - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - - D3D11_BOX destRegion; - destRegion.left = 0; - destRegion.front = 0; - destRegion.top = 0; - destRegion.bottom = 1; - destRegion.back = 1; - - destRegion.right = (m_CPUBuffer->size())*sizeof(ElementType); - m_d3dDeviceContext->CopySubresourceRegion( - m_readBackBuffer, - 0, - 0, - 0, - 0 , - m_Buffer, - 0, - &destRegion - ); - - m_d3dDeviceContext->Map(m_readBackBuffer, 0, D3D11_MAP_READ, 0, &MappedResource); - //memcpy(m_hAngVel, MappedResource.pData, (m_maxObjs * sizeof(float) )); - memcpy(&((*m_CPUBuffer)[0]), MappedResource.pData, ((m_CPUBuffer->size()) * sizeof(ElementType) )); - m_d3dDeviceContext->Unmap(m_readBackBuffer, 0); - } - } - - return true; - } - - /** - * Call if data has changed on the CPU. - * Can then trigger a move to the GPU as necessary. - */ - virtual void changedOnCPU() - { - m_onGPU = false; - } -}; // class btDX11Buffer - - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_BUFFER_DX11_H \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverLinkData_DX11.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverLinkData_DX11.h deleted file mode 100644 index 454c3c8cc..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverLinkData_DX11.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_DX11.h" - - -#ifndef BT_SOFT_BODY_SOLVER_LINK_DATA_DX11_H -#define BT_SOFT_BODY_SOLVER_LINK_DATA_DX11_H - -struct ID3D11Device; -struct ID3D11DeviceContext; - - -class btSoftBodyLinkDataDX11 : public btSoftBodyLinkData -{ -public: - bool m_onGPU; - ID3D11Device *m_d3dDevice; - ID3D11DeviceContext *m_d3dDeviceContext; - - - btDX11Buffer m_dx11Links; - btDX11Buffer m_dx11LinkStrength; - btDX11Buffer m_dx11LinksMassLSC; - btDX11Buffer m_dx11LinksRestLengthSquared; - btDX11Buffer m_dx11LinksCLength; - btDX11Buffer m_dx11LinksLengthRatio; - btDX11Buffer m_dx11LinksRestLength; - btDX11Buffer m_dx11LinksMaterialLinearStiffnessCoefficient; - - struct BatchPair - { - int start; - int length; - - BatchPair() : - start(0), - length(0) - { - } - - BatchPair( int s, int l ) : - start( s ), - length( l ) - { - } - }; - - /** - * Link addressing information for each cloth. - * Allows link locations to be computed independently of data batching. - */ - btAlignedObjectArray< int > m_linkAddresses; - - /** - * Start and length values for computation batches over link data. - */ - btAlignedObjectArray< BatchPair > m_batchStartLengths; - - - //ID3D11Buffer* readBackBuffer; - - btSoftBodyLinkDataDX11( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ); - - virtual ~btSoftBodyLinkDataDX11(); - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createLinks( int numLinks ); - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setLinkAt( const LinkDescription &link, int linkIndex ); - - virtual bool onAccelerator(); - - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(); - - /** - * Generate (and later update) the batching for the entire link set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ - void generateBatches(); -}; - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_LINK_DATA_DX11_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverLinkData_DX11SIMDAware.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverLinkData_DX11SIMDAware.h deleted file mode 100644 index 6eb26c68e..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverLinkData_DX11SIMDAware.h +++ /dev/null @@ -1,173 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_DX11.h" - -#ifndef BT_ACCELERATED_SOFT_BODY_LINK_DATA_DX11_SIMDAWARE_H -#define BT_ACCELERATED_SOFT_BODY_LINK_DATA_DX11_SIMDAWARE_H - -struct ID3D11Device; -struct ID3D11DeviceContext; - - -class btSoftBodyLinkDataDX11SIMDAware : public btSoftBodyLinkData -{ -public: - bool m_onGPU; - ID3D11Device *m_d3dDevice; - ID3D11DeviceContext *m_d3dDeviceContext; - - const int m_wavefrontSize; - const int m_linksPerWorkItem; - const int m_maxLinksPerWavefront; - int m_maxBatchesWithinWave; - int m_maxVerticesWithinWave; - int m_numWavefronts; - - int m_maxVertex; - - struct NumBatchesVerticesPair - { - int numBatches; - int numVertices; - }; - - // Array storing number of links in each wavefront - btAlignedObjectArray m_linksPerWavefront; - btAlignedObjectArray m_numBatchesAndVerticesWithinWaves; - btDX11Buffer< NumBatchesVerticesPair > m_dx11NumBatchesAndVerticesWithinWaves; - - // All arrays here will contain batches of m_maxLinksPerWavefront links - // ordered by wavefront. - // with either global vertex pairs or local vertex pairs - btAlignedObjectArray< int > m_wavefrontVerticesGlobalAddresses; // List of global vertices per wavefront - btDX11Buffer m_dx11WavefrontVerticesGlobalAddresses; - btAlignedObjectArray< LinkNodePair > m_linkVerticesLocalAddresses; // Vertex pair for the link - btDX11Buffer m_dx11LinkVerticesLocalAddresses; - btDX11Buffer m_dx11LinkStrength; - btDX11Buffer m_dx11LinksMassLSC; - btDX11Buffer m_dx11LinksRestLengthSquared; - btDX11Buffer m_dx11LinksRestLength; - btDX11Buffer m_dx11LinksMaterialLinearStiffnessCoefficient; - - struct BatchPair - { - int start; - int length; - - BatchPair() : - start(0), - length(0) - { - } - - BatchPair( int s, int l ) : - start( s ), - length( l ) - { - } - }; - - /** - * Link addressing information for each cloth. - * Allows link locations to be computed independently of data batching. - */ - btAlignedObjectArray< int > m_linkAddresses; - - /** - * Start and length values for computation batches over link data. - */ - btAlignedObjectArray< BatchPair > m_wavefrontBatchStartLengths; - - - //ID3D11Buffer* readBackBuffer; - - btSoftBodyLinkDataDX11SIMDAware( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ); - - virtual ~btSoftBodyLinkDataDX11SIMDAware(); - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createLinks( int numLinks ); - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setLinkAt( const LinkDescription &link, int linkIndex ); - - virtual bool onAccelerator(); - - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(); - - /** - * Generate (and later update) the batching for the entire link set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ - void generateBatches(); - - int getMaxVerticesPerWavefront() - { - return m_maxVerticesWithinWave; - } - - int getWavefrontSize() - { - return m_wavefrontSize; - } - - int getLinksPerWorkItem() - { - return m_linksPerWorkItem; - } - - int getMaxLinksPerWavefront() - { - return m_maxLinksPerWavefront; - } - - int getMaxBatchesPerWavefront() - { - return m_maxBatchesWithinWave; - } - - int getNumWavefronts() - { - return m_numWavefronts; - } - - NumBatchesVerticesPair getNumBatchesAndVerticesWithinWavefront( int wavefront ) - { - return m_numBatchesAndVerticesWithinWaves[wavefront]; - } - - int getVertexGlobalAddresses( int vertexIndex ) - { - return m_wavefrontVerticesGlobalAddresses[vertexIndex]; - } - - /** - * Get post-batching local addresses of the vertex pair for a link assuming all vertices used by a wavefront are loaded locally. - */ - LinkNodePair getVertexPairLocalAddresses( int linkIndex ) - { - return m_linkVerticesLocalAddresses[linkIndex]; - } - -}; - - -#endif // #ifndef BT_ACCELERATED_SOFT_BODY_LINK_DATA_DX11_SIMDAWARE_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverTriangleData_DX11.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverTriangleData_DX11.h deleted file mode 100644 index 7012fabd4..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverTriangleData_DX11.h +++ /dev/null @@ -1,96 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_DX11.h" - - -#ifndef BT_SOFT_BODY_SOLVER_TRIANGLE_DATA_DX11_H -#define BT_SOFT_BODY_SOLVER_TRIANGLE_DATA_DX11_H - -struct ID3D11Device; -struct ID3D11DeviceContext; - -class btSoftBodyTriangleDataDX11 : public btSoftBodyTriangleData -{ -public: - bool m_onGPU; - ID3D11Device *m_d3dDevice; - ID3D11DeviceContext *m_d3dDeviceContext; - - btDX11Buffer m_dx11VertexIndices; - btDX11Buffer m_dx11Area; - btDX11Buffer m_dx11Normal; - - struct BatchPair - { - int start; - int length; - - BatchPair() : - start(0), - length(0) - { - } - - BatchPair( int s, int l ) : - start( s ), - length( l ) - { - } - }; - - - /** - * Link addressing information for each cloth. - * Allows link locations to be computed independently of data batching. - */ - btAlignedObjectArray< int > m_triangleAddresses; - - /** - * Start and length values for computation batches over link data. - */ - btAlignedObjectArray< BatchPair > m_batchStartLengths; - - //ID3D11Buffer* readBackBuffer; - -public: - btSoftBodyTriangleDataDX11( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ); - - virtual ~btSoftBodyTriangleDataDX11(); - - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createTriangles( int numTriangles ); - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setTriangleAt( const btSoftBodyTriangleData::TriangleDescription &triangle, int triangleIndex ); - - virtual bool onAccelerator(); - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(); - /** - * Generate (and later update) the batching for the entire triangle set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ - void generateBatches(); -}; - - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_TRIANGLE_DATA_DX11_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexBuffer_DX11.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexBuffer_DX11.h deleted file mode 100644 index 66bd90fa7..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexBuffer_DX11.h +++ /dev/null @@ -1,107 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_DX11_H -#define BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_DX11_H - - -#include "BulletSoftBody/btSoftBodySolverVertexBuffer.h" - -#include -#include -#include -#include -#include - -class btDX11VertexBufferDescriptor : public btVertexBufferDescriptor -{ -protected: - /** Context of the DX11 device on which the vertex buffer is stored. */ - ID3D11DeviceContext* m_context; - /** DX11 vertex buffer */ - ID3D11Buffer* m_vertexBuffer; - /** UAV for DX11 buffer */ - ID3D11UnorderedAccessView* m_vertexBufferUAV; - - -public: - /** - * buffer is a pointer to the DX11 buffer to place the vertex data in. - * UAV is a pointer to the UAV representation of the buffer laid out in floats. - * vertexOffset is the offset in floats to the first vertex. - * vertexStride is the stride in floats between vertices. - */ - btDX11VertexBufferDescriptor( ID3D11DeviceContext* context, ID3D11Buffer* buffer, ID3D11UnorderedAccessView *UAV, int vertexOffset, int vertexStride ) - { - m_context = context; - m_vertexBuffer = buffer; - m_vertexBufferUAV = UAV; - m_vertexOffset = vertexOffset; - m_vertexStride = vertexStride; - m_hasVertexPositions = true; - } - - /** - * buffer is a pointer to the DX11 buffer to place the vertex data in. - * UAV is a pointer to the UAV representation of the buffer laid out in floats. - * vertexOffset is the offset in floats to the first vertex. - * vertexStride is the stride in floats between vertices. - * normalOffset is the offset in floats to the first normal. - * normalStride is the stride in floats between normals. - */ - btDX11VertexBufferDescriptor( ID3D11DeviceContext* context, ID3D11Buffer* buffer, ID3D11UnorderedAccessView *UAV, int vertexOffset, int vertexStride, int normalOffset, int normalStride ) - { - m_context = context; - m_vertexBuffer = buffer; - m_vertexBufferUAV = UAV; - m_vertexOffset = vertexOffset; - m_vertexStride = vertexStride; - m_hasVertexPositions = true; - - m_normalOffset = normalOffset; - m_normalStride = normalStride; - m_hasNormals = true; - } - - virtual ~btDX11VertexBufferDescriptor() - { - - } - - /** - * Return the type of the vertex buffer descriptor. - */ - virtual BufferTypes getBufferType() const - { - return DX11_BUFFER; - } - - virtual ID3D11DeviceContext* getContext() const - { - return m_context; - } - - virtual ID3D11Buffer* getbtDX11Buffer() const - { - return m_vertexBuffer; - } - - virtual ID3D11UnorderedAccessView* getDX11UAV() const - { - return m_vertexBufferUAV; - } -}; - -#endif // #ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_DX11_H \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexData_DX11.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexData_DX11.h deleted file mode 100644 index dd7cc84ce..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexData_DX11.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_DX11.h" - - -#ifndef BT_SOFT_BHODY_SOLVER_VERTEX_DATA_DX11_H -#define BT_SOFT_BHODY_SOLVER_VERTEX_DATA_DX11_H - -class btSoftBodyLinkData; -class btSoftBodyLinkData::LinkDescription; - -struct ID3D11Device; -struct ID3D11DeviceContext; - -class btSoftBodyVertexDataDX11 : public btSoftBodyVertexData -{ -protected: - bool m_onGPU; - ID3D11Device *m_d3dDevice; - ID3D11DeviceContext *m_d3dDeviceContext; - -public: - btDX11Buffer m_dx11ClothIdentifier; - btDX11Buffer m_dx11VertexPosition; - btDX11Buffer m_dx11VertexPreviousPosition; - btDX11Buffer m_dx11VertexVelocity; - btDX11Buffer m_dx11VertexForceAccumulator; - btDX11Buffer m_dx11VertexNormal; - btDX11Buffer m_dx11VertexInverseMass; - btDX11Buffer m_dx11VertexArea; - btDX11Buffer m_dx11VertexTriangleCount; - - - //ID3D11Buffer* readBackBuffer; - -public: - btSoftBodyVertexDataDX11( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ); - virtual ~btSoftBodyVertexDataDX11(); - - virtual bool onAccelerator(); - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(bool bCopy = false, bool bCopyMinimum = true); -}; - - -#endif // #ifndef BT_SOFT_BHODY_SOLVER_VERTEX_DATA_DX11_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.cpp deleted file mode 100644 index 357c4089e..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.cpp +++ /dev/null @@ -1,2236 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "vectormath/vmInclude.h" - -#include "btSoftBodySolver_DX11.h" -#include "btSoftBodySolverVertexBuffer_DX11.h" -#include "BulletSoftBody/btSoftBody.h" -#include "BulletCollision/CollisionShapes/btCapsuleShape.h" -#include //printf -#define MSTRINGIFY(A) #A -static char* PrepareLinksHLSLString = -#include "HLSL/PrepareLinks.hlsl" -static char* UpdatePositionsFromVelocitiesHLSLString = -#include "HLSL/UpdatePositionsFromVelocities.hlsl" -static char* SolvePositionsHLSLString = -#include "HLSL/SolvePositions.hlsl" -static char* UpdateNodesHLSLString = -#include "HLSL/UpdateNodes.hlsl" -static char* UpdatePositionsHLSLString = -#include "HLSL/UpdatePositions.hlsl" -static char* UpdateConstantsHLSLString = -#include "HLSL/UpdateConstants.hlsl" -static char* IntegrateHLSLString = -#include "HLSL/Integrate.hlsl" -static char* ApplyForcesHLSLString = -#include "HLSL/ApplyForces.hlsl" -static char* UpdateNormalsHLSLString = -#include "HLSL/UpdateNormals.hlsl" -static char* OutputToVertexArrayHLSLString = -#include "HLSL/OutputToVertexArray.hlsl" -static char* VSolveLinksHLSLString = -#include "HLSL/VSolveLinks.hlsl" -static char* ComputeBoundsHLSLString = -#include "HLSL/ComputeBounds.hlsl" -static char* SolveCollisionsAndUpdateVelocitiesHLSLString = -#include "HLSL/SolveCollisionsAndUpdateVelocities.hlsl" -#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" - -btSoftBodyLinkDataDX11::btSoftBodyLinkDataDX11( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ) : - m_dx11Links( d3dDevice, d3dDeviceContext, &m_links, false ), - m_dx11LinkStrength( d3dDevice, d3dDeviceContext, &m_linkStrength, false ), - m_dx11LinksMassLSC( d3dDevice, d3dDeviceContext, &m_linksMassLSC, false ), - m_dx11LinksRestLengthSquared( d3dDevice, d3dDeviceContext, &m_linksRestLengthSquared, false ), - m_dx11LinksCLength( d3dDevice, d3dDeviceContext, &m_linksCLength, false ), - m_dx11LinksLengthRatio( d3dDevice, d3dDeviceContext, &m_linksLengthRatio, false ), - m_dx11LinksRestLength( d3dDevice, d3dDeviceContext, &m_linksRestLength, false ), - m_dx11LinksMaterialLinearStiffnessCoefficient( d3dDevice, d3dDeviceContext, &m_linksMaterialLinearStiffnessCoefficient, false ) -{ - m_d3dDevice = d3dDevice; - m_d3dDeviceContext = d3dDeviceContext; -} - -btSoftBodyLinkDataDX11::~btSoftBodyLinkDataDX11() -{ -} - -static Vectormath::Aos::Vector3 toVector3( const btVector3 &vec ) -{ - Vectormath::Aos::Vector3 outVec( vec.getX(), vec.getY(), vec.getZ() ); - return outVec; -} - -void btSoftBodyLinkDataDX11::createLinks( int numLinks ) -{ - int previousSize = m_links.size(); - int newSize = previousSize + numLinks; - - btSoftBodyLinkData::createLinks( numLinks ); - - // Resize the link addresses array as well - m_linkAddresses.resize( newSize ); -} - -void btSoftBodyLinkDataDX11::setLinkAt( const btSoftBodyLinkData::LinkDescription &link, int linkIndex ) -{ - btSoftBodyLinkData::setLinkAt( link, linkIndex ); - - // Set the link index correctly for initialisation - m_linkAddresses[linkIndex] = linkIndex; -} - -bool btSoftBodyLinkDataDX11::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyLinkDataDX11::moveToAccelerator() -{ - bool success = true; - success = success && m_dx11Links.moveToGPU(); - success = success && m_dx11LinkStrength.moveToGPU(); - success = success && m_dx11LinksMassLSC.moveToGPU(); - success = success && m_dx11LinksRestLengthSquared.moveToGPU(); - success = success && m_dx11LinksCLength.moveToGPU(); - success = success && m_dx11LinksLengthRatio.moveToGPU(); - success = success && m_dx11LinksRestLength.moveToGPU(); - success = success && m_dx11LinksMaterialLinearStiffnessCoefficient.moveToGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -bool btSoftBodyLinkDataDX11::moveFromAccelerator() -{ - bool success = true; - success = success && m_dx11Links.moveFromGPU(); - success = success && m_dx11LinkStrength.moveFromGPU(); - success = success && m_dx11LinksMassLSC.moveFromGPU(); - success = success && m_dx11LinksRestLengthSquared.moveFromGPU(); - success = success && m_dx11LinksCLength.moveFromGPU(); - success = success && m_dx11LinksLengthRatio.moveFromGPU(); - success = success && m_dx11LinksRestLength.moveFromGPU(); - success = success && m_dx11LinksMaterialLinearStiffnessCoefficient.moveFromGPU(); - - if( success ) - m_onGPU = false; - - return success; -} - -void btSoftBodyLinkDataDX11::generateBatches() -{ - int numLinks = getNumLinks(); - - // Do the graph colouring here temporarily - btAlignedObjectArray< int > batchValues; - batchValues.resize( numLinks, 0 ); - - // Find the maximum vertex value internally for now - int maxVertex = 0; - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - int vertex0 = getVertexPair(linkIndex).vertex0; - int vertex1 = getVertexPair(linkIndex).vertex1; - if( vertex0 > maxVertex ) - maxVertex = vertex0; - if( vertex1 > maxVertex ) - maxVertex = vertex1; - } - int numVertices = maxVertex + 1; - - // Set of lists, one for each node, specifying which colours are connected - // to that node. - // No two edges into a node can share a colour. - btAlignedObjectArray< btAlignedObjectArray< int > > vertexConnectedColourLists; - vertexConnectedColourLists.resize(numVertices); - - - - // Simple algorithm that chooses the lowest batch number - // that none of the links attached to either of the connected - // nodes is in - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - int linkLocation = m_linkAddresses[linkIndex]; - - int vertex0 = getVertexPair(linkLocation).vertex0; - int vertex1 = getVertexPair(linkLocation).vertex1; - - // Get the two node colour lists - btAlignedObjectArray< int > &colourListVertex0( vertexConnectedColourLists[vertex0] ); - btAlignedObjectArray< int > &colourListVertex1( vertexConnectedColourLists[vertex1] ); - - // Choose the minimum colour that is in neither list - int colour = 0; - while( colourListVertex0.findLinearSearch(colour) != colourListVertex0.size() || colourListVertex1.findLinearSearch(colour) != colourListVertex1.size() ) - ++colour; - // i should now be the minimum colour in neither list - // Add to the two lists so that future edges don't share - // And store the colour against this edge - - colourListVertex0.push_back(colour); - colourListVertex1.push_back(colour); - batchValues[linkIndex] = colour; - } - - // Check the colour counts - btAlignedObjectArray< int > batchCounts; - for( int i = 0; i < numLinks; ++i ) - { - int batch = batchValues[i]; - if( batch >= batchCounts.size() ) - batchCounts.push_back(1); - else - ++(batchCounts[batch]); - } - - m_batchStartLengths.resize(batchCounts.size()); - if( m_batchStartLengths.size() > 0 ) - { - m_batchStartLengths[0] = BatchPair( 0, 0 ); - - int sum = 0; - for( int batchIndex = 0; batchIndex < batchCounts.size(); ++batchIndex ) - { - m_batchStartLengths[batchIndex].start = sum; - m_batchStartLengths[batchIndex].length = batchCounts[batchIndex]; - sum += batchCounts[batchIndex]; - } - } - - ///////////////////////////// - // Sort data based on batches - - // Create source arrays by copying originals - btAlignedObjectArray m_links_Backup(m_links); - btAlignedObjectArray m_linkStrength_Backup(m_linkStrength); - btAlignedObjectArray m_linksMassLSC_Backup(m_linksMassLSC); - btAlignedObjectArray m_linksRestLengthSquared_Backup(m_linksRestLengthSquared); - btAlignedObjectArray m_linksCLength_Backup(m_linksCLength); - btAlignedObjectArray m_linksLengthRatio_Backup(m_linksLengthRatio); - btAlignedObjectArray m_linksRestLength_Backup(m_linksRestLength); - btAlignedObjectArray m_linksMaterialLinearStiffnessCoefficient_Backup(m_linksMaterialLinearStiffnessCoefficient); - - - for( int batch = 0; batch < batchCounts.size(); ++batch ) - batchCounts[batch] = 0; - - // Do sort as single pass into destination arrays - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - // To maintain locations run off the original link locations rather than the current position. - // It's not cache efficient, but as we run this rarely that should not matter. - // It's faster than searching the link location array for the current location and then updating it. - // The other alternative would be to unsort before resorting, but this is equivalent to doing that. - int linkLocation = m_linkAddresses[linkIndex]; - - // Obtain batch and calculate target location for the - // next element in that batch, incrementing the batch counter - // afterwards - int batch = batchValues[linkIndex]; - int newLocation = m_batchStartLengths[batch].start + batchCounts[batch]; - - batchCounts[batch] = batchCounts[batch] + 1; - m_links[newLocation] = m_links_Backup[linkLocation]; -#if 1 - m_linkStrength[newLocation] = m_linkStrength_Backup[linkLocation]; - m_linksMassLSC[newLocation] = m_linksMassLSC_Backup[linkLocation]; - m_linksRestLengthSquared[newLocation] = m_linksRestLengthSquared_Backup[linkLocation]; - m_linksLengthRatio[newLocation] = m_linksLengthRatio_Backup[linkLocation]; - m_linksRestLength[newLocation] = m_linksRestLength_Backup[linkLocation]; - m_linksMaterialLinearStiffnessCoefficient[newLocation] = m_linksMaterialLinearStiffnessCoefficient_Backup[linkLocation]; -#endif - // Update the locations array to account for the moved entry - m_linkAddresses[linkIndex] = newLocation; - } -} // void btSoftBodyLinkDataDX11::generateBatches() - - - -btSoftBodyVertexDataDX11::btSoftBodyVertexDataDX11( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ) : - m_dx11ClothIdentifier( d3dDevice, d3dDeviceContext, &m_clothIdentifier, false ), - m_dx11VertexPosition( d3dDevice, d3dDeviceContext, &m_vertexPosition, false ), - m_dx11VertexPreviousPosition( d3dDevice, d3dDeviceContext, &m_vertexPreviousPosition, false ), - m_dx11VertexVelocity( d3dDevice, d3dDeviceContext, &m_vertexVelocity, false ), - m_dx11VertexForceAccumulator( d3dDevice, d3dDeviceContext, &m_vertexForceAccumulator, false ), - m_dx11VertexNormal( d3dDevice, d3dDeviceContext, &m_vertexNormal, false ), - m_dx11VertexInverseMass( d3dDevice, d3dDeviceContext, &m_vertexInverseMass, false ), - m_dx11VertexArea( d3dDevice, d3dDeviceContext, &m_vertexArea, false ), - m_dx11VertexTriangleCount( d3dDevice, d3dDeviceContext, &m_vertexTriangleCount, false ) -{ - m_d3dDevice = d3dDevice; - m_d3dDeviceContext = d3dDeviceContext; -} - -btSoftBodyVertexDataDX11::~btSoftBodyVertexDataDX11() -{ - -} - -bool btSoftBodyVertexDataDX11::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyVertexDataDX11::moveToAccelerator() -{ - bool success = true; - success = success && m_dx11ClothIdentifier.moveToGPU(); - success = success && m_dx11VertexPosition.moveToGPU(); - success = success && m_dx11VertexPreviousPosition.moveToGPU(); - success = success && m_dx11VertexVelocity.moveToGPU(); - success = success && m_dx11VertexForceAccumulator.moveToGPU(); - success = success && m_dx11VertexNormal.moveToGPU(); - success = success && m_dx11VertexInverseMass.moveToGPU(); - success = success && m_dx11VertexArea.moveToGPU(); - success = success && m_dx11VertexTriangleCount.moveToGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -bool btSoftBodyVertexDataDX11::moveFromAccelerator(bool bCopy, bool bCopyMinimum) -{ - bool success = true; - - if (!bCopy) - { - success = success && m_dx11ClothIdentifier.moveFromGPU(); - success = success && m_dx11VertexPosition.moveFromGPU(); - success = success && m_dx11VertexPreviousPosition.moveFromGPU(); - success = success && m_dx11VertexVelocity.moveFromGPU(); - success = success && m_dx11VertexForceAccumulator.moveFromGPU(); - success = success && m_dx11VertexNormal.moveFromGPU(); - success = success && m_dx11VertexInverseMass.moveFromGPU(); - success = success && m_dx11VertexArea.moveFromGPU(); - success = success && m_dx11VertexTriangleCount.moveFromGPU(); - } - else - { - if (bCopyMinimum) - { - success = success && m_dx11VertexPosition.copyFromGPU(); - success = success && m_dx11VertexNormal.copyFromGPU(); - } - else - { - success = success && m_dx11ClothIdentifier.copyFromGPU(); - success = success && m_dx11VertexPosition.copyFromGPU(); - success = success && m_dx11VertexPreviousPosition.copyFromGPU(); - success = success && m_dx11VertexVelocity.copyFromGPU(); - success = success && m_dx11VertexForceAccumulator.copyFromGPU(); - success = success && m_dx11VertexNormal.copyFromGPU(); - success = success && m_dx11VertexInverseMass.copyFromGPU(); - success = success && m_dx11VertexArea.copyFromGPU(); - success = success && m_dx11VertexTriangleCount.copyFromGPU(); - } - } - - if( success ) - m_onGPU = true; - - return success; -} - - -btSoftBodyTriangleDataDX11::btSoftBodyTriangleDataDX11( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ) : - m_dx11VertexIndices( d3dDevice, d3dDeviceContext, &m_vertexIndices, false ), - m_dx11Area( d3dDevice, d3dDeviceContext, &m_area, false ), - m_dx11Normal( d3dDevice, d3dDeviceContext, &m_normal, false ) -{ - m_d3dDevice = d3dDevice; - m_d3dDeviceContext = d3dDeviceContext; -} - -btSoftBodyTriangleDataDX11::~btSoftBodyTriangleDataDX11() -{ - -} - - -/** Allocate enough space in all link-related arrays to fit numLinks links */ -void btSoftBodyTriangleDataDX11::createTriangles( int numTriangles ) -{ - int previousSize = getNumTriangles(); - int newSize = previousSize + numTriangles; - - btSoftBodyTriangleData::createTriangles( numTriangles ); - - // Resize the link addresses array as well - m_triangleAddresses.resize( newSize ); -} - -/** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ -void btSoftBodyTriangleDataDX11::setTriangleAt( const btSoftBodyTriangleData::TriangleDescription &triangle, int triangleIndex ) -{ - btSoftBodyTriangleData::setTriangleAt( triangle, triangleIndex ); - - m_triangleAddresses[triangleIndex] = triangleIndex; -} - -bool btSoftBodyTriangleDataDX11::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyTriangleDataDX11::moveToAccelerator() -{ - bool success = true; - success = success && m_dx11VertexIndices.moveToGPU(); - success = success && m_dx11Area.moveToGPU(); - success = success && m_dx11Normal.moveToGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -bool btSoftBodyTriangleDataDX11::moveFromAccelerator() -{ - bool success = true; - success = success && m_dx11VertexIndices.moveFromGPU(); - success = success && m_dx11Area.moveFromGPU(); - success = success && m_dx11Normal.moveFromGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -/** - * Generate (and later update) the batching for the entire triangle set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ -void btSoftBodyTriangleDataDX11::generateBatches() -{ - int numTriangles = getNumTriangles(); - if( numTriangles == 0 ) - return; - - // Do the graph colouring here temporarily - btAlignedObjectArray< int > batchValues; - batchValues.resize( numTriangles ); - - // Find the maximum vertex value internally for now - int maxVertex = 0; - for( int triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex ) - { - int vertex0 = getVertexSet(triangleIndex).vertex0; - int vertex1 = getVertexSet(triangleIndex).vertex1; - int vertex2 = getVertexSet(triangleIndex).vertex2; - - if( vertex0 > maxVertex ) - maxVertex = vertex0; - if( vertex1 > maxVertex ) - maxVertex = vertex1; - if( vertex2 > maxVertex ) - maxVertex = vertex2; - } - int numVertices = maxVertex + 1; - - // Set of lists, one for each node, specifying which colours are connected - // to that node. - // No two edges into a node can share a colour. - btAlignedObjectArray< btAlignedObjectArray< int > > vertexConnectedColourLists; - vertexConnectedColourLists.resize(numVertices); - - - //std::cout << "\n"; - // Simple algorithm that chooses the lowest batch number - // that none of the faces attached to either of the connected - // nodes is in - for( int triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex ) - { - // To maintain locations run off the original link locations rather than the current position. - // It's not cache efficient, but as we run this rarely that should not matter. - // It's faster than searching the link location array for the current location and then updating it. - // The other alternative would be to unsort before resorting, but this is equivalent to doing that. - int triangleLocation = m_triangleAddresses[triangleIndex]; - - int vertex0 = getVertexSet(triangleLocation).vertex0; - int vertex1 = getVertexSet(triangleLocation).vertex1; - int vertex2 = getVertexSet(triangleLocation).vertex2; - - // Get the three node colour lists - btAlignedObjectArray< int > &colourListVertex0( vertexConnectedColourLists[vertex0] ); - btAlignedObjectArray< int > &colourListVertex1( vertexConnectedColourLists[vertex1] ); - btAlignedObjectArray< int > &colourListVertex2( vertexConnectedColourLists[vertex2] ); - - // Choose the minimum colour that is in none of the lists - int colour = 0; - while( - colourListVertex0.findLinearSearch(colour) != colourListVertex0.size() || - colourListVertex1.findLinearSearch(colour) != colourListVertex1.size() || - colourListVertex2.findLinearSearch(colour) != colourListVertex2.size() ) - { - ++colour; - } - // i should now be the minimum colour in neither list - // Add to the three lists so that future edges don't share - // And store the colour against this face - colourListVertex0.push_back(colour); - colourListVertex1.push_back(colour); - colourListVertex2.push_back(colour); - - batchValues[triangleIndex] = colour; - } - - - // Check the colour counts - btAlignedObjectArray< int > batchCounts; - for( int i = 0; i < numTriangles; ++i ) - { - int batch = batchValues[i]; - if( batch >= batchCounts.size() ) - batchCounts.push_back(1); - else - ++(batchCounts[batch]); - } - - - m_batchStartLengths.resize(batchCounts.size()); - m_batchStartLengths[0] = BatchPair( 0, 0 ); - - - int sum = 0; - for( int batchIndex = 0; batchIndex < batchCounts.size(); ++batchIndex ) - { - m_batchStartLengths[batchIndex].start = sum; - m_batchStartLengths[batchIndex].length = batchCounts[batchIndex]; - sum += batchCounts[batchIndex]; - } - - ///////////////////////////// - // Sort data based on batches - - // Create source arrays by copying originals - btAlignedObjectArray m_vertexIndices_Backup(m_vertexIndices); - btAlignedObjectArray m_area_Backup(m_area); - btAlignedObjectArray m_normal_Backup(m_normal); - - - for( int batch = 0; batch < batchCounts.size(); ++batch ) - batchCounts[batch] = 0; - - // Do sort as single pass into destination arrays - for( int triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex ) - { - // To maintain locations run off the original link locations rather than the current position. - // It's not cache efficient, but as we run this rarely that should not matter. - // It's faster than searching the link location array for the current location and then updating it. - // The other alternative would be to unsort before resorting, but this is equivalent to doing that. - int triangleLocation = m_triangleAddresses[triangleIndex]; - - // Obtain batch and calculate target location for the - // next element in that batch, incrementing the batch counter - // afterwards - int batch = batchValues[triangleIndex]; - int newLocation = m_batchStartLengths[batch].start + batchCounts[batch]; - - batchCounts[batch] = batchCounts[batch] + 1; - m_vertexIndices[newLocation] = m_vertexIndices_Backup[triangleLocation]; - m_area[newLocation] = m_area_Backup[triangleLocation]; - m_normal[newLocation] = m_normal_Backup[triangleLocation]; - - // Update the locations array to account for the moved entry - m_triangleAddresses[triangleIndex] = newLocation; - } -} // btSoftBodyTriangleDataDX11::generateBatches - - - - - - - - - - - - -btDX11SoftBodySolver::btDX11SoftBodySolver(ID3D11Device * dx11Device, ID3D11DeviceContext* dx11Context, DXFunctions::CompileFromMemoryFunc dx11CompileFromMemory) : - m_dx11Device( dx11Device ), - m_dx11Context( dx11Context ), - dxFunctions( m_dx11Device, m_dx11Context, dx11CompileFromMemory ), - m_linkData(m_dx11Device, m_dx11Context), - m_vertexData(m_dx11Device, m_dx11Context), - m_triangleData(m_dx11Device, m_dx11Context), - m_dx11PerClothAcceleration( m_dx11Device, m_dx11Context, &m_perClothAcceleration, true ), - m_dx11PerClothWindVelocity( m_dx11Device, m_dx11Context, &m_perClothWindVelocity, true ), - m_dx11PerClothDampingFactor( m_dx11Device, m_dx11Context, &m_perClothDampingFactor, true ), - m_dx11PerClothVelocityCorrectionCoefficient( m_dx11Device, m_dx11Context, &m_perClothVelocityCorrectionCoefficient, true ), - m_dx11PerClothLiftFactor( m_dx11Device, m_dx11Context, &m_perClothLiftFactor, true ), - m_dx11PerClothDragFactor( m_dx11Device, m_dx11Context, &m_perClothDragFactor, true ), - m_dx11PerClothMediumDensity( m_dx11Device, m_dx11Context, &m_perClothMediumDensity, true ), - m_dx11PerClothCollisionObjects( m_dx11Device, m_dx11Context, &m_perClothCollisionObjects, true ), - m_dx11CollisionObjectDetails( m_dx11Device, m_dx11Context, &m_collisionObjectDetails, true ), - m_dx11PerClothMinBounds( m_dx11Device, m_dx11Context, &m_perClothMinBounds, false ), - m_dx11PerClothMaxBounds( m_dx11Device, m_dx11Context, &m_perClothMaxBounds, false ), - m_dx11PerClothFriction( m_dx11Device, m_dx11Context, &m_perClothFriction, false ), - m_enableUpdateBounds(false) -{ - // Initial we will clearly need to update solver constants - // For now this is global for the cloths linked with this solver - we should probably make this body specific - // for performance in future once we understand more clearly when constants need to be updated - m_updateSolverConstants = true; - - m_shadersInitialized = false; -} - -btDX11SoftBodySolver::~btDX11SoftBodySolver() -{ - releaseKernels(); -} - -void btDX11SoftBodySolver::releaseKernels() -{ - - SAFE_RELEASE( prepareLinksKernel.kernel ); - SAFE_RELEASE( prepareLinksKernel.constBuffer ); - SAFE_RELEASE( integrateKernel.kernel ); - SAFE_RELEASE( integrateKernel.constBuffer ); - SAFE_RELEASE( integrateKernel.kernel ); - SAFE_RELEASE( solvePositionsFromLinksKernel.constBuffer ); - SAFE_RELEASE( solvePositionsFromLinksKernel.kernel ); - SAFE_RELEASE( updatePositionsFromVelocitiesKernel.constBuffer ); - SAFE_RELEASE( updatePositionsFromVelocitiesKernel.kernel ); - SAFE_RELEASE( updateVelocitiesFromPositionsWithoutVelocitiesKernel.constBuffer ); - SAFE_RELEASE( updateVelocitiesFromPositionsWithoutVelocitiesKernel.kernel ); - SAFE_RELEASE( updateVelocitiesFromPositionsWithVelocitiesKernel.constBuffer ); - SAFE_RELEASE( updateVelocitiesFromPositionsWithVelocitiesKernel.kernel ); - SAFE_RELEASE( resetNormalsAndAreasKernel.constBuffer ); - SAFE_RELEASE( resetNormalsAndAreasKernel.kernel ); - SAFE_RELEASE( normalizeNormalsAndAreasKernel.constBuffer ); - SAFE_RELEASE( normalizeNormalsAndAreasKernel.kernel ); - SAFE_RELEASE( updateSoftBodiesKernel.constBuffer ); - SAFE_RELEASE( updateSoftBodiesKernel.kernel ); - SAFE_RELEASE( solveCollisionsAndUpdateVelocitiesKernel.kernel ); - SAFE_RELEASE( solveCollisionsAndUpdateVelocitiesKernel.constBuffer ); - SAFE_RELEASE( computeBoundsKernel.kernel ); - SAFE_RELEASE( computeBoundsKernel.constBuffer ); - SAFE_RELEASE( vSolveLinksKernel.kernel ); - SAFE_RELEASE( vSolveLinksKernel.constBuffer ); - - SAFE_RELEASE( addVelocityKernel.constBuffer ); - SAFE_RELEASE( addVelocityKernel.kernel ); - SAFE_RELEASE( applyForcesKernel.constBuffer ); - SAFE_RELEASE( applyForcesKernel.kernel ); - - m_shadersInitialized = false; -} - - -void btDX11SoftBodySolver::copyBackToSoftBodies(bool bMove) -{ - // Move the vertex data back to the host first - m_vertexData.moveFromAccelerator(!bMove); - - // Loop over soft bodies, copying all the vertex positions back for each body in turn - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btAcceleratedSoftBodyInterface *softBodyInterface = m_softBodySet[ softBodyIndex ]; - btSoftBody *softBody = softBodyInterface->getSoftBody(); - - int firstVertex = softBodyInterface->getFirstVertex(); - int numVertices = softBodyInterface->getNumVertices(); - - // Copy vertices from solver back into the softbody - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - using Vectormath::Aos::Point3; - Point3 vertexPosition( getVertexData().getVertexPositions()[firstVertex + vertex] ); - - softBody->m_nodes[vertex].m_x.setX( vertexPosition.getX() ); - softBody->m_nodes[vertex].m_x.setY( vertexPosition.getY() ); - softBody->m_nodes[vertex].m_x.setZ( vertexPosition.getZ() ); - - softBody->m_nodes[vertex].m_n.setX( vertexPosition.getX() ); - softBody->m_nodes[vertex].m_n.setY( vertexPosition.getY() ); - softBody->m_nodes[vertex].m_n.setZ( vertexPosition.getZ() ); - } - } -} // btDX11SoftBodySolver::copyBackToSoftBodies - - -void btDX11SoftBodySolver::optimize( btAlignedObjectArray< btSoftBody * > &softBodies, bool forceUpdate ) -{ - if( forceUpdate || m_softBodySet.size() != softBodies.size() ) - { - // Have a change in the soft body set so update, reloading all the data - getVertexData().clear(); - getTriangleData().clear(); - getLinkData().clear(); - m_softBodySet.resize(0); - - - for( int softBodyIndex = 0; softBodyIndex < softBodies.size(); ++softBodyIndex ) - { - btSoftBody *softBody = softBodies[ softBodyIndex ]; - using Vectormath::Aos::Matrix3; - using Vectormath::Aos::Point3; - - // Create SoftBody that will store the information within the solver - btAcceleratedSoftBodyInterface *newSoftBody = new btAcceleratedSoftBodyInterface( softBody ); - m_softBodySet.push_back( newSoftBody ); - - m_perClothAcceleration.push_back( toVector3(softBody->getWorldInfo()->m_gravity) ); - m_perClothDampingFactor.push_back(softBody->m_cfg.kDP); - m_perClothVelocityCorrectionCoefficient.push_back( softBody->m_cfg.kVCF ); - m_perClothLiftFactor.push_back( softBody->m_cfg.kLF ); - m_perClothDragFactor.push_back( softBody->m_cfg.kDG ); - m_perClothMediumDensity.push_back(softBody->getWorldInfo()->air_density); - // Simple init values. Actually we'll put 0 and -1 into them at the appropriate time - m_perClothMinBounds.push_back( UIntVector3( 0, 0, 0 ) ); - m_perClothMaxBounds.push_back( UIntVector3( UINT_MAX, UINT_MAX, UINT_MAX ) ); - m_perClothFriction.push_back( softBody->getFriction() ); - m_perClothCollisionObjects.push_back( CollisionObjectIndices(-1, -1) ); - - // Add space for new vertices and triangles in the default solver for now - // TODO: Include space here for tearing too later - int firstVertex = getVertexData().getNumVertices(); - int numVertices = softBody->m_nodes.size(); - int maxVertices = numVertices; - // Allocate space for new vertices in all the vertex arrays - getVertexData().createVertices( maxVertices, softBodyIndex ); - - int firstTriangle = getTriangleData().getNumTriangles(); - int numTriangles = softBody->m_faces.size(); - int maxTriangles = numTriangles; - getTriangleData().createTriangles( maxTriangles ); - - // Copy vertices from softbody into the solver - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - Point3 multPoint(softBody->m_nodes[vertex].m_x.getX(), softBody->m_nodes[vertex].m_x.getY(), softBody->m_nodes[vertex].m_x.getZ()); - btSoftBodyVertexData::VertexDescription desc; - - // TODO: Position in the softbody might be pre-transformed - // or we may need to adapt for the pose. - //desc.setPosition( cloth.getMeshTransform()*multPoint ); - desc.setPosition( multPoint ); - - float vertexInverseMass = softBody->m_nodes[vertex].m_im; - desc.setInverseMass(vertexInverseMass); - getVertexData().setVertexAt( desc, firstVertex + vertex ); - } - - // Copy triangles similarly - // We're assuming here that vertex indices are based on the firstVertex rather than the entire scene - for( int triangle = 0; triangle < numTriangles; ++triangle ) - { - // Note that large array storage is relative to the array not to the cloth - // So we need to add firstVertex to each value - int vertexIndex0 = (softBody->m_faces[triangle].m_n[0] - &(softBody->m_nodes[0])); - int vertexIndex1 = (softBody->m_faces[triangle].m_n[1] - &(softBody->m_nodes[0])); - int vertexIndex2 = (softBody->m_faces[triangle].m_n[2] - &(softBody->m_nodes[0])); - btSoftBodyTriangleData::TriangleDescription newTriangle(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, vertexIndex2 + firstVertex); - getTriangleData().setTriangleAt( newTriangle, firstTriangle + triangle ); - - // Increase vertex triangle counts for this triangle - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex0)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex1)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex2)++; - } - - int firstLink = getLinkData().getNumLinks(); - int numLinks = softBody->m_links.size(); - int maxLinks = numLinks; - - // Allocate space for the links - getLinkData().createLinks( numLinks ); - - // Add the links - for( int link = 0; link < numLinks; ++link ) - { - int vertexIndex0 = softBody->m_links[link].m_n[0] - &(softBody->m_nodes[0]); - int vertexIndex1 = softBody->m_links[link].m_n[1] - &(softBody->m_nodes[0]); - - btSoftBodyLinkData::LinkDescription newLink(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, softBody->m_links[link].m_material->m_kLST); - newLink.setLinkStrength(1.f); - getLinkData().setLinkAt(newLink, firstLink + link); - } - - newSoftBody->setFirstVertex( firstVertex ); - newSoftBody->setFirstTriangle( firstTriangle ); - newSoftBody->setNumVertices( numVertices ); - newSoftBody->setMaxVertices( maxVertices ); - newSoftBody->setNumTriangles( numTriangles ); - newSoftBody->setMaxTriangles( maxTriangles ); - newSoftBody->setFirstLink( firstLink ); - newSoftBody->setNumLinks( numLinks ); - } - - - - updateConstants(0.f); - - - m_linkData.generateBatches(); - m_triangleData.generateBatches(); - } -} - - -btSoftBodyLinkData &btDX11SoftBodySolver::getLinkData() -{ - // TODO: Consider setting link data to "changed" here - return m_linkData; -} - -btSoftBodyVertexData &btDX11SoftBodySolver::getVertexData() -{ - // TODO: Consider setting vertex data to "changed" here - return m_vertexData; -} - -btSoftBodyTriangleData &btDX11SoftBodySolver::getTriangleData() -{ - // TODO: Consider setting triangle data to "changed" here - return m_triangleData; -} - -bool btDX11SoftBodySolver::checkInitialized() -{ - if( !m_shadersInitialized ) - if( buildShaders() ) - m_shadersInitialized = true; - - return m_shadersInitialized; -} - -void btDX11SoftBodySolver::resetNormalsAndAreas( int numVertices ) -{ - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - UpdateSoftBodiesCB constBuffer; - - constBuffer.numNodes = numVertices; - constBuffer.epsilon = FLT_EPSILON; - - // Todo: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( integrateKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(UpdateSoftBodiesCB) ); - m_dx11Context->Unmap( integrateKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &integrateKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexNormal.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexArea.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( resetNormalsAndAreasKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::resetNormalsAndAreas - -void btDX11SoftBodySolver::normalizeNormalsAndAreas( int numVertices ) -{ - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - UpdateSoftBodiesCB constBuffer; - - constBuffer.numNodes = numVertices; - constBuffer.epsilon = FLT_EPSILON; - - // Todo: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( integrateKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(UpdateSoftBodiesCB) ); - m_dx11Context->Unmap( integrateKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &integrateKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 2, 1, &(m_vertexData.m_dx11VertexTriangleCount.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexNormal.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexArea.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( normalizeNormalsAndAreasKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::normalizeNormalsAndAreas - -void btDX11SoftBodySolver::executeUpdateSoftBodies( int firstTriangle, int numTriangles ) -{ - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - UpdateSoftBodiesCB constBuffer; - - constBuffer.startFace = firstTriangle; - constBuffer.numFaces = numTriangles; - - // Todo: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( updateSoftBodiesKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(UpdateSoftBodiesCB) ); - m_dx11Context->Unmap( updateSoftBodiesKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &updateSoftBodiesKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_triangleData.m_dx11VertexIndices.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_vertexData.m_dx11VertexPosition.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexNormal.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexArea.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 2, 1, &(m_triangleData.m_dx11Normal.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 3, 1, &(m_triangleData.m_dx11Area.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( updateSoftBodiesKernel.kernel, NULL, 0 ); - - int numBlocks = (numTriangles + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 4, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::executeUpdateSoftBodies - -void btDX11SoftBodySolver::updateSoftBodies() -{ - using namespace Vectormath::Aos; - - - int numVertices = m_vertexData.getNumVertices(); - int numTriangles = m_triangleData.getNumTriangles(); - - // Ensure data is on accelerator - m_vertexData.moveToAccelerator(); - m_triangleData.moveToAccelerator(); - - resetNormalsAndAreas( numVertices ); - - - // Go through triangle batches so updates occur correctly - for( int batchIndex = 0; batchIndex < m_triangleData.m_batchStartLengths.size(); ++batchIndex ) - { - - int startTriangle = m_triangleData.m_batchStartLengths[batchIndex].start; - int numTriangles = m_triangleData.m_batchStartLengths[batchIndex].length; - - executeUpdateSoftBodies( startTriangle, numTriangles ); - } - - - normalizeNormalsAndAreas( numVertices ); - - -} // btDX11SoftBodySolver::updateSoftBodies - - -Vectormath::Aos::Vector3 btDX11SoftBodySolver::ProjectOnAxis( const Vectormath::Aos::Vector3 &v, const Vectormath::Aos::Vector3 &a ) -{ - return a*Vectormath::Aos::dot(v, a); -} - -void btDX11SoftBodySolver::ApplyClampedForce( float solverdt, const Vectormath::Aos::Vector3 &force, const Vectormath::Aos::Vector3 &vertexVelocity, float inverseMass, Vectormath::Aos::Vector3 &vertexForce ) -{ - float dtInverseMass = solverdt*inverseMass; - if( Vectormath::Aos::lengthSqr(force * dtInverseMass) > Vectormath::Aos::lengthSqr(vertexVelocity) ) - { - vertexForce -= ProjectOnAxis( vertexVelocity, normalize( force ) )/dtInverseMass; - } else { - vertexForce += force; - } -} - -void btDX11SoftBodySolver::applyForces( float solverdt ) -{ - using namespace Vectormath::Aos; - - - // Ensure data is on accelerator - m_vertexData.moveToAccelerator(); - m_dx11PerClothAcceleration.moveToGPU(); - m_dx11PerClothLiftFactor.moveToGPU(); - m_dx11PerClothDragFactor.moveToGPU(); - m_dx11PerClothMediumDensity.moveToGPU(); - m_dx11PerClothWindVelocity.moveToGPU(); - - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - ApplyForcesCB constBuffer; - - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.solverdt = solverdt; - constBuffer.epsilon = FLT_EPSILON; - - // Todo: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( integrateKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(ApplyForcesCB) ); - m_dx11Context->Unmap( integrateKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &integrateKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11ClothIdentifier.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_vertexData.m_dx11VertexNormal.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_vertexData.m_dx11VertexArea.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_vertexData.m_dx11VertexInverseMass.getSRV()) ); - m_dx11Context->CSSetShaderResources( 4, 1, &(m_dx11PerClothLiftFactor.getSRV()) ); - m_dx11Context->CSSetShaderResources( 5, 1, &(m_dx11PerClothDragFactor.getSRV()) ); - m_dx11Context->CSSetShaderResources( 6, 1, &(m_dx11PerClothWindVelocity.getSRV()) ); - m_dx11Context->CSSetShaderResources( 7, 1, &(m_dx11PerClothAcceleration.getSRV()) ); - m_dx11Context->CSSetShaderResources( 8, 1, &(m_dx11PerClothMediumDensity.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexForceAccumulator.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexVelocity.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( applyForcesKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 4, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 5, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 6, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 7, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 8, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::applyForces - -/** - * Integrate motion on the solver. - */ -void btDX11SoftBodySolver::integrate( float solverdt ) -{ - // TEMPORARY COPIES - m_vertexData.moveToAccelerator(); - - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - IntegrateCB constBuffer; - - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.solverdt = solverdt; - - // Todo: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( integrateKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(IntegrateCB) ); - m_dx11Context->Unmap( integrateKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &integrateKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11VertexInverseMass.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexPosition.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexVelocity.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 2, 1, &(m_vertexData.m_dx11VertexPreviousPosition.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 3, 1, &(m_vertexData.m_dx11VertexForceAccumulator.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( integrateKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 2, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 3, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::integrate - -float btDX11SoftBodySolver::computeTriangleArea( - const Vectormath::Aos::Point3 &vertex0, - const Vectormath::Aos::Point3 &vertex1, - const Vectormath::Aos::Point3 &vertex2 ) -{ - Vectormath::Aos::Vector3 a = vertex1 - vertex0; - Vectormath::Aos::Vector3 b = vertex2 - vertex0; - Vectormath::Aos::Vector3 crossProduct = cross(a, b); - float area = length( crossProduct ); - return area; -} // btDX11SoftBodySolver::computeTriangleArea - - -void btDX11SoftBodySolver::updateBounds() -{ - using Vectormath::Aos::Point3; - // Interpretation structure for float and int - - struct FPRep { - unsigned int mantissa : 23; - unsigned int exponent : 8; - unsigned int sign : 1; - }; - union FloatAsInt - { - float floatValue; - int intValue; - unsigned int uintValue; - FPRep fpRep; - }; - - - // Update bounds array to min and max int values to allow easy atomics - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - m_perClothMinBounds[softBodyIndex] = UIntVector3( UINT_MAX, UINT_MAX, UINT_MAX ); - m_perClothMaxBounds[softBodyIndex] = UIntVector3( 0, 0, 0 ); - } - - m_dx11PerClothMinBounds.moveToGPU(); - m_dx11PerClothMaxBounds.moveToGPU(); - - - computeBounds( ); - - - m_dx11PerClothMinBounds.moveFromGPU(); - m_dx11PerClothMaxBounds.moveFromGPU(); - - - - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - UIntVector3 minBoundUInt = m_perClothMinBounds[softBodyIndex]; - UIntVector3 maxBoundUInt = m_perClothMaxBounds[softBodyIndex]; - - // Convert back to float - FloatAsInt fai; - - btVector3 minBound; - fai.uintValue = minBoundUInt.x; - fai.uintValue ^= (((fai.uintValue >> 31) - 1) | 0x80000000); - minBound.setX( fai.floatValue ); - fai.uintValue = minBoundUInt.y; - fai.uintValue ^= (((fai.uintValue >> 31) - 1) | 0x80000000); - minBound.setY( fai.floatValue ); - fai.uintValue = minBoundUInt.z; - fai.uintValue ^= (((fai.uintValue >> 31) - 1) | 0x80000000); - minBound.setZ( fai.floatValue ); - - btVector3 maxBound; - fai.uintValue = maxBoundUInt.x; - fai.uintValue ^= (((fai.uintValue >> 31) - 1) | 0x80000000); - maxBound.setX( fai.floatValue ); - fai.uintValue = maxBoundUInt.y; - fai.uintValue ^= (((fai.uintValue >> 31) - 1) | 0x80000000); - maxBound.setY( fai.floatValue ); - fai.uintValue = maxBoundUInt.z; - fai.uintValue ^= (((fai.uintValue >> 31) - 1) | 0x80000000); - maxBound.setZ( fai.floatValue ); - - // And finally assign to the soft body - m_softBodySet[softBodyIndex]->updateBounds( minBound, maxBound ); - } -} - -void btDX11SoftBodySolver::updateConstants( float timeStep ) -{ - using namespace Vectormath::Aos; - - if( m_updateSolverConstants ) - { - m_updateSolverConstants = false; - - // Will have to redo this if we change the structure (tear, maybe) or various other possible changes - - // Initialise link constants - const int numLinks = m_linkData.getNumLinks(); - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair &vertices( m_linkData.getVertexPair(linkIndex) ); - m_linkData.getRestLength(linkIndex) = length((m_vertexData.getPosition( vertices.vertex0 ) - m_vertexData.getPosition( vertices.vertex1 ))); - float invMass0 = m_vertexData.getInverseMass(vertices.vertex0); - float invMass1 = m_vertexData.getInverseMass(vertices.vertex1); - float linearStiffness = m_linkData.getLinearStiffnessCoefficient(linkIndex); - float massLSC = (invMass0 + invMass1)/linearStiffness; - m_linkData.getMassLSC(linkIndex) = massLSC; - float restLength = m_linkData.getRestLength(linkIndex); - float restLengthSquared = restLength*restLength; - m_linkData.getRestLengthSquared(linkIndex) = restLengthSquared; - } - } -} // btDX11SoftBodySolver::updateConstants - -/** - * Sort the collision object details array and generate indexing into it for the per-cloth collision object array. - */ -void btDX11SoftBodySolver::prepareCollisionConstraints() -{ - // First do a simple sort on the collision objects - btAlignedObjectArray numObjectsPerClothPrefixSum; - btAlignedObjectArray numObjectsPerCloth; - numObjectsPerCloth.resize( m_softBodySet.size(), 0 ); - numObjectsPerClothPrefixSum.resize( m_softBodySet.size(), 0 ); - - - class QuickSortCompare - { - public: - - bool operator() ( const CollisionShapeDescription& a, const CollisionShapeDescription& b ) const - { - return ( a.softBodyIdentifier < b.softBodyIdentifier ); - } - }; - - QuickSortCompare comparator; - m_collisionObjectDetails.quickSort( comparator ); - - // Generating indexing for perClothCollisionObjects - // First clear the previous values with the "no collision object for cloth" constant - for( int clothIndex = 0; clothIndex < m_perClothCollisionObjects.size(); ++clothIndex ) - { - m_perClothCollisionObjects[clothIndex].firstObject = -1; - m_perClothCollisionObjects[clothIndex].endObject = -1; - } - int currentCloth = 0; - int startIndex = 0; - for( int collisionObject = 0; collisionObject < m_collisionObjectDetails.size(); ++collisionObject ) - { - int nextCloth = m_collisionObjectDetails[collisionObject].softBodyIdentifier; - if( nextCloth != currentCloth ) - { - // Changed cloth in the array - // Set the end index and the range is what we need for currentCloth - m_perClothCollisionObjects[currentCloth].firstObject = startIndex; - m_perClothCollisionObjects[currentCloth].endObject = collisionObject; - currentCloth = nextCloth; - startIndex = collisionObject; - } - } - - // And update last cloth - m_perClothCollisionObjects[currentCloth].firstObject = startIndex; - m_perClothCollisionObjects[currentCloth].endObject = m_collisionObjectDetails.size(); - -} // btDX11SoftBodySolver::prepareCollisionConstraints - - -void btDX11SoftBodySolver::solveConstraints( float solverdt ) -{ - - //std::cerr << "'GPU' solve constraints\n"; - using Vectormath::Aos::Vector3; - using Vectormath::Aos::Point3; - using Vectormath::Aos::lengthSqr; - using Vectormath::Aos::dot; - - // Prepare links - int numLinks = m_linkData.getNumLinks(); - int numVertices = m_vertexData.getNumVertices(); - - float kst = 1.f; - float ti = 0.f; - - - m_dx11PerClothDampingFactor.moveToGPU(); - m_dx11PerClothVelocityCorrectionCoefficient.moveToGPU(); - - - // Ensure data is on accelerator - m_linkData.moveToAccelerator(); - m_vertexData.moveToAccelerator(); - - - prepareLinks(); - - for( int iteration = 0; iteration < m_numberOfVelocityIterations ; ++iteration ) - { - for( int i = 0; i < m_linkData.m_batchStartLengths.size(); ++i ) - { - int startLink = m_linkData.m_batchStartLengths[i].start; - int numLinks = m_linkData.m_batchStartLengths[i].length; - - solveLinksForVelocity( startLink, numLinks, kst ); - } - } - - - prepareCollisionConstraints(); - - // Compute new positions from velocity - // Also update the previous position so that our position computation is now based on the new position from the velocity solution - // rather than based directly on the original positions - if( m_numberOfVelocityIterations > 0 ) - { - updateVelocitiesFromPositionsWithVelocities( 1.f/solverdt ); - } else { - updateVelocitiesFromPositionsWithoutVelocities( 1.f/solverdt ); - } - - - // Solve drift - for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - { - for( int i = 0; i < m_linkData.m_batchStartLengths.size(); ++i ) - { - int startLink = m_linkData.m_batchStartLengths[i].start; - int numLinks = m_linkData.m_batchStartLengths[i].length; - - solveLinksForPosition( startLink, numLinks, kst, ti ); - } - - } // for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - - // At this point assume that the force array is blank - we will overwrite it - solveCollisionsAndUpdateVelocities( 1.f/solverdt ); -} // btDX11SoftBodySolver::solveConstraints - - - - -////////////////////////////////////// -// Kernel dispatches -void btDX11SoftBodySolver::prepareLinks() -{ - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - PrepareLinksCB constBuffer; - - constBuffer.numLinks = m_linkData.getNumLinks(); - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( prepareLinksKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(PrepareLinksCB) ); - m_dx11Context->Unmap( prepareLinksKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &prepareLinksKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_linkData.m_dx11Links.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_linkData.m_dx11LinksMassLSC.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_vertexData.m_dx11VertexPreviousPosition.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_linkData.m_dx11LinksLengthRatio.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_linkData.m_dx11LinksCLength.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( prepareLinksKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numLinks + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::prepareLinks - - -void btDX11SoftBodySolver::updatePositionsFromVelocities( float solverdt ) -{ - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - UpdatePositionsFromVelocitiesCB constBuffer; - - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.solverSDT = solverdt; - - // Todo: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( updatePositionsFromVelocitiesKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(UpdatePositionsFromVelocitiesCB) ); - m_dx11Context->Unmap( updatePositionsFromVelocitiesKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &updatePositionsFromVelocitiesKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11VertexVelocity.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexPreviousPosition.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexPosition.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( updatePositionsFromVelocitiesKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::updatePositionsFromVelocities - -void btDX11SoftBodySolver::solveLinksForPosition( int startLink, int numLinks, float kst, float ti ) -{ - // Copy kernel parameters to GPU - SolvePositionsFromLinksKernelCB constBuffer; - - // Set the first link of the batch - // and the batch size - constBuffer.startLink = startLink; - constBuffer.numLinks = numLinks; - - constBuffer.kst = kst; - constBuffer.ti = ti; - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( solvePositionsFromLinksKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(SolvePositionsFromLinksKernelCB) ); - m_dx11Context->Unmap( solvePositionsFromLinksKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &solvePositionsFromLinksKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_linkData.m_dx11Links.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_linkData.m_dx11LinksMassLSC.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_linkData.m_dx11LinksRestLengthSquared.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_vertexData.m_dx11VertexInverseMass.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexPosition.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( solvePositionsFromLinksKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numLinks + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } - -} // btDX11SoftBodySolver::solveLinksForPosition - -void btDX11SoftBodySolver::solveLinksForVelocity( int startLink, int numLinks, float kst ) -{ - // Copy kernel parameters to GPU - VSolveLinksCB constBuffer; - - // Set the first link of the batch - // and the batch size - - constBuffer.startLink = startLink; - constBuffer.numLinks = numLinks; - constBuffer.kst = kst; - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( vSolveLinksKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(VSolveLinksCB) ); - m_dx11Context->Unmap( vSolveLinksKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &vSolveLinksKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_linkData.m_dx11Links.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_linkData.m_dx11LinksLengthRatio.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_linkData.m_dx11LinksCLength.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_vertexData.m_dx11VertexInverseMass.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexVelocity.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( vSolveLinksKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numLinks + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SoftBodySolver::solveLinksForVelocity - - -void btDX11SoftBodySolver::updateVelocitiesFromPositionsWithVelocities( float isolverdt ) -{ - // Copy kernel parameters to GPU - UpdateVelocitiesFromPositionsWithVelocitiesCB constBuffer; - - // Set the first link of the batch - // and the batch size - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.isolverdt = isolverdt; - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( updateVelocitiesFromPositionsWithVelocitiesKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(UpdateVelocitiesFromPositionsWithVelocitiesCB) ); - m_dx11Context->Unmap( updateVelocitiesFromPositionsWithVelocitiesKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &updateVelocitiesFromPositionsWithVelocitiesKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11VertexPosition.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_vertexData.m_dx11VertexPreviousPosition.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_vertexData.m_dx11ClothIdentifier.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_dx11PerClothVelocityCorrectionCoefficient.getSRV()) ); - m_dx11Context->CSSetShaderResources( 4, 1, &(m_dx11PerClothDampingFactor.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexVelocity.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexForceAccumulator.getUAV()), NULL ); - - - // Execute the kernel - m_dx11Context->CSSetShader( updateVelocitiesFromPositionsWithVelocitiesKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 4, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } - -} // btDX11SoftBodySolver::updateVelocitiesFromPositionsWithVelocities - -void btDX11SoftBodySolver::updateVelocitiesFromPositionsWithoutVelocities( float isolverdt ) -{ - // Copy kernel parameters to GPU - UpdateVelocitiesFromPositionsWithoutVelocitiesCB constBuffer; - - // Set the first link of the batch - // and the batch size - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.isolverdt = isolverdt; - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( updateVelocitiesFromPositionsWithoutVelocitiesKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(UpdateVelocitiesFromPositionsWithoutVelocitiesCB) ); - m_dx11Context->Unmap( updateVelocitiesFromPositionsWithoutVelocitiesKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &updateVelocitiesFromPositionsWithoutVelocitiesKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11VertexPosition.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_vertexData.m_dx11VertexPreviousPosition.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_vertexData.m_dx11ClothIdentifier.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_dx11PerClothDampingFactor.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexVelocity.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexForceAccumulator.getUAV()), NULL ); - - - // Execute the kernel - m_dx11Context->CSSetShader( updateVelocitiesFromPositionsWithoutVelocitiesKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } - -} // btDX11SoftBodySolver::updateVelocitiesFromPositionsWithoutVelocities - - -void btDX11SoftBodySolver::computeBounds( ) -{ - ComputeBoundsCB constBuffer; - m_vertexData.moveToAccelerator(); - - // Set the first link of the batch - // and the batch size - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.numSoftBodies = m_softBodySet.size(); - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( computeBoundsKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(ComputeBoundsCB) ); - m_dx11Context->Unmap( computeBoundsKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &computeBoundsKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11ClothIdentifier.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_vertexData.m_dx11VertexPosition.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_dx11PerClothMinBounds.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_dx11PerClothMaxBounds.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( computeBoundsKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} - -void btDX11SoftBodySolver::solveCollisionsAndUpdateVelocities( float isolverdt ) -{ - - // Copy kernel parameters to GPU - m_vertexData.moveToAccelerator(); - m_dx11PerClothFriction.moveToGPU(); - m_dx11PerClothDampingFactor.moveToGPU(); - m_dx11PerClothCollisionObjects.moveToGPU(); - m_dx11CollisionObjectDetails.moveToGPU(); - - SolveCollisionsAndUpdateVelocitiesCB constBuffer; - - // Set the first link of the batch - // and the batch size - constBuffer.numNodes = m_vertexData.getNumVertices(); - constBuffer.isolverdt = isolverdt; - - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( solveCollisionsAndUpdateVelocitiesKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(SolveCollisionsAndUpdateVelocitiesCB) ); - m_dx11Context->Unmap( solveCollisionsAndUpdateVelocitiesKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &solveCollisionsAndUpdateVelocitiesKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_vertexData.m_dx11ClothIdentifier.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_vertexData.m_dx11VertexPreviousPosition.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_dx11PerClothFriction.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_dx11PerClothDampingFactor.getSRV()) ); - m_dx11Context->CSSetShaderResources( 4, 1, &(m_dx11PerClothCollisionObjects.getSRV()) ); - m_dx11Context->CSSetShaderResources( 5, 1, &(m_dx11CollisionObjectDetails.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexForceAccumulator.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &(m_vertexData.m_dx11VertexVelocity.getUAV()), NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 2, 1, &(m_vertexData.m_dx11VertexPosition.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( solveCollisionsAndUpdateVelocitiesKernel.kernel, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 4, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 5, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 1, 1, &pUAViewNULL, NULL ); - m_dx11Context->CSSetUnorderedAccessViews( 2, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } - -} // btDX11SoftBodySolver::solveCollisionsAndUpdateVelocities - -// End kernel dispatches -///////////////////////////////////// - - - - - - - - - - - - - - -btDX11SoftBodySolver::btAcceleratedSoftBodyInterface *btDX11SoftBodySolver::findSoftBodyInterface( const btSoftBody* const softBody ) -{ - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btAcceleratedSoftBodyInterface *softBodyInterface = m_softBodySet[softBodyIndex]; - if( softBodyInterface->getSoftBody() == softBody ) - return softBodyInterface; - } - return 0; -} - -const btDX11SoftBodySolver::btAcceleratedSoftBodyInterface * const btDX11SoftBodySolver::findSoftBodyInterface( const btSoftBody* const softBody ) const -{ - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btAcceleratedSoftBodyInterface *softBodyInterface = m_softBodySet[softBodyIndex]; - if( softBodyInterface->getSoftBody() == softBody ) - return softBodyInterface; - } - return 0; -} - -int btDX11SoftBodySolver::findSoftBodyIndex( const btSoftBody* const softBody ) -{ - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btAcceleratedSoftBodyInterface *softBodyInterface = m_softBodySet[softBodyIndex]; - if( softBodyInterface->getSoftBody() == softBody ) - return softBodyIndex; - } - return 1; -} - - -void btSoftBodySolverOutputDXtoCPU::copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ) -{ - - - btSoftBodySolver *solver = softBody->getSoftBodySolver(); - btAssert( solver->getSolverType() == btSoftBodySolver::DX_SOLVER || solver->getSolverType() == btSoftBodySolver::DX_SIMD_SOLVER ); - btDX11SoftBodySolver *dxSolver = static_cast< btDX11SoftBodySolver * >( solver ); - - btDX11SoftBodySolver::btAcceleratedSoftBodyInterface * currentCloth = dxSolver->findSoftBodyInterface( softBody ); - btSoftBodyVertexDataDX11 &vertexData( dxSolver->m_vertexData ); - - - const int firstVertex = currentCloth->getFirstVertex(); - const int lastVertex = firstVertex + currentCloth->getNumVertices(); - - if( vertexBuffer->getBufferType() == btVertexBufferDescriptor::CPU_BUFFER ) - { - // If we're doing a CPU-buffer copy must copy the data back to the host first - vertexData.m_dx11VertexPosition.copyFromGPU(); - vertexData.m_dx11VertexNormal.copyFromGPU(); - - const int firstVertex = currentCloth->getFirstVertex(); - const int lastVertex = firstVertex + currentCloth->getNumVertices(); - const btCPUVertexBufferDescriptor *cpuVertexBuffer = static_cast< btCPUVertexBufferDescriptor* >(vertexBuffer); - float *basePointer = cpuVertexBuffer->getBasePointer(); - - if( vertexBuffer->hasVertexPositions() ) - { - const int vertexOffset = cpuVertexBuffer->getVertexOffset(); - const int vertexStride = cpuVertexBuffer->getVertexStride(); - float *vertexPointer = basePointer + vertexOffset; - - for( int vertexIndex = firstVertex; vertexIndex < lastVertex; ++vertexIndex ) - { - Vectormath::Aos::Point3 position = vertexData.getPosition(vertexIndex); - *(vertexPointer + 0) = position.getX(); - *(vertexPointer + 1) = position.getY(); - *(vertexPointer + 2) = position.getZ(); - vertexPointer += vertexStride; - } - } - if( vertexBuffer->hasNormals() ) - { - const int normalOffset = cpuVertexBuffer->getNormalOffset(); - const int normalStride = cpuVertexBuffer->getNormalStride(); - float *normalPointer = basePointer + normalOffset; - - for( int vertexIndex = firstVertex; vertexIndex < lastVertex; ++vertexIndex ) - { - Vectormath::Aos::Vector3 normal = vertexData.getNormal(vertexIndex); - *(normalPointer + 0) = normal.getX(); - *(normalPointer + 1) = normal.getY(); - *(normalPointer + 2) = normal.getZ(); - normalPointer += normalStride; - } - } - } -} // btDX11SoftBodySolver::outputToVertexBuffers - - - -bool btSoftBodySolverOutputDXtoDX::checkInitialized() -{ - if( !m_shadersInitialized ) - if( buildShaders() ) - m_shadersInitialized = true; - - return m_shadersInitialized; -} - -void btSoftBodySolverOutputDXtoDX::releaseKernels() -{ - SAFE_RELEASE( outputToVertexArrayWithNormalsKernel.constBuffer ); - SAFE_RELEASE( outputToVertexArrayWithNormalsKernel.kernel ); - SAFE_RELEASE( outputToVertexArrayWithoutNormalsKernel.constBuffer ); - SAFE_RELEASE( outputToVertexArrayWithoutNormalsKernel.kernel ); - - m_shadersInitialized = false; -} - - -bool btSoftBodySolverOutputDXtoDX::buildShaders() -{ - // Ensure current kernels are released first - releaseKernels(); - - bool returnVal = true; - - if( m_shadersInitialized ) - return true; - - - outputToVertexArrayWithNormalsKernel = dxFunctions.compileComputeShaderFromString( OutputToVertexArrayHLSLString, "OutputToVertexArrayWithNormalsKernel", sizeof(OutputToVertexArrayCB) ); - if( !outputToVertexArrayWithNormalsKernel.constBuffer) - returnVal = false; - outputToVertexArrayWithoutNormalsKernel = dxFunctions.compileComputeShaderFromString( OutputToVertexArrayHLSLString, "OutputToVertexArrayWithoutNormalsKernel", sizeof(OutputToVertexArrayCB) ); - if( !outputToVertexArrayWithoutNormalsKernel.constBuffer ) - returnVal = false; - - - if( returnVal ) - m_shadersInitialized = true; - - return returnVal; -} - - -void btSoftBodySolverOutputDXtoDX::copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ) -{ - - - btSoftBodySolver *solver = softBody->getSoftBodySolver(); - btAssert( solver->getSolverType() == btSoftBodySolver::DX_SOLVER || solver->getSolverType() == btSoftBodySolver::DX_SIMD_SOLVER ); - btDX11SoftBodySolver *dxSolver = static_cast< btDX11SoftBodySolver * >( solver ); - checkInitialized(); - btDX11SoftBodySolver::btAcceleratedSoftBodyInterface * currentCloth = dxSolver->findSoftBodyInterface( softBody ); - btSoftBodyVertexDataDX11 &vertexData( dxSolver->m_vertexData ); - - - const int firstVertex = currentCloth->getFirstVertex(); - const int lastVertex = firstVertex + currentCloth->getNumVertices(); - - if( vertexBuffer->getBufferType() == btVertexBufferDescriptor::CPU_BUFFER ) - { - btSoftBodySolverOutputDXtoDX::copySoftBodyToVertexBuffer( softBody, vertexBuffer ); - } else if( vertexBuffer->getBufferType() == btVertexBufferDescriptor::DX11_BUFFER ) - { - // Do a DX11 copy shader DX to DX copy - - const btDX11VertexBufferDescriptor *dx11VertexBuffer = static_cast< btDX11VertexBufferDescriptor* >(vertexBuffer); - - // No need to batch link solver, it is entirely parallel - // Copy kernel parameters to GPU - OutputToVertexArrayCB constBuffer; - ID3D11ComputeShader* outputToVertexArrayShader = outputToVertexArrayWithoutNormalsKernel.kernel; - ID3D11Buffer* outputToVertexArrayConstBuffer = outputToVertexArrayWithoutNormalsKernel.constBuffer; - - constBuffer.startNode = firstVertex; - constBuffer.numNodes = currentCloth->getNumVertices(); - constBuffer.positionOffset = vertexBuffer->getVertexOffset(); - constBuffer.positionStride = vertexBuffer->getVertexStride(); - if( vertexBuffer->hasNormals() ) - { - constBuffer.normalOffset = vertexBuffer->getNormalOffset(); - constBuffer.normalStride = vertexBuffer->getNormalStride(); - outputToVertexArrayShader = outputToVertexArrayWithNormalsKernel.kernel; - outputToVertexArrayConstBuffer = outputToVertexArrayWithNormalsKernel.constBuffer; - } - - // TODO: factor this out. Number of nodes is static and sdt might be, too, we can update this just once on setup - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - dxFunctions.m_dx11Context->Map( outputToVertexArrayConstBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(OutputToVertexArrayCB) ); - dxFunctions.m_dx11Context->Unmap( outputToVertexArrayConstBuffer, 0 ); - dxFunctions.m_dx11Context->CSSetConstantBuffers( 0, 1, &outputToVertexArrayConstBuffer ); - - // Set resources and dispatch - dxFunctions.m_dx11Context->CSSetShaderResources( 0, 1, &(vertexData.m_dx11VertexPosition.getSRV()) ); - dxFunctions.m_dx11Context->CSSetShaderResources( 1, 1, &(vertexData.m_dx11VertexNormal.getSRV()) ); - - ID3D11UnorderedAccessView* dx11UAV = dx11VertexBuffer->getDX11UAV(); - dxFunctions.m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(dx11UAV), NULL ); - - // Execute the kernel - dxFunctions.m_dx11Context->CSSetShader( outputToVertexArrayShader, NULL, 0 ); - - int numBlocks = (constBuffer.numNodes + (128-1)) / 128; - dxFunctions.m_dx11Context->Dispatch(numBlocks, 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - dxFunctions.m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - dxFunctions.m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - dxFunctions.m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - dxFunctions.m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } - } -} // btDX11SoftBodySolver::outputToVertexBuffers - - - - -DXFunctions::KernelDesc DXFunctions::compileComputeShaderFromString( const char* shaderString, const char* shaderName, int constBufferSize, D3D10_SHADER_MACRO *compileMacros ) -{ - const char *cs5String = "cs_5_0"; - - HRESULT hr = S_OK; - ID3DBlob* pErrorBlob = NULL; - ID3DBlob* pBlob = NULL; - ID3D11ComputeShader* kernelPointer = 0; - - hr = m_dx11CompileFromMemory( - shaderString, - strlen(shaderString), - shaderName, - compileMacros, - NULL, - shaderName, - cs5String, - D3D10_SHADER_ENABLE_STRICTNESS, - NULL, - NULL, - &pBlob, - &pErrorBlob, - NULL - ); - - if( FAILED(hr) ) - { - if( pErrorBlob ) { - btAssert( "Compilation of compute shader failed\n" ); - char *debugString = (char*)pErrorBlob->GetBufferPointer(); - OutputDebugStringA( debugString ); - } - - SAFE_RELEASE( pErrorBlob ); - SAFE_RELEASE( pBlob ); - - DXFunctions::KernelDesc descriptor; - descriptor.kernel = 0; - descriptor.constBuffer = 0; - return descriptor; - } - - // Create the Compute Shader - hr = m_dx11Device->CreateComputeShader( pBlob->GetBufferPointer(), pBlob->GetBufferSize(), NULL, &kernelPointer ); - if( FAILED( hr ) ) - { - DXFunctions::KernelDesc descriptor; - descriptor.kernel = 0; - descriptor.constBuffer = 0; - return descriptor; - } - - ID3D11Buffer* constBuffer = 0; - if( constBufferSize > 0 ) - { - // Create the constant buffer - D3D11_BUFFER_DESC constant_buffer_desc; - ZeroMemory(&constant_buffer_desc, sizeof(constant_buffer_desc)); - constant_buffer_desc.ByteWidth = constBufferSize; - constant_buffer_desc.Usage = D3D11_USAGE_DYNAMIC; - constant_buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; - constant_buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; - m_dx11Device->CreateBuffer(&constant_buffer_desc, NULL, &constBuffer); - if( FAILED( hr ) ) - { - KernelDesc descriptor; - descriptor.kernel = 0; - descriptor.constBuffer = 0; - return descriptor; - } - } - - SAFE_RELEASE( pErrorBlob ); - SAFE_RELEASE( pBlob ); - - DXFunctions::KernelDesc descriptor; - descriptor.kernel = kernelPointer; - descriptor.constBuffer = constBuffer; - return descriptor; -} // compileComputeShader - - - -bool btDX11SoftBodySolver::buildShaders() -{ - // Ensure current kernels are released first - releaseKernels(); - - bool returnVal = true; - - if( m_shadersInitialized ) - return true; - - prepareLinksKernel = dxFunctions.compileComputeShaderFromString( PrepareLinksHLSLString, "PrepareLinksKernel", sizeof(PrepareLinksCB) ); - if( !prepareLinksKernel.constBuffer ) - returnVal = false; - updatePositionsFromVelocitiesKernel = dxFunctions.compileComputeShaderFromString( UpdatePositionsFromVelocitiesHLSLString, "UpdatePositionsFromVelocitiesKernel", sizeof(UpdatePositionsFromVelocitiesCB) ); - if( !updatePositionsFromVelocitiesKernel.constBuffer ) - returnVal = false; - solvePositionsFromLinksKernel = dxFunctions.compileComputeShaderFromString( SolvePositionsHLSLString, "SolvePositionsFromLinksKernel", sizeof(SolvePositionsFromLinksKernelCB) ); - if( !updatePositionsFromVelocitiesKernel.constBuffer ) - returnVal = false; - vSolveLinksKernel = dxFunctions.compileComputeShaderFromString( VSolveLinksHLSLString, "VSolveLinksKernel", sizeof(VSolveLinksCB) ); - if( !vSolveLinksKernel.constBuffer ) - returnVal = false; - updateVelocitiesFromPositionsWithVelocitiesKernel = dxFunctions.compileComputeShaderFromString( UpdateNodesHLSLString, "updateVelocitiesFromPositionsWithVelocitiesKernel", sizeof(UpdateVelocitiesFromPositionsWithVelocitiesCB) ); - if( !updateVelocitiesFromPositionsWithVelocitiesKernel.constBuffer ) - returnVal = false; - updateVelocitiesFromPositionsWithoutVelocitiesKernel = dxFunctions.compileComputeShaderFromString( UpdatePositionsHLSLString, "updateVelocitiesFromPositionsWithoutVelocitiesKernel", sizeof(UpdateVelocitiesFromPositionsWithoutVelocitiesCB) ); - if( !updateVelocitiesFromPositionsWithoutVelocitiesKernel.constBuffer ) - returnVal = false; - integrateKernel = dxFunctions.compileComputeShaderFromString( IntegrateHLSLString, "IntegrateKernel", sizeof(IntegrateCB) ); - if( !integrateKernel.constBuffer ) - returnVal = false; - applyForcesKernel = dxFunctions.compileComputeShaderFromString( ApplyForcesHLSLString, "ApplyForcesKernel", sizeof(ApplyForcesCB) ); - if( !applyForcesKernel.constBuffer ) - returnVal = false; - solveCollisionsAndUpdateVelocitiesKernel = dxFunctions.compileComputeShaderFromString( SolveCollisionsAndUpdateVelocitiesHLSLString, "SolveCollisionsAndUpdateVelocitiesKernel", sizeof(SolveCollisionsAndUpdateVelocitiesCB) ); - if( !solveCollisionsAndUpdateVelocitiesKernel.constBuffer ) - returnVal = false; - - // TODO: Rename to UpdateSoftBodies - resetNormalsAndAreasKernel = dxFunctions.compileComputeShaderFromString( UpdateNormalsHLSLString, "ResetNormalsAndAreasKernel", sizeof(UpdateSoftBodiesCB) ); - if( !resetNormalsAndAreasKernel.constBuffer ) - returnVal = false; - normalizeNormalsAndAreasKernel = dxFunctions.compileComputeShaderFromString( UpdateNormalsHLSLString, "NormalizeNormalsAndAreasKernel", sizeof(UpdateSoftBodiesCB) ); - if( !normalizeNormalsAndAreasKernel.constBuffer ) - returnVal = false; - updateSoftBodiesKernel = dxFunctions.compileComputeShaderFromString( UpdateNormalsHLSLString, "UpdateSoftBodiesKernel", sizeof(UpdateSoftBodiesCB) ); - if( !updateSoftBodiesKernel.constBuffer ) - returnVal = false; - - computeBoundsKernel = dxFunctions.compileComputeShaderFromString( ComputeBoundsHLSLString, "ComputeBoundsKernel", sizeof(ComputeBoundsCB) ); - if( !computeBoundsKernel.constBuffer ) - returnVal = false; - - - - if( returnVal ) - m_shadersInitialized = true; - - return returnVal; -} - - -static Vectormath::Aos::Transform3 toTransform3( const btTransform &transform ) -{ - Vectormath::Aos::Transform3 outTransform; - outTransform.setCol(0, toVector3(transform.getBasis().getColumn(0))); - outTransform.setCol(1, toVector3(transform.getBasis().getColumn(1))); - outTransform.setCol(2, toVector3(transform.getBasis().getColumn(2))); - outTransform.setCol(3, toVector3(transform.getOrigin())); - return outTransform; -} - - -void btDX11SoftBodySolver::btAcceleratedSoftBodyInterface::updateBounds( const btVector3 &lowerBound, const btVector3 &upperBound ) -{ - float scalarMargin = this->getSoftBody()->getCollisionShape()->getMargin(); - btVector3 vectorMargin( scalarMargin, scalarMargin, scalarMargin ); - m_softBody->m_bounds[0] = lowerBound - vectorMargin; - m_softBody->m_bounds[1] = upperBound + vectorMargin; -} - -void btDX11SoftBodySolver::processCollision( btSoftBody*, btSoftBody* ) -{ - -} - -// Add the collision object to the set to deal with for a particular soft body -void btDX11SoftBodySolver::processCollision( btSoftBody *softBody, const btCollisionObjectWrapper* collisionObject ) -{ - int softBodyIndex = findSoftBodyIndex( softBody ); - - if( softBodyIndex >= 0 ) - { - const btCollisionShape *collisionShape = collisionObject->getCollisionShape(); - float friction = collisionObject->getCollisionObject()->getFriction(); - int shapeType = collisionShape->getShapeType(); - if( shapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Add to the list of expected collision objects - CollisionShapeDescription newCollisionShapeDescription; - newCollisionShapeDescription.softBodyIdentifier = softBodyIndex; - newCollisionShapeDescription.collisionShapeType = shapeType; - // TODO: May need to transpose this matrix either here or in HLSL - newCollisionShapeDescription.shapeTransform = toTransform3(collisionObject->getWorldTransform()); - const btCapsuleShape *capsule = static_cast( collisionShape ); - newCollisionShapeDescription.radius = capsule->getRadius(); - newCollisionShapeDescription.halfHeight = capsule->getHalfHeight(); - newCollisionShapeDescription.margin = capsule->getMargin(); - newCollisionShapeDescription.friction = friction; - const btRigidBody* body = static_cast< const btRigidBody* >( collisionObject->getCollisionObject() ); - newCollisionShapeDescription.linearVelocity = toVector3(body->getLinearVelocity()); - newCollisionShapeDescription.angularVelocity = toVector3(body->getAngularVelocity()); - m_collisionObjectDetails.push_back( newCollisionShapeDescription ); - - } else { -#ifdef _DEBUG - printf("Unsupported collision shape type\n"); -#endif - } - } else { - btAssert("Unknown soft body"); - } -} // btDX11SoftBodySolver::processCollision - - - -void btDX11SoftBodySolver::predictMotion( float timeStep ) -{ - // Clear the collision shape array for the next frame - // Ensure that the DX11 ones are moved off the device so they will be updated correctly - m_dx11CollisionObjectDetails.changedOnCPU(); - m_dx11PerClothCollisionObjects.changedOnCPU(); - m_collisionObjectDetails.clear(); - - // Fill the force arrays with current acceleration data etc - m_perClothWindVelocity.resize( m_softBodySet.size() ); - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btSoftBody *softBody = m_softBodySet[softBodyIndex]->getSoftBody(); - - m_perClothWindVelocity[softBodyIndex] = toVector3(softBody->getWindVelocity()); - } - m_dx11PerClothWindVelocity.changedOnCPU(); - - // Apply forces that we know about to the cloths - applyForces( timeStep * getTimeScale() ); - - // Itegrate motion for all soft bodies dealt with by the solver - integrate( timeStep * getTimeScale() ); - - // Update bounds - // Will update the bounds for all softBodies being dealt with by the solver and - // set the values in the btSoftBody object - if (m_enableUpdateBounds) - updateBounds(); - - // End prediction work for solvers -} - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.h deleted file mode 100644 index 0f50ecf79..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.h +++ /dev/null @@ -1,691 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_ACCELERATED_SOFT_BODY_DX11_SOLVER_H -#define BT_ACCELERATED_SOFT_BODY_DX11_SOLVER_H - - -#include "vectormath/vmInclude.h" -#include "BulletSoftBody/btSoftBodySolvers.h" -#include "btSoftBodySolverVertexBuffer_DX11.h" -#include "btSoftBodySolverLinkData_DX11.h" -#include "btSoftBodySolverVertexData_DX11.h" -#include "btSoftBodySolverTriangleData_DX11.h" - - - -class DXFunctions -{ -public: - - typedef HRESULT (WINAPI * CompileFromMemoryFunc)(LPCSTR,SIZE_T,LPCSTR,const D3D10_SHADER_MACRO*,LPD3D10INCLUDE,LPCSTR,LPCSTR,UINT,UINT,ID3DX11ThreadPump*,ID3D10Blob**,ID3D10Blob**,HRESULT*); - - ID3D11Device * m_dx11Device; - ID3D11DeviceContext* m_dx11Context; - CompileFromMemoryFunc m_dx11CompileFromMemory; - - DXFunctions(ID3D11Device *dx11Device, ID3D11DeviceContext* dx11Context, CompileFromMemoryFunc dx11CompileFromMemory) : - m_dx11Device( dx11Device ), - m_dx11Context( dx11Context ), - m_dx11CompileFromMemory( dx11CompileFromMemory ) - { - - } - - class KernelDesc - { - protected: - - - public: - ID3D11ComputeShader* kernel; - ID3D11Buffer* constBuffer; - - KernelDesc() - { - kernel = 0; - constBuffer = 0; - } - - virtual ~KernelDesc() - { - // TODO: this should probably destroy its kernel but we need to be careful - // in case KernelDescs are copied - } - }; - - /** - * Compile a compute shader kernel from a string and return the appropriate KernelDesc object. - */ - KernelDesc compileComputeShaderFromString( const char* shaderString, const char* shaderName, int constBufferSize, D3D10_SHADER_MACRO *compileMacros = 0 ); - -}; - -class btDX11SoftBodySolver : public btSoftBodySolver -{ -protected: - /** - * Entry in the collision shape array. - * Specifies the shape type, the transform matrix and the necessary details of the collisionShape. - */ - struct CollisionShapeDescription - { - Vectormath::Aos::Transform3 shapeTransform; - Vectormath::Aos::Vector3 linearVelocity; - Vectormath::Aos::Vector3 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - // Both needed for capsule - float radius; - float halfHeight; - - float margin; - float friction; - - CollisionShapeDescription() - { - collisionShapeType = 0; - margin = 0; - friction = 0; - } - }; - - struct UIntVector3 - { - UIntVector3() - { - x = 0; - y = 0; - z = 0; - _padding = 0; - } - - UIntVector3( unsigned int x_, unsigned int y_, unsigned int z_ ) - { - x = x_; - y = y_; - z = z_; - _padding = 0; - } - - unsigned int x; - unsigned int y; - unsigned int z; - unsigned int _padding; - }; - - - -public: - /** - * SoftBody class to maintain information about a soft body instance - * within a solver. - * This data addresses the main solver arrays. - */ - class btAcceleratedSoftBodyInterface - { - protected: - /** Current number of vertices that are part of this cloth */ - int m_numVertices; - /** Maximum number of vertices allocated to be part of this cloth */ - int m_maxVertices; - /** Current number of triangles that are part of this cloth */ - int m_numTriangles; - /** Maximum number of triangles allocated to be part of this cloth */ - int m_maxTriangles; - /** Index of first vertex in the world allocated to this cloth */ - int m_firstVertex; - /** Index of first triangle in the world allocated to this cloth */ - int m_firstTriangle; - /** Index of first link in the world allocated to this cloth */ - int m_firstLink; - /** Maximum number of links allocated to this cloth */ - int m_maxLinks; - /** Current number of links allocated to this cloth */ - int m_numLinks; - - /** The actual soft body this data represents */ - btSoftBody *m_softBody; - - - public: - btAcceleratedSoftBodyInterface( btSoftBody *softBody ) : - m_softBody( softBody ) - { - m_numVertices = 0; - m_maxVertices = 0; - m_numTriangles = 0; - m_maxTriangles = 0; - m_firstVertex = 0; - m_firstTriangle = 0; - m_firstLink = 0; - m_maxLinks = 0; - m_numLinks = 0; - } - int getNumVertices() const - { - return m_numVertices; - } - - int getNumTriangles() const - { - return m_numTriangles; - } - - int getMaxVertices() const - { - return m_maxVertices; - } - - int getMaxTriangles() const - { - return m_maxTriangles; - } - - int getFirstVertex() const - { - return m_firstVertex; - } - - int getFirstTriangle() const - { - return m_firstTriangle; - } - - - /** - * Update the bounds in the btSoftBody object - */ - void updateBounds( const btVector3 &lowerBound, const btVector3 &upperBound ); - - - // TODO: All of these set functions will have to do checks and - // update the world because restructuring of the arrays will be necessary - // Reasonable use of "friend"? - void setNumVertices( int numVertices ) - { - m_numVertices = numVertices; - } - - void setNumTriangles( int numTriangles ) - { - m_numTriangles = numTriangles; - } - - void setMaxVertices( int maxVertices ) - { - m_maxVertices = maxVertices; - } - - void setMaxTriangles( int maxTriangles ) - { - m_maxTriangles = maxTriangles; - } - - void setFirstVertex( int firstVertex ) - { - m_firstVertex = firstVertex; - } - - void setFirstTriangle( int firstTriangle ) - { - m_firstTriangle = firstTriangle; - } - - void setMaxLinks( int maxLinks ) - { - m_maxLinks = maxLinks; - } - - void setNumLinks( int numLinks ) - { - m_numLinks = numLinks; - } - - void setFirstLink( int firstLink ) - { - m_firstLink = firstLink; - } - - int getMaxLinks() - { - return m_maxLinks; - } - - int getNumLinks() - { - return m_numLinks; - } - - int getFirstLink() - { - return m_firstLink; - } - - btSoftBody* getSoftBody() - { - return m_softBody; - } - - }; - - - struct CollisionObjectIndices - { - CollisionObjectIndices( int f, int e ) - { - firstObject = f; - endObject = e; - } - - int firstObject; - int endObject; - }; - - - - - - struct PrepareLinksCB - { - int numLinks; - int padding0; - int padding1; - int padding2; - }; - - struct SolvePositionsFromLinksKernelCB - { - int startLink; - int numLinks; - float kst; - float ti; - }; - - struct IntegrateCB - { - int numNodes; - float solverdt; - int padding1; - int padding2; - }; - - struct UpdatePositionsFromVelocitiesCB - { - int numNodes; - float solverSDT; - int padding1; - int padding2; - }; - - struct UpdateVelocitiesFromPositionsWithoutVelocitiesCB - { - int numNodes; - float isolverdt; - int padding1; - int padding2; - }; - - struct UpdateVelocitiesFromPositionsWithVelocitiesCB - { - int numNodes; - float isolverdt; - int padding1; - int padding2; - }; - - struct UpdateSoftBodiesCB - { - int numNodes; - int startFace; - int numFaces; - float epsilon; - }; - - - struct ApplyForcesCB - { - unsigned int numNodes; - float solverdt; - float epsilon; - int padding3; - }; - - struct AddVelocityCB - { - int startNode; - int lastNode; - float velocityX; - float velocityY; - float velocityZ; - int padding1; - int padding2; - int padding3; - }; - - struct VSolveLinksCB - { - int startLink; - int numLinks; - float kst; - int padding; - }; - - struct ComputeBoundsCB - { - int numNodes; - int numSoftBodies; - int padding1; - int padding2; - }; - - struct SolveCollisionsAndUpdateVelocitiesCB - { - unsigned int numNodes; - float isolverdt; - int padding0; - int padding1; - }; - - - - -protected: - ID3D11Device * m_dx11Device; - ID3D11DeviceContext* m_dx11Context; - - DXFunctions dxFunctions; -public: - /** Link data for all cloths. Note that this will be sorted batch-wise for efficient computation and m_linkAddresses will maintain the addressing. */ - btSoftBodyLinkDataDX11 m_linkData; - btSoftBodyVertexDataDX11 m_vertexData; - btSoftBodyTriangleDataDX11 m_triangleData; - -protected: - - /** Variable to define whether we need to update solver constants on the next iteration */ - bool m_updateSolverConstants; - - bool m_shadersInitialized; - - /** - * Cloths owned by this solver. - * Only our cloths are in this array. - */ - btAlignedObjectArray< btAcceleratedSoftBodyInterface * > m_softBodySet; - - /** Acceleration value to be applied to all non-static vertices in the solver. - * Index n is cloth n, array sized by number of cloths in the world not the solver. - */ - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_perClothAcceleration; - btDX11Buffer m_dx11PerClothAcceleration; - - /** Wind velocity to be applied normal to all non-static vertices in the solver. - * Index n is cloth n, array sized by number of cloths in the world not the solver. - */ - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_perClothWindVelocity; - btDX11Buffer m_dx11PerClothWindVelocity; - - /** Velocity damping factor */ - btAlignedObjectArray< float > m_perClothDampingFactor; - btDX11Buffer m_dx11PerClothDampingFactor; - - /** Velocity correction coefficient */ - btAlignedObjectArray< float > m_perClothVelocityCorrectionCoefficient; - btDX11Buffer m_dx11PerClothVelocityCorrectionCoefficient; - - /** Lift parameter for wind effect on cloth. */ - btAlignedObjectArray< float > m_perClothLiftFactor; - btDX11Buffer m_dx11PerClothLiftFactor; - - /** Drag parameter for wind effect on cloth. */ - btAlignedObjectArray< float > m_perClothDragFactor; - btDX11Buffer m_dx11PerClothDragFactor; - - /** Density of the medium in which each cloth sits */ - btAlignedObjectArray< float > m_perClothMediumDensity; - btDX11Buffer m_dx11PerClothMediumDensity; - - - /** - * Collision shape details: pair of index of first collision shape for the cloth and number of collision objects. - */ - btAlignedObjectArray< CollisionObjectIndices > m_perClothCollisionObjects; - btDX11Buffer m_dx11PerClothCollisionObjects; - - /** - * Collision shapes being passed across to the cloths in this solver. - */ - btAlignedObjectArray< CollisionShapeDescription > m_collisionObjectDetails; - btDX11Buffer< CollisionShapeDescription > m_dx11CollisionObjectDetails; - - /** - * Minimum bounds for each cloth. - * Updated by GPU and returned for use by broad phase. - * These are int vectors as a reminder that they store the int representation of a float, not a float. - * Bit 31 is inverted - is floats are stored with int-sortable values. - */ - btAlignedObjectArray< UIntVector3 > m_perClothMinBounds; - btDX11Buffer< UIntVector3 > m_dx11PerClothMinBounds; - - /** - * Maximum bounds for each cloth. - * Updated by GPU and returned for use by broad phase. - * These are int vectors as a reminder that they store the int representation of a float, not a float. - * Bit 31 is inverted - is floats are stored with int-sortable values. - */ - btAlignedObjectArray< UIntVector3 > m_perClothMaxBounds; - btDX11Buffer< UIntVector3 > m_dx11PerClothMaxBounds; - - - /** - * Friction coefficient for each cloth - */ - btAlignedObjectArray< float > m_perClothFriction; - btDX11Buffer< float > m_dx11PerClothFriction; - - DXFunctions::KernelDesc prepareLinksKernel; - DXFunctions::KernelDesc solvePositionsFromLinksKernel; - DXFunctions::KernelDesc vSolveLinksKernel; - DXFunctions::KernelDesc integrateKernel; - DXFunctions::KernelDesc addVelocityKernel; - DXFunctions::KernelDesc updatePositionsFromVelocitiesKernel; - DXFunctions::KernelDesc updateVelocitiesFromPositionsWithoutVelocitiesKernel; - DXFunctions::KernelDesc updateVelocitiesFromPositionsWithVelocitiesKernel; - DXFunctions::KernelDesc solveCollisionsAndUpdateVelocitiesKernel; - DXFunctions::KernelDesc resetNormalsAndAreasKernel; - DXFunctions::KernelDesc normalizeNormalsAndAreasKernel; - DXFunctions::KernelDesc computeBoundsKernel; - DXFunctions::KernelDesc updateSoftBodiesKernel; - - DXFunctions::KernelDesc applyForcesKernel; - - bool m_enableUpdateBounds; - - /** - * Integrate motion on the solver. - */ - virtual void integrate( float solverdt ); - float computeTriangleArea( - const Vectormath::Aos::Point3 &vertex0, - const Vectormath::Aos::Point3 &vertex1, - const Vectormath::Aos::Point3 &vertex2 ); - - - virtual bool buildShaders(); - - void resetNormalsAndAreas( int numVertices ); - - void normalizeNormalsAndAreas( int numVertices ); - - void executeUpdateSoftBodies( int firstTriangle, int numTriangles ); - - void prepareCollisionConstraints(); - - Vectormath::Aos::Vector3 ProjectOnAxis( const Vectormath::Aos::Vector3 &v, const Vectormath::Aos::Vector3 &a ); - - void ApplyClampedForce( float solverdt, const Vectormath::Aos::Vector3 &force, const Vectormath::Aos::Vector3 &vertexVelocity, float inverseMass, Vectormath::Aos::Vector3 &vertexForce ); - - virtual void applyForces( float solverdt ); - - virtual void updateConstants( float timeStep ); - int findSoftBodyIndex( const btSoftBody* const softBody ); - - ////////////////////////////////////// - // Kernel dispatches - virtual void prepareLinks(); - - void updatePositionsFromVelocities( float solverdt ); - void solveLinksForPosition( int startLink, int numLinks, float kst, float ti ); - void solveLinksForVelocity( int startLink, int numLinks, float kst ); - - void updateVelocitiesFromPositionsWithVelocities( float isolverdt ); - void updateVelocitiesFromPositionsWithoutVelocities( float isolverdt ); - void computeBounds( ); - void solveCollisionsAndUpdateVelocities( float isolverdt ); - - // End kernel dispatches - ///////////////////////////////////// - - void updateBounds(); - - - void releaseKernels(); - -public: - btDX11SoftBodySolver(ID3D11Device * dx11Device, ID3D11DeviceContext* dx11Context, DXFunctions::CompileFromMemoryFunc dx11CompileFromMemory = &D3DX11CompileFromMemory); - - virtual ~btDX11SoftBodySolver(); - - - virtual SolverTypes getSolverType() const - { - return DX_SOLVER; - } - - void setEnableUpdateBounds(bool enableBounds) - { - m_enableUpdateBounds = enableBounds; - } - bool getEnableUpdateBounds() const - { - return m_enableUpdateBounds; - } - - - - virtual btSoftBodyLinkData &getLinkData(); - - virtual btSoftBodyVertexData &getVertexData(); - - virtual btSoftBodyTriangleData &getTriangleData(); - - - - - - btAcceleratedSoftBodyInterface *findSoftBodyInterface( const btSoftBody* const softBody ); - const btAcceleratedSoftBodyInterface * const findSoftBodyInterface( const btSoftBody* const softBody ) const; - - virtual bool checkInitialized(); - - virtual void updateSoftBodies( ); - - virtual void optimize( btAlignedObjectArray< btSoftBody * > &softBodies , bool forceUpdate=false); - - virtual void copyBackToSoftBodies(bool bMove = true); - - virtual void solveConstraints( float solverdt ); - - virtual void predictMotion( float solverdt ); - - - virtual void processCollision( btSoftBody *, const btCollisionObjectWrapper* ); - - virtual void processCollision( btSoftBody*, btSoftBody* ); - -}; - - - -/** - * Class to manage movement of data from a solver to a given target. - * This version is the DX to CPU version. - */ -class btSoftBodySolverOutputDXtoCPU : public btSoftBodySolverOutput -{ -protected: - -public: - btSoftBodySolverOutputDXtoCPU() - { - } - - /** Output current computed vertex data to the vertex buffers for all cloths in the solver. */ - virtual void copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ); -}; - -/** - * Class to manage movement of data from a solver to a given target. - * This version is the DX to DX version and subclasses DX to CPU so that it works for that too. - */ -class btSoftBodySolverOutputDXtoDX : public btSoftBodySolverOutputDXtoCPU -{ -protected: - struct OutputToVertexArrayCB - { - int startNode; - int numNodes; - int positionOffset; - int positionStride; - - int normalOffset; - int normalStride; - int padding1; - int padding2; - }; - - DXFunctions dxFunctions; - DXFunctions::KernelDesc outputToVertexArrayWithNormalsKernel; - DXFunctions::KernelDesc outputToVertexArrayWithoutNormalsKernel; - - - bool m_shadersInitialized; - - bool checkInitialized(); - bool buildShaders(); - void releaseKernels(); - -public: - btSoftBodySolverOutputDXtoDX(ID3D11Device *dx11Device, ID3D11DeviceContext* dx11Context, DXFunctions::CompileFromMemoryFunc dx11CompileFromMemory = &D3DX11CompileFromMemory) : - dxFunctions( dx11Device, dx11Context, dx11CompileFromMemory ) - { - m_shadersInitialized = false; - } - - ~btSoftBodySolverOutputDXtoDX() - { - releaseKernels(); - } - - /** Output current computed vertex data to the vertex buffers for all cloths in the solver. */ - virtual void copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ); -}; - -#endif // #ifndef BT_ACCELERATED_SOFT_BODY_DX11_SOLVER_H - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.cpp deleted file mode 100644 index 5c73ee5d2..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.cpp +++ /dev/null @@ -1,1051 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include - - -#define WAVEFRONT_SIZE 32 -#define WAVEFRONT_BLOCK_MULTIPLIER 2 -#define GROUP_SIZE (WAVEFRONT_SIZE*WAVEFRONT_BLOCK_MULTIPLIER) -#define LINKS_PER_SIMD_LANE 16 - -#define STRINGIFY( S ) STRINGIFY2( S ) -#define STRINGIFY2( S ) #S - -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "vectormath/vmInclude.h" - -#include "btSoftBodySolverLinkData_DX11SIMDAware.h" -#include "btSoftBodySolver_DX11SIMDAware.h" -#include "btSoftBodySolverVertexBuffer_DX11.h" -#include "BulletSoftBody/btSoftBody.h" -#include "BulletCollision/CollisionShapes/btCapsuleShape.h" - -#define MSTRINGIFY(A) #A -static char* UpdatePositionsFromVelocitiesHLSLString = -#include "HLSL/UpdatePositionsFromVelocities.hlsl" -static char* SolvePositionsSIMDBatchedHLSLString = -#include "HLSL/SolvePositionsSIMDBatched.hlsl" -static char* UpdateNodesHLSLString = -#include "HLSL/UpdateNodes.hlsl" -static char* UpdatePositionsHLSLString = -#include "HLSL/UpdatePositions.hlsl" -static char* UpdateConstantsHLSLString = -#include "HLSL/UpdateConstants.hlsl" -static char* IntegrateHLSLString = -#include "HLSL/Integrate.hlsl" -static char* ApplyForcesHLSLString = -#include "HLSL/ApplyForces.hlsl" -static char* UpdateNormalsHLSLString = -#include "HLSL/UpdateNormals.hlsl" -static char* OutputToVertexArrayHLSLString = -#include "HLSL/OutputToVertexArray.hlsl" -static char* VSolveLinksHLSLString = -#include "HLSL/VSolveLinks.hlsl" -static char* ComputeBoundsHLSLString = -#include "HLSL/ComputeBounds.hlsl" -static char* SolveCollisionsAndUpdateVelocitiesHLSLString = -#include "HLSL/solveCollisionsAndUpdateVelocitiesSIMDBatched.hlsl" - - - -btSoftBodyLinkDataDX11SIMDAware::btSoftBodyLinkDataDX11SIMDAware( ID3D11Device *d3dDevice, ID3D11DeviceContext *d3dDeviceContext ) : - m_d3dDevice( d3dDevice ), - m_d3dDeviceContext( d3dDeviceContext ), - m_wavefrontSize( WAVEFRONT_SIZE ), - m_linksPerWorkItem( LINKS_PER_SIMD_LANE ), - m_maxBatchesWithinWave( 0 ), - m_maxLinksPerWavefront( m_wavefrontSize * m_linksPerWorkItem ), - m_numWavefronts( 0 ), - m_maxVertex( 0 ), - m_dx11NumBatchesAndVerticesWithinWaves( d3dDevice, d3dDeviceContext, &m_numBatchesAndVerticesWithinWaves, true ), - m_dx11WavefrontVerticesGlobalAddresses( d3dDevice, d3dDeviceContext, &m_wavefrontVerticesGlobalAddresses, true ), - m_dx11LinkVerticesLocalAddresses( d3dDevice, d3dDeviceContext, &m_linkVerticesLocalAddresses, true ), - m_dx11LinkStrength( d3dDevice, d3dDeviceContext, &m_linkStrength, true ), - m_dx11LinksMassLSC( d3dDevice, d3dDeviceContext, &m_linksMassLSC, true ), - m_dx11LinksRestLengthSquared( d3dDevice, d3dDeviceContext, &m_linksRestLengthSquared, true ), - m_dx11LinksRestLength( d3dDevice, d3dDeviceContext, &m_linksRestLength, true ), - m_dx11LinksMaterialLinearStiffnessCoefficient( d3dDevice, d3dDeviceContext, &m_linksMaterialLinearStiffnessCoefficient, true ) -{ - m_d3dDevice = d3dDevice; - m_d3dDeviceContext = d3dDeviceContext; -} - -btSoftBodyLinkDataDX11SIMDAware::~btSoftBodyLinkDataDX11SIMDAware() -{ -} - -static Vectormath::Aos::Vector3 toVector3( const btVector3 &vec ) -{ - Vectormath::Aos::Vector3 outVec( vec.getX(), vec.getY(), vec.getZ() ); - return outVec; -} - -void btSoftBodyLinkDataDX11SIMDAware::createLinks( int numLinks ) -{ - int previousSize = m_links.size(); - int newSize = previousSize + numLinks; - - btSoftBodyLinkData::createLinks( numLinks ); - - // Resize the link addresses array as well - m_linkAddresses.resize( newSize ); -} - -void btSoftBodyLinkDataDX11SIMDAware::setLinkAt( const btSoftBodyLinkData::LinkDescription &link, int linkIndex ) -{ - btSoftBodyLinkData::setLinkAt( link, linkIndex ); - - if( link.getVertex0() > m_maxVertex ) - m_maxVertex = link.getVertex0(); - if( link.getVertex1() > m_maxVertex ) - m_maxVertex = link.getVertex1(); - - // Set the link index correctly for initialisation - m_linkAddresses[linkIndex] = linkIndex; -} - -bool btSoftBodyLinkDataDX11SIMDAware::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyLinkDataDX11SIMDAware::moveToAccelerator() -{ - bool success = true; - - success = success && m_dx11NumBatchesAndVerticesWithinWaves.moveToGPU(); - success = success && m_dx11WavefrontVerticesGlobalAddresses.moveToGPU(); - success = success && m_dx11LinkVerticesLocalAddresses.moveToGPU(); - success = success && m_dx11LinkStrength.moveToGPU(); - success = success && m_dx11LinksMassLSC.moveToGPU(); - success = success && m_dx11LinksRestLengthSquared.moveToGPU(); - success = success && m_dx11LinksRestLength.moveToGPU(); - success = success && m_dx11LinksMaterialLinearStiffnessCoefficient.moveToGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -bool btSoftBodyLinkDataDX11SIMDAware::moveFromAccelerator() -{ - bool success = true; - success = success && m_dx11NumBatchesAndVerticesWithinWaves.moveFromGPU(); - success = success && m_dx11WavefrontVerticesGlobalAddresses.moveFromGPU(); - success = success && m_dx11LinkVerticesLocalAddresses.moveFromGPU(); - success = success && m_dx11LinkStrength.moveFromGPU(); - success = success && m_dx11LinksMassLSC.moveFromGPU(); - success = success && m_dx11LinksRestLengthSquared.moveFromGPU(); - success = success && m_dx11LinksRestLength.moveFromGPU(); - success = success && m_dx11LinksMaterialLinearStiffnessCoefficient.moveFromGPU(); - - if( success ) - m_onGPU = false; - - return success; -} - - - - - - - - - - - - - - - -btDX11SIMDAwareSoftBodySolver::btDX11SIMDAwareSoftBodySolver(ID3D11Device * dx11Device, ID3D11DeviceContext* dx11Context, DXFunctions::CompileFromMemoryFunc dx11CompileFromMemory) : - btDX11SoftBodySolver( dx11Device, dx11Context, dx11CompileFromMemory ), - m_linkData(m_dx11Device, m_dx11Context) -{ - // Initial we will clearly need to update solver constants - // For now this is global for the cloths linked with this solver - we should probably make this body specific - // for performance in future once we understand more clearly when constants need to be updated - m_updateSolverConstants = true; - - m_shadersInitialized = false; -} - -btDX11SIMDAwareSoftBodySolver::~btDX11SIMDAwareSoftBodySolver() -{ - releaseKernels(); -} - - -btSoftBodyLinkData &btDX11SIMDAwareSoftBodySolver::getLinkData() -{ - // TODO: Consider setting link data to "changed" here - return m_linkData; -} - - - -void btDX11SIMDAwareSoftBodySolver::optimize( btAlignedObjectArray< btSoftBody * > &softBodies , bool forceUpdate) -{ - if(forceUpdate || m_softBodySet.size() != softBodies.size() ) - { - // Have a change in the soft body set so update, reloading all the data - getVertexData().clear(); - getTriangleData().clear(); - getLinkData().clear(); - m_softBodySet.resize(0); - - - for( int softBodyIndex = 0; softBodyIndex < softBodies.size(); ++softBodyIndex ) - { - btSoftBody *softBody = softBodies[ softBodyIndex ]; - using Vectormath::Aos::Matrix3; - using Vectormath::Aos::Point3; - - // Create SoftBody that will store the information within the solver - btAcceleratedSoftBodyInterface *newSoftBody = new btAcceleratedSoftBodyInterface( softBody ); - m_softBodySet.push_back( newSoftBody ); - - m_perClothAcceleration.push_back( toVector3(softBody->getWorldInfo()->m_gravity) ); - m_perClothDampingFactor.push_back(softBody->m_cfg.kDP); - m_perClothVelocityCorrectionCoefficient.push_back( softBody->m_cfg.kVCF ); - m_perClothLiftFactor.push_back( softBody->m_cfg.kLF ); - m_perClothDragFactor.push_back( softBody->m_cfg.kDG ); - m_perClothMediumDensity.push_back(softBody->getWorldInfo()->air_density); - // Simple init values. Actually we'll put 0 and -1 into them at the appropriate time - m_perClothMinBounds.push_back( UIntVector3( 0, 0, 0 ) ); - m_perClothMaxBounds.push_back( UIntVector3( UINT_MAX, UINT_MAX, UINT_MAX ) ); - m_perClothFriction.push_back( softBody->getFriction() ); - m_perClothCollisionObjects.push_back( CollisionObjectIndices(-1, -1) ); - - // Add space for new vertices and triangles in the default solver for now - // TODO: Include space here for tearing too later - int firstVertex = getVertexData().getNumVertices(); - int numVertices = softBody->m_nodes.size(); - // Round maxVertices to a multiple of the workgroup size so we know we're safe to run over in a given group - // maxVertices can be increased to allow tearing, but should be used sparingly because these extra verts will always be processed - int maxVertices = GROUP_SIZE*((numVertices+GROUP_SIZE)/GROUP_SIZE); - // Allocate space for new vertices in all the vertex arrays - getVertexData().createVertices( numVertices, softBodyIndex, maxVertices ); - - int firstTriangle = getTriangleData().getNumTriangles(); - int numTriangles = softBody->m_faces.size(); - int maxTriangles = numTriangles; - getTriangleData().createTriangles( maxTriangles ); - - // Copy vertices from softbody into the solver - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - Point3 multPoint(softBody->m_nodes[vertex].m_x.getX(), softBody->m_nodes[vertex].m_x.getY(), softBody->m_nodes[vertex].m_x.getZ()); - btSoftBodyVertexData::VertexDescription desc; - - // TODO: Position in the softbody might be pre-transformed - // or we may need to adapt for the pose. - //desc.setPosition( cloth.getMeshTransform()*multPoint ); - desc.setPosition( multPoint ); - - float vertexInverseMass = softBody->m_nodes[vertex].m_im; - desc.setInverseMass(vertexInverseMass); - getVertexData().setVertexAt( desc, firstVertex + vertex ); - } - - // Copy triangles similarly - // We're assuming here that vertex indices are based on the firstVertex rather than the entire scene - for( int triangle = 0; triangle < numTriangles; ++triangle ) - { - // Note that large array storage is relative to the array not to the cloth - // So we need to add firstVertex to each value - int vertexIndex0 = (softBody->m_faces[triangle].m_n[0] - &(softBody->m_nodes[0])); - int vertexIndex1 = (softBody->m_faces[triangle].m_n[1] - &(softBody->m_nodes[0])); - int vertexIndex2 = (softBody->m_faces[triangle].m_n[2] - &(softBody->m_nodes[0])); - btSoftBodyTriangleData::TriangleDescription newTriangle(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, vertexIndex2 + firstVertex); - getTriangleData().setTriangleAt( newTriangle, firstTriangle + triangle ); - - // Increase vertex triangle counts for this triangle - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex0)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex1)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex2)++; - } - - int firstLink = getLinkData().getNumLinks(); - int numLinks = softBody->m_links.size(); - int maxLinks = numLinks; - - // Allocate space for the links - getLinkData().createLinks( numLinks ); - - // Add the links - for( int link = 0; link < numLinks; ++link ) - { - int vertexIndex0 = softBody->m_links[link].m_n[0] - &(softBody->m_nodes[0]); - int vertexIndex1 = softBody->m_links[link].m_n[1] - &(softBody->m_nodes[0]); - - btSoftBodyLinkData::LinkDescription newLink(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, softBody->m_links[link].m_material->m_kLST); - newLink.setLinkStrength(1.f); - getLinkData().setLinkAt(newLink, firstLink + link); - } - - newSoftBody->setFirstVertex( firstVertex ); - newSoftBody->setFirstTriangle( firstTriangle ); - newSoftBody->setNumVertices( numVertices ); - newSoftBody->setMaxVertices( maxVertices ); - newSoftBody->setNumTriangles( numTriangles ); - newSoftBody->setMaxTriangles( maxTriangles ); - newSoftBody->setFirstLink( firstLink ); - newSoftBody->setNumLinks( numLinks ); - } - - - - updateConstants(0.f); - - - m_linkData.generateBatches(); - m_triangleData.generateBatches(); - - - // Build the shaders to match the batching parameters - buildShaders(); - } - -} - - - -void btDX11SIMDAwareSoftBodySolver::solveConstraints( float solverdt ) -{ - - //std::cerr << "'GPU' solve constraints\n"; - using Vectormath::Aos::Vector3; - using Vectormath::Aos::Point3; - using Vectormath::Aos::lengthSqr; - using Vectormath::Aos::dot; - - // Prepare links - int numLinks = m_linkData.getNumLinks(); - int numVertices = m_vertexData.getNumVertices(); - - float kst = 1.f; - float ti = 0.f; - - - m_dx11PerClothDampingFactor.moveToGPU(); - m_dx11PerClothVelocityCorrectionCoefficient.moveToGPU(); - - - - // Ensure data is on accelerator - m_linkData.moveToAccelerator(); - m_vertexData.moveToAccelerator(); - - - - prepareCollisionConstraints(); - - - // Solve drift - for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - { - - for( int i = 0; i < m_linkData.m_wavefrontBatchStartLengths.size(); ++i ) - { - int startWave = m_linkData.m_wavefrontBatchStartLengths[i].start; - int numWaves = m_linkData.m_wavefrontBatchStartLengths[i].length; - - solveLinksForPosition( startWave, numWaves, kst, ti ); - } - - } // for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - - - - - // At this point assume that the force array is blank - we will overwrite it - solveCollisionsAndUpdateVelocities( 1.f/solverdt ); - -} // btDX11SIMDAwareSoftBodySolver::solveConstraints - - -void btDX11SIMDAwareSoftBodySolver::updateConstants( float timeStep ) -{ - using namespace Vectormath::Aos; - - if( m_updateSolverConstants ) - { - m_updateSolverConstants = false; - - // Will have to redo this if we change the structure (tear, maybe) or various other possible changes - - // Initialise link constants - const int numLinks = m_linkData.getNumLinks(); - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair &vertices( m_linkData.getVertexPair(linkIndex) ); - m_linkData.getRestLength(linkIndex) = length((m_vertexData.getPosition( vertices.vertex0 ) - m_vertexData.getPosition( vertices.vertex1 ))); - float invMass0 = m_vertexData.getInverseMass(vertices.vertex0); - float invMass1 = m_vertexData.getInverseMass(vertices.vertex1); - float linearStiffness = m_linkData.getLinearStiffnessCoefficient(linkIndex); - float massLSC = (invMass0 + invMass1)/linearStiffness; - m_linkData.getMassLSC(linkIndex) = massLSC; - float restLength = m_linkData.getRestLength(linkIndex); - float restLengthSquared = restLength*restLength; - m_linkData.getRestLengthSquared(linkIndex) = restLengthSquared; - } - } -} // btDX11SIMDAwareSoftBodySolver::updateConstants - -////////////////////////////////////// -// Kernel dispatches - - -void btDX11SIMDAwareSoftBodySolver::solveLinksForPosition( int startWave, int numWaves, float kst, float ti ) -{ - - - m_vertexData.moveToAccelerator(); - m_linkData.moveToAccelerator(); - - // Copy kernel parameters to GPU - SolvePositionsFromLinksKernelCB constBuffer; - - // Set the first wave of the batch and the number of waves - constBuffer.startWave = startWave; - constBuffer.numWaves = numWaves; - - constBuffer.kst = kst; - constBuffer.ti = ti; - - D3D11_MAPPED_SUBRESOURCE MappedResource = {0}; - m_dx11Context->Map( solvePositionsFromLinksKernel.constBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource ); - memcpy( MappedResource.pData, &constBuffer, sizeof(SolvePositionsFromLinksKernelCB) ); - m_dx11Context->Unmap( solvePositionsFromLinksKernel.constBuffer, 0 ); - m_dx11Context->CSSetConstantBuffers( 0, 1, &solvePositionsFromLinksKernel.constBuffer ); - - // Set resources and dispatch - m_dx11Context->CSSetShaderResources( 0, 1, &(m_linkData.m_dx11NumBatchesAndVerticesWithinWaves.getSRV()) ); - m_dx11Context->CSSetShaderResources( 1, 1, &(m_linkData.m_dx11WavefrontVerticesGlobalAddresses.getSRV()) ); - m_dx11Context->CSSetShaderResources( 2, 1, &(m_vertexData.m_dx11VertexInverseMass.getSRV()) ); - m_dx11Context->CSSetShaderResources( 3, 1, &(m_linkData.m_dx11LinkVerticesLocalAddresses.getSRV()) ); - m_dx11Context->CSSetShaderResources( 4, 1, &(m_linkData.m_dx11LinksMassLSC.getSRV()) ); - m_dx11Context->CSSetShaderResources( 5, 1, &(m_linkData.m_dx11LinksRestLengthSquared.getSRV()) ); - - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &(m_vertexData.m_dx11VertexPosition.getUAV()), NULL ); - - // Execute the kernel - m_dx11Context->CSSetShader( solvePositionsFromLinksKernel.kernel, NULL, 0 ); - - int numBlocks = ((constBuffer.numWaves + WAVEFRONT_BLOCK_MULTIPLIER - 1) / WAVEFRONT_BLOCK_MULTIPLIER ); - m_dx11Context->Dispatch(numBlocks , 1, 1 ); - - { - // Tidy up - ID3D11ShaderResourceView* pViewNULL = NULL; - m_dx11Context->CSSetShaderResources( 0, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 1, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 2, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 3, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 4, 1, &pViewNULL ); - m_dx11Context->CSSetShaderResources( 5, 1, &pViewNULL ); - - ID3D11UnorderedAccessView* pUAViewNULL = NULL; - m_dx11Context->CSSetUnorderedAccessViews( 0, 1, &pUAViewNULL, NULL ); - - ID3D11Buffer *pBufferNull = NULL; - m_dx11Context->CSSetConstantBuffers( 0, 1, &pBufferNull ); - } -} // btDX11SIMDAwareSoftBodySolver::solveLinksForPosition - - - -// End kernel dispatches -///////////////////////////////////// - - - - - - - - - -bool btDX11SIMDAwareSoftBodySolver::buildShaders() -{ - // Ensure current kernels are released first - releaseKernels(); - - bool returnVal = true; - - - if( m_shadersInitialized ) - return true; - - - updatePositionsFromVelocitiesKernel = dxFunctions.compileComputeShaderFromString( UpdatePositionsFromVelocitiesHLSLString, "UpdatePositionsFromVelocitiesKernel", sizeof(UpdatePositionsFromVelocitiesCB) ); - if( !updatePositionsFromVelocitiesKernel.constBuffer ) - returnVal = false; - - char maxVerticesPerWavefront[20]; - char maxBatchesPerWavefront[20]; - char waveFrontSize[20]; - char waveFrontBlockMultiplier[20]; - char blockSize[20]; - - sprintf(maxVerticesPerWavefront, "%d", m_linkData.getMaxVerticesPerWavefront()); - sprintf(maxBatchesPerWavefront, "%d", m_linkData.getMaxBatchesPerWavefront()); - sprintf(waveFrontSize, "%d", m_linkData.getWavefrontSize()); - sprintf(waveFrontBlockMultiplier, "%d", WAVEFRONT_BLOCK_MULTIPLIER); - sprintf(blockSize, "%d", WAVEFRONT_BLOCK_MULTIPLIER*m_linkData.getWavefrontSize()); - - D3D10_SHADER_MACRO solvePositionsMacros[6] = { "MAX_NUM_VERTICES_PER_WAVE", maxVerticesPerWavefront, "MAX_BATCHES_PER_WAVE", maxBatchesPerWavefront, "WAVEFRONT_SIZE", waveFrontSize, "WAVEFRONT_BLOCK_MULTIPLIER", waveFrontBlockMultiplier, "BLOCK_SIZE", blockSize, 0, 0 }; - - solvePositionsFromLinksKernel = dxFunctions.compileComputeShaderFromString( SolvePositionsSIMDBatchedHLSLString, "SolvePositionsFromLinksKernel", sizeof(SolvePositionsFromLinksKernelCB), solvePositionsMacros ); - if( !solvePositionsFromLinksKernel.constBuffer ) - returnVal = false; - - updateVelocitiesFromPositionsWithVelocitiesKernel = dxFunctions.compileComputeShaderFromString( UpdateNodesHLSLString, "updateVelocitiesFromPositionsWithVelocitiesKernel", sizeof(UpdateVelocitiesFromPositionsWithVelocitiesCB) ); - if( !updateVelocitiesFromPositionsWithVelocitiesKernel.constBuffer ) - returnVal = false; - updateVelocitiesFromPositionsWithoutVelocitiesKernel = dxFunctions.compileComputeShaderFromString( UpdatePositionsHLSLString, "updateVelocitiesFromPositionsWithoutVelocitiesKernel", sizeof(UpdateVelocitiesFromPositionsWithoutVelocitiesCB)); - if( !updateVelocitiesFromPositionsWithoutVelocitiesKernel.constBuffer ) - returnVal = false; - integrateKernel = dxFunctions.compileComputeShaderFromString( IntegrateHLSLString, "IntegrateKernel", sizeof(IntegrateCB) ); - if( !integrateKernel.constBuffer ) - returnVal = false; - applyForcesKernel = dxFunctions.compileComputeShaderFromString( ApplyForcesHLSLString, "ApplyForcesKernel", sizeof(ApplyForcesCB) ); - if( !applyForcesKernel.constBuffer ) - returnVal = false; - solveCollisionsAndUpdateVelocitiesKernel = dxFunctions.compileComputeShaderFromString( SolveCollisionsAndUpdateVelocitiesHLSLString, "SolveCollisionsAndUpdateVelocitiesKernel", sizeof(SolveCollisionsAndUpdateVelocitiesCB) ); - if( !solveCollisionsAndUpdateVelocitiesKernel.constBuffer ) - returnVal = false; - resetNormalsAndAreasKernel = dxFunctions.compileComputeShaderFromString( UpdateNormalsHLSLString, "ResetNormalsAndAreasKernel", sizeof(UpdateSoftBodiesCB) ); - if( !resetNormalsAndAreasKernel.constBuffer ) - returnVal = false; - normalizeNormalsAndAreasKernel = dxFunctions.compileComputeShaderFromString( UpdateNormalsHLSLString, "NormalizeNormalsAndAreasKernel", sizeof(UpdateSoftBodiesCB) ); - if( !normalizeNormalsAndAreasKernel.constBuffer ) - returnVal = false; - updateSoftBodiesKernel = dxFunctions.compileComputeShaderFromString( UpdateNormalsHLSLString, "UpdateSoftBodiesKernel", sizeof(UpdateSoftBodiesCB) ); - if( !updateSoftBodiesKernel.constBuffer ) - returnVal = false; - - computeBoundsKernel = dxFunctions.compileComputeShaderFromString( ComputeBoundsHLSLString, "ComputeBoundsKernel", sizeof(ComputeBoundsCB) ); - if( !computeBoundsKernel.constBuffer ) - returnVal = false; - - if( returnVal ) - m_shadersInitialized = true; - - return returnVal; -} // btDX11SIMDAwareSoftBodySolver::buildShaders - -static Vectormath::Aos::Transform3 toTransform3( const btTransform &transform ) -{ - Vectormath::Aos::Transform3 outTransform; - outTransform.setCol(0, toVector3(transform.getBasis().getColumn(0))); - outTransform.setCol(1, toVector3(transform.getBasis().getColumn(1))); - outTransform.setCol(2, toVector3(transform.getBasis().getColumn(2))); - outTransform.setCol(3, toVector3(transform.getOrigin())); - return outTransform; -} - - - - - - - - - - - - -static void generateBatchesOfWavefronts( btAlignedObjectArray < btAlignedObjectArray > &linksForWavefronts, btSoftBodyLinkData &linkData, int numVertices, btAlignedObjectArray < btAlignedObjectArray > &wavefrontBatches ) -{ - // A per-batch map of truth values stating whether a given vertex is in that batch - // This allows us to significantly optimize the batching - btAlignedObjectArray > mapOfVerticesInBatches; - - for( int waveIndex = 0; waveIndex < linksForWavefronts.size(); ++waveIndex ) - { - btAlignedObjectArray &wavefront( linksForWavefronts[waveIndex] ); - - int batch = 0; - bool placed = false; - while( batch < wavefrontBatches.size() && !placed ) - { - // Test the current batch, see if this wave shares any vertex with the waves in the batch - bool foundSharedVertex = false; - for( int link = 0; link < wavefront.size(); ++link ) - { - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( wavefront[link] ); - if( (mapOfVerticesInBatches[batch])[vertices.vertex0] || (mapOfVerticesInBatches[batch])[vertices.vertex1] ) - { - foundSharedVertex = true; - } - } - - if( !foundSharedVertex ) - { - wavefrontBatches[batch].push_back( waveIndex ); - // Insert vertices into this batch too - for( int link = 0; link < wavefront.size(); ++link ) - { - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( wavefront[link] ); - (mapOfVerticesInBatches[batch])[vertices.vertex0] = true; - (mapOfVerticesInBatches[batch])[vertices.vertex1] = true; - } - placed = true; - } - batch++; - } - if( batch == wavefrontBatches.size() && !placed ) - { - wavefrontBatches.resize( batch + 1 ); - wavefrontBatches[batch].push_back( waveIndex ); - - // And resize map as well - mapOfVerticesInBatches.resize( batch + 1 ); - - // Resize maps with total number of vertices - mapOfVerticesInBatches[batch].resize( numVertices+1, false ); - - // Insert vertices into this batch too - for( int link = 0; link < wavefront.size(); ++link ) - { - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( wavefront[link] ); - (mapOfVerticesInBatches[batch])[vertices.vertex0] = true; - (mapOfVerticesInBatches[batch])[vertices.vertex1] = true; - } - } - } - mapOfVerticesInBatches.clear(); -} - -// Function to remove an object from a vector maintaining correct ordering of the vector -template< typename T > static void removeFromVector( btAlignedObjectArray< T > &vectorToUpdate, int indexToRemove ) -{ - int currentSize = vectorToUpdate.size(); - for( int i = indexToRemove; i < (currentSize-1); ++i ) - { - vectorToUpdate[i] = vectorToUpdate[i+1]; - } - if( currentSize > 0 ) - vectorToUpdate.resize( currentSize - 1 ); -} - -/** - * Insert element into vectorToUpdate at index index. - */ -template< typename T > static void insertAtIndex( btAlignedObjectArray< T > &vectorToUpdate, int index, T element ) -{ - vectorToUpdate.resize( vectorToUpdate.size() + 1 ); - for( int i = (vectorToUpdate.size() - 1); i > index; --i ) - { - vectorToUpdate[i] = vectorToUpdate[i-1]; - } - vectorToUpdate[index] = element; -} - -/** - * Insert into btAlignedObjectArray assuming the array is ordered and maintaining both ordering and uniqueness. - * ie it treats vectorToUpdate as an ordered set. - */ -template< typename T > static void insertUniqueAndOrderedIntoVector( btAlignedObjectArray &vectorToUpdate, T element ) -{ - int index = 0; - while( index < vectorToUpdate.size() && vectorToUpdate[index] < element ) - { - index++; - } - if( index == vectorToUpdate.size() || vectorToUpdate[index] != element ) - insertAtIndex( vectorToUpdate, index, element ); -} - -static void generateLinksPerVertex( int numVertices, btSoftBodyLinkData &linkData, btAlignedObjectArray< int > &listOfLinksPerVertex, btAlignedObjectArray &numLinksPerVertex, int &maxLinks ) -{ - for( int linkIndex = 0; linkIndex < linkData.getNumLinks(); ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair nodes( linkData.getVertexPair(linkIndex) ); - numLinksPerVertex[nodes.vertex0]++; - numLinksPerVertex[nodes.vertex1]++; - } - int maxLinksPerVertex = 0; - for( int vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex ) - { - maxLinksPerVertex = btMax(numLinksPerVertex[vertexIndex], maxLinksPerVertex); - } - maxLinks = maxLinksPerVertex; - - btAlignedObjectArray< int > linksFoundPerVertex; - linksFoundPerVertex.resize( numVertices, 0 ); - - listOfLinksPerVertex.resize( maxLinksPerVertex * numVertices ); - - for( int linkIndex = 0; linkIndex < linkData.getNumLinks(); ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair nodes( linkData.getVertexPair(linkIndex) ); - { - // Do vertex 0 - int vertexIndex = nodes.vertex0; - int linkForVertex = linksFoundPerVertex[nodes.vertex0]; - int linkAddress = vertexIndex * maxLinksPerVertex + linkForVertex; - - listOfLinksPerVertex[linkAddress] = linkIndex; - - linksFoundPerVertex[nodes.vertex0] = linkForVertex + 1; - } - { - // Do vertex 1 - int vertexIndex = nodes.vertex1; - int linkForVertex = linksFoundPerVertex[nodes.vertex1]; - int linkAddress = vertexIndex * maxLinksPerVertex + linkForVertex; - - listOfLinksPerVertex[linkAddress] = linkIndex; - - linksFoundPerVertex[nodes.vertex1] = linkForVertex + 1; - } - } -} - -static void computeBatchingIntoWavefronts( - btSoftBodyLinkData &linkData, - int wavefrontSize, - int linksPerWorkItem, - int maxLinksPerWavefront, - btAlignedObjectArray < btAlignedObjectArray > &linksForWavefronts, - btAlignedObjectArray< btAlignedObjectArray < btAlignedObjectArray > > &batchesWithinWaves, /* wave, batch, links in batch */ - btAlignedObjectArray< btAlignedObjectArray< int > > &verticesForWavefronts /* wavefront, vertex */ - ) -{ - - - // Attempt generation of larger batches of links. - btAlignedObjectArray< bool > processedLink; - processedLink.resize( linkData.getNumLinks() ); - btAlignedObjectArray< int > listOfLinksPerVertex; - int maxLinksPerVertex = 0; - - // Count num vertices - int numVertices = 0; - for( int linkIndex = 0; linkIndex < linkData.getNumLinks(); ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair nodes( linkData.getVertexPair(linkIndex) ); - numVertices = btMax( numVertices, nodes.vertex0 + 1 ); - numVertices = btMax( numVertices, nodes.vertex1 + 1 ); - } - - // Need list of links per vertex - // Compute valence of each vertex - btAlignedObjectArray numLinksPerVertex; - numLinksPerVertex.resize(0); - numLinksPerVertex.resize( numVertices, 0 ); - - generateLinksPerVertex( numVertices, linkData, listOfLinksPerVertex, numLinksPerVertex, maxLinksPerVertex ); - - - // At this point we know what links we have for each vertex so we can start batching - - // We want a vertex to start with, let's go with 0 - int currentVertex = 0; - int linksProcessed = 0; - - btAlignedObjectArray verticesToProcess; - - while( linksProcessed < linkData.getNumLinks() ) - { - // Next wavefront - int nextWavefront = linksForWavefronts.size(); - linksForWavefronts.resize( nextWavefront + 1 ); - btAlignedObjectArray &linksForWavefront(linksForWavefronts[nextWavefront]); - verticesForWavefronts.resize( nextWavefront + 1 ); - btAlignedObjectArray &vertexSet( verticesForWavefronts[nextWavefront] ); - - linksForWavefront.resize(0); - - // Loop to find enough links to fill the wavefront - // Stopping if we either run out of links, or fill it - while( linksProcessed < linkData.getNumLinks() && linksForWavefront.size() < maxLinksPerWavefront ) - { - // Go through the links for the current vertex - for( int link = 0; link < numLinksPerVertex[currentVertex] && linksForWavefront.size() < maxLinksPerWavefront; ++link ) - { - int linkAddress = currentVertex * maxLinksPerVertex + link; - int linkIndex = listOfLinksPerVertex[linkAddress]; - - // If we have not already processed this link, add it to the wavefront - // Claim it as another processed link - // Add the vertex at the far end to the list of vertices to process. - if( !processedLink[linkIndex] ) - { - linksForWavefront.push_back( linkIndex ); - linksProcessed++; - processedLink[linkIndex] = true; - int v0 = linkData.getVertexPair(linkIndex).vertex0; - int v1 = linkData.getVertexPair(linkIndex).vertex1; - if( v0 == currentVertex ) - verticesToProcess.push_back( v1 ); - else - verticesToProcess.push_back( v0 ); - } - } - if( verticesToProcess.size() > 0 ) - { - // Get the element on the front of the queue and remove it - currentVertex = verticesToProcess[0]; - removeFromVector( verticesToProcess, 0 ); - } else { - // If we've not yet processed all the links, find the first unprocessed one - // and select one of its vertices as the current vertex - if( linksProcessed < linkData.getNumLinks() ) - { - int searchLink = 0; - while( processedLink[searchLink] ) - searchLink++; - currentVertex = linkData.getVertexPair(searchLink).vertex0; - } - } - } - - // We have either finished or filled a wavefront - for( int link = 0; link < linksForWavefront.size(); ++link ) - { - int v0 = linkData.getVertexPair( linksForWavefront[link] ).vertex0; - int v1 = linkData.getVertexPair( linksForWavefront[link] ).vertex1; - insertUniqueAndOrderedIntoVector( vertexSet, v0 ); - insertUniqueAndOrderedIntoVector( vertexSet, v1 ); - } - // Iterate over links mapped to the wave and batch those - // We can run a batch on each cycle trivially - - batchesWithinWaves.resize( batchesWithinWaves.size() + 1 ); - btAlignedObjectArray < btAlignedObjectArray > &batchesWithinWave( batchesWithinWaves[batchesWithinWaves.size()-1] ); - - - for( int link = 0; link < linksForWavefront.size(); ++link ) - { - int linkIndex = linksForWavefront[link]; - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( linkIndex ); - - int batch = 0; - bool placed = false; - while( batch < batchesWithinWave.size() && !placed ) - { - bool foundSharedVertex = false; - if( batchesWithinWave[batch].size() >= wavefrontSize ) - { - // If we have already filled this batch, move on to another - foundSharedVertex = true; - } else { - for( int link2 = 0; link2 < batchesWithinWave[batch].size(); ++link2 ) - { - btSoftBodyLinkData::LinkNodePair vertices2 = linkData.getVertexPair( (batchesWithinWave[batch])[link2] ); - - if( vertices.vertex0 == vertices2.vertex0 || - vertices.vertex1 == vertices2.vertex0 || - vertices.vertex0 == vertices2.vertex1 || - vertices.vertex1 == vertices2.vertex1 ) - { - foundSharedVertex = true; - break; - } - } - } - if( !foundSharedVertex ) - { - batchesWithinWave[batch].push_back( linkIndex ); - placed = true; - } else { - ++batch; - } - } - if( batch == batchesWithinWave.size() && !placed ) - { - batchesWithinWave.resize( batch + 1 ); - batchesWithinWave[batch].push_back( linkIndex ); - } - } - - } - -} - -void btSoftBodyLinkDataDX11SIMDAware::generateBatches() -{ - btAlignedObjectArray < btAlignedObjectArray > linksForWavefronts; - btAlignedObjectArray < btAlignedObjectArray > wavefrontBatches; - btAlignedObjectArray< btAlignedObjectArray < btAlignedObjectArray > > batchesWithinWaves; - btAlignedObjectArray< btAlignedObjectArray< int > > verticesForWavefronts; // wavefronts, vertices in wavefront as an ordered set - - // Group the links into wavefronts - computeBatchingIntoWavefronts( *this, m_wavefrontSize, m_linksPerWorkItem, m_maxLinksPerWavefront, linksForWavefronts, batchesWithinWaves, verticesForWavefronts ); - - - // Batch the wavefronts - generateBatchesOfWavefronts( linksForWavefronts, *this, m_maxVertex, wavefrontBatches ); - - m_numWavefronts = linksForWavefronts.size(); - - // At this point we have a description of which links we need to process in each wavefront - - // First correctly fill the batch ranges vector - int numBatches = wavefrontBatches.size(); - m_wavefrontBatchStartLengths.resize(0); - int prefixSum = 0; - for( int batchIndex = 0; batchIndex < numBatches; ++batchIndex ) - { - int wavesInBatch = wavefrontBatches[batchIndex].size(); - int nextPrefixSum = prefixSum + wavesInBatch; - m_wavefrontBatchStartLengths.push_back( BatchPair( prefixSum, nextPrefixSum - prefixSum ) ); - - prefixSum += wavesInBatch; - } - - // Also find max number of batches within a wave - m_maxBatchesWithinWave = 0; - m_maxVerticesWithinWave = 0; - m_numBatchesAndVerticesWithinWaves.resize( m_numWavefronts ); - for( int waveIndex = 0; waveIndex < m_numWavefronts; ++waveIndex ) - { - // See if the number of batches in this wave is greater than the current maxium - int batchesInCurrentWave = batchesWithinWaves[waveIndex].size(); - int verticesInCurrentWave = verticesForWavefronts[waveIndex].size(); - m_maxBatchesWithinWave = btMax( batchesInCurrentWave, m_maxBatchesWithinWave ); - m_maxVerticesWithinWave = btMax( verticesInCurrentWave, m_maxVerticesWithinWave ); - } - - // Add padding values both for alignment and as dudd addresses within LDS to compute junk rather than branch around - m_maxVerticesWithinWave = 16*((m_maxVerticesWithinWave/16)+2); - - // Now we know the maximum number of vertices per-wave we can resize the global vertices array - m_wavefrontVerticesGlobalAddresses.resize( m_maxVerticesWithinWave * m_numWavefronts ); - - // Grab backup copies of all the link data arrays for the sorting process - btAlignedObjectArray m_links_Backup(m_links); - btAlignedObjectArray m_linkStrength_Backup(m_linkStrength); - btAlignedObjectArray m_linksMassLSC_Backup(m_linksMassLSC); - btAlignedObjectArray m_linksRestLengthSquared_Backup(m_linksRestLengthSquared); - //btAlignedObjectArray m_linksCLength_Backup(m_linksCLength); - //btAlignedObjectArray m_linksLengthRatio_Backup(m_linksLengthRatio); - btAlignedObjectArray m_linksRestLength_Backup(m_linksRestLength); - btAlignedObjectArray m_linksMaterialLinearStiffnessCoefficient_Backup(m_linksMaterialLinearStiffnessCoefficient); - - // Resize to a wavefront sized batch per batch per wave so we get perfectly coherent memory accesses. - m_links.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linkVerticesLocalAddresses.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linkStrength.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksMassLSC.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksRestLengthSquared.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksRestLength.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksMaterialLinearStiffnessCoefficient.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - - // Then re-order links into wavefront blocks - - // Total number of wavefronts moved. This will decide the ordering of sorted wavefronts. - int wavefrontCount = 0; - - // Iterate over batches of wavefronts, then wavefronts in the batch - for( int batchIndex = 0; batchIndex < numBatches; ++batchIndex ) - { - btAlignedObjectArray &batch( wavefrontBatches[batchIndex] ); - int wavefrontsInBatch = batch.size(); - - - for( int wavefrontIndex = 0; wavefrontIndex < wavefrontsInBatch; ++wavefrontIndex ) - { - - int originalWavefrontIndex = batch[wavefrontIndex]; - btAlignedObjectArray< int > &wavefrontVertices( verticesForWavefronts[originalWavefrontIndex] ); - int verticesUsedByWavefront = wavefrontVertices.size(); - - // Copy the set of vertices into the correctly structured array for use on the device - // Fill the non-vertices with -1s - // so we can mask out those reads - for( int vertex = 0; vertex < verticesUsedByWavefront; ++vertex ) - { - m_wavefrontVerticesGlobalAddresses[m_maxVerticesWithinWave * wavefrontCount + vertex] = wavefrontVertices[vertex]; - } - for( int vertex = verticesUsedByWavefront; vertex < m_maxVerticesWithinWave; ++vertex ) - { - m_wavefrontVerticesGlobalAddresses[m_maxVerticesWithinWave * wavefrontCount + vertex] = -1; - } - - // Obtain the set of batches within the current wavefront - btAlignedObjectArray < btAlignedObjectArray > &batchesWithinWavefront( batchesWithinWaves[originalWavefrontIndex] ); - // Set the size of the batches for use in the solver, correctly ordered - NumBatchesVerticesPair batchesAndVertices; - batchesAndVertices.numBatches = batchesWithinWavefront.size(); - batchesAndVertices.numVertices = verticesUsedByWavefront; - m_numBatchesAndVerticesWithinWaves[wavefrontCount] = batchesAndVertices; - - - // Now iterate over batches within the wavefront to structure the links correctly - for( int wavefrontBatch = 0; wavefrontBatch < batchesWithinWavefront.size(); ++wavefrontBatch ) - { - btAlignedObjectArray &linksInBatch( batchesWithinWavefront[wavefrontBatch] ); - int wavefrontBatchSize = linksInBatch.size(); - - int batchAddressInTarget = m_maxBatchesWithinWave * m_wavefrontSize * wavefrontCount + m_wavefrontSize * wavefrontBatch; - - for( int linkIndex = 0; linkIndex < wavefrontBatchSize; ++linkIndex ) - { - int originalLinkAddress = linksInBatch[linkIndex]; - // Reorder simple arrays trivially - m_links[batchAddressInTarget + linkIndex] = m_links_Backup[originalLinkAddress]; - m_linkStrength[batchAddressInTarget + linkIndex] = m_linkStrength_Backup[originalLinkAddress]; - m_linksMassLSC[batchAddressInTarget + linkIndex] = m_linksMassLSC_Backup[originalLinkAddress]; - m_linksRestLengthSquared[batchAddressInTarget + linkIndex] = m_linksRestLengthSquared_Backup[originalLinkAddress]; - m_linksRestLength[batchAddressInTarget + linkIndex] = m_linksRestLength_Backup[originalLinkAddress]; - m_linksMaterialLinearStiffnessCoefficient[batchAddressInTarget + linkIndex] = m_linksMaterialLinearStiffnessCoefficient_Backup[originalLinkAddress]; - - // The local address is more complicated. We need to work out where a given vertex will end up - // by searching the set of vertices for this link and using the index as the local address - btSoftBodyLinkData::LinkNodePair localPair; - btSoftBodyLinkData::LinkNodePair globalPair = m_links[batchAddressInTarget + linkIndex]; - localPair.vertex0 = wavefrontVertices.findLinearSearch( globalPair.vertex0 ); - localPair.vertex1 = wavefrontVertices.findLinearSearch( globalPair.vertex1 ); - m_linkVerticesLocalAddresses[batchAddressInTarget + linkIndex] = localPair; - } - for( int linkIndex = wavefrontBatchSize; linkIndex < m_wavefrontSize; ++linkIndex ) - { - // Put 0s into these arrays for padding for cleanliness - m_links[batchAddressInTarget + linkIndex] = btSoftBodyLinkData::LinkNodePair(0, 0); - m_linkStrength[batchAddressInTarget + linkIndex] = 0.f; - m_linksMassLSC[batchAddressInTarget + linkIndex] = 0.f; - m_linksRestLengthSquared[batchAddressInTarget + linkIndex] = 0.f; - m_linksRestLength[batchAddressInTarget + linkIndex] = 0.f; - m_linksMaterialLinearStiffnessCoefficient[batchAddressInTarget + linkIndex] = 0.f; - - - // For local addresses of junk data choose a set of addresses just above the range of valid ones - // and cycling tyhrough % 16 so that we don't have bank conficts between all dud addresses - // The valid addresses will do scatter and gather in the valid range, the junk ones should happily work - // off the end of that range so we need no control - btSoftBodyLinkData::LinkNodePair localPair; - localPair.vertex0 = verticesUsedByWavefront + (linkIndex % 16); - localPair.vertex1 = verticesUsedByWavefront + (linkIndex % 16); - m_linkVerticesLocalAddresses[batchAddressInTarget + linkIndex] = localPair; - } - - } - - - wavefrontCount++; - } - - - } - -} // void btSoftBodyLinkDataDX11SIMDAware::generateBatches() diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.h deleted file mode 100644 index 348819738..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "vectormath/vmInclude.h" -#include "btSoftBodySolver_DX11.h" -#include "btSoftBodySolverVertexBuffer_DX11.h" -#include "btSoftBodySolverLinkData_DX11SIMDAware.h" -#include "btSoftBodySolverVertexData_DX11.h" -#include "btSoftBodySolverTriangleData_DX11.h" - - -#ifndef BT_SOFT_BODY_DX11_SOLVER_SIMDAWARE_H -#define BT_SOFT_BODY_DX11_SOLVER_SIMDAWARE_H - -class btDX11SIMDAwareSoftBodySolver : public btDX11SoftBodySolver -{ -protected: - struct SolvePositionsFromLinksKernelCB - { - int startWave; - int numWaves; - float kst; - float ti; - }; - - - /** Link data for all cloths. Note that this will be sorted batch-wise for efficient computation and m_linkAddresses will maintain the addressing. */ - btSoftBodyLinkDataDX11SIMDAware m_linkData; - - /** Variable to define whether we need to update solver constants on the next iteration */ - bool m_updateSolverConstants; - - - virtual bool buildShaders(); - - void updateConstants( float timeStep ); - - - ////////////////////////////////////// - // Kernel dispatches - - - void solveLinksForPosition( int startLink, int numLinks, float kst, float ti ); - - // End kernel dispatches - ///////////////////////////////////// - - - -public: - btDX11SIMDAwareSoftBodySolver(ID3D11Device * dx11Device, ID3D11DeviceContext* dx11Context, DXFunctions::CompileFromMemoryFunc dx11CompileFromMemory = &D3DX11CompileFromMemory); - - virtual ~btDX11SIMDAwareSoftBodySolver(); - - virtual btSoftBodyLinkData &getLinkData(); - - virtual void optimize( btAlignedObjectArray< btSoftBody * > &softBodies , bool forceUpdate=false); - - virtual void solveConstraints( float solverdt ); - - virtual SolverTypes getSolverType() const - { - return DX_SIMD_SOLVER; - } - -}; - -#endif // #ifndef BT_SOFT_BODY_DX11_SOLVER_SIMDAWARE_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/premake4.lua b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/premake4.lua deleted file mode 100644 index 4625306dc..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/premake4.lua +++ /dev/null @@ -1,23 +0,0 @@ - -hasDX11 = findDirectX11() - -if (hasDX11) then - - project "BulletSoftBodyDX11Solvers" - - initDirectX11() - - kind "StaticLib" - - targetdir "../../../../lib" - - includedirs { - ".", - "../../.." - } - files { - "**.cpp", - "**.h" - } - -end diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt deleted file mode 100644 index 1fc07328e..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ - -INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src - ${AMD_OPENCL_INCLUDES} -) - -ADD_DEFINITIONS(-DUSE_AMD_OPENCL) -ADD_DEFINITIONS(-DCL_PLATFORM_AMD) - - - -SET(BulletSoftBodyOpenCLSolvers_SRCS - ../btSoftBodySolver_OpenCL.cpp - ../btSoftBodySolver_OpenCLSIMDAware.cpp - ../btSoftBodySolverOutputCLtoGL.cpp -) - -SET(BulletSoftBodyOpenCLSolvers_HDRS - ../btSoftBodySolver_OpenCL.h - ../btSoftBodySolver_OpenCLSIMDAware.h - ../../Shared/btSoftBodySolverData.h - ../btSoftBodySolverVertexData_OpenCL.h - ../btSoftBodySolverTriangleData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCLSIMDAware.h - ../btSoftBodySolverBuffer_OpenCL.h - ../btSoftBodySolverVertexBuffer_OpenGL.h - ../btSoftBodySolverOutputCLtoGL.h -) - - - - -ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_AMD - ${BulletSoftBodyOpenCLSolvers_SRCS} - ${BulletSoftBodyOpenCLSolvers_HDRS} -) - -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_AMD PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_AMD PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_AMD BulletSoftBody) -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_AMD DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_AMD - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -#headers are already installed by BulletMultiThreaded library - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_AMD PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_AMD PROPERTIES PUBLIC_HEADER "${BulletSoftBodyOpenCLSolvers_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/premake4.lua b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/premake4.lua deleted file mode 100644 index 8c663a8cb..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/premake4.lua +++ /dev/null @@ -1,27 +0,0 @@ - -hasCL = findOpenCL_AMD() - -if (hasCL) then - - project "BulletSoftBodySolvers_OpenCL_AMD" - - defines { "USE_AMD_OPENCL","CL_PLATFORM_AMD"} - - initOpenCL_AMD() - - kind "StaticLib" - - targetdir "../../../../../lib" - - includedirs { - ".", - "../../../..", - "../../../../../Glut" - } - files { - "../btSoftBodySolver_OpenCL.cpp", - "../btSoftBodySolver_OpenCLSIMDAware.cpp", - "../btSoftBodySolverOutputCLtoGL.cpp" - } - -end diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt deleted file mode 100644 index 6e593a998..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt +++ /dev/null @@ -1,80 +0,0 @@ - -INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src -) - - - - -SET(BulletSoftBodyOpenCLSolvers_SRCS - ../btSoftBodySolver_OpenCL.cpp - ../btSoftBodySolver_OpenCLSIMDAware.cpp -) - -SET(BulletSoftBodyOpenCLSolvers_HDRS - ../btSoftBodySolver_OpenCL.h - ../../Shared/btSoftBodySolverData.h - ../btSoftBodySolverVertexData_OpenCL.h - ../btSoftBodySolverTriangleData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCL.h - ../btSoftBodySolverBuffer_OpenCL.h -) - -# OpenCL and HLSL Shaders. -# Build rules generated to stringify these into headers -# which are needed by some of the sources -SET(BulletSoftBodyOpenCLSolvers_Shaders -# OutputToVertexArray - UpdateNormals - Integrate - UpdatePositions - UpdateNodes - SolvePositions - UpdatePositionsFromVelocities - ApplyForces - PrepareLinks - VSolveLinks -) - -foreach(f ${BulletSoftBodyOpenCLSolvers_Shaders}) - LIST(APPEND BulletSoftBodyOpenCLSolvers_OpenCLC "../OpenCLC10/${f}.cl") -endforeach(f) - - - -ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_Apple - ${BulletSoftBodyOpenCLSolvers_SRCS} - ${BulletSoftBodyOpenCLSolvers_HDRS} - ${BulletSoftBodyOpenCLSolvers_OpenCLC} -) - -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - IF (APPLE AND (BUILD_SHARED_LIBS OR FRAMEWORK) ) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES LINK_FLAGS "-framework OpenCL") - ENDIF (APPLE AND (BUILD_SHARED_LIBS OR FRAMEWORK) ) - TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Apple BulletSoftBody) -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_Apple DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_Apple - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -#headers are already installed by BulletMultiThreaded library - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES PUBLIC_HEADER "${BulletSoftBodyOpenCLSolvers_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/CMakeLists.txt deleted file mode 100644 index cf9a0be28..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ - SUBDIRS( MiniCL ) - -IF(BUILD_INTEL_OPENCL_DEMOS) - SUBDIRS(Intel) -ENDIF() - -IF(BUILD_AMD_OPENCL_DEMOS) - SUBDIRS(AMD) -ENDIF() - -IF(BUILD_NVIDIA_OPENCL_DEMOS) - SUBDIRS(NVidia) -ENDIF() - -IF(APPLE AND OPENCL_LIBRARY) - SUBDIRS(Apple) -ENDIF() diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt deleted file mode 100644 index ecca18130..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ - -INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src - ${INTEL_OPENCL_INCLUDES} -) - -ADD_DEFINITIONS(-DUSE_INTEL_OPENCL) -ADD_DEFINITIONS(-DCL_PLATFORM_INTEL) - - - -SET(BulletSoftBodyOpenCLSolvers_SRCS - ../btSoftBodySolver_OpenCL.cpp - ../btSoftBodySolver_OpenCLSIMDAware.cpp - ../btSoftBodySolverOutputCLtoGL.cpp -) - -SET(BulletSoftBodyOpenCLSolvers_HDRS - ../btSoftBodySolver_OpenCL.h - ../btSoftBodySolver_OpenCLSIMDAware.h - ../../Shared/btSoftBodySolverData.h - ../btSoftBodySolverVertexData_OpenCL.h - ../btSoftBodySolverTriangleData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCLSIMDAware.h - ../btSoftBodySolverBuffer_OpenCL.h - ../btSoftBodySolverVertexBuffer_OpenGL.h - ../btSoftBodySolverOutputCLtoGL.h -) - -# OpenCL and HLSL Shaders. -# Build rules generated to stringify these into headers -# which are needed by some of the sources -SET(BulletSoftBodyOpenCLSolvers_Shaders -# OutputToVertexArray - UpdateNormals - Integrate - UpdatePositions - UpdateNodes - SolvePositions - UpdatePositionsFromVelocities - ApplyForces - PrepareLinks - VSolveLinks -) - -foreach(f ${BulletSoftBodyOpenCLSolvers_Shaders}) - LIST(APPEND BulletSoftBodyOpenCLSolvers_OpenCLC "../OpenCLC10/${f}.cl") -endforeach(f) - - - -ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_Intel - ${BulletSoftBodyOpenCLSolvers_SRCS} - ${BulletSoftBodyOpenCLSolvers_HDRS} - ${BulletSoftBodyOpenCLSolvers_OpenCLC} -) - -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Intel PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Intel PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Intel BulletSoftBody) -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_Intel DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_Intel - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -#headers are already installed by BulletMultiThreaded library - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Intel PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Intel PROPERTIES PUBLIC_HEADER "${BulletSoftBodyOpenCLSolvers_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/premake4.lua b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/premake4.lua deleted file mode 100644 index 668886d17..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/premake4.lua +++ /dev/null @@ -1,27 +0,0 @@ - -hasCL = findOpenCL_Intel() - -if (hasCL) then - - project "BulletSoftBodySolvers_OpenCL_Intel" - - defines { "USE_INTEL_OPENCL","CL_PLATFORM_INTEL"} - - initOpenCL_Intel() - - kind "StaticLib" - - targetdir "../../../../../lib" - - includedirs { - ".", - "../../../..", - "../../../../../Glut" - } - files { - "../btSoftBodySolver_OpenCL.cpp", - "../btSoftBodySolver_OpenCLSIMDAware.cpp", - "../btSoftBodySolverOutputCLtoGL.cpp" - } - -end diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt deleted file mode 100644 index 97deb7e46..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ - -INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/src -) - -ADD_DEFINITIONS(-DUSE_MINICL) - - - - -SET(BulletSoftBodyOpenCLSolvers_SRCS - ../btSoftBodySolver_OpenCL.cpp -) - -SET(BulletSoftBodyOpenCLSolvers_HDRS - ../btSoftBodySolver_OpenCL.h - ../../Shared/btSoftBodySolverData.h - ../btSoftBodySolverVertexData_OpenCL.h - ../btSoftBodySolverTriangleData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCL.h - ../btSoftBodySolverBuffer_OpenCL.h -) - -# OpenCL and HLSL Shaders. -# Build rules generated to stringify these into headers -# which are needed by some of the sources -SET(BulletSoftBodyOpenCLSolvers_Shaders -# OutputToVertexArray - UpdateNormals - Integrate - UpdatePositions - UpdateNodes - SolvePositions - UpdatePositionsFromVelocities - ApplyForces - PrepareLinks - VSolveLinks -) - -foreach(f ${BulletSoftBodyOpenCLSolvers_Shaders}) - LIST(APPEND BulletSoftBodyOpenCLSolvers_OpenCLC "../OpenCLC10/${f}.cl") -endforeach(f) - - - -ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_Mini - ${BulletSoftBodyOpenCLSolvers_SRCS} - ${BulletSoftBodyOpenCLSolvers_HDRS} - ${BulletSoftBodyOpenCLSolvers_OpenCLC} -) - -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Mini PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Mini PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Mini MiniCL BulletMultiThreaded BulletSoftBody) -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_Mini DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_Mini - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -#headers are already installed by BulletMultiThreaded library - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Mini PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Mini PROPERTIES PUBLIC_HEADER "${BulletSoftBodyOpenCLSolvers_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.cpp deleted file mode 100644 index dfa60e66c..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.cpp +++ /dev/null @@ -1,249 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include - -#define MSTRINGIFY(A) A -#include "../OpenCLC10/ApplyForces.cl" -#include "../OpenCLC10/Integrate.cl" -#include "../OpenCLC10/PrepareLinks.cl" -#include "../OpenCLC10/SolvePositions.cl" -#include "../OpenCLC10/UpdateNodes.cl" -#include "../OpenCLC10/UpdateNormals.cl" -#include "../OpenCLC10/UpdatePositions.cl" -#include "../OpenCLC10/UpdatePositionsFromVelocities.cl" -#include "../OpenCLC10/VSolveLinks.cl" -#include "../OpenCLC10/UpdateFixedVertexPositions.cl" -//#include "../OpenCLC10/SolveCollisionsAndUpdateVelocities.cl" - - -MINICL_REGISTER(PrepareLinksKernel) -MINICL_REGISTER(VSolveLinksKernel) -MINICL_REGISTER(UpdatePositionsFromVelocitiesKernel) -MINICL_REGISTER(SolvePositionsFromLinksKernel) -MINICL_REGISTER(updateVelocitiesFromPositionsWithVelocitiesKernel) -MINICL_REGISTER(updateVelocitiesFromPositionsWithoutVelocitiesKernel) -MINICL_REGISTER(IntegrateKernel) -MINICL_REGISTER(ApplyForcesKernel) -MINICL_REGISTER(ResetNormalsAndAreasKernel) -MINICL_REGISTER(NormalizeNormalsAndAreasKernel) -MINICL_REGISTER(UpdateSoftBodiesKernel) -MINICL_REGISTER(UpdateFixedVertexPositions) - -float mydot3a(float4 a, float4 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -} - - -typedef struct -{ - int firstObject; - int endObject; -} CollisionObjectIndices; - -typedef struct -{ - float4 shapeTransform[4]; // column major 4x4 matrix - float4 linearVelocity; - float4 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - - // Shape information - // Compressed from the union - float radius; - float halfHeight; - int upAxis; - - float margin; - float friction; - - int padding0; - -} CollisionShapeDescription; - -// From btBroadphaseProxy.h -__constant int CAPSULE_SHAPE_PROXYTYPE = 10; - -// Multiply column-major matrix against vector -float4 matrixVectorMul( float4 matrix[4], float4 vector ) -{ - float4 returnVector; - float4 row0 = float4(matrix[0].x, matrix[1].x, matrix[2].x, matrix[3].x); - float4 row1 = float4(matrix[0].y, matrix[1].y, matrix[2].y, matrix[3].y); - float4 row2 = float4(matrix[0].z, matrix[1].z, matrix[2].z, matrix[3].z); - float4 row3 = float4(matrix[0].w, matrix[1].w, matrix[2].w, matrix[3].w); - returnVector.x = dot(row0, vector); - returnVector.y = dot(row1, vector); - returnVector.z = dot(row2, vector); - returnVector.w = dot(row3, vector); - return returnVector; -} - -__kernel void -SolveCollisionsAndUpdateVelocitiesKernel( - const int numNodes, - const float isolverdt, - __global int *g_vertexClothIdentifier, - __global float4 *g_vertexPreviousPositions, - __global float * g_perClothFriction, - __global float * g_clothDampingFactor, - __global CollisionObjectIndices * g_perClothCollisionObjectIndices, - __global CollisionShapeDescription * g_collisionObjectDetails, - __global float4 * g_vertexForces, - __global float4 *g_vertexVelocities, - __global float4 *g_vertexPositions GUID_ARG) -{ - int nodeID = get_global_id(0); - float4 forceOnVertex = (float4)(0.f, 0.f, 0.f, 0.f); - - if( get_global_id(0) < numNodes ) - { - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - - // Abort if this is not a valid cloth - if( clothIdentifier < 0 ) - return; - - - float4 position (g_vertexPositions[nodeID].xyz, 1.f); - float4 previousPosition (g_vertexPreviousPositions[nodeID].xyz, 1.f); - - float clothFriction = g_perClothFriction[clothIdentifier]; - float dampingFactor = g_clothDampingFactor[clothIdentifier]; - float velocityCoefficient = (1.f - dampingFactor); - float4 difference = position - previousPosition; - float4 velocity = difference*velocityCoefficient*isolverdt; - - CollisionObjectIndices collisionObjectIndices = g_perClothCollisionObjectIndices[clothIdentifier]; - - int numObjects = collisionObjectIndices.endObject - collisionObjectIndices.firstObject; - - if( numObjects > 0 ) - { - // We have some possible collisions to deal with - for( int collision = collisionObjectIndices.firstObject; collision < collisionObjectIndices.endObject; ++collision ) - { - CollisionShapeDescription shapeDescription = g_collisionObjectDetails[collision]; - float colliderFriction = shapeDescription.friction; - - if( shapeDescription.collisionShapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Colliding with a capsule - - float capsuleHalfHeight = shapeDescription.halfHeight; - float capsuleRadius = shapeDescription.radius; - float capsuleMargin = shapeDescription.margin; - int capsuleupAxis = shapeDescription.upAxis; - - // Four columns of worldTransform matrix - float4 worldTransform[4]; - worldTransform[0] = shapeDescription.shapeTransform[0]; - worldTransform[1] = shapeDescription.shapeTransform[1]; - worldTransform[2] = shapeDescription.shapeTransform[2]; - worldTransform[3] = shapeDescription.shapeTransform[3]; - - // Correctly define capsule centerline vector - float4 c1 (0.f, 0.f, 0.f, 1.f); - float4 c2 (0.f, 0.f, 0.f, 1.f); - c1.x = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 0 ); - c1.y = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 1 ); - c1.z = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 2 ); - c2.x = -c1.x; - c2.y = -c1.y; - c2.z = -c1.z; - - - float4 worldC1 = matrixVectorMul(worldTransform, c1); - float4 worldC2 = matrixVectorMul(worldTransform, c2); - float4 segment = (worldC2 - worldC1); - - // compute distance of tangent to vertex along line segment in capsule - float distanceAlongSegment = -( mydot3a( (worldC1 - position), segment ) / mydot3a(segment, segment) ); - - float4 closestPoint = (worldC1 + (segment * distanceAlongSegment)); - float distanceFromLine = length(position - closestPoint); - float distanceFromC1 = length(worldC1 - position); - float distanceFromC2 = length(worldC2 - position); - - // Final distance from collision, point to push from, direction to push in - // for impulse force - float dist; - float4 normalVector; - if( distanceAlongSegment < 0 ) - { - dist = distanceFromC1; - normalVector = float4(normalize(position - worldC1).xyz, 0.f); - } else if( distanceAlongSegment > 1.f ) { - dist = distanceFromC2; - normalVector = float4(normalize(position - worldC2).xyz, 0.f); - } else { - dist = distanceFromLine; - normalVector = float4(normalize(position - closestPoint).xyz, 0.f); - } - - float4 colliderLinearVelocity = shapeDescription.linearVelocity; - float4 colliderAngularVelocity = shapeDescription.angularVelocity; - float4 velocityOfSurfacePoint = colliderLinearVelocity + cross(colliderAngularVelocity, position - float4(worldTransform[0].w, worldTransform[1].w, worldTransform[2].w, 0.f)); - - float minDistance = capsuleRadius + capsuleMargin; - - // In case of no collision, this is the value of velocity - velocity = (position - previousPosition) * velocityCoefficient * isolverdt; - - - // Check for a collision - if( dist < minDistance ) - { - // Project back to surface along normal - position = position + float4(normalVector*(minDistance - dist)*0.9f); - velocity = (position - previousPosition) * velocityCoefficient * isolverdt; - float4 relativeVelocity = velocity - velocityOfSurfacePoint; - - float4 p1 = normalize(cross(normalVector, segment)); - float4 p2 = normalize(cross(p1, normalVector)); - // Full friction is sum of velocities in each direction of plane - float4 frictionVector = p1*mydot3a(relativeVelocity, p1) + p2*mydot3a(relativeVelocity, p2); - - // Real friction is peak friction corrected by friction coefficients - frictionVector = frictionVector * (colliderFriction*clothFriction); - - float approachSpeed = dot(relativeVelocity, normalVector); - - if( approachSpeed <= 0.0f ) - forceOnVertex -= frictionVector; - } - } - } - } - - g_vertexVelocities[nodeID] = float4(velocity.xyz, 0.f); - - // Update external force - g_vertexForces[nodeID] = float4(forceOnVertex.xyz, 0.f); - - g_vertexPositions[nodeID] = float4(position.xyz, 0.f); - } -} - - -MINICL_REGISTER(SolveCollisionsAndUpdateVelocitiesKernel); - - - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt deleted file mode 100644 index 884a0ffea..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt +++ /dev/null @@ -1,84 +0,0 @@ - -ADD_DEFINITIONS(-DUSE_NVIDIA_OPENCL) -ADD_DEFINITIONS(-DCL_PLATFORM_NVIDIA) - -INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src - ${NVIDIA_OPENCL_INCLUDES} -) - - - -SET(BulletSoftBodyOpenCLSolvers_SRCS - ../btSoftBodySolver_OpenCL.cpp - ../btSoftBodySolver_OpenCLSIMDAware.cpp - ../btSoftBodySolverOutputCLtoGL.cpp -) - -SET(BulletSoftBodyOpenCLSolvers_HDRS - ../btSoftBodySolver_OpenCL.h - ../../Shared/btSoftBodySolverData.h - ../btSoftBodySolverVertexData_OpenCL.h - ../btSoftBodySolverTriangleData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCL.h - ../btSoftBodySolverLinkData_OpenCLSIMDAware.h - ../btSoftBodySolverBuffer_OpenCL.h - ../btSoftBodySolverVertexBuffer_OpenGL.h - ../btSoftBodySolverOutputCLtoGL.h -) - -# OpenCL and HLSL Shaders. -# Build rules generated to stringify these into headers -# which are needed by some of the sources -SET(BulletSoftBodyOpenCLSolvers_Shaders -# OutputToVertexArray - UpdateNormals - Integrate - UpdatePositions - UpdateNodes - SolvePositions - UpdatePositionsFromVelocities - ApplyForces - PrepareLinks - VSolveLinks -) - -foreach(f ${BulletSoftBodyOpenCLSolvers_Shaders}) - LIST(APPEND BulletSoftBodyOpenCLSolvers_OpenCLC "../OpenCLC10/${f}.cl") -endforeach(f) - - - -ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_NVidia - ${BulletSoftBodyOpenCLSolvers_SRCS} - ${BulletSoftBodyOpenCLSolvers_HDRS} - ${BulletSoftBodyOpenCLSolvers_OpenCLC} -) - -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_NVidia PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_NVidia PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_NVidia BulletSoftBody BulletDynamics) -ENDIF (BUILD_SHARED_LIBS) - - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_NVidia DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBodySolvers_OpenCL_NVidia - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -#headers are already installed by BulletMultiThreaded library - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_NVidia PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_NVidia PROPERTIES PUBLIC_HEADER "${BulletSoftBodyOpenCLSolvers_HDRS}") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/premake4.lua b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/premake4.lua deleted file mode 100644 index 0bab1e30f..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/premake4.lua +++ /dev/null @@ -1,27 +0,0 @@ - -hasCL = findOpenCL_NVIDIA() - -if (hasCL) then - - project "BulletSoftBodySolvers_OpenCL_NVIDIA" - - defines { "USE_NVIDIA_OPENCL","CL_PLATFORM_NVIDIA"} - - initOpenCL_NVIDIA() - - kind "StaticLib" - - targetdir "../../../../../lib" - - includedirs { - ".", - "../../../..", - "../../../../../Glut" - } - files { - "../btSoftBodySolver_OpenCL.cpp", - "../btSoftBodySolver_OpenCLSIMDAware.cpp", - "../btSoftBodySolverOutputCLtoGL.cpp" - } - -end diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/ApplyForces.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/ApplyForces.cl deleted file mode 100644 index f9bcb88ea..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/ApplyForces.cl +++ /dev/null @@ -1,102 +0,0 @@ -MSTRINGIFY( - - -float adot3(float4 a, float4 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -} - -float alength3(float4 a) -{ - a.w = 0; - return length(a); -} - -float4 anormalize3(float4 a) -{ - a.w = 0; - return normalize(a); -} - -float4 projectOnAxis( float4 v, float4 a ) -{ - return (a*adot3(v, a)); -} - -__kernel void -ApplyForcesKernel( - const uint numNodes, - const float solverdt, - const float epsilon, - __global int * g_vertexClothIdentifier, - __global float4 * g_vertexNormal, - __global float * g_vertexArea, - __global float * g_vertexInverseMass, - __global float * g_clothLiftFactor, - __global float * g_clothDragFactor, - __global float4 * g_clothWindVelocity, - __global float4 * g_clothAcceleration, - __global float * g_clothMediumDensity, - __global float4 * g_vertexForceAccumulator, - __global float4 * g_vertexVelocity GUID_ARG) -{ - unsigned int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - int clothId = g_vertexClothIdentifier[nodeID]; - float nodeIM = g_vertexInverseMass[nodeID]; - - if( nodeIM > 0.0f ) - { - float4 nodeV = g_vertexVelocity[nodeID]; - float4 normal = g_vertexNormal[nodeID]; - float area = g_vertexArea[nodeID]; - float4 nodeF = g_vertexForceAccumulator[nodeID]; - - // Read per-cloth values - float4 clothAcceleration = g_clothAcceleration[clothId]; - float4 clothWindVelocity = g_clothWindVelocity[clothId]; - float liftFactor = g_clothLiftFactor[clothId]; - float dragFactor = g_clothDragFactor[clothId]; - float mediumDensity = g_clothMediumDensity[clothId]; - - // Apply the acceleration to the cloth rather than do this via a force - nodeV += (clothAcceleration*solverdt); - - g_vertexVelocity[nodeID] = nodeV; - - // Aerodynamics - float4 rel_v = nodeV - clothWindVelocity; - float rel_v_len = alength3(rel_v); - float rel_v2 = dot(rel_v, rel_v); - - if( rel_v2 > epsilon ) - { - float4 rel_v_nrm = anormalize3(rel_v); - float4 nrm = normal; - - nrm = nrm * (dot(nrm, rel_v) < 0 ? -1.f : 1.f); - - float4 fDrag = (float4)(0.f, 0.f, 0.f, 0.f); - float4 fLift = (float4)(0.f, 0.f, 0.f, 0.f); - - float n_dot_v = dot(nrm, rel_v_nrm); - - // drag force - if ( dragFactor > 0.f ) - fDrag = 0.5f * dragFactor * mediumDensity * rel_v2 * area * n_dot_v * (-1.0f) * rel_v_nrm; - - // lift force - // Check angle of attack - // cos(10ş) = 0.98480 - if ( 0 < n_dot_v && n_dot_v < 0.98480f) - fLift = 0.5f * liftFactor * mediumDensity * rel_v_len * area * sqrt(1.0f-n_dot_v*n_dot_v) * (cross(cross(nrm, rel_v_nrm), rel_v_nrm)); - - nodeF += fDrag + fLift; - g_vertexForceAccumulator[nodeID] = nodeF; - } - } - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/ComputeBounds.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/ComputeBounds.cl deleted file mode 100644 index 2ae7148ad..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/ComputeBounds.cl +++ /dev/null @@ -1,82 +0,0 @@ -MSTRINGIFY( -#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable\n -#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable\n - -__kernel void -ComputeBoundsKernel( - const int numNodes, - const int numSoftBodies, - __global int * g_vertexClothIdentifier, - __global float4 * g_vertexPositions, - /* Unfortunately, to get the atomics below to work these arrays cannot be */ - /* uint4, though that is the layout of the data */ - /* Therefore this is little-endian-only code */ - volatile __global uint * g_clothMinBounds, - volatile __global uint * g_clothMaxBounds, - volatile __local uint * clothMinBounds, - volatile __local uint * clothMaxBounds) -{ - // Init min and max bounds arrays - if( get_local_id(0) < numSoftBodies ) - { - - clothMinBounds[get_local_id(0)*4] = UINT_MAX; - clothMinBounds[get_local_id(0)*4+1] = UINT_MAX; - clothMinBounds[get_local_id(0)*4+2] = UINT_MAX; - clothMinBounds[get_local_id(0)*4+3] = UINT_MAX; - clothMaxBounds[get_local_id(0)*4] = 0; - clothMaxBounds[get_local_id(0)*4+1] = 0; - clothMaxBounds[get_local_id(0)*4+2] = 0; - clothMaxBounds[get_local_id(0)*4+3] = 0; - - } - - barrier(CLK_LOCAL_MEM_FENCE); - - int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - if( clothIdentifier >= 0 ) - { - - float4 position = (float4)(g_vertexPositions[nodeID].xyz, 0.f); - - /* Reinterpret position as uint */ - uint4 positionUInt = (uint4)(as_uint(position.x), as_uint(position.y), as_uint(position.z), 0); - - /* Invert sign bit of positives and whole of negatives to allow comparison as unsigned ints */ - positionUInt.x ^= (1+~(positionUInt.x >> 31) | 0x80000000); - positionUInt.y ^= (1+~(positionUInt.y >> 31) | 0x80000000); - positionUInt.z ^= (1+~(positionUInt.z >> 31) | 0x80000000); - - // Min/max with the LDS values - atom_min(&(clothMinBounds[clothIdentifier*4]), positionUInt.x); - atom_min(&(clothMinBounds[clothIdentifier*4+1]), positionUInt.y); - atom_min(&(clothMinBounds[clothIdentifier*4+2]), positionUInt.z); - - atom_max(&(clothMaxBounds[clothIdentifier*4]), positionUInt.x); - atom_max(&(clothMaxBounds[clothIdentifier*4+1]), positionUInt.y); - atom_max(&(clothMaxBounds[clothIdentifier*4+2]), positionUInt.z); - } - } - - barrier(CLK_LOCAL_MEM_FENCE); - - - /* Use global atomics to update the global versions of the data */ - if( get_local_id(0) < numSoftBodies ) - { - /*atom_min(&(g_clothMinBounds[get_local_id(0)].x), clothMinBounds[get_local_id(0)].x);*/ - atom_min(&(g_clothMinBounds[get_local_id(0)*4]), clothMinBounds[get_local_id(0)*4]); - atom_min(&(g_clothMinBounds[get_local_id(0)*4+1]), clothMinBounds[get_local_id(0)*4+1]); - atom_min(&(g_clothMinBounds[get_local_id(0)*4+2]), clothMinBounds[get_local_id(0)*4+2]); - - atom_max(&(g_clothMaxBounds[get_local_id(0)*4]), clothMaxBounds[get_local_id(0)*4]); - atom_max(&(g_clothMaxBounds[get_local_id(0)*4+1]), clothMaxBounds[get_local_id(0)*4+1]); - atom_max(&(g_clothMaxBounds[get_local_id(0)*4+2]), clothMaxBounds[get_local_id(0)*4+2]); - } -} - - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/Integrate.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/Integrate.cl deleted file mode 100644 index bb2d98a53..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/Integrate.cl +++ /dev/null @@ -1,35 +0,0 @@ -MSTRINGIFY( - -// Node indices for each link - - - -__kernel void -IntegrateKernel( - const int numNodes, - const float solverdt, - __global float * g_vertexInverseMasses, - __global float4 * g_vertexPositions, - __global float4 * g_vertexVelocity, - __global float4 * g_vertexPreviousPositions, - __global float4 * g_vertexForceAccumulator GUID_ARG) -{ - int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID]; - float4 velocity = g_vertexVelocity[nodeID]; - float4 force = g_vertexForceAccumulator[nodeID]; - float inverseMass = g_vertexInverseMasses[nodeID]; - - g_vertexPreviousPositions[nodeID] = position; - velocity += force * inverseMass * solverdt; - position += velocity * solverdt; - - g_vertexForceAccumulator[nodeID] = (float4)(0.f, 0.f, 0.f, 0.0f); - g_vertexPositions[nodeID] = position; - g_vertexVelocity[nodeID] = velocity; - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/OutputToVertexArray.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/OutputToVertexArray.cl deleted file mode 100644 index 989137777..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/OutputToVertexArray.cl +++ /dev/null @@ -1,46 +0,0 @@ -MSTRINGIFY( - -__kernel void -OutputToVertexArrayWithNormalsKernel( - const int startNode, const int numNodes, __global float *g_vertexBuffer, - const int positionOffset, const int positionStride, const __global float4* g_vertexPositions, - const int normalOffset, const int normalStride, const __global float4* g_vertexNormals ) -{ - int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID + startNode]; - float4 normal = g_vertexNormals[nodeID + startNode]; - - // Stride should account for the float->float4 conversion - int positionDestination = nodeID * positionStride + positionOffset; - g_vertexBuffer[positionDestination] = position.x; - g_vertexBuffer[positionDestination+1] = position.y; - g_vertexBuffer[positionDestination+2] = position.z; - - int normalDestination = nodeID * normalStride + normalOffset; - g_vertexBuffer[normalDestination] = normal.x; - g_vertexBuffer[normalDestination+1] = normal.y; - g_vertexBuffer[normalDestination+2] = normal.z; - } -} - -__kernel void -OutputToVertexArrayWithoutNormalsKernel( - const int startNode, const int numNodes, __global float *g_vertexBuffer, - const int positionOffset, const int positionStride, const __global float4* g_vertexPositions ) -{ - int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID + startNode]; - - // Stride should account for the float->float4 conversion - int positionDestination = nodeID * positionStride + positionOffset; - g_vertexBuffer[positionDestination] = position.x; - g_vertexBuffer[positionDestination+1] = position.y; - g_vertexBuffer[positionDestination+2] = position.z; - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/PrepareLinks.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/PrepareLinks.cl deleted file mode 100644 index 542a11ec2..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/PrepareLinks.cl +++ /dev/null @@ -1,38 +0,0 @@ -MSTRINGIFY( - - - -__kernel void -PrepareLinksKernel( - const int numLinks, - __global int2 * g_linksVertexIndices, - __global float * g_linksMassLSC, - __global float4 * g_nodesPreviousPosition, - __global float * g_linksLengthRatio, - __global float4 * g_linksCurrentLength GUID_ARG) -{ - int linkID = get_global_id(0); - if( linkID < numLinks ) - { - - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - - float4 nodePreviousPosition0 = g_nodesPreviousPosition[node0]; - float4 nodePreviousPosition1 = g_nodesPreviousPosition[node1]; - - float massLSC = g_linksMassLSC[linkID]; - - float4 linkCurrentLength = nodePreviousPosition1 - nodePreviousPosition0; - linkCurrentLength.w = 0.f; - - float linkLengthRatio = dot(linkCurrentLength, linkCurrentLength)*massLSC; - linkLengthRatio = 1.0f/linkLengthRatio; - - g_linksCurrentLength[linkID] = linkCurrentLength; - g_linksLengthRatio[linkID] = linkLengthRatio; - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocities.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocities.cl deleted file mode 100644 index 92fb939de..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocities.cl +++ /dev/null @@ -1,204 +0,0 @@ -MSTRINGIFY( - - - -float mydot3a(float4 a, float4 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -} - - -typedef struct -{ - int firstObject; - int endObject; -} CollisionObjectIndices; - -typedef struct -{ - float4 shapeTransform[4]; // column major 4x4 matrix - float4 linearVelocity; - float4 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - - // Shape information - // Compressed from the union - float radius; - float halfHeight; - int upAxis; - - float margin; - float friction; - - int padding0; - -} CollisionShapeDescription; - -// From btBroadphaseProxy.h -__constant int CAPSULE_SHAPE_PROXYTYPE = 10; - -// Multiply column-major matrix against vector -float4 matrixVectorMul( float4 matrix[4], float4 vector ) -{ - float4 returnVector; - float4 row0 = (float4)(matrix[0].x, matrix[1].x, matrix[2].x, matrix[3].x); - float4 row1 = (float4)(matrix[0].y, matrix[1].y, matrix[2].y, matrix[3].y); - float4 row2 = (float4)(matrix[0].z, matrix[1].z, matrix[2].z, matrix[3].z); - float4 row3 = (float4)(matrix[0].w, matrix[1].w, matrix[2].w, matrix[3].w); - returnVector.x = dot(row0, vector); - returnVector.y = dot(row1, vector); - returnVector.z = dot(row2, vector); - returnVector.w = dot(row3, vector); - return returnVector; -} - -__kernel void -SolveCollisionsAndUpdateVelocitiesKernel( - const int numNodes, - const float isolverdt, - __global int *g_vertexClothIdentifier, - __global float4 *g_vertexPreviousPositions, - __global float * g_perClothFriction, - __global float * g_clothDampingFactor, - __global CollisionObjectIndices * g_perClothCollisionObjectIndices, - __global CollisionShapeDescription * g_collisionObjectDetails, - __global float4 * g_vertexForces, - __global float4 *g_vertexVelocities, - __global float4 *g_vertexPositions GUID_ARG) -{ - int nodeID = get_global_id(0); - float4 forceOnVertex = (float4)(0.f, 0.f, 0.f, 0.f); - - if( get_global_id(0) < numNodes ) - { - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - - // Abort if this is not a valid cloth - if( clothIdentifier < 0 ) - return; - - - float4 position = (float4)(g_vertexPositions[nodeID].xyz, 1.f); - float4 previousPosition = (float4)(g_vertexPreviousPositions[nodeID].xyz, 1.f); - - float clothFriction = g_perClothFriction[clothIdentifier]; - float dampingFactor = g_clothDampingFactor[clothIdentifier]; - float velocityCoefficient = (1.f - dampingFactor); - float4 difference = position - previousPosition; - float4 velocity = difference*velocityCoefficient*isolverdt; - - CollisionObjectIndices collisionObjectIndices = g_perClothCollisionObjectIndices[clothIdentifier]; - - int numObjects = collisionObjectIndices.endObject - collisionObjectIndices.firstObject; - - if( numObjects > 0 ) - { - // We have some possible collisions to deal with - for( int collision = collisionObjectIndices.firstObject; collision < collisionObjectIndices.endObject; ++collision ) - { - CollisionShapeDescription shapeDescription = g_collisionObjectDetails[collision]; - float colliderFriction = shapeDescription.friction; - - if( shapeDescription.collisionShapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Colliding with a capsule - - float capsuleHalfHeight = shapeDescription.halfHeight; - float capsuleRadius = shapeDescription.radius; - float capsuleMargin = shapeDescription.margin; - int capsuleupAxis = shapeDescription.upAxis; - - // Four columns of worldTransform matrix - float4 worldTransform[4]; - worldTransform[0] = shapeDescription.shapeTransform[0]; - worldTransform[1] = shapeDescription.shapeTransform[1]; - worldTransform[2] = shapeDescription.shapeTransform[2]; - worldTransform[3] = shapeDescription.shapeTransform[3]; - - // Correctly define capsule centerline vector - float4 c1 = (float4)(0.f, 0.f, 0.f, 1.f); - float4 c2 = (float4)(0.f, 0.f, 0.f, 1.f); - c1.x = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 0 ); - c1.y = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 1 ); - c1.z = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 2 ); - c2.x = -c1.x; - c2.y = -c1.y; - c2.z = -c1.z; - - - float4 worldC1 = matrixVectorMul(worldTransform, c1); - float4 worldC2 = matrixVectorMul(worldTransform, c2); - float4 segment = (worldC2 - worldC1); - - // compute distance of tangent to vertex along line segment in capsule - float distanceAlongSegment = -( mydot3a( (worldC1 - position), segment ) / mydot3a(segment, segment) ); - - float4 closestPoint = (worldC1 + (float4)(segment * distanceAlongSegment)); - float distanceFromLine = length(position - closestPoint); - float distanceFromC1 = length(worldC1 - position); - float distanceFromC2 = length(worldC2 - position); - - // Final distance from collision, point to push from, direction to push in - // for impulse force - float dist; - float4 normalVector; - if( distanceAlongSegment < 0 ) - { - dist = distanceFromC1; - normalVector = (float4)(normalize(position - worldC1).xyz, 0.f); - } else if( distanceAlongSegment > 1.f ) { - dist = distanceFromC2; - normalVector = (float4)(normalize(position - worldC2).xyz, 0.f); - } else { - dist = distanceFromLine; - normalVector = (float4)(normalize(position - closestPoint).xyz, 0.f); - } - - float4 colliderLinearVelocity = shapeDescription.linearVelocity; - float4 colliderAngularVelocity = shapeDescription.angularVelocity; - float4 velocityOfSurfacePoint = colliderLinearVelocity + cross(colliderAngularVelocity, position - (float4)(worldTransform[0].w, worldTransform[1].w, worldTransform[2].w, 0.f)); - - float minDistance = capsuleRadius + capsuleMargin; - - // In case of no collision, this is the value of velocity - velocity = (position - previousPosition) * velocityCoefficient * isolverdt; - - - // Check for a collision - if( dist < minDistance ) - { - // Project back to surface along normal - position = position + (float4)((minDistance - dist)*normalVector*0.9f); - velocity = (position - previousPosition) * velocityCoefficient * isolverdt; - float4 relativeVelocity = velocity - velocityOfSurfacePoint; - - float4 p1 = normalize(cross(normalVector, segment)); - float4 p2 = normalize(cross(p1, normalVector)); - // Full friction is sum of velocities in each direction of plane - float4 frictionVector = p1*mydot3a(relativeVelocity, p1) + p2*mydot3a(relativeVelocity, p2); - - // Real friction is peak friction corrected by friction coefficients - frictionVector = frictionVector * (colliderFriction*clothFriction); - - float approachSpeed = dot(relativeVelocity, normalVector); - - if( approachSpeed <= 0.0f ) - forceOnVertex -= frictionVector; - } - } - } - } - - g_vertexVelocities[nodeID] = (float4)(velocity.xyz, 0.f); - - // Update external force - g_vertexForces[nodeID] = (float4)(forceOnVertex.xyz, 0.f); - - g_vertexPositions[nodeID] = (float4)(position.xyz, 0.f); - } -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocitiesSIMDBatched.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocitiesSIMDBatched.cl deleted file mode 100644 index 8720b72e0..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocitiesSIMDBatched.cl +++ /dev/null @@ -1,242 +0,0 @@ -MSTRINGIFY( - -//#pragma OPENCL EXTENSION cl_amd_printf:enable\n - -float mydot3a(float4 a, float4 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -} - -float mylength3(float4 a) -{ - a.w = 0; - return length(a); -} - -float4 mynormalize3(float4 a) -{ - a.w = 0; - return normalize(a); -} - -typedef struct -{ - int firstObject; - int endObject; -} CollisionObjectIndices; - -typedef struct -{ - float4 shapeTransform[4]; // column major 4x4 matrix - float4 linearVelocity; - float4 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - - // Shape information - // Compressed from the union - float radius; - float halfHeight; - int upAxis; - - float margin; - float friction; - - int padding0; - -} CollisionShapeDescription; - -// From btBroadphaseProxy.h -__constant int CAPSULE_SHAPE_PROXYTYPE = 10; - -// Multiply column-major matrix against vector -float4 matrixVectorMul( float4 matrix[4], float4 vector ) -{ - float4 returnVector; - float4 row0 = (float4)(matrix[0].x, matrix[1].x, matrix[2].x, matrix[3].x); - float4 row1 = (float4)(matrix[0].y, matrix[1].y, matrix[2].y, matrix[3].y); - float4 row2 = (float4)(matrix[0].z, matrix[1].z, matrix[2].z, matrix[3].z); - float4 row3 = (float4)(matrix[0].w, matrix[1].w, matrix[2].w, matrix[3].w); - returnVector.x = dot(row0, vector); - returnVector.y = dot(row1, vector); - returnVector.z = dot(row2, vector); - returnVector.w = dot(row3, vector); - return returnVector; -} - -__kernel void -SolveCollisionsAndUpdateVelocitiesKernel( - const int numNodes, - const float isolverdt, - __global int *g_vertexClothIdentifier, - __global float4 *g_vertexPreviousPositions, - __global float * g_perClothFriction, - __global float * g_clothDampingFactor, - __global CollisionObjectIndices * g_perClothCollisionObjectIndices, - __global CollisionShapeDescription * g_collisionObjectDetails, - __global float4 * g_vertexForces, - __global float4 *g_vertexVelocities, - __global float4 *g_vertexPositions, - __local CollisionShapeDescription *localCollisionShapes, - __global float * g_vertexInverseMasses) -{ - int nodeID = get_global_id(0); - float4 forceOnVertex = (float4)(0.f, 0.f, 0.f, 0.f); - - int clothIdentifier = g_vertexClothIdentifier[nodeID]; - - // Abort if this is not a valid cloth - if( clothIdentifier < 0 ) - return; - - - float4 position = (float4)(g_vertexPositions[nodeID].xyz, 0.f); - float4 previousPosition = (float4)(g_vertexPreviousPositions[nodeID].xyz, 0.f); - - float clothFriction = g_perClothFriction[clothIdentifier]; - float dampingFactor = g_clothDampingFactor[clothIdentifier]; - float velocityCoefficient = (1.f - dampingFactor); - float4 difference = position - previousPosition; - float4 velocity = difference*velocityCoefficient*isolverdt; - float inverseMass = g_vertexInverseMasses[nodeID]; - - CollisionObjectIndices collisionObjectIndices = g_perClothCollisionObjectIndices[clothIdentifier]; - - int numObjects = collisionObjectIndices.endObject - collisionObjectIndices.firstObject; - - if( numObjects > 0 ) - { - // We have some possible collisions to deal with - - // First load all of the collision objects into LDS - int numObjects = collisionObjectIndices.endObject - collisionObjectIndices.firstObject; - if( get_local_id(0) < numObjects ) - { - localCollisionShapes[get_local_id(0)] = g_collisionObjectDetails[ collisionObjectIndices.firstObject + get_local_id(0) ]; - } - } - - // Safe as the vertices are padded so that not more than one soft body is in a group - barrier(CLK_LOCAL_MEM_FENCE); - - // Annoyingly, even though I know the flow control is not varying, the compiler will not let me skip this - if( numObjects > 0 ) - { - - - // We have some possible collisions to deal with - for( int collision = 0; collision < numObjects; ++collision ) - { - CollisionShapeDescription shapeDescription = localCollisionShapes[collision]; - float colliderFriction = localCollisionShapes[collision].friction; - - if( localCollisionShapes[collision].collisionShapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Colliding with a capsule - - float capsuleHalfHeight = localCollisionShapes[collision].halfHeight; - float capsuleRadius = localCollisionShapes[collision].radius; - float capsuleMargin = localCollisionShapes[collision].margin; - int capsuleupAxis = localCollisionShapes[collision].upAxis; - - if ( capsuleHalfHeight <= 0 ) - capsuleHalfHeight = 0.0001f; - float4 worldTransform[4]; - worldTransform[0] = localCollisionShapes[collision].shapeTransform[0]; - worldTransform[1] = localCollisionShapes[collision].shapeTransform[1]; - worldTransform[2] = localCollisionShapes[collision].shapeTransform[2]; - worldTransform[3] = localCollisionShapes[collision].shapeTransform[3]; - - // Correctly define capsule centerline vector - float4 c1 = (float4)(0.f, 0.f, 0.f, 1.f); - float4 c2 = (float4)(0.f, 0.f, 0.f, 1.f); - c1.x = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 0 ); - c1.y = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 1 ); - c1.z = select( 0.f, -capsuleHalfHeight, capsuleupAxis == 2 ); - c2.x = -c1.x; - c2.y = -c1.y; - c2.z = -c1.z; - - float4 worldC1 = matrixVectorMul(worldTransform, c1); - float4 worldC2 = matrixVectorMul(worldTransform, c2); - float4 segment = (float4)((worldC2 - worldC1).xyz, 0.f); - - float4 segmentNormalized = mynormalize3(segment); - float distanceAlongSegment =mydot3a( (position - worldC1), segmentNormalized ); - - float4 closestPointOnSegment = (worldC1 + (float4)(segmentNormalized * distanceAlongSegment)); - float distanceFromLine = mylength3(position - closestPointOnSegment); - float distanceFromC1 = mylength3(worldC1 - position); - float distanceFromC2 = mylength3(worldC2 - position); - - // Final distance from collision, point to push from, direction to push in - // for impulse force - float dist; - float4 normalVector; - - if( distanceAlongSegment < 0 ) - { - dist = distanceFromC1; - normalVector = (float4)(normalize(position - worldC1).xyz, 0.f); - } else if( distanceAlongSegment > length(segment) ) { - dist = distanceFromC2; - normalVector = (float4)(normalize(position - worldC2).xyz, 0.f); - } else { - dist = distanceFromLine; - normalVector = (float4)(normalize(position - closestPointOnSegment).xyz, 0.f); - } - - float minDistance = capsuleRadius + capsuleMargin; - float4 closestPointOnSurface = (float4)((position + (minDistance - dist) * normalVector).xyz, 0.f); - - float4 colliderLinearVelocity = shapeDescription.linearVelocity; - float4 colliderAngularVelocity = shapeDescription.angularVelocity; - float4 velocityOfSurfacePoint = colliderLinearVelocity + cross(colliderAngularVelocity, closestPointOnSurface - (float4)(worldTransform[0].w, worldTransform[1].w, worldTransform[2].w, 0.f)); - - - // Check for a collision - if( dist < minDistance ) - { - // Project back to surface along normal - position = closestPointOnSurface; - velocity = (position - previousPosition) * velocityCoefficient * isolverdt; - float4 relativeVelocity = velocity - velocityOfSurfacePoint; - - float4 p1 = mynormalize3(cross(normalVector, segment)); - float4 p2 = mynormalize3(cross(p1, normalVector)); - - float4 tangentialVel = p1*mydot3a(relativeVelocity, p1) + p2*mydot3a(relativeVelocity, p2); - float frictionCoef = (colliderFriction * clothFriction); - if (frictionCoef>1.f) - frictionCoef = 1.f; - - //only apply friction if objects are not moving apart - float projVel = mydot3a(relativeVelocity,normalVector); - if ( projVel >= -0.001f) - { - if ( inverseMass > 0 ) - { - //float4 myforceOnVertex = -tangentialVel * frictionCoef * isolverdt * (1.0f / inverseMass); - position += (-tangentialVel * frictionCoef) / (isolverdt); - } - } - - // In case of no collision, this is the value of velocity - velocity = (position - previousPosition) * velocityCoefficient * isolverdt; - - } - } - } - } - - g_vertexVelocities[nodeID] = (float4)(velocity.xyz, 0.f); - - // Update external force - g_vertexForces[nodeID] = (float4)(forceOnVertex.xyz, 0.f); - - g_vertexPositions[nodeID] = (float4)(position.xyz, 0.f); -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolvePositions.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolvePositions.cl deleted file mode 100644 index e4a5341c6..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolvePositions.cl +++ /dev/null @@ -1,57 +0,0 @@ - - - -MSTRINGIFY( - - -float mydot3(float4 a, float4 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -} - - -__kernel void -SolvePositionsFromLinksKernel( - const int startLink, - const int numLinks, - const float kst, - const float ti, - __global int2 * g_linksVertexIndices, - __global float * g_linksMassLSC, - __global float * g_linksRestLengthSquared, - __global float * g_verticesInverseMass, - __global float4 * g_vertexPositions GUID_ARG) - -{ - int linkID = get_global_id(0) + startLink; - if( get_global_id(0) < numLinks ) - { - float massLSC = g_linksMassLSC[linkID]; - float restLengthSquared = g_linksRestLengthSquared[linkID]; - - if( massLSC > 0.0f ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - - float4 position0 = g_vertexPositions[node0]; - float4 position1 = g_vertexPositions[node1]; - - float inverseMass0 = g_verticesInverseMass[node0]; - float inverseMass1 = g_verticesInverseMass[node1]; - - float4 del = position1 - position0; - float len = mydot3(del, del); - float k = ((restLengthSquared - len)/(massLSC*(restLengthSquared+len)))*kst; - position0 = position0 - del*(k*inverseMass0); - position1 = position1 + del*(k*inverseMass1); - - g_vertexPositions[node0] = position0; - g_vertexPositions[node1] = position1; - - } - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolvePositionsSIMDBatched.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolvePositionsSIMDBatched.cl deleted file mode 100644 index e99bbf23d..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolvePositionsSIMDBatched.cl +++ /dev/null @@ -1,130 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -MSTRINGIFY( - -float mydot3(float4 a, float4 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -} - -__kernel __attribute__((reqd_work_group_size(WAVEFRONT_BLOCK_MULTIPLIER*WAVEFRONT_SIZE, 1, 1))) -void -SolvePositionsFromLinksKernel( - const int startWaveInBatch, - const int numWaves, - const float kst, - const float ti, - __global int2 *g_wavefrontBatchCountsVertexCounts, - __global int *g_vertexAddressesPerWavefront, - __global int2 * g_linksVertexIndices, - __global float * g_linksMassLSC, - __global float * g_linksRestLengthSquared, - __global float * g_verticesInverseMass, - __global float4 * g_vertexPositions, - __local int2 *wavefrontBatchCountsVertexCounts, - __local float4 *vertexPositionSharedData, - __local float *vertexInverseMassSharedData) -{ - const int laneInWavefront = (get_global_id(0) & (WAVEFRONT_SIZE-1)); - const int wavefront = startWaveInBatch + (get_global_id(0) / WAVEFRONT_SIZE); - const int firstWavefrontInBlock = startWaveInBatch + get_group_id(0) * WAVEFRONT_BLOCK_MULTIPLIER; - const int localWavefront = wavefront - firstWavefrontInBlock; - - // Mask out in case there's a stray "wavefront" at the end that's been forced in through the multiplier - if( wavefront < (startWaveInBatch + numWaves) ) - { - // Load the batch counts for the wavefronts - - int2 batchesAndVerticesWithinWavefront = g_wavefrontBatchCountsVertexCounts[wavefront]; - int batchesWithinWavefront = batchesAndVerticesWithinWavefront.x; - int verticesUsedByWave = batchesAndVerticesWithinWavefront.y; - - // Load the vertices for the wavefronts - for( int vertex = laneInWavefront; vertex < verticesUsedByWave; vertex+=WAVEFRONT_SIZE ) - { - int vertexAddress = g_vertexAddressesPerWavefront[wavefront*MAX_NUM_VERTICES_PER_WAVE + vertex]; - - vertexPositionSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex] = g_vertexPositions[vertexAddress]; - vertexInverseMassSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex] = g_verticesInverseMass[vertexAddress]; - } - - barrier(CLK_LOCAL_MEM_FENCE); - - // Loop through the batches performing the solve on each in LDS - int baseDataLocationForWave = WAVEFRONT_SIZE * wavefront * MAX_BATCHES_PER_WAVE; - - //for( int batch = 0; batch < batchesWithinWavefront; ++batch ) - - int batch = 0; - do - { - int baseDataLocation = baseDataLocationForWave + WAVEFRONT_SIZE * batch; - int locationOfValue = baseDataLocation + laneInWavefront; - - - // These loads should all be perfectly linear across the WF - int2 localVertexIndices = g_linksVertexIndices[locationOfValue]; - float massLSC = g_linksMassLSC[locationOfValue]; - float restLengthSquared = g_linksRestLengthSquared[locationOfValue]; - - // LDS vertex addresses based on logical wavefront number in block and loaded index - int vertexAddress0 = MAX_NUM_VERTICES_PER_WAVE * localWavefront + localVertexIndices.x; - int vertexAddress1 = MAX_NUM_VERTICES_PER_WAVE * localWavefront + localVertexIndices.y; - - float4 position0 = vertexPositionSharedData[vertexAddress0]; - float4 position1 = vertexPositionSharedData[vertexAddress1]; - - float inverseMass0 = vertexInverseMassSharedData[vertexAddress0]; - float inverseMass1 = vertexInverseMassSharedData[vertexAddress1]; - - float4 del = position1 - position0; - float len = mydot3(del, del); - - float k = 0; - if( massLSC > 0.0f ) - { - k = ((restLengthSquared - len)/(massLSC*(restLengthSquared+len)))*kst; - } - - position0 = position0 - del*(k*inverseMass0); - position1 = position1 + del*(k*inverseMass1); - - // Ensure compiler does not re-order memory operations - barrier(CLK_LOCAL_MEM_FENCE); - - vertexPositionSharedData[vertexAddress0] = position0; - vertexPositionSharedData[vertexAddress1] = position1; - - // Ensure compiler does not re-order memory operations - barrier(CLK_LOCAL_MEM_FENCE); - - - ++batch; - } while( batch < batchesWithinWavefront ); - - // Update the global memory vertices for the wavefronts - for( int vertex = laneInWavefront; vertex < verticesUsedByWave; vertex+=WAVEFRONT_SIZE ) - { - int vertexAddress = g_vertexAddressesPerWavefront[wavefront*MAX_NUM_VERTICES_PER_WAVE + vertex]; - - g_vertexPositions[vertexAddress] = (float4)(vertexPositionSharedData[localWavefront*MAX_NUM_VERTICES_PER_WAVE + vertex].xyz, 0.f); - } - - } - -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateConstants.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateConstants.cl deleted file mode 100644 index 1d925a31f..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateConstants.cl +++ /dev/null @@ -1,44 +0,0 @@ -MSTRINGIFY( - -/*#define float3 float4 - -float dot3(float3 a, float3 b) -{ - return a.x*b.x + a.y*b.y + a.z*b.z; -}*/ - -__kernel void -UpdateConstantsKernel( - const int numLinks, - __global int2 * g_linksVertexIndices, - __global float4 * g_vertexPositions, - __global float * g_vertexInverseMasses, - __global float * g_linksMaterialLSC, - __global float * g_linksMassLSC, - __global float * g_linksRestLengthSquared, - __global float * g_linksRestLengths) -{ - int linkID = get_global_id(0); - if( linkID < numLinks ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - float linearStiffnessCoefficient = g_linksMaterialLSC[ linkID ]; - - float3 position0 = g_vertexPositions[node0].xyz; - float3 position1 = g_vertexPositions[node1].xyz; - float inverseMass0 = g_vertexInverseMasses[node0]; - float inverseMass1 = g_vertexInverseMasses[node1]; - - float3 difference = position0 - position1; - float length2 = dot(difference, difference); - float length = sqrt(length2); - - g_linksRestLengths[linkID] = length; - g_linksMassLSC[linkID] = (inverseMass0 + inverseMass1)/linearStiffnessCoefficient; - g_linksRestLengthSquared[linkID] = length*length; - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateFixedVertexPositions.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateFixedVertexPositions.cl deleted file mode 100644 index 3b2516e7f..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateFixedVertexPositions.cl +++ /dev/null @@ -1,25 +0,0 @@ -MSTRINGIFY( - -__kernel void -UpdateFixedVertexPositions( - const uint numNodes, - __global int * g_anchorIndex, - __global float4 * g_vertexPositions, - __global float4 * g_anchorPositions GUID_ARG) -{ - unsigned int nodeID = get_global_id(0); - - if( nodeID < numNodes ) - { - int anchorIndex = g_anchorIndex[nodeID]; - float4 position = g_vertexPositions[nodeID]; - - if ( anchorIndex >= 0 ) - { - float4 anchorPosition = g_anchorPositions[anchorIndex]; - g_vertexPositions[nodeID] = anchorPosition; - } - } -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateNodes.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateNodes.cl deleted file mode 100644 index aa7c778ab..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateNodes.cl +++ /dev/null @@ -1,39 +0,0 @@ -MSTRINGIFY( - - -__kernel void -updateVelocitiesFromPositionsWithVelocitiesKernel( - int numNodes, - float isolverdt, - __global float4 * g_vertexPositions, - __global float4 * g_vertexPreviousPositions, - __global int * g_vertexClothIndices, - __global float *g_clothVelocityCorrectionCoefficients, - __global float * g_clothDampingFactor, - __global float4 * g_vertexVelocities, - __global float4 * g_vertexForces GUID_ARG) -{ - int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID]; - float4 previousPosition = g_vertexPreviousPositions[nodeID]; - float4 velocity = g_vertexVelocities[nodeID]; - int clothIndex = g_vertexClothIndices[nodeID]; - float velocityCorrectionCoefficient = g_clothVelocityCorrectionCoefficients[clothIndex]; - float dampingFactor = g_clothDampingFactor[clothIndex]; - float velocityCoefficient = (1.f - dampingFactor); - - float4 difference = position - previousPosition; - - velocity += difference*velocityCorrectionCoefficient*isolverdt; - - // Damp the velocity - velocity *= velocityCoefficient; - - g_vertexVelocities[nodeID] = velocity; - g_vertexForces[nodeID] = (float4)(0.f, 0.f, 0.f, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateNormals.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateNormals.cl deleted file mode 100644 index d277b683a..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdateNormals.cl +++ /dev/null @@ -1,102 +0,0 @@ -MSTRINGIFY( - -float length3(float4 a) -{ - a.w = 0; - return length(a); -} - -float4 normalize3(float4 a) -{ - a.w = 0; - return normalize(a); -} - -__kernel void -ResetNormalsAndAreasKernel( - const unsigned int numNodes, - __global float4 * g_vertexNormals, - __global float * g_vertexArea GUID_ARG) -{ - if( get_global_id(0) < numNodes ) - { - g_vertexNormals[get_global_id(0)] = (float4)(0.0f, 0.0f, 0.0f, 0.0f); - g_vertexArea[get_global_id(0)] = 0.0f; - } -} - - -__kernel void -UpdateSoftBodiesKernel( - const unsigned int startFace, - const unsigned int numFaces, - __global int4 * g_triangleVertexIndexSet, - __global float4 * g_vertexPositions, - __global float4 * g_vertexNormals, - __global float * g_vertexArea, - __global float4 * g_triangleNormals, - __global float * g_triangleArea GUID_ARG) -{ - int faceID = get_global_id(0) + startFace; - if( get_global_id(0) < numFaces ) - { - int4 triangleIndexSet = g_triangleVertexIndexSet[ faceID ]; - int nodeIndex0 = triangleIndexSet.x; - int nodeIndex1 = triangleIndexSet.y; - int nodeIndex2 = triangleIndexSet.z; - - float4 node0 = g_vertexPositions[nodeIndex0]; - float4 node1 = g_vertexPositions[nodeIndex1]; - float4 node2 = g_vertexPositions[nodeIndex2]; - float4 nodeNormal0 = g_vertexNormals[nodeIndex0]; - float4 nodeNormal1 = g_vertexNormals[nodeIndex1]; - float4 nodeNormal2 = g_vertexNormals[nodeIndex2]; - float vertexArea0 = g_vertexArea[nodeIndex0]; - float vertexArea1 = g_vertexArea[nodeIndex1]; - float vertexArea2 = g_vertexArea[nodeIndex2]; - - float4 vector0 = node1 - node0; - float4 vector1 = node2 - node0; - - float4 faceNormal = cross(vector0, vector1); - float triangleArea = length(faceNormal); - - nodeNormal0 = nodeNormal0 + faceNormal; - nodeNormal1 = nodeNormal1 + faceNormal; - nodeNormal2 = nodeNormal2 + faceNormal; - vertexArea0 = vertexArea0 + triangleArea; - vertexArea1 = vertexArea1 + triangleArea; - vertexArea2 = vertexArea2 + triangleArea; - - g_triangleNormals[faceID] = normalize3(faceNormal); - g_vertexNormals[nodeIndex0] = nodeNormal0; - g_vertexNormals[nodeIndex1] = nodeNormal1; - g_vertexNormals[nodeIndex2] = nodeNormal2; - g_triangleArea[faceID] = triangleArea; - g_vertexArea[nodeIndex0] = vertexArea0; - g_vertexArea[nodeIndex1] = vertexArea1; - g_vertexArea[nodeIndex2] = vertexArea2; - } -} - -__kernel void -NormalizeNormalsAndAreasKernel( - const unsigned int numNodes, - __global int * g_vertexTriangleCount, - __global float4 * g_vertexNormals, - __global float * g_vertexArea GUID_ARG) -{ - if( get_global_id(0) < numNodes ) - { - float4 normal = g_vertexNormals[get_global_id(0)]; - float area = g_vertexArea[get_global_id(0)]; - int numTriangles = g_vertexTriangleCount[get_global_id(0)]; - - float vectorLength = length3(normal); - - g_vertexNormals[get_global_id(0)] = normalize3(normal); - g_vertexArea[get_global_id(0)] = area/(float)(numTriangles); - } -} - -); diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdatePositions.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdatePositions.cl deleted file mode 100644 index a2610314a..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdatePositions.cl +++ /dev/null @@ -1,34 +0,0 @@ -MSTRINGIFY( - -__kernel void -updateVelocitiesFromPositionsWithoutVelocitiesKernel( - const int numNodes, - const float isolverdt, - __global float4 * g_vertexPositions, - __global float4 * g_vertexPreviousPositions, - __global int * g_vertexClothIndices, - __global float * g_clothDampingFactor, - __global float4 * g_vertexVelocities, - __global float4 * g_vertexForces GUID_ARG) - -{ - int nodeID = get_global_id(0); - if( nodeID < numNodes ) - { - float4 position = g_vertexPositions[nodeID]; - float4 previousPosition = g_vertexPreviousPositions[nodeID]; - float4 velocity = g_vertexVelocities[nodeID]; - int clothIndex = g_vertexClothIndices[nodeID]; - float dampingFactor = g_clothDampingFactor[clothIndex]; - float velocityCoefficient = (1.f - dampingFactor); - - float4 difference = position - previousPosition; - - velocity = difference*velocityCoefficient*isolverdt; - - g_vertexVelocities[nodeID] = velocity; - g_vertexForces[nodeID] = (float4)(0.f, 0.f, 0.f, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdatePositionsFromVelocities.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdatePositionsFromVelocities.cl deleted file mode 100644 index ec1f4878c..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/UpdatePositionsFromVelocities.cl +++ /dev/null @@ -1,28 +0,0 @@ - -MSTRINGIFY( - - - - -__kernel void -UpdatePositionsFromVelocitiesKernel( - const int numNodes, - const float solverSDT, - __global float4 * g_vertexVelocities, - __global float4 * g_vertexPreviousPositions, - __global float4 * g_vertexCurrentPosition GUID_ARG) -{ - int vertexID = get_global_id(0); - if( vertexID < numNodes ) - { - float4 previousPosition = g_vertexPreviousPositions[vertexID]; - float4 velocity = g_vertexVelocities[vertexID]; - - float4 newPosition = previousPosition + velocity*solverSDT; - - g_vertexCurrentPosition[vertexID] = newPosition; - g_vertexPreviousPositions[vertexID] = newPosition; - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/VSolveLinks.cl b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/VSolveLinks.cl deleted file mode 100644 index 19224bdaa..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/VSolveLinks.cl +++ /dev/null @@ -1,45 +0,0 @@ -MSTRINGIFY( - -__kernel void -VSolveLinksKernel( - int startLink, - int numLinks, - float kst, - __global int2 * g_linksVertexIndices, - __global float * g_linksLengthRatio, - __global float4 * g_linksCurrentLength, - __global float * g_vertexInverseMass, - __global float4 * g_vertexVelocity GUID_ARG) -{ - int linkID = get_global_id(0) + startLink; - if( get_global_id(0) < numLinks ) - { - int2 nodeIndices = g_linksVertexIndices[linkID]; - int node0 = nodeIndices.x; - int node1 = nodeIndices.y; - - float linkLengthRatio = g_linksLengthRatio[linkID]; - float3 linkCurrentLength = g_linksCurrentLength[linkID].xyz; - - float3 vertexVelocity0 = g_vertexVelocity[node0].xyz; - float3 vertexVelocity1 = g_vertexVelocity[node1].xyz; - - float vertexInverseMass0 = g_vertexInverseMass[node0]; - float vertexInverseMass1 = g_vertexInverseMass[node1]; - - float3 nodeDifference = vertexVelocity0 - vertexVelocity1; - float dotResult = dot(linkCurrentLength, nodeDifference); - float j = -dotResult*linkLengthRatio*kst; - - float3 velocityChange0 = linkCurrentLength*(j*vertexInverseMass0); - float3 velocityChange1 = linkCurrentLength*(j*vertexInverseMass1); - - vertexVelocity0 += velocityChange0; - vertexVelocity1 -= velocityChange1; - - g_vertexVelocity[node0] = (float4)(vertexVelocity0, 0.f); - g_vertexVelocity[node1] = (float4)(vertexVelocity1, 0.f); - } -} - -); \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverBuffer_OpenCL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverBuffer_OpenCL.h deleted file mode 100644 index f824f2813..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverBuffer_OpenCL.h +++ /dev/null @@ -1,209 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_BUFFER_OPENCL_H -#define BT_SOFT_BODY_SOLVER_BUFFER_OPENCL_H - -// OpenCL support - -#ifdef USE_MINICL - #include "MiniCL/cl.h" -#else //USE_MINICL - #ifdef __APPLE__ - #include - #else - #include - #endif //__APPLE__ -#endif//USE_MINICL - -#ifndef SAFE_RELEASE -#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } -#endif - -template class btOpenCLBuffer -{ -public: - - cl_command_queue m_cqCommandQue; - cl_context m_clContext; - cl_mem m_buffer; - - - - btAlignedObjectArray< ElementType > * m_CPUBuffer; - - int m_gpuSize; - bool m_onGPU; - bool m_readOnlyOnGPU; - bool m_allocated; - - - bool createBuffer( cl_mem* preexistingBuffer = 0) - { - - cl_int err; - - - if( preexistingBuffer ) - { - m_buffer = *preexistingBuffer; - } - else { - - cl_mem_flags flags= m_readOnlyOnGPU ? CL_MEM_READ_ONLY : CL_MEM_READ_WRITE; - - size_t size = m_CPUBuffer->size() * sizeof(ElementType); - // At a minimum the buffer must exist - if( size == 0 ) - size = sizeof(ElementType); - m_buffer = clCreateBuffer(m_clContext, flags, size, 0, &err); - if( err != CL_SUCCESS ) - { - btAssert( "Buffer::Buffer(m_buffer)"); - } - } - - m_gpuSize = m_CPUBuffer->size(); - - return true; - } - -public: - btOpenCLBuffer( cl_command_queue commandQue,cl_context ctx, btAlignedObjectArray< ElementType >* CPUBuffer, bool readOnly) - :m_cqCommandQue(commandQue), - m_clContext(ctx), - m_buffer(0), - m_CPUBuffer(CPUBuffer), - m_gpuSize(0), - m_onGPU(false), - m_readOnlyOnGPU(readOnly), - m_allocated(false) - { - } - - ~btOpenCLBuffer() - { - clReleaseMemObject(m_buffer); - } - - - bool moveToGPU() - { - - - cl_int err; - - if( (m_CPUBuffer->size() != m_gpuSize) ) - { - m_onGPU = false; - } - - if( !m_allocated && m_CPUBuffer->size() == 0 ) - { - // If it isn't on the GPU and yet there is no data on the CPU side this may cause a problem with some kernels. - // We should create *something* on the device side - if (!createBuffer()) { - return false; - } - m_allocated = true; - } - - if( !m_onGPU && m_CPUBuffer->size() > 0 ) - { - if (!m_allocated || (m_CPUBuffer->size() != m_gpuSize)) { - if (!createBuffer()) { - return false; - } - m_allocated = true; - } - - size_t size = m_CPUBuffer->size() * sizeof(ElementType); - err = clEnqueueWriteBuffer(m_cqCommandQue,m_buffer, - CL_FALSE, - 0, - size, - &((*m_CPUBuffer)[0]),0,0,0); - if( err != CL_SUCCESS ) - { - btAssert( "CommandQueue::enqueueWriteBuffer(m_buffer)" ); - } - - m_onGPU = true; - } - - return true; - - } - - bool moveFromGPU() - { - - cl_int err; - - if (m_CPUBuffer->size() > 0) { - if (m_onGPU && !m_readOnlyOnGPU) { - size_t size = m_CPUBuffer->size() * sizeof(ElementType); - err = clEnqueueReadBuffer(m_cqCommandQue, - m_buffer, - CL_TRUE, - 0, - size, - &((*m_CPUBuffer)[0]),0,0,0); - - if( err != CL_SUCCESS ) - { - btAssert( "CommandQueue::enqueueReadBuffer(m_buffer)" ); - } - - m_onGPU = false; - } - } - - return true; - } - - bool copyFromGPU() - { - - cl_int err; - size_t size = m_CPUBuffer->size() * sizeof(ElementType); - - if (m_CPUBuffer->size() > 0) { - if (m_onGPU && !m_readOnlyOnGPU) { - err = clEnqueueReadBuffer(m_cqCommandQue, - m_buffer, - CL_TRUE, - 0,size, - &((*m_CPUBuffer)[0]),0,0,0); - - if( err != CL_SUCCESS ) - { - btAssert( "CommandQueue::enqueueReadBuffer(m_buffer)"); - } - - } - } - - return true; - } - - virtual void changedOnCPU() - { - m_onGPU = false; - } -}; // class btOpenCLBuffer - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_BUFFER_OPENCL_H \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCL.h deleted file mode 100644 index 6921f7da9..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCL.h +++ /dev/null @@ -1,99 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_OpenCL.h" - - -#ifndef BT_SOFT_BODY_SOLVER_LINK_DATA_OPENCL_H -#define BT_SOFT_BODY_SOLVER_LINK_DATA_OPENCL_H - - -class btSoftBodyLinkDataOpenCL : public btSoftBodyLinkData -{ -public: - bool m_onGPU; - - cl_command_queue m_cqCommandQue; - - - btOpenCLBuffer m_clLinks; - btOpenCLBuffer m_clLinkStrength; - btOpenCLBuffer m_clLinksMassLSC; - btOpenCLBuffer m_clLinksRestLengthSquared; - btOpenCLBuffer m_clLinksCLength; - btOpenCLBuffer m_clLinksLengthRatio; - btOpenCLBuffer m_clLinksRestLength; - btOpenCLBuffer m_clLinksMaterialLinearStiffnessCoefficient; - - struct BatchPair - { - int start; - int length; - - BatchPair() : - start(0), - length(0) - { - } - - BatchPair( int s, int l ) : - start( s ), - length( l ) - { - } - }; - - /** - * Link addressing information for each cloth. - * Allows link locations to be computed independently of data batching. - */ - btAlignedObjectArray< int > m_linkAddresses; - - /** - * Start and length values for computation batches over link data. - */ - btAlignedObjectArray< BatchPair > m_batchStartLengths; - - btSoftBodyLinkDataOpenCL(cl_command_queue queue, cl_context ctx); - - virtual ~btSoftBodyLinkDataOpenCL(); - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createLinks( int numLinks ); - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setLinkAt( - const LinkDescription &link, - int linkIndex ); - - virtual bool onAccelerator(); - - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(); - - /** - * Generate (and later update) the batching for the entire link set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ - void generateBatches(); -}; - - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_LINK_DATA_OPENCL_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCLSIMDAware.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCLSIMDAware.h deleted file mode 100644 index b20e8055f..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCLSIMDAware.h +++ /dev/null @@ -1,169 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_OpenCL.h" - - -#ifndef BT_SOFT_BODY_SOLVER_LINK_DATA_OPENCL_SIMDAWARE_H -#define BT_SOFT_BODY_SOLVER_LINK_DATA_OPENCL_SIMDAWARE_H - - -class btSoftBodyLinkDataOpenCLSIMDAware : public btSoftBodyLinkData -{ -public: - bool m_onGPU; - - cl_command_queue m_cqCommandQue; - - const int m_wavefrontSize; - const int m_linksPerWorkItem; - const int m_maxLinksPerWavefront; - int m_maxBatchesWithinWave; - int m_maxVerticesWithinWave; - int m_numWavefronts; - - int m_maxVertex; - - struct NumBatchesVerticesPair - { - int numBatches; - int numVertices; - }; - - btAlignedObjectArray m_linksPerWavefront; - btAlignedObjectArray m_numBatchesAndVerticesWithinWaves; - btOpenCLBuffer< NumBatchesVerticesPair > m_clNumBatchesAndVerticesWithinWaves; - - // All arrays here will contain batches of m_maxLinksPerWavefront links - // ordered by wavefront. - // with either global vertex pairs or local vertex pairs - btAlignedObjectArray< int > m_wavefrontVerticesGlobalAddresses; // List of global vertices per wavefront - btOpenCLBuffer m_clWavefrontVerticesGlobalAddresses; - btAlignedObjectArray< LinkNodePair > m_linkVerticesLocalAddresses; // Vertex pair for the link - btOpenCLBuffer m_clLinkVerticesLocalAddresses; - btOpenCLBuffer m_clLinkStrength; - btOpenCLBuffer m_clLinksMassLSC; - btOpenCLBuffer m_clLinksRestLengthSquared; - btOpenCLBuffer m_clLinksRestLength; - btOpenCLBuffer m_clLinksMaterialLinearStiffnessCoefficient; - - struct BatchPair - { - int start; - int length; - - BatchPair() : - start(0), - length(0) - { - } - - BatchPair( int s, int l ) : - start( s ), - length( l ) - { - } - }; - - /** - * Link addressing information for each cloth. - * Allows link locations to be computed independently of data batching. - */ - btAlignedObjectArray< int > m_linkAddresses; - - /** - * Start and length values for computation batches over link data. - */ - btAlignedObjectArray< BatchPair > m_wavefrontBatchStartLengths; - - btSoftBodyLinkDataOpenCLSIMDAware(cl_command_queue queue, cl_context ctx); - - virtual ~btSoftBodyLinkDataOpenCLSIMDAware(); - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createLinks( int numLinks ); - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setLinkAt( - const LinkDescription &link, - int linkIndex ); - - virtual bool onAccelerator(); - - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(); - - /** - * Generate (and later update) the batching for the entire link set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ - void generateBatches(); - - int getMaxVerticesPerWavefront() - { - return m_maxVerticesWithinWave; - } - - int getWavefrontSize() - { - return m_wavefrontSize; - } - - int getLinksPerWorkItem() - { - return m_linksPerWorkItem; - } - - int getMaxLinksPerWavefront() - { - return m_maxLinksPerWavefront; - } - - int getMaxBatchesPerWavefront() - { - return m_maxBatchesWithinWave; - } - - int getNumWavefronts() - { - return m_numWavefronts; - } - - NumBatchesVerticesPair getNumBatchesAndVerticesWithinWavefront( int wavefront ) - { - return m_numBatchesAndVerticesWithinWaves[wavefront]; - } - - int getVertexGlobalAddresses( int vertexIndex ) - { - return m_wavefrontVerticesGlobalAddresses[vertexIndex]; - } - - /** - * Get post-batching local addresses of the vertex pair for a link assuming all vertices used by a wavefront are loaded locally. - */ - LinkNodePair getVertexPairLocalAddresses( int linkIndex ) - { - return m_linkVerticesLocalAddresses[linkIndex]; - } -}; - - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_LINK_DATA_OPENCL_SIMDAWARE_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.cpp deleted file mode 100644 index 1000440bd..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "btSoftBodySolverOutputCLtoGL.h" -#include //@todo: remove the debugging printf at some stage -#include "btSoftBodySolver_OpenCL.h" -#include "BulletSoftBody/btSoftBodySolverVertexBuffer.h" -#include "btSoftBodySolverVertexBuffer_OpenGL.h" -#include "BulletSoftBody/btSoftBody.h" - -////OpenCL 1.0 kernels don't use float3 -#define MSTRINGIFY(A) #A -static char* OutputToVertexArrayCLString = -#include "OpenCLC10/OutputToVertexArray.cl" - - -#define RELEASE_CL_KERNEL(kernelName) {if( kernelName ){ clReleaseKernel( kernelName ); kernelName = 0; }} - -static const size_t workGroupSize = 128; - -void btSoftBodySolverOutputCLtoGL::copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ) -{ - - btSoftBodySolver *solver = softBody->getSoftBodySolver(); - btAssert( solver->getSolverType() == btSoftBodySolver::CL_SOLVER || solver->getSolverType() == btSoftBodySolver::CL_SIMD_SOLVER ); - btOpenCLSoftBodySolver *dxSolver = static_cast< btOpenCLSoftBodySolver * >( solver ); - checkInitialized(); - btOpenCLAcceleratedSoftBodyInterface* currentCloth = dxSolver->findSoftBodyInterface( softBody ); - btSoftBodyVertexDataOpenCL &vertexData( dxSolver->m_vertexData ); - - const int firstVertex = currentCloth->getFirstVertex(); - const int lastVertex = firstVertex + currentCloth->getNumVertices(); - - if( vertexBuffer->getBufferType() == btVertexBufferDescriptor::OPENGL_BUFFER ) { - - const btOpenGLInteropVertexBufferDescriptor *openGLVertexBuffer = static_cast< btOpenGLInteropVertexBufferDescriptor* >(vertexBuffer); - cl_int ciErrNum = CL_SUCCESS; - - cl_mem clBuffer = openGLVertexBuffer->getBuffer(); - cl_kernel outputKernel = outputToVertexArrayWithNormalsKernel; - if( !vertexBuffer->hasNormals() ) - outputKernel = outputToVertexArrayWithoutNormalsKernel; - - ciErrNum = clEnqueueAcquireGLObjects(m_cqCommandQue, 1, &clBuffer, 0, 0, NULL); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "clEnqueueAcquireGLObjects(copySoftBodyToVertexBuffer)"); - } - - int numVertices = currentCloth->getNumVertices(); - - ciErrNum = clSetKernelArg(outputKernel, 0, sizeof(int), &firstVertex ); - ciErrNum = clSetKernelArg(outputKernel, 1, sizeof(int), &numVertices ); - ciErrNum = clSetKernelArg(outputKernel, 2, sizeof(cl_mem), (void*)&clBuffer ); - if( vertexBuffer->hasVertexPositions() ) - { - int vertexOffset = vertexBuffer->getVertexOffset(); - int vertexStride = vertexBuffer->getVertexStride(); - ciErrNum = clSetKernelArg(outputKernel, 3, sizeof(int), &vertexOffset ); - ciErrNum = clSetKernelArg(outputKernel, 4, sizeof(int), &vertexStride ); - ciErrNum = clSetKernelArg(outputKernel, 5, sizeof(cl_mem), (void*)&vertexData.m_clVertexPosition.m_buffer ); - - } - if( vertexBuffer->hasNormals() ) - { - int normalOffset = vertexBuffer->getNormalOffset(); - int normalStride = vertexBuffer->getNormalStride(); - ciErrNum = clSetKernelArg(outputKernel, 6, sizeof(int), &normalOffset ); - ciErrNum = clSetKernelArg(outputKernel, 7, sizeof(int), &normalStride ); - ciErrNum = clSetKernelArg(outputKernel, 8, sizeof(cl_mem), (void*)&vertexData.m_clVertexNormal.m_buffer ); - - } - size_t numWorkItems = workGroupSize*((vertexData.getNumVertices() + (workGroupSize-1)) / workGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue, outputKernel, 1, NULL, &numWorkItems, &workGroupSize,0 ,0 ,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(copySoftBodyToVertexBuffer)"); - } - - ciErrNum = clEnqueueReleaseGLObjects(m_cqCommandQue, 1, &clBuffer, 0, 0, 0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "clEnqueueReleaseGLObjects(copySoftBodyToVertexBuffer)"); - } - } else { - btAssert( "Undefined output for this solver output" == false ); - } - - // clFinish in here may not be the best thing. It's possible that we should have a waitForFrameComplete function. - clFinish(m_cqCommandQue); - -} // btSoftBodySolverOutputCLtoGL::outputToVertexBuffers - -bool btSoftBodySolverOutputCLtoGL::buildShaders() -{ - // Ensure current kernels are released first - releaseKernels(); - - bool returnVal = true; - - if( m_shadersInitialized ) - return true; - - outputToVertexArrayWithNormalsKernel = clFunctions.compileCLKernelFromString( OutputToVertexArrayCLString, "OutputToVertexArrayWithNormalsKernel" ,"","OpenCLC10/OutputToVertexArray.cl"); - outputToVertexArrayWithoutNormalsKernel = clFunctions.compileCLKernelFromString( OutputToVertexArrayCLString, "OutputToVertexArrayWithoutNormalsKernel" ,"","OpenCLC10/OutputToVertexArray.cl"); - - - if( returnVal ) - m_shadersInitialized = true; - - return returnVal; -} // btSoftBodySolverOutputCLtoGL::buildShaders - -void btSoftBodySolverOutputCLtoGL::releaseKernels() -{ - RELEASE_CL_KERNEL( outputToVertexArrayWithNormalsKernel ); - RELEASE_CL_KERNEL( outputToVertexArrayWithoutNormalsKernel ); - - m_shadersInitialized = false; -} // btSoftBodySolverOutputCLtoGL::releaseKernels - -bool btSoftBodySolverOutputCLtoGL::checkInitialized() -{ - if( !m_shadersInitialized ) - if( buildShaders() ) - m_shadersInitialized = true; - - return m_shadersInitialized; -} \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.h deleted file mode 100644 index ab3ea264c..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_OUTPUT_CL_TO_GL_H -#define BT_SOFT_BODY_SOLVER_OUTPUT_CL_TO_GL_H - -#include "btSoftBodySolver_OpenCL.h" - -/** - * Class to manage movement of data from a solver to a given target. - * This version is the CL to GL interop version. - */ -class btSoftBodySolverOutputCLtoGL : public btSoftBodySolverOutput -{ -protected: - cl_command_queue m_cqCommandQue; - cl_context m_cxMainContext; - CLFunctions clFunctions; - - cl_kernel outputToVertexArrayWithNormalsKernel; - cl_kernel outputToVertexArrayWithoutNormalsKernel; - - bool m_shadersInitialized; - - virtual bool checkInitialized(); - virtual bool buildShaders(); - void releaseKernels(); -public: - btSoftBodySolverOutputCLtoGL(cl_command_queue cqCommandQue, cl_context cxMainContext) : - m_cqCommandQue( cqCommandQue ), - m_cxMainContext( cxMainContext ), - clFunctions(cqCommandQue, cxMainContext), - outputToVertexArrayWithNormalsKernel( 0 ), - outputToVertexArrayWithoutNormalsKernel( 0 ), - m_shadersInitialized( false ) - { - } - - virtual ~btSoftBodySolverOutputCLtoGL() - { - releaseKernels(); - } - - /** Output current computed vertex data to the vertex buffers for all cloths in the solver. */ - virtual void copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ); -}; - - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_OUTPUT_CL_TO_GL_H \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverTriangleData_OpenCL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverTriangleData_OpenCL.h deleted file mode 100644 index 7e3767855..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverTriangleData_OpenCL.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_OpenCL.h" - - -#ifndef BT_SOFT_BODY_SOLVER_TRIANGLE_DATA_OPENCL_H -#define BT_SOFT_BODY_SOLVER_TRIANGLE_DATA_OPENCL_H - - -class btSoftBodyTriangleDataOpenCL : public btSoftBodyTriangleData -{ -public: - bool m_onGPU; - cl_command_queue m_queue; - - btOpenCLBuffer m_clVertexIndices; - btOpenCLBuffer m_clArea; - btOpenCLBuffer m_clNormal; - - /** - * Link addressing information for each cloth. - * Allows link locations to be computed independently of data batching. - */ - btAlignedObjectArray< int > m_triangleAddresses; - - /** - * Start and length values for computation batches over link data. - */ - struct btSomePair - { - btSomePair() {} - btSomePair(int f,int s) - :first(f),second(s) - { - } - int first; - int second; - }; - btAlignedObjectArray< btSomePair > m_batchStartLengths; - -public: - btSoftBodyTriangleDataOpenCL( cl_command_queue queue, cl_context ctx ); - - virtual ~btSoftBodyTriangleDataOpenCL(); - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createTriangles( int numTriangles ); - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setTriangleAt( const btSoftBodyTriangleData::TriangleDescription &triangle, int triangleIndex ); - - virtual bool onAccelerator(); - - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(); - - /** - * Generate (and later update) the batching for the entire triangle set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ - void generateBatches(); -}; // class btSoftBodyTriangleDataOpenCL - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_TRIANGLE_DATA_OPENCL_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexBuffer_OpenGL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexBuffer_OpenGL.h deleted file mode 100644 index 7c223ecc1..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexBuffer_OpenGL.h +++ /dev/null @@ -1,166 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_OPENGL_H -#define BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_OPENGL_H - - -#include "BulletSoftBody/btSoftBodySolverVertexBuffer.h" -#ifdef USE_MINICL - #include "MiniCL/cl.h" -#else //USE_MINICL - #ifdef __APPLE__ - #include - #else - #include - #include - #endif //__APPLE__ -#endif//USE_MINICL - - -#ifdef _WIN32//for glut.h -#include -#endif - -//think different -#if defined(__APPLE__) && !defined (VMDMESA) -#include -#include -#include -#include -#else - - -#ifdef _WINDOWS -#include -#include -#include -#else -#include -#endif //_WINDOWS -#endif //APPLE - - - -class btOpenGLInteropVertexBufferDescriptor : public btVertexBufferDescriptor -{ -protected: - /** OpenCL context */ - cl_context m_context; - - /** OpenCL command queue */ - cl_command_queue m_commandQueue; - - /** OpenCL interop buffer */ - cl_mem m_buffer; - - /** VBO in GL that is the basis of the interop buffer */ - GLuint m_openGLVBO; - - -public: - /** - * context is the OpenCL context this interop buffer will work in. - * queue is the command queue that kernels and data movement will be enqueued into. - * openGLVBO is the OpenGL vertex buffer data will be copied into. - * vertexOffset is the offset in floats to the first vertex. - * vertexStride is the stride in floats between vertices. - */ - btOpenGLInteropVertexBufferDescriptor( cl_command_queue cqCommandQue, cl_context context, GLuint openGLVBO, int vertexOffset, int vertexStride ) - { -#ifndef USE_MINICL - cl_int ciErrNum = CL_SUCCESS; - m_context = context; - m_commandQueue = cqCommandQue; - - m_vertexOffset = vertexOffset; - m_vertexStride = vertexStride; - - m_openGLVBO = openGLVBO; - - m_buffer = clCreateFromGLBuffer(m_context, CL_MEM_WRITE_ONLY, openGLVBO, &ciErrNum); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "clEnqueueAcquireGLObjects(copySoftBodyToVertexBuffer)"); - } - - m_hasVertexPositions = true; -#else - btAssert(0);//MiniCL shouldn't get here -#endif - } - - /** - * context is the OpenCL context this interop buffer will work in. - * queue is the command queue that kernels and data movement will be enqueued into. - * openGLVBO is the OpenGL vertex buffer data will be copied into. - * vertexOffset is the offset in floats to the first vertex. - * vertexStride is the stride in floats between vertices. - * normalOffset is the offset in floats to the first normal. - * normalStride is the stride in floats between normals. - */ - btOpenGLInteropVertexBufferDescriptor( cl_command_queue cqCommandQue, cl_context context, GLuint openGLVBO, int vertexOffset, int vertexStride, int normalOffset, int normalStride ) - { -#ifndef USE_MINICL - cl_int ciErrNum = CL_SUCCESS; - m_context = context; - m_commandQueue = cqCommandQue; - - m_openGLVBO = openGLVBO; - - m_buffer = clCreateFromGLBuffer(m_context, CL_MEM_WRITE_ONLY, openGLVBO, &ciErrNum); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "clEnqueueAcquireGLObjects(copySoftBodyToVertexBuffer)"); - } - - m_vertexOffset = vertexOffset; - m_vertexStride = vertexStride; - m_hasVertexPositions = true; - - m_normalOffset = normalOffset; - m_normalStride = normalStride; - m_hasNormals = true; -#else - btAssert(0); -#endif //USE_MINICL - - } - - virtual ~btOpenGLInteropVertexBufferDescriptor() - { - clReleaseMemObject( m_buffer ); - } - - /** - * Return the type of the vertex buffer descriptor. - */ - virtual BufferTypes getBufferType() const - { - return OPENGL_BUFFER; - } - - virtual cl_context getContext() const - { - return m_context; - } - - virtual cl_mem getBuffer() const - { - return m_buffer; - } -}; - -#endif // #ifndef BT_SOFT_BODY_SOLVER_VERTEX_BUFFER_OPENGL_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexData_OpenCL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexData_OpenCL.h deleted file mode 100644 index 531c34279..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexData_OpenCL.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h" -#include "btSoftBodySolverBuffer_OpenCL.h" - -#ifndef BT_SOFT_BODY_SOLVER_VERTEX_DATA_OPENCL_H -#define BT_SOFT_BODY_SOLVER_VERTEX_DATA_OPENCL_H - - -class btSoftBodyVertexDataOpenCL : public btSoftBodyVertexData -{ -protected: - bool m_onGPU; - cl_command_queue m_queue; - -public: - btOpenCLBuffer m_clClothIdentifier; - btOpenCLBuffer m_clVertexPosition; - btOpenCLBuffer m_clVertexPreviousPosition; - btOpenCLBuffer m_clVertexVelocity; - btOpenCLBuffer m_clVertexForceAccumulator; - btOpenCLBuffer m_clVertexNormal; - btOpenCLBuffer m_clVertexInverseMass; - btOpenCLBuffer m_clVertexArea; - btOpenCLBuffer m_clVertexTriangleCount; -public: - btSoftBodyVertexDataOpenCL( cl_command_queue queue, cl_context ctx); - - virtual ~btSoftBodyVertexDataOpenCL(); - - virtual bool onAccelerator(); - - virtual bool moveToAccelerator(); - - virtual bool moveFromAccelerator(bool bCopy = false, bool bCopyMinimum = true); -}; - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_VERTEX_DATA_OPENCL_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.cpp deleted file mode 100644 index e5f4ebb25..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.cpp +++ /dev/null @@ -1,1820 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "vectormath/vmInclude.h" -#include //@todo: remove the debugging printf at some stage -#include "btSoftBodySolver_OpenCL.h" -#include "BulletSoftBody/btSoftBodySolverVertexBuffer.h" -#include "BulletSoftBody/btSoftBody.h" -#include "BulletSoftBody/btSoftBodyInternals.h" -#include "BulletCollision/CollisionShapes/btCapsuleShape.h" -#include "BulletCollision/CollisionShapes/btSphereShape.h" -#include "LinearMath/btQuickprof.h" -#include -#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" - -#define BT_SUPPRESS_OPENCL_ASSERTS - -#ifdef USE_MINICL - #include "MiniCL/cl.h" -#else //USE_MINICL - #ifdef __APPLE__ - #include - #else - #include - #endif //__APPLE__ -#endif//USE_MINICL - -#define BT_DEFAULT_WORKGROUPSIZE 64 - - -#define RELEASE_CL_KERNEL(kernelName) {if( kernelName ){ clReleaseKernel( kernelName ); kernelName = 0; }} - - -//CL_VERSION_1_1 seems broken on NVidia SDK so just disable it - -////OpenCL 1.0 kernels don't use float3 -#define MSTRINGIFY(A) #A -static const char* PrepareLinksCLString = -#include "OpenCLC10/PrepareLinks.cl" -static const char* UpdatePositionsFromVelocitiesCLString = -#include "OpenCLC10/UpdatePositionsFromVelocities.cl" -static const char* SolvePositionsCLString = -#include "OpenCLC10/SolvePositions.cl" -static const char* UpdateNodesCLString = -#include "OpenCLC10/UpdateNodes.cl" -static const char* UpdatePositionsCLString = -#include "OpenCLC10/UpdatePositions.cl" -static const char* UpdateConstantsCLString = -#include "OpenCLC10/UpdateConstants.cl" -static const char* IntegrateCLString = -#include "OpenCLC10/Integrate.cl" -static const char* ApplyForcesCLString = -#include "OpenCLC10/ApplyForces.cl" -static const char* UpdateFixedVertexPositionsCLString = -#include "OpenCLC10/UpdateFixedVertexPositions.cl" -static const char* UpdateNormalsCLString = -#include "OpenCLC10/UpdateNormals.cl" -static const char* VSolveLinksCLString = -#include "OpenCLC10/VSolveLinks.cl" -static const char* SolveCollisionsAndUpdateVelocitiesCLString = -#include "OpenCLC10/SolveCollisionsAndUpdateVelocities.cl" - - -btSoftBodyVertexDataOpenCL::btSoftBodyVertexDataOpenCL( cl_command_queue queue, cl_context ctx) : - m_queue(queue), - m_clClothIdentifier( queue, ctx, &m_clothIdentifier, false ), - m_clVertexPosition( queue, ctx, &m_vertexPosition, false ), - m_clVertexPreviousPosition( queue, ctx, &m_vertexPreviousPosition, false ), - m_clVertexVelocity( queue, ctx, &m_vertexVelocity, false ), - m_clVertexForceAccumulator( queue, ctx, &m_vertexForceAccumulator, false ), - m_clVertexNormal( queue, ctx, &m_vertexNormal, false ), - m_clVertexInverseMass( queue, ctx, &m_vertexInverseMass, false ), - m_clVertexArea( queue, ctx, &m_vertexArea, false ), - m_clVertexTriangleCount( queue, ctx, &m_vertexTriangleCount, false ) -{ -} - -btSoftBodyVertexDataOpenCL::~btSoftBodyVertexDataOpenCL() -{ - -} - -bool btSoftBodyVertexDataOpenCL::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyVertexDataOpenCL::moveToAccelerator() -{ - bool success = true; - success = success && m_clClothIdentifier.moveToGPU(); - success = success && m_clVertexPosition.moveToGPU(); - success = success && m_clVertexPreviousPosition.moveToGPU(); - success = success && m_clVertexVelocity.moveToGPU(); - success = success && m_clVertexForceAccumulator.moveToGPU(); - success = success && m_clVertexNormal.moveToGPU(); - success = success && m_clVertexInverseMass.moveToGPU(); - success = success && m_clVertexArea.moveToGPU(); - success = success && m_clVertexTriangleCount.moveToGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -bool btSoftBodyVertexDataOpenCL::moveFromAccelerator(bool bCopy, bool bCopyMinimum) -{ - bool success = true; - - if (!bCopy) - { - success = success && m_clClothIdentifier.moveFromGPU(); - success = success && m_clVertexPosition.moveFromGPU(); - success = success && m_clVertexPreviousPosition.moveFromGPU(); - success = success && m_clVertexVelocity.moveFromGPU(); - success = success && m_clVertexForceAccumulator.moveFromGPU(); - success = success && m_clVertexNormal.moveFromGPU(); - success = success && m_clVertexInverseMass.moveFromGPU(); - success = success && m_clVertexArea.moveFromGPU(); - success = success && m_clVertexTriangleCount.moveFromGPU(); - } - else - { - if (bCopyMinimum) - { - success = success && m_clVertexPosition.copyFromGPU(); - success = success && m_clVertexNormal.copyFromGPU(); - } - else - { - success = success && m_clClothIdentifier.copyFromGPU(); - success = success && m_clVertexPosition.copyFromGPU(); - success = success && m_clVertexPreviousPosition.copyFromGPU(); - success = success && m_clVertexVelocity.copyFromGPU(); - success = success && m_clVertexForceAccumulator.copyFromGPU(); - success = success && m_clVertexNormal.copyFromGPU(); - success = success && m_clVertexInverseMass.copyFromGPU(); - success = success && m_clVertexArea.copyFromGPU(); - success = success && m_clVertexTriangleCount.copyFromGPU(); - } - } - - if( success ) - m_onGPU = true; - - return success; -} - -btSoftBodyLinkDataOpenCL::btSoftBodyLinkDataOpenCL(cl_command_queue queue, cl_context ctx) -:m_cqCommandQue(queue), - m_clLinks( queue, ctx, &m_links, false ), - m_clLinkStrength( queue, ctx, &m_linkStrength, false ), - m_clLinksMassLSC( queue, ctx, &m_linksMassLSC, false ), - m_clLinksRestLengthSquared( queue, ctx, &m_linksRestLengthSquared, false ), - m_clLinksCLength( queue, ctx, &m_linksCLength, false ), - m_clLinksLengthRatio( queue, ctx, &m_linksLengthRatio, false ), - m_clLinksRestLength( queue, ctx, &m_linksRestLength, false ), - m_clLinksMaterialLinearStiffnessCoefficient( queue, ctx, &m_linksMaterialLinearStiffnessCoefficient, false ) -{ -} - -btSoftBodyLinkDataOpenCL::~btSoftBodyLinkDataOpenCL() -{ -} - -static Vectormath::Aos::Vector3 toVector3( const btVector3 &vec ) -{ - Vectormath::Aos::Vector3 outVec( vec.getX(), vec.getY(), vec.getZ() ); - return outVec; -} - -/** Allocate enough space in all link-related arrays to fit numLinks links */ -void btSoftBodyLinkDataOpenCL::createLinks( int numLinks ) -{ - int previousSize = m_links.size(); - int newSize = previousSize + numLinks; - - btSoftBodyLinkData::createLinks( numLinks ); - - // Resize the link addresses array as well - m_linkAddresses.resize( newSize ); -} - -/** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ -void btSoftBodyLinkDataOpenCL::setLinkAt( - const LinkDescription &link, - int linkIndex ) -{ - btSoftBodyLinkData::setLinkAt( link, linkIndex ); - - // Set the link index correctly for initialisation - m_linkAddresses[linkIndex] = linkIndex; -} - -bool btSoftBodyLinkDataOpenCL::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyLinkDataOpenCL::moveToAccelerator() -{ - bool success = true; - success = success && m_clLinks.moveToGPU(); - success = success && m_clLinkStrength.moveToGPU(); - success = success && m_clLinksMassLSC.moveToGPU(); - success = success && m_clLinksRestLengthSquared.moveToGPU(); - success = success && m_clLinksCLength.moveToGPU(); - success = success && m_clLinksLengthRatio.moveToGPU(); - success = success && m_clLinksRestLength.moveToGPU(); - success = success && m_clLinksMaterialLinearStiffnessCoefficient.moveToGPU(); - - if( success ) { - m_onGPU = true; - } - - return success; -} - -bool btSoftBodyLinkDataOpenCL::moveFromAccelerator() -{ - bool success = true; - success = success && m_clLinks.moveFromGPU(); - success = success && m_clLinkStrength.moveFromGPU(); - success = success && m_clLinksMassLSC.moveFromGPU(); - success = success && m_clLinksRestLengthSquared.moveFromGPU(); - success = success && m_clLinksCLength.moveFromGPU(); - success = success && m_clLinksLengthRatio.moveFromGPU(); - success = success && m_clLinksRestLength.moveFromGPU(); - success = success && m_clLinksMaterialLinearStiffnessCoefficient.moveFromGPU(); - - if( success ) { - m_onGPU = false; - } - - return success; -} - -/** - * Generate (and later update) the batching for the entire link set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ -void btSoftBodyLinkDataOpenCL::generateBatches() -{ - int numLinks = getNumLinks(); - - // Do the graph colouring here temporarily - btAlignedObjectArray< int > batchValues; - batchValues.resize( numLinks, 0 ); - - // Find the maximum vertex value internally for now - int maxVertex = 0; - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - int vertex0 = getVertexPair(linkIndex).vertex0; - int vertex1 = getVertexPair(linkIndex).vertex1; - if( vertex0 > maxVertex ) - maxVertex = vertex0; - if( vertex1 > maxVertex ) - maxVertex = vertex1; - } - int numVertices = maxVertex + 1; - - // Set of lists, one for each node, specifying which colours are connected - // to that node. - // No two edges into a node can share a colour. - btAlignedObjectArray< btAlignedObjectArray< int > > vertexConnectedColourLists; - vertexConnectedColourLists.resize(numVertices); - - // Simple algorithm that chooses the lowest batch number - // that none of the links attached to either of the connected - // nodes is in - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - int linkLocation = m_linkAddresses[linkIndex]; - - int vertex0 = getVertexPair(linkLocation).vertex0; - int vertex1 = getVertexPair(linkLocation).vertex1; - - // Get the two node colour lists - btAlignedObjectArray< int > &colourListVertex0( vertexConnectedColourLists[vertex0] ); - btAlignedObjectArray< int > &colourListVertex1( vertexConnectedColourLists[vertex1] ); - - // Choose the minimum colour that is in neither list - int colour = 0; - while( colourListVertex0.findLinearSearch(colour) != colourListVertex0.size() || colourListVertex1.findLinearSearch(colour) != colourListVertex1.size() ) - ++colour; - // i should now be the minimum colour in neither list - // Add to the two lists so that future edges don't share - // And store the colour against this edge - - colourListVertex0.push_back(colour); - colourListVertex1.push_back(colour); - batchValues[linkIndex] = colour; - } - - // Check the colour counts - btAlignedObjectArray< int > batchCounts; - for( int i = 0; i < numLinks; ++i ) - { - int batch = batchValues[i]; - if( batch >= batchCounts.size() ) - batchCounts.push_back(1); - else - ++(batchCounts[batch]); - } - - m_batchStartLengths.resize(batchCounts.size()); - if( m_batchStartLengths.size() > 0 ) - { - m_batchStartLengths.resize(batchCounts.size()); - m_batchStartLengths[0] = BatchPair(0, 0); - - int sum = 0; - for( int batchIndex = 0; batchIndex < batchCounts.size(); ++batchIndex ) - { - m_batchStartLengths[batchIndex].start = sum; - m_batchStartLengths[batchIndex].length = batchCounts[batchIndex]; - sum += batchCounts[batchIndex]; - } - } - - ///////////////////////////// - // Sort data based on batches - - // Create source arrays by copying originals - btAlignedObjectArray m_links_Backup(m_links); - btAlignedObjectArray m_linkStrength_Backup(m_linkStrength); - btAlignedObjectArray m_linksMassLSC_Backup(m_linksMassLSC); - btAlignedObjectArray m_linksRestLengthSquared_Backup(m_linksRestLengthSquared); - btAlignedObjectArray m_linksCLength_Backup(m_linksCLength); - btAlignedObjectArray m_linksLengthRatio_Backup(m_linksLengthRatio); - btAlignedObjectArray m_linksRestLength_Backup(m_linksRestLength); - btAlignedObjectArray m_linksMaterialLinearStiffnessCoefficient_Backup(m_linksMaterialLinearStiffnessCoefficient); - - - for( int batch = 0; batch < batchCounts.size(); ++batch ) - batchCounts[batch] = 0; - - // Do sort as single pass into destination arrays - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - // To maintain locations run off the original link locations rather than the current position. - // It's not cache efficient, but as we run this rarely that should not matter. - // It's faster than searching the link location array for the current location and then updating it. - // The other alternative would be to unsort before resorting, but this is equivalent to doing that. - int linkLocation = m_linkAddresses[linkIndex]; - - // Obtain batch and calculate target location for the - // next element in that batch, incrementing the batch counter - // afterwards - int batch = batchValues[linkIndex]; - int newLocation = m_batchStartLengths[batch].start + batchCounts[batch]; - - batchCounts[batch] = batchCounts[batch] + 1; - m_links[newLocation] = m_links_Backup[linkLocation]; -#if 1 - m_linkStrength[newLocation] = m_linkStrength_Backup[linkLocation]; - m_linksMassLSC[newLocation] = m_linksMassLSC_Backup[linkLocation]; - m_linksRestLengthSquared[newLocation] = m_linksRestLengthSquared_Backup[linkLocation]; - m_linksLengthRatio[newLocation] = m_linksLengthRatio_Backup[linkLocation]; - m_linksRestLength[newLocation] = m_linksRestLength_Backup[linkLocation]; - m_linksMaterialLinearStiffnessCoefficient[newLocation] = m_linksMaterialLinearStiffnessCoefficient_Backup[linkLocation]; -#endif - // Update the locations array to account for the moved entry - m_linkAddresses[linkIndex] = newLocation; - } - - -} // void generateBatches() - - - - - -btSoftBodyTriangleDataOpenCL::btSoftBodyTriangleDataOpenCL( cl_command_queue queue , cl_context ctx) : - m_queue( queue ), - m_clVertexIndices( queue, ctx, &m_vertexIndices, false ), - m_clArea( queue, ctx, &m_area, false ), - m_clNormal( queue, ctx, &m_normal, false ) -{ -} - -btSoftBodyTriangleDataOpenCL::~btSoftBodyTriangleDataOpenCL() -{ -} - -/** Allocate enough space in all link-related arrays to fit numLinks links */ -void btSoftBodyTriangleDataOpenCL::createTriangles( int numTriangles ) -{ - int previousSize = getNumTriangles(); - int newSize = previousSize + numTriangles; - - btSoftBodyTriangleData::createTriangles( numTriangles ); - - // Resize the link addresses array as well - m_triangleAddresses.resize( newSize ); -} - -/** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ -void btSoftBodyTriangleDataOpenCL::setTriangleAt( const btSoftBodyTriangleData::TriangleDescription &triangle, int triangleIndex ) -{ - btSoftBodyTriangleData::setTriangleAt( triangle, triangleIndex ); - - m_triangleAddresses[triangleIndex] = triangleIndex; -} - -bool btSoftBodyTriangleDataOpenCL::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyTriangleDataOpenCL::moveToAccelerator() -{ - bool success = true; - success = success && m_clVertexIndices.moveToGPU(); - success = success && m_clArea.moveToGPU(); - success = success && m_clNormal.moveToGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -bool btSoftBodyTriangleDataOpenCL::moveFromAccelerator() -{ - bool success = true; - success = success && m_clVertexIndices.moveFromGPU(); - success = success && m_clArea.moveFromGPU(); - success = success && m_clNormal.moveFromGPU(); - - if( success ) - m_onGPU = true; - - return success; -} - -/** - * Generate (and later update) the batching for the entire triangle set. - * This redoes a lot of work because it batches the entire set when each cloth is inserted. - * In theory we could delay it until just before we need the cloth. - * It's a one-off overhead, though, so that is a later optimisation. - */ -void btSoftBodyTriangleDataOpenCL::generateBatches() -{ - int numTriangles = getNumTriangles(); - if( numTriangles == 0 ) - return; - - // Do the graph colouring here temporarily - btAlignedObjectArray< int > batchValues; - batchValues.resize( numTriangles ); - - // Find the maximum vertex value internally for now - int maxVertex = 0; - for( int triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex ) - { - int vertex0 = getVertexSet(triangleIndex).vertex0; - int vertex1 = getVertexSet(triangleIndex).vertex1; - int vertex2 = getVertexSet(triangleIndex).vertex2; - - if( vertex0 > maxVertex ) - maxVertex = vertex0; - if( vertex1 > maxVertex ) - maxVertex = vertex1; - if( vertex2 > maxVertex ) - maxVertex = vertex2; - } - int numVertices = maxVertex + 1; - - // Set of lists, one for each node, specifying which colours are connected - // to that node. - // No two edges into a node can share a colour. - btAlignedObjectArray< btAlignedObjectArray< int > > vertexConnectedColourLists; - vertexConnectedColourLists.resize(numVertices); - - - //std::cout << "\n"; - // Simple algorithm that chooses the lowest batch number - // that none of the faces attached to either of the connected - // nodes is in - for( int triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex ) - { - // To maintain locations run off the original link locations rather than the current position. - // It's not cache efficient, but as we run this rarely that should not matter. - // It's faster than searching the link location array for the current location and then updating it. - // The other alternative would be to unsort before resorting, but this is equivalent to doing that. - int triangleLocation = m_triangleAddresses[triangleIndex]; - - int vertex0 = getVertexSet(triangleLocation).vertex0; - int vertex1 = getVertexSet(triangleLocation).vertex1; - int vertex2 = getVertexSet(triangleLocation).vertex2; - - // Get the three node colour lists - btAlignedObjectArray< int > &colourListVertex0( vertexConnectedColourLists[vertex0] ); - btAlignedObjectArray< int > &colourListVertex1( vertexConnectedColourLists[vertex1] ); - btAlignedObjectArray< int > &colourListVertex2( vertexConnectedColourLists[vertex2] ); - - // Choose the minimum colour that is in none of the lists - int colour = 0; - while( - colourListVertex0.findLinearSearch(colour) != colourListVertex0.size() || - colourListVertex1.findLinearSearch(colour) != colourListVertex1.size() || - colourListVertex2.findLinearSearch(colour) != colourListVertex2.size() ) - { - ++colour; - } - // i should now be the minimum colour in neither list - // Add to the three lists so that future edges don't share - // And store the colour against this face - colourListVertex0.push_back(colour); - colourListVertex1.push_back(colour); - colourListVertex2.push_back(colour); - - batchValues[triangleIndex] = colour; - } - - - // Check the colour counts - btAlignedObjectArray< int > batchCounts; - for( int i = 0; i < numTriangles; ++i ) - { - int batch = batchValues[i]; - if( batch >= batchCounts.size() ) - batchCounts.push_back(1); - else - ++(batchCounts[batch]); - } - - - m_batchStartLengths.resize(batchCounts.size()); - m_batchStartLengths[0] = btSomePair(0,0); - - - int sum = 0; - for( int batchIndex = 0; batchIndex < batchCounts.size(); ++batchIndex ) - { - m_batchStartLengths[batchIndex].first = sum; - m_batchStartLengths[batchIndex].second = batchCounts[batchIndex]; - sum += batchCounts[batchIndex]; - } - - ///////////////////////////// - // Sort data based on batches - - // Create source arrays by copying originals - btAlignedObjectArray m_vertexIndices_Backup(m_vertexIndices); - btAlignedObjectArray m_area_Backup(m_area); - btAlignedObjectArray m_normal_Backup(m_normal); - - - for( int batch = 0; batch < batchCounts.size(); ++batch ) - batchCounts[batch] = 0; - - // Do sort as single pass into destination arrays - for( int triangleIndex = 0; triangleIndex < numTriangles; ++triangleIndex ) - { - // To maintain locations run off the original link locations rather than the current position. - // It's not cache efficient, but as we run this rarely that should not matter. - // It's faster than searching the link location array for the current location and then updating it. - // The other alternative would be to unsort before resorting, but this is equivalent to doing that. - int triangleLocation = m_triangleAddresses[triangleIndex]; - - // Obtain batch and calculate target location for the - // next element in that batch, incrementing the batch counter - // afterwards - int batch = batchValues[triangleIndex]; - int newLocation = m_batchStartLengths[batch].first + batchCounts[batch]; - - batchCounts[batch] = batchCounts[batch] + 1; - m_vertexIndices[newLocation] = m_vertexIndices_Backup[triangleLocation]; - m_area[newLocation] = m_area_Backup[triangleLocation]; - m_normal[newLocation] = m_normal_Backup[triangleLocation]; - - // Update the locations array to account for the moved entry - m_triangleAddresses[triangleIndex] = newLocation; - } -} // btSoftBodyTriangleDataOpenCL::generateBatches - - - - - - - -btOpenCLSoftBodySolver::btOpenCLSoftBodySolver(cl_command_queue queue, cl_context ctx, bool bUpdateAchchoredNodePos) : - m_linkData(queue, ctx), - m_vertexData(queue, ctx), - m_triangleData(queue, ctx), - m_defaultCLFunctions(queue, ctx), - m_currentCLFunctions(&m_defaultCLFunctions), - m_clPerClothAcceleration(queue, ctx, &m_perClothAcceleration, true ), - m_clPerClothWindVelocity(queue, ctx, &m_perClothWindVelocity, true ), - m_clPerClothDampingFactor(queue,ctx, &m_perClothDampingFactor, true ), - m_clPerClothVelocityCorrectionCoefficient(queue, ctx,&m_perClothVelocityCorrectionCoefficient, true ), - m_clPerClothLiftFactor(queue, ctx,&m_perClothLiftFactor, true ), - m_clPerClothDragFactor(queue, ctx,&m_perClothDragFactor, true ), - m_clPerClothMediumDensity(queue, ctx,&m_perClothMediumDensity, true ), - m_clPerClothCollisionObjects( queue, ctx, &m_perClothCollisionObjects, true ), - m_clCollisionObjectDetails( queue, ctx, &m_collisionObjectDetails, true ), - m_clPerClothFriction( queue, ctx, &m_perClothFriction, false ), - m_clAnchorPosition( queue, ctx, &m_anchorPosition, true ), - m_clAnchorIndex( queue, ctx, &m_anchorIndex, true), - m_cqCommandQue( queue ), - m_cxMainContext(ctx), - m_defaultWorkGroupSize(BT_DEFAULT_WORKGROUPSIZE), - m_bUpdateAnchoredNodePos(bUpdateAchchoredNodePos) -{ - - // Initial we will clearly need to update solver constants - // For now this is global for the cloths linked with this solver - we should probably make this body specific - // for performance in future once we understand more clearly when constants need to be updated - m_updateSolverConstants = true; - - m_shadersInitialized = false; - - m_prepareLinksKernel = 0; - m_solvePositionsFromLinksKernel = 0; - m_updateConstantsKernel = 0; - m_integrateKernel = 0; - m_addVelocityKernel = 0; - m_updatePositionsFromVelocitiesKernel = 0; - m_updateVelocitiesFromPositionsWithoutVelocitiesKernel = 0; - m_updateVelocitiesFromPositionsWithVelocitiesKernel = 0; - m_vSolveLinksKernel = 0; - m_solveCollisionsAndUpdateVelocitiesKernel = 0; - m_resetNormalsAndAreasKernel = 0; - m_updateSoftBodiesKernel = 0; - m_normalizeNormalsAndAreasKernel = 0; - m_outputToVertexArrayKernel = 0; - m_applyForcesKernel = 0; - m_updateFixedVertexPositionsKernel = 0; -} - -btOpenCLSoftBodySolver::~btOpenCLSoftBodySolver() -{ - releaseKernels(); -} - -void btOpenCLSoftBodySolver::releaseKernels() -{ - RELEASE_CL_KERNEL( m_prepareLinksKernel ); - RELEASE_CL_KERNEL( m_solvePositionsFromLinksKernel ); - RELEASE_CL_KERNEL( m_updateConstantsKernel ); - RELEASE_CL_KERNEL( m_integrateKernel ); - RELEASE_CL_KERNEL( m_addVelocityKernel ); - RELEASE_CL_KERNEL( m_updatePositionsFromVelocitiesKernel ); - RELEASE_CL_KERNEL( m_updateVelocitiesFromPositionsWithoutVelocitiesKernel ); - RELEASE_CL_KERNEL( m_updateVelocitiesFromPositionsWithVelocitiesKernel ); - RELEASE_CL_KERNEL( m_vSolveLinksKernel ); - RELEASE_CL_KERNEL( m_solveCollisionsAndUpdateVelocitiesKernel ); - RELEASE_CL_KERNEL( m_resetNormalsAndAreasKernel ); - RELEASE_CL_KERNEL( m_normalizeNormalsAndAreasKernel ); - RELEASE_CL_KERNEL( m_outputToVertexArrayKernel ); - RELEASE_CL_KERNEL( m_applyForcesKernel ); - RELEASE_CL_KERNEL( m_updateFixedVertexPositionsKernel ); - - m_shadersInitialized = false; -} - -void btOpenCLSoftBodySolver::copyBackToSoftBodies(bool bMove) -{ - - // Move the vertex data back to the host first - m_vertexData.moveFromAccelerator(!bMove); - - // Loop over soft bodies, copying all the vertex positions back for each body in turn - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btOpenCLAcceleratedSoftBodyInterface *softBodyInterface = m_softBodySet[ softBodyIndex ]; - btSoftBody *softBody = softBodyInterface->getSoftBody(); - - int firstVertex = softBodyInterface->getFirstVertex(); - int numVertices = softBodyInterface->getNumVertices(); - - // Copy vertices from solver back into the softbody - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - using Vectormath::Aos::Point3; - Point3 vertexPosition( m_vertexData.getVertexPositions()[firstVertex + vertex] ); - Point3 normal(m_vertexData.getNormal(firstVertex + vertex)); - - softBody->m_nodes[vertex].m_x.setX( vertexPosition.getX() ); - softBody->m_nodes[vertex].m_x.setY( vertexPosition.getY() ); - softBody->m_nodes[vertex].m_x.setZ( vertexPosition.getZ() ); - - softBody->m_nodes[vertex].m_n.setX( normal.getX() ); - softBody->m_nodes[vertex].m_n.setY( normal.getY() ); - softBody->m_nodes[vertex].m_n.setZ( normal.getZ() ); - } - } -} // btOpenCLSoftBodySolver::copyBackToSoftBodies - -void btOpenCLSoftBodySolver::optimize( btAlignedObjectArray< btSoftBody * > &softBodies, bool forceUpdate ) -{ - if( forceUpdate || m_softBodySet.size() != softBodies.size() ) - { - // Have a change in the soft body set so update, reloading all the data - getVertexData().clear(); - getTriangleData().clear(); - getLinkData().clear(); - m_softBodySet.resize(0); - m_anchorIndex.clear(); - - int maxPiterations = 0; - int maxViterations = 0; - - for( int softBodyIndex = 0; softBodyIndex < softBodies.size(); ++softBodyIndex ) - { - btSoftBody *softBody = softBodies[ softBodyIndex ]; - using Vectormath::Aos::Matrix3; - using Vectormath::Aos::Point3; - - // Create SoftBody that will store the information within the solver - btOpenCLAcceleratedSoftBodyInterface *newSoftBody = new btOpenCLAcceleratedSoftBodyInterface( softBody ); - m_softBodySet.push_back( newSoftBody ); - - m_perClothAcceleration.push_back( toVector3(softBody->getWorldInfo()->m_gravity) ); - m_perClothDampingFactor.push_back(softBody->m_cfg.kDP); - m_perClothVelocityCorrectionCoefficient.push_back( softBody->m_cfg.kVCF ); - m_perClothLiftFactor.push_back( softBody->m_cfg.kLF ); - m_perClothDragFactor.push_back( softBody->m_cfg.kDG ); - m_perClothMediumDensity.push_back(softBody->getWorldInfo()->air_density); - // Simple init values. Actually we'll put 0 and -1 into them at the appropriate time - m_perClothFriction.push_back(softBody->m_cfg.kDF); - m_perClothCollisionObjects.push_back( CollisionObjectIndices(-1, -1) ); - - // Add space for new vertices and triangles in the default solver for now - // TODO: Include space here for tearing too later - int firstVertex = getVertexData().getNumVertices(); - int numVertices = softBody->m_nodes.size(); - int maxVertices = numVertices; - // Allocate space for new vertices in all the vertex arrays - getVertexData().createVertices( maxVertices, softBodyIndex ); - - int firstTriangle = getTriangleData().getNumTriangles(); - int numTriangles = softBody->m_faces.size(); - int maxTriangles = numTriangles; - getTriangleData().createTriangles( maxTriangles ); - - // Copy vertices from softbody into the solver - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - Point3 multPoint(softBody->m_nodes[vertex].m_x.getX(), softBody->m_nodes[vertex].m_x.getY(), softBody->m_nodes[vertex].m_x.getZ()); - btSoftBodyVertexData::VertexDescription desc; - - // TODO: Position in the softbody might be pre-transformed - // or we may need to adapt for the pose. - //desc.setPosition( cloth.getMeshTransform()*multPoint ); - desc.setPosition( multPoint ); - - float vertexInverseMass = softBody->m_nodes[vertex].m_im; - desc.setInverseMass(vertexInverseMass); - getVertexData().setVertexAt( desc, firstVertex + vertex ); - - m_anchorIndex.push_back(-1); - } - - // Copy triangles similarly - // We're assuming here that vertex indices are based on the firstVertex rather than the entire scene - for( int triangle = 0; triangle < numTriangles; ++triangle ) - { - // Note that large array storage is relative to the array not to the cloth - // So we need to add firstVertex to each value - int vertexIndex0 = (softBody->m_faces[triangle].m_n[0] - &(softBody->m_nodes[0])); - int vertexIndex1 = (softBody->m_faces[triangle].m_n[1] - &(softBody->m_nodes[0])); - int vertexIndex2 = (softBody->m_faces[triangle].m_n[2] - &(softBody->m_nodes[0])); - btSoftBodyTriangleData::TriangleDescription newTriangle(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, vertexIndex2 + firstVertex); - getTriangleData().setTriangleAt( newTriangle, firstTriangle + triangle ); - - // Increase vertex triangle counts for this triangle - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex0)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex1)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex2)++; - } - - int firstLink = getLinkData().getNumLinks(); - int numLinks = softBody->m_links.size(); -// int maxLinks = numLinks; - - // Allocate space for the links - getLinkData().createLinks( numLinks ); - - // Add the links - for( int link = 0; link < numLinks; ++link ) - { - int vertexIndex0 = softBody->m_links[link].m_n[0] - &(softBody->m_nodes[0]); - int vertexIndex1 = softBody->m_links[link].m_n[1] - &(softBody->m_nodes[0]); - - btSoftBodyLinkData::LinkDescription newLink(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, softBody->m_links[link].m_material->m_kLST); - newLink.setLinkStrength(1.f); - getLinkData().setLinkAt(newLink, firstLink + link); - } - - newSoftBody->setFirstVertex( firstVertex ); - newSoftBody->setFirstTriangle( firstTriangle ); - newSoftBody->setNumVertices( numVertices ); - newSoftBody->setMaxVertices( maxVertices ); - newSoftBody->setNumTriangles( numTriangles ); - newSoftBody->setMaxTriangles( maxTriangles ); - newSoftBody->setFirstLink( firstLink ); - newSoftBody->setNumLinks( numLinks ); - - // Find maximum piterations and viterations - int piterations = softBody->m_cfg.piterations; - - if ( piterations > maxPiterations ) - maxPiterations = piterations; - - int viterations = softBody->m_cfg.viterations; - - if ( viterations > maxViterations ) - maxViterations = viterations; - - // zero mass - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - if ( softBody->m_nodes[vertex].m_im == 0 ) - { - AnchorNodeInfoCL nodeInfo; - nodeInfo.clVertexIndex = firstVertex + vertex; - nodeInfo.pNode = &softBody->m_nodes[vertex]; - - m_anchorNodeInfoArray.push_back(nodeInfo); - } - } - - // anchor position - if ( numVertices > 0 ) - { - for ( int anchorIndex = 0; anchorIndex < softBody->m_anchors.size(); anchorIndex++ ) - { - btSoftBody::Node* anchorNode = softBody->m_anchors[anchorIndex].m_node; - btSoftBody::Node* firstNode = &softBody->m_nodes[0]; - - AnchorNodeInfoCL nodeInfo; - nodeInfo.clVertexIndex = firstVertex + (int)(anchorNode - firstNode); - nodeInfo.pNode = anchorNode; - - m_anchorNodeInfoArray.push_back(nodeInfo); - } - } - } - - - m_anchorPosition.clear(); - m_anchorPosition.resize(m_anchorNodeInfoArray.size()); - - for ( int anchorNode = 0; anchorNode < m_anchorNodeInfoArray.size(); anchorNode++ ) - { - const AnchorNodeInfoCL& anchorNodeInfo = m_anchorNodeInfoArray[anchorNode]; - m_anchorIndex[anchorNodeInfo.clVertexIndex] = anchorNode; - getVertexData().getInverseMass(anchorNodeInfo.clVertexIndex) = 0.0f; - } - - updateConstants(0.f); - - // set position and velocity iterations - setNumberOfPositionIterations(maxPiterations); - setNumberOfVelocityIterations(maxViterations); - - // set wind velocity - m_perClothWindVelocity.resize( m_softBodySet.size() ); - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btSoftBody *softBody = m_softBodySet[softBodyIndex]->getSoftBody(); - m_perClothWindVelocity[softBodyIndex] = toVector3(softBody->getWindVelocity()); - } - - m_clPerClothWindVelocity.changedOnCPU(); - - // generate batches - m_linkData.generateBatches(); - m_triangleData.generateBatches(); - - // Build the shaders to match the batching parameters - buildShaders(); - } -} - - -btSoftBodyLinkData &btOpenCLSoftBodySolver::getLinkData() -{ - // TODO: Consider setting link data to "changed" here - return m_linkData; -} - -btSoftBodyVertexData &btOpenCLSoftBodySolver::getVertexData() -{ - // TODO: Consider setting vertex data to "changed" here - return m_vertexData; -} - -btSoftBodyTriangleData &btOpenCLSoftBodySolver::getTriangleData() -{ - // TODO: Consider setting triangle data to "changed" here - return m_triangleData; -} - -void btOpenCLSoftBodySolver::resetNormalsAndAreas( int numVertices ) -{ - cl_int ciErrNum; - ciErrNum = clSetKernelArg(m_resetNormalsAndAreasKernel, 0, sizeof(numVertices), (void*)&numVertices); //oclCHECKERROR(ciErrNum, CL_SUCCESS); - ciErrNum = clSetKernelArg(m_resetNormalsAndAreasKernel, 1, sizeof(cl_mem), (void*)&m_vertexData.m_clVertexNormal.m_buffer);//oclCHECKERROR(ciErrNum, CL_SUCCESS); - ciErrNum = clSetKernelArg(m_resetNormalsAndAreasKernel, 2, sizeof(cl_mem), (void*)&m_vertexData.m_clVertexArea.m_buffer); //oclCHECKERROR(ciErrNum, CL_SUCCESS); - size_t numWorkItems = m_defaultWorkGroupSize*((numVertices + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue, m_resetNormalsAndAreasKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize, 0,0,0 ); - - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_resetNormalsAndAreasKernel)" ); - } - } - -} - -void btOpenCLSoftBodySolver::normalizeNormalsAndAreas( int numVertices ) -{ - cl_int ciErrNum; - - ciErrNum = clSetKernelArg(m_normalizeNormalsAndAreasKernel, 0, sizeof(int),(void*) &numVertices); - ciErrNum = clSetKernelArg(m_normalizeNormalsAndAreasKernel, 1, sizeof(cl_mem), &m_vertexData.m_clVertexTriangleCount.m_buffer); - ciErrNum = clSetKernelArg(m_normalizeNormalsAndAreasKernel, 2, sizeof(cl_mem), &m_vertexData.m_clVertexNormal.m_buffer); - ciErrNum = clSetKernelArg(m_normalizeNormalsAndAreasKernel, 3, sizeof(cl_mem), &m_vertexData.m_clVertexArea.m_buffer); - size_t numWorkItems = m_defaultWorkGroupSize*((numVertices + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue, m_normalizeNormalsAndAreasKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize, 0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_normalizeNormalsAndAreasKernel)"); - } - } - -} - -void btOpenCLSoftBodySolver::executeUpdateSoftBodies( int firstTriangle, int numTriangles ) -{ - cl_int ciErrNum; - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 0, sizeof(int), (void*) &firstTriangle); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 1, sizeof(int), &numTriangles); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 2, sizeof(cl_mem), &m_triangleData.m_clVertexIndices.m_buffer); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 3, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 4, sizeof(cl_mem), &m_vertexData.m_clVertexNormal.m_buffer); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 5, sizeof(cl_mem), &m_vertexData.m_clVertexArea.m_buffer); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 6, sizeof(cl_mem), &m_triangleData.m_clNormal.m_buffer); - ciErrNum = clSetKernelArg(m_updateSoftBodiesKernel, 7, sizeof(cl_mem), &m_triangleData.m_clArea.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((numTriangles + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue, m_updateSoftBodiesKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_normalizeNormalsAndAreasKernel)"); - } - -} - -void btOpenCLSoftBodySolver::updateSoftBodies() -{ - using namespace Vectormath::Aos; - - - int numVertices = m_vertexData.getNumVertices(); -// int numTriangles = m_triangleData.getNumTriangles(); - - // Ensure data is on accelerator - m_vertexData.moveToAccelerator(); - m_triangleData.moveToAccelerator(); - - resetNormalsAndAreas( numVertices ); - - - // Go through triangle batches so updates occur correctly - for( int batchIndex = 0; batchIndex < m_triangleData.m_batchStartLengths.size(); ++batchIndex ) - { - - int startTriangle = m_triangleData.m_batchStartLengths[batchIndex].first; - int numTriangles = m_triangleData.m_batchStartLengths[batchIndex].second; - - executeUpdateSoftBodies( startTriangle, numTriangles ); - } - - - normalizeNormalsAndAreas( numVertices ); -} // updateSoftBodies - - -Vectormath::Aos::Vector3 btOpenCLSoftBodySolver::ProjectOnAxis( const Vectormath::Aos::Vector3 &v, const Vectormath::Aos::Vector3 &a ) -{ - return a*Vectormath::Aos::dot(v, a); -} - -void btOpenCLSoftBodySolver::ApplyClampedForce( float solverdt, const Vectormath::Aos::Vector3 &force, const Vectormath::Aos::Vector3 &vertexVelocity, float inverseMass, Vectormath::Aos::Vector3 &vertexForce ) -{ - float dtInverseMass = solverdt*inverseMass; - if( Vectormath::Aos::lengthSqr(force * dtInverseMass) > Vectormath::Aos::lengthSqr(vertexVelocity) ) - { - vertexForce -= ProjectOnAxis( vertexVelocity, normalize( force ) )/dtInverseMass; - } else { - vertexForce += force; - } -} - -void btOpenCLSoftBodySolver::updateFixedVertexPositions() -{ - // Ensure data is on accelerator - m_vertexData.moveToAccelerator(); - m_clAnchorPosition.moveToGPU(); - m_clAnchorIndex.moveToGPU(); - - cl_int ciErrNum ; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_updateFixedVertexPositionsKernel, 0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_updateFixedVertexPositionsKernel,1, sizeof(cl_mem), &m_clAnchorIndex.m_buffer); - ciErrNum = clSetKernelArg(m_updateFixedVertexPositionsKernel,2, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updateFixedVertexPositionsKernel,3, sizeof(cl_mem), &m_clAnchorPosition.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_updateFixedVertexPositionsKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize, 0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_updateFixedVertexPositionsKernel)"); - } - } - -} - -void btOpenCLSoftBodySolver::applyForces( float solverdt ) -{ - // Ensure data is on accelerator - m_vertexData.moveToAccelerator(); - m_clPerClothAcceleration.moveToGPU(); - m_clPerClothLiftFactor.moveToGPU(); - m_clPerClothDragFactor.moveToGPU(); - m_clPerClothMediumDensity.moveToGPU(); - m_clPerClothWindVelocity.moveToGPU(); - - cl_int ciErrNum ; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 1, sizeof(float), &solverdt); - float fl = FLT_EPSILON; - ciErrNum = clSetKernelArg(m_applyForcesKernel, 2, sizeof(float), &fl); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 3, sizeof(cl_mem), &m_vertexData.m_clClothIdentifier.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 4, sizeof(cl_mem), &m_vertexData.m_clVertexNormal.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 5, sizeof(cl_mem), &m_vertexData.m_clVertexArea.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 6, sizeof(cl_mem), &m_vertexData.m_clVertexInverseMass.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 7, sizeof(cl_mem), &m_clPerClothLiftFactor.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 8 ,sizeof(cl_mem), &m_clPerClothDragFactor.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel, 9, sizeof(cl_mem), &m_clPerClothWindVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel,10, sizeof(cl_mem), &m_clPerClothAcceleration.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel,11, sizeof(cl_mem), &m_clPerClothMediumDensity.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel,12, sizeof(cl_mem), &m_vertexData.m_clVertexForceAccumulator.m_buffer); - ciErrNum = clSetKernelArg(m_applyForcesKernel,13, sizeof(cl_mem), &m_vertexData.m_clVertexVelocity.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_applyForcesKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize, 0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_applyForcesKernel)"); - } - } - -} - -/** - * Integrate motion on the solver. - */ -void btOpenCLSoftBodySolver::integrate( float solverdt ) -{ - // Ensure data is on accelerator - m_vertexData.moveToAccelerator(); - - cl_int ciErrNum; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_integrateKernel, 0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_integrateKernel, 1, sizeof(float), &solverdt); - ciErrNum = clSetKernelArg(m_integrateKernel, 2, sizeof(cl_mem), &m_vertexData.m_clVertexInverseMass.m_buffer); - ciErrNum = clSetKernelArg(m_integrateKernel, 3, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - ciErrNum = clSetKernelArg(m_integrateKernel, 4, sizeof(cl_mem), &m_vertexData.m_clVertexVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_integrateKernel, 5, sizeof(cl_mem), &m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_integrateKernel, 6, sizeof(cl_mem), &m_vertexData.m_clVertexForceAccumulator.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_integrateKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_integrateKernel)"); - } - } - -} - -float btOpenCLSoftBodySolver::computeTriangleArea( - const Vectormath::Aos::Point3 &vertex0, - const Vectormath::Aos::Point3 &vertex1, - const Vectormath::Aos::Point3 &vertex2 ) -{ - Vectormath::Aos::Vector3 a = vertex1 - vertex0; - Vectormath::Aos::Vector3 b = vertex2 - vertex0; - Vectormath::Aos::Vector3 crossProduct = cross(a, b); - float area = length( crossProduct ); - return area; -} - - -void btOpenCLSoftBodySolver::updateBounds() -{ - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btVector3 minBound(-1e30,-1e30,-1e30), maxBound(1e30,1e30,1e30); - m_softBodySet[softBodyIndex]->updateBounds( minBound, maxBound ); - } - -} // btOpenCLSoftBodySolver::updateBounds - - -void btOpenCLSoftBodySolver::updateConstants( float timeStep ) -{ - - using namespace Vectormath::Aos; - - if( m_updateSolverConstants ) - { - m_updateSolverConstants = false; - - // Will have to redo this if we change the structure (tear, maybe) or various other possible changes - - // Initialise link constants - const int numLinks = m_linkData.getNumLinks(); - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair &vertices( m_linkData.getVertexPair(linkIndex) ); - m_linkData.getRestLength(linkIndex) = length((m_vertexData.getPosition( vertices.vertex0 ) - m_vertexData.getPosition( vertices.vertex1 ))); - float invMass0 = m_vertexData.getInverseMass(vertices.vertex0); - float invMass1 = m_vertexData.getInverseMass(vertices.vertex1); - float linearStiffness = m_linkData.getLinearStiffnessCoefficient(linkIndex); - float massLSC = (invMass0 + invMass1)/linearStiffness; - m_linkData.getMassLSC(linkIndex) = massLSC; - float restLength = m_linkData.getRestLength(linkIndex); - float restLengthSquared = restLength*restLength; - m_linkData.getRestLengthSquared(linkIndex) = restLengthSquared; - } - } - -} - -class QuickSortCompare -{ - public: - - bool operator() ( const CollisionShapeDescription& a, const CollisionShapeDescription& b ) const - { - return ( a.softBodyIdentifier < b.softBodyIdentifier ); - } -}; - - -/** - * Sort the collision object details array and generate indexing into it for the per-cloth collision object array. - */ -void btOpenCLSoftBodySolver::prepareCollisionConstraints() -{ - // First do a simple sort on the collision objects - btAlignedObjectArray numObjectsPerClothPrefixSum; - btAlignedObjectArray numObjectsPerCloth; - numObjectsPerCloth.resize( m_softBodySet.size(), 0 ); - numObjectsPerClothPrefixSum.resize( m_softBodySet.size(), 0 ); - - - - m_collisionObjectDetails.quickSort( QuickSortCompare() ); - - if (!m_perClothCollisionObjects.size()) - return; - - // Generating indexing for perClothCollisionObjects - // First clear the previous values with the "no collision object for cloth" constant - for( int clothIndex = 0; clothIndex < m_perClothCollisionObjects.size(); ++clothIndex ) - { - m_perClothCollisionObjects[clothIndex].firstObject = -1; - m_perClothCollisionObjects[clothIndex].endObject = -1; - } - int currentCloth = 0; - int startIndex = 0; - for( int collisionObject = 0; collisionObject < m_collisionObjectDetails.size(); ++collisionObject ) - { - int nextCloth = m_collisionObjectDetails[collisionObject].softBodyIdentifier; - if( nextCloth != currentCloth ) - { - // Changed cloth in the array - // Set the end index and the range is what we need for currentCloth - m_perClothCollisionObjects[currentCloth].firstObject = startIndex; - m_perClothCollisionObjects[currentCloth].endObject = collisionObject; - currentCloth = nextCloth; - startIndex = collisionObject; - } - } - - // And update last cloth - m_perClothCollisionObjects[currentCloth].firstObject = startIndex; - m_perClothCollisionObjects[currentCloth].endObject = m_collisionObjectDetails.size(); - -} // btOpenCLSoftBodySolver::prepareCollisionConstraints - - - -void btOpenCLSoftBodySolver::solveConstraints( float solverdt ) -{ - - using Vectormath::Aos::Vector3; - using Vectormath::Aos::Point3; - using Vectormath::Aos::lengthSqr; - using Vectormath::Aos::dot; - - // Prepare links -// int numLinks = m_linkData.getNumLinks(); -// int numVertices = m_vertexData.getNumVertices(); - - float kst = 1.f; - float ti = 0.f; - - - m_clPerClothDampingFactor.moveToGPU(); - m_clPerClothVelocityCorrectionCoefficient.moveToGPU(); - - - // Ensure data is on accelerator - m_linkData.moveToAccelerator(); - m_vertexData.moveToAccelerator(); - - prepareLinks(); - - - - for( int iteration = 0; iteration < m_numberOfVelocityIterations ; ++iteration ) - { - for( int i = 0; i < m_linkData.m_batchStartLengths.size(); ++i ) - { - int startLink = m_linkData.m_batchStartLengths[i].start; - int numLinks = m_linkData.m_batchStartLengths[i].length; - - solveLinksForVelocity( startLink, numLinks, kst ); - } - } - - - prepareCollisionConstraints(); - - // Compute new positions from velocity - // Also update the previous position so that our position computation is now based on the new position from the velocity solution - // rather than based directly on the original positions - if( m_numberOfVelocityIterations > 0 ) - { - updateVelocitiesFromPositionsWithVelocities( 1.f/solverdt ); - } else { - updateVelocitiesFromPositionsWithoutVelocities( 1.f/solverdt ); - } - - // Solve position - for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - { - for( int i = 0; i < m_linkData.m_batchStartLengths.size(); ++i ) - { - int startLink = m_linkData.m_batchStartLengths[i].start; - int numLinks = m_linkData.m_batchStartLengths[i].length; - - solveLinksForPosition( startLink, numLinks, kst, ti ); - } - - } // for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - - - // At this point assume that the force array is blank - we will overwrite it - solveCollisionsAndUpdateVelocities( 1.f/solverdt ); - -} - - -////////////////////////////////////// -// Kernel dispatches -void btOpenCLSoftBodySolver::prepareLinks() -{ - cl_int ciErrNum; - int numLinks = m_linkData.getNumLinks(); - ciErrNum = clSetKernelArg(m_prepareLinksKernel,0, sizeof(int), &numLinks); - ciErrNum = clSetKernelArg(m_prepareLinksKernel,1, sizeof(cl_mem), &m_linkData.m_clLinks.m_buffer); - ciErrNum = clSetKernelArg(m_prepareLinksKernel,2, sizeof(cl_mem), &m_linkData.m_clLinksMassLSC.m_buffer); - ciErrNum = clSetKernelArg(m_prepareLinksKernel,3, sizeof(cl_mem), &m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_prepareLinksKernel,4, sizeof(cl_mem), &m_linkData.m_clLinksLengthRatio.m_buffer); - ciErrNum = clSetKernelArg(m_prepareLinksKernel,5, sizeof(cl_mem), &m_linkData.m_clLinksCLength.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_linkData.getNumLinks() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_prepareLinksKernel, 1 , NULL, &numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_prepareLinksKernel)"); - } - -} - -void btOpenCLSoftBodySolver::updatePositionsFromVelocities( float solverdt ) -{ - cl_int ciErrNum; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_updatePositionsFromVelocitiesKernel,0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_updatePositionsFromVelocitiesKernel,1, sizeof(float), &solverdt); - ciErrNum = clSetKernelArg(m_updatePositionsFromVelocitiesKernel,2, sizeof(cl_mem), &m_vertexData.m_clVertexVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_updatePositionsFromVelocitiesKernel,3, sizeof(cl_mem), &m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updatePositionsFromVelocitiesKernel,4, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_updatePositionsFromVelocitiesKernel, 1, NULL, &numWorkItems,&m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_updatePositionsFromVelocitiesKernel)"); - } - -} - -void btOpenCLSoftBodySolver::solveLinksForPosition( int startLink, int numLinks, float kst, float ti ) -{ - cl_int ciErrNum; - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,0, sizeof(int), &startLink); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,1, sizeof(int), &numLinks); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,2, sizeof(float), &kst); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,3, sizeof(float), &ti); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,4, sizeof(cl_mem), &m_linkData.m_clLinks.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,5, sizeof(cl_mem), &m_linkData.m_clLinksMassLSC.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,6, sizeof(cl_mem), &m_linkData.m_clLinksRestLengthSquared.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,7, sizeof(cl_mem), &m_vertexData.m_clVertexInverseMass.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,8, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((numLinks + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_solvePositionsFromLinksKernel,1,NULL,&numWorkItems,&m_defaultWorkGroupSize,0,0,0); - if( ciErrNum!= CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_solvePositionsFromLinksKernel)"); - } - -} // solveLinksForPosition - - -void btOpenCLSoftBodySolver::solveLinksForVelocity( int startLink, int numLinks, float kst ) -{ - cl_int ciErrNum; - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 0, sizeof(int), &startLink); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 1, sizeof(int), &numLinks); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 2, sizeof(float), &kst); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 3, sizeof(cl_mem), &m_linkData.m_clLinks.m_buffer); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 4, sizeof(cl_mem), &m_linkData.m_clLinksLengthRatio.m_buffer); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 5, sizeof(cl_mem), &m_linkData.m_clLinksCLength.m_buffer); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 6, sizeof(cl_mem), &m_vertexData.m_clVertexInverseMass.m_buffer); - ciErrNum = clSetKernelArg(m_vSolveLinksKernel, 7, sizeof(cl_mem), &m_vertexData.m_clVertexVelocity.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((numLinks + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_vSolveLinksKernel,1,NULL,&numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_vSolveLinksKernel)"); - } - -} - -void btOpenCLSoftBodySolver::updateVelocitiesFromPositionsWithVelocities( float isolverdt ) -{ - cl_int ciErrNum; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel,0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 1, sizeof(float), &isolverdt); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 2, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 3, sizeof(cl_mem), &m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 4, sizeof(cl_mem), &m_vertexData.m_clClothIdentifier.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 5, sizeof(cl_mem), &m_clPerClothVelocityCorrectionCoefficient.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 6, sizeof(cl_mem), &m_clPerClothDampingFactor.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 7, sizeof(cl_mem), &m_vertexData.m_clVertexVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithVelocitiesKernel, 8, sizeof(cl_mem), &m_vertexData.m_clVertexForceAccumulator.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_updateVelocitiesFromPositionsWithVelocitiesKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_updateVelocitiesFromPositionsWithVelocitiesKernel)"); - } - - -} // updateVelocitiesFromPositionsWithVelocities - -void btOpenCLSoftBodySolver::updateVelocitiesFromPositionsWithoutVelocities( float isolverdt ) -{ - cl_int ciErrNum; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 1, sizeof(float), &isolverdt); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 2, sizeof(cl_mem),&m_vertexData.m_clVertexPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 3, sizeof(cl_mem),&m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 4, sizeof(cl_mem),&m_vertexData.m_clClothIdentifier.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 5, sizeof(cl_mem),&m_clPerClothDampingFactor.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 6, sizeof(cl_mem),&m_vertexData.m_clVertexVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 7, sizeof(cl_mem),&m_vertexData.m_clVertexForceAccumulator.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_updateVelocitiesFromPositionsWithoutVelocitiesKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel)"); - } - -} // updateVelocitiesFromPositionsWithoutVelocities - - - -void btOpenCLSoftBodySolver::solveCollisionsAndUpdateVelocities( float isolverdt ) -{ - // Copy kernel parameters to GPU - m_vertexData.moveToAccelerator(); - m_clPerClothFriction.moveToGPU(); - m_clPerClothDampingFactor.moveToGPU(); - m_clPerClothCollisionObjects.moveToGPU(); - m_clCollisionObjectDetails.moveToGPU(); - - cl_int ciErrNum; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 1, sizeof(int), &isolverdt); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 2, sizeof(cl_mem),&m_vertexData.m_clClothIdentifier.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 3, sizeof(cl_mem),&m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 4, sizeof(cl_mem),&m_clPerClothFriction.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 5, sizeof(cl_mem),&m_clPerClothDampingFactor.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 6, sizeof(cl_mem),&m_clPerClothCollisionObjects.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 7, sizeof(cl_mem),&m_clCollisionObjectDetails.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 8, sizeof(cl_mem),&m_vertexData.m_clVertexForceAccumulator.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 9, sizeof(cl_mem),&m_vertexData.m_clVertexVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 10, sizeof(cl_mem),&m_vertexData.m_clVertexPosition.m_buffer); - - size_t numWorkItems = m_defaultWorkGroupSize*((m_vertexData.getNumVertices() + (m_defaultWorkGroupSize-1)) / m_defaultWorkGroupSize); - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_solveCollisionsAndUpdateVelocitiesKernel, 1, NULL, &numWorkItems, &m_defaultWorkGroupSize,0,0,0); - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_updateVelocitiesFromPositionsWithoutVelocitiesKernel)"); - } - } - -} // btOpenCLSoftBodySolver::updateVelocitiesFromPositionsWithoutVelocities - - - -// End kernel dispatches -///////////////////////////////////// - - -void btSoftBodySolverOutputCLtoCPU::copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ) -{ - - btSoftBodySolver *solver = softBody->getSoftBodySolver(); - btAssert( solver->getSolverType() == btSoftBodySolver::CL_SOLVER || solver->getSolverType() == btSoftBodySolver::CL_SIMD_SOLVER ); - btOpenCLSoftBodySolver *dxSolver = static_cast< btOpenCLSoftBodySolver * >( solver ); - - btOpenCLAcceleratedSoftBodyInterface* currentCloth = dxSolver->findSoftBodyInterface( softBody ); - btSoftBodyVertexDataOpenCL &vertexData( dxSolver->m_vertexData ); - - - const int firstVertex = currentCloth->getFirstVertex(); - const int lastVertex = firstVertex + currentCloth->getNumVertices(); - - if( vertexBuffer->getBufferType() == btVertexBufferDescriptor::CPU_BUFFER ) - { - const btCPUVertexBufferDescriptor *cpuVertexBuffer = static_cast< btCPUVertexBufferDescriptor* >(vertexBuffer); - float *basePointer = cpuVertexBuffer->getBasePointer(); - - vertexData.m_clVertexPosition.copyFromGPU(); - vertexData.m_clVertexNormal.copyFromGPU(); - - if( vertexBuffer->hasVertexPositions() ) - { - const int vertexOffset = cpuVertexBuffer->getVertexOffset(); - const int vertexStride = cpuVertexBuffer->getVertexStride(); - float *vertexPointer = basePointer + vertexOffset; - - for( int vertexIndex = firstVertex; vertexIndex < lastVertex; ++vertexIndex ) - { - Vectormath::Aos::Point3 position = vertexData.getPosition(vertexIndex); - *(vertexPointer + 0) = position.getX(); - *(vertexPointer + 1) = position.getY(); - *(vertexPointer + 2) = position.getZ(); - vertexPointer += vertexStride; - } - } - if( vertexBuffer->hasNormals() ) - { - const int normalOffset = cpuVertexBuffer->getNormalOffset(); - const int normalStride = cpuVertexBuffer->getNormalStride(); - float *normalPointer = basePointer + normalOffset; - - for( int vertexIndex = firstVertex; vertexIndex < lastVertex; ++vertexIndex ) - { - Vectormath::Aos::Vector3 normal = vertexData.getNormal(vertexIndex); - *(normalPointer + 0) = normal.getX(); - *(normalPointer + 1) = normal.getY(); - *(normalPointer + 2) = normal.getZ(); - normalPointer += normalStride; - } - } - } - -} // btSoftBodySolverOutputCLtoCPU::outputToVertexBuffers - - - -cl_kernel CLFunctions::compileCLKernelFromString( const char* kernelSource, const char* kernelName, const char* additionalMacros ,const char* orgSrcFileNameForCaching) -{ - printf("compiling kernelName: %s ",kernelName); - cl_kernel kernel=0; - cl_int ciErrNum; - size_t program_length = strlen(kernelSource); - - cl_program m_cpProgram = clCreateProgramWithSource(m_cxMainContext, 1, (const char**)&kernelSource, &program_length, &ciErrNum); -// oclCHECKERROR(ciErrNum, CL_SUCCESS); - - // Build the program with 'mad' Optimization option - - -#ifdef MAC - char* flags = "-cl-mad-enable -DMAC -DGUID_ARG"; -#else - //const char* flags = "-DGUID_ARG= -fno-alias"; - const char* flags = "-DGUID_ARG= "; -#endif - - char* compileFlags = new char[strlen(additionalMacros) + strlen(flags) + 5]; - sprintf(compileFlags, "%s %s", flags, additionalMacros); - ciErrNum = clBuildProgram(m_cpProgram, 0, NULL, compileFlags, NULL, NULL); - if (ciErrNum != CL_SUCCESS) - { - size_t numDevices; - clGetProgramInfo( m_cpProgram, CL_PROGRAM_DEVICES, 0, 0, &numDevices ); - cl_device_id *devices = new cl_device_id[numDevices]; - clGetProgramInfo( m_cpProgram, CL_PROGRAM_DEVICES, numDevices, devices, &numDevices ); - for( int i = 0; i < 2; ++i ) - { - char *build_log; - size_t ret_val_size; - clGetProgramBuildInfo(m_cpProgram, devices[i], CL_PROGRAM_BUILD_LOG, 0, NULL, &ret_val_size); - build_log = new char[ret_val_size+1]; - clGetProgramBuildInfo(m_cpProgram, devices[i], CL_PROGRAM_BUILD_LOG, ret_val_size, build_log, NULL); - - // to be carefully, terminate with \0 - // there's no information in the reference whether the string is 0 terminated or not - build_log[ret_val_size] = '\0'; - - - printf("Error in clBuildProgram, Line %u in file %s, Log: \n%s\n !!!\n\n", __LINE__, __FILE__, build_log); - delete[] build_log; - } -#ifndef BT_SUPPRESS_OPENCL_ASSERTS - btAssert(0); -#endif //BT_SUPPRESS_OPENCL_ASSERTS - m_kernelCompilationFailures++; - return 0; - } - - - // Create the kernel - kernel = clCreateKernel(m_cpProgram, kernelName, &ciErrNum); - if (ciErrNum != CL_SUCCESS) - { - const char* msg = ""; - switch(ciErrNum) - { - case CL_INVALID_PROGRAM: - msg = "Program is not a valid program object."; - break; - case CL_INVALID_PROGRAM_EXECUTABLE: - msg = "There is no successfully built executable for program."; - break; - case CL_INVALID_KERNEL_NAME: - msg = "kernel_name is not found in program."; - break; - case CL_INVALID_KERNEL_DEFINITION: - msg = "the function definition for __kernel function given by kernel_name such as the number of arguments, the argument types are not the same for all devices for which the program executable has been built."; - break; - case CL_INVALID_VALUE: - msg = "kernel_name is NULL."; - break; - case CL_OUT_OF_HOST_MEMORY: - msg = "Failure to allocate resources required by the OpenCL implementation on the host."; - break; - default: - { - } - } - - printf("Error in clCreateKernel for kernel '%s', error is \"%s\", Line %u in file %s !!!\n\n", kernelName, msg, __LINE__, __FILE__); - -#ifndef BT_SUPPRESS_OPENCL_ASSERTS - btAssert(0); -#endif //BT_SUPPRESS_OPENCL_ASSERTS - m_kernelCompilationFailures++; - return 0; - } - - printf("ready. \n"); - delete [] compileFlags; - if (!kernel) - m_kernelCompilationFailures++; - return kernel; - -} - -void btOpenCLSoftBodySolver::predictMotion( float timeStep ) -{ - // Clear the collision shape array for the next frame - // Ensure that the DX11 ones are moved off the device so they will be updated correctly - m_clCollisionObjectDetails.changedOnCPU(); - m_clPerClothCollisionObjects.changedOnCPU(); - m_collisionObjectDetails.clear(); - - if ( m_bUpdateAnchoredNodePos ) - { - // In OpenCL cloth solver, if softbody node has zero inverse mass(infinite mass) or anchor attached, - // we need to update the node position in case the node or anchor is animated externally. - // If there is no such node, we can eliminate the unnecessary CPU-to-GPU data trasferring. - for ( int i = 0; i < m_anchorNodeInfoArray.size(); i++ ) - { - const AnchorNodeInfoCL& anchorNodeInfo = m_anchorNodeInfoArray[i]; - btSoftBody::Node* node = anchorNodeInfo.pNode; - - using Vectormath::Aos::Point3; - Point3 pos((float)node->m_x.getX(), (float)node->m_x.getY(), (float)node->m_x.getZ()); - m_anchorPosition[i] = pos; - } - - if ( m_anchorNodeInfoArray.size() > 0 ) - m_clAnchorPosition.changedOnCPU(); - - updateFixedVertexPositions(); - } - - { - BT_PROFILE("applyForces"); - // Apply forces that we know about to the cloths - applyForces( timeStep * getTimeScale() ); - } - - { - BT_PROFILE("integrate"); - // Itegrate motion for all soft bodies dealt with by the solver - integrate( timeStep * getTimeScale() ); - } - - { - BT_PROFILE("updateBounds"); - updateBounds(); - } - // End prediction work for solvers -} - -static Vectormath::Aos::Transform3 toTransform3( const btTransform &transform ) -{ - Vectormath::Aos::Transform3 outTransform; - outTransform.setCol(0, toVector3(transform.getBasis().getColumn(0))); - outTransform.setCol(1, toVector3(transform.getBasis().getColumn(1))); - outTransform.setCol(2, toVector3(transform.getBasis().getColumn(2))); - outTransform.setCol(3, toVector3(transform.getOrigin())); - return outTransform; -} - -void btOpenCLAcceleratedSoftBodyInterface::updateBounds( const btVector3 &lowerBound, const btVector3 &upperBound ) -{ - float scalarMargin = (float)getSoftBody()->getCollisionShape()->getMargin(); - btVector3 vectorMargin( scalarMargin, scalarMargin, scalarMargin ); - m_softBody->m_bounds[0] = lowerBound - vectorMargin; - m_softBody->m_bounds[1] = upperBound + vectorMargin; -} // btOpenCLSoftBodySolver::btDX11AcceleratedSoftBodyInterface::updateBounds - -void btOpenCLSoftBodySolver::processCollision( btSoftBody*, btSoftBody* ) -{ - -} - -// Add the collision object to the set to deal with for a particular soft body -void btOpenCLSoftBodySolver::processCollision( btSoftBody *softBody, const btCollisionObjectWrapper* collisionObject ) -{ - int softBodyIndex = findSoftBodyIndex( softBody ); - - if( softBodyIndex >= 0 ) - { - const btCollisionShape *collisionShape = collisionObject->getCollisionShape(); - float friction = collisionObject->getCollisionObject()->getFriction(); - int shapeType = collisionShape->getShapeType(); - if( shapeType == CAPSULE_SHAPE_PROXYTYPE ) - { - // Add to the list of expected collision objects - CollisionShapeDescription newCollisionShapeDescription; - newCollisionShapeDescription.softBodyIdentifier = softBodyIndex; - newCollisionShapeDescription.collisionShapeType = shapeType; - // TODO: May need to transpose this matrix either here or in HLSL - newCollisionShapeDescription.shapeTransform = toTransform3(collisionObject->getWorldTransform()); - const btCapsuleShape *capsule = static_cast( collisionShape ); - newCollisionShapeDescription.radius = capsule->getRadius(); - newCollisionShapeDescription.halfHeight = capsule->getHalfHeight(); - newCollisionShapeDescription.margin = capsule->getMargin(); - newCollisionShapeDescription.upAxis = capsule->getUpAxis(); - newCollisionShapeDescription.friction = friction; - const btRigidBody* body = static_cast< const btRigidBody* >( collisionObject->getCollisionObject() ); - newCollisionShapeDescription.linearVelocity = toVector3(body->getLinearVelocity()); - newCollisionShapeDescription.angularVelocity = toVector3(body->getAngularVelocity()); - m_collisionObjectDetails.push_back( newCollisionShapeDescription ); - - } - else { -#ifdef _DEBUG - printf("Unsupported collision shape type\n"); -#endif - //btAssert(0 && "Unsupported collision shape type\n"); - } - } else { - btAssert(0 && "Unknown soft body"); - } -} // btOpenCLSoftBodySolver::processCollision - - - - - -btOpenCLAcceleratedSoftBodyInterface* btOpenCLSoftBodySolver::findSoftBodyInterface( const btSoftBody* const softBody ) -{ - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btOpenCLAcceleratedSoftBodyInterface* softBodyInterface = m_softBodySet[softBodyIndex]; - if( softBodyInterface->getSoftBody() == softBody ) - return softBodyInterface; - } - return 0; -} - - -int btOpenCLSoftBodySolver::findSoftBodyIndex( const btSoftBody* const softBody ) -{ - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btOpenCLAcceleratedSoftBodyInterface* softBodyInterface = m_softBodySet[softBodyIndex]; - if( softBodyInterface->getSoftBody() == softBody ) - return softBodyIndex; - } - return 1; -} - -bool btOpenCLSoftBodySolver::checkInitialized() -{ - if( !m_shadersInitialized ) - if( buildShaders() ) - m_shadersInitialized = true; - - return m_shadersInitialized; -} - -bool btOpenCLSoftBodySolver::buildShaders() -{ - if( m_shadersInitialized ) - return true; - - const char* additionalMacros=""; - - // Ensure current kernels are released first - releaseKernels(); - - m_currentCLFunctions->clearKernelCompilationFailures(); - - m_prepareLinksKernel = m_currentCLFunctions->compileCLKernelFromString( PrepareLinksCLString, "PrepareLinksKernel",additionalMacros,"OpenCLC10/PrepareLinks.cl" ); - m_updatePositionsFromVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdatePositionsFromVelocitiesCLString, "UpdatePositionsFromVelocitiesKernel" ,additionalMacros,"OpenCLC10/UpdatePositionsFromVelocities.cl"); - m_solvePositionsFromLinksKernel = m_currentCLFunctions->compileCLKernelFromString( SolvePositionsCLString, "SolvePositionsFromLinksKernel",additionalMacros,"OpenCLC10/SolvePositions.cl" ); - m_vSolveLinksKernel = m_currentCLFunctions->compileCLKernelFromString( VSolveLinksCLString, "VSolveLinksKernel" ,additionalMacros,"OpenCLC10/VSolveLinks.cl"); - m_updateVelocitiesFromPositionsWithVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNodesCLString, "updateVelocitiesFromPositionsWithVelocitiesKernel" ,additionalMacros,"OpenCLC10/UpdateNodes.cl"); - m_updateVelocitiesFromPositionsWithoutVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdatePositionsCLString, "updateVelocitiesFromPositionsWithoutVelocitiesKernel" ,additionalMacros,"OpenCLC10/UpdatePositions.cl"); - m_solveCollisionsAndUpdateVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( SolveCollisionsAndUpdateVelocitiesCLString, "SolveCollisionsAndUpdateVelocitiesKernel" ,additionalMacros,"OpenCLC10/SolveCollisionsAndUpdateVelocities.cl"); - m_integrateKernel = m_currentCLFunctions->compileCLKernelFromString( IntegrateCLString, "IntegrateKernel" ,additionalMacros,"OpenCLC10/Integrate.cl"); - m_applyForcesKernel = m_currentCLFunctions->compileCLKernelFromString( ApplyForcesCLString, "ApplyForcesKernel" ,additionalMacros,"OpenCLC10/ApplyForces.cl"); - m_updateFixedVertexPositionsKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateFixedVertexPositionsCLString, "UpdateFixedVertexPositions" , additionalMacros, "OpenCLC10/UpdateFixedVertexPositions.cl"); - - // TODO: Rename to UpdateSoftBodies - m_resetNormalsAndAreasKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNormalsCLString, "ResetNormalsAndAreasKernel" ,additionalMacros,"OpenCLC10/UpdateNormals.cl"); - m_normalizeNormalsAndAreasKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNormalsCLString, "NormalizeNormalsAndAreasKernel" ,additionalMacros,"OpenCLC10/UpdateNormals.cl"); - m_updateSoftBodiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNormalsCLString, "UpdateSoftBodiesKernel" ,additionalMacros,"OpenCLC10/UpdateNormals.cl"); - - - if( m_currentCLFunctions->getKernelCompilationFailures()==0 ) - m_shadersInitialized = true; - - return m_shadersInitialized; -} - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h deleted file mode 100644 index 6de58c4f1..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h +++ /dev/null @@ -1,527 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_OPENCL_H -#define BT_SOFT_BODY_SOLVER_OPENCL_H - -#include "stddef.h" //for size_t -#include "vectormath/vmInclude.h" - -#include "BulletSoftBody/btSoftBodySolvers.h" -#include "BulletSoftBody/btSoftBody.h" -#include "btSoftBodySolverBuffer_OpenCL.h" -#include "btSoftBodySolverLinkData_OpenCL.h" -#include "btSoftBodySolverVertexData_OpenCL.h" -#include "btSoftBodySolverTriangleData_OpenCL.h" - -class CLFunctions -{ -protected: - cl_command_queue m_cqCommandQue; - cl_context m_cxMainContext; - - int m_kernelCompilationFailures; - - -public: - CLFunctions(cl_command_queue cqCommandQue, cl_context cxMainContext) : - m_cqCommandQue( cqCommandQue ), - m_cxMainContext( cxMainContext ), - m_kernelCompilationFailures(0) - { - } - - int getKernelCompilationFailures() const - { - return m_kernelCompilationFailures; - } - - /** - * Compile a compute shader kernel from a string and return the appropriate cl_kernel object. - */ - virtual cl_kernel compileCLKernelFromString( const char* kernelSource, const char* kernelName, const char* additionalMacros, const char* srcFileNameForCaching); - - void clearKernelCompilationFailures() - { - m_kernelCompilationFailures=0; - } -}; - -/** - * Entry in the collision shape array. - * Specifies the shape type, the transform matrix and the necessary details of the collisionShape. - */ -struct CollisionShapeDescription -{ - Vectormath::Aos::Transform3 shapeTransform; - Vectormath::Aos::Vector3 linearVelocity; - Vectormath::Aos::Vector3 angularVelocity; - - int softBodyIdentifier; - int collisionShapeType; - - // Both needed for capsule - float radius; - float halfHeight; - int upAxis; - - float margin; - float friction; - - CollisionShapeDescription() - { - collisionShapeType = 0; - margin = 0; - friction = 0; - } -}; - -/** - * SoftBody class to maintain information about a soft body instance - * within a solver. - * This data addresses the main solver arrays. - */ -class btOpenCLAcceleratedSoftBodyInterface -{ -protected: - /** Current number of vertices that are part of this cloth */ - int m_numVertices; - /** Maximum number of vertices allocated to be part of this cloth */ - int m_maxVertices; - /** Current number of triangles that are part of this cloth */ - int m_numTriangles; - /** Maximum number of triangles allocated to be part of this cloth */ - int m_maxTriangles; - /** Index of first vertex in the world allocated to this cloth */ - int m_firstVertex; - /** Index of first triangle in the world allocated to this cloth */ - int m_firstTriangle; - /** Index of first link in the world allocated to this cloth */ - int m_firstLink; - /** Maximum number of links allocated to this cloth */ - int m_maxLinks; - /** Current number of links allocated to this cloth */ - int m_numLinks; - - /** The actual soft body this data represents */ - btSoftBody *m_softBody; - - -public: - btOpenCLAcceleratedSoftBodyInterface( btSoftBody *softBody ) : - m_softBody( softBody ) - { - m_numVertices = 0; - m_maxVertices = 0; - m_numTriangles = 0; - m_maxTriangles = 0; - m_firstVertex = 0; - m_firstTriangle = 0; - m_firstLink = 0; - m_maxLinks = 0; - m_numLinks = 0; - } - int getNumVertices() - { - return m_numVertices; - } - - int getNumTriangles() - { - return m_numTriangles; - } - - int getMaxVertices() - { - return m_maxVertices; - } - - int getMaxTriangles() - { - return m_maxTriangles; - } - - int getFirstVertex() - { - return m_firstVertex; - } - - int getFirstTriangle() - { - return m_firstTriangle; - } - - /** - * Update the bounds in the btSoftBody object - */ - void updateBounds( const btVector3 &lowerBound, const btVector3 &upperBound ); - - // TODO: All of these set functions will have to do checks and - // update the world because restructuring of the arrays will be necessary - // Reasonable use of "friend"? - void setNumVertices( int numVertices ) - { - m_numVertices = numVertices; - } - - void setNumTriangles( int numTriangles ) - { - m_numTriangles = numTriangles; - } - - void setMaxVertices( int maxVertices ) - { - m_maxVertices = maxVertices; - } - - void setMaxTriangles( int maxTriangles ) - { - m_maxTriangles = maxTriangles; - } - - void setFirstVertex( int firstVertex ) - { - m_firstVertex = firstVertex; - } - - void setFirstTriangle( int firstTriangle ) - { - m_firstTriangle = firstTriangle; - } - - void setMaxLinks( int maxLinks ) - { - m_maxLinks = maxLinks; - } - - void setNumLinks( int numLinks ) - { - m_numLinks = numLinks; - } - - void setFirstLink( int firstLink ) - { - m_firstLink = firstLink; - } - - int getMaxLinks() - { - return m_maxLinks; - } - - int getNumLinks() - { - return m_numLinks; - } - - int getFirstLink() - { - return m_firstLink; - } - - btSoftBody* getSoftBody() - { - return m_softBody; - } - -}; - - - -class btOpenCLSoftBodySolver : public btSoftBodySolver -{ -public: - - - struct UIntVector3 - { - UIntVector3() - { - x = 0; - y = 0; - z = 0; - _padding = 0; - } - - UIntVector3( unsigned int x_, unsigned int y_, unsigned int z_ ) - { - x = x_; - y = y_; - z = z_; - _padding = 0; - } - - unsigned int x; - unsigned int y; - unsigned int z; - unsigned int _padding; - }; - - struct CollisionObjectIndices - { - CollisionObjectIndices( int f, int e ) - { - firstObject = f; - endObject = e; - } - - int firstObject; - int endObject; - }; - - btSoftBodyLinkDataOpenCL m_linkData; - btSoftBodyVertexDataOpenCL m_vertexData; - btSoftBodyTriangleDataOpenCL m_triangleData; - -protected: - - CLFunctions m_defaultCLFunctions; - CLFunctions* m_currentCLFunctions; - - /** Variable to define whether we need to update solver constants on the next iteration */ - bool m_updateSolverConstants; - - bool m_shadersInitialized; - - /** - * Cloths owned by this solver. - * Only our cloths are in this array. - */ - btAlignedObjectArray< btOpenCLAcceleratedSoftBodyInterface * > m_softBodySet; - - /** Acceleration value to be applied to all non-static vertices in the solver. - * Index n is cloth n, array sized by number of cloths in the world not the solver. - */ - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_perClothAcceleration; - btOpenCLBuffer m_clPerClothAcceleration; - - /** Wind velocity to be applied normal to all non-static vertices in the solver. - * Index n is cloth n, array sized by number of cloths in the world not the solver. - */ - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_perClothWindVelocity; - btOpenCLBuffer m_clPerClothWindVelocity; - - /** Velocity damping factor */ - btAlignedObjectArray< float > m_perClothDampingFactor; - btOpenCLBuffer m_clPerClothDampingFactor; - - /** Velocity correction coefficient */ - btAlignedObjectArray< float > m_perClothVelocityCorrectionCoefficient; - btOpenCLBuffer m_clPerClothVelocityCorrectionCoefficient; - - /** Lift parameter for wind effect on cloth. */ - btAlignedObjectArray< float > m_perClothLiftFactor; - btOpenCLBuffer m_clPerClothLiftFactor; - - /** Drag parameter for wind effect on cloth. */ - btAlignedObjectArray< float > m_perClothDragFactor; - btOpenCLBuffer m_clPerClothDragFactor; - - /** Density of the medium in which each cloth sits */ - btAlignedObjectArray< float > m_perClothMediumDensity; - btOpenCLBuffer m_clPerClothMediumDensity; - - /** - * Collision shape details: pair of index of first collision shape for the cloth and number of collision objects. - */ - btAlignedObjectArray< CollisionObjectIndices > m_perClothCollisionObjects; - btOpenCLBuffer m_clPerClothCollisionObjects; - - /** - * Collision shapes being passed across to the cloths in this solver. - */ - btAlignedObjectArray< CollisionShapeDescription > m_collisionObjectDetails; - btOpenCLBuffer< CollisionShapeDescription > m_clCollisionObjectDetails; - - - - /** - * Friction coefficient for each cloth - */ - btAlignedObjectArray< float > m_perClothFriction; - btOpenCLBuffer< float > m_clPerClothFriction; - - // anchor node info - struct AnchorNodeInfoCL - { - int clVertexIndex; - btSoftBody::Node* pNode; - }; - - btAlignedObjectArray m_anchorNodeInfoArray; - btAlignedObjectArray m_anchorPosition; - btOpenCLBuffer m_clAnchorPosition; - btAlignedObjectArray m_anchorIndex; - btOpenCLBuffer m_clAnchorIndex; - - bool m_bUpdateAnchoredNodePos; - - cl_kernel m_prepareLinksKernel; - cl_kernel m_solvePositionsFromLinksKernel; - cl_kernel m_updateConstantsKernel; - cl_kernel m_integrateKernel; - cl_kernel m_addVelocityKernel; - cl_kernel m_updatePositionsFromVelocitiesKernel; - cl_kernel m_updateVelocitiesFromPositionsWithoutVelocitiesKernel; - cl_kernel m_updateVelocitiesFromPositionsWithVelocitiesKernel; - cl_kernel m_vSolveLinksKernel; - cl_kernel m_solveCollisionsAndUpdateVelocitiesKernel; - cl_kernel m_resetNormalsAndAreasKernel; - cl_kernel m_normalizeNormalsAndAreasKernel; - cl_kernel m_updateSoftBodiesKernel; - - cl_kernel m_outputToVertexArrayKernel; - cl_kernel m_applyForcesKernel; - cl_kernel m_updateFixedVertexPositionsKernel; - - cl_command_queue m_cqCommandQue; - cl_context m_cxMainContext; - - size_t m_defaultWorkGroupSize; - - - virtual bool buildShaders(); - - void resetNormalsAndAreas( int numVertices ); - - void normalizeNormalsAndAreas( int numVertices ); - - void executeUpdateSoftBodies( int firstTriangle, int numTriangles ); - - void prepareCollisionConstraints(); - - Vectormath::Aos::Vector3 ProjectOnAxis( const Vectormath::Aos::Vector3 &v, const Vectormath::Aos::Vector3 &a ); - - void ApplyClampedForce( float solverdt, const Vectormath::Aos::Vector3 &force, const Vectormath::Aos::Vector3 &vertexVelocity, float inverseMass, Vectormath::Aos::Vector3 &vertexForce ); - - - int findSoftBodyIndex( const btSoftBody* const softBody ); - - virtual void applyForces( float solverdt ); - - void updateFixedVertexPositions(); - - /** - * Integrate motion on the solver. - */ - virtual void integrate( float solverdt ); - - virtual void updateConstants( float timeStep ); - - float computeTriangleArea( - const Vectormath::Aos::Point3 &vertex0, - const Vectormath::Aos::Point3 &vertex1, - const Vectormath::Aos::Point3 &vertex2 ); - - - ////////////////////////////////////// - // Kernel dispatches - void prepareLinks(); - - void solveLinksForVelocity( int startLink, int numLinks, float kst ); - - void updatePositionsFromVelocities( float solverdt ); - - virtual void solveLinksForPosition( int startLink, int numLinks, float kst, float ti ); - - void updateVelocitiesFromPositionsWithVelocities( float isolverdt ); - - void updateVelocitiesFromPositionsWithoutVelocities( float isolverdt ); - virtual void solveCollisionsAndUpdateVelocities( float isolverdt ); - - // End kernel dispatches - ///////////////////////////////////// - - void updateBounds(); - - void releaseKernels(); - -public: - btOpenCLSoftBodySolver(cl_command_queue queue,cl_context ctx, bool bUpdateAchchoredNodePos = false); - - virtual ~btOpenCLSoftBodySolver(); - - - - btOpenCLAcceleratedSoftBodyInterface *findSoftBodyInterface( const btSoftBody* const softBody ); - - virtual btSoftBodyLinkData &getLinkData(); - - virtual btSoftBodyVertexData &getVertexData(); - - virtual btSoftBodyTriangleData &getTriangleData(); - - virtual SolverTypes getSolverType() const - { - return CL_SOLVER; - } - - - virtual bool checkInitialized(); - - virtual void updateSoftBodies( ); - - virtual void optimize( btAlignedObjectArray< btSoftBody * > &softBodies , bool forceUpdate=false); - - virtual void copyBackToSoftBodies(bool bMove = true); - - virtual void solveConstraints( float solverdt ); - - virtual void predictMotion( float solverdt ); - - virtual void processCollision( btSoftBody *, const btCollisionObjectWrapper* ); - - virtual void processCollision( btSoftBody*, btSoftBody* ); - - virtual void setDefaultWorkgroupSize(size_t workGroupSize) - { - m_defaultWorkGroupSize = workGroupSize; - } - virtual size_t getDefaultWorkGroupSize() const - { - return m_defaultWorkGroupSize; - } - - void setCLFunctions(CLFunctions* funcs) - { - if (funcs) - m_currentCLFunctions = funcs; - else - m_currentCLFunctions = &m_defaultCLFunctions; - } - -}; // btOpenCLSoftBodySolver - - -/** - * Class to manage movement of data from a solver to a given target. - * This version is the CL to CPU version. - */ -class btSoftBodySolverOutputCLtoCPU : public btSoftBodySolverOutput -{ -protected: - -public: - btSoftBodySolverOutputCLtoCPU() - { - } - - /** Output current computed vertex data to the vertex buffers for all cloths in the solver. */ - virtual void copySoftBodyToVertexBuffer( const btSoftBody * const softBody, btVertexBufferDescriptor *vertexBuffer ); -}; - - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_OPENCL_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.cpp deleted file mode 100644 index 0380a6dd5..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.cpp +++ /dev/null @@ -1,1101 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "vectormath/vmInclude.h" -#include //@todo: remove the debugging printf at some stage -#include "btSoftBodySolver_OpenCLSIMDAware.h" -#include "BulletSoftBody/btSoftBodySolverVertexBuffer.h" -#include "BulletSoftBody/btSoftBody.h" -#include "BulletCollision/CollisionShapes/btCapsuleShape.h" -#include - -#define WAVEFRONT_SIZE 32 -#define WAVEFRONT_BLOCK_MULTIPLIER 2 -#define GROUP_SIZE (WAVEFRONT_SIZE*WAVEFRONT_BLOCK_MULTIPLIER) -#define LINKS_PER_SIMD_LANE 16 - -static const size_t workGroupSize = GROUP_SIZE; - - -//CL_VERSION_1_1 seems broken on NVidia SDK so just disable it - -////OpenCL 1.0 kernels don't use float3 -#define MSTRINGIFY(A) #A -static const char* UpdatePositionsFromVelocitiesCLString = -#include "OpenCLC10/UpdatePositionsFromVelocities.cl" -static const char* SolvePositionsCLString = -#include "OpenCLC10/SolvePositionsSIMDBatched.cl" -static const char* UpdateNodesCLString = -#include "OpenCLC10/UpdateNodes.cl" -static const char* UpdatePositionsCLString = -#include "OpenCLC10/UpdatePositions.cl" -static const char* UpdateConstantsCLString = -#include "OpenCLC10/UpdateConstants.cl" -static const char* IntegrateCLString = -#include "OpenCLC10/Integrate.cl" -static const char* ApplyForcesCLString = -#include "OpenCLC10/ApplyForces.cl" -static const char* UpdateFixedVertexPositionsCLString = -#include "OpenCLC10/UpdateFixedVertexPositions.cl" -static const char* UpdateNormalsCLString = -#include "OpenCLC10/UpdateNormals.cl" -static const char* VSolveLinksCLString = -#include "OpenCLC10/VSolveLinks.cl" -static const char* SolveCollisionsAndUpdateVelocitiesCLString = -#include "OpenCLC10/SolveCollisionsAndUpdateVelocitiesSIMDBatched.cl" -static const char* OutputToVertexArrayCLString = -#include "OpenCLC10/OutputToVertexArray.cl" - - - -btSoftBodyLinkDataOpenCLSIMDAware::btSoftBodyLinkDataOpenCLSIMDAware(cl_command_queue queue, cl_context ctx) : - m_cqCommandQue(queue), - m_wavefrontSize( WAVEFRONT_SIZE ), - m_linksPerWorkItem( LINKS_PER_SIMD_LANE ), - m_maxBatchesWithinWave( 0 ), - m_maxLinksPerWavefront( m_wavefrontSize * m_linksPerWorkItem ), - m_numWavefronts( 0 ), - m_maxVertex( 0 ), - m_clNumBatchesAndVerticesWithinWaves( queue, ctx, &m_numBatchesAndVerticesWithinWaves, true ), - m_clWavefrontVerticesGlobalAddresses( queue, ctx, &m_wavefrontVerticesGlobalAddresses, true ), - m_clLinkVerticesLocalAddresses( queue, ctx, &m_linkVerticesLocalAddresses, true ), - m_clLinkStrength( queue, ctx, &m_linkStrength, false ), - m_clLinksMassLSC( queue, ctx, &m_linksMassLSC, false ), - m_clLinksRestLengthSquared( queue, ctx, &m_linksRestLengthSquared, false ), - m_clLinksRestLength( queue, ctx, &m_linksRestLength, false ), - m_clLinksMaterialLinearStiffnessCoefficient( queue, ctx, &m_linksMaterialLinearStiffnessCoefficient, false ) -{ -} - -btSoftBodyLinkDataOpenCLSIMDAware::~btSoftBodyLinkDataOpenCLSIMDAware() -{ -} - -static Vectormath::Aos::Vector3 toVector3( const btVector3 &vec ) -{ - Vectormath::Aos::Vector3 outVec( vec.getX(), vec.getY(), vec.getZ() ); - return outVec; -} - -/** Allocate enough space in all link-related arrays to fit numLinks links */ -void btSoftBodyLinkDataOpenCLSIMDAware::createLinks( int numLinks ) -{ - int previousSize = m_links.size(); - int newSize = previousSize + numLinks; - - btSoftBodyLinkData::createLinks( numLinks ); - - // Resize the link addresses array as well - m_linkAddresses.resize( newSize ); -} - -/** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ -void btSoftBodyLinkDataOpenCLSIMDAware::setLinkAt( - const LinkDescription &link, - int linkIndex ) -{ - btSoftBodyLinkData::setLinkAt( link, linkIndex ); - - if( link.getVertex0() > m_maxVertex ) - m_maxVertex = link.getVertex0(); - if( link.getVertex1() > m_maxVertex ) - m_maxVertex = link.getVertex1(); - - // Set the link index correctly for initialisation - m_linkAddresses[linkIndex] = linkIndex; -} - -bool btSoftBodyLinkDataOpenCLSIMDAware::onAccelerator() -{ - return m_onGPU; -} - -bool btSoftBodyLinkDataOpenCLSIMDAware::moveToAccelerator() -{ - bool success = true; - success = success && m_clNumBatchesAndVerticesWithinWaves.moveToGPU(); - success = success && m_clWavefrontVerticesGlobalAddresses.moveToGPU(); - success = success && m_clLinkVerticesLocalAddresses.moveToGPU(); - success = success && m_clLinkStrength.moveToGPU(); - success = success && m_clLinksMassLSC.moveToGPU(); - success = success && m_clLinksRestLengthSquared.moveToGPU(); - success = success && m_clLinksRestLength.moveToGPU(); - success = success && m_clLinksMaterialLinearStiffnessCoefficient.moveToGPU(); - - if( success ) { - m_onGPU = true; - } - - return success; -} - -bool btSoftBodyLinkDataOpenCLSIMDAware::moveFromAccelerator() -{ - bool success = true; - success = success && m_clNumBatchesAndVerticesWithinWaves.moveToGPU(); - success = success && m_clWavefrontVerticesGlobalAddresses.moveToGPU(); - success = success && m_clLinkVerticesLocalAddresses.moveToGPU(); - success = success && m_clLinkStrength.moveFromGPU(); - success = success && m_clLinksMassLSC.moveFromGPU(); - success = success && m_clLinksRestLengthSquared.moveFromGPU(); - success = success && m_clLinksRestLength.moveFromGPU(); - success = success && m_clLinksMaterialLinearStiffnessCoefficient.moveFromGPU(); - - if( success ) { - m_onGPU = false; - } - - return success; -} - - - - - - - - -btOpenCLSoftBodySolverSIMDAware::btOpenCLSoftBodySolverSIMDAware(cl_command_queue queue, cl_context ctx, bool bUpdateAchchoredNodePos) : - btOpenCLSoftBodySolver( queue, ctx, bUpdateAchchoredNodePos ), - m_linkData(queue, ctx) -{ - // Initial we will clearly need to update solver constants - // For now this is global for the cloths linked with this solver - we should probably make this body specific - // for performance in future once we understand more clearly when constants need to be updated - m_updateSolverConstants = true; - - m_shadersInitialized = false; -} - -btOpenCLSoftBodySolverSIMDAware::~btOpenCLSoftBodySolverSIMDAware() -{ - releaseKernels(); -} - -void btOpenCLSoftBodySolverSIMDAware::optimize( btAlignedObjectArray< btSoftBody * > &softBodies ,bool forceUpdate) -{ - if( forceUpdate || m_softBodySet.size() != softBodies.size() ) - { - // Have a change in the soft body set so update, reloading all the data - getVertexData().clear(); - getTriangleData().clear(); - getLinkData().clear(); - m_softBodySet.resize(0); - m_anchorIndex.clear(); - - int maxPiterations = 0; - int maxViterations = 0; - - for( int softBodyIndex = 0; softBodyIndex < softBodies.size(); ++softBodyIndex ) - { - btSoftBody *softBody = softBodies[ softBodyIndex ]; - using Vectormath::Aos::Matrix3; - using Vectormath::Aos::Point3; - - // Create SoftBody that will store the information within the solver - btOpenCLAcceleratedSoftBodyInterface* newSoftBody = new btOpenCLAcceleratedSoftBodyInterface( softBody ); - m_softBodySet.push_back( newSoftBody ); - - m_perClothAcceleration.push_back( toVector3(softBody->getWorldInfo()->m_gravity) ); - m_perClothDampingFactor.push_back(softBody->m_cfg.kDP); - m_perClothVelocityCorrectionCoefficient.push_back( softBody->m_cfg.kVCF ); - m_perClothLiftFactor.push_back( softBody->m_cfg.kLF ); - m_perClothDragFactor.push_back( softBody->m_cfg.kDG ); - m_perClothMediumDensity.push_back(softBody->getWorldInfo()->air_density); - // Simple init values. Actually we'll put 0 and -1 into them at the appropriate time - m_perClothFriction.push_back(softBody->m_cfg.kDF); - m_perClothCollisionObjects.push_back( CollisionObjectIndices(-1, -1) ); - - // Add space for new vertices and triangles in the default solver for now - // TODO: Include space here for tearing too later - int firstVertex = getVertexData().getNumVertices(); - int numVertices = softBody->m_nodes.size(); - // Round maxVertices to a multiple of the workgroup size so we know we're safe to run over in a given group - // maxVertices can be increased to allow tearing, but should be used sparingly because these extra verts will always be processed - int maxVertices = GROUP_SIZE*((numVertices+GROUP_SIZE)/GROUP_SIZE); - // Allocate space for new vertices in all the vertex arrays - getVertexData().createVertices( numVertices, softBodyIndex, maxVertices ); - - - int firstTriangle = getTriangleData().getNumTriangles(); - int numTriangles = softBody->m_faces.size(); - int maxTriangles = numTriangles; - getTriangleData().createTriangles( maxTriangles ); - - // Copy vertices from softbody into the solver - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - Point3 multPoint(softBody->m_nodes[vertex].m_x.getX(), softBody->m_nodes[vertex].m_x.getY(), softBody->m_nodes[vertex].m_x.getZ()); - btSoftBodyVertexData::VertexDescription desc; - - // TODO: Position in the softbody might be pre-transformed - // or we may need to adapt for the pose. - //desc.setPosition( cloth.getMeshTransform()*multPoint ); - desc.setPosition( multPoint ); - - float vertexInverseMass = softBody->m_nodes[vertex].m_im; - desc.setInverseMass(vertexInverseMass); - getVertexData().setVertexAt( desc, firstVertex + vertex ); - - m_anchorIndex.push_back(-1); - } - for( int vertex = numVertices; vertex < maxVertices; ++vertex ) - { - m_anchorIndex.push_back(-1.0); - } - - // Copy triangles similarly - // We're assuming here that vertex indices are based on the firstVertex rather than the entire scene - for( int triangle = 0; triangle < numTriangles; ++triangle ) - { - // Note that large array storage is relative to the array not to the cloth - // So we need to add firstVertex to each value - int vertexIndex0 = (softBody->m_faces[triangle].m_n[0] - &(softBody->m_nodes[0])); - int vertexIndex1 = (softBody->m_faces[triangle].m_n[1] - &(softBody->m_nodes[0])); - int vertexIndex2 = (softBody->m_faces[triangle].m_n[2] - &(softBody->m_nodes[0])); - btSoftBodyTriangleData::TriangleDescription newTriangle(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, vertexIndex2 + firstVertex); - getTriangleData().setTriangleAt( newTriangle, firstTriangle + triangle ); - - // Increase vertex triangle counts for this triangle - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex0)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex1)++; - getVertexData().getTriangleCount(newTriangle.getVertexSet().vertex2)++; - } - - int firstLink = getLinkData().getNumLinks(); - int numLinks = softBody->m_links.size(); - int maxLinks = numLinks; - - // Allocate space for the links - getLinkData().createLinks( numLinks ); - - // Add the links - for( int link = 0; link < numLinks; ++link ) - { - int vertexIndex0 = softBody->m_links[link].m_n[0] - &(softBody->m_nodes[0]); - int vertexIndex1 = softBody->m_links[link].m_n[1] - &(softBody->m_nodes[0]); - - btSoftBodyLinkData::LinkDescription newLink(vertexIndex0 + firstVertex, vertexIndex1 + firstVertex, softBody->m_links[link].m_material->m_kLST); - newLink.setLinkStrength(1.f); - getLinkData().setLinkAt(newLink, firstLink + link); - } - - newSoftBody->setFirstVertex( firstVertex ); - newSoftBody->setFirstTriangle( firstTriangle ); - newSoftBody->setNumVertices( numVertices ); - newSoftBody->setMaxVertices( maxVertices ); - newSoftBody->setNumTriangles( numTriangles ); - newSoftBody->setMaxTriangles( maxTriangles ); - newSoftBody->setFirstLink( firstLink ); - newSoftBody->setNumLinks( numLinks ); - - // Find maximum piterations and viterations - int piterations = softBody->m_cfg.piterations; - - if ( piterations > maxPiterations ) - maxPiterations = piterations; - - int viterations = softBody->m_cfg.viterations; - - if ( viterations > maxViterations ) - maxViterations = viterations; - - // zero mass - for( int vertex = 0; vertex < numVertices; ++vertex ) - { - if ( softBody->m_nodes[vertex].m_im == 0 ) - { - AnchorNodeInfoCL nodeInfo; - nodeInfo.clVertexIndex = firstVertex + vertex; - nodeInfo.pNode = &softBody->m_nodes[vertex]; - - m_anchorNodeInfoArray.push_back(nodeInfo); - } - } - - // anchor position - if ( numVertices > 0 ) - { - for ( int anchorIndex = 0; anchorIndex < softBody->m_anchors.size(); anchorIndex++ ) - { - btSoftBody::Node* anchorNode = softBody->m_anchors[anchorIndex].m_node; - btSoftBody::Node* firstNode = &softBody->m_nodes[0]; - - AnchorNodeInfoCL nodeInfo; - nodeInfo.clVertexIndex = firstVertex + (int)(anchorNode - firstNode); - nodeInfo.pNode = anchorNode; - - m_anchorNodeInfoArray.push_back(nodeInfo); - } - } - } - - m_anchorPosition.clear(); - m_anchorPosition.resize(m_anchorNodeInfoArray.size()); - - for ( int anchorNode = 0; anchorNode < m_anchorNodeInfoArray.size(); anchorNode++ ) - { - const AnchorNodeInfoCL& anchorNodeInfo = m_anchorNodeInfoArray[anchorNode]; - m_anchorIndex[anchorNodeInfo.clVertexIndex] = anchorNode; - getVertexData().getInverseMass(anchorNodeInfo.clVertexIndex) = 0.0f; - } - - updateConstants(0.f); - - // set position and velocity iterations - setNumberOfPositionIterations(maxPiterations); - setNumberOfVelocityIterations(maxViterations); - - // set wind velocity - m_perClothWindVelocity.resize( m_softBodySet.size() ); - for( int softBodyIndex = 0; softBodyIndex < m_softBodySet.size(); ++softBodyIndex ) - { - btSoftBody *softBody = m_softBodySet[softBodyIndex]->getSoftBody(); - m_perClothWindVelocity[softBodyIndex] = toVector3(softBody->getWindVelocity()); - } - - m_clPerClothWindVelocity.changedOnCPU(); - - // generate batches - m_linkData.generateBatches(); - m_triangleData.generateBatches(); - - // Build the shaders to match the batching parameters - buildShaders(); - } -} - - -btSoftBodyLinkData &btOpenCLSoftBodySolverSIMDAware::getLinkData() -{ - // TODO: Consider setting link data to "changed" here - return m_linkData; -} - - - - -void btOpenCLSoftBodySolverSIMDAware::updateConstants( float timeStep ) -{ - - using namespace Vectormath::Aos; - - if( m_updateSolverConstants ) - { - m_updateSolverConstants = false; - - // Will have to redo this if we change the structure (tear, maybe) or various other possible changes - - // Initialise link constants - const int numLinks = m_linkData.getNumLinks(); - for( int linkIndex = 0; linkIndex < numLinks; ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair &vertices( m_linkData.getVertexPair(linkIndex) ); - m_linkData.getRestLength(linkIndex) = length((m_vertexData.getPosition( vertices.vertex0 ) - m_vertexData.getPosition( vertices.vertex1 ))); - float invMass0 = m_vertexData.getInverseMass(vertices.vertex0); - float invMass1 = m_vertexData.getInverseMass(vertices.vertex1); - float linearStiffness = m_linkData.getLinearStiffnessCoefficient(linkIndex); - float massLSC = (invMass0 + invMass1)/linearStiffness; - m_linkData.getMassLSC(linkIndex) = massLSC; - float restLength = m_linkData.getRestLength(linkIndex); - float restLengthSquared = restLength*restLength; - m_linkData.getRestLengthSquared(linkIndex) = restLengthSquared; - } - } - -} - - - -void btOpenCLSoftBodySolverSIMDAware::solveConstraints( float solverdt ) -{ - - using Vectormath::Aos::Vector3; - using Vectormath::Aos::Point3; - using Vectormath::Aos::lengthSqr; - using Vectormath::Aos::dot; - - // Prepare links - int numLinks = m_linkData.getNumLinks(); - int numVertices = m_vertexData.getNumVertices(); - - float kst = 1.f; - float ti = 0.f; - - - m_clPerClothDampingFactor.moveToGPU(); - m_clPerClothVelocityCorrectionCoefficient.moveToGPU(); - - - // Ensure data is on accelerator - m_linkData.moveToAccelerator(); - m_vertexData.moveToAccelerator(); - - - //prepareLinks(); - - prepareCollisionConstraints(); - - // Solve drift - for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - { - - for( int i = 0; i < m_linkData.m_wavefrontBatchStartLengths.size(); ++i ) - { - int startWave = m_linkData.m_wavefrontBatchStartLengths[i].start; - int numWaves = m_linkData.m_wavefrontBatchStartLengths[i].length; - solveLinksForPosition( startWave, numWaves, kst, ti ); - } - } // for( int iteration = 0; iteration < m_numberOfPositionIterations ; ++iteration ) - - - // At this point assume that the force array is blank - we will overwrite it - solveCollisionsAndUpdateVelocities( 1.f/solverdt ); -} - - -////////////////////////////////////// -// Kernel dispatches - - -void btOpenCLSoftBodySolverSIMDAware::solveLinksForPosition( int startWave, int numWaves, float kst, float ti ) -{ - cl_int ciErrNum; - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,0, sizeof(int), &startWave); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,1, sizeof(int), &numWaves); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,2, sizeof(float), &kst); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,3, sizeof(float), &ti); - - - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,4, sizeof(cl_mem), &m_linkData.m_clNumBatchesAndVerticesWithinWaves.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,5, sizeof(cl_mem), &m_linkData.m_clWavefrontVerticesGlobalAddresses.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,6, sizeof(cl_mem), &m_linkData.m_clLinkVerticesLocalAddresses.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,7, sizeof(cl_mem), &m_linkData.m_clLinksMassLSC.m_buffer); - - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,8, sizeof(cl_mem), &m_linkData.m_clLinksRestLengthSquared.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,9, sizeof(cl_mem), &m_vertexData.m_clVertexInverseMass.m_buffer); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,10, sizeof(cl_mem), &m_vertexData.m_clVertexPosition.m_buffer); - - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,11, WAVEFRONT_BLOCK_MULTIPLIER*sizeof(cl_int2), 0); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,12, m_linkData.getMaxVerticesPerWavefront()*WAVEFRONT_BLOCK_MULTIPLIER*sizeof(cl_float4), 0); - ciErrNum = clSetKernelArg(m_solvePositionsFromLinksKernel,13, m_linkData.getMaxVerticesPerWavefront()*WAVEFRONT_BLOCK_MULTIPLIER*sizeof(cl_float), 0); - - size_t numWorkItems = workGroupSize*((numWaves*WAVEFRONT_SIZE + (workGroupSize-1)) / workGroupSize); - - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_solvePositionsFromLinksKernel,1,NULL,&numWorkItems,&workGroupSize,0,0,0); - - if( ciErrNum!= CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_solvePositionsFromLinksKernel)"); - } - -} // solveLinksForPosition - -void btOpenCLSoftBodySolverSIMDAware::solveCollisionsAndUpdateVelocities( float isolverdt ) -{ - // Copy kernel parameters to GPU - m_vertexData.moveToAccelerator(); - m_clPerClothFriction.moveToGPU(); - m_clPerClothDampingFactor.moveToGPU(); - m_clPerClothCollisionObjects.moveToGPU(); - m_clCollisionObjectDetails.moveToGPU(); - - cl_int ciErrNum; - int numVerts = m_vertexData.getNumVertices(); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 0, sizeof(int), &numVerts); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 1, sizeof(int), &isolverdt); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 2, sizeof(cl_mem),&m_vertexData.m_clClothIdentifier.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 3, sizeof(cl_mem),&m_vertexData.m_clVertexPreviousPosition.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 4, sizeof(cl_mem),&m_clPerClothFriction.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 5, sizeof(cl_mem),&m_clPerClothDampingFactor.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 6, sizeof(cl_mem),&m_clPerClothCollisionObjects.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 7, sizeof(cl_mem),&m_clCollisionObjectDetails.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 8, sizeof(cl_mem),&m_vertexData.m_clVertexForceAccumulator.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 9, sizeof(cl_mem),&m_vertexData.m_clVertexVelocity.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 10, sizeof(cl_mem),&m_vertexData.m_clVertexPosition.m_buffer); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 11, sizeof(CollisionShapeDescription)*16,0); - ciErrNum = clSetKernelArg(m_solveCollisionsAndUpdateVelocitiesKernel, 12, sizeof(cl_mem),&m_vertexData.m_clVertexInverseMass.m_buffer); - size_t numWorkItems = workGroupSize*((m_vertexData.getNumVertices() + (workGroupSize-1)) / workGroupSize); - - if (numWorkItems) - { - ciErrNum = clEnqueueNDRangeKernel(m_cqCommandQue,m_solveCollisionsAndUpdateVelocitiesKernel, 1, NULL, &numWorkItems, &workGroupSize,0,0,0); - - if( ciErrNum != CL_SUCCESS ) - { - btAssert( 0 && "enqueueNDRangeKernel(m_solveCollisionsAndUpdateVelocitiesKernel)"); - } - } - -} // btOpenCLSoftBodySolverSIMDAware::updateVelocitiesFromPositionsWithoutVelocities - -// End kernel dispatches -///////////////////////////////////// - - - -bool btOpenCLSoftBodySolverSIMDAware::buildShaders() -{ - releaseKernels(); - - if( m_shadersInitialized ) - return true; - - const char* additionalMacros=""; - - m_currentCLFunctions->clearKernelCompilationFailures(); - - char *wavefrontMacros = new char[256]; - - sprintf( - wavefrontMacros, - "-DMAX_NUM_VERTICES_PER_WAVE=%d -DMAX_BATCHES_PER_WAVE=%d -DWAVEFRONT_SIZE=%d -DWAVEFRONT_BLOCK_MULTIPLIER=%d -DBLOCK_SIZE=%d", - m_linkData.getMaxVerticesPerWavefront(), - m_linkData.getMaxBatchesPerWavefront(), - m_linkData.getWavefrontSize(), - WAVEFRONT_BLOCK_MULTIPLIER, - WAVEFRONT_BLOCK_MULTIPLIER*m_linkData.getWavefrontSize()); - - m_updatePositionsFromVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdatePositionsFromVelocitiesCLString, "UpdatePositionsFromVelocitiesKernel", additionalMacros,"OpenCLC10/UpdatePositionsFromVelocities.cl"); - m_solvePositionsFromLinksKernel = m_currentCLFunctions->compileCLKernelFromString( SolvePositionsCLString, "SolvePositionsFromLinksKernel", wavefrontMacros ,"OpenCLC10/SolvePositionsSIMDBatched.cl"); - m_updateVelocitiesFromPositionsWithVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNodesCLString, "updateVelocitiesFromPositionsWithVelocitiesKernel", additionalMacros ,"OpenCLC10/UpdateNodes.cl"); - m_updateVelocitiesFromPositionsWithoutVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdatePositionsCLString, "updateVelocitiesFromPositionsWithoutVelocitiesKernel", additionalMacros,"OpenCLC10/UpdatePositions.cl"); - m_integrateKernel = m_currentCLFunctions->compileCLKernelFromString( IntegrateCLString, "IntegrateKernel", additionalMacros ,"OpenCLC10/Integrate.cl"); - m_applyForcesKernel = m_currentCLFunctions->compileCLKernelFromString( ApplyForcesCLString, "ApplyForcesKernel", additionalMacros,"OpenCLC10/ApplyForces.cl" ); - m_updateFixedVertexPositionsKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateFixedVertexPositionsCLString, "UpdateFixedVertexPositions" ,additionalMacros,"OpenCLC10/UpdateFixedVertexPositions.cl"); - m_solveCollisionsAndUpdateVelocitiesKernel = m_currentCLFunctions->compileCLKernelFromString( SolveCollisionsAndUpdateVelocitiesCLString, "SolveCollisionsAndUpdateVelocitiesKernel", additionalMacros ,"OpenCLC10/SolveCollisionsAndUpdateVelocitiesSIMDBatched.cl"); - - // TODO: Rename to UpdateSoftBodies - m_resetNormalsAndAreasKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNormalsCLString, "ResetNormalsAndAreasKernel", additionalMacros ,"OpenCLC10/UpdateNormals.cl"); - m_normalizeNormalsAndAreasKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNormalsCLString, "NormalizeNormalsAndAreasKernel", additionalMacros ,"OpenCLC10/UpdateNormals.cl"); - m_updateSoftBodiesKernel = m_currentCLFunctions->compileCLKernelFromString( UpdateNormalsCLString, "UpdateSoftBodiesKernel", additionalMacros ,"OpenCLC10/UpdateNormals.cl"); - - delete [] wavefrontMacros; - - if( m_currentCLFunctions->getKernelCompilationFailures()==0) - { - m_shadersInitialized = true; - } - - return m_shadersInitialized; -} - - - - -static Vectormath::Aos::Transform3 toTransform3( const btTransform &transform ) -{ - Vectormath::Aos::Transform3 outTransform; - outTransform.setCol(0, toVector3(transform.getBasis().getColumn(0))); - outTransform.setCol(1, toVector3(transform.getBasis().getColumn(1))); - outTransform.setCol(2, toVector3(transform.getBasis().getColumn(2))); - outTransform.setCol(3, toVector3(transform.getOrigin())); - return outTransform; -} - - -static void generateBatchesOfWavefronts( btAlignedObjectArray < btAlignedObjectArray > &linksForWavefronts, btSoftBodyLinkData &linkData, int numVertices, btAlignedObjectArray < btAlignedObjectArray > &wavefrontBatches ) -{ - // A per-batch map of truth values stating whether a given vertex is in that batch - // This allows us to significantly optimize the batching - btAlignedObjectArray > mapOfVerticesInBatches; - - for( int waveIndex = 0; waveIndex < linksForWavefronts.size(); ++waveIndex ) - { - btAlignedObjectArray &wavefront( linksForWavefronts[waveIndex] ); - - int batch = 0; - bool placed = false; - while( batch < wavefrontBatches.size() && !placed ) - { - // Test the current batch, see if this wave shares any vertex with the waves in the batch - bool foundSharedVertex = false; - for( int link = 0; link < wavefront.size(); ++link ) - { - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( wavefront[link] ); - if( (mapOfVerticesInBatches[batch])[vertices.vertex0] || (mapOfVerticesInBatches[batch])[vertices.vertex1] ) - { - foundSharedVertex = true; - } - } - - if( !foundSharedVertex ) - { - wavefrontBatches[batch].push_back( waveIndex ); - // Insert vertices into this batch too - for( int link = 0; link < wavefront.size(); ++link ) - { - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( wavefront[link] ); - (mapOfVerticesInBatches[batch])[vertices.vertex0] = true; - (mapOfVerticesInBatches[batch])[vertices.vertex1] = true; - } - placed = true; - } - batch++; - } - if( batch == wavefrontBatches.size() && !placed ) - { - wavefrontBatches.resize( batch + 1 ); - wavefrontBatches[batch].push_back( waveIndex ); - - // And resize map as well - mapOfVerticesInBatches.resize( batch + 1 ); - - // Resize maps with total number of vertices - mapOfVerticesInBatches[batch].resize( numVertices+1, false ); - - // Insert vertices into this batch too - for( int link = 0; link < wavefront.size(); ++link ) - { - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( wavefront[link] ); - (mapOfVerticesInBatches[batch])[vertices.vertex0] = true; - (mapOfVerticesInBatches[batch])[vertices.vertex1] = true; - } - } - } - mapOfVerticesInBatches.clear(); -} - -// Function to remove an object from a vector maintaining correct ordering of the vector -template< typename T > static void removeFromVector( btAlignedObjectArray< T > &vectorToUpdate, int indexToRemove ) -{ - int currentSize = vectorToUpdate.size(); - for( int i = indexToRemove; i < (currentSize-1); ++i ) - { - vectorToUpdate[i] = vectorToUpdate[i+1]; - } - if( currentSize > 0 ) - vectorToUpdate.resize( currentSize - 1 ); -} - -/** - * Insert element into vectorToUpdate at index index. - */ -template< typename T > static void insertAtIndex( btAlignedObjectArray< T > &vectorToUpdate, int index, T element ) -{ - vectorToUpdate.resize( vectorToUpdate.size() + 1 ); - for( int i = (vectorToUpdate.size() - 1); i > index; --i ) - { - vectorToUpdate[i] = vectorToUpdate[i-1]; - } - vectorToUpdate[index] = element; -} - -/** - * Insert into btAlignedObjectArray assuming the array is ordered and maintaining both ordering and uniqueness. - * ie it treats vectorToUpdate as an ordered set. - */ -template< typename T > static void insertUniqueAndOrderedIntoVector( btAlignedObjectArray &vectorToUpdate, T element ) -{ - int index = 0; - while( index < vectorToUpdate.size() && vectorToUpdate[index] < element ) - { - index++; - } - if( index == vectorToUpdate.size() || vectorToUpdate[index] != element ) - insertAtIndex( vectorToUpdate, index, element ); -} - -static void generateLinksPerVertex( int numVertices, btSoftBodyLinkData &linkData, btAlignedObjectArray< int > &listOfLinksPerVertex, btAlignedObjectArray &numLinksPerVertex, int &maxLinks ) -{ - for( int linkIndex = 0; linkIndex < linkData.getNumLinks(); ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair nodes( linkData.getVertexPair(linkIndex) ); - numLinksPerVertex[nodes.vertex0]++; - numLinksPerVertex[nodes.vertex1]++; - } - int maxLinksPerVertex = 0; - for( int vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex ) - { - maxLinksPerVertex = btMax(numLinksPerVertex[vertexIndex], maxLinksPerVertex); - } - maxLinks = maxLinksPerVertex; - - btAlignedObjectArray< int > linksFoundPerVertex; - linksFoundPerVertex.resize( numVertices, 0 ); - - listOfLinksPerVertex.resize( maxLinksPerVertex * numVertices ); - - for( int linkIndex = 0; linkIndex < linkData.getNumLinks(); ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair nodes( linkData.getVertexPair(linkIndex) ); - { - // Do vertex 0 - int vertexIndex = nodes.vertex0; - int linkForVertex = linksFoundPerVertex[nodes.vertex0]; - int linkAddress = vertexIndex * maxLinksPerVertex + linkForVertex; - - listOfLinksPerVertex[linkAddress] = linkIndex; - - linksFoundPerVertex[nodes.vertex0] = linkForVertex + 1; - } - { - // Do vertex 1 - int vertexIndex = nodes.vertex1; - int linkForVertex = linksFoundPerVertex[nodes.vertex1]; - int linkAddress = vertexIndex * maxLinksPerVertex + linkForVertex; - - listOfLinksPerVertex[linkAddress] = linkIndex; - - linksFoundPerVertex[nodes.vertex1] = linkForVertex + 1; - } - } -} - -static void computeBatchingIntoWavefronts( - btSoftBodyLinkData &linkData, - int wavefrontSize, - int linksPerWorkItem, - int maxLinksPerWavefront, - btAlignedObjectArray < btAlignedObjectArray > &linksForWavefronts, - btAlignedObjectArray< btAlignedObjectArray < btAlignedObjectArray > > &batchesWithinWaves, /* wave, batch, links in batch */ - btAlignedObjectArray< btAlignedObjectArray< int > > &verticesForWavefronts /* wavefront, vertex */ - ) -{ - - - // Attempt generation of larger batches of links. - btAlignedObjectArray< bool > processedLink; - processedLink.resize( linkData.getNumLinks() ); - btAlignedObjectArray< int > listOfLinksPerVertex; - int maxLinksPerVertex = 0; - - // Count num vertices - int numVertices = 0; - for( int linkIndex = 0; linkIndex < linkData.getNumLinks(); ++linkIndex ) - { - btSoftBodyLinkData::LinkNodePair nodes( linkData.getVertexPair(linkIndex) ); - numVertices = btMax( numVertices, nodes.vertex0 + 1 ); - numVertices = btMax( numVertices, nodes.vertex1 + 1 ); - } - - // Need list of links per vertex - // Compute valence of each vertex - btAlignedObjectArray numLinksPerVertex; - numLinksPerVertex.resize(0); - numLinksPerVertex.resize( numVertices, 0 ); - - generateLinksPerVertex( numVertices, linkData, listOfLinksPerVertex, numLinksPerVertex, maxLinksPerVertex ); - - if (!numVertices) - return; - - for( int vertex = 0; vertex < 10; ++vertex ) - { - for( int link = 0; link < numLinksPerVertex[vertex]; ++link ) - { - int linkAddress = vertex * maxLinksPerVertex + link; - } - } - - - // At this point we know what links we have for each vertex so we can start batching - - // We want a vertex to start with, let's go with 0 - int currentVertex = 0; - int linksProcessed = 0; - - btAlignedObjectArray verticesToProcess; - - while( linksProcessed < linkData.getNumLinks() ) - { - // Next wavefront - int nextWavefront = linksForWavefronts.size(); - linksForWavefronts.resize( nextWavefront + 1 ); - btAlignedObjectArray &linksForWavefront(linksForWavefronts[nextWavefront]); - verticesForWavefronts.resize( nextWavefront + 1 ); - btAlignedObjectArray &vertexSet( verticesForWavefronts[nextWavefront] ); - - linksForWavefront.resize(0); - - // Loop to find enough links to fill the wavefront - // Stopping if we either run out of links, or fill it - while( linksProcessed < linkData.getNumLinks() && linksForWavefront.size() < maxLinksPerWavefront ) - { - // Go through the links for the current vertex - for( int link = 0; link < numLinksPerVertex[currentVertex] && linksForWavefront.size() < maxLinksPerWavefront; ++link ) - { - int linkAddress = currentVertex * maxLinksPerVertex + link; - int linkIndex = listOfLinksPerVertex[linkAddress]; - - // If we have not already processed this link, add it to the wavefront - // Claim it as another processed link - // Add the vertex at the far end to the list of vertices to process. - if( !processedLink[linkIndex] ) - { - linksForWavefront.push_back( linkIndex ); - linksProcessed++; - processedLink[linkIndex] = true; - int v0 = linkData.getVertexPair(linkIndex).vertex0; - int v1 = linkData.getVertexPair(linkIndex).vertex1; - if( v0 == currentVertex ) - verticesToProcess.push_back( v1 ); - else - verticesToProcess.push_back( v0 ); - } - } - if( verticesToProcess.size() > 0 ) - { - // Get the element on the front of the queue and remove it - currentVertex = verticesToProcess[0]; - removeFromVector( verticesToProcess, 0 ); - } else { - // If we've not yet processed all the links, find the first unprocessed one - // and select one of its vertices as the current vertex - if( linksProcessed < linkData.getNumLinks() ) - { - int searchLink = 0; - while( processedLink[searchLink] ) - searchLink++; - currentVertex = linkData.getVertexPair(searchLink).vertex0; - } - } - } - - // We have either finished or filled a wavefront - for( int link = 0; link < linksForWavefront.size(); ++link ) - { - int v0 = linkData.getVertexPair( linksForWavefront[link] ).vertex0; - int v1 = linkData.getVertexPair( linksForWavefront[link] ).vertex1; - insertUniqueAndOrderedIntoVector( vertexSet, v0 ); - insertUniqueAndOrderedIntoVector( vertexSet, v1 ); - } - // Iterate over links mapped to the wave and batch those - // We can run a batch on each cycle trivially - - batchesWithinWaves.resize( batchesWithinWaves.size() + 1 ); - btAlignedObjectArray < btAlignedObjectArray > &batchesWithinWave( batchesWithinWaves[batchesWithinWaves.size()-1] ); - - - for( int link = 0; link < linksForWavefront.size(); ++link ) - { - int linkIndex = linksForWavefront[link]; - btSoftBodyLinkData::LinkNodePair vertices = linkData.getVertexPair( linkIndex ); - - int batch = 0; - bool placed = false; - while( batch < batchesWithinWave.size() && !placed ) - { - bool foundSharedVertex = false; - if( batchesWithinWave[batch].size() >= wavefrontSize ) - { - // If we have already filled this batch, move on to another - foundSharedVertex = true; - } else { - for( int link2 = 0; link2 < batchesWithinWave[batch].size(); ++link2 ) - { - btSoftBodyLinkData::LinkNodePair vertices2 = linkData.getVertexPair( (batchesWithinWave[batch])[link2] ); - - if( vertices.vertex0 == vertices2.vertex0 || - vertices.vertex1 == vertices2.vertex0 || - vertices.vertex0 == vertices2.vertex1 || - vertices.vertex1 == vertices2.vertex1 ) - { - foundSharedVertex = true; - break; - } - } - } - if( !foundSharedVertex ) - { - batchesWithinWave[batch].push_back( linkIndex ); - placed = true; - } else { - ++batch; - } - } - if( batch == batchesWithinWave.size() && !placed ) - { - batchesWithinWave.resize( batch + 1 ); - batchesWithinWave[batch].push_back( linkIndex ); - } - } - - } - -} - -void btSoftBodyLinkDataOpenCLSIMDAware::generateBatches() -{ - btAlignedObjectArray < btAlignedObjectArray > linksForWavefronts; - btAlignedObjectArray < btAlignedObjectArray > wavefrontBatches; - btAlignedObjectArray< btAlignedObjectArray < btAlignedObjectArray > > batchesWithinWaves; - btAlignedObjectArray< btAlignedObjectArray< int > > verticesForWavefronts; // wavefronts, vertices in wavefront as an ordered set - - // Group the links into wavefronts - computeBatchingIntoWavefronts( *this, m_wavefrontSize, m_linksPerWorkItem, m_maxLinksPerWavefront, linksForWavefronts, batchesWithinWaves, verticesForWavefronts ); - - - // Batch the wavefronts - generateBatchesOfWavefronts( linksForWavefronts, *this, m_maxVertex, wavefrontBatches ); - - m_numWavefronts = linksForWavefronts.size(); - - // At this point we have a description of which links we need to process in each wavefront - - // First correctly fill the batch ranges vector - int numBatches = wavefrontBatches.size(); - m_wavefrontBatchStartLengths.resize(0); - int prefixSum = 0; - for( int batchIndex = 0; batchIndex < numBatches; ++batchIndex ) - { - int wavesInBatch = wavefrontBatches[batchIndex].size(); - int nextPrefixSum = prefixSum + wavesInBatch; - m_wavefrontBatchStartLengths.push_back( BatchPair( prefixSum, nextPrefixSum - prefixSum ) ); - - prefixSum += wavesInBatch; - } - - // Also find max number of batches within a wave - m_maxBatchesWithinWave = 0; - m_maxVerticesWithinWave = 0; - m_numBatchesAndVerticesWithinWaves.resize( m_numWavefronts ); - for( int waveIndex = 0; waveIndex < m_numWavefronts; ++waveIndex ) - { - // See if the number of batches in this wave is greater than the current maxium - int batchesInCurrentWave = batchesWithinWaves[waveIndex].size(); - int verticesInCurrentWave = verticesForWavefronts[waveIndex].size(); - m_maxBatchesWithinWave = btMax( batchesInCurrentWave, m_maxBatchesWithinWave ); - m_maxVerticesWithinWave = btMax( verticesInCurrentWave, m_maxVerticesWithinWave ); - } - - // Add padding values both for alignment and as dudd addresses within LDS to compute junk rather than branch around - m_maxVerticesWithinWave = 16*((m_maxVerticesWithinWave/16)+2); - - // Now we know the maximum number of vertices per-wave we can resize the global vertices array - m_wavefrontVerticesGlobalAddresses.resize( m_maxVerticesWithinWave * m_numWavefronts ); - - // Grab backup copies of all the link data arrays for the sorting process - btAlignedObjectArray m_links_Backup(m_links); - btAlignedObjectArray m_linkStrength_Backup(m_linkStrength); - btAlignedObjectArray m_linksMassLSC_Backup(m_linksMassLSC); - btAlignedObjectArray m_linksRestLengthSquared_Backup(m_linksRestLengthSquared); - //btAlignedObjectArray m_linksCLength_Backup(m_linksCLength); - //btAlignedObjectArray m_linksLengthRatio_Backup(m_linksLengthRatio); - btAlignedObjectArray m_linksRestLength_Backup(m_linksRestLength); - btAlignedObjectArray m_linksMaterialLinearStiffnessCoefficient_Backup(m_linksMaterialLinearStiffnessCoefficient); - - // Resize to a wavefront sized batch per batch per wave so we get perfectly coherent memory accesses. - m_links.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linkVerticesLocalAddresses.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linkStrength.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksMassLSC.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksRestLengthSquared.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksRestLength.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - m_linksMaterialLinearStiffnessCoefficient.resize( m_maxBatchesWithinWave * m_wavefrontSize * m_numWavefronts ); - - // Then re-order links into wavefront blocks - - // Total number of wavefronts moved. This will decide the ordering of sorted wavefronts. - int wavefrontCount = 0; - - // Iterate over batches of wavefronts, then wavefronts in the batch - for( int batchIndex = 0; batchIndex < numBatches; ++batchIndex ) - { - btAlignedObjectArray &batch( wavefrontBatches[batchIndex] ); - int wavefrontsInBatch = batch.size(); - - - for( int wavefrontIndex = 0; wavefrontIndex < wavefrontsInBatch; ++wavefrontIndex ) - { - - int originalWavefrontIndex = batch[wavefrontIndex]; - btAlignedObjectArray< int > &wavefrontVertices( verticesForWavefronts[originalWavefrontIndex] ); - int verticesUsedByWavefront = wavefrontVertices.size(); - - // Copy the set of vertices into the correctly structured array for use on the device - // Fill the non-vertices with -1s - // so we can mask out those reads - for( int vertex = 0; vertex < verticesUsedByWavefront; ++vertex ) - { - m_wavefrontVerticesGlobalAddresses[m_maxVerticesWithinWave * wavefrontCount + vertex] = wavefrontVertices[vertex]; - } - for( int vertex = verticesUsedByWavefront; vertex < m_maxVerticesWithinWave; ++vertex ) - { - m_wavefrontVerticesGlobalAddresses[m_maxVerticesWithinWave * wavefrontCount + vertex] = -1; - } - - // Obtain the set of batches within the current wavefront - btAlignedObjectArray < btAlignedObjectArray > &batchesWithinWavefront( batchesWithinWaves[originalWavefrontIndex] ); - // Set the size of the batches for use in the solver, correctly ordered - NumBatchesVerticesPair batchesAndVertices; - batchesAndVertices.numBatches = batchesWithinWavefront.size(); - batchesAndVertices.numVertices = verticesUsedByWavefront; - m_numBatchesAndVerticesWithinWaves[wavefrontCount] = batchesAndVertices; - - - // Now iterate over batches within the wavefront to structure the links correctly - for( int wavefrontBatch = 0; wavefrontBatch < batchesWithinWavefront.size(); ++wavefrontBatch ) - { - btAlignedObjectArray &linksInBatch( batchesWithinWavefront[wavefrontBatch] ); - int wavefrontBatchSize = linksInBatch.size(); - - int batchAddressInTarget = m_maxBatchesWithinWave * m_wavefrontSize * wavefrontCount + m_wavefrontSize * wavefrontBatch; - - for( int linkIndex = 0; linkIndex < wavefrontBatchSize; ++linkIndex ) - { - int originalLinkAddress = linksInBatch[linkIndex]; - // Reorder simple arrays trivially - m_links[batchAddressInTarget + linkIndex] = m_links_Backup[originalLinkAddress]; - m_linkStrength[batchAddressInTarget + linkIndex] = m_linkStrength_Backup[originalLinkAddress]; - m_linksMassLSC[batchAddressInTarget + linkIndex] = m_linksMassLSC_Backup[originalLinkAddress]; - m_linksRestLengthSquared[batchAddressInTarget + linkIndex] = m_linksRestLengthSquared_Backup[originalLinkAddress]; - m_linksRestLength[batchAddressInTarget + linkIndex] = m_linksRestLength_Backup[originalLinkAddress]; - m_linksMaterialLinearStiffnessCoefficient[batchAddressInTarget + linkIndex] = m_linksMaterialLinearStiffnessCoefficient_Backup[originalLinkAddress]; - - // The local address is more complicated. We need to work out where a given vertex will end up - // by searching the set of vertices for this link and using the index as the local address - btSoftBodyLinkData::LinkNodePair localPair; - btSoftBodyLinkData::LinkNodePair globalPair = m_links[batchAddressInTarget + linkIndex]; - localPair.vertex0 = wavefrontVertices.findLinearSearch( globalPair.vertex0 ); - localPair.vertex1 = wavefrontVertices.findLinearSearch( globalPair.vertex1 ); - m_linkVerticesLocalAddresses[batchAddressInTarget + linkIndex] = localPair; - } - for( int linkIndex = wavefrontBatchSize; linkIndex < m_wavefrontSize; ++linkIndex ) - { - // Put 0s into these arrays for padding for cleanliness - m_links[batchAddressInTarget + linkIndex] = btSoftBodyLinkData::LinkNodePair(0, 0); - m_linkStrength[batchAddressInTarget + linkIndex] = 0.f; - m_linksMassLSC[batchAddressInTarget + linkIndex] = 0.f; - m_linksRestLengthSquared[batchAddressInTarget + linkIndex] = 0.f; - m_linksRestLength[batchAddressInTarget + linkIndex] = 0.f; - m_linksMaterialLinearStiffnessCoefficient[batchAddressInTarget + linkIndex] = 0.f; - - - // For local addresses of junk data choose a set of addresses just above the range of valid ones - // and cycling tyhrough % 16 so that we don't have bank conficts between all dud addresses - // The valid addresses will do scatter and gather in the valid range, the junk ones should happily work - // off the end of that range so we need no control - btSoftBodyLinkData::LinkNodePair localPair; - localPair.vertex0 = verticesUsedByWavefront + (linkIndex % 16); - localPair.vertex1 = verticesUsedByWavefront + (linkIndex % 16); - m_linkVerticesLocalAddresses[batchAddressInTarget + linkIndex] = localPair; - } - - } - - - wavefrontCount++; - } - - - } - -} // void btSoftBodyLinkDataDX11SIMDAware::generateBatches() - - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.h deleted file mode 100644 index 8cd838ad7..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_OPENCL_SIMDAWARE_H -#define BT_SOFT_BODY_SOLVER_OPENCL_SIMDAWARE_H - -#include "stddef.h" //for size_t -#include "vectormath/vmInclude.h" - -#include "btSoftBodySolver_OpenCL.h" -#include "btSoftBodySolverBuffer_OpenCL.h" -#include "btSoftBodySolverLinkData_OpenCLSIMDAware.h" -#include "btSoftBodySolverVertexData_OpenCL.h" -#include "btSoftBodySolverTriangleData_OpenCL.h" - - - - - -class btOpenCLSoftBodySolverSIMDAware : public btOpenCLSoftBodySolver -{ -protected: - - - btSoftBodyLinkDataOpenCLSIMDAware m_linkData; - - - - - virtual bool buildShaders(); - - - void updateConstants( float timeStep ); - - float computeTriangleArea( - const Vectormath::Aos::Point3 &vertex0, - const Vectormath::Aos::Point3 &vertex1, - const Vectormath::Aos::Point3 &vertex2 ); - - - ////////////////////////////////////// - // Kernel dispatches - void solveLinksForPosition( int startLink, int numLinks, float kst, float ti ); - - void solveCollisionsAndUpdateVelocities( float isolverdt ); - // End kernel dispatches - ///////////////////////////////////// - -public: - btOpenCLSoftBodySolverSIMDAware(cl_command_queue queue,cl_context ctx, bool bUpdateAchchoredNodePos = false); - - virtual ~btOpenCLSoftBodySolverSIMDAware(); - - virtual SolverTypes getSolverType() const - { - return CL_SIMD_SOLVER; - } - - - virtual btSoftBodyLinkData &getLinkData(); - - - virtual void optimize( btAlignedObjectArray< btSoftBody * > &softBodies , bool forceUpdate=false); - - virtual void solveConstraints( float solverdt ); - -}; // btOpenCLSoftBodySolverSIMDAware - -#endif // #ifndef BT_SOFT_BODY_SOLVER_OPENCL_SIMDAWARE_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h b/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h deleted file mode 100644 index ab6721fbb..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h +++ /dev/null @@ -1,748 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SOFT_BODY_SOLVER_DATA_H -#define BT_SOFT_BODY_SOLVER_DATA_H - -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "vectormath/vmInclude.h" - - -class btSoftBodyLinkData -{ -public: - /** - * Class representing a link as a set of three indices into the vertex array. - */ - class LinkNodePair - { - public: - int vertex0; - int vertex1; - - LinkNodePair() - { - vertex0 = 0; - vertex1 = 0; - } - - LinkNodePair( int v0, int v1 ) - { - vertex0 = v0; - vertex1 = v1; - } - }; - - /** - * Class describing a link for input into the system. - */ - class LinkDescription - { - protected: - int m_vertex0; - int m_vertex1; - float m_linkLinearStiffness; - float m_linkStrength; - - public: - - LinkDescription() - { - m_vertex0 = 0; - m_vertex1 = 0; - m_linkLinearStiffness = 1.0; - m_linkStrength = 1.0; - } - - LinkDescription( int newVertex0, int newVertex1, float linkLinearStiffness ) - { - m_vertex0 = newVertex0; - m_vertex1 = newVertex1; - m_linkLinearStiffness = linkLinearStiffness; - m_linkStrength = 1.0; - } - - LinkNodePair getVertexPair() const - { - LinkNodePair nodes; - nodes.vertex0 = m_vertex0; - nodes.vertex1 = m_vertex1; - return nodes; - } - - void setVertex0( int vertex ) - { - m_vertex0 = vertex; - } - - void setVertex1( int vertex ) - { - m_vertex1 = vertex; - } - - void setLinkLinearStiffness( float linearStiffness ) - { - m_linkLinearStiffness = linearStiffness; - } - - void setLinkStrength( float strength ) - { - m_linkStrength = strength; - } - - int getVertex0() const - { - return m_vertex0; - } - - int getVertex1() const - { - return m_vertex1; - } - - float getLinkStrength() const - { - return m_linkStrength; - } - - float getLinkLinearStiffness() const - { - return m_linkLinearStiffness; - } - }; - - -protected: - // NOTE: - // Vertex reference data is stored relative to global array, not relative to individual cloth. - // Values must be correct if being passed into single-cloth VBOs or when migrating from one solver - // to another. - - btAlignedObjectArray< LinkNodePair > m_links; // Vertex pair for the link - btAlignedObjectArray< float > m_linkStrength; // Strength of each link - // (inverseMassA + inverseMassB)/ linear stiffness coefficient - btAlignedObjectArray< float > m_linksMassLSC; - btAlignedObjectArray< float > m_linksRestLengthSquared; - // Current vector length of link - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_linksCLength; - // 1/(current length * current length * massLSC) - btAlignedObjectArray< float > m_linksLengthRatio; - btAlignedObjectArray< float > m_linksRestLength; - btAlignedObjectArray< float > m_linksMaterialLinearStiffnessCoefficient; - -public: - btSoftBodyLinkData() - { - } - - virtual ~btSoftBodyLinkData() - { - } - - virtual void clear() - { - m_links.resize(0); - m_linkStrength.resize(0); - m_linksMassLSC.resize(0); - m_linksRestLengthSquared.resize(0); - m_linksLengthRatio.resize(0); - m_linksRestLength.resize(0); - m_linksMaterialLinearStiffnessCoefficient.resize(0); - } - - int getNumLinks() - { - return m_links.size(); - } - - /** Allocate enough space in all link-related arrays to fit numLinks links */ - virtual void createLinks( int numLinks ) - { - int previousSize = m_links.size(); - int newSize = previousSize + numLinks; - - // Resize all the arrays that store link data - m_links.resize( newSize ); - m_linkStrength.resize( newSize ); - m_linksMassLSC.resize( newSize ); - m_linksRestLengthSquared.resize( newSize ); - m_linksCLength.resize( newSize ); - m_linksLengthRatio.resize( newSize ); - m_linksRestLength.resize( newSize ); - m_linksMaterialLinearStiffnessCoefficient.resize( newSize ); - } - - /** Insert the link described into the correct data structures assuming space has already been allocated by a call to createLinks */ - virtual void setLinkAt( const LinkDescription &link, int linkIndex ) - { - m_links[linkIndex] = link.getVertexPair(); - m_linkStrength[linkIndex] = link.getLinkStrength(); - m_linksMassLSC[linkIndex] = 0.f; - m_linksRestLengthSquared[linkIndex] = 0.f; - m_linksCLength[linkIndex] = Vectormath::Aos::Vector3(0.f, 0.f, 0.f); - m_linksLengthRatio[linkIndex] = 0.f; - m_linksRestLength[linkIndex] = 0.f; - m_linksMaterialLinearStiffnessCoefficient[linkIndex] = link.getLinkLinearStiffness(); - } - - - /** - * Return true if data is on the accelerator. - * The CPU version of this class will return true here because - * the CPU is the same as the accelerator. - */ - virtual bool onAccelerator() - { - return true; - } - - /** - * Move data from host memory to the accelerator. - * The CPU version will always return that it has moved it. - */ - virtual bool moveToAccelerator() - { - return true; - } - - /** - * Move data from host memory from the accelerator. - * The CPU version will always return that it has moved it. - */ - virtual bool moveFromAccelerator() - { - return true; - } - - - - /** - * Return reference to the vertex index pair for link linkIndex as stored on the host. - */ - LinkNodePair &getVertexPair( int linkIndex ) - { - return m_links[linkIndex]; - } - - /** - * Return reference to strength of link linkIndex as stored on the host. - */ - float &getStrength( int linkIndex ) - { - return m_linkStrength[linkIndex]; - } - - /** - * Return a reference to the strength of the link corrected for link sorting. - * This is important if we are using data on an accelerator which has the data sorted in some fashion. - */ - virtual float &getStrengthCorrected( int linkIndex ) - { - return getStrength( linkIndex ); - } - - /** - * Return reference to the rest length of link linkIndex as stored on the host. - */ - float &getRestLength( int linkIndex ) - { - return m_linksRestLength[linkIndex]; - } - - /** - * Return reference to linear stiffness coefficient for link linkIndex as stored on the host. - */ - float &getLinearStiffnessCoefficient( int linkIndex ) - { - return m_linksMaterialLinearStiffnessCoefficient[linkIndex]; - } - - /** - * Return reference to the MassLSC value for link linkIndex as stored on the host. - */ - float &getMassLSC( int linkIndex ) - { - return m_linksMassLSC[linkIndex]; - } - - /** - * Return reference to rest length squared for link linkIndex as stored on the host. - */ - float &getRestLengthSquared( int linkIndex ) - { - return m_linksRestLengthSquared[linkIndex]; - } - - /** - * Return reference to current length of link linkIndex as stored on the host. - */ - Vectormath::Aos::Vector3 &getCurrentLength( int linkIndex ) - { - return m_linksCLength[linkIndex]; - } - - /** - * Return the link length ratio from for link linkIndex as stored on the host. - */ - float &getLinkLengthRatio( int linkIndex ) - { - return m_linksLengthRatio[linkIndex]; - } -}; - - - -/** - * Wrapper for vertex data information. - * By wrapping it like this we stand a good chance of being able to optimise for storage format easily. - * It should also help us make sure all the data structures remain consistent. - */ -class btSoftBodyVertexData -{ -public: - /** - * Class describing a vertex for input into the system. - */ - class VertexDescription - { - private: - Vectormath::Aos::Point3 m_position; - /** Inverse mass. If this is 0f then the mass was 0 because that simplifies calculations. */ - float m_inverseMass; - - public: - VertexDescription() - { - m_position = Vectormath::Aos::Point3( 0.f, 0.f, 0.f ); - m_inverseMass = 0.f; - } - - VertexDescription( const Vectormath::Aos::Point3 &position, float mass ) - { - m_position = position; - if( mass > 0.f ) - m_inverseMass = 1.0f/mass; - else - m_inverseMass = 0.f; - } - - void setPosition( const Vectormath::Aos::Point3 &position ) - { - m_position = position; - } - - void setInverseMass( float inverseMass ) - { - m_inverseMass = inverseMass; - } - - void setMass( float mass ) - { - if( mass > 0.f ) - m_inverseMass = 1.0f/mass; - else - m_inverseMass = 0.f; - } - - Vectormath::Aos::Point3 getPosition() const - { - return m_position; - } - - float getInverseMass() const - { - return m_inverseMass; - } - - float getMass() const - { - if( m_inverseMass == 0.f ) - return 0.f; - else - return 1.0f/m_inverseMass; - } - }; -protected: - - // identifier for the individual cloth - // For the CPU we don't really need this as we can grab the cloths and iterate over only their vertices - // For a parallel accelerator knowing on a per-vertex basis which cloth we're part of will help for obtaining - // per-cloth data - // For sorting etc it might also be helpful to be able to use in-array data such as this. - btAlignedObjectArray< int > m_clothIdentifier; - btAlignedObjectArray< Vectormath::Aos::Point3 > m_vertexPosition; // vertex positions - btAlignedObjectArray< Vectormath::Aos::Point3 > m_vertexPreviousPosition; // vertex positions - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_vertexVelocity; // Velocity - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_vertexForceAccumulator; // Force accumulator - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_vertexNormal; // Normals - btAlignedObjectArray< float > m_vertexInverseMass; // Inverse mass - btAlignedObjectArray< float > m_vertexArea; // Area controlled by the vertex - btAlignedObjectArray< int > m_vertexTriangleCount; // Number of triangles touching this vertex - -public: - btSoftBodyVertexData() - { - } - - virtual ~btSoftBodyVertexData() - { - } - - virtual void clear() - { - m_clothIdentifier.resize(0); - m_vertexPosition.resize(0); - m_vertexPreviousPosition.resize(0); - m_vertexVelocity.resize(0); - m_vertexForceAccumulator.resize(0); - m_vertexNormal.resize(0); - m_vertexInverseMass.resize(0); - m_vertexArea.resize(0); - m_vertexTriangleCount.resize(0); - } - - int getNumVertices() - { - return m_vertexPosition.size(); - } - - int getClothIdentifier( int vertexIndex ) - { - return m_clothIdentifier[vertexIndex]; - } - - void setVertexAt( const VertexDescription &vertex, int vertexIndex ) - { - m_vertexPosition[vertexIndex] = vertex.getPosition(); - m_vertexPreviousPosition[vertexIndex] = vertex.getPosition(); - m_vertexVelocity[vertexIndex] = Vectormath::Aos::Vector3(0.f, 0.f, 0.f); - m_vertexForceAccumulator[vertexIndex] = Vectormath::Aos::Vector3(0.f, 0.f, 0.f); - m_vertexNormal[vertexIndex] = Vectormath::Aos::Vector3(0.f, 0.f, 0.f); - m_vertexInverseMass[vertexIndex] = vertex.getInverseMass(); - m_vertexArea[vertexIndex] = 0.f; - m_vertexTriangleCount[vertexIndex] = 0; - } - - /** - * Create numVertices new vertices for cloth clothIdentifier - * maxVertices allows a buffer zone of extra vertices for alignment or tearing reasons. - */ - void createVertices( int numVertices, int clothIdentifier, int maxVertices = 0 ) - { - int previousSize = m_vertexPosition.size(); - if( maxVertices == 0 ) - maxVertices = numVertices; - int newSize = previousSize + maxVertices; - - // Resize all the arrays that store vertex data - m_clothIdentifier.resize( newSize ); - m_vertexPosition.resize( newSize ); - m_vertexPreviousPosition.resize( newSize ); - m_vertexVelocity.resize( newSize ); - m_vertexForceAccumulator.resize( newSize ); - m_vertexNormal.resize( newSize ); - m_vertexInverseMass.resize( newSize ); - m_vertexArea.resize( newSize ); - m_vertexTriangleCount.resize( newSize ); - - for( int vertexIndex = previousSize; vertexIndex < newSize; ++vertexIndex ) - m_clothIdentifier[vertexIndex] = clothIdentifier; - for( int vertexIndex = (previousSize + numVertices); vertexIndex < newSize; ++vertexIndex ) - m_clothIdentifier[vertexIndex] = -1; - } - - // Get and set methods in header so they can be inlined - - /** - * Return a reference to the position of vertex vertexIndex as stored on the host. - */ - Vectormath::Aos::Point3 &getPosition( int vertexIndex ) - { - return m_vertexPosition[vertexIndex]; - } - - Vectormath::Aos::Point3 getPosition( int vertexIndex ) const - { - return m_vertexPosition[vertexIndex]; - } - - /** - * Return a reference to the previous position of vertex vertexIndex as stored on the host. - */ - Vectormath::Aos::Point3 &getPreviousPosition( int vertexIndex ) - { - return m_vertexPreviousPosition[vertexIndex]; - } - - /** - * Return a reference to the velocity of vertex vertexIndex as stored on the host. - */ - Vectormath::Aos::Vector3 &getVelocity( int vertexIndex ) - { - return m_vertexVelocity[vertexIndex]; - } - - /** - * Return a reference to the force accumulator of vertex vertexIndex as stored on the host. - */ - Vectormath::Aos::Vector3 &getForceAccumulator( int vertexIndex ) - { - return m_vertexForceAccumulator[vertexIndex]; - } - - /** - * Return a reference to the normal of vertex vertexIndex as stored on the host. - */ - Vectormath::Aos::Vector3 &getNormal( int vertexIndex ) - { - return m_vertexNormal[vertexIndex]; - } - - Vectormath::Aos::Vector3 getNormal( int vertexIndex ) const - { - return m_vertexNormal[vertexIndex]; - } - - /** - * Return a reference to the inverse mass of vertex vertexIndex as stored on the host. - */ - float &getInverseMass( int vertexIndex ) - { - return m_vertexInverseMass[vertexIndex]; - } - - /** - * Get access to the area controlled by this vertex. - */ - float &getArea( int vertexIndex ) - { - return m_vertexArea[vertexIndex]; - } - - /** - * Get access to the array of how many triangles touch each vertex. - */ - int &getTriangleCount( int vertexIndex ) - { - return m_vertexTriangleCount[vertexIndex]; - } - - - - /** - * Return true if data is on the accelerator. - * The CPU version of this class will return true here because - * the CPU is the same as the accelerator. - */ - virtual bool onAccelerator() - { - return true; - } - - /** - * Move data from host memory to the accelerator. - * The CPU version will always return that it has moved it. - */ - virtual bool moveToAccelerator() - { - return true; - } - - /** - * Move data to host memory from the accelerator if bCopy is false. - * If bCopy is true, copy data to host memory from the accelerator so that data - * won't be moved to accelerator when moveToAccelerator() is called next time. - * If bCopyMinimum is true, only vertex position and normal are copied. - * bCopyMinimum will be meaningful only if bCopy is true. - * The CPU version will always return that it has moved it. - */ - virtual bool moveFromAccelerator(bool bCopy = false, bool bCopyMinimum = true) - { - return true; - } - - btAlignedObjectArray< Vectormath::Aos::Point3 > &getVertexPositions() - { - return m_vertexPosition; - } -}; - - -class btSoftBodyTriangleData -{ -public: - /** - * Class representing a triangle as a set of three indices into the - * vertex array. - */ - class TriangleNodeSet - { - public: - int vertex0; - int vertex1; - int vertex2; - int _padding; - - TriangleNodeSet( ) - { - vertex0 = 0; - vertex1 = 0; - vertex2 = 0; - _padding = -1; - } - - TriangleNodeSet( int newVertex0, int newVertex1, int newVertex2 ) - { - vertex0 = newVertex0; - vertex1 = newVertex1; - vertex2 = newVertex2; - } - }; - - class TriangleDescription - { - protected: - int m_vertex0; - int m_vertex1; - int m_vertex2; - - public: - TriangleDescription() - { - m_vertex0 = 0; - m_vertex1 = 0; - m_vertex2 = 0; - } - - TriangleDescription( int newVertex0, int newVertex1, int newVertex2 ) - { - m_vertex0 = newVertex0; - m_vertex1 = newVertex1; - m_vertex2 = newVertex2; - } - - TriangleNodeSet getVertexSet() const - { - btSoftBodyTriangleData::TriangleNodeSet nodes; - nodes.vertex0 = m_vertex0; - nodes.vertex1 = m_vertex1; - nodes.vertex2 = m_vertex2; - return nodes; - } - }; - -protected: - // NOTE: - // Vertex reference data is stored relative to global array, not relative to individual cloth. - // Values must be correct if being passed into single-cloth VBOs or when migrating from one solver - // to another. - btAlignedObjectArray< TriangleNodeSet > m_vertexIndices; - btAlignedObjectArray< float > m_area; - btAlignedObjectArray< Vectormath::Aos::Vector3 > m_normal; - -public: - btSoftBodyTriangleData() - { - } - - virtual ~btSoftBodyTriangleData() - { - - } - - virtual void clear() - { - m_vertexIndices.resize(0); - m_area.resize(0); - m_normal.resize(0); - } - - int getNumTriangles() - { - return m_vertexIndices.size(); - } - - virtual void setTriangleAt( const TriangleDescription &triangle, int triangleIndex ) - { - m_vertexIndices[triangleIndex] = triangle.getVertexSet(); - } - - virtual void createTriangles( int numTriangles ) - { - int previousSize = m_vertexIndices.size(); - int newSize = previousSize + numTriangles; - - // Resize all the arrays that store triangle data - m_vertexIndices.resize( newSize ); - m_area.resize( newSize ); - m_normal.resize( newSize ); - } - - /** - * Return the vertex index set for triangle triangleIndex as stored on the host. - */ - const TriangleNodeSet &getVertexSet( int triangleIndex ) - { - return m_vertexIndices[triangleIndex]; - } - - /** - * Get access to the triangle area. - */ - float &getTriangleArea( int triangleIndex ) - { - return m_area[triangleIndex]; - } - - /** - * Get access to the normal vector for this triangle. - */ - Vectormath::Aos::Vector3 &getNormal( int triangleIndex ) - { - return m_normal[triangleIndex]; - } - - /** - * Return true if data is on the accelerator. - * The CPU version of this class will return true here because - * the CPU is the same as the accelerator. - */ - virtual bool onAccelerator() - { - return true; - } - - /** - * Move data from host memory to the accelerator. - * The CPU version will always return that it has moved it. - */ - virtual bool moveToAccelerator() - { - return true; - } - - /** - * Move data from host memory from the accelerator. - * The CPU version will always return that it has moved it. - */ - virtual bool moveFromAccelerator() - { - return true; - } -}; - - -#endif // #ifndef BT_SOFT_BODY_SOLVER_DATA_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/HeapManager.h b/Engine/lib/bullet/src/BulletMultiThreaded/HeapManager.h deleted file mode 100644 index b2da4ef55..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/HeapManager.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef BT_HEAP_MANAGER_H__ -#define BT_HEAP_MANAGER_H__ - -#ifdef __SPU__ - #define HEAP_STACK_SIZE 32 -#else - #define HEAP_STACK_SIZE 64 -#endif - -#define MIN_ALLOC_SIZE 16 - - -class HeapManager -{ -private: - ATTRIBUTE_ALIGNED16(unsigned char *mHeap); - ATTRIBUTE_ALIGNED16(unsigned int mHeapBytes); - ATTRIBUTE_ALIGNED16(unsigned char *mPoolStack[HEAP_STACK_SIZE]); - ATTRIBUTE_ALIGNED16(unsigned int mCurStack); - -public: - enum {ALIGN16,ALIGN128}; - - HeapManager(unsigned char *buf,int bytes) - { - mHeap = buf; - mHeapBytes = bytes; - clear(); - } - - ~HeapManager() - { - } - - int getAllocated() - { - return (int)(mPoolStack[mCurStack]-mHeap); - } - - int getRest() - { - return mHeapBytes-getAllocated(); - } - - void *allocate(size_t bytes,int alignment = ALIGN16) - { - if(bytes <= 0) bytes = MIN_ALLOC_SIZE; - btAssert(mCurStack < (HEAP_STACK_SIZE-1)); - - -#if defined(_WIN64) || defined(__LP64__) || defined(__x86_64__) - unsigned long long p = (unsigned long long )mPoolStack[mCurStack]; - if(alignment == ALIGN128) { - p = ((p+127) & 0xffffffffffffff80); - bytes = (bytes+127) & 0xffffffffffffff80; - } - else { - bytes = (bytes+15) & 0xfffffffffffffff0; - } - - btAssert(bytes <=(mHeapBytes-(p-(unsigned long long )mHeap)) ); - -#else - unsigned long p = (unsigned long )mPoolStack[mCurStack]; - if(alignment == ALIGN128) { - p = ((p+127) & 0xffffff80); - bytes = (bytes+127) & 0xffffff80; - } - else { - bytes = (bytes+15) & 0xfffffff0; - } - btAssert(bytes <=(mHeapBytes-(p-(unsigned long)mHeap)) ); -#endif - unsigned char * bla = (unsigned char *)(p + bytes); - mPoolStack[++mCurStack] = bla; - return (void*)p; - } - - void deallocate(void *p) - { - (void) p; - mCurStack--; - } - - void clear() - { - mPoolStack[0] = mHeap; - mCurStack = 0; - } - -// void printStack() -// { -// for(unsigned int i=0;i<=mCurStack;i++) { -// PRINTF("memStack %2d 0x%x\n",i,(uint32_t)mPoolStack[i]); -// } -// } - -}; - -#endif //BT_HEAP_MANAGER_H__ - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/PlatformDefinitions.h b/Engine/lib/bullet/src/BulletMultiThreaded/PlatformDefinitions.h deleted file mode 100644 index 9bf8c96f5..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/PlatformDefinitions.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef BT_TYPE_DEFINITIONS_H -#define BT_TYPE_DEFINITIONS_H - -///This file provides some platform/compiler checks for common definitions -#include "LinearMath/btScalar.h" -#include "LinearMath/btMinMax.h" - -#ifdef PFX_USE_FREE_VECTORMATH -#include "physics_effects/base_level/base/pfx_vectormath_include.win32.h" -typedef Vectormath::Aos::Vector3 vmVector3; -typedef Vectormath::Aos::Quat vmQuat; -typedef Vectormath::Aos::Matrix3 vmMatrix3; -typedef Vectormath::Aos::Transform3 vmTransform3; -typedef Vectormath::Aos::Point3 vmPoint3; -#else -#include "vectormath/vmInclude.h" -#endif//PFX_USE_FREE_VECTORMATH - - - - - -#ifdef _WIN32 - -typedef union -{ - unsigned int u; - void *p; -} addr64; - -#define USE_WIN32_THREADING 1 - - #if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300) - #else - #endif //__MINGW32__ - - typedef unsigned char uint8_t; -#ifndef __PHYSICS_COMMON_H__ -#ifndef PFX_USE_FREE_VECTORMATH -#ifndef __BT_SKIP_UINT64_H -#if defined(_WIN64) && defined(_MSC_VER) - typedef unsigned __int64 uint64_t; -#else - typedef unsigned long int uint64_t; -#endif -#endif //__BT_SKIP_UINT64_H -#endif //PFX_USE_FREE_VECTORMATH - typedef unsigned int uint32_t; -#endif //__PHYSICS_COMMON_H__ - typedef unsigned short uint16_t; - - #include - #define memalign(alignment, size) malloc(size); - -#include //memcpy - - - - #include - #define spu_printf printf - -#else - #include - #include - #include //for memcpy - -#if defined (__CELLOS_LV2__) - // Playstation 3 Cell SDK -#include - -#else - // posix system - -#define USE_PTHREADS (1) - -#ifdef USE_LIBSPE2 -#include -#define spu_printf printf -#define DWORD unsigned int - typedef union - { - unsigned long long ull; - unsigned int ui[2]; - void *p; - } addr64; -#endif // USE_LIBSPE2 - -#endif //__CELLOS_LV2__ - -#endif - -#ifdef __SPU__ -#include -#define printf spu_printf -#endif - -/* Included here because we need uint*_t typedefs */ -#include "PpuAddressSpace.h" - -#endif //BT_TYPE_DEFINITIONS_H - - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/PosixThreadSupport.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/PosixThreadSupport.cpp deleted file mode 100644 index 81c0cf86d..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/PosixThreadSupport.cpp +++ /dev/null @@ -1,409 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include -#include "PosixThreadSupport.h" -#ifdef USE_PTHREADS -#include -#include - -#include "SpuCollisionTaskProcess.h" -#include "SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" - -#define checkPThreadFunction(returnValue) \ - if(0 != returnValue) { \ - printf("PThread problem at line %i in file %s: %i %d\n", __LINE__, __FILE__, returnValue, errno); \ - } - -// The number of threads should be equal to the number of available cores -// Todo: each worker should be linked to a single core, using SetThreadIdealProcessor. - -// PosixThreadSupport helps to initialize/shutdown libspe2, start/stop SPU tasks and communication -// Setup and initialize SPU/CELL/Libspe2 -PosixThreadSupport::PosixThreadSupport(ThreadConstructionInfo& threadConstructionInfo) -{ - startThreads(threadConstructionInfo); -} - -// cleanup/shutdown Libspe2 -PosixThreadSupport::~PosixThreadSupport() -{ - stopSPU(); -} - -#if (defined (__APPLE__)) -#define NAMED_SEMAPHORES -#endif - -// this semaphore will signal, if and how many threads are finished with their work -static sem_t* mainSemaphore=0; - -static sem_t* createSem(const char* baseName) -{ - static int semCount = 0; -#ifdef NAMED_SEMAPHORES - /// Named semaphore begin - char name[32]; - snprintf(name, 32, "/%s-%d-%4.4d", baseName, getpid(), semCount++); - sem_t* tempSem = sem_open(name, O_CREAT, 0600, 0); - - if (tempSem != reinterpret_cast(SEM_FAILED)) - { -// printf("Created \"%s\" Semaphore %p\n", name, tempSem); - } - else - { - //printf("Error creating Semaphore %d\n", errno); - exit(-1); - } - /// Named semaphore end -#else - sem_t* tempSem = new sem_t; - checkPThreadFunction(sem_init(tempSem, 0, 0)); -#endif - return tempSem; -} - -static void destroySem(sem_t* semaphore) -{ -#ifdef NAMED_SEMAPHORES - checkPThreadFunction(sem_close(semaphore)); -#else - checkPThreadFunction(sem_destroy(semaphore)); - delete semaphore; -#endif -} - -static void *threadFunction(void *argument) -{ - - PosixThreadSupport::btSpuStatus* status = (PosixThreadSupport::btSpuStatus*)argument; - - - while (1) - { - checkPThreadFunction(sem_wait(status->startSemaphore)); - - void* userPtr = status->m_userPtr; - - if (userPtr) - { - btAssert(status->m_status); - status->m_userThreadFunc(userPtr,status->m_lsMemory); - status->m_status = 2; - checkPThreadFunction(sem_post(mainSemaphore)); - status->threadUsed++; - } else { - //exit Thread - status->m_status = 3; - checkPThreadFunction(sem_post(mainSemaphore)); - printf("Thread with taskId %i exiting\n",status->m_taskId); - break; - } - - } - - printf("Thread TERMINATED\n"); - return 0; - -} - -///send messages to SPUs -void PosixThreadSupport::sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t taskId) -{ - /// gMidphaseSPU.sendRequest(CMD_GATHER_AND_PROCESS_PAIRLIST, (uint32_t) &taskDesc); - - ///we should spawn an SPU task here, and in 'waitForResponse' it should wait for response of the (one of) the first tasks that finished - - - - switch (uiCommand) - { - case CMD_GATHER_AND_PROCESS_PAIRLIST: - { - btSpuStatus& spuStatus = m_activeSpuStatus[taskId]; - btAssert(taskId >= 0); - btAssert(taskId < m_activeSpuStatus.size()); - - spuStatus.m_commandId = uiCommand; - spuStatus.m_status = 1; - spuStatus.m_userPtr = (void*)uiArgument0; - - // fire event to start new task - checkPThreadFunction(sem_post(spuStatus.startSemaphore)); - break; - } - default: - { - ///not implemented - btAssert(0); - } - - }; - - -} - - -///check for messages from SPUs -void PosixThreadSupport::waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1) -{ - ///We should wait for (one of) the first tasks to finish (or other SPU messages), and report its response - - ///A possible response can be 'yes, SPU handled it', or 'no, please do a PPU fallback' - - - btAssert(m_activeSpuStatus.size()); - - // wait for any of the threads to finish - checkPThreadFunction(sem_wait(mainSemaphore)); - - // get at least one thread which has finished - size_t last = -1; - - for(size_t t=0; t < size_t(m_activeSpuStatus.size()); ++t) { - if(2 == m_activeSpuStatus[t].m_status) { - last = t; - break; - } - } - - btSpuStatus& spuStatus = m_activeSpuStatus[last]; - - btAssert(spuStatus.m_status > 1); - spuStatus.m_status = 0; - - // need to find an active spu - btAssert(last >= 0); - - *puiArgument0 = spuStatus.m_taskId; - *puiArgument1 = spuStatus.m_status; -} - - - -void PosixThreadSupport::startThreads(ThreadConstructionInfo& threadConstructionInfo) -{ - printf("%s creating %i threads.\n", __FUNCTION__, threadConstructionInfo.m_numThreads); - m_activeSpuStatus.resize(threadConstructionInfo.m_numThreads); - - mainSemaphore = createSem("main"); - //checkPThreadFunction(sem_wait(mainSemaphore)); - - for (int i=0;i < threadConstructionInfo.m_numThreads;i++) - { - printf("starting thread %d\n",i); - - btSpuStatus& spuStatus = m_activeSpuStatus[i]; - - spuStatus.startSemaphore = createSem("threadLocal"); - - checkPThreadFunction(pthread_create(&spuStatus.thread, NULL, &threadFunction, (void*)&spuStatus)); - - spuStatus.m_userPtr=0; - - spuStatus.m_taskId = i; - spuStatus.m_commandId = 0; - spuStatus.m_status = 0; - spuStatus.m_lsMemory = threadConstructionInfo.m_lsMemoryFunc(); - spuStatus.m_userThreadFunc = threadConstructionInfo.m_userThreadFunc; - spuStatus.threadUsed = 0; - - printf("started thread %d \n",i); - - } - -} - -void PosixThreadSupport::startSPU() -{ -} - - -///tell the task scheduler we are done with the SPU tasks -void PosixThreadSupport::stopSPU() -{ - for(size_t t=0; t < size_t(m_activeSpuStatus.size()); ++t) - { - btSpuStatus& spuStatus = m_activeSpuStatus[t]; - printf("%s: Thread %i used: %ld\n", __FUNCTION__, int(t), spuStatus.threadUsed); - - spuStatus.m_userPtr = 0; - checkPThreadFunction(sem_post(spuStatus.startSemaphore)); - checkPThreadFunction(sem_wait(mainSemaphore)); - - printf("destroy semaphore\n"); - destroySem(spuStatus.startSemaphore); - printf("semaphore destroyed\n"); - checkPThreadFunction(pthread_join(spuStatus.thread,0)); - - } - printf("destroy main semaphore\n"); - destroySem(mainSemaphore); - printf("main semaphore destroyed\n"); - m_activeSpuStatus.clear(); -} - -class PosixCriticalSection : public btCriticalSection -{ - pthread_mutex_t m_mutex; - -public: - PosixCriticalSection() - { - pthread_mutex_init(&m_mutex, NULL); - } - virtual ~PosixCriticalSection() - { - pthread_mutex_destroy(&m_mutex); - } - - ATTRIBUTE_ALIGNED16(unsigned int mCommonBuff[32]); - - virtual unsigned int getSharedParam(int i) - { - return mCommonBuff[i]; - } - virtual void setSharedParam(int i,unsigned int p) - { - mCommonBuff[i] = p; - } - - virtual void lock() - { - pthread_mutex_lock(&m_mutex); - } - virtual void unlock() - { - pthread_mutex_unlock(&m_mutex); - } -}; - - -#if defined(_POSIX_BARRIERS) && (_POSIX_BARRIERS - 20012L) >= 0 -/* OK to use barriers on this platform */ -class PosixBarrier : public btBarrier -{ - pthread_barrier_t m_barr; - int m_numThreads; -public: - PosixBarrier() - :m_numThreads(0) { } - virtual ~PosixBarrier() { - pthread_barrier_destroy(&m_barr); - } - - virtual void sync() - { - int rc = pthread_barrier_wait(&m_barr); - if(rc != 0 && rc != PTHREAD_BARRIER_SERIAL_THREAD) - { - printf("Could not wait on barrier\n"); - exit(-1); - } - } - virtual void setMaxCount(int numThreads) - { - int result = pthread_barrier_init(&m_barr, NULL, numThreads); - m_numThreads = numThreads; - btAssert(result==0); - } - virtual int getMaxCount() - { - return m_numThreads; - } -}; -#else -/* Not OK to use barriers on this platform - insert alternate code here */ -class PosixBarrier : public btBarrier -{ - pthread_mutex_t m_mutex; - pthread_cond_t m_cond; - - int m_numThreads; - int m_called; - -public: - PosixBarrier() - :m_numThreads(0) - { - } - virtual ~PosixBarrier() - { - if (m_numThreads>0) - { - pthread_mutex_destroy(&m_mutex); - pthread_cond_destroy(&m_cond); - } - } - - virtual void sync() - { - pthread_mutex_lock(&m_mutex); - m_called++; - if (m_called == m_numThreads) { - m_called = 0; - pthread_cond_broadcast(&m_cond); - } else { - pthread_cond_wait(&m_cond,&m_mutex); - } - pthread_mutex_unlock(&m_mutex); - - } - virtual void setMaxCount(int numThreads) - { - if (m_numThreads>0) - { - pthread_mutex_destroy(&m_mutex); - pthread_cond_destroy(&m_cond); - } - m_called = 0; - pthread_mutex_init(&m_mutex,NULL); - pthread_cond_init(&m_cond,NULL); - m_numThreads = numThreads; - } - virtual int getMaxCount() - { - return m_numThreads; - } -}; - -#endif//_POSIX_BARRIERS - - - -btBarrier* PosixThreadSupport::createBarrier() -{ - PosixBarrier* barrier = new PosixBarrier(); - barrier->setMaxCount(getNumTasks()); - return barrier; -} - -btCriticalSection* PosixThreadSupport::createCriticalSection() -{ - return new PosixCriticalSection(); -} - -void PosixThreadSupport::deleteBarrier(btBarrier* barrier) -{ - delete barrier; -} - -void PosixThreadSupport::deleteCriticalSection(btCriticalSection* cs) -{ - delete cs; -} -#endif // USE_PTHREADS - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/PosixThreadSupport.h b/Engine/lib/bullet/src/BulletMultiThreaded/PosixThreadSupport.h deleted file mode 100644 index bf7578f51..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/PosixThreadSupport.h +++ /dev/null @@ -1,147 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_POSIX_THREAD_SUPPORT_H -#define BT_POSIX_THREAD_SUPPORT_H - - -#include "LinearMath/btScalar.h" -#include "PlatformDefinitions.h" - -#ifdef USE_PTHREADS //platform specifc defines are defined in PlatformDefinitions.h - -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 600 //for definition of pthread_barrier_t, see http://pages.cs.wisc.edu/~travitch/pthreads_primer.html -#endif //_XOPEN_SOURCE -#include -#include - - - -#include "LinearMath/btAlignedObjectArray.h" - -#include "btThreadSupportInterface.h" - - -typedef void (*PosixThreadFunc)(void* userPtr,void* lsMemory); -typedef void* (*PosixlsMemorySetupFunc)(); - -// PosixThreadSupport helps to initialize/shutdown libspe2, start/stop SPU tasks and communication -class PosixThreadSupport : public btThreadSupportInterface -{ -public: - typedef enum sStatus { - STATUS_BUSY, - STATUS_READY, - STATUS_FINISHED - } Status; - - // placeholder, until libspe2 support is there - struct btSpuStatus - { - uint32_t m_taskId; - uint32_t m_commandId; - uint32_t m_status; - - PosixThreadFunc m_userThreadFunc; - void* m_userPtr; //for taskDesc etc - void* m_lsMemory; //initialized using PosixLocalStoreMemorySetupFunc - - pthread_t thread; - sem_t* startSemaphore; - - unsigned long threadUsed; - }; -private: - - btAlignedObjectArray m_activeSpuStatus; -public: - ///Setup and initialize SPU/CELL/Libspe2 - - - - struct ThreadConstructionInfo - { - ThreadConstructionInfo(const char* uniqueName, - PosixThreadFunc userThreadFunc, - PosixlsMemorySetupFunc lsMemoryFunc, - int numThreads=1, - int threadStackSize=65535 - ) - :m_uniqueName(uniqueName), - m_userThreadFunc(userThreadFunc), - m_lsMemoryFunc(lsMemoryFunc), - m_numThreads(numThreads), - m_threadStackSize(threadStackSize) - { - - } - - const char* m_uniqueName; - PosixThreadFunc m_userThreadFunc; - PosixlsMemorySetupFunc m_lsMemoryFunc; - int m_numThreads; - int m_threadStackSize; - - }; - - PosixThreadSupport(ThreadConstructionInfo& threadConstructionInfo); - -///cleanup/shutdown Libspe2 - virtual ~PosixThreadSupport(); - - void startThreads(ThreadConstructionInfo& threadInfo); - - -///send messages to SPUs - virtual void sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t uiArgument1); - -///check for messages from SPUs - virtual void waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1); - -///start the spus (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) - virtual void startSPU(); - -///tell the task scheduler we are done with the SPU tasks - virtual void stopSPU(); - - virtual void setNumTasks(int numTasks) {} - - virtual int getNumTasks() const - { - return m_activeSpuStatus.size(); - } - - virtual btBarrier* createBarrier(); - - virtual btCriticalSection* createCriticalSection(); - - virtual void deleteBarrier(btBarrier* barrier); - - virtual void deleteCriticalSection(btCriticalSection* criticalSection); - - - virtual void* getThreadLocalMemory(int taskId) - { - return m_activeSpuStatus[taskId].m_lsMemory; - } - -}; - -#endif // USE_PTHREADS - -#endif // BT_POSIX_THREAD_SUPPORT_H - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SequentialThreadSupport.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SequentialThreadSupport.cpp deleted file mode 100644 index 199927721..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SequentialThreadSupport.cpp +++ /dev/null @@ -1,181 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SequentialThreadSupport.h" - - -#include "SpuCollisionTaskProcess.h" -#include "SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" - -SequentialThreadSupport::SequentialThreadSupport(SequentialThreadConstructionInfo& threadConstructionInfo) -{ - startThreads(threadConstructionInfo); -} - -///cleanup/shutdown Libspe2 -SequentialThreadSupport::~SequentialThreadSupport() -{ - stopSPU(); -} - -#include - -///send messages to SPUs -void SequentialThreadSupport::sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t taskId) -{ - switch (uiCommand) - { - case CMD_GATHER_AND_PROCESS_PAIRLIST: - { - btSpuStatus& spuStatus = m_activeSpuStatus[0]; - spuStatus.m_userPtr=(void*)uiArgument0; - spuStatus.m_userThreadFunc(spuStatus.m_userPtr,spuStatus.m_lsMemory); - } - break; - default: - { - ///not implemented - btAssert(0 && "Not implemented"); - } - - }; - - -} - -///check for messages from SPUs -void SequentialThreadSupport::waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1) -{ - btAssert(m_activeSpuStatus.size()); - btSpuStatus& spuStatus = m_activeSpuStatus[0]; - *puiArgument0 = spuStatus.m_taskId; - *puiArgument1 = spuStatus.m_status; -} - -void SequentialThreadSupport::startThreads(SequentialThreadConstructionInfo& threadConstructionInfo) -{ - m_activeSpuStatus.resize(1); - printf("STS: Not starting any threads\n"); - btSpuStatus& spuStatus = m_activeSpuStatus[0]; - spuStatus.m_userPtr = 0; - spuStatus.m_taskId = 0; - spuStatus.m_commandId = 0; - spuStatus.m_status = 0; - spuStatus.m_lsMemory = threadConstructionInfo.m_lsMemoryFunc(); - spuStatus.m_userThreadFunc = threadConstructionInfo.m_userThreadFunc; - printf("STS: Created local store at %p for task %s\n", spuStatus.m_lsMemory, threadConstructionInfo.m_uniqueName); -} - -void SequentialThreadSupport::startSPU() -{ -} - -void SequentialThreadSupport::stopSPU() -{ - m_activeSpuStatus.clear(); -} - -void SequentialThreadSupport::setNumTasks(int numTasks) -{ - printf("SequentialThreadSupport::setNumTasks(%d) is not implemented and has no effect\n",numTasks); -} - - - - -class btDummyBarrier : public btBarrier -{ -private: - -public: - btDummyBarrier() - { - } - - virtual ~btDummyBarrier() - { - } - - void sync() - { - } - - virtual void setMaxCount(int n) {} - virtual int getMaxCount() {return 1;} -}; - -class btDummyCriticalSection : public btCriticalSection -{ - -public: - btDummyCriticalSection() - { - } - - virtual ~btDummyCriticalSection() - { - } - - unsigned int getSharedParam(int i) - { - btAssert(i>=0&&i<31); - return mCommonBuff[i+1]; - } - - void setSharedParam(int i,unsigned int p) - { - btAssert(i>=0&&i<31); - mCommonBuff[i+1] = p; - } - - void lock() - { - mCommonBuff[0] = 1; - } - - void unlock() - { - mCommonBuff[0] = 0; - } -}; - - - - -btBarrier* SequentialThreadSupport::createBarrier() -{ - return new btDummyBarrier(); -} - -btCriticalSection* SequentialThreadSupport::createCriticalSection() -{ - return new btDummyCriticalSection(); - -} - -void SequentialThreadSupport::deleteBarrier(btBarrier* barrier) -{ - delete barrier; -} - -void SequentialThreadSupport::deleteCriticalSection(btCriticalSection* criticalSection) -{ - delete criticalSection; -} - - - - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SequentialThreadSupport.h b/Engine/lib/bullet/src/BulletMultiThreaded/SequentialThreadSupport.h deleted file mode 100644 index a188ef219..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SequentialThreadSupport.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "LinearMath/btScalar.h" -#include "PlatformDefinitions.h" - - -#ifndef BT_SEQUENTIAL_THREAD_SUPPORT_H -#define BT_SEQUENTIAL_THREAD_SUPPORT_H - -#include "LinearMath/btAlignedObjectArray.h" - -#include "btThreadSupportInterface.h" - -typedef void (*SequentialThreadFunc)(void* userPtr,void* lsMemory); -typedef void* (*SequentiallsMemorySetupFunc)(); - - - -///The SequentialThreadSupport is a portable non-parallel implementation of the btThreadSupportInterface -///This is useful for debugging and porting SPU Tasks to other platforms. -class SequentialThreadSupport : public btThreadSupportInterface -{ -public: - struct btSpuStatus - { - uint32_t m_taskId; - uint32_t m_commandId; - uint32_t m_status; - - SequentialThreadFunc m_userThreadFunc; - - void* m_userPtr; //for taskDesc etc - void* m_lsMemory; //initialized using SequentiallsMemorySetupFunc - }; -private: - btAlignedObjectArray m_activeSpuStatus; - btAlignedObjectArray m_completeHandles; -public: - struct SequentialThreadConstructionInfo - { - SequentialThreadConstructionInfo (const char* uniqueName, - SequentialThreadFunc userThreadFunc, - SequentiallsMemorySetupFunc lsMemoryFunc - ) - :m_uniqueName(uniqueName), - m_userThreadFunc(userThreadFunc), - m_lsMemoryFunc(lsMemoryFunc) - { - - } - - const char* m_uniqueName; - SequentialThreadFunc m_userThreadFunc; - SequentiallsMemorySetupFunc m_lsMemoryFunc; - }; - - SequentialThreadSupport(SequentialThreadConstructionInfo& threadConstructionInfo); - virtual ~SequentialThreadSupport(); - void startThreads(SequentialThreadConstructionInfo& threadInfo); -///send messages to SPUs - virtual void sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t uiArgument1); -///check for messages from SPUs - virtual void waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1); -///start the spus (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) - virtual void startSPU(); -///tell the task scheduler we are done with the SPU tasks - virtual void stopSPU(); - - virtual void setNumTasks(int numTasks); - - virtual int getNumTasks() const - { - return 1; - } - virtual btBarrier* createBarrier(); - - virtual btCriticalSection* createCriticalSection(); - - virtual void deleteBarrier(btBarrier* barrier); - - virtual void deleteCriticalSection(btCriticalSection* criticalSection); - - -}; - -#endif //BT_SEQUENTIAL_THREAD_SUPPORT_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp deleted file mode 100644 index 182aa2694..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SpuCollisionObjectWrapper.h" -#include "BulletCollision/CollisionShapes/btCollisionShape.h" - -SpuCollisionObjectWrapper::SpuCollisionObjectWrapper () -{ -} - -#ifndef __SPU__ -SpuCollisionObjectWrapper::SpuCollisionObjectWrapper (const btCollisionObject* collisionObject) -{ - m_shapeType = collisionObject->getCollisionShape()->getShapeType (); - m_collisionObjectPtr = (ppu_address_t)collisionObject; - m_margin = collisionObject->getCollisionShape()->getMargin (); -} -#endif - -int -SpuCollisionObjectWrapper::getShapeType () const -{ - return m_shapeType; -} - -float -SpuCollisionObjectWrapper::getCollisionMargin () const -{ - return m_margin; -} - -ppu_address_t -SpuCollisionObjectWrapper::getCollisionObjectPtr () const -{ - return m_collisionObjectPtr; -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp deleted file mode 100644 index f606d1363..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp +++ /dev/null @@ -1,317 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -//#define DEBUG_SPU_TASK_SCHEDULING 1 - - -//class OptimizedBvhNode; - -#include "SpuCollisionTaskProcess.h" - - - - -void SpuCollisionTaskProcess::setNumTasks(int maxNumTasks) -{ - if (int(m_maxNumOutstandingTasks) != maxNumTasks) - { - m_maxNumOutstandingTasks = maxNumTasks; - m_taskBusy.resize(m_maxNumOutstandingTasks); - m_spuGatherTaskDesc.resize(m_maxNumOutstandingTasks); - - for (int i = 0; i < m_taskBusy.size(); i++) - { - m_taskBusy[i] = false; - } - - ///re-allocate task memory buffers - if (m_workUnitTaskBuffers != 0) - { - btAlignedFree(m_workUnitTaskBuffers); - } - - m_workUnitTaskBuffers = (unsigned char *)btAlignedAlloc(MIDPHASE_WORKUNIT_TASK_SIZE*m_maxNumOutstandingTasks, 128); - } - -} - - - -SpuCollisionTaskProcess::SpuCollisionTaskProcess(class btThreadSupportInterface* threadInterface, unsigned int maxNumOutstandingTasks) -:m_threadInterface(threadInterface), -m_maxNumOutstandingTasks(0) -{ - m_workUnitTaskBuffers = (unsigned char *)0; - setNumTasks(maxNumOutstandingTasks); - m_numBusyTasks = 0; - m_currentTask = 0; - m_currentPage = 0; - m_currentPageEntry = 0; - -#ifdef DEBUG_SpuCollisionTaskProcess - m_initialized = false; -#endif - - m_threadInterface->startSPU(); - - //printf("sizeof vec_float4: %d\n", sizeof(vec_float4)); - printf("sizeof SpuGatherAndProcessWorkUnitInput: %d\n", int(sizeof(SpuGatherAndProcessWorkUnitInput))); - -} - -SpuCollisionTaskProcess::~SpuCollisionTaskProcess() -{ - - if (m_workUnitTaskBuffers != 0) - { - btAlignedFree(m_workUnitTaskBuffers); - m_workUnitTaskBuffers = 0; - } - - - - m_threadInterface->stopSPU(); - -} - - - -void SpuCollisionTaskProcess::initialize2(bool useEpa) -{ - -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("SpuCollisionTaskProcess::initialize()\n"); -#endif //DEBUG_SPU_TASK_SCHEDULING - - for (int i = 0; i < int (m_maxNumOutstandingTasks); i++) - { - m_taskBusy[i] = false; - } - m_numBusyTasks = 0; - m_currentTask = 0; - m_currentPage = 0; - m_currentPageEntry = 0; - m_useEpa = useEpa; - -#ifdef DEBUG_SpuCollisionTaskProcess - m_initialized = true; - btAssert(MIDPHASE_NUM_WORKUNITS_PER_TASK*sizeof(SpuGatherAndProcessWorkUnitInput) <= MIDPHASE_WORKUNIT_TASK_SIZE); -#endif -} - - -void SpuCollisionTaskProcess::issueTask2() -{ - -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("SpuCollisionTaskProcess::issueTask (m_currentTask= %d\n)", m_currentTask); -#endif //DEBUG_SPU_TASK_SCHEDULING - - m_taskBusy[m_currentTask] = true; - m_numBusyTasks++; - - - SpuGatherAndProcessPairsTaskDesc& taskDesc = m_spuGatherTaskDesc[m_currentTask]; - taskDesc.m_useEpa = m_useEpa; - - { - // send task description in event message - // no error checking here... - // but, currently, event queue can be no larger than NUM_WORKUNIT_TASKS. - - taskDesc.m_inPairPtr = reinterpret_cast(MIDPHASE_TASK_PTR(m_currentTask)); - - taskDesc.taskId = m_currentTask; - taskDesc.numPages = m_currentPage+1; - taskDesc.numOnLastPage = m_currentPageEntry; - } - - - - m_threadInterface->sendRequest(CMD_GATHER_AND_PROCESS_PAIRLIST, (ppu_address_t) &taskDesc,m_currentTask); - - // if all tasks busy, wait for spu event to clear the task. - - - if (m_numBusyTasks >= m_maxNumOutstandingTasks) - { - unsigned int taskId; - unsigned int outputSize; - - - for (int i=0;i=0); - - - m_threadInterface->waitForResponse(&taskId, &outputSize); - -// printf("issueTask taskId %d completed, numBusy=%d\n",taskId,m_numBusyTasks); - - //printf("PPU: after issue, received event: %u %d\n", taskId, outputSize); - - //postProcess(taskId, outputSize); - - m_taskBusy[taskId] = false; - - m_numBusyTasks--; - } - -} - -void SpuCollisionTaskProcess::addWorkToTask(void* pairArrayPtr,int startIndex,int endIndex) -{ -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("#"); -#endif //DEBUG_SPU_TASK_SCHEDULING - -#ifdef DEBUG_SpuCollisionTaskProcess - btAssert(m_initialized); - btAssert(m_workUnitTaskBuffers); - -#endif - - bool batch = true; - - if (batch) - { - if (m_currentPageEntry == MIDPHASE_NUM_WORKUNITS_PER_PAGE) - { - if (m_currentPage == MIDPHASE_NUM_WORKUNIT_PAGES-1) - { - // task buffer is full, issue current task. - // if all task buffers busy, this waits until SPU is done. - issueTask2(); - - // find new task buffer - for (unsigned int i = 0; i < m_maxNumOutstandingTasks; i++) - { - if (!m_taskBusy[i]) - { - m_currentTask = i; - //init the task data - - break; - } - } - - m_currentPage = 0; - } - else - { - m_currentPage++; - } - - m_currentPageEntry = 0; - } - } - - { - - - - SpuGatherAndProcessWorkUnitInput &wuInput = - *(reinterpret_cast - (MIDPHASE_ENTRY_PTR(m_currentTask, m_currentPage, m_currentPageEntry))); - - wuInput.m_pairArrayPtr = reinterpret_cast(pairArrayPtr); - wuInput.m_startIndex = startIndex; - wuInput.m_endIndex = endIndex; - - - - m_currentPageEntry++; - - if (!batch) - { - issueTask2(); - - // find new task buffer - for (unsigned int i = 0; i < m_maxNumOutstandingTasks; i++) - { - if (!m_taskBusy[i]) - { - m_currentTask = i; - //init the task data - - break; - } - } - - m_currentPage = 0; - m_currentPageEntry =0; - } - } -} - - -void -SpuCollisionTaskProcess::flush2() -{ -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("\nSpuCollisionTaskProcess::flush()\n"); -#endif //DEBUG_SPU_TASK_SCHEDULING - - // if there's a partially filled task buffer, submit that task - if (m_currentPage > 0 || m_currentPageEntry > 0) - { - issueTask2(); - } - - - // all tasks are issued, wait for all tasks to be complete - while(m_numBusyTasks > 0) - { - // Consolidating SPU code - unsigned int taskId=-1; - unsigned int outputSize; - - for (int i=0;i=0); - - - { - - // SPURS support. - m_threadInterface->waitForResponse(&taskId, &outputSize); - } -// printf("flush2 taskId %d completed, numBusy =%d \n",taskId,m_numBusyTasks); - //printf("PPU: flushing, received event: %u %d\n", taskId, outputSize); - - //postProcess(taskId, outputSize); - - m_taskBusy[taskId] = false; - - m_numBusyTasks--; - } - - -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionTaskProcess.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionTaskProcess.h deleted file mode 100644 index 23b5b05a1..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuCollisionTaskProcess.h +++ /dev/null @@ -1,163 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SPU_COLLISION_TASK_PROCESS_H -#define BT_SPU_COLLISION_TASK_PROCESS_H - -#include - -#include "LinearMath/btScalar.h" - -#include "PlatformDefinitions.h" -#include "LinearMath/btAlignedObjectArray.h" -#include "SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" // for definitions processCollisionTask and createCollisionLocalStoreMemory - -#include "btThreadSupportInterface.h" - - -//#include "SPUAssert.h" -#include - - -#include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletCollision/CollisionShapes/btCollisionShape.h" -#include "BulletCollision/CollisionShapes/btConvexShape.h" - -#include "LinearMath/btAlignedAllocator.h" - -#include - - -#define DEBUG_SpuCollisionTaskProcess 1 - - -#define CMD_GATHER_AND_PROCESS_PAIRLIST 1 - -class btCollisionObject; -class btPersistentManifold; -class btDispatcher; - - -/////Task Description for SPU collision detection -//struct SpuGatherAndProcessPairsTaskDesc -//{ -// uint64_t inPtr;//m_pairArrayPtr; -// //mutex variable -// uint32_t m_someMutexVariableInMainMemory; -// -// uint64_t m_dispatcher; -// -// uint32_t numOnLastPage; -// -// uint16_t numPages; -// uint16_t taskId; -// -// struct CollisionTask_LocalStoreMemory* m_lsMemory; -//} -// -//#if defined(__CELLOS_LV2__) || defined(USE_LIBSPE2) -//__attribute__ ((aligned (16))) -//#endif -//; - - -///MidphaseWorkUnitInput stores individual primitive versus mesh collision detection input, to be processed by the SPU. -ATTRIBUTE_ALIGNED16(struct) SpuGatherAndProcessWorkUnitInput -{ - uint64_t m_pairArrayPtr; - int m_startIndex; - int m_endIndex; -}; - - - - -/// SpuCollisionTaskProcess handles SPU processing of collision pairs. -/// Maintains a set of task buffers. -/// When the task is full, the task is issued for SPUs to process. Contact output goes into btPersistentManifold -/// associated with each task. -/// When PPU issues a task, it will look for completed task buffers -/// PPU will do postprocessing, dependent on workunit output (not likely) -class SpuCollisionTaskProcess -{ - - unsigned char *m_workUnitTaskBuffers; - - - // track task buffers that are being used, and total busy tasks - btAlignedObjectArray m_taskBusy; - btAlignedObjectArray m_spuGatherTaskDesc; - - class btThreadSupportInterface* m_threadInterface; - - unsigned int m_maxNumOutstandingTasks; - - unsigned int m_numBusyTasks; - - // the current task and the current entry to insert a new work unit - unsigned int m_currentTask; - unsigned int m_currentPage; - unsigned int m_currentPageEntry; - - bool m_useEpa; - -#ifdef DEBUG_SpuCollisionTaskProcess - bool m_initialized; -#endif - void issueTask2(); - //void postProcess(unsigned int taskId, int outputSize); - -public: - SpuCollisionTaskProcess(btThreadSupportInterface* threadInterface, unsigned int maxNumOutstandingTasks); - - ~SpuCollisionTaskProcess(); - - ///call initialize in the beginning of the frame, before addCollisionPairToTask - void initialize2(bool useEpa = false); - - ///batch up additional work to a current task for SPU processing. When batch is full, it issues the task. - void addWorkToTask(void* pairArrayPtr,int startIndex,int endIndex); - - ///call flush to submit potential outstanding work to SPUs and wait for all involved SPUs to be finished - void flush2(); - - /// set the maximum number of SPU tasks allocated - void setNumTasks(int maxNumTasks); - - int getNumTasks() const - { - return m_maxNumOutstandingTasks; - } -}; - - - -#define MIDPHASE_TASK_PTR(task) (&m_workUnitTaskBuffers[0] + MIDPHASE_WORKUNIT_TASK_SIZE*task) -#define MIDPHASE_ENTRY_PTR(task,page,entry) (MIDPHASE_TASK_PTR(task) + MIDPHASE_WORKUNIT_PAGE_SIZE*page + sizeof(SpuGatherAndProcessWorkUnitInput)*entry) -#define MIDPHASE_OUTPUT_PTR(task) (&m_contactOutputBuffers[0] + MIDPHASE_MAX_CONTACT_BUFFER_SIZE*task) -#define MIDPHASE_TREENODES_PTR(task) (&m_complexShapeBuffers[0] + MIDPHASE_COMPLEX_SHAPE_BUFFER_SIZE*task) - - -#define MIDPHASE_WORKUNIT_PAGE_SIZE (16) -//#define MIDPHASE_WORKUNIT_PAGE_SIZE (128) - -#define MIDPHASE_NUM_WORKUNIT_PAGES 1 -#define MIDPHASE_WORKUNIT_TASK_SIZE (MIDPHASE_WORKUNIT_PAGE_SIZE*MIDPHASE_NUM_WORKUNIT_PAGES) -#define MIDPHASE_NUM_WORKUNITS_PER_PAGE (MIDPHASE_WORKUNIT_PAGE_SIZE / sizeof(SpuGatherAndProcessWorkUnitInput)) -#define MIDPHASE_NUM_WORKUNITS_PER_TASK (MIDPHASE_NUM_WORKUNITS_PER_PAGE*MIDPHASE_NUM_WORKUNIT_PAGES) - - -#endif // BT_SPU_COLLISION_TASK_PROCESS_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp deleted file mode 100644 index 62cf4f0f5..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SpuContactManifoldCollisionAlgorithm.h" -#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" -#include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletCollision/CollisionShapes/btCollisionShape.h" -#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" - - - - -void SpuContactManifoldCollisionAlgorithm::processCollision (const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) -{ - btAssert(0); -} - -btScalar SpuContactManifoldCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) -{ - btAssert(0); - return 1.f; -} - -#ifndef __SPU__ -SpuContactManifoldCollisionAlgorithm::SpuContactManifoldCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObject* body0,const btCollisionObject* body1) -:btCollisionAlgorithm(ci) -#ifdef USE_SEPDISTANCE_UTIL -,m_sepDistance(body0->getCollisionShape()->getAngularMotionDisc(),body1->getCollisionShape()->getAngularMotionDisc()) -#endif //USE_SEPDISTANCE_UTIL -{ - m_manifoldPtr = m_dispatcher->getNewManifold(body0,body1); - m_shapeType0 = body0->getCollisionShape()->getShapeType(); - m_shapeType1 = body1->getCollisionShape()->getShapeType(); - m_collisionMargin0 = body0->getCollisionShape()->getMargin(); - m_collisionMargin1 = body1->getCollisionShape()->getMargin(); - m_collisionObject0 = body0; - m_collisionObject1 = body1; - - if (body0->getCollisionShape()->isPolyhedral()) - { - btPolyhedralConvexShape* convex0 = (btPolyhedralConvexShape*)body0->getCollisionShape(); - m_shapeDimensions0 = convex0->getImplicitShapeDimensions(); - } - if (body1->getCollisionShape()->isPolyhedral()) - { - btPolyhedralConvexShape* convex1 = (btPolyhedralConvexShape*)body1->getCollisionShape(); - m_shapeDimensions1 = convex1->getImplicitShapeDimensions(); - } -} -#endif //__SPU__ - - -SpuContactManifoldCollisionAlgorithm::~SpuContactManifoldCollisionAlgorithm() -{ - if (m_manifoldPtr) - m_dispatcher->releaseManifold(m_manifoldPtr); -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h deleted file mode 100644 index 14b0a9454..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h +++ /dev/null @@ -1,121 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H -#define BT_SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H - -#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" -#include "BulletCollision/BroadphaseCollision/btDispatcher.h" -#include "LinearMath/btTransformUtil.h" -#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" - -class btPersistentManifold; - -//#define USE_SEPDISTANCE_UTIL 1 - -/// SpuContactManifoldCollisionAlgorithm provides contact manifold and should be processed on SPU. -ATTRIBUTE_ALIGNED16(class) SpuContactManifoldCollisionAlgorithm : public btCollisionAlgorithm -{ - btVector3 m_shapeDimensions0; - btVector3 m_shapeDimensions1; - btPersistentManifold* m_manifoldPtr; - int m_shapeType0; - int m_shapeType1; - float m_collisionMargin0; - float m_collisionMargin1; - - const btCollisionObject* m_collisionObject0; - const btCollisionObject* m_collisionObject1; - - - - -public: - - virtual void processCollision (const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut); - - virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut); - - - SpuContactManifoldCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci,const btCollisionObject* body0,const btCollisionObject* body1); -#ifdef USE_SEPDISTANCE_UTIL - btConvexSeparatingDistanceUtil m_sepDistance; -#endif //USE_SEPDISTANCE_UTIL - - virtual ~SpuContactManifoldCollisionAlgorithm(); - - virtual void getAllContactManifolds(btManifoldArray& manifoldArray) - { - if (m_manifoldPtr) - manifoldArray.push_back(m_manifoldPtr); - } - - btPersistentManifold* getContactManifoldPtr() - { - return m_manifoldPtr; - } - - const btCollisionObject* getCollisionObject0() - { - return m_collisionObject0; - } - - const btCollisionObject* getCollisionObject1() - { - return m_collisionObject1; - } - - int getShapeType0() const - { - return m_shapeType0; - } - - int getShapeType1() const - { - return m_shapeType1; - } - float getCollisionMargin0() const - { - return m_collisionMargin0; - } - float getCollisionMargin1() const - { - return m_collisionMargin1; - } - - const btVector3& getShapeDimensions0() const - { - return m_shapeDimensions0; - } - - const btVector3& getShapeDimensions1() const - { - return m_shapeDimensions1; - } - - struct CreateFunc :public btCollisionAlgorithmCreateFunc - { - virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap) - { - void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(SpuContactManifoldCollisionAlgorithm)); - return new(mem) SpuContactManifoldCollisionAlgorithm(ci,body0Wrap->getCollisionObject(),body1Wrap->getCollisionObject()); - } - }; - -}; - -#endif //BT_SPU_CONTACTMANIFOLD_COLLISION_ALGORITHM_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuDoubleBuffer.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuDoubleBuffer.h deleted file mode 100644 index 558d61526..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuDoubleBuffer.h +++ /dev/null @@ -1,126 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#ifndef BT_DOUBLE_BUFFER_H -#define BT_DOUBLE_BUFFER_H - -#include "SpuFakeDma.h" -#include "LinearMath/btScalar.h" - - -///DoubleBuffer -template -class DoubleBuffer -{ -#if defined(__SPU__) || defined(USE_LIBSPE2) - ATTRIBUTE_ALIGNED128( T m_buffer0[size] ) ; - ATTRIBUTE_ALIGNED128( T m_buffer1[size] ) ; -#else - T m_buffer0[size]; - T m_buffer1[size]; -#endif - - T *m_frontBuffer; - T *m_backBuffer; - - unsigned int m_dmaTag; - bool m_dmaPending; -public: - bool isPending() const { return m_dmaPending;} - DoubleBuffer(); - - void init (); - - // dma get and put commands - void backBufferDmaGet(uint64_t ea, unsigned int numBytes, unsigned int tag); - void backBufferDmaPut(uint64_t ea, unsigned int numBytes, unsigned int tag); - - // gets pointer to a buffer - T *getFront(); - T *getBack(); - - // if back buffer dma was started, wait for it to complete - // then move back to front and vice versa - T *swapBuffers(); -}; - -template -DoubleBuffer::DoubleBuffer() -{ - init (); -} - -template -void DoubleBuffer::init() -{ - this->m_dmaPending = false; - this->m_frontBuffer = &this->m_buffer0[0]; - this->m_backBuffer = &this->m_buffer1[0]; -} - -template -void -DoubleBuffer::backBufferDmaGet(uint64_t ea, unsigned int numBytes, unsigned int tag) -{ - m_dmaPending = true; - m_dmaTag = tag; - if (numBytes) - { - m_backBuffer = (T*)cellDmaLargeGetReadOnly(m_backBuffer, ea, numBytes, tag, 0, 0); - } -} - -template -void -DoubleBuffer::backBufferDmaPut(uint64_t ea, unsigned int numBytes, unsigned int tag) -{ - m_dmaPending = true; - m_dmaTag = tag; - cellDmaLargePut(m_backBuffer, ea, numBytes, tag, 0, 0); -} - -template -T * -DoubleBuffer::getFront() -{ - return m_frontBuffer; -} - -template -T * -DoubleBuffer::getBack() -{ - return m_backBuffer; -} - -template -T * -DoubleBuffer::swapBuffers() -{ - if (m_dmaPending) - { - cellDmaWaitTagStatusAll(1< //for btAssert -//Disabling memcpy sometimes helps debugging DMA - -#define USE_MEMCPY 1 -#ifdef USE_MEMCPY - -#endif - - -void* cellDmaLargeGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) -{ - -#if defined (__SPU__) || defined (USE_LIBSPE2) - cellDmaLargeGet(ls,ea,size,tag,tid,rid); - return ls; -#else - return (void*)(ppu_address_t)ea; -#endif -} - -void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) -{ -#if defined (__SPU__) || defined (USE_LIBSPE2) - mfc_get(ls,ea,size,tag,0,0); - return ls; -#else - return (void*)(ppu_address_t)ea; -#endif -} - - - - -void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid) -{ -#if defined (__SPU__) || defined (USE_LIBSPE2) - cellDmaGet(ls,ea,size,tag,tid,rid); - return ls; -#else - return (void*)(ppu_address_t)ea; -#endif -} - - -///this unalignedDma should not be frequently used, only for small data. It handles alignment and performs check on size (<16 bytes) -int stallingUnalignedDmaSmallGet(void *ls, uint64_t ea, uint32_t size) -{ - - btAssert(size<32); - - ATTRIBUTE_ALIGNED16(char tmpBuffer[32]); - - - char* localStore = (char*)ls; - uint32_t i; - - - ///make sure last 4 bits are the same, for cellDmaSmallGet - uint32_t last4BitsOffset = ea & 0x0f; - char* tmpTarget = tmpBuffer + last4BitsOffset; - -#if defined (__SPU__) || defined (USE_LIBSPE2) - - int remainingSize = size; - -//#define FORCE_cellDmaUnalignedGet 1 -#ifdef FORCE_cellDmaUnalignedGet - cellDmaUnalignedGet(tmpTarget,ea,size,DMA_TAG(1),0,0); -#else - char* remainingTmpTarget = tmpTarget; - uint64_t remainingEa = ea; - - while (remainingSize) - { - switch (remainingSize) - { - case 1: - case 2: - case 4: - case 8: - case 16: - { - mfc_get(remainingTmpTarget,remainingEa,remainingSize,DMA_TAG(1),0,0); - remainingSize=0; - break; - } - default: - { - //spu_printf("unaligned DMA with non-natural size:%d\n",remainingSize); - int actualSize = 0; - - if (remainingSize > 16) - actualSize = 16; - else - if (remainingSize >8) - actualSize=8; - else - if (remainingSize >4) - actualSize=4; - else - if (remainingSize >2) - actualSize=2; - mfc_get(remainingTmpTarget,remainingEa,actualSize,DMA_TAG(1),0,0); - remainingSize-=actualSize; - remainingTmpTarget+=actualSize; - remainingEa += actualSize; - } - } - } -#endif//FORCE_cellDmaUnalignedGet - -#else - char* mainMem = (char*)ea; - //copy into final destination -#ifdef USE_MEMCPY - - memcpy(tmpTarget,mainMem,size); -#else - for ( i=0;i -#include - -#define DMA_TAG(xfer) (xfer + 1) -#define DMA_MASK(xfer) (1 << DMA_TAG(xfer)) - -#else // !USE_LIBSPE2 - -#define DMA_TAG(xfer) (xfer + 1) -#define DMA_MASK(xfer) (1 << DMA_TAG(xfer)) - -#include - -#define DEBUG_DMA -#ifdef DEBUG_DMA -#define dUASSERT(a,b) if (!(a)) { printf(b);} -#define uintsize ppu_address_t - -#define cellDmaLargeGet(ls, ea, size, tag, tid, rid) if ( (((uintsize)ls%16) != ((uintsize)ea%16)) || ((((uintsize)ea%16) || ((uintsize)ls%16)) && (( ((uintsize)ls%16) != ((uintsize)size%16) ) || ( ((uintsize)ea%16) != ((uintsize)size%16) ) ) ) || ( ((uintsize)size%16) && ((uintsize)size!=1) && ((uintsize)size!=2) && ((uintsize)size!=4) && ((uintsize)size!=8) ) || (size >= 16384) || !(uintsize)ls || !(uintsize)ea) { \ - dUASSERT( (((uintsize)ea % 16) == 0) || (size < 16), "XDR Address not aligned: "); \ - dUASSERT( (((uintsize)ls % 16) == 0) || (size < 16), "LS Address not aligned: "); \ - dUASSERT( ((((uintsize)ls % size) == 0) && (((uintsize)ea % size) == 0)) || (size > 16), "Not naturally aligned: "); \ - dUASSERT((size == 1) || (size == 2) || (size == 4) || (size == 8) || ((size % 16) == 0), "size not a multiple of 16byte: "); \ - dUASSERT(size < 16384, "size too big: "); \ - dUASSERT( ((uintsize)ea%16)==((uintsize)ls%16), "wrong Quadword alignment of LS and EA: "); \ - dUASSERT(ea != 0, "Nullpointer EA: "); dUASSERT(ls != 0, "Nullpointer LS: ");\ - printf("GET %s:%d from: 0x%x, to: 0x%x - %d bytes\n", __FILE__, __LINE__, (unsigned int)ea,(unsigned int)ls,(unsigned int)size);\ - } \ - mfc_get(ls, ea, size, tag, tid, rid) -#define cellDmaGet(ls, ea, size, tag, tid, rid) if ( (((uintsize)ls%16) != ((uintsize)ea%16)) || ((((uintsize)ea%16) || ((uintsize)ls%16)) && (( ((uintsize)ls%16) != ((uintsize)size%16) ) || ( ((uintsize)ea%16) != ((uintsize)size%16) ) ) ) || ( ((uintsize)size%16) && ((uintsize)size!=1) && ((uintsize)size!=2) && ((uintsize)size!=4) && ((uintsize)size!=8) ) || (size >= 16384) || !(uintsize)ls || !(uintsize)ea) { \ - dUASSERT( (((uintsize)ea % 16) == 0) || (size < 16), "XDR Address not aligned: "); \ - dUASSERT( (((uintsize)ls % 16) == 0) || (size < 16), "LS Address not aligned: "); \ - dUASSERT( ((((uintsize)ls % size) == 0) && (((uintsize)ea % size) == 0)) || (size > 16), "Not naturally aligned: "); \ - dUASSERT((size == 1) || (size == 2) || (size == 4) || (size == 8) || ((size % 16) == 0), "size not a multiple of 16byte: "); \ - dUASSERT(size < 16384, "size too big: "); \ - dUASSERT( ((uintsize)ea%16)==((uintsize)ls%16), "wrong Quadword alignment of LS and EA: "); \ - dUASSERT(ea != 0, "Nullpointer EA: "); dUASSERT(ls != 0, "Nullpointer LS: ");\ - printf("GET %s:%d from: 0x%x, to: 0x%x - %d bytes\n", __FILE__, __LINE__, (unsigned int)ea,(unsigned int)ls,(unsigned int)size);\ - } \ - mfc_get(ls, ea, size, tag, tid, rid) -#define cellDmaLargePut(ls, ea, size, tag, tid, rid) if ( (((uintsize)ls%16) != ((uintsize)ea%16)) || ((((uintsize)ea%16) || ((uintsize)ls%16)) && (( ((uintsize)ls%16) != ((uintsize)size%16) ) || ( ((uintsize)ea%16) != ((uintsize)size%16) ) ) ) || ( ((uintsize)size%16) && ((uintsize)size!=1) && ((uintsize)size!=2) && ((uintsize)size!=4) && ((uintsize)size!=8) ) || (size >= 16384) || !(uintsize)ls || !(uintsize)ea) { \ - dUASSERT( (((uintsize)ea % 16) == 0) || (size < 16), "XDR Address not aligned: "); \ - dUASSERT( (((uintsize)ls % 16) == 0) || (size < 16), "LS Address not aligned: "); \ - dUASSERT( ((((uintsize)ls % size) == 0) && (((uintsize)ea % size) == 0)) || (size > 16), "Not naturally aligned: "); \ - dUASSERT((size == 1) || (size == 2) || (size == 4) || (size == 8) || ((size % 16) == 0), "size not a multiple of 16byte: "); \ - dUASSERT(size < 16384, "size too big: "); \ - dUASSERT( ((uintsize)ea%16)==((uintsize)ls%16), "wrong Quadword alignment of LS and EA: "); \ - dUASSERT(ea != 0, "Nullpointer EA: "); dUASSERT(ls != 0, "Nullpointer LS: ");\ - printf("PUT %s:%d from: 0x%x, to: 0x%x - %d bytes\n", __FILE__, __LINE__, (unsigned int)ls,(unsigned int)ea,(unsigned int)size); \ - } \ - mfc_put(ls, ea, size, tag, tid, rid) -#define cellDmaSmallGet(ls, ea, size, tag, tid, rid) if ( (((uintsize)ls%16) != ((uintsize)ea%16)) || ((((uintsize)ea%16) || ((uintsize)ls%16)) && (( ((uintsize)ls%16) != ((uintsize)size%16) ) || ( ((uintsize)ea%16) != ((uintsize)size%16) ) ) ) || ( ((uintsize)size%16) && ((uintsize)size!=1) && ((uintsize)size!=2) && ((uintsize)size!=4) && ((uintsize)size!=8) ) || (size >= 16384) || !(uintsize)ls || !(uintsize)ea) { \ - dUASSERT( (((uintsize)ea % 16) == 0) || (size < 16), "XDR Address not aligned: "); \ - dUASSERT( (((uintsize)ls % 16) == 0) || (size < 16), "LS Address not aligned: "); \ - dUASSERT( ((((uintsize)ls % size) == 0) && (((uintsize)ea % size) == 0)) || (size > 16), "Not naturally aligned: "); \ - dUASSERT((size == 1) || (size == 2) || (size == 4) || (size == 8) || ((size % 16) == 0), "size not a multiple of 16byte: "); \ - dUASSERT(size < 16384, "size too big: "); \ - dUASSERT( ((uintsize)ea%16)==((uintsize)ls%16), "wrong Quadword alignment of LS and EA: "); \ - dUASSERT(ea != 0, "Nullpointer EA: "); dUASSERT(ls != 0, "Nullpointer LS: ");\ - printf("GET %s:%d from: 0x%x, to: 0x%x - %d bytes\n", __FILE__, __LINE__, (unsigned int)ea,(unsigned int)ls,(unsigned int)size);\ - } \ - mfc_get(ls, ea, size, tag, tid, rid) -#define cellDmaWaitTagStatusAll(ignore) mfc_write_tag_mask(ignore) ; mfc_read_tag_status_all() - -#else -#define cellDmaLargeGet(ls, ea, size, tag, tid, rid) mfc_get(ls, ea, size, tag, tid, rid) -#define cellDmaGet(ls, ea, size, tag, tid, rid) mfc_get(ls, ea, size, tag, tid, rid) -#define cellDmaLargePut(ls, ea, size, tag, tid, rid) mfc_put(ls, ea, size, tag, tid, rid) -#define cellDmaSmallGet(ls, ea, size, tag, tid, rid) mfc_get(ls, ea, size, tag, tid, rid) -#define cellDmaWaitTagStatusAll(ignore) mfc_write_tag_mask(ignore) ; mfc_read_tag_status_all() -#endif // DEBUG_DMA - - - - - - - - -#endif // USE_LIBSPE2 -#else // !__SPU__ -//Simulate DMA using memcpy or direct access on non-CELL platforms that don't have DMAs and SPUs (Win32, Mac, Linux etc) -//Potential to add networked simulation using this interface - -#define DMA_TAG(a) (a) -#define DMA_MASK(a) (a) - - /// cellDmaLargeGet Win32 replacements for Cell DMA to allow simulating most of the SPU code (just memcpy) - int cellDmaLargeGet(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); - int cellDmaGet(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); - /// cellDmaLargePut Win32 replacements for Cell DMA to allow simulating most of the SPU code (just memcpy) - int cellDmaLargePut(const void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); - /// cellDmaWaitTagStatusAll Win32 replacements for Cell DMA to allow simulating most of the SPU code (just memcpy) - void cellDmaWaitTagStatusAll(int ignore); - - -#endif //__CELLOS_LV2__ - -///stallingUnalignedDmaSmallGet internally uses DMA_TAG(1) -int stallingUnalignedDmaSmallGet(void *ls, uint64_t ea, uint32_t size); - - -void* cellDmaLargeGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); -void* cellDmaGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); -void* cellDmaSmallGetReadOnly(void *ls, uint64_t ea, uint32_t size, uint32_t tag, uint32_t tid, uint32_t rid); - - -#endif //BT_FAKE_DMA_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp deleted file mode 100644 index c8712dab7..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp +++ /dev/null @@ -1,283 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SpuGatheringCollisionDispatcher.h" -#include "SpuCollisionTaskProcess.h" - - -#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" -#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h" -#include "SpuContactManifoldCollisionAlgorithm.h" -#include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletCollision/CollisionShapes/btCollisionShape.h" -#include "LinearMath/btQuickprof.h" -#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h" -#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h" - - - - -SpuGatheringCollisionDispatcher::SpuGatheringCollisionDispatcher(class btThreadSupportInterface* threadInterface, unsigned int maxNumOutstandingTasks,btCollisionConfiguration* collisionConfiguration) -:btCollisionDispatcher(collisionConfiguration), -m_spuCollisionTaskProcess(0), -m_threadInterface(threadInterface), -m_maxNumOutstandingTasks(maxNumOutstandingTasks) -{ - -} - - -bool SpuGatheringCollisionDispatcher::supportsDispatchPairOnSpu(int proxyType0,int proxyType1) -{ - bool supported0 = ( - (proxyType0 == BOX_SHAPE_PROXYTYPE) || - (proxyType0 == TRIANGLE_SHAPE_PROXYTYPE) || - (proxyType0 == SPHERE_SHAPE_PROXYTYPE) || - (proxyType0 == CAPSULE_SHAPE_PROXYTYPE) || - (proxyType0 == CYLINDER_SHAPE_PROXYTYPE) || -// (proxyType0 == CONE_SHAPE_PROXYTYPE) || - (proxyType0 == TRIANGLE_MESH_SHAPE_PROXYTYPE) || - (proxyType0 == CONVEX_HULL_SHAPE_PROXYTYPE)|| - (proxyType0 == STATIC_PLANE_PROXYTYPE)|| - (proxyType0 == COMPOUND_SHAPE_PROXYTYPE) - ); - - bool supported1 = ( - (proxyType1 == BOX_SHAPE_PROXYTYPE) || - (proxyType1 == TRIANGLE_SHAPE_PROXYTYPE) || - (proxyType1 == SPHERE_SHAPE_PROXYTYPE) || - (proxyType1 == CAPSULE_SHAPE_PROXYTYPE) || - (proxyType1 == CYLINDER_SHAPE_PROXYTYPE) || -// (proxyType1 == CONE_SHAPE_PROXYTYPE) || - (proxyType1 == TRIANGLE_MESH_SHAPE_PROXYTYPE) || - (proxyType1 == CONVEX_HULL_SHAPE_PROXYTYPE) || - (proxyType1 == STATIC_PLANE_PROXYTYPE) || - (proxyType1 == COMPOUND_SHAPE_PROXYTYPE) - ); - - - return supported0 && supported1; -} - - - -SpuGatheringCollisionDispatcher::~SpuGatheringCollisionDispatcher() -{ - if (m_spuCollisionTaskProcess) - delete m_spuCollisionTaskProcess; - -} - -#include "stdio.h" - - - -///interface for iterating all overlapping collision pairs, no matter how those pairs are stored (array, set, map etc) -///this is useful for the collision dispatcher. -class btSpuCollisionPairCallback : public btOverlapCallback -{ - const btDispatcherInfo& m_dispatchInfo; - SpuGatheringCollisionDispatcher* m_dispatcher; - -public: - - btSpuCollisionPairCallback(const btDispatcherInfo& dispatchInfo, SpuGatheringCollisionDispatcher* dispatcher) - :m_dispatchInfo(dispatchInfo), - m_dispatcher(dispatcher) - { - } - - virtual bool processOverlap(btBroadphasePair& collisionPair) - { - - - //PPU version - //(*m_dispatcher->getNearCallback())(collisionPair,*m_dispatcher,m_dispatchInfo); - - //only support discrete collision detection for now, we could fallback on PPU/unoptimized version for TOI/CCD - btAssert(m_dispatchInfo.m_dispatchFunc == btDispatcherInfo::DISPATCH_DISCRETE); - - //by default, Bullet will use this near callback - { - ///userInfo is used to determine if the SPU has to handle this case or not (skip PPU tasks) - if (!collisionPair.m_internalTmpValue) - { - collisionPair.m_internalTmpValue = 1; - } - if (!collisionPair.m_algorithm) - { - btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject; - btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject; - - btCollisionAlgorithmConstructionInfo ci; - ci.m_dispatcher1 = m_dispatcher; - ci.m_manifold = 0; - - if (m_dispatcher->needsCollision(colObj0,colObj1)) - { - int proxyType0 = colObj0->getCollisionShape()->getShapeType(); - int proxyType1 = colObj1->getCollisionShape()->getShapeType(); - bool supportsSpuDispatch = m_dispatcher->supportsDispatchPairOnSpu(proxyType0,proxyType1) - && ((colObj0->getCollisionFlags() & btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) == 0) - && ((colObj1->getCollisionFlags() & btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) == 0); - - if (proxyType0 == COMPOUND_SHAPE_PROXYTYPE) - { - btCompoundShape* compound = (btCompoundShape*)colObj0->getCollisionShape(); - if (compound->getNumChildShapes()>MAX_SPU_COMPOUND_SUBSHAPES) - { - //printf("PPU fallback, compound->getNumChildShapes(%d)>%d\n",compound->getNumChildShapes(),MAX_SPU_COMPOUND_SUBSHAPES); - supportsSpuDispatch = false; - } - } - - if (proxyType1 == COMPOUND_SHAPE_PROXYTYPE) - { - btCompoundShape* compound = (btCompoundShape*)colObj1->getCollisionShape(); - if (compound->getNumChildShapes()>MAX_SPU_COMPOUND_SUBSHAPES) - { - //printf("PPU fallback, compound->getNumChildShapes(%d)>%d\n",compound->getNumChildShapes(),MAX_SPU_COMPOUND_SUBSHAPES); - supportsSpuDispatch = false; - } - } - - if (supportsSpuDispatch) - { - - int so = sizeof(SpuContactManifoldCollisionAlgorithm); -#ifdef ALLOCATE_SEPARATELY - void* mem = btAlignedAlloc(so,16);//m_dispatcher->allocateCollisionAlgorithm(so); -#else - void* mem = m_dispatcher->allocateCollisionAlgorithm(so); -#endif - collisionPair.m_algorithm = new(mem) SpuContactManifoldCollisionAlgorithm(ci,colObj0,colObj1); - collisionPair.m_internalTmpValue = 2; - } else - { - btCollisionObjectWrapper ob0(0,colObj0->getCollisionShape(),colObj0,colObj0->getWorldTransform(),-1,-1); - btCollisionObjectWrapper ob1(0,colObj1->getCollisionShape(),colObj1,colObj1->getWorldTransform(),-1,-1); - - collisionPair.m_algorithm = m_dispatcher->findAlgorithm(&ob0,&ob1); - collisionPair.m_internalTmpValue = 3; - } - } - } - } - return false; - } -}; - -void SpuGatheringCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo, btDispatcher* dispatcher) -{ - - if (dispatchInfo.m_enableSPU) - { - m_maxNumOutstandingTasks = m_threadInterface->getNumTasks(); - - { - BT_PROFILE("processAllOverlappingPairs"); - - if (!m_spuCollisionTaskProcess) - m_spuCollisionTaskProcess = new SpuCollisionTaskProcess(m_threadInterface,m_maxNumOutstandingTasks); - - m_spuCollisionTaskProcess->setNumTasks(m_maxNumOutstandingTasks); - // printf("m_maxNumOutstandingTasks =%d\n",m_maxNumOutstandingTasks); - - m_spuCollisionTaskProcess->initialize2(dispatchInfo.m_useEpa); - - - ///modified version of btCollisionDispatcher::dispatchAllCollisionPairs: - { - btSpuCollisionPairCallback collisionCallback(dispatchInfo,this); - - pairCache->processAllOverlappingPairs(&collisionCallback,dispatcher); - } - } - - //send one big batch - int numTotalPairs = pairCache->getNumOverlappingPairs(); - if (numTotalPairs) - { - btBroadphasePair* pairPtr = pairCache->getOverlappingPairArrayPtr(); - int i; - { - int pairRange = SPU_BATCHSIZE_BROADPHASE_PAIRS; - if (numTotalPairs < (m_spuCollisionTaskProcess->getNumTasks()*SPU_BATCHSIZE_BROADPHASE_PAIRS)) - { - pairRange = (numTotalPairs/m_spuCollisionTaskProcess->getNumTasks())+1; - } - - BT_PROFILE("addWorkToTask"); - for (i=0;iaddWorkToTask(pairPtr,i,endIndex); - i = endIndex; - } - } - { - BT_PROFILE("PPU fallback"); - //handle PPU fallback pairs - for (i=0;im_clientObject; - btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject; - - if (dispatcher->needsCollision(colObj0,colObj1)) - { - //discrete collision detection query - btCollisionObjectWrapper ob0(0,colObj0->getCollisionShape(),colObj0,colObj0->getWorldTransform(),-1,-1); - btCollisionObjectWrapper ob1(0,colObj1->getCollisionShape(),colObj1,colObj1->getWorldTransform(),-1,-1); - - btManifoldResult contactPointResult(&ob0,&ob1); - - if (dispatchInfo.m_dispatchFunc == btDispatcherInfo::DISPATCH_DISCRETE) - { - - collisionPair.m_algorithm->processCollision(&ob0,&ob1,dispatchInfo,&contactPointResult); - } else - { - //continuous collision detection query, time of impact (toi) - btScalar toi = collisionPair.m_algorithm->calculateTimeOfImpact(colObj0,colObj1,dispatchInfo,&contactPointResult); - if (dispatchInfo.m_timeOfImpact > toi) - dispatchInfo.m_timeOfImpact = toi; - - } - } - } - } - } - } - } - { - BT_PROFILE("flush2"); - //make sure all SPU work is done - m_spuCollisionTaskProcess->flush2(); - } - - } else - { - ///PPU fallback - ///!Need to make sure to clear all 'algorithms' when switching between SPU and PPU - btCollisionDispatcher::dispatchAllCollisionPairs(pairCache,dispatchInfo,dispatcher); - } -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h deleted file mode 100644 index f8bc7da65..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.h +++ /dev/null @@ -1,72 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ -#ifndef BT_SPU_GATHERING_COLLISION__DISPATCHER_H -#define BT_SPU_GATHERING_COLLISION__DISPATCHER_H - -#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" - - -///Tuning value to optimized SPU utilization -///Too small value means Task overhead is large compared to computation (too fine granularity) -///Too big value might render some SPUs are idle, while a few other SPUs are doing all work. -//#define SPU_BATCHSIZE_BROADPHASE_PAIRS 8 -//#define SPU_BATCHSIZE_BROADPHASE_PAIRS 16 -//#define SPU_BATCHSIZE_BROADPHASE_PAIRS 64 -#define SPU_BATCHSIZE_BROADPHASE_PAIRS 128 -//#define SPU_BATCHSIZE_BROADPHASE_PAIRS 256 -//#define SPU_BATCHSIZE_BROADPHASE_PAIRS 512 -//#define SPU_BATCHSIZE_BROADPHASE_PAIRS 1024 - - - -class SpuCollisionTaskProcess; - -///SpuGatheringCollisionDispatcher can use SPU to gather and calculate collision detection -///Time of Impact, Closest Points and Penetration Depth. -class SpuGatheringCollisionDispatcher : public btCollisionDispatcher -{ - - SpuCollisionTaskProcess* m_spuCollisionTaskProcess; - -protected: - - class btThreadSupportInterface* m_threadInterface; - - unsigned int m_maxNumOutstandingTasks; - - -public: - - //can be used by SPU collision algorithms - SpuCollisionTaskProcess* getSpuCollisionTaskProcess() - { - return m_spuCollisionTaskProcess; - } - - SpuGatheringCollisionDispatcher (class btThreadSupportInterface* threadInterface, unsigned int maxNumOutstandingTasks,btCollisionConfiguration* collisionConfiguration); - - virtual ~SpuGatheringCollisionDispatcher(); - - bool supportsDispatchPairOnSpu(int proxyType0,int proxyType1); - - virtual void dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher) ; - -}; - - - -#endif //BT_SPU_GATHERING_COLLISION__DISPATCHER_H - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuLibspe2Support.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuLibspe2Support.cpp deleted file mode 100644 index a312450ed..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuLibspe2Support.cpp +++ /dev/null @@ -1,257 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifdef USE_LIBSPE2 - -#include "SpuLibspe2Support.h" - - - - -//SpuLibspe2Support helps to initialize/shutdown libspe2, start/stop SPU tasks and communication -///Setup and initialize SPU/CELL/Libspe2 -SpuLibspe2Support::SpuLibspe2Support(spe_program_handle_t *speprog, int numThreads) -{ - this->program = speprog; - this->numThreads = ((numThreads <= spe_cpu_info_get(SPE_COUNT_PHYSICAL_SPES, -1)) ? numThreads : spe_cpu_info_get(SPE_COUNT_PHYSICAL_SPES, -1)); -} - -///cleanup/shutdown Libspe2 -SpuLibspe2Support::~SpuLibspe2Support() -{ - - stopSPU(); -} - - - -///send messages to SPUs -void SpuLibspe2Support::sendRequest(uint32_t uiCommand, uint32_t uiArgument0, uint32_t uiArgument1) -{ - spe_context_ptr_t context; - - switch (uiCommand) - { - case CMD_SAMPLE_TASK_COMMAND: - { - //get taskdescription - SpuSampleTaskDesc* taskDesc = (SpuSampleTaskDesc*) uiArgument0; - - btAssert(taskDesc->m_taskIdm_taskId]; - - //set data for spuStatus - spuStatus.m_commandId = uiCommand; - spuStatus.m_status = Spu_Status_Occupied; //set SPU as "occupied" - spuStatus.m_taskDesc.p = taskDesc; - - //get context - context = data[taskDesc->m_taskId].context; - - - taskDesc->m_mainMemoryPtr = reinterpret_cast (spuStatus.m_lsMemory.p); - - - break; - } - case CMD_GATHER_AND_PROCESS_PAIRLIST: - { - //get taskdescription - SpuGatherAndProcessPairsTaskDesc* taskDesc = (SpuGatherAndProcessPairsTaskDesc*) uiArgument0; - - btAssert(taskDesc->taskIdtaskId]; - - //set data for spuStatus - spuStatus.m_commandId = uiCommand; - spuStatus.m_status = Spu_Status_Occupied; //set SPU as "occupied" - spuStatus.m_taskDesc.p = taskDesc; - - //get context - context = data[taskDesc->taskId].context; - - - taskDesc->m_lsMemory = (CollisionTask_LocalStoreMemory*)spuStatus.m_lsMemory.p; - - break; - } - default: - { - ///not implemented - btAssert(0); - } - - }; - - - //write taskdescription in mailbox - unsigned int event = Spu_Mailbox_Event_Task; - spe_in_mbox_write(context, &event, 1, SPE_MBOX_ANY_NONBLOCKING); - -} - -///check for messages from SPUs -void SpuLibspe2Support::waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1) -{ - ///We should wait for (one of) the first tasks to finish (or other SPU messages), and report its response - - ///A possible response can be 'yes, SPU handled it', or 'no, please do a PPU fallback' - - btAssert(m_activeSpuStatus.size()); - - - int last = -1; - - //find an active spu/thread - while(last < 0) - { - for (int i=0;i=0); - - - - *puiArgument0 = spuStatus.m_taskId; - *puiArgument1 = spuStatus.m_status; - - -} - - -void SpuLibspe2Support::startSPU() -{ - this->internal_startSPU(); -} - - - -///start the spus group (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) -void SpuLibspe2Support::internal_startSPU() -{ - m_activeSpuStatus.resize(numThreads); - - - for (int i=0; i < numThreads; i++) - { - - if(data[i].context == NULL) - { - - /* Create context */ - if ((data[i].context = spe_context_create(0, NULL)) == NULL) - { - perror ("Failed creating context"); - exit(1); - } - - /* Load program into context */ - if(spe_program_load(data[i].context, this->program)) - { - perror ("Failed loading program"); - exit(1); - } - - m_activeSpuStatus[i].m_status = Spu_Status_Startup; - m_activeSpuStatus[i].m_taskId = i; - m_activeSpuStatus[i].m_commandId = 0; - m_activeSpuStatus[i].m_lsMemory.p = NULL; - - - data[i].entry = SPE_DEFAULT_ENTRY; - data[i].flags = 0; - data[i].argp.p = &m_activeSpuStatus[i]; - data[i].envp.p = NULL; - - /* Create thread for each SPE context */ - if (pthread_create(&data[i].pthread, NULL, &ppu_pthread_function, &(data[i]) )) - { - perror ("Failed creating thread"); - exit(1); - } - /* - else - { - printf("started thread %d\n",i); - }*/ - } - } - - - for (int i=0; i < numThreads; i++) - { - if(data[i].context != NULL) - { - while( m_activeSpuStatus[i].m_status == Spu_Status_Startup) - { - // wait for spu to set up - sched_yield(); - } - printf("Spu %d is ready\n", i); - } - } -} - -///tell the task scheduler we are done with the SPU tasks -void SpuLibspe2Support::stopSPU() -{ - // wait for all threads to finish - int i; - for ( i = 0; i < this->numThreads; i++ ) - { - - unsigned int event = Spu_Mailbox_Event_Shutdown; - spe_context_ptr_t context = data[i].context; - spe_in_mbox_write(context, &event, 1, SPE_MBOX_ALL_BLOCKING); - pthread_join (data[i].pthread, NULL); - - } - // close SPE program - spe_image_close(program); - // destroy SPE contexts - for ( i = 0; i < this->numThreads; i++ ) - { - if(data[i].context != NULL) - { - spe_context_destroy (data[i].context); - } - } - - m_activeSpuStatus.clear(); - -} - - - -#endif //USE_LIBSPE2 - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuLibspe2Support.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuLibspe2Support.h deleted file mode 100644 index 37a5e79f0..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuLibspe2Support.h +++ /dev/null @@ -1,180 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#ifndef BT_SPU_LIBSPE2_SUPPORT_H -#define BT_SPU_LIBSPE2_SUPPORT_H - -#include //for uint32_t etc. - -#ifdef USE_LIBSPE2 - -#include -#include -//#include "SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" -#include "PlatformDefinitions.h" - - -//extern struct SpuGatherAndProcessPairsTaskDesc; - -enum -{ - Spu_Mailbox_Event_Nothing = 0, - Spu_Mailbox_Event_Task = 1, - Spu_Mailbox_Event_Shutdown = 2, - - Spu_Mailbox_Event_ForceDword = 0xFFFFFFFF - -}; - -enum -{ - Spu_Status_Free = 0, - Spu_Status_Occupied = 1, - Spu_Status_Startup = 2, - - Spu_Status_ForceDword = 0xFFFFFFFF - -}; - - -struct btSpuStatus -{ - uint32_t m_taskId; - uint32_t m_commandId; - uint32_t m_status; - - addr64 m_taskDesc; - addr64 m_lsMemory; - -} -__attribute__ ((aligned (128))) -; - - - -#ifndef __SPU__ - -#include "LinearMath/btAlignedObjectArray.h" -#include "SpuCollisionTaskProcess.h" -#include "SpuSampleTaskProcess.h" -#include "btThreadSupportInterface.h" -#include -#include -#include - -#define MAX_SPUS 4 - -typedef struct ppu_pthread_data -{ - spe_context_ptr_t context; - pthread_t pthread; - unsigned int entry; - unsigned int flags; - addr64 argp; - addr64 envp; - spe_stop_info_t stopinfo; -} ppu_pthread_data_t; - - -static void *ppu_pthread_function(void *arg) -{ - ppu_pthread_data_t * datap = (ppu_pthread_data_t *)arg; - /* - int rc; - do - {*/ - spe_context_run(datap->context, &datap->entry, datap->flags, datap->argp.p, datap->envp.p, &datap->stopinfo); - if (datap->stopinfo.stop_reason == SPE_EXIT) - { - if (datap->stopinfo.result.spe_exit_code != 0) - { - perror("FAILED: SPE returned a non-zero exit status: \n"); - exit(1); - } - } - else - { - perror("FAILED: SPE abnormally terminated\n"); - exit(1); - } - - - //} while (rc > 0); // loop until exit or error, and while any stop & signal - pthread_exit(NULL); -} - - - - - - -///SpuLibspe2Support helps to initialize/shutdown libspe2, start/stop SPU tasks and communication -class SpuLibspe2Support : public btThreadSupportInterface -{ - - btAlignedObjectArray m_activeSpuStatus; - -public: - //Setup and initialize SPU/CELL/Libspe2 - SpuLibspe2Support(spe_program_handle_t *speprog,int numThreads); - - // SPE program handle ptr. - spe_program_handle_t *program; - - // SPE program data - ppu_pthread_data_t data[MAX_SPUS]; - - //cleanup/shutdown Libspe2 - ~SpuLibspe2Support(); - - ///send messages to SPUs - void sendRequest(uint32_t uiCommand, uint32_t uiArgument0, uint32_t uiArgument1=0); - - //check for messages from SPUs - void waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1); - - //start the spus (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) - virtual void startSPU(); - - //tell the task scheduler we are done with the SPU tasks - virtual void stopSPU(); - - virtual void setNumTasks(int numTasks) - { - //changing the number of tasks after initialization is not implemented (yet) - } - -private: - - ///start the spus (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) - void internal_startSPU(); - - - - - int numThreads; - -}; - -#endif // NOT __SPU__ - -#endif //USE_LIBSPE2 - -#endif //BT_SPU_LIBSPE2_SUPPORT_H - - - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h deleted file mode 100644 index e51796119..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h +++ /dev/null @@ -1,167 +0,0 @@ -/* - Copyright (C) 2006, 2008 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef __BOX_H__ -#define __BOX_H__ - - -#ifndef PE_REF -#define PE_REF(a) a& -#endif - -#include - - -#include "../PlatformDefinitions.h" - - - - -enum FeatureType { F, E, V }; - -//---------------------------------------------------------------------------- -// Box -//---------------------------------------------------------------------------- -///The Box is an internal class used by the boxBoxDistance calculation. -class Box -{ -public: - vmVector3 mHalf; - - inline Box() - {} - inline Box(PE_REF(vmVector3) half_); - inline Box(float hx, float hy, float hz); - - inline void Set(PE_REF(vmVector3) half_); - inline void Set(float hx, float hy, float hz); - - inline vmVector3 GetAABB(const vmMatrix3& rotation) const; -}; - -inline -Box::Box(PE_REF(vmVector3) half_) -{ - Set(half_); -} - -inline -Box::Box(float hx, float hy, float hz) -{ - Set(hx, hy, hz); -} - -inline -void -Box::Set(PE_REF(vmVector3) half_) -{ - mHalf = half_; -} - -inline -void -Box::Set(float hx, float hy, float hz) -{ - mHalf = vmVector3(hx, hy, hz); -} - -inline -vmVector3 -Box::GetAABB(const vmMatrix3& rotation) const -{ - return absPerElem(rotation) * mHalf; -} - -//------------------------------------------------------------------------------------------------- -// BoxPoint -//------------------------------------------------------------------------------------------------- - -///The BoxPoint class is an internally used class to contain feature information for boxBoxDistance calculation. -class BoxPoint -{ -public: - BoxPoint() : localPoint(0.0f) {} - - vmPoint3 localPoint; - FeatureType featureType; - int featureIdx; - - inline void setVertexFeature(int plusX, int plusY, int plusZ); - inline void setEdgeFeature(int dim0, int plus0, int dim1, int plus1); - inline void setFaceFeature(int dim, int plus); - - inline void getVertexFeature(int & plusX, int & plusY, int & plusZ) const; - inline void getEdgeFeature(int & dim0, int & plus0, int & dim1, int & plus1) const; - inline void getFaceFeature(int & dim, int & plus) const; -}; - -inline -void -BoxPoint::setVertexFeature(int plusX, int plusY, int plusZ) -{ - featureType = V; - featureIdx = plusX << 2 | plusY << 1 | plusZ; -} - -inline -void -BoxPoint::setEdgeFeature(int dim0, int plus0, int dim1, int plus1) -{ - featureType = E; - - if (dim0 > dim1) { - featureIdx = plus1 << 5 | dim1 << 3 | plus0 << 2 | dim0; - } else { - featureIdx = plus0 << 5 | dim0 << 3 | plus1 << 2 | dim1; - } -} - -inline -void -BoxPoint::setFaceFeature(int dim, int plus) -{ - featureType = F; - featureIdx = plus << 2 | dim; -} - -inline -void -BoxPoint::getVertexFeature(int & plusX, int & plusY, int & plusZ) const -{ - plusX = featureIdx >> 2; - plusY = featureIdx >> 1 & 1; - plusZ = featureIdx & 1; -} - -inline -void -BoxPoint::getEdgeFeature(int & dim0, int & plus0, int & dim1, int & plus1) const -{ - plus0 = featureIdx >> 5; - dim0 = featureIdx >> 3 & 3; - plus1 = featureIdx >> 2 & 1; - dim1 = featureIdx & 3; -} - -inline -void -BoxPoint::getFaceFeature(int & dim, int & plus) const -{ - plus = featureIdx >> 2; - dim = featureIdx & 3; -} - -#endif /* __BOX_H__ */ diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp deleted file mode 100644 index 8d755b223..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp +++ /dev/null @@ -1,302 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#include "SpuCollisionShapes.h" - -///not supported on IBM SDK, until we fix the alignment of btVector3 -#if defined (__CELLOS_LV2__) && defined (__SPU__) -#include -static inline vec_float4 vec_dot3( vec_float4 vec0, vec_float4 vec1 ) -{ - vec_float4 result; - result = spu_mul( vec0, vec1 ); - result = spu_madd( spu_rlqwbyte( vec0, 4 ), spu_rlqwbyte( vec1, 4 ), result ); - return spu_madd( spu_rlqwbyte( vec0, 8 ), spu_rlqwbyte( vec1, 8 ), result ); -} -#endif //__SPU__ - - -void computeAabb (btVector3& aabbMin, btVector3& aabbMax, btConvexInternalShape* convexShape, ppu_address_t convexShapePtr, int shapeType, const btTransform& xform) -{ - //calculate the aabb, given the types... - switch (shapeType) - { - case CYLINDER_SHAPE_PROXYTYPE: - /* fall through */ - case BOX_SHAPE_PROXYTYPE: - { - btScalar margin=convexShape->getMarginNV(); - btVector3 halfExtents = convexShape->getImplicitShapeDimensions(); - halfExtents += btVector3(margin,margin,margin); - const btTransform& t = xform; - btMatrix3x3 abs_b = t.getBasis().absolute(); - btVector3 center = t.getOrigin(); - btVector3 extent = halfExtents.dot3( abs_b[0], abs_b[1], abs_b[2] ); - - aabbMin = center - extent; - aabbMax = center + extent; - break; - } - case CAPSULE_SHAPE_PROXYTYPE: - { - btScalar margin=convexShape->getMarginNV(); - btVector3 halfExtents = convexShape->getImplicitShapeDimensions(); - //add the radius to y-axis to get full height - btScalar radius = halfExtents[0]; - halfExtents[1] += radius; - halfExtents += btVector3(margin,margin,margin); -#if 0 - int capsuleUpAxis = convexShape->getUpAxis(); - btScalar halfHeight = convexShape->getHalfHeight(); - btScalar radius = convexShape->getRadius(); - halfExtents[capsuleUpAxis] = radius + halfHeight; -#endif - const btTransform& t = xform; - btMatrix3x3 abs_b = t.getBasis().absolute(); - btVector3 center = t.getOrigin(); - btVector3 extent = halfExtents.dot3( abs_b[0], abs_b[1], abs_b[2] ); - - aabbMin = center - extent; - aabbMax = center + extent; - break; - } - case SPHERE_SHAPE_PROXYTYPE: - { - btScalar radius = convexShape->getImplicitShapeDimensions().getX();// * convexShape->getLocalScaling().getX(); - btScalar margin = radius + convexShape->getMarginNV(); - const btTransform& t = xform; - const btVector3& center = t.getOrigin(); - btVector3 extent(margin,margin,margin); - aabbMin = center - extent; - aabbMax = center + extent; - break; - } - case CONVEX_HULL_SHAPE_PROXYTYPE: - { - ATTRIBUTE_ALIGNED16(char convexHullShape0[sizeof(btConvexHullShape)]); - cellDmaGet(&convexHullShape0, convexShapePtr , sizeof(btConvexHullShape), DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - btConvexHullShape* localPtr = (btConvexHullShape*)&convexHullShape0; - const btTransform& t = xform; - btScalar margin = convexShape->getMarginNV(); - localPtr->getNonvirtualAabb(t,aabbMin,aabbMax,margin); - //spu_printf("SPU convex aabbMin=%f,%f,%f=\n",aabbMin.getX(),aabbMin.getY(),aabbMin.getZ()); - //spu_printf("SPU convex aabbMax=%f,%f,%f=\n",aabbMax.getX(),aabbMax.getY(),aabbMax.getZ()); - break; - } - default: - { - // spu_printf("SPU: unsupported shapetype %d in AABB calculation\n"); - } - }; -} - -void dmaBvhShapeData (bvhMeshShape_LocalStoreMemory* bvhMeshShape, btBvhTriangleMeshShape* triMeshShape) -{ - register int dmaSize; - register ppu_address_t dmaPpuAddress2; - - dmaSize = sizeof(btTriangleIndexVertexArray); - dmaPpuAddress2 = reinterpret_cast(triMeshShape->getMeshInterface()); - // spu_printf("trimeshShape->getMeshInterface() == %llx\n",dmaPpuAddress2); -#ifdef __SPU__ - cellDmaGet(&bvhMeshShape->gTriangleMeshInterfaceStorage, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - bvhMeshShape->gTriangleMeshInterfacePtr = &bvhMeshShape->gTriangleMeshInterfaceStorage; -#else - bvhMeshShape->gTriangleMeshInterfacePtr = (btTriangleIndexVertexArray*)cellDmaGetReadOnly(&bvhMeshShape->gTriangleMeshInterfaceStorage, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); -#endif - - //cellDmaWaitTagStatusAll(DMA_MASK(1)); - - ///now DMA over the BVH - - dmaSize = sizeof(btOptimizedBvh); - dmaPpuAddress2 = reinterpret_cast(triMeshShape->getOptimizedBvh()); - //spu_printf("trimeshShape->getOptimizedBvh() == %llx\n",dmaPpuAddress2); - cellDmaGet(&bvhMeshShape->gOptimizedBvh, dmaPpuAddress2 , dmaSize, DMA_TAG(2), 0, 0); - //cellDmaWaitTagStatusAll(DMA_MASK(2)); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); -} - -void dmaBvhIndexedMesh (btIndexedMesh* IndexMesh, IndexedMeshArray& indexArray, int index, uint32_t dmaTag) -{ - cellDmaGet(IndexMesh, (ppu_address_t)&indexArray[index] , sizeof(btIndexedMesh), DMA_TAG(dmaTag), 0, 0); - -} - -void dmaBvhSubTreeHeaders (btBvhSubtreeInfo* subTreeHeaders, ppu_address_t subTreePtr, int batchSize, uint32_t dmaTag) -{ - cellDmaGet(subTreeHeaders, subTreePtr, batchSize * sizeof(btBvhSubtreeInfo), DMA_TAG(dmaTag), 0, 0); -} - -void dmaBvhSubTreeNodes (btQuantizedBvhNode* nodes, const btBvhSubtreeInfo& subtree, QuantizedNodeArray& nodeArray, int dmaTag) -{ - cellDmaGet(nodes, reinterpret_cast(&nodeArray[subtree.m_rootNodeIndex]) , subtree.m_subtreeSize* sizeof(btQuantizedBvhNode), DMA_TAG(2), 0, 0); -} - -///getShapeTypeSize could easily be optimized, but it is not likely a bottleneck -int getShapeTypeSize(int shapeType) -{ - - - switch (shapeType) - { - case CYLINDER_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btCylinderShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - case BOX_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btBoxShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - case SPHERE_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btSphereShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - case TRIANGLE_MESH_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btBvhTriangleMeshShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - case CAPSULE_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btCapsuleShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - - case CONVEX_HULL_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btConvexHullShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - - case COMPOUND_SHAPE_PROXYTYPE: - { - int shapeSize = sizeof(btCompoundShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - case STATIC_PLANE_PROXYTYPE: - { - int shapeSize = sizeof(btStaticPlaneShape); - btAssert(shapeSize < MAX_SHAPE_SIZE); - return shapeSize; - } - - default: - btAssert(0); - //unsupported shapetype, please add here - return 0; - } -} - -void dmaConvexVertexData (SpuConvexPolyhedronVertexData* convexVertexData, btConvexHullShape* convexShapeSPU) -{ - convexVertexData->gNumConvexPoints = convexShapeSPU->getNumPoints(); - if (convexVertexData->gNumConvexPoints>MAX_NUM_SPU_CONVEX_POINTS) - { - btAssert(0); - // spu_printf("SPU: Error: MAX_NUM_SPU_CONVEX_POINTS(%d) exceeded: %d\n",MAX_NUM_SPU_CONVEX_POINTS,convexVertexData->gNumConvexPoints); - return; - } - - register int dmaSize = convexVertexData->gNumConvexPoints*sizeof(btVector3); - ppu_address_t pointsPPU = (ppu_address_t) convexShapeSPU->getUnscaledPoints(); - cellDmaGet(&convexVertexData->g_convexPointBuffer[0], pointsPPU , dmaSize, DMA_TAG(2), 0, 0); -} - -void dmaCollisionShape (void* collisionShapeLocation, ppu_address_t collisionShapePtr, uint32_t dmaTag, int shapeType) -{ - register int dmaSize = getShapeTypeSize(shapeType); - cellDmaGet(collisionShapeLocation, collisionShapePtr , dmaSize, DMA_TAG(dmaTag), 0, 0); - //cellDmaGetReadOnly(collisionShapeLocation, collisionShapePtr , dmaSize, DMA_TAG(dmaTag), 0, 0); - //cellDmaWaitTagStatusAll(DMA_MASK(dmaTag)); -} - -void dmaCompoundShapeInfo (CompoundShape_LocalStoreMemory* compoundShapeLocation, btCompoundShape* spuCompoundShape, uint32_t dmaTag) -{ - register int dmaSize; - register ppu_address_t dmaPpuAddress2; - int childShapeCount = spuCompoundShape->getNumChildShapes(); - dmaSize = childShapeCount * sizeof(btCompoundShapeChild); - dmaPpuAddress2 = (ppu_address_t)spuCompoundShape->getChildList(); - cellDmaGet(&compoundShapeLocation->gSubshapes[0], dmaPpuAddress2, dmaSize, DMA_TAG(dmaTag), 0, 0); -} - -void dmaCompoundSubShapes (CompoundShape_LocalStoreMemory* compoundShapeLocation, btCompoundShape* spuCompoundShape, uint32_t dmaTag) -{ - int childShapeCount = spuCompoundShape->getNumChildShapes(); - int i; - // DMA all the subshapes - for ( i = 0; i < childShapeCount; ++i) - { - btCompoundShapeChild& childShape = compoundShapeLocation->gSubshapes[i]; - dmaCollisionShape (&compoundShapeLocation->gSubshapeShape[i],(ppu_address_t)childShape.m_childShape, dmaTag, childShape.m_childShapeType); - } -} - - -void spuWalkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,const btQuantizedBvhNode* rootNode,int startNodeIndex,int endNodeIndex) -{ - - int curIndex = startNodeIndex; - int walkIterations = 0; -#ifdef BT_DEBUG - int subTreeSize = endNodeIndex - startNodeIndex; -#endif - - int escapeIndex; - - unsigned int aabbOverlap, isLeafNode; - - while (curIndex < endNodeIndex) - { - //catch bugs in tree data - btAssert (walkIterations < subTreeSize); - - walkIterations++; - aabbOverlap = spuTestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax); - isLeafNode = rootNode->isLeafNode(); - - if (isLeafNode && aabbOverlap) - { - //printf("overlap with node %d\n",rootNode->getTriangleIndex()); - nodeCallback->processNode(0,rootNode->getTriangleIndex()); - // spu_printf("SPU: overlap detected with triangleIndex:%d\n",rootNode->getTriangleIndex()); - } - - if (aabbOverlap || isLeafNode) - { - rootNode++; - curIndex++; - } else - { - escapeIndex = rootNode->getEscapeIndex(); - rootNode += escapeIndex; - curIndex += escapeIndex; - } - } - -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h deleted file mode 100644 index aa8a29104..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h +++ /dev/null @@ -1,128 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ -#ifndef __SPU_COLLISION_SHAPES_H -#define __SPU_COLLISION_SHAPES_H - -#include "../SpuDoubleBuffer.h" - -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "BulletCollision/CollisionShapes/btConvexInternalShape.h" -#include "BulletCollision/CollisionShapes/btCylinderShape.h" -#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h" - -#include "BulletCollision/CollisionShapes/btOptimizedBvh.h" -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "BulletCollision/CollisionShapes/btSphereShape.h" - -#include "BulletCollision/CollisionShapes/btCapsuleShape.h" - -#include "BulletCollision/CollisionShapes/btConvexShape.h" -#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" -#include "BulletCollision/CollisionShapes/btConvexHullShape.h" -#include "BulletCollision/CollisionShapes/btCompoundShape.h" - -#define MAX_NUM_SPU_CONVEX_POINTS 128 //@fallback to PPU if a btConvexHullShape has more than MAX_NUM_SPU_CONVEX_POINTS points -#define MAX_SPU_COMPOUND_SUBSHAPES 16 //@fallback on PPU if compound has more than MAX_SPU_COMPOUND_SUBSHAPES child shapes -#define MAX_SHAPE_SIZE 256 //@todo: assert on this - -ATTRIBUTE_ALIGNED16(struct) SpuConvexPolyhedronVertexData -{ - void* gSpuConvexShapePtr; - btVector3* gConvexPoints; - int gNumConvexPoints; - int unused; - ATTRIBUTE_ALIGNED16(btVector3 g_convexPointBuffer[MAX_NUM_SPU_CONVEX_POINTS]); -}; - - - -ATTRIBUTE_ALIGNED16(struct) CollisionShape_LocalStoreMemory -{ - ATTRIBUTE_ALIGNED16(char collisionShape[MAX_SHAPE_SIZE]); -}; - -ATTRIBUTE_ALIGNED16(struct) CompoundShape_LocalStoreMemory -{ - // Compound data - - ATTRIBUTE_ALIGNED16(btCompoundShapeChild gSubshapes[MAX_SPU_COMPOUND_SUBSHAPES]); - ATTRIBUTE_ALIGNED16(char gSubshapeShape[MAX_SPU_COMPOUND_SUBSHAPES][MAX_SHAPE_SIZE]); -}; - -ATTRIBUTE_ALIGNED16(struct) bvhMeshShape_LocalStoreMemory -{ - //ATTRIBUTE_ALIGNED16(btOptimizedBvh gOptimizedBvh); - ATTRIBUTE_ALIGNED16(char gOptimizedBvh[sizeof(btOptimizedBvh)+16]); - btOptimizedBvh* getOptimizedBvh() - { - return (btOptimizedBvh*) gOptimizedBvh; - } - - ATTRIBUTE_ALIGNED16(btTriangleIndexVertexArray gTriangleMeshInterfaceStorage); - btTriangleIndexVertexArray* gTriangleMeshInterfacePtr; - ///only a single mesh part for now, we can add support for multiple parts, but quantized trees don't support this at the moment - ATTRIBUTE_ALIGNED16(btIndexedMesh gIndexMesh); - #define MAX_SPU_SUBTREE_HEADERS 32 - //1024 - ATTRIBUTE_ALIGNED16(btBvhSubtreeInfo gSubtreeHeaders[MAX_SPU_SUBTREE_HEADERS]); - ATTRIBUTE_ALIGNED16(btQuantizedBvhNode gSubtreeNodes[MAX_SUBTREE_SIZE_IN_BYTES/sizeof(btQuantizedBvhNode)]); -}; - - -void computeAabb (btVector3& aabbMin, btVector3& aabbMax, btConvexInternalShape* convexShape, ppu_address_t convexShapePtr, int shapeType, const btTransform& xform); -void dmaBvhShapeData (bvhMeshShape_LocalStoreMemory* bvhMeshShape, btBvhTriangleMeshShape* triMeshShape); -void dmaBvhIndexedMesh (btIndexedMesh* IndexMesh, IndexedMeshArray& indexArray, int index, uint32_t dmaTag); -void dmaBvhSubTreeHeaders (btBvhSubtreeInfo* subTreeHeaders, ppu_address_t subTreePtr, int batchSize, uint32_t dmaTag); -void dmaBvhSubTreeNodes (btQuantizedBvhNode* nodes, const btBvhSubtreeInfo& subtree, QuantizedNodeArray& nodeArray, int dmaTag); - -int getShapeTypeSize(int shapeType); -void dmaConvexVertexData (SpuConvexPolyhedronVertexData* convexVertexData, btConvexHullShape* convexShapeSPU); -void dmaCollisionShape (void* collisionShapeLocation, ppu_address_t collisionShapePtr, uint32_t dmaTag, int shapeType); -void dmaCompoundShapeInfo (CompoundShape_LocalStoreMemory* compoundShapeLocation, btCompoundShape* spuCompoundShape, uint32_t dmaTag); -void dmaCompoundSubShapes (CompoundShape_LocalStoreMemory* compoundShapeLocation, btCompoundShape* spuCompoundShape, uint32_t dmaTag); - - -#define USE_BRANCHFREE_TEST 1 -#ifdef USE_BRANCHFREE_TEST -SIMD_FORCE_INLINE unsigned int spuTestQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) -{ -#if defined(__CELLOS_LV2__) && defined (__SPU__) - vec_ushort8 vecMin = {aabbMin1[0],aabbMin2[0],aabbMin1[2],aabbMin2[2],aabbMin1[1],aabbMin2[1],0,0}; - vec_ushort8 vecMax = {aabbMax2[0],aabbMax1[0],aabbMax2[2],aabbMax1[2],aabbMax2[1],aabbMax1[1],0,0}; - vec_ushort8 isGt = spu_cmpgt(vecMin,vecMax); - return spu_extract(spu_gather(isGt),0)==0; - -#else - return btSelect((unsigned)((aabbMin1[0] <= aabbMax2[0]) & (aabbMax1[0] >= aabbMin2[0]) - & (aabbMin1[2] <= aabbMax2[2]) & (aabbMax1[2] >= aabbMin2[2]) - & (aabbMin1[1] <= aabbMax2[1]) & (aabbMax1[1] >= aabbMin2[1])), - 1, 0); -#endif -} -#else - -SIMD_FORCE_INLINE unsigned int spuTestQuantizedAabbAgainstQuantizedAabb(const unsigned short int* aabbMin1,const unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) -{ - unsigned int overlap = 1; - overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? 0 : overlap; - overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? 0 : overlap; - overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? 0 : overlap; - return overlap; -} -#endif - -void spuWalkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,const btQuantizedBvhNode* rootNode,int startNodeIndex,int endNodeIndex); - -#endif diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp deleted file mode 100644 index 8584e74c1..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp +++ /dev/null @@ -1,248 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SpuContactResult.h" - -//#define DEBUG_SPU_COLLISION_DETECTION 1 - -#ifdef DEBUG_SPU_COLLISION_DETECTION -#ifndef __SPU__ -#include -#define spu_printf printf -#endif -#endif //DEBUG_SPU_COLLISION_DETECTION - -SpuContactResult::SpuContactResult() -{ - m_manifoldAddress = 0; - m_spuManifold = NULL; - m_RequiresWriteBack = false; -} - - SpuContactResult::~SpuContactResult() -{ - g_manifoldDmaExport.swapBuffers(); -} - - ///User can override this material combiner by implementing gContactAddedCallback and setting body0->m_collisionFlags |= btCollisionObject::customMaterialCallback; -inline btScalar calculateCombinedFriction(btScalar friction0,btScalar friction1) -{ - btScalar friction = friction0*friction1; - - const btScalar MAX_FRICTION = btScalar(10.); - - if (friction < -MAX_FRICTION) - friction = -MAX_FRICTION; - if (friction > MAX_FRICTION) - friction = MAX_FRICTION; - return friction; - -} - -inline btScalar calculateCombinedRestitution(btScalar restitution0,btScalar restitution1) -{ - return restitution0*restitution1; -} - - - - void SpuContactResult::setContactInfo(btPersistentManifold* spuManifold, ppu_address_t manifoldAddress,const btTransform& worldTrans0,const btTransform& worldTrans1, btScalar restitution0,btScalar restitution1, btScalar friction0,btScalar friction1, bool isSwapped) - { - //spu_printf("SpuContactResult::setContactInfo ManifoldAddress: %lu\n", manifoldAddress); - m_rootWorldTransform0 = worldTrans0; - m_rootWorldTransform1 = worldTrans1; - m_manifoldAddress = manifoldAddress; - m_spuManifold = spuManifold; - - m_combinedFriction = calculateCombinedFriction(friction0,friction1); - m_combinedRestitution = calculateCombinedRestitution(restitution0,restitution1); - m_isSwapped = isSwapped; - } - - void SpuContactResult::setShapeIdentifiersA(int partId0,int index0) - { - - } - - void SpuContactResult::setShapeIdentifiersB(int partId1,int index1) - { - - } - - - - ///return true if it requires a dma transfer back -bool ManifoldResultAddContactPoint(const btVector3& normalOnBInWorld, - const btVector3& pointInWorld, - float depth, - btPersistentManifold* manifoldPtr, - btTransform& transA, - btTransform& transB, - btScalar combinedFriction, - btScalar combinedRestitution, - bool isSwapped) -{ - -// float contactTreshold = manifoldPtr->getContactBreakingThreshold(); - - //spu_printf("SPU: add contactpoint, depth:%f, contactTreshold %f, manifoldPtr %llx\n",depth,contactTreshold,manifoldPtr); - -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("SPU: contactTreshold %f\n",contactTreshold); -#endif //DEBUG_SPU_COLLISION_DETECTION - if (depth > manifoldPtr->getContactBreakingThreshold()) - return false; - - //if (depth > manifoldPtr->getContactProcessingThreshold()) - // return false; - - - - btVector3 pointA; - btVector3 localA; - btVector3 localB; - btVector3 normal; - - - if (isSwapped) - { - normal = normalOnBInWorld * -1; - pointA = pointInWorld + normal * depth; - localA = transA.invXform(pointA ); - localB = transB.invXform(pointInWorld); - } - else - { - normal = normalOnBInWorld; - pointA = pointInWorld + normal * depth; - localA = transA.invXform(pointA ); - localB = transB.invXform(pointInWorld); - } - - btManifoldPoint newPt(localA,localB,normal,depth); - newPt.m_positionWorldOnA = pointA; - newPt.m_positionWorldOnB = pointInWorld; - - newPt.m_combinedFriction = combinedFriction; - newPt.m_combinedRestitution = combinedRestitution; - - - int insertIndex = manifoldPtr->getCacheEntry(newPt); - if (insertIndex >= 0) - { - // we need to replace the current contact point, otherwise small errors will accumulate (spheres start rolling etc) - manifoldPtr->replaceContactPoint(newPt,insertIndex); - return true; - - } else - { - - /* - ///@todo: SPU callbacks, either immediate (local on the SPU), or deferred - //User can override friction and/or restitution - if (gContactAddedCallback && - //and if either of the two bodies requires custom material - ((m_body0->m_collisionFlags & btCollisionObject::customMaterialCallback) || - (m_body1->m_collisionFlags & btCollisionObject::customMaterialCallback))) - { - //experimental feature info, for per-triangle material etc. - (*gContactAddedCallback)(newPt,m_body0,m_partId0,m_index0,m_body1,m_partId1,m_index1); - } - */ - - manifoldPtr->addManifoldPoint(newPt); - return true; - - } - return false; - -} - - -void SpuContactResult::writeDoubleBufferedManifold(btPersistentManifold* lsManifold, btPersistentManifold* mmManifold) -{ - ///only write back the contact information on SPU. Other platforms avoid copying, and use the data in-place - ///see SpuFakeDma.cpp 'cellDmaLargeGetReadOnly' -#if defined (__SPU__) || defined (USE_LIBSPE2) - memcpy(g_manifoldDmaExport.getFront(),lsManifold,sizeof(btPersistentManifold)); - - g_manifoldDmaExport.swapBuffers(); - ppu_address_t mmAddr = (ppu_address_t)mmManifold; - g_manifoldDmaExport.backBufferDmaPut(mmAddr, sizeof(btPersistentManifold), DMA_TAG(9)); - // Should there be any kind of wait here? What if somebody tries to use this tag again? What if we call this function again really soon? - //no, the swapBuffers does the wait -#endif -} - -void SpuContactResult::addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth) -{ -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("*** SpuContactResult::addContactPoint: depth = %f\n",depth); - spu_printf("*** normal = %f,%f,%f\n",normalOnBInWorld.getX(),normalOnBInWorld.getY(),normalOnBInWorld.getZ()); - spu_printf("*** position = %f,%f,%f\n",pointInWorld.getX(),pointInWorld.getY(),pointInWorld.getZ()); -#endif //DEBUG_SPU_COLLISION_DETECTION - - -#ifdef DEBUG_SPU_COLLISION_DETECTION - // int sman = sizeof(rage::phManifold); -// spu_printf("sizeof_manifold = %i\n",sman); -#endif //DEBUG_SPU_COLLISION_DETECTION - - btPersistentManifold* localManifold = m_spuManifold; - - btVector3 normalB(normalOnBInWorld.getX(),normalOnBInWorld.getY(),normalOnBInWorld.getZ()); - btVector3 pointWrld(pointInWorld.getX(),pointInWorld.getY(),pointInWorld.getZ()); - - //process the contact point - const bool retVal = ManifoldResultAddContactPoint(normalB, - pointWrld, - depth, - localManifold, - m_rootWorldTransform0, - m_rootWorldTransform1, - m_combinedFriction, - m_combinedRestitution, - m_isSwapped); - m_RequiresWriteBack = m_RequiresWriteBack || retVal; -} - -void SpuContactResult::flush() -{ - - if (m_spuManifold && m_spuManifold->getNumContacts()) - { - m_spuManifold->refreshContactPoints(m_rootWorldTransform0,m_rootWorldTransform1); - m_RequiresWriteBack = true; - } - - - if (m_RequiresWriteBack) - { -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("SPU: Start SpuContactResult::flush (Put) DMA\n"); - spu_printf("Num contacts:%d\n", m_spuManifold->getNumContacts()); - spu_printf("Manifold address: %llu\n", m_manifoldAddress); -#endif //DEBUG_SPU_COLLISION_DETECTION - // spu_printf("writeDoubleBufferedManifold\n"); - writeDoubleBufferedManifold(m_spuManifold, (btPersistentManifold*)m_manifoldAddress); -#ifdef DEBUG_SPU_COLLISION_DETECTION - spu_printf("SPU: Finished (Put) DMA\n"); -#endif //DEBUG_SPU_COLLISION_DETECTION - } - m_spuManifold = NULL; - m_RequiresWriteBack = false; -} - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h deleted file mode 100644 index 394f56dcb..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h +++ /dev/null @@ -1,106 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef SPU_CONTACT_RESULT2_H -#define SPU_CONTACT_RESULT2_H - - -#ifndef _WIN32 -#include -#endif - - - -#include "../SpuDoubleBuffer.h" - - -#include "LinearMath/btTransform.h" - - -#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h" -#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h" - -class btCollisionShape; - - -struct SpuCollisionPairInput -{ - ppu_address_t m_collisionShapes[2]; - btCollisionShape* m_spuCollisionShapes[2]; - - ppu_address_t m_persistentManifoldPtr; - btVector3 m_primitiveDimensions0; - btVector3 m_primitiveDimensions1; - int m_shapeType0; - int m_shapeType1; - float m_collisionMargin0; - float m_collisionMargin1; - - btTransform m_worldTransform0; - btTransform m_worldTransform1; - - bool m_isSwapped; - bool m_useEpa; -}; - - -struct SpuClosestPointInput : public btDiscreteCollisionDetectorInterface::ClosestPointInput -{ - struct SpuConvexPolyhedronVertexData* m_convexVertexData[2]; -}; - -///SpuContactResult exports the contact points using double-buffered DMA transfers, only when needed -///So when an existing contact point is duplicated, no transfer/refresh is performed. -class SpuContactResult : public btDiscreteCollisionDetectorInterface::Result -{ - btTransform m_rootWorldTransform0; - btTransform m_rootWorldTransform1; - ppu_address_t m_manifoldAddress; - - btPersistentManifold* m_spuManifold; - bool m_RequiresWriteBack; - btScalar m_combinedFriction; - btScalar m_combinedRestitution; - - bool m_isSwapped; - - DoubleBuffer g_manifoldDmaExport; - - public: - SpuContactResult(); - virtual ~SpuContactResult(); - - btPersistentManifold* GetSpuManifold() const - { - return m_spuManifold; - } - - virtual void setShapeIdentifiersA(int partId0,int index0); - virtual void setShapeIdentifiersB(int partId1,int index1); - - void setContactInfo(btPersistentManifold* spuManifold, ppu_address_t manifoldAddress,const btTransform& worldTrans0,const btTransform& worldTrans1, btScalar restitution0,btScalar restitution1, btScalar friction0,btScalar friction01, bool isSwapped); - - - void writeDoubleBufferedManifold(btPersistentManifold* lsManifold, btPersistentManifold* mmManifold); - - virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth); - - void flush(); -}; - - - -#endif //SPU_CONTACT_RESULT2_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h deleted file mode 100644 index b1bd53d94..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h +++ /dev/null @@ -1,50 +0,0 @@ - -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - -#ifndef SPU_CONVEX_PENETRATION_DEPTH_H -#define SPU_CONVEX_PENETRATION_DEPTH_H - - - -class btIDebugDraw; -#include "BulletCollision/NarrowphaseCollision/btConvexPenetrationDepthSolver.h" - -#include "LinearMath/btTransform.h" - - -///ConvexPenetrationDepthSolver provides an interface for penetration depth calculation. -class SpuConvexPenetrationDepthSolver : public btConvexPenetrationDepthSolver -{ -public: - - virtual ~SpuConvexPenetrationDepthSolver() {}; - virtual bool calcPenDepth( SpuVoronoiSimplexSolver& simplexSolver, - void* convexA,void* convexB,int shapeTypeA, int shapeTypeB, float marginA, float marginB, - btTransform& transA,const btTransform& transB, - btVector3& v, btVector3& pa, btVector3& pb, - class btIDebugDraw* debugDraw, - struct SpuConvexPolyhedronVertexData* convexVertexDataA, - struct SpuConvexPolyhedronVertexData* convexVertexDataB - ) const = 0; - - -}; - - - -#endif //SPU_CONVEX_PENETRATION_DEPTH_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp deleted file mode 100644 index c2fe2905c..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp +++ /dev/null @@ -1,1432 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SpuGatheringCollisionTask.h" - -//#define DEBUG_SPU_COLLISION_DETECTION 1 -#include "../SpuDoubleBuffer.h" - -#include "../SpuCollisionTaskProcess.h" -#include "../SpuGatheringCollisionDispatcher.h" //for SPU_BATCHSIZE_BROADPHASE_PAIRS - -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "../SpuContactManifoldCollisionAlgorithm.h" -#include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "SpuContactResult.h" -#include "BulletCollision/CollisionShapes/btOptimizedBvh.h" -#include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h" -#include "BulletCollision/CollisionShapes/btSphereShape.h" -#include "BulletCollision/CollisionShapes/btConvexPointCloudShape.h" - -#include "BulletCollision/CollisionShapes/btCapsuleShape.h" - -#include "BulletCollision/CollisionShapes/btConvexShape.h" -#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" -#include "BulletCollision/CollisionShapes/btConvexHullShape.h" -#include "BulletCollision/CollisionShapes/btCompoundShape.h" - -#include "SpuMinkowskiPenetrationDepthSolver.h" -//#include "SpuEpaPenetrationDepthSolver.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" - - -#include "boxBoxDistance.h" -#include "BulletMultiThreaded/vectormath2bullet.h" -#include "SpuCollisionShapes.h" //definition of SpuConvexPolyhedronVertexData -#include "BulletCollision/CollisionDispatch/btBoxBoxDetector.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h" -#include "BulletCollision/CollisionShapes/btTriangleShape.h" - -#ifdef __SPU__ -///Software caching from the IBM Cell SDK, it reduces 25% SPU time for our test cases -#ifndef USE_LIBSPE2 -//#define USE_SOFTWARE_CACHE 1 -#endif -#endif //__SPU__ - -int gSkippedCol = 0; -int gProcessedCol = 0; - -//////////////////////////////////////////////// -/// software caching -#if USE_SOFTWARE_CACHE -#include -#include -#include -#include -#define SPE_CACHE_NWAY 4 -//#define SPE_CACHE_NSETS 32, 16 -#define SPE_CACHE_NSETS 8 -//#define SPE_CACHELINE_SIZE 512 -#define SPE_CACHELINE_SIZE 128 -#define SPE_CACHE_SET_TAGID(set) 15 -///make sure that spe_cache.h is below those defines! -#include "../Extras/software_cache/cache/include/spe_cache.h" - - -int g_CacheMisses=0; -int g_CacheHits=0; - -#if 0 // Added to allow cache misses and hits to be tracked, change this to 1 to restore unmodified version -#define spe_cache_read(ea) _spe_cache_lookup_xfer_wait_(ea, 0, 1) -#else -#define spe_cache_read(ea) \ -({ \ - int set, idx, line, byte; \ - _spe_cache_nway_lookup_(ea, set, idx); \ - \ - if (btUnlikely(idx < 0)) { \ - ++g_CacheMisses; \ - idx = _spe_cache_miss_(ea, set, -1); \ - spu_writech(22, SPE_CACHE_SET_TAGMASK(set)); \ - spu_mfcstat(MFC_TAG_UPDATE_ALL); \ - } \ - else \ - { \ - ++g_CacheHits; \ - } \ - line = _spe_cacheline_num_(set, idx); \ - byte = _spe_cacheline_byte_offset_(ea); \ - (void *) &spe_cache_mem[line + byte]; \ -}) - -#endif - -#endif // USE_SOFTWARE_CACHE - -bool gUseEpa = false; - -#ifdef USE_SN_TUNER -#include -#endif //USE_SN_TUNER - -#if defined (__SPU__) && !defined (USE_LIBSPE2) -#include -#elif defined (USE_LIBSPE2) -#define spu_printf(a) -#else -#define IGNORE_ALIGNMENT 1 -#include -#include -#define spu_printf printf - -#endif - -//int gNumConvexPoints0=0; - -///Make sure no destructors are called on this memory -ATTRIBUTE_ALIGNED16(struct) CollisionTask_LocalStoreMemory -{ - ///This CollisionTask_LocalStoreMemory is mainly used for the SPU version, using explicit DMA - ///Other platforms can use other memory programming models. - - ATTRIBUTE_ALIGNED16(btBroadphasePair gBroadphasePairsBuffer[SPU_BATCHSIZE_BROADPHASE_PAIRS]); - DoubleBuffer g_workUnitTaskBuffers; - ATTRIBUTE_ALIGNED16(char gSpuContactManifoldAlgoBuffer [sizeof(SpuContactManifoldCollisionAlgorithm)+16]); - ATTRIBUTE_ALIGNED16(char gColObj0Buffer [sizeof(btCollisionObject)+16]); - ATTRIBUTE_ALIGNED16(char gColObj1Buffer [sizeof(btCollisionObject)+16]); - ///we reserve 32bit integer indices, even though they might be 16bit - ATTRIBUTE_ALIGNED16(int spuIndices[16]); - btPersistentManifold gPersistentManifoldBuffer; - CollisionShape_LocalStoreMemory gCollisionShapes[2]; - bvhMeshShape_LocalStoreMemory bvhShapeData; - ATTRIBUTE_ALIGNED16(SpuConvexPolyhedronVertexData convexVertexData[2]); - CompoundShape_LocalStoreMemory compoundShapeData[2]; - - ///The following pointers might either point into this local store memory, or to the original/other memory locations. - ///See SpuFakeDma for implementation of cellDmaSmallGetReadOnly. - btCollisionObject* m_lsColObj0Ptr; - btCollisionObject* m_lsColObj1Ptr; - btBroadphasePair* m_pairsPointer; - btPersistentManifold* m_lsManifoldPtr; - SpuContactManifoldCollisionAlgorithm* m_lsCollisionAlgorithmPtr; - - bool needsDmaPutContactManifoldAlgo; - - btCollisionObject* getColObj0() - { - return m_lsColObj0Ptr; - } - btCollisionObject* getColObj1() - { - return m_lsColObj1Ptr; - } - - - btBroadphasePair* getBroadphasePairPtr() - { - return m_pairsPointer; - } - - SpuContactManifoldCollisionAlgorithm* getlocalCollisionAlgorithm() - { - return m_lsCollisionAlgorithmPtr; - } - - btPersistentManifold* getContactManifoldPtr() - { - return m_lsManifoldPtr; - } -}; - - -#if defined(__CELLOS_LV2__) || defined(USE_LIBSPE2) - -ATTRIBUTE_ALIGNED16(CollisionTask_LocalStoreMemory gLocalStoreMemory); - -void* createCollisionLocalStoreMemory() -{ - return &gLocalStoreMemory; -} -void deleteCollisionLocalStoreMemory() -{ -} -#else - -btAlignedObjectArray sLocalStorePointers; - -void* createCollisionLocalStoreMemory() -{ - CollisionTask_LocalStoreMemory* localStore = (CollisionTask_LocalStoreMemory*)btAlignedAlloc( sizeof(CollisionTask_LocalStoreMemory),16); - sLocalStorePointers.push_back(localStore); - return localStore; -} - -void deleteCollisionLocalStoreMemory() -{ - for (int i=0;ibvhShapeData.gIndexMesh.m_indexType == PHY_SHORT) - { - unsigned short int* indexBasePtr = (unsigned short int*)(m_lsMemPtr->bvhShapeData.gIndexMesh.m_triangleIndexBase+triangleIndex*m_lsMemPtr->bvhShapeData.gIndexMesh.m_triangleIndexStride); - ATTRIBUTE_ALIGNED16(unsigned short int tmpIndices[3]); - - small_cache_read_triple(&tmpIndices[0],(ppu_address_t)&indexBasePtr[0], - &tmpIndices[1],(ppu_address_t)&indexBasePtr[1], - &tmpIndices[2],(ppu_address_t)&indexBasePtr[2], - sizeof(unsigned short int)); - - m_lsMemPtr->spuIndices[0] = int(tmpIndices[0]); - m_lsMemPtr->spuIndices[1] = int(tmpIndices[1]); - m_lsMemPtr->spuIndices[2] = int(tmpIndices[2]); - } else - { - unsigned int* indexBasePtr = (unsigned int*)(m_lsMemPtr->bvhShapeData.gIndexMesh.m_triangleIndexBase+triangleIndex*m_lsMemPtr->bvhShapeData.gIndexMesh.m_triangleIndexStride); - - small_cache_read_triple(&m_lsMemPtr->spuIndices[0],(ppu_address_t)&indexBasePtr[0], - &m_lsMemPtr->spuIndices[1],(ppu_address_t)&indexBasePtr[1], - &m_lsMemPtr->spuIndices[2],(ppu_address_t)&indexBasePtr[2], - sizeof(int)); - } - - // spu_printf("SPU index0=%d ,",spuIndices[0]); - // spu_printf("SPU index1=%d ,",spuIndices[1]); - // spu_printf("SPU index2=%d ,",spuIndices[2]); - // spu_printf("SPU: indexBasePtr=%llx\n",indexBasePtr); - - const btVector3& meshScaling = m_lsMemPtr->bvhShapeData.gTriangleMeshInterfacePtr->getScaling(); - for (int j=2;btLikely( j>=0 );j--) - { - int graphicsindex = m_lsMemPtr->spuIndices[j]; - - // spu_printf("SPU index=%d ,",graphicsindex); - btScalar* graphicsbasePtr = (btScalar*)(m_lsMemPtr->bvhShapeData.gIndexMesh.m_vertexBase+graphicsindex*m_lsMemPtr->bvhShapeData.gIndexMesh.m_vertexStride); - // spu_printf("SPU graphicsbasePtr=%llx\n",graphicsbasePtr); - - - ///handle un-aligned vertices... - - //another DMA for each vertex - small_cache_read_triple(&spuUnscaledVertex[0],(ppu_address_t)&graphicsbasePtr[0], - &spuUnscaledVertex[1],(ppu_address_t)&graphicsbasePtr[1], - &spuUnscaledVertex[2],(ppu_address_t)&graphicsbasePtr[2], - sizeof(btScalar)); - - m_tmpTriangleShape.getVertexPtr(j).setValue(spuUnscaledVertex[0]*meshScaling.getX(), - spuUnscaledVertex[1]*meshScaling.getY(), - spuUnscaledVertex[2]*meshScaling.getZ()); - - // spu_printf("SPU:triangle vertices:%f,%f,%f\n",spuTriangleVertices[j].x(),spuTriangleVertices[j].y(),spuTriangleVertices[j].z()); - } - - - SpuCollisionPairInput triangleConcaveInput(*m_wuInput); -// triangleConcaveInput.m_spuCollisionShapes[1] = &spuTriangleVertices[0]; - triangleConcaveInput.m_spuCollisionShapes[1] = &m_tmpTriangleShape; - triangleConcaveInput.m_shapeType1 = TRIANGLE_SHAPE_PROXYTYPE; - - m_spuContacts.setShapeIdentifiersB(subPart,triangleIndex); - - // m_spuContacts.flush(); - - ProcessSpuConvexConvexCollision(&triangleConcaveInput, m_lsMemPtr,m_spuContacts); - ///this flush should be automatic - // m_spuContacts.flush(); - } - -}; - - - -void btConvexPlaneCollideSingleContact (SpuCollisionPairInput* wuInput,CollisionTask_LocalStoreMemory* lsMemPtr,SpuContactResult& spuContacts) -{ - - btConvexShape* convexShape = (btConvexShape*) wuInput->m_spuCollisionShapes[0]; - btStaticPlaneShape* planeShape = (btStaticPlaneShape*) wuInput->m_spuCollisionShapes[1]; - - bool hasCollision = false; - const btVector3& planeNormal = planeShape->getPlaneNormal(); - const btScalar& planeConstant = planeShape->getPlaneConstant(); - - - btTransform convexWorldTransform = wuInput->m_worldTransform0; - btTransform convexInPlaneTrans; - convexInPlaneTrans= wuInput->m_worldTransform1.inverse() * convexWorldTransform; - btTransform planeInConvex; - planeInConvex= convexWorldTransform.inverse() * wuInput->m_worldTransform1; - - //btVector3 vtx = convexShape->localGetSupportVertexWithoutMarginNonVirtual(planeInConvex.getBasis()*-planeNormal); - btVector3 vtx = convexShape->localGetSupportVertexNonVirtual(planeInConvex.getBasis()*-planeNormal); - - btVector3 vtxInPlane = convexInPlaneTrans(vtx); - btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant); - - btVector3 vtxInPlaneProjected = vtxInPlane - distance*planeNormal; - btVector3 vtxInPlaneWorld = wuInput->m_worldTransform1 * vtxInPlaneProjected; - - hasCollision = distance < lsMemPtr->getContactManifoldPtr()->getContactBreakingThreshold(); - //resultOut->setPersistentManifold(m_manifoldPtr); - if (hasCollision) - { - /// report a contact. internally this will be kept persistent, and contact reduction is done - btVector3 normalOnSurfaceB =wuInput->m_worldTransform1.getBasis() * planeNormal; - btVector3 pOnB = vtxInPlaneWorld; - spuContacts.addContactPoint(normalOnSurfaceB,pOnB,distance); - } -} - -void ProcessConvexPlaneSpuCollision(SpuCollisionPairInput* wuInput, CollisionTask_LocalStoreMemory* lsMemPtr, SpuContactResult& spuContacts) -{ - - register int dmaSize = 0; - register ppu_address_t dmaPpuAddress2; - btPersistentManifold* manifold = (btPersistentManifold*)wuInput->m_persistentManifoldPtr; - - ///DMA in the vertices for convex shapes - ATTRIBUTE_ALIGNED16(char convexHullShape0[sizeof(btConvexHullShape)]); - ATTRIBUTE_ALIGNED16(char convexHullShape1[sizeof(btConvexHullShape)]); - - if ( btLikely( wuInput->m_shapeType0== CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - // spu_printf("SPU: DMA btConvexHullShape\n"); - - dmaSize = sizeof(btConvexHullShape); - dmaPpuAddress2 = wuInput->m_collisionShapes[0]; - - cellDmaGet(&convexHullShape0, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - //cellDmaWaitTagStatusAll(DMA_MASK(1)); - } - - if ( btLikely( wuInput->m_shapeType1 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - // spu_printf("SPU: DMA btConvexHullShape\n"); - dmaSize = sizeof(btConvexHullShape); - dmaPpuAddress2 = wuInput->m_collisionShapes[1]; - cellDmaGet(&convexHullShape1, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - //cellDmaWaitTagStatusAll(DMA_MASK(1)); - } - - if ( btLikely( wuInput->m_shapeType0 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(1)); - dmaConvexVertexData (&lsMemPtr->convexVertexData[0], (btConvexHullShape*)&convexHullShape0); - lsMemPtr->convexVertexData[0].gSpuConvexShapePtr = wuInput->m_spuCollisionShapes[0]; - } - - - if ( btLikely( wuInput->m_shapeType1 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(1)); - dmaConvexVertexData (&lsMemPtr->convexVertexData[1], (btConvexHullShape*)&convexHullShape1); - lsMemPtr->convexVertexData[1].gSpuConvexShapePtr = wuInput->m_spuCollisionShapes[1]; - } - - - btConvexPointCloudShape cpc0,cpc1; - - if ( btLikely( wuInput->m_shapeType0 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(2)); - lsMemPtr->convexVertexData[0].gConvexPoints = &lsMemPtr->convexVertexData[0].g_convexPointBuffer[0]; - btConvexHullShape* ch = (btConvexHullShape*)wuInput->m_spuCollisionShapes[0]; - const btVector3& localScaling = ch->getLocalScalingNV(); - cpc0.setPoints(lsMemPtr->convexVertexData[0].gConvexPoints,lsMemPtr->convexVertexData[0].gNumConvexPoints,false,localScaling); - wuInput->m_spuCollisionShapes[0] = &cpc0; - } - - if ( btLikely( wuInput->m_shapeType1 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(2)); - lsMemPtr->convexVertexData[1].gConvexPoints = &lsMemPtr->convexVertexData[1].g_convexPointBuffer[0]; - btConvexHullShape* ch = (btConvexHullShape*)wuInput->m_spuCollisionShapes[1]; - const btVector3& localScaling = ch->getLocalScalingNV(); - cpc1.setPoints(lsMemPtr->convexVertexData[1].gConvexPoints,lsMemPtr->convexVertexData[1].gNumConvexPoints,false,localScaling); - wuInput->m_spuCollisionShapes[1] = &cpc1; - - } - - -// const btConvexShape* shape0Ptr = (const btConvexShape*)wuInput->m_spuCollisionShapes[0]; -// const btConvexShape* shape1Ptr = (const btConvexShape*)wuInput->m_spuCollisionShapes[1]; -// int shapeType0 = wuInput->m_shapeType0; -// int shapeType1 = wuInput->m_shapeType1; - float marginA = wuInput->m_collisionMargin0; - float marginB = wuInput->m_collisionMargin1; - - SpuClosestPointInput cpInput; - cpInput.m_convexVertexData[0] = &lsMemPtr->convexVertexData[0]; - cpInput.m_convexVertexData[1] = &lsMemPtr->convexVertexData[1]; - cpInput.m_transformA = wuInput->m_worldTransform0; - cpInput.m_transformB = wuInput->m_worldTransform1; - float sumMargin = (marginA+marginB+lsMemPtr->getContactManifoldPtr()->getContactBreakingThreshold()); - cpInput.m_maximumDistanceSquared = sumMargin * sumMargin; - - ppu_address_t manifoldAddress = (ppu_address_t)manifold; - - btPersistentManifold* spuManifold=lsMemPtr->getContactManifoldPtr(); - //spuContacts.setContactInfo(spuManifold,manifoldAddress,wuInput->m_worldTransform0,wuInput->m_worldTransform1,wuInput->m_isSwapped); - spuContacts.setContactInfo(spuManifold,manifoldAddress,lsMemPtr->getColObj0()->getWorldTransform(), - lsMemPtr->getColObj1()->getWorldTransform(), - lsMemPtr->getColObj0()->getRestitution(),lsMemPtr->getColObj1()->getRestitution(), - lsMemPtr->getColObj0()->getFriction(),lsMemPtr->getColObj1()->getFriction(), - wuInput->m_isSwapped); - - - btConvexPlaneCollideSingleContact(wuInput,lsMemPtr,spuContacts); - - - - -} - - - - -//////////////////////// -/// Convex versus Concave triangle mesh collision detection (handles concave triangle mesh versus sphere, box, cylinder, triangle, cone, convex polyhedron etc) -/////////////////// -void ProcessConvexConcaveSpuCollision(SpuCollisionPairInput* wuInput, CollisionTask_LocalStoreMemory* lsMemPtr, SpuContactResult& spuContacts) -{ - //order: first collision shape is convex, second concave. m_isSwapped is true, if the original order was opposite - - btBvhTriangleMeshShape* trimeshShape = (btBvhTriangleMeshShape*)wuInput->m_spuCollisionShapes[1]; - //need the mesh interface, for access to triangle vertices - dmaBvhShapeData (&lsMemPtr->bvhShapeData, trimeshShape); - - btVector3 aabbMin(-1,-400,-1); - btVector3 aabbMax(1,400,1); - - - //recalc aabbs - btTransform convexInTriangleSpace; - convexInTriangleSpace = wuInput->m_worldTransform1.inverse() * wuInput->m_worldTransform0; - btConvexInternalShape* convexShape = (btConvexInternalShape*)wuInput->m_spuCollisionShapes[0]; - - computeAabb (aabbMin, aabbMax, convexShape, wuInput->m_collisionShapes[0], wuInput->m_shapeType0, convexInTriangleSpace); - - - //CollisionShape* triangleShape = static_cast(triBody->m_collisionShape); - //convexShape->getAabb(convexInTriangleSpace,m_aabbMin,m_aabbMax); - - // btScalar extraMargin = collisionMarginTriangle; - // btVector3 extra(extraMargin,extraMargin,extraMargin); - // aabbMax += extra; - // aabbMin -= extra; - - ///quantize query AABB - unsigned short int quantizedQueryAabbMin[3]; - unsigned short int quantizedQueryAabbMax[3]; - lsMemPtr->bvhShapeData.getOptimizedBvh()->quantizeWithClamp(quantizedQueryAabbMin,aabbMin,0); - lsMemPtr->bvhShapeData.getOptimizedBvh()->quantizeWithClamp(quantizedQueryAabbMax,aabbMax,1); - - QuantizedNodeArray& nodeArray = lsMemPtr->bvhShapeData.getOptimizedBvh()->getQuantizedNodeArray(); - //spu_printf("SPU: numNodes = %d\n",nodeArray.size()); - - BvhSubtreeInfoArray& subTrees = lsMemPtr->bvhShapeData.getOptimizedBvh()->getSubtreeInfoArray(); - - - spuNodeCallback nodeCallback(wuInput,lsMemPtr,spuContacts); - IndexedMeshArray& indexArray = lsMemPtr->bvhShapeData.gTriangleMeshInterfacePtr->getIndexedMeshArray(); - //spu_printf("SPU:indexArray.size() = %d\n",indexArray.size()); - - // spu_printf("SPU: numSubTrees = %d\n",subTrees.size()); - //not likely to happen - if (subTrees.size() && indexArray.size() == 1) - { - ///DMA in the index info - dmaBvhIndexedMesh (&lsMemPtr->bvhShapeData.gIndexMesh, indexArray, 0 /* index into indexArray */, 1 /* dmaTag */); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - //display the headers - int numBatch = subTrees.size(); - for (int i=0;ibvhShapeData.gSubtreeHeaders[0], (ppu_address_t)(&subTrees[i]), nextBatch, 1); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - - // spu_printf("nextBatch = %d\n",nextBatch); - - for (int j=0;jbvhShapeData.gSubtreeHeaders[j]; - - unsigned int overlap = spuTestQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax); - if (overlap) - { - btAssert(subtree.m_subtreeSize); - - //dma the actual nodes of this subtree - dmaBvhSubTreeNodes (&lsMemPtr->bvhShapeData.gSubtreeNodes[0], subtree, nodeArray, 2); - cellDmaWaitTagStatusAll(DMA_MASK(2)); - - /* Walk this subtree */ - spuWalkStacklessQuantizedTree(&nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax, - &lsMemPtr->bvhShapeData.gSubtreeNodes[0], - 0, - subtree.m_subtreeSize); - } - // spu_printf("subtreeSize = %d\n",gSubtreeHeaders[j].m_subtreeSize); - } - - // unsigned short int m_quantizedAabbMin[3]; - // unsigned short int m_quantizedAabbMax[3]; - // int m_rootNodeIndex; - // int m_subtreeSize; - i+=nextBatch; - } - - //pre-fetch first tree, then loop and double buffer - } - -} - - -#define MAX_DEGENERATE_STATS 15 -int stats[MAX_DEGENERATE_STATS]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -int degenerateStats[MAX_DEGENERATE_STATS]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - - -//////////////////////// -/// Convex versus Convex collision detection (handles collision between sphere, box, cylinder, triangle, cone, convex polyhedron etc) -/////////////////// -void ProcessSpuConvexConvexCollision(SpuCollisionPairInput* wuInput, CollisionTask_LocalStoreMemory* lsMemPtr, SpuContactResult& spuContacts) -{ - register int dmaSize; - register ppu_address_t dmaPpuAddress2; - -#ifdef DEBUG_SPU_COLLISION_DETECTION - //spu_printf("SPU: ProcessSpuConvexConvexCollision\n"); -#endif //DEBUG_SPU_COLLISION_DETECTION - //CollisionShape* shape0 = (CollisionShape*)wuInput->m_collisionShapes[0]; - //CollisionShape* shape1 = (CollisionShape*)wuInput->m_collisionShapes[1]; - btPersistentManifold* manifold = (btPersistentManifold*)wuInput->m_persistentManifoldPtr; - - bool genericGjk = true; - - if (genericGjk) - { - //try generic GJK - - - - //SpuConvexPenetrationDepthSolver* penetrationSolver=0; - btVoronoiSimplexSolver simplexSolver; - btGjkEpaPenetrationDepthSolver epaPenetrationSolver2; - - btConvexPenetrationDepthSolver* penetrationSolver = &epaPenetrationSolver2; - - //SpuMinkowskiPenetrationDepthSolver minkowskiPenetrationSolver; -#ifdef ENABLE_EPA - if (gUseEpa) - { - penetrationSolver = &epaPenetrationSolver2; - } else -#endif - { - //penetrationSolver = &minkowskiPenetrationSolver; - } - - - ///DMA in the vertices for convex shapes - ATTRIBUTE_ALIGNED16(char convexHullShape0[sizeof(btConvexHullShape)]); - ATTRIBUTE_ALIGNED16(char convexHullShape1[sizeof(btConvexHullShape)]); - - if ( btLikely( wuInput->m_shapeType0== CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - // spu_printf("SPU: DMA btConvexHullShape\n"); - - dmaSize = sizeof(btConvexHullShape); - dmaPpuAddress2 = wuInput->m_collisionShapes[0]; - - cellDmaGet(&convexHullShape0, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - //cellDmaWaitTagStatusAll(DMA_MASK(1)); - } - - if ( btLikely( wuInput->m_shapeType1 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - // spu_printf("SPU: DMA btConvexHullShape\n"); - dmaSize = sizeof(btConvexHullShape); - dmaPpuAddress2 = wuInput->m_collisionShapes[1]; - cellDmaGet(&convexHullShape1, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - //cellDmaWaitTagStatusAll(DMA_MASK(1)); - } - - if ( btLikely( wuInput->m_shapeType0 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(1)); - dmaConvexVertexData (&lsMemPtr->convexVertexData[0], (btConvexHullShape*)&convexHullShape0); - lsMemPtr->convexVertexData[0].gSpuConvexShapePtr = wuInput->m_spuCollisionShapes[0]; - } - - - if ( btLikely( wuInput->m_shapeType1 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(1)); - dmaConvexVertexData (&lsMemPtr->convexVertexData[1], (btConvexHullShape*)&convexHullShape1); - lsMemPtr->convexVertexData[1].gSpuConvexShapePtr = wuInput->m_spuCollisionShapes[1]; - } - - - btConvexPointCloudShape cpc0,cpc1; - - if ( btLikely( wuInput->m_shapeType0 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(2)); - lsMemPtr->convexVertexData[0].gConvexPoints = &lsMemPtr->convexVertexData[0].g_convexPointBuffer[0]; - btConvexHullShape* ch = (btConvexHullShape*)wuInput->m_spuCollisionShapes[0]; - const btVector3& localScaling = ch->getLocalScalingNV(); - cpc0.setPoints(lsMemPtr->convexVertexData[0].gConvexPoints,lsMemPtr->convexVertexData[0].gNumConvexPoints,false,localScaling); - wuInput->m_spuCollisionShapes[0] = &cpc0; - } - - if ( btLikely( wuInput->m_shapeType1 == CONVEX_HULL_SHAPE_PROXYTYPE ) ) - { - cellDmaWaitTagStatusAll(DMA_MASK(2)); - lsMemPtr->convexVertexData[1].gConvexPoints = &lsMemPtr->convexVertexData[1].g_convexPointBuffer[0]; - btConvexHullShape* ch = (btConvexHullShape*)wuInput->m_spuCollisionShapes[1]; - const btVector3& localScaling = ch->getLocalScalingNV(); - cpc1.setPoints(lsMemPtr->convexVertexData[1].gConvexPoints,lsMemPtr->convexVertexData[1].gNumConvexPoints,false,localScaling); - wuInput->m_spuCollisionShapes[1] = &cpc1; - - } - - - const btConvexShape* shape0Ptr = (const btConvexShape*)wuInput->m_spuCollisionShapes[0]; - const btConvexShape* shape1Ptr = (const btConvexShape*)wuInput->m_spuCollisionShapes[1]; - int shapeType0 = wuInput->m_shapeType0; - int shapeType1 = wuInput->m_shapeType1; - float marginA = wuInput->m_collisionMargin0; - float marginB = wuInput->m_collisionMargin1; - - SpuClosestPointInput cpInput; - cpInput.m_convexVertexData[0] = &lsMemPtr->convexVertexData[0]; - cpInput.m_convexVertexData[1] = &lsMemPtr->convexVertexData[1]; - cpInput.m_transformA = wuInput->m_worldTransform0; - cpInput.m_transformB = wuInput->m_worldTransform1; - float sumMargin = (marginA+marginB+lsMemPtr->getContactManifoldPtr()->getContactBreakingThreshold()); - cpInput.m_maximumDistanceSquared = sumMargin * sumMargin; - - ppu_address_t manifoldAddress = (ppu_address_t)manifold; - - btPersistentManifold* spuManifold=lsMemPtr->getContactManifoldPtr(); - //spuContacts.setContactInfo(spuManifold,manifoldAddress,wuInput->m_worldTransform0,wuInput->m_worldTransform1,wuInput->m_isSwapped); - spuContacts.setContactInfo(spuManifold,manifoldAddress,lsMemPtr->getColObj0()->getWorldTransform(), - lsMemPtr->getColObj1()->getWorldTransform(), - lsMemPtr->getColObj0()->getRestitution(),lsMemPtr->getColObj1()->getRestitution(), - lsMemPtr->getColObj0()->getFriction(),lsMemPtr->getColObj1()->getFriction(), - wuInput->m_isSwapped); - - { - btGjkPairDetector gjk(shape0Ptr,shape1Ptr,shapeType0,shapeType1,marginA,marginB,&simplexSolver,penetrationSolver);//&vsSolver,penetrationSolver); - gjk.getClosestPoints(cpInput,spuContacts,0);//,debugDraw); - - btAssert(gjk.m_lastUsedMethod getContactBreakingThreshold(); - lsMemPtr->getlocalCollisionAlgorithm()->m_sepDistance.initSeparatingDistance(gjk.getCachedSeparatingAxis(),sepDist,wuInput->m_worldTransform0,wuInput->m_worldTransform1); - lsMemPtr->needsDmaPutContactManifoldAlgo = true; -#endif //USE_SEPDISTANCE_UTIL - - } - - } - - -} - - -template void DoSwap(T& a, T& b) -{ - char tmp[sizeof(T)]; - memcpy(tmp, &a, sizeof(T)); - memcpy(&a, &b, sizeof(T)); - memcpy(&b, tmp, sizeof(T)); -} - -SIMD_FORCE_INLINE void dmaAndSetupCollisionObjects(SpuCollisionPairInput& collisionPairInput, CollisionTask_LocalStoreMemory& lsMem) -{ - register int dmaSize; - register ppu_address_t dmaPpuAddress2; - - dmaSize = sizeof(btCollisionObject);//btTransform); - dmaPpuAddress2 = /*collisionPairInput.m_isSwapped ? (ppu_address_t)lsMem.gProxyPtr1->m_clientObject :*/ (ppu_address_t)lsMem.getlocalCollisionAlgorithm()->getCollisionObject0(); - lsMem.m_lsColObj0Ptr = (btCollisionObject*)cellDmaGetReadOnly(&lsMem.gColObj0Buffer, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - - dmaSize = sizeof(btCollisionObject);//btTransform); - dmaPpuAddress2 = /*collisionPairInput.m_isSwapped ? (ppu_address_t)lsMem.gProxyPtr0->m_clientObject :*/ (ppu_address_t)lsMem.getlocalCollisionAlgorithm()->getCollisionObject1(); - lsMem.m_lsColObj1Ptr = (btCollisionObject*)cellDmaGetReadOnly(&lsMem.gColObj1Buffer, dmaPpuAddress2 , dmaSize, DMA_TAG(2), 0, 0); - - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - - btCollisionObject* ob0 = lsMem.getColObj0(); - btCollisionObject* ob1 = lsMem.getColObj1(); - - collisionPairInput.m_worldTransform0 = ob0->getWorldTransform(); - collisionPairInput.m_worldTransform1 = ob1->getWorldTransform(); -} - - - -void handleCollisionPair(SpuCollisionPairInput& collisionPairInput, CollisionTask_LocalStoreMemory& lsMem, - SpuContactResult &spuContacts, - ppu_address_t collisionShape0Ptr, void* collisionShape0Loc, - ppu_address_t collisionShape1Ptr, void* collisionShape1Loc, bool dmaShapes = true) -{ - - if (btBroadphaseProxy::isConvex(collisionPairInput.m_shapeType0) - && btBroadphaseProxy::isConvex(collisionPairInput.m_shapeType1)) - { - if (dmaShapes) - { - dmaCollisionShape (collisionShape0Loc, collisionShape0Ptr, 1, collisionPairInput.m_shapeType0); - dmaCollisionShape (collisionShape1Loc, collisionShape1Ptr, 2, collisionPairInput.m_shapeType1); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - } - - btConvexInternalShape* spuConvexShape0 = (btConvexInternalShape*)collisionShape0Loc; - btConvexInternalShape* spuConvexShape1 = (btConvexInternalShape*)collisionShape1Loc; - - btVector3 dim0 = spuConvexShape0->getImplicitShapeDimensions(); - btVector3 dim1 = spuConvexShape1->getImplicitShapeDimensions(); - - collisionPairInput.m_primitiveDimensions0 = dim0; - collisionPairInput.m_primitiveDimensions1 = dim1; - collisionPairInput.m_collisionShapes[0] = collisionShape0Ptr; - collisionPairInput.m_collisionShapes[1] = collisionShape1Ptr; - collisionPairInput.m_spuCollisionShapes[0] = spuConvexShape0; - collisionPairInput.m_spuCollisionShapes[1] = spuConvexShape1; - ProcessSpuConvexConvexCollision(&collisionPairInput,&lsMem,spuContacts); - } - else if (btBroadphaseProxy::isCompound(collisionPairInput.m_shapeType0) && - btBroadphaseProxy::isCompound(collisionPairInput.m_shapeType1)) - { - //snPause(); - - dmaCollisionShape (collisionShape0Loc, collisionShape0Ptr, 1, collisionPairInput.m_shapeType0); - dmaCollisionShape (collisionShape1Loc, collisionShape1Ptr, 2, collisionPairInput.m_shapeType1); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - - // Both are compounds, do N^2 CD for now - ///@todo: add some AABB-based pruning (probably not -> slower) - - btCompoundShape* spuCompoundShape0 = (btCompoundShape*)collisionShape0Loc; - btCompoundShape* spuCompoundShape1 = (btCompoundShape*)collisionShape1Loc; - - dmaCompoundShapeInfo (&lsMem.compoundShapeData[0], spuCompoundShape0, 1); - dmaCompoundShapeInfo (&lsMem.compoundShapeData[1], spuCompoundShape1, 2); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - - - dmaCompoundSubShapes (&lsMem.compoundShapeData[0], spuCompoundShape0, 1); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - dmaCompoundSubShapes (&lsMem.compoundShapeData[1], spuCompoundShape1, 1); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - int childShapeCount0 = spuCompoundShape0->getNumChildShapes(); - btAssert(childShapeCount0< MAX_SPU_COMPOUND_SUBSHAPES); - int childShapeCount1 = spuCompoundShape1->getNumChildShapes(); - btAssert(childShapeCount1< MAX_SPU_COMPOUND_SUBSHAPES); - - // Start the N^2 - for (int i = 0; i < childShapeCount0; ++i) - { - btCompoundShapeChild& childShape0 = lsMem.compoundShapeData[0].gSubshapes[i]; - btAssert(!btBroadphaseProxy::isCompound(childShape0.m_childShapeType)); - - for (int j = 0; j < childShapeCount1; ++j) - { - btCompoundShapeChild& childShape1 = lsMem.compoundShapeData[1].gSubshapes[j]; - btAssert(!btBroadphaseProxy::isCompound(childShape1.m_childShapeType)); - - - /* Create a new collision pair input struct using the two child shapes */ - SpuCollisionPairInput cinput (collisionPairInput); - - cinput.m_worldTransform0 = collisionPairInput.m_worldTransform0 * childShape0.m_transform; - cinput.m_shapeType0 = childShape0.m_childShapeType; - cinput.m_collisionMargin0 = childShape0.m_childMargin; - - cinput.m_worldTransform1 = collisionPairInput.m_worldTransform1 * childShape1.m_transform; - cinput.m_shapeType1 = childShape1.m_childShapeType; - cinput.m_collisionMargin1 = childShape1.m_childMargin; - /* Recursively call handleCollisionPair () with new collision pair input */ - - handleCollisionPair(cinput, lsMem, spuContacts, - (ppu_address_t)childShape0.m_childShape, lsMem.compoundShapeData[0].gSubshapeShape[i], - (ppu_address_t)childShape1.m_childShape, lsMem.compoundShapeData[1].gSubshapeShape[j], false); - } - } - } - else if (btBroadphaseProxy::isCompound(collisionPairInput.m_shapeType0) ) - { - //snPause(); - - dmaCollisionShape (collisionShape0Loc, collisionShape0Ptr, 1, collisionPairInput.m_shapeType0); - dmaCollisionShape (collisionShape1Loc, collisionShape1Ptr, 2, collisionPairInput.m_shapeType1); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - - // object 0 compound, object 1 non-compound - btCompoundShape* spuCompoundShape = (btCompoundShape*)collisionShape0Loc; - dmaCompoundShapeInfo (&lsMem.compoundShapeData[0], spuCompoundShape, 1); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - int childShapeCount = spuCompoundShape->getNumChildShapes(); - btAssert(childShapeCount< MAX_SPU_COMPOUND_SUBSHAPES); - - for (int i = 0; i < childShapeCount; ++i) - { - btCompoundShapeChild& childShape = lsMem.compoundShapeData[0].gSubshapes[i]; - btAssert(!btBroadphaseProxy::isCompound(childShape.m_childShapeType)); - // Dma the child shape - dmaCollisionShape (&lsMem.compoundShapeData[0].gSubshapeShape[i], (ppu_address_t)childShape.m_childShape, 1, childShape.m_childShapeType); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - SpuCollisionPairInput cinput (collisionPairInput); - cinput.m_worldTransform0 = collisionPairInput.m_worldTransform0 * childShape.m_transform; - cinput.m_shapeType0 = childShape.m_childShapeType; - cinput.m_collisionMargin0 = childShape.m_childMargin; - - handleCollisionPair(cinput, lsMem, spuContacts, - (ppu_address_t)childShape.m_childShape, lsMem.compoundShapeData[0].gSubshapeShape[i], - collisionShape1Ptr, collisionShape1Loc, false); - } - } - else if (btBroadphaseProxy::isCompound(collisionPairInput.m_shapeType1) ) - { - //snPause(); - - dmaCollisionShape (collisionShape0Loc, collisionShape0Ptr, 1, collisionPairInput.m_shapeType0); - dmaCollisionShape (collisionShape1Loc, collisionShape1Ptr, 2, collisionPairInput.m_shapeType1); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - // object 0 non-compound, object 1 compound - btCompoundShape* spuCompoundShape = (btCompoundShape*)collisionShape1Loc; - dmaCompoundShapeInfo (&lsMem.compoundShapeData[0], spuCompoundShape, 1); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - int childShapeCount = spuCompoundShape->getNumChildShapes(); - btAssert(childShapeCount< MAX_SPU_COMPOUND_SUBSHAPES); - - - for (int i = 0; i < childShapeCount; ++i) - { - btCompoundShapeChild& childShape = lsMem.compoundShapeData[0].gSubshapes[i]; - btAssert(!btBroadphaseProxy::isCompound(childShape.m_childShapeType)); - // Dma the child shape - dmaCollisionShape (&lsMem.compoundShapeData[0].gSubshapeShape[i], (ppu_address_t)childShape.m_childShape, 1, childShape.m_childShapeType); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - SpuCollisionPairInput cinput (collisionPairInput); - cinput.m_worldTransform1 = collisionPairInput.m_worldTransform1 * childShape.m_transform; - cinput.m_shapeType1 = childShape.m_childShapeType; - cinput.m_collisionMargin1 = childShape.m_childMargin; - handleCollisionPair(cinput, lsMem, spuContacts, - collisionShape0Ptr, collisionShape0Loc, - (ppu_address_t)childShape.m_childShape, lsMem.compoundShapeData[0].gSubshapeShape[i], false); - } - - } - else - { - //a non-convex shape is involved - bool handleConvexConcave = false; - - //snPause(); - - if (btBroadphaseProxy::isConcave(collisionPairInput.m_shapeType0) && - btBroadphaseProxy::isConvex(collisionPairInput.m_shapeType1)) - { - // Swap stuff - DoSwap(collisionShape0Ptr, collisionShape1Ptr); - DoSwap(collisionShape0Loc, collisionShape1Loc); - DoSwap(collisionPairInput.m_shapeType0, collisionPairInput.m_shapeType1); - DoSwap(collisionPairInput.m_worldTransform0, collisionPairInput.m_worldTransform1); - DoSwap(collisionPairInput.m_collisionMargin0, collisionPairInput.m_collisionMargin1); - - collisionPairInput.m_isSwapped = true; - } - - if (btBroadphaseProxy::isConvex(collisionPairInput.m_shapeType0)&& - btBroadphaseProxy::isConcave(collisionPairInput.m_shapeType1)) - { - handleConvexConcave = true; - } - if (handleConvexConcave) - { - if (dmaShapes) - { - dmaCollisionShape (collisionShape0Loc, collisionShape0Ptr, 1, collisionPairInput.m_shapeType0); - dmaCollisionShape (collisionShape1Loc, collisionShape1Ptr, 2, collisionPairInput.m_shapeType1); - cellDmaWaitTagStatusAll(DMA_MASK(1) | DMA_MASK(2)); - } - - if (collisionPairInput.m_shapeType1 == STATIC_PLANE_PROXYTYPE) - { - btConvexInternalShape* spuConvexShape0 = (btConvexInternalShape*)collisionShape0Loc; - btStaticPlaneShape* planeShape= (btStaticPlaneShape*)collisionShape1Loc; - - btVector3 dim0 = spuConvexShape0->getImplicitShapeDimensions(); - collisionPairInput.m_primitiveDimensions0 = dim0; - collisionPairInput.m_collisionShapes[0] = collisionShape0Ptr; - collisionPairInput.m_collisionShapes[1] = collisionShape1Ptr; - collisionPairInput.m_spuCollisionShapes[0] = spuConvexShape0; - collisionPairInput.m_spuCollisionShapes[1] = planeShape; - - ProcessConvexPlaneSpuCollision(&collisionPairInput,&lsMem,spuContacts); - } else - { - btConvexInternalShape* spuConvexShape0 = (btConvexInternalShape*)collisionShape0Loc; - btBvhTriangleMeshShape* trimeshShape = (btBvhTriangleMeshShape*)collisionShape1Loc; - - btVector3 dim0 = spuConvexShape0->getImplicitShapeDimensions(); - collisionPairInput.m_primitiveDimensions0 = dim0; - collisionPairInput.m_collisionShapes[0] = collisionShape0Ptr; - collisionPairInput.m_collisionShapes[1] = collisionShape1Ptr; - collisionPairInput.m_spuCollisionShapes[0] = spuConvexShape0; - collisionPairInput.m_spuCollisionShapes[1] = trimeshShape; - - ProcessConvexConcaveSpuCollision(&collisionPairInput,&lsMem,spuContacts); - } - } - - } - - spuContacts.flush(); - -} - - -void processCollisionTask(void* userPtr, void* lsMemPtr) -{ - - SpuGatherAndProcessPairsTaskDesc* taskDescPtr = (SpuGatherAndProcessPairsTaskDesc*)userPtr; - SpuGatherAndProcessPairsTaskDesc& taskDesc = *taskDescPtr; - CollisionTask_LocalStoreMemory* colMemPtr = (CollisionTask_LocalStoreMemory*)lsMemPtr; - CollisionTask_LocalStoreMemory& lsMem = *(colMemPtr); - - gUseEpa = taskDesc.m_useEpa; - - // spu_printf("taskDescPtr=%llx\n",taskDescPtr); - - SpuContactResult spuContacts; - - //////////////////// - - ppu_address_t dmaInPtr = taskDesc.m_inPairPtr; - unsigned int numPages = taskDesc.numPages; - unsigned int numOnLastPage = taskDesc.numOnLastPage; - - // prefetch first set of inputs and wait - lsMem.g_workUnitTaskBuffers.init(); - - unsigned int nextNumOnPage = (numPages > 1)? MIDPHASE_NUM_WORKUNITS_PER_PAGE : numOnLastPage; - lsMem.g_workUnitTaskBuffers.backBufferDmaGet(dmaInPtr, nextNumOnPage*sizeof(SpuGatherAndProcessWorkUnitInput), DMA_TAG(3)); - dmaInPtr += MIDPHASE_WORKUNIT_PAGE_SIZE; - - - register unsigned char *inputPtr; - register unsigned int numOnPage; - register unsigned int j; - SpuGatherAndProcessWorkUnitInput* wuInputs; - register int dmaSize; - register ppu_address_t dmaPpuAddress; - register ppu_address_t dmaPpuAddress2; - - int numPairs; - register int p; - SpuCollisionPairInput collisionPairInput; - - for (unsigned int i = 0; btLikely(i < numPages); i++) - { - - // wait for back buffer dma and swap buffers - inputPtr = lsMem.g_workUnitTaskBuffers.swapBuffers(); - - // number on current page is number prefetched last iteration - numOnPage = nextNumOnPage; - - - // prefetch next set of inputs -#if MIDPHASE_NUM_WORKUNIT_PAGES > 2 - if ( btLikely( i < numPages-1 ) ) -#else - if ( btUnlikely( i < numPages-1 ) ) -#endif - { - nextNumOnPage = (i == numPages-2)? numOnLastPage : MIDPHASE_NUM_WORKUNITS_PER_PAGE; - lsMem.g_workUnitTaskBuffers.backBufferDmaGet(dmaInPtr, nextNumOnPage*sizeof(SpuGatherAndProcessWorkUnitInput), DMA_TAG(3)); - dmaInPtr += MIDPHASE_WORKUNIT_PAGE_SIZE; - } - - wuInputs = reinterpret_cast(inputPtr); - - - for (j = 0; btLikely( j < numOnPage ); j++) - { -#ifdef DEBUG_SPU_COLLISION_DETECTION - // printMidphaseInput(&wuInputs[j]); -#endif //DEBUG_SPU_COLLISION_DETECTION - - - numPairs = wuInputs[j].m_endIndex - wuInputs[j].m_startIndex; - - if ( btLikely( numPairs ) ) - { - dmaSize = numPairs*sizeof(btBroadphasePair); - dmaPpuAddress = wuInputs[j].m_pairArrayPtr+wuInputs[j].m_startIndex * sizeof(btBroadphasePair); - lsMem.m_pairsPointer = (btBroadphasePair*)cellDmaGetReadOnly(&lsMem.gBroadphasePairsBuffer, dmaPpuAddress , dmaSize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - - for (p=0;pm_userInfo = %d\n",pair.m_userInfo); - spu_printf("pair->m_algorithm = %d\n",pair.m_algorithm); - spu_printf("pair->m_pProxy0 = %d\n",pair.m_pProxy0); - spu_printf("pair->m_pProxy1 = %d\n",pair.m_pProxy1); -#endif //DEBUG_SPU_COLLISION_DETECTION - - if (pair.m_internalTmpValue == 2 && pair.m_algorithm && pair.m_pProxy0 && pair.m_pProxy1) - { - dmaSize = sizeof(SpuContactManifoldCollisionAlgorithm); - dmaPpuAddress2 = (ppu_address_t)pair.m_algorithm; - lsMem.m_lsCollisionAlgorithmPtr = (SpuContactManifoldCollisionAlgorithm*)cellDmaGetReadOnly(&lsMem.gSpuContactManifoldAlgoBuffer, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - lsMem.needsDmaPutContactManifoldAlgo = false; - - collisionPairInput.m_persistentManifoldPtr = (ppu_address_t) lsMem.getlocalCollisionAlgorithm()->getContactManifoldPtr(); - collisionPairInput.m_isSwapped = false; - - if (1) - { - - ///can wait on the combined DMA_MASK, or dma on the same tag - - -#ifdef DEBUG_SPU_COLLISION_DETECTION - // spu_printf("SPU collisionPairInput->m_shapeType0 = %d\n",collisionPairInput->m_shapeType0); - // spu_printf("SPU collisionPairInput->m_shapeType1 = %d\n",collisionPairInput->m_shapeType1); -#endif //DEBUG_SPU_COLLISION_DETECTION - - - dmaSize = sizeof(btPersistentManifold); - - dmaPpuAddress2 = collisionPairInput.m_persistentManifoldPtr; - lsMem.m_lsManifoldPtr = (btPersistentManifold*)cellDmaGetReadOnly(&lsMem.gPersistentManifoldBuffer, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - - collisionPairInput.m_shapeType0 = lsMem.getlocalCollisionAlgorithm()->getShapeType0(); - collisionPairInput.m_shapeType1 = lsMem.getlocalCollisionAlgorithm()->getShapeType1(); - collisionPairInput.m_collisionMargin0 = lsMem.getlocalCollisionAlgorithm()->getCollisionMargin0(); - collisionPairInput.m_collisionMargin1 = lsMem.getlocalCollisionAlgorithm()->getCollisionMargin1(); - - - - //??cellDmaWaitTagStatusAll(DMA_MASK(1)); - - - if (1) - { - //snPause(); - - // Get the collision objects - dmaAndSetupCollisionObjects(collisionPairInput, lsMem); - - if (lsMem.getColObj0()->isActive() || lsMem.getColObj1()->isActive()) - { - - lsMem.needsDmaPutContactManifoldAlgo = true; -#ifdef USE_SEPDISTANCE_UTIL - lsMem.getlocalCollisionAlgorithm()->m_sepDistance.updateSeparatingDistance(collisionPairInput.m_worldTransform0,collisionPairInput.m_worldTransform1); -#endif //USE_SEPDISTANCE_UTIL - -#define USE_DEDICATED_BOX_BOX 1 -#ifdef USE_DEDICATED_BOX_BOX - bool boxbox = ((lsMem.getlocalCollisionAlgorithm()->getShapeType0()==BOX_SHAPE_PROXYTYPE)&& - (lsMem.getlocalCollisionAlgorithm()->getShapeType1()==BOX_SHAPE_PROXYTYPE)); - if (boxbox) - { - //spu_printf("boxbox dist = %f\n",distance); - btPersistentManifold* spuManifold=lsMem.getContactManifoldPtr(); - btPersistentManifold* manifold = (btPersistentManifold*)collisionPairInput.m_persistentManifoldPtr; - ppu_address_t manifoldAddress = (ppu_address_t)manifold; - - spuContacts.setContactInfo(spuManifold,manifoldAddress,lsMem.getColObj0()->getWorldTransform(), - lsMem.getColObj1()->getWorldTransform(), - lsMem.getColObj0()->getRestitution(),lsMem.getColObj1()->getRestitution(), - lsMem.getColObj0()->getFriction(),lsMem.getColObj1()->getFriction(), - collisionPairInput.m_isSwapped); - - - //float distance=0.f; - btVector3 normalInB; - - - if (//!gUseEpa && -#ifdef USE_SEPDISTANCE_UTIL - lsMem.getlocalCollisionAlgorithm()->m_sepDistance.getConservativeSeparatingDistance()<=0.f -#else - 1 -#endif - ) - { -//#define USE_PE_BOX_BOX 1 -#ifdef USE_PE_BOX_BOX - { - - //getCollisionMargin0 - btScalar margin0 = lsMem.getlocalCollisionAlgorithm()->getCollisionMargin0(); - btScalar margin1 = lsMem.getlocalCollisionAlgorithm()->getCollisionMargin1(); - btVector3 shapeDim0 = lsMem.getlocalCollisionAlgorithm()->getShapeDimensions0()+btVector3(margin0,margin0,margin0); - btVector3 shapeDim1 = lsMem.getlocalCollisionAlgorithm()->getShapeDimensions1()+btVector3(margin1,margin1,margin1); -/* - //Box boxA(shapeDim0.getX(),shapeDim0.getY(),shapeDim0.getZ()); - vmVector3 vmPos0 = getVmVector3(collisionPairInput.m_worldTransform0.getOrigin()); - vmVector3 vmPos1 = getVmVector3(collisionPairInput.m_worldTransform1.getOrigin()); - vmMatrix3 vmMatrix0 = getVmMatrix3(collisionPairInput.m_worldTransform0.getBasis()); - vmMatrix3 vmMatrix1 = getVmMatrix3(collisionPairInput.m_worldTransform1.getBasis()); - - vmTransform3 transformA(vmMatrix0,vmPos0); - Box boxB(shapeDim1.getX(),shapeDim1.getY(),shapeDim1.getZ()); - vmTransform3 transformB(vmMatrix1,vmPos1); - BoxPoint resultClosestBoxPointA; - BoxPoint resultClosestBoxPointB; - vmVector3 resultNormal; - */ - -#ifdef USE_SEPDISTANCE_UTIL - float distanceThreshold = FLT_MAX -#else - //float distanceThreshold = 0.f; -#endif - - - vmVector3 n; - Box boxA; - vmVector3 hA(shapeDim0.getX(),shapeDim0.getY(),shapeDim0.getZ()); - vmVector3 hB(shapeDim1.getX(),shapeDim1.getY(),shapeDim1.getZ()); - boxA.mHalf= hA; - vmTransform3 trA; - trA.setTranslation(getVmVector3(collisionPairInput.m_worldTransform0.getOrigin())); - trA.setUpper3x3(getVmMatrix3(collisionPairInput.m_worldTransform0.getBasis())); - Box boxB; - boxB.mHalf = hB; - vmTransform3 trB; - trB.setTranslation(getVmVector3(collisionPairInput.m_worldTransform1.getOrigin())); - trB.setUpper3x3(getVmMatrix3(collisionPairInput.m_worldTransform1.getBasis())); - - float distanceThreshold = spuManifold->getContactBreakingThreshold();//0.001f; - - - BoxPoint ptA,ptB; - float dist = boxBoxDistance(n, ptA, ptB, - boxA, trA, boxB, trB, - distanceThreshold ); - - -// float distance = boxBoxDistance(resultNormal,resultClosestBoxPointA,resultClosestBoxPointB, boxA, transformA, boxB,transformB,distanceThreshold); - - normalInB = -getBtVector3(n);//resultNormal); - - //if(dist < distanceThreshold)//spuManifold->getContactBreakingThreshold()) - if(dist < spuManifold->getContactBreakingThreshold()) - { - btVector3 pointOnB = collisionPairInput.m_worldTransform1(getBtVector3(ptB.localPoint)); - - spuContacts.addContactPoint( - normalInB, - pointOnB, - dist); - } - } -#else - { - - btScalar margin0 = lsMem.getlocalCollisionAlgorithm()->getCollisionMargin0(); - btScalar margin1 = lsMem.getlocalCollisionAlgorithm()->getCollisionMargin1(); - btVector3 shapeDim0 = lsMem.getlocalCollisionAlgorithm()->getShapeDimensions0()+btVector3(margin0,margin0,margin0); - btVector3 shapeDim1 = lsMem.getlocalCollisionAlgorithm()->getShapeDimensions1()+btVector3(margin1,margin1,margin1); - - - btBoxShape box0(shapeDim0); - btBoxShape box1(shapeDim1); - - struct SpuBridgeContactCollector : public btDiscreteCollisionDetectorInterface::Result - { - SpuContactResult& m_spuContacts; - - virtual void setShapeIdentifiersA(int partId0,int index0) - { - m_spuContacts.setShapeIdentifiersA(partId0,index0); - } - virtual void setShapeIdentifiersB(int partId1,int index1) - { - m_spuContacts.setShapeIdentifiersB(partId1,index1); - } - virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth) - { - m_spuContacts.addContactPoint(normalOnBInWorld,pointInWorld,depth); - } - - SpuBridgeContactCollector(SpuContactResult& spuContacts) - :m_spuContacts(spuContacts) - { - - } - }; - - SpuBridgeContactCollector bridgeOutput(spuContacts); - - btDiscreteCollisionDetectorInterface::ClosestPointInput input; - input.m_maximumDistanceSquared = BT_LARGE_FLOAT; - input.m_transformA = collisionPairInput.m_worldTransform0; - input.m_transformB = collisionPairInput.m_worldTransform1; - - btBoxBoxDetector detector(&box0,&box1); - - detector.getClosestPoints(input,bridgeOutput,0); - - } -#endif //USE_PE_BOX_BOX - - lsMem.needsDmaPutContactManifoldAlgo = true; -#ifdef USE_SEPDISTANCE_UTIL - btScalar sepDist2 = distance+spuManifold->getContactBreakingThreshold(); - lsMem.getlocalCollisionAlgorithm()->m_sepDistance.initSeparatingDistance(normalInB,sepDist2,collisionPairInput.m_worldTransform0,collisionPairInput.m_worldTransform1); -#endif //USE_SEPDISTANCE_UTIL - gProcessedCol++; - } else - { - gSkippedCol++; - } - - spuContacts.flush(); - - - } else -#endif //USE_DEDICATED_BOX_BOX - { - if ( -#ifdef USE_SEPDISTANCE_UTIL - lsMem.getlocalCollisionAlgorithm()->m_sepDistance.getConservativeSeparatingDistance()<=0.f -#else - 1 -#endif //USE_SEPDISTANCE_UTIL - ) - { - handleCollisionPair(collisionPairInput, lsMem, spuContacts, - (ppu_address_t)lsMem.getColObj0()->getCollisionShape(), &lsMem.gCollisionShapes[0].collisionShape, - (ppu_address_t)lsMem.getColObj1()->getCollisionShape(), &lsMem.gCollisionShapes[1].collisionShape); - } else - { - //spu_printf("boxbox dist = %f\n",distance); - btPersistentManifold* spuManifold=lsMem.getContactManifoldPtr(); - btPersistentManifold* manifold = (btPersistentManifold*)collisionPairInput.m_persistentManifoldPtr; - ppu_address_t manifoldAddress = (ppu_address_t)manifold; - - spuContacts.setContactInfo(spuManifold,manifoldAddress,lsMem.getColObj0()->getWorldTransform(), - lsMem.getColObj1()->getWorldTransform(), - lsMem.getColObj0()->getRestitution(),lsMem.getColObj1()->getRestitution(), - lsMem.getColObj0()->getFriction(),lsMem.getColObj1()->getFriction(), - collisionPairInput.m_isSwapped); - - spuContacts.flush(); - } - } - - } - - } - } - -#ifdef USE_SEPDISTANCE_UTIL -#if defined (__SPU__) || defined (USE_LIBSPE2) - if (lsMem.needsDmaPutContactManifoldAlgo) - { - dmaSize = sizeof(SpuContactManifoldCollisionAlgorithm); - dmaPpuAddress2 = (ppu_address_t)pair.m_algorithm; - cellDmaLargePut(&lsMem.gSpuContactManifoldAlgoBuffer, dmaPpuAddress2 , dmaSize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - } -#endif -#endif //#ifdef USE_SEPDISTANCE_UTIL - - } - } - } - } //end for (j = 0; j < numOnPage; j++) - - }// for - - - - return; -} - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h deleted file mode 100644 index 64af964c1..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h +++ /dev/null @@ -1,140 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef SPU_GATHERING_COLLISION_TASK_H -#define SPU_GATHERING_COLLISION_TASK_H - -#include "../PlatformDefinitions.h" -//#define DEBUG_SPU_COLLISION_DETECTION 1 - - -///Task Description for SPU collision detection -struct SpuGatherAndProcessPairsTaskDesc -{ - ppu_address_t m_inPairPtr;//m_pairArrayPtr; - //mutex variable - uint32_t m_someMutexVariableInMainMemory; - - ppu_address_t m_dispatcher; - - uint32_t numOnLastPage; - - uint16_t numPages; - uint16_t taskId; - bool m_useEpa; - - struct CollisionTask_LocalStoreMemory* m_lsMemory; -} - -#if defined(__CELLOS_LV2__) || defined(USE_LIBSPE2) -__attribute__ ((aligned (128))) -#endif -; - - -void processCollisionTask(void* userPtr, void* lsMemory); - -void* createCollisionLocalStoreMemory(); -void deleteCollisionLocalStoreMemory(); - -#if defined(USE_LIBSPE2) && defined(__SPU__) -#include "../SpuLibspe2Support.h" -#include -#include -#include - -//#define DEBUG_LIBSPE2_SPU_TASK - - - -int main(unsigned long long speid, addr64 argp, addr64 envp) -{ - printf("SPU: hello \n"); - - ATTRIBUTE_ALIGNED128(btSpuStatus status); - ATTRIBUTE_ALIGNED16( SpuGatherAndProcessPairsTaskDesc taskDesc ) ; - unsigned int received_message = Spu_Mailbox_Event_Nothing; - bool shutdown = false; - - cellDmaGet(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - status.m_status = Spu_Status_Free; - status.m_lsMemory.p = createCollisionLocalStoreMemory(); - - cellDmaLargePut(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - - while ( btLikely( !shutdown ) ) - { - - received_message = spu_read_in_mbox(); - - if( btLikely( received_message == Spu_Mailbox_Event_Task )) - { -#ifdef DEBUG_LIBSPE2_SPU_TASK - printf("SPU: received Spu_Mailbox_Event_Task\n"); -#endif //DEBUG_LIBSPE2_SPU_TASK - - // refresh the status - cellDmaGet(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - btAssert(status.m_status==Spu_Status_Occupied); - - cellDmaGet(&taskDesc, status.m_taskDesc.p, sizeof(SpuGatherAndProcessPairsTaskDesc), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); -#ifdef DEBUG_LIBSPE2_SPU_TASK - printf("SPU:processCollisionTask\n"); -#endif //DEBUG_LIBSPE2_SPU_TASK - processCollisionTask((void*)&taskDesc, taskDesc.m_lsMemory); - -#ifdef DEBUG_LIBSPE2_SPU_TASK - printf("SPU:finished processCollisionTask\n"); -#endif //DEBUG_LIBSPE2_SPU_TASK - } - else - { -#ifdef DEBUG_LIBSPE2_SPU_TASK - printf("SPU: received ShutDown\n"); -#endif //DEBUG_LIBSPE2_SPU_TASK - if( btLikely( received_message == Spu_Mailbox_Event_Shutdown ) ) - { - shutdown = true; - } - else - { - //printf("SPU - Sth. recieved\n"); - } - } - - // set to status free and wait for next task - status.m_status = Spu_Status_Free; - cellDmaLargePut(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - - } - - printf("SPU: shutdown\n"); - return 0; -} -#endif // USE_LIBSPE2 - - -#endif //SPU_GATHERING_COLLISION_TASK_H - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp deleted file mode 100644 index 166a38f6d..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp +++ /dev/null @@ -1,347 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "SpuMinkowskiPenetrationDepthSolver.h" -#include "SpuContactResult.h" -#include "SpuPreferredPenetrationDirections.h" -#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" -#include "SpuCollisionShapes.h" - -#define NUM_UNITSPHERE_POINTS 42 -static btVector3 sPenetrationDirections[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2] = -{ -btVector3(btScalar(0.000000) , btScalar(-0.000000),btScalar(-1.000000)), -btVector3(btScalar(0.723608) , btScalar(-0.525725),btScalar(-0.447219)), -btVector3(btScalar(-0.276388) , btScalar(-0.850649),btScalar(-0.447219)), -btVector3(btScalar(-0.894426) , btScalar(-0.000000),btScalar(-0.447216)), -btVector3(btScalar(-0.276388) , btScalar(0.850649),btScalar(-0.447220)), -btVector3(btScalar(0.723608) , btScalar(0.525725),btScalar(-0.447219)), -btVector3(btScalar(0.276388) , btScalar(-0.850649),btScalar(0.447220)), -btVector3(btScalar(-0.723608) , btScalar(-0.525725),btScalar(0.447219)), -btVector3(btScalar(-0.723608) , btScalar(0.525725),btScalar(0.447219)), -btVector3(btScalar(0.276388) , btScalar(0.850649),btScalar(0.447219)), -btVector3(btScalar(0.894426) , btScalar(0.000000),btScalar(0.447216)), -btVector3(btScalar(-0.000000) , btScalar(0.000000),btScalar(1.000000)), -btVector3(btScalar(0.425323) , btScalar(-0.309011),btScalar(-0.850654)), -btVector3(btScalar(-0.162456) , btScalar(-0.499995),btScalar(-0.850654)), -btVector3(btScalar(0.262869) , btScalar(-0.809012),btScalar(-0.525738)), -btVector3(btScalar(0.425323) , btScalar(0.309011),btScalar(-0.850654)), -btVector3(btScalar(0.850648) , btScalar(-0.000000),btScalar(-0.525736)), -btVector3(btScalar(-0.525730) , btScalar(-0.000000),btScalar(-0.850652)), -btVector3(btScalar(-0.688190) , btScalar(-0.499997),btScalar(-0.525736)), -btVector3(btScalar(-0.162456) , btScalar(0.499995),btScalar(-0.850654)), -btVector3(btScalar(-0.688190) , btScalar(0.499997),btScalar(-0.525736)), -btVector3(btScalar(0.262869) , btScalar(0.809012),btScalar(-0.525738)), -btVector3(btScalar(0.951058) , btScalar(0.309013),btScalar(0.000000)), -btVector3(btScalar(0.951058) , btScalar(-0.309013),btScalar(0.000000)), -btVector3(btScalar(0.587786) , btScalar(-0.809017),btScalar(0.000000)), -btVector3(btScalar(0.000000) , btScalar(-1.000000),btScalar(0.000000)), -btVector3(btScalar(-0.587786) , btScalar(-0.809017),btScalar(0.000000)), -btVector3(btScalar(-0.951058) , btScalar(-0.309013),btScalar(-0.000000)), -btVector3(btScalar(-0.951058) , btScalar(0.309013),btScalar(-0.000000)), -btVector3(btScalar(-0.587786) , btScalar(0.809017),btScalar(-0.000000)), -btVector3(btScalar(-0.000000) , btScalar(1.000000),btScalar(-0.000000)), -btVector3(btScalar(0.587786) , btScalar(0.809017),btScalar(-0.000000)), -btVector3(btScalar(0.688190) , btScalar(-0.499997),btScalar(0.525736)), -btVector3(btScalar(-0.262869) , btScalar(-0.809012),btScalar(0.525738)), -btVector3(btScalar(-0.850648) , btScalar(0.000000),btScalar(0.525736)), -btVector3(btScalar(-0.262869) , btScalar(0.809012),btScalar(0.525738)), -btVector3(btScalar(0.688190) , btScalar(0.499997),btScalar(0.525736)), -btVector3(btScalar(0.525730) , btScalar(0.000000),btScalar(0.850652)), -btVector3(btScalar(0.162456) , btScalar(-0.499995),btScalar(0.850654)), -btVector3(btScalar(-0.425323) , btScalar(-0.309011),btScalar(0.850654)), -btVector3(btScalar(-0.425323) , btScalar(0.309011),btScalar(0.850654)), -btVector3(btScalar(0.162456) , btScalar(0.499995),btScalar(0.850654)) -}; - - -bool SpuMinkowskiPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& simplexSolver, - const btConvexShape* convexA,const btConvexShape* convexB, - const btTransform& transA,const btTransform& transB, - btVector3& v, btVector3& pa, btVector3& pb, - class btIDebugDraw* debugDraw) -{ -#if 0 - (void)v; - - - struct btIntermediateResult : public SpuContactResult - { - - btIntermediateResult():m_hasResult(false) - { - } - - btVector3 m_normalOnBInWorld; - btVector3 m_pointInWorld; - btScalar m_depth; - bool m_hasResult; - - virtual void setShapeIdentifiersA(int partId0,int index0) - { - (void)partId0; - (void)index0; - } - - virtual void setShapeIdentifiersB(int partId1,int index1) - { - (void)partId1; - (void)index1; - } - void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth) - { - m_normalOnBInWorld = normalOnBInWorld; - m_pointInWorld = pointInWorld; - m_depth = depth; - m_hasResult = true; - } - }; - - //just take fixed number of orientation, and sample the penetration depth in that direction - btScalar minProj = btScalar(BT_LARGE_FLOAT); - btVector3 minNorm(0.f,0.f,0.f); - btVector3 minVertex; - btVector3 minA,minB; - btVector3 seperatingAxisInA,seperatingAxisInB; - btVector3 pInA,qInB,pWorld,qWorld,w; - -//#define USE_BATCHED_SUPPORT 1 -#ifdef USE_BATCHED_SUPPORT - - btVector3 supportVerticesABatch[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2]; - btVector3 supportVerticesBBatch[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2]; - btVector3 seperatingAxisInABatch[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2]; - btVector3 seperatingAxisInBBatch[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2]; - int i; - - int numSampleDirections = NUM_UNITSPHERE_POINTS; - - for (i=0;igetNumPreferredPenetrationDirections(); - if (numPDA) - { - for (int i=0;igetPreferredPenetrationDirection(i,norm); - norm = transA.getBasis() * norm; - sPenetrationDirections[numSampleDirections] = norm; - seperatingAxisInABatch[numSampleDirections] = (-norm) * transA.getBasis(); - seperatingAxisInBBatch[numSampleDirections] = norm * transB.getBasis(); - numSampleDirections++; - } - } - } - - { - int numPDB = convexB->getNumPreferredPenetrationDirections(); - if (numPDB) - { - for (int i=0;igetPreferredPenetrationDirection(i,norm); - norm = transB.getBasis() * norm; - sPenetrationDirections[numSampleDirections] = norm; - seperatingAxisInABatch[numSampleDirections] = (-norm) * transA.getBasis(); - seperatingAxisInBBatch[numSampleDirections] = norm * transB.getBasis(); - numSampleDirections++; - } - } - } - - - - convexA->batchedUnitVectorGetSupportingVertexWithoutMargin(seperatingAxisInABatch,supportVerticesABatch,numSampleDirections); - convexB->batchedUnitVectorGetSupportingVertexWithoutMargin(seperatingAxisInBBatch,supportVerticesBBatch,numSampleDirections); - - for (i=0;ilocalGetSupportVertexWithoutMarginNonVirtual( seperatingAxisInA);//, NULL); - qInB = convexB->localGetSupportVertexWithoutMarginNonVirtual(seperatingAxisInB);//, NULL); - - // pInA = convexA->localGetSupportingVertexWithoutMargin(seperatingAxisInA); - // qInB = convexB->localGetSupportingVertexWithoutMargin(seperatingAxisInB); - - pWorld = transA(pInA); - qWorld = transB(qInB); - w = qWorld - pWorld; - btScalar delta = norm.dot(w); - //find smallest delta - if (delta < minProj) - { - minProj = delta; - minNorm = norm; - minA = pWorld; - minB = qWorld; - } - } -#endif //USE_BATCHED_SUPPORT - - //add the margins - - minA += minNorm*marginA; - minB -= minNorm*marginB; - //no penetration - if (minProj < btScalar(0.)) - return false; - - minProj += (marginA + marginB) + btScalar(1.00); - - - - - -//#define DEBUG_DRAW 1 -#ifdef DEBUG_DRAW - if (debugDraw) - { - btVector3 color(0,1,0); - debugDraw->drawLine(minA,minB,color); - color = btVector3 (1,1,1); - btVector3 vec = minB-minA; - btScalar prj2 = minNorm.dot(vec); - debugDraw->drawLine(minA,minA+(minNorm*minProj),color); - - } -#endif //DEBUG_DRAW - - - btGjkPairDetector gjkdet(convexA,convexB,&simplexSolver,0); - - btScalar offsetDist = minProj; - btVector3 offset = minNorm * offsetDist; - - - SpuClosestPointInput input; - input.m_convexVertexData[0] = convexVertexDataA; - input.m_convexVertexData[1] = convexVertexDataB; - btVector3 newOrg = transA.getOrigin() + offset; - - btTransform displacedTrans = transA; - displacedTrans.setOrigin(newOrg); - - input.m_transformA = displacedTrans; - input.m_transformB = transB; - input.m_maximumDistanceSquared = btScalar(BT_LARGE_FLOAT);//minProj; - - btIntermediateResult res; - gjkdet.getClosestPoints(input,res,0); - - btScalar correctedMinNorm = minProj - res.m_depth; - - - //the penetration depth is over-estimated, relax it - btScalar penetration_relaxation= btScalar(1.); - minNorm*=penetration_relaxation; - - if (res.m_hasResult) - { - - pa = res.m_pointInWorld - minNorm * correctedMinNorm; - pb = res.m_pointInWorld; - -#ifdef DEBUG_DRAW - if (debugDraw) - { - btVector3 color(1,0,0); - debugDraw->drawLine(pa,pb,color); - } -#endif//DEBUG_DRAW - - - } else { - // could not seperate shapes - //btAssert (false); - } - return res.m_hasResult; -#endif - return false; -} - - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h deleted file mode 100644 index 98c4fc68e..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h +++ /dev/null @@ -1,47 +0,0 @@ - -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef MINKOWSKI_PENETRATION_DEPTH_SOLVER_H -#define MINKOWSKI_PENETRATION_DEPTH_SOLVER_H - - -#include "BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h" - -class btIDebugDraw; -class btVoronoiSimplexSolver; -class btConvexShape; - -///MinkowskiPenetrationDepthSolver implements bruteforce penetration depth estimation. -///Implementation is based on sampling the depth using support mapping, and using GJK step to get the witness points. -class SpuMinkowskiPenetrationDepthSolver : public btConvexPenetrationDepthSolver -{ -public: - SpuMinkowskiPenetrationDepthSolver() {} - virtual ~SpuMinkowskiPenetrationDepthSolver() {}; - - virtual bool calcPenDepth( btSimplexSolverInterface& simplexSolver, - const btConvexShape* convexA,const btConvexShape* convexB, - const btTransform& transA,const btTransform& transB, - btVector3& v, btVector3& pa, btVector3& pb, - class btIDebugDraw* debugDraw - ); - - -}; - - -#endif //MINKOWSKI_PENETRATION_DEPTH_SOLVER_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h deleted file mode 100644 index 774a0cb2e..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h +++ /dev/null @@ -1,70 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://continuousphysics.com/Bullet/ - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SPU_PREFERRED_PENETRATION_DIRECTIONS_H -#define _SPU_PREFERRED_PENETRATION_DIRECTIONS_H - - -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" - -int spuGetNumPreferredPenetrationDirections(int shapeType, void* shape) -{ - switch (shapeType) - { - case TRIANGLE_SHAPE_PROXYTYPE: - { - return 2; - //spu_printf("2\n"); - break; - } - default: - { -#if __ASSERT - spu_printf("spuGetNumPreferredPenetrationDirections() - Unsupported bound type: %d.\n", shapeType); -#endif // __ASSERT - } - } - - return 0; -} - -void spuGetPreferredPenetrationDirection(int shapeType, void* shape, int index, btVector3& penetrationVector) -{ - - - switch (shapeType) - { - case TRIANGLE_SHAPE_PROXYTYPE: - { - btVector3* vertices = (btVector3*)shape; - ///calcNormal - penetrationVector = (vertices[1]-vertices[0]).cross(vertices[2]-vertices[0]); - penetrationVector.normalize(); - if (index) - penetrationVector *= btScalar(-1.); - break; - } - default: - { - -#if __ASSERT - spu_printf("spuGetNumPreferredPenetrationDirections() - Unsupported bound type: %d.\n", shapeType); -#endif // __ASSERT - } - } - -} - -#endif //_SPU_PREFERRED_PENETRATION_DIRECTIONS_H diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp deleted file mode 100644 index 5e1202c01..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp +++ /dev/null @@ -1,1160 +0,0 @@ -/* - Copyright (C) 2006, 2008 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - - -//#include "PfxContactBoxBox.h" - -#include -#include "../PlatformDefinitions.h" -#include "boxBoxDistance.h" - -static inline float sqr( float a ) -{ - return (a * a); -} - -enum BoxSepAxisType -{ - A_AXIS, B_AXIS, CROSS_AXIS -}; - -//------------------------------------------------------------------------------------------------- -// voronoiTol: bevels Voronoi planes slightly which helps when features are parallel. -//------------------------------------------------------------------------------------------------- - -static const float voronoiTol = -1.0e-5f; - -//------------------------------------------------------------------------------------------------- -// separating axis tests: gaps along each axis are computed, and the axis with the maximum -// gap is stored. cross product axes are normalized. -//------------------------------------------------------------------------------------------------- - -#define AaxisTest( dim, letter, first ) \ -{ \ - if ( first ) \ - { \ - maxGap = gap = gapsA.get##letter(); \ - if ( gap > distanceThreshold ) return gap; \ - axisType = A_AXIS; \ - faceDimA = dim; \ - axisA = identity.getCol##dim(); \ - } \ - else \ - { \ - gap = gapsA.get##letter(); \ - if ( gap > distanceThreshold ) return gap; \ - else if ( gap > maxGap ) \ - { \ - maxGap = gap; \ - axisType = A_AXIS; \ - faceDimA = dim; \ - axisA = identity.getCol##dim(); \ - } \ - } \ -} - - -#define BaxisTest( dim, letter ) \ -{ \ - gap = gapsB.get##letter(); \ - if ( gap > distanceThreshold ) return gap; \ - else if ( gap > maxGap ) \ - { \ - maxGap = gap; \ - axisType = B_AXIS; \ - faceDimB = dim; \ - axisB = identity.getCol##dim(); \ - } \ -} - -#define CrossAxisTest( dima, dimb, letterb ) \ -{ \ - const float lsqr_tolerance = 1.0e-30f; \ - float lsqr; \ - \ - lsqr = lsqrs.getCol##dima().get##letterb(); \ - \ - if ( lsqr > lsqr_tolerance ) \ - { \ - float l_recip = 1.0f / sqrtf( lsqr ); \ - gap = float(gapsAxB.getCol##dima().get##letterb()) * l_recip; \ - \ - if ( gap > distanceThreshold ) \ - { \ - return gap; \ - } \ - \ - if ( gap > maxGap ) \ - { \ - maxGap = gap; \ - axisType = CROSS_AXIS; \ - edgeDimA = dima; \ - edgeDimB = dimb; \ - axisA = cross(identity.getCol##dima(),matrixAB.getCol##dimb()) * l_recip; \ - } \ - } \ -} - -//------------------------------------------------------------------------------------------------- -// tests whether a vertex of box B and a face of box A are the closest features -//------------------------------------------------------------------------------------------------- - -inline -float -VertexBFaceATest( - bool & inVoronoi, - float & t0, - float & t1, - const vmVector3 & hA, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesB ) -{ - // compute a corner of box B in A's coordinate system - - vmVector3 corner = - vmVector3( faceOffsetAB + matrixAB.getCol0() * scalesB.getX() + matrixAB.getCol1() * scalesB.getY() ); - - // compute the parameters of the point on A, closest to this corner - - t0 = corner[0]; - t1 = corner[1]; - - if ( t0 > hA[0] ) - t0 = hA[0]; - else if ( t0 < -hA[0] ) - t0 = -hA[0]; - if ( t1 > hA[1] ) - t1 = hA[1]; - else if ( t1 < -hA[1] ) - t1 = -hA[1]; - - // do the Voronoi test: already know the point on B is in the Voronoi region of the - // point on A, check the reverse. - - vmVector3 facePointB = - vmVector3( mulPerElem( faceOffsetBA + matrixBA.getCol0() * t0 + matrixBA.getCol1() * t1 - scalesB, signsB ) ); - - inVoronoi = ( ( facePointB[0] >= voronoiTol * facePointB[2] ) && - ( facePointB[1] >= voronoiTol * facePointB[0] ) && - ( facePointB[2] >= voronoiTol * facePointB[1] ) ); - - return (sqr( corner[0] - t0 ) + sqr( corner[1] - t1 ) + sqr( corner[2] )); -} - -#define VertexBFaceA_SetNewMin() \ -{ \ - minDistSqr = distSqr; \ - localPointA.setX(t0); \ - localPointA.setY(t1); \ - localPointB.setX( scalesB.getX() ); \ - localPointB.setY( scalesB.getY() ); \ - featureA = F; \ - featureB = V; \ -} - -void -VertexBFaceATests( - bool & done, - float & minDistSqr, - vmPoint3 & localPointA, - vmPoint3 & localPointB, - FeatureType & featureA, - FeatureType & featureB, - const vmVector3 & hA, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesB, - bool first ) -{ - - float t0, t1; - float distSqr; - - distSqr = VertexBFaceATest( done, t0, t1, hA, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsB, scalesB ); - - if ( first ) { - VertexBFaceA_SetNewMin(); - } else { - if ( distSqr < minDistSqr ) { - VertexBFaceA_SetNewMin(); - } - } - - if ( done ) - return; - - signsB.setX( -signsB.getX() ); - scalesB.setX( -scalesB.getX() ); - - distSqr = VertexBFaceATest( done, t0, t1, hA, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsB, scalesB ); - - if ( distSqr < minDistSqr ) { - VertexBFaceA_SetNewMin(); - } - - if ( done ) - return; - - signsB.setY( -signsB.getY() ); - scalesB.setY( -scalesB.getY() ); - - distSqr = VertexBFaceATest( done, t0, t1, hA, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsB, scalesB ); - - if ( distSqr < minDistSqr ) { - VertexBFaceA_SetNewMin(); - } - - if ( done ) - return; - - signsB.setX( -signsB.getX() ); - scalesB.setX( -scalesB.getX() ); - - distSqr = VertexBFaceATest( done, t0, t1, hA, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsB, scalesB ); - - if ( distSqr < minDistSqr ) { - VertexBFaceA_SetNewMin(); - } -} - -//------------------------------------------------------------------------------------------------- -// VertexAFaceBTest: tests whether a vertex of box A and a face of box B are the closest features -//------------------------------------------------------------------------------------------------- - -inline -float -VertexAFaceBTest( - bool & inVoronoi, - float & t0, - float & t1, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) scalesA ) -{ - vmVector3 corner = - vmVector3( faceOffsetBA + matrixBA.getCol0() * scalesA.getX() + matrixBA.getCol1() * scalesA.getY() ); - - t0 = corner[0]; - t1 = corner[1]; - - if ( t0 > hB[0] ) - t0 = hB[0]; - else if ( t0 < -hB[0] ) - t0 = -hB[0]; - if ( t1 > hB[1] ) - t1 = hB[1]; - else if ( t1 < -hB[1] ) - t1 = -hB[1]; - - vmVector3 facePointA = - vmVector3( mulPerElem( faceOffsetAB + matrixAB.getCol0() * t0 + matrixAB.getCol1() * t1 - scalesA, signsA ) ); - - inVoronoi = ( ( facePointA[0] >= voronoiTol * facePointA[2] ) && - ( facePointA[1] >= voronoiTol * facePointA[0] ) && - ( facePointA[2] >= voronoiTol * facePointA[1] ) ); - - return (sqr( corner[0] - t0 ) + sqr( corner[1] - t1 ) + sqr( corner[2] )); -} - -#define VertexAFaceB_SetNewMin() \ -{ \ - minDistSqr = distSqr; \ - localPointB.setX(t0); \ - localPointB.setY(t1); \ - localPointA.setX( scalesA.getX() ); \ - localPointA.setY( scalesA.getY() ); \ - featureA = V; \ - featureB = F; \ -} - -void -VertexAFaceBTests( - bool & done, - float & minDistSqr, - vmPoint3 & localPointA, - vmPoint3 & localPointB, - FeatureType & featureA, - FeatureType & featureB, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) scalesA, - bool first ) -{ - float t0, t1; - float distSqr; - - distSqr = VertexAFaceBTest( done, t0, t1, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, scalesA ); - - if ( first ) { - VertexAFaceB_SetNewMin(); - } else { - if ( distSqr < minDistSqr ) { - VertexAFaceB_SetNewMin(); - } - } - - if ( done ) - return; - - signsA.setX( -signsA.getX() ); - scalesA.setX( -scalesA.getX() ); - - distSqr = VertexAFaceBTest( done, t0, t1, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, scalesA ); - - if ( distSqr < minDistSqr ) { - VertexAFaceB_SetNewMin(); - } - - if ( done ) - return; - - signsA.setY( -signsA.getY() ); - scalesA.setY( -scalesA.getY() ); - - distSqr = VertexAFaceBTest( done, t0, t1, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, scalesA ); - - if ( distSqr < minDistSqr ) { - VertexAFaceB_SetNewMin(); - } - - if ( done ) - return; - - signsA.setX( -signsA.getX() ); - scalesA.setX( -scalesA.getX() ); - - distSqr = VertexAFaceBTest( done, t0, t1, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, scalesA ); - - if ( distSqr < minDistSqr ) { - VertexAFaceB_SetNewMin(); - } -} - -//------------------------------------------------------------------------------------------------- -// CustomEdgeEdgeTest: -// -// tests whether a pair of edges are the closest features -// -// note on the shorthand: -// 'a' & 'b' refer to the edges. -// 'c' is the dimension of the axis that points from the face center to the edge Center -// 'd' is the dimension of the edge Direction -// the dimension of the face normal is 2 -//------------------------------------------------------------------------------------------------- - -#define CustomEdgeEdgeTest( ac, ac_letter, ad, ad_letter, bc, bc_letter, bd, bd_letter ) \ -{ \ - vmVector3 edgeOffsetAB; \ - vmVector3 edgeOffsetBA; \ - \ - edgeOffsetAB = faceOffsetAB + matrixAB.getCol##bc() * scalesB.get##bc_letter(); \ - edgeOffsetAB.set##ac_letter( edgeOffsetAB.get##ac_letter() - scalesA.get##ac_letter() ); \ - \ - edgeOffsetBA = faceOffsetBA + matrixBA.getCol##ac() * scalesA.get##ac_letter(); \ - edgeOffsetBA.set##bc_letter( edgeOffsetBA.get##bc_letter() - scalesB.get##bc_letter() ); \ - \ - float dirDot = matrixAB.getCol##bd().get##ad_letter(); \ - float denom = 1.0f - dirDot*dirDot; \ - float edgeOffsetAB_ad = edgeOffsetAB.get##ad_letter(); \ - float edgeOffsetBA_bd = edgeOffsetBA.get##bd_letter(); \ - \ - if ( denom == 0.0f ) \ - { \ - tA = 0.0f; \ - } \ - else \ - { \ - tA = ( edgeOffsetAB_ad + edgeOffsetBA_bd * dirDot ) / denom; \ - } \ - \ - if ( tA < -hA[ad] ) tA = -hA[ad]; \ - else if ( tA > hA[ad] ) tA = hA[ad]; \ - \ - tB = tA * dirDot + edgeOffsetBA_bd; \ - \ - if ( tB < -hB[bd] ) \ - { \ - tB = -hB[bd]; \ - tA = tB * dirDot + edgeOffsetAB_ad; \ - \ - if ( tA < -hA[ad] ) tA = -hA[ad]; \ - else if ( tA > hA[ad] ) tA = hA[ad]; \ - } \ - else if ( tB > hB[bd] ) \ - { \ - tB = hB[bd]; \ - tA = tB * dirDot + edgeOffsetAB_ad; \ - \ - if ( tA < -hA[ad] ) tA = -hA[ad]; \ - else if ( tA > hA[ad] ) tA = hA[ad]; \ - } \ - \ - vmVector3 edgeOffAB = vmVector3( mulPerElem( edgeOffsetAB + matrixAB.getCol##bd() * tB, signsA ) );\ - vmVector3 edgeOffBA = vmVector3( mulPerElem( edgeOffsetBA + matrixBA.getCol##ad() * tA, signsB ) );\ - \ - inVoronoi = ( edgeOffAB[ac] >= voronoiTol * edgeOffAB[2] ) && \ - ( edgeOffAB[2] >= voronoiTol * edgeOffAB[ac] ) && \ - ( edgeOffBA[bc] >= voronoiTol * edgeOffBA[2] ) && \ - ( edgeOffBA[2] >= voronoiTol * edgeOffBA[bc] ); \ - \ - edgeOffAB[ad] -= tA; \ - edgeOffBA[bd] -= tB; \ - \ - return dot(edgeOffAB,edgeOffAB); \ -} - -float -CustomEdgeEdgeTest_0101( - bool & inVoronoi, - float & tA, - float & tB, - const vmVector3 & hA, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesA, - PE_REF(vmVector3) scalesB ) -{ - CustomEdgeEdgeTest( 0, X, 1, Y, 0, X, 1, Y ); -} - -float -CustomEdgeEdgeTest_0110( - bool & inVoronoi, - float & tA, - float & tB, - const vmVector3 & hA, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesA, - PE_REF(vmVector3) scalesB ) -{ - CustomEdgeEdgeTest( 0, X, 1, Y, 1, Y, 0, X ); -} - -float -CustomEdgeEdgeTest_1001( - bool & inVoronoi, - float & tA, - float & tB, - const vmVector3 & hA, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesA, - PE_REF(vmVector3) scalesB ) -{ - CustomEdgeEdgeTest( 1, Y, 0, X, 0, X, 1, Y ); -} - -float -CustomEdgeEdgeTest_1010( - bool & inVoronoi, - float & tA, - float & tB, - const vmVector3 & hA, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesA, - PE_REF(vmVector3) scalesB ) -{ - CustomEdgeEdgeTest( 1, Y, 0, X, 1, Y, 0, X ); -} - -#define EdgeEdge_SetNewMin( ac_letter, ad_letter, bc_letter, bd_letter ) \ -{ \ - minDistSqr = distSqr; \ - localPointA.set##ac_letter(scalesA.get##ac_letter()); \ - localPointA.set##ad_letter(tA); \ - localPointB.set##bc_letter(scalesB.get##bc_letter()); \ - localPointB.set##bd_letter(tB); \ - otherFaceDimA = testOtherFaceDimA; \ - otherFaceDimB = testOtherFaceDimB; \ - featureA = E; \ - featureB = E; \ -} - -void -EdgeEdgeTests( - bool & done, - float & minDistSqr, - vmPoint3 & localPointA, - vmPoint3 & localPointB, - int & otherFaceDimA, - int & otherFaceDimB, - FeatureType & featureA, - FeatureType & featureB, - const vmVector3 & hA, - const vmVector3 & hB, - PE_REF(vmVector3) faceOffsetAB, - PE_REF(vmVector3) faceOffsetBA, - const vmMatrix3 & matrixAB, - const vmMatrix3 & matrixBA, - PE_REF(vmVector3) signsA, - PE_REF(vmVector3) signsB, - PE_REF(vmVector3) scalesA, - PE_REF(vmVector3) scalesB, - bool first ) -{ - - float distSqr; - float tA, tB; - - int testOtherFaceDimA, testOtherFaceDimB; - - testOtherFaceDimA = 0; - testOtherFaceDimB = 0; - - distSqr = CustomEdgeEdgeTest_0101( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( first ) { - EdgeEdge_SetNewMin( X, Y, X, Y ); - } else { - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, X, Y ); - } - } - - if ( done ) - return; - - signsA.setX( -signsA.getX() ); - scalesA.setX( -scalesA.getX() ); - - distSqr = CustomEdgeEdgeTest_0101( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, X, Y ); - } - - if ( done ) - return; - - signsB.setX( -signsB.getX() ); - scalesB.setX( -scalesB.getX() ); - - distSqr = CustomEdgeEdgeTest_0101( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, X, Y ); - } - - if ( done ) - return; - - signsA.setX( -signsA.getX() ); - scalesA.setX( -scalesA.getX() ); - - distSqr = CustomEdgeEdgeTest_0101( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, X, Y ); - } - - if ( done ) - return; - - testOtherFaceDimA = 1; - testOtherFaceDimB = 0; - signsB.setX( -signsB.getX() ); - scalesB.setX( -scalesB.getX() ); - - distSqr = CustomEdgeEdgeTest_1001( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, X, Y ); - } - - if ( done ) - return; - - signsA.setY( -signsA.getY() ); - scalesA.setY( -scalesA.getY() ); - - distSqr = CustomEdgeEdgeTest_1001( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, X, Y ); - } - - if ( done ) - return; - - signsB.setX( -signsB.getX() ); - scalesB.setX( -scalesB.getX() ); - - distSqr = CustomEdgeEdgeTest_1001( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, X, Y ); - } - - if ( done ) - return; - - signsA.setY( -signsA.getY() ); - scalesA.setY( -scalesA.getY() ); - - distSqr = CustomEdgeEdgeTest_1001( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, X, Y ); - } - - if ( done ) - return; - - testOtherFaceDimA = 0; - testOtherFaceDimB = 1; - signsB.setX( -signsB.getX() ); - scalesB.setX( -scalesB.getX() ); - - distSqr = CustomEdgeEdgeTest_0110( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, Y, X ); - } - - if ( done ) - return; - - signsA.setX( -signsA.getX() ); - scalesA.setX( -scalesA.getX() ); - - distSqr = CustomEdgeEdgeTest_0110( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, Y, X ); - } - - if ( done ) - return; - - signsB.setY( -signsB.getY() ); - scalesB.setY( -scalesB.getY() ); - - distSqr = CustomEdgeEdgeTest_0110( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, Y, X ); - } - - if ( done ) - return; - - signsA.setX( -signsA.getX() ); - scalesA.setX( -scalesA.getX() ); - - distSqr = CustomEdgeEdgeTest_0110( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( X, Y, Y, X ); - } - - if ( done ) - return; - - testOtherFaceDimA = 1; - testOtherFaceDimB = 1; - signsB.setY( -signsB.getY() ); - scalesB.setY( -scalesB.getY() ); - - distSqr = CustomEdgeEdgeTest_1010( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, Y, X ); - } - - if ( done ) - return; - - signsA.setY( -signsA.getY() ); - scalesA.setY( -scalesA.getY() ); - - distSqr = CustomEdgeEdgeTest_1010( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, Y, X ); - } - - if ( done ) - return; - - signsB.setY( -signsB.getY() ); - scalesB.setY( -scalesB.getY() ); - - distSqr = CustomEdgeEdgeTest_1010( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, Y, X ); - } - - if ( done ) - return; - - signsA.setY( -signsA.getY() ); - scalesA.setY( -scalesA.getY() ); - - distSqr = CustomEdgeEdgeTest_1010( done, tA, tB, hA, hB, faceOffsetAB, faceOffsetBA, - matrixAB, matrixBA, signsA, signsB, scalesA, scalesB ); - - if ( distSqr < minDistSqr ) { - EdgeEdge_SetNewMin( Y, X, Y, X ); - } -} - - -float -boxBoxDistance(vmVector3& normal, BoxPoint& boxPointA, BoxPoint& boxPointB, - PE_REF(Box) boxA, const vmTransform3 & transformA, PE_REF(Box) boxB, - const vmTransform3 & transformB, - float distanceThreshold) -{ - vmMatrix3 identity; - identity = vmMatrix3::identity(); - vmVector3 ident[3]; - ident[0] = identity.getCol0(); - ident[1] = identity.getCol1(); - ident[2] = identity.getCol2(); - - // get relative transformations - - vmTransform3 transformAB, transformBA; - vmMatrix3 matrixAB, matrixBA; - vmVector3 offsetAB, offsetBA; - - transformAB = orthoInverse(transformA) * transformB; - transformBA = orthoInverse(transformAB); - - matrixAB = transformAB.getUpper3x3(); - offsetAB = transformAB.getTranslation(); - matrixBA = transformBA.getUpper3x3(); - offsetBA = transformBA.getTranslation(); - - vmMatrix3 absMatrixAB = absPerElem(matrixAB); - vmMatrix3 absMatrixBA = absPerElem(matrixBA); - - // find separating axis with largest gap between projections - - BoxSepAxisType axisType; - vmVector3 axisA(0.0f), axisB(0.0f); - float gap, maxGap; - int faceDimA = 0, faceDimB = 0, edgeDimA = 0, edgeDimB = 0; - - // face axes - - vmVector3 gapsA = absPerElem(offsetAB) - boxA.mHalf - absMatrixAB * boxB.mHalf; - - AaxisTest(0,X,true); - AaxisTest(1,Y,false); - AaxisTest(2,Z,false); - - vmVector3 gapsB = absPerElem(offsetBA) - boxB.mHalf - absMatrixBA * boxA.mHalf; - - BaxisTest(0,X); - BaxisTest(1,Y); - BaxisTest(2,Z); - - // cross product axes - - // ŠOĎ‚Ş‚O‚Ě‚Ć‚«‚Ě‘ÎŤô - absMatrixAB += vmMatrix3(1.0e-5f); - absMatrixBA += vmMatrix3(1.0e-5f); - - vmMatrix3 lsqrs, projOffset, projAhalf, projBhalf; - - lsqrs.setCol0( mulPerElem( matrixBA.getCol2(), matrixBA.getCol2() ) + - mulPerElem( matrixBA.getCol1(), matrixBA.getCol1() ) ); - lsqrs.setCol1( mulPerElem( matrixBA.getCol2(), matrixBA.getCol2() ) + - mulPerElem( matrixBA.getCol0(), matrixBA.getCol0() ) ); - lsqrs.setCol2( mulPerElem( matrixBA.getCol1(), matrixBA.getCol1() ) + - mulPerElem( matrixBA.getCol0(), matrixBA.getCol0() ) ); - - projOffset.setCol0(matrixBA.getCol1() * offsetAB.getZ() - matrixBA.getCol2() * offsetAB.getY()); - projOffset.setCol1(matrixBA.getCol2() * offsetAB.getX() - matrixBA.getCol0() * offsetAB.getZ()); - projOffset.setCol2(matrixBA.getCol0() * offsetAB.getY() - matrixBA.getCol1() * offsetAB.getX()); - - projAhalf.setCol0(absMatrixBA.getCol1() * boxA.mHalf.getZ() + absMatrixBA.getCol2() * boxA.mHalf.getY()); - projAhalf.setCol1(absMatrixBA.getCol2() * boxA.mHalf.getX() + absMatrixBA.getCol0() * boxA.mHalf.getZ()); - projAhalf.setCol2(absMatrixBA.getCol0() * boxA.mHalf.getY() + absMatrixBA.getCol1() * boxA.mHalf.getX()); - - projBhalf.setCol0(absMatrixAB.getCol1() * boxB.mHalf.getZ() + absMatrixAB.getCol2() * boxB.mHalf.getY()); - projBhalf.setCol1(absMatrixAB.getCol2() * boxB.mHalf.getX() + absMatrixAB.getCol0() * boxB.mHalf.getZ()); - projBhalf.setCol2(absMatrixAB.getCol0() * boxB.mHalf.getY() + absMatrixAB.getCol1() * boxB.mHalf.getX()); - - vmMatrix3 gapsAxB = absPerElem(projOffset) - projAhalf - transpose(projBhalf); - - CrossAxisTest(0,0,X); - CrossAxisTest(0,1,Y); - CrossAxisTest(0,2,Z); - CrossAxisTest(1,0,X); - CrossAxisTest(1,1,Y); - CrossAxisTest(1,2,Z); - CrossAxisTest(2,0,X); - CrossAxisTest(2,1,Y); - CrossAxisTest(2,2,Z); - - // need to pick the face on each box whose normal best matches the separating axis. - // will transform vectors to be in the coordinate system of this face to simplify things later. - // for this, a permutation matrix can be used, which the next section computes. - - int dimA[3], dimB[3]; - - if ( axisType == A_AXIS ) { - if ( dot(axisA,offsetAB) < 0.0f ) - axisA = -axisA; - axisB = matrixBA * -axisA; - - vmVector3 absAxisB = vmVector3(absPerElem(axisB)); - - if ( ( absAxisB[0] > absAxisB[1] ) && ( absAxisB[0] > absAxisB[2] ) ) - faceDimB = 0; - else if ( absAxisB[1] > absAxisB[2] ) - faceDimB = 1; - else - faceDimB = 2; - } else if ( axisType == B_AXIS ) { - if ( dot(axisB,offsetBA) < 0.0f ) - axisB = -axisB; - axisA = matrixAB * -axisB; - - vmVector3 absAxisA = vmVector3(absPerElem(axisA)); - - if ( ( absAxisA[0] > absAxisA[1] ) && ( absAxisA[0] > absAxisA[2] ) ) - faceDimA = 0; - else if ( absAxisA[1] > absAxisA[2] ) - faceDimA = 1; - else - faceDimA = 2; - } - - if ( axisType == CROSS_AXIS ) { - if ( dot(axisA,offsetAB) < 0.0f ) - axisA = -axisA; - axisB = matrixBA * -axisA; - - vmVector3 absAxisA = vmVector3(absPerElem(axisA)); - vmVector3 absAxisB = vmVector3(absPerElem(axisB)); - - dimA[1] = edgeDimA; - dimB[1] = edgeDimB; - - if ( edgeDimA == 0 ) { - if ( absAxisA[1] > absAxisA[2] ) { - dimA[0] = 2; - dimA[2] = 1; - } else { - dimA[0] = 1; - dimA[2] = 2; - } - } else if ( edgeDimA == 1 ) { - if ( absAxisA[2] > absAxisA[0] ) { - dimA[0] = 0; - dimA[2] = 2; - } else { - dimA[0] = 2; - dimA[2] = 0; - } - } else { - if ( absAxisA[0] > absAxisA[1] ) { - dimA[0] = 1; - dimA[2] = 0; - } else { - dimA[0] = 0; - dimA[2] = 1; - } - } - - if ( edgeDimB == 0 ) { - if ( absAxisB[1] > absAxisB[2] ) { - dimB[0] = 2; - dimB[2] = 1; - } else { - dimB[0] = 1; - dimB[2] = 2; - } - } else if ( edgeDimB == 1 ) { - if ( absAxisB[2] > absAxisB[0] ) { - dimB[0] = 0; - dimB[2] = 2; - } else { - dimB[0] = 2; - dimB[2] = 0; - } - } else { - if ( absAxisB[0] > absAxisB[1] ) { - dimB[0] = 1; - dimB[2] = 0; - } else { - dimB[0] = 0; - dimB[2] = 1; - } - } - } else { - dimA[2] = faceDimA; - dimA[0] = (faceDimA+1)%3; - dimA[1] = (faceDimA+2)%3; - dimB[2] = faceDimB; - dimB[0] = (faceDimB+1)%3; - dimB[1] = (faceDimB+2)%3; - } - - vmMatrix3 aperm_col, bperm_col; - - aperm_col.setCol0(ident[dimA[0]]); - aperm_col.setCol1(ident[dimA[1]]); - aperm_col.setCol2(ident[dimA[2]]); - - bperm_col.setCol0(ident[dimB[0]]); - bperm_col.setCol1(ident[dimB[1]]); - bperm_col.setCol2(ident[dimB[2]]); - - vmMatrix3 aperm_row, bperm_row; - - aperm_row = transpose(aperm_col); - bperm_row = transpose(bperm_col); - - // permute all box parameters to be in the face coordinate systems - - vmMatrix3 matrixAB_perm = aperm_row * matrixAB * bperm_col; - vmMatrix3 matrixBA_perm = transpose(matrixAB_perm); - - vmVector3 offsetAB_perm, offsetBA_perm; - - offsetAB_perm = aperm_row * offsetAB; - offsetBA_perm = bperm_row * offsetBA; - - vmVector3 halfA_perm, halfB_perm; - - halfA_perm = aperm_row * boxA.mHalf; - halfB_perm = bperm_row * boxB.mHalf; - - // compute the vector between the centers of each face, in each face's coordinate frame - - vmVector3 signsA_perm, signsB_perm, scalesA_perm, scalesB_perm, faceOffsetAB_perm, faceOffsetBA_perm; - - signsA_perm = copySignPerElem(vmVector3(1.0f),aperm_row * axisA); - signsB_perm = copySignPerElem(vmVector3(1.0f),bperm_row * axisB); - scalesA_perm = mulPerElem( signsA_perm, halfA_perm ); - scalesB_perm = mulPerElem( signsB_perm, halfB_perm ); - - faceOffsetAB_perm = offsetAB_perm + matrixAB_perm.getCol2() * scalesB_perm.getZ(); - faceOffsetAB_perm.setZ( faceOffsetAB_perm.getZ() - scalesA_perm.getZ() ); - - faceOffsetBA_perm = offsetBA_perm + matrixBA_perm.getCol2() * scalesA_perm.getZ(); - faceOffsetBA_perm.setZ( faceOffsetBA_perm.getZ() - scalesB_perm.getZ() ); - - if ( maxGap < 0.0f ) { - // if boxes overlap, this will separate the faces for finding points of penetration. - - faceOffsetAB_perm -= aperm_row * axisA * maxGap * 1.01f; - faceOffsetBA_perm -= bperm_row * axisB * maxGap * 1.01f; - } - - // for each vertex/face or edge/edge pair of the two faces, find the closest points. - // - // these points each have an associated box feature (vertex, edge, or face). if each - // point is in the external Voronoi region of the other's feature, they are the - // closest points of the boxes, and the algorithm can exit. - // - // the feature pairs are arranged so that in the general case, the first test will - // succeed. degenerate cases (parallel faces) may require up to all tests in the - // worst case. - // - // if for some reason no case passes the Voronoi test, the features with the minimum - // distance are returned. - - vmPoint3 localPointA_perm, localPointB_perm; - float minDistSqr; - bool done; - - vmVector3 hA_perm( halfA_perm ), hB_perm( halfB_perm ); - - localPointA_perm.setZ( scalesA_perm.getZ() ); - localPointB_perm.setZ( scalesB_perm.getZ() ); - scalesA_perm.setZ(0.0f); - scalesB_perm.setZ(0.0f); - - int otherFaceDimA, otherFaceDimB; - FeatureType featureA, featureB; - - if ( axisType == CROSS_AXIS ) { - EdgeEdgeTests( done, minDistSqr, localPointA_perm, localPointB_perm, - otherFaceDimA, otherFaceDimB, featureA, featureB, - hA_perm, hB_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsA_perm, signsB_perm, - scalesA_perm, scalesB_perm, true ); - - if ( !done ) { - VertexBFaceATests( done, minDistSqr, localPointA_perm, localPointB_perm, - featureA, featureB, - hA_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsB_perm, scalesB_perm, false ); - - if ( !done ) { - VertexAFaceBTests( done, minDistSqr, localPointA_perm, localPointB_perm, - featureA, featureB, - hB_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsA_perm, scalesA_perm, false ); - } - } - } else if ( axisType == B_AXIS ) { - VertexAFaceBTests( done, minDistSqr, localPointA_perm, localPointB_perm, - featureA, featureB, - hB_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsA_perm, scalesA_perm, true ); - - if ( !done ) { - VertexBFaceATests( done, minDistSqr, localPointA_perm, localPointB_perm, - featureA, featureB, - hA_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsB_perm, scalesB_perm, false ); - - if ( !done ) { - EdgeEdgeTests( done, minDistSqr, localPointA_perm, localPointB_perm, - otherFaceDimA, otherFaceDimB, featureA, featureB, - hA_perm, hB_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsA_perm, signsB_perm, - scalesA_perm, scalesB_perm, false ); - } - } - } else { - VertexBFaceATests( done, minDistSqr, localPointA_perm, localPointB_perm, - featureA, featureB, - hA_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsB_perm, scalesB_perm, true ); - - if ( !done ) { - VertexAFaceBTests( done, minDistSqr, localPointA_perm, localPointB_perm, - featureA, featureB, - hB_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsA_perm, scalesA_perm, false ); - - if ( !done ) { - EdgeEdgeTests( done, minDistSqr, localPointA_perm, localPointB_perm, - otherFaceDimA, otherFaceDimB, featureA, featureB, - hA_perm, hB_perm, faceOffsetAB_perm, faceOffsetBA_perm, - matrixAB_perm, matrixBA_perm, signsA_perm, signsB_perm, - scalesA_perm, scalesB_perm, false ); - } - } - } - - // convert local points from face-local to box-local coordinate system - - - boxPointA.localPoint = vmPoint3( aperm_col * vmVector3( localPointA_perm )) ; - boxPointB.localPoint = vmPoint3( bperm_col * vmVector3( localPointB_perm )) ; - -#if 0 - // find which features of the boxes are involved. - // the only feature pairs which occur in this function are VF, FV, and EE, even though the - // closest points might actually lie on sub-features, as in a VF contact might be used for - // what's actually a VV contact. this means some feature pairs could possibly seem distinct - // from others, although their contact positions are the same. don't know yet whether this - // matters. - - int sA[3], sB[3]; - - sA[0] = boxPointA.localPoint.getX() > 0.0f; - sA[1] = boxPointA.localPoint.getY() > 0.0f; - sA[2] = boxPointA.localPoint.getZ() > 0.0f; - - sB[0] = boxPointB.localPoint.getX() > 0.0f; - sB[1] = boxPointB.localPoint.getY() > 0.0f; - sB[2] = boxPointB.localPoint.getZ() > 0.0f; - - if ( featureA == F ) { - boxPointA.setFaceFeature( dimA[2], sA[dimA[2]] ); - } else if ( featureA == E ) { - boxPointA.setEdgeFeature( dimA[2], sA[dimA[2]], dimA[otherFaceDimA], sA[dimA[otherFaceDimA]] ); - } else { - boxPointA.setVertexFeature( sA[0], sA[1], sA[2] ); - } - - if ( featureB == F ) { - boxPointB.setFaceFeature( dimB[2], sB[dimB[2]] ); - } else if ( featureB == E ) { - boxPointB.setEdgeFeature( dimB[2], sB[dimB[2]], dimB[otherFaceDimB], sB[dimB[otherFaceDimB]] ); - } else { - boxPointB.setVertexFeature( sB[0], sB[1], sB[2] ); - } -#endif - - normal = transformA * axisA; - - if ( maxGap < 0.0f ) { - return (maxGap); - } else { - return (sqrtf( minDistSqr )); - } -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h deleted file mode 100644 index 0d4957dea..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - Copyright (C) 2006, 2008 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - - -#ifndef __BOXBOXDISTANCE_H__ -#define __BOXBOXDISTANCE_H__ - - -#include "Box.h" - - -//--------------------------------------------------------------------------- -// boxBoxDistance: -// -// description: -// this computes info that can be used for the collision response of two boxes. when the boxes -// do not overlap, the points are set to the closest points of the boxes, and a positive -// distance between them is returned. if the boxes do overlap, a negative distance is returned -// and the points are set to two points that would touch after the boxes are translated apart. -// the contact normal gives the direction to repel or separate the boxes when they touch or -// overlap (it's being approximated here as one of the 15 "separating axis" directions). -// -// returns: -// positive or negative distance between two boxes. -// -// args: -// vmVector3& normal: set to a unit contact normal pointing from box A to box B. -// -// BoxPoint& boxPointA, BoxPoint& boxPointB: -// set to a closest point or point of penetration on each box. -// -// Box boxA, Box boxB: -// boxes, represented as 3 half-widths -// -// const vmTransform3& transformA, const vmTransform3& transformB: -// box transformations, in world coordinates -// -// float distanceThreshold: -// the algorithm will exit early if it finds that the boxes are more distant than this -// threshold, and not compute a contact normal or points. if this distance returned -// exceeds the threshold, all the other output data may not have been computed. by -// default, this is set to MAX_FLOAT so it will have no effect. -// -//--------------------------------------------------------------------------- - -float -boxBoxDistance(vmVector3& normal, BoxPoint& boxPointA, BoxPoint& boxPointB, - PE_REF(Box) boxA, const vmTransform3 & transformA, PE_REF(Box) boxB, - const vmTransform3 & transformB, - float distanceThreshold = FLT_MAX ); - -#endif /* __BOXBOXDISTANCE_H__ */ diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/readme.txt b/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/readme.txt deleted file mode 100644 index 5b4a90705..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Empty placeholder for future Libspe2 SPU task diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp deleted file mode 100644 index fe6195557..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp +++ /dev/null @@ -1,214 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, Copyright (c) 2007 Erwin Coumans - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - - -#include "SpuSampleTask.h" -#include "BulletDynamics/Dynamics/btRigidBody.h" -#include "../PlatformDefinitions.h" -#include "../SpuFakeDma.h" -#include "LinearMath/btMinMax.h" - -#ifdef __SPU__ -#include -#else -#include -#define spu_printf printf -#endif - -#define MAX_NUM_BODIES 8192 - -struct SampleTask_LocalStoreMemory -{ - ATTRIBUTE_ALIGNED16(char gLocalRigidBody [sizeof(btRigidBody)+16]); - ATTRIBUTE_ALIGNED16(void* gPointerArray[MAX_NUM_BODIES]); - -}; - - - - -//-- MAIN METHOD -void processSampleTask(void* userPtr, void* lsMemory) -{ - // BT_PROFILE("processSampleTask"); - - SampleTask_LocalStoreMemory* localMemory = (SampleTask_LocalStoreMemory*)lsMemory; - - SpuSampleTaskDesc* taskDescPtr = (SpuSampleTaskDesc*)userPtr; - SpuSampleTaskDesc& taskDesc = *taskDescPtr; - - switch (taskDesc.m_sampleCommand) - { - case CMD_SAMPLE_INTEGRATE_BODIES: - { - btTransform predictedTrans; - btCollisionObject** eaPtr = (btCollisionObject**)taskDesc.m_mainMemoryPtr; - - int batchSize = taskDesc.m_sampleValue; - if (batchSize>MAX_NUM_BODIES) - { - spu_printf("SPU Error: exceed number of bodies, see MAX_NUM_BODIES in SpuSampleTask.cpp\n"); - break; - } - int dmaArraySize = batchSize*sizeof(void*); - - uint64_t ppuArrayAddress = reinterpret_cast(eaPtr); - - // spu_printf("array location is at %llx, batchSize = %d, DMA size = %d\n",ppuArrayAddress,batchSize,dmaArraySize); - - if (dmaArraySize>=16) - { - cellDmaLargeGet((void*)&localMemory->gPointerArray[0], ppuArrayAddress , dmaArraySize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - } else - { - stallingUnalignedDmaSmallGet((void*)&localMemory->gPointerArray[0], ppuArrayAddress , dmaArraySize); - } - - - for ( int i=0;igLocalRigidBody[0]; - void* shortAdd = localMemory->gPointerArray[i]; - uint64_t ppuRigidBodyAddress = reinterpret_cast(shortAdd); - - // spu_printf("cellDmaGet at CMD_SAMPLE_INTEGRATE_BODIES from %llx to %llx\n",ppuRigidBodyAddress,localPtr); - - int dmaBodySize = sizeof(btRigidBody); - - cellDmaGet((void*)localPtr, ppuRigidBodyAddress , dmaBodySize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - - float timeStep = 1.f/60.f; - - btRigidBody* body = (btRigidBody*) localPtr;//btRigidBody::upcast(colObj); - if (body) - { - if (body->isActive() && (!body->isStaticOrKinematicObject())) - { - body->predictIntegratedTransform(timeStep, predictedTrans); - body->proceedToTransform( predictedTrans); - void* ptr = (void*)localPtr; - // spu_printf("cellDmaLargePut from %llx to LS %llx\n",ptr,ppuRigidBodyAddress); - - cellDmaLargePut(ptr, ppuRigidBodyAddress , dmaBodySize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - } - } - - } - break; - } - - - case CMD_SAMPLE_PREDICT_MOTION_BODIES: - { - btTransform predictedTrans; - btCollisionObject** eaPtr = (btCollisionObject**)taskDesc.m_mainMemoryPtr; - - int batchSize = taskDesc.m_sampleValue; - int dmaArraySize = batchSize*sizeof(void*); - - if (batchSize>MAX_NUM_BODIES) - { - spu_printf("SPU Error: exceed number of bodies, see MAX_NUM_BODIES in SpuSampleTask.cpp\n"); - break; - } - - uint64_t ppuArrayAddress = reinterpret_cast(eaPtr); - - // spu_printf("array location is at %llx, batchSize = %d, DMA size = %d\n",ppuArrayAddress,batchSize,dmaArraySize); - - if (dmaArraySize>=16) - { - cellDmaLargeGet((void*)&localMemory->gPointerArray[0], ppuArrayAddress , dmaArraySize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - } else - { - stallingUnalignedDmaSmallGet((void*)&localMemory->gPointerArray[0], ppuArrayAddress , dmaArraySize); - } - - - for ( int i=0;igLocalRigidBody[0]; - void* shortAdd = localMemory->gPointerArray[i]; - uint64_t ppuRigidBodyAddress = reinterpret_cast(shortAdd); - - // spu_printf("cellDmaGet at CMD_SAMPLE_INTEGRATE_BODIES from %llx to %llx\n",ppuRigidBodyAddress,localPtr); - - int dmaBodySize = sizeof(btRigidBody); - - cellDmaGet((void*)localPtr, ppuRigidBodyAddress , dmaBodySize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - - - float timeStep = 1.f/60.f; - - btRigidBody* body = (btRigidBody*) localPtr;//btRigidBody::upcast(colObj); - if (body) - { - if (!body->isStaticOrKinematicObject()) - { - if (body->isActive()) - { - body->integrateVelocities( timeStep); - //damping - body->applyDamping(timeStep); - - body->predictIntegratedTransform(timeStep,body->getInterpolationWorldTransform()); - - void* ptr = (void*)localPtr; - cellDmaLargePut(ptr, ppuRigidBodyAddress , dmaBodySize, DMA_TAG(1), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(1)); - } - } - } - - } - break; - } - - - - default: - { - - } - }; -} - - -#if defined(__CELLOS_LV2__) || defined (LIBSPE2) - -ATTRIBUTE_ALIGNED16(SampleTask_LocalStoreMemory gLocalStoreMemory); - -void* createSampleLocalStoreMemory() -{ - return &gLocalStoreMemory; -} -#else -void* createSampleLocalStoreMemory() -{ - return new SampleTask_LocalStoreMemory; -}; - -#endif diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h deleted file mode 100644 index c8ebdfd62..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, Copyright (c) 2007 Erwin Coumans - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef SPU_SAMPLE_TASK_H -#define SPU_SAMPLE_TASK_H - -#include "../PlatformDefinitions.h" -#include "LinearMath/btScalar.h" -#include "LinearMath/btVector3.h" -#include "LinearMath/btMatrix3x3.h" - -#include "LinearMath/btAlignedAllocator.h" - - -enum -{ - CMD_SAMPLE_INTEGRATE_BODIES = 1, - CMD_SAMPLE_PREDICT_MOTION_BODIES -}; - - - -ATTRIBUTE_ALIGNED16(struct) SpuSampleTaskDesc -{ - BT_DECLARE_ALIGNED_ALLOCATOR(); - - uint32_t m_sampleCommand; - uint32_t m_taskId; - - uint64_t m_mainMemoryPtr; - int m_sampleValue; - - -}; - - -void processSampleTask(void* userPtr, void* lsMemory); -void* createSampleLocalStoreMemory(); - - -#endif //SPU_SAMPLE_TASK_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/readme.txt b/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/readme.txt deleted file mode 100644 index 5b4a90705..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTask/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Empty placeholder for future Libspe2 SPU task diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTaskProcess.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTaskProcess.cpp deleted file mode 100644 index 11cb9e7c3..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTaskProcess.cpp +++ /dev/null @@ -1,222 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -//#define __CELLOS_LV2__ 1 - -#define USE_SAMPLE_PROCESS 1 -#ifdef USE_SAMPLE_PROCESS - - -#include "SpuSampleTaskProcess.h" -#include - -#ifdef __SPU__ - - - -void SampleThreadFunc(void* userPtr,void* lsMemory) -{ - //do nothing - printf("hello world\n"); -} - - -void* SamplelsMemoryFunc() -{ - //don't create local store memory, just return 0 - return 0; -} - - -#else - - -#include "btThreadSupportInterface.h" - -//# include "SPUAssert.h" -#include - - - -extern "C" { - extern char SPU_SAMPLE_ELF_SYMBOL[]; -} - - - - - -SpuSampleTaskProcess::SpuSampleTaskProcess(btThreadSupportInterface* threadInterface, int maxNumOutstandingTasks) -:m_threadInterface(threadInterface), -m_maxNumOutstandingTasks(maxNumOutstandingTasks) -{ - - m_taskBusy.resize(m_maxNumOutstandingTasks); - m_spuSampleTaskDesc.resize(m_maxNumOutstandingTasks); - - for (int i = 0; i < m_maxNumOutstandingTasks; i++) - { - m_taskBusy[i] = false; - } - m_numBusyTasks = 0; - m_currentTask = 0; - - m_initialized = false; - - m_threadInterface->startSPU(); - - -} - -SpuSampleTaskProcess::~SpuSampleTaskProcess() -{ - m_threadInterface->stopSPU(); - -} - - - -void SpuSampleTaskProcess::initialize() -{ -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("SpuSampleTaskProcess::initialize()\n"); -#endif //DEBUG_SPU_TASK_SCHEDULING - - for (int i = 0; i < m_maxNumOutstandingTasks; i++) - { - m_taskBusy[i] = false; - } - m_numBusyTasks = 0; - m_currentTask = 0; - m_initialized = true; - -} - - -void SpuSampleTaskProcess::issueTask(void* sampleMainMemPtr,int sampleValue,int sampleCommand) -{ - -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("SpuSampleTaskProcess::issueTask (m_currentTask= %d\)n", m_currentTask); -#endif //DEBUG_SPU_TASK_SCHEDULING - - m_taskBusy[m_currentTask] = true; - m_numBusyTasks++; - - SpuSampleTaskDesc& taskDesc = m_spuSampleTaskDesc[m_currentTask]; - { - // send task description in event message - // no error checking here... - // but, currently, event queue can be no larger than NUM_WORKUNIT_TASKS. - - taskDesc.m_mainMemoryPtr = reinterpret_cast(sampleMainMemPtr); - taskDesc.m_sampleValue = sampleValue; - taskDesc.m_sampleCommand = sampleCommand; - - //some bookkeeping to recognize finished tasks - taskDesc.m_taskId = m_currentTask; - } - - - m_threadInterface->sendRequest(1, (ppu_address_t) &taskDesc, m_currentTask); - - // if all tasks busy, wait for spu event to clear the task. - - if (m_numBusyTasks >= m_maxNumOutstandingTasks) - { - unsigned int taskId; - unsigned int outputSize; - - for (int i=0;iwaitForResponse(&taskId, &outputSize); - - //printf("PPU: after issue, received event: %u %d\n", taskId, outputSize); - - postProcess(taskId, outputSize); - - m_taskBusy[taskId] = false; - - m_numBusyTasks--; - } - - // find new task buffer - for (int i = 0; i < m_maxNumOutstandingTasks; i++) - { - if (!m_taskBusy[i]) - { - m_currentTask = i; - break; - } - } -} - - -///Optional PPU-size post processing for each task -void SpuSampleTaskProcess::postProcess(int taskId, int outputSize) -{ - -} - - -void SpuSampleTaskProcess::flush() -{ -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("\nSpuCollisionTaskProcess::flush()\n"); -#endif //DEBUG_SPU_TASK_SCHEDULING - - - // all tasks are issued, wait for all tasks to be complete - while(m_numBusyTasks > 0) - { -// Consolidating SPU code - unsigned int taskId; - unsigned int outputSize; - - for (int i=0;iwaitForResponse(&taskId, &outputSize); - } - - //printf("PPU: flushing, received event: %u %d\n", taskId, outputSize); - - postProcess(taskId, outputSize); - - m_taskBusy[taskId] = false; - - m_numBusyTasks--; - } - - -} - -#endif - - -#endif //USE_SAMPLE_PROCESS diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTaskProcess.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTaskProcess.h deleted file mode 100644 index 6173225ae..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSampleTaskProcess.h +++ /dev/null @@ -1,153 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_SPU_SAMPLE_TASK_PROCESS_H -#define BT_SPU_SAMPLE_TASK_PROCESS_H - -#include - - -#include "PlatformDefinitions.h" - -#include - -#include "LinearMath/btAlignedObjectArray.h" - - -#include "SpuSampleTask/SpuSampleTask.h" - - -//just add your commands here, try to keep them globally unique for debugging purposes -#define CMD_SAMPLE_TASK_COMMAND 10 - - - -/// SpuSampleTaskProcess handles SPU processing of collision pairs. -/// When PPU issues a task, it will look for completed task buffers -/// PPU will do postprocessing, dependent on workunit output (not likely) -class SpuSampleTaskProcess -{ - // track task buffers that are being used, and total busy tasks - btAlignedObjectArray m_taskBusy; - btAlignedObjectArraym_spuSampleTaskDesc; - - int m_numBusyTasks; - - // the current task and the current entry to insert a new work unit - int m_currentTask; - - bool m_initialized; - - void postProcess(int taskId, int outputSize); - - class btThreadSupportInterface* m_threadInterface; - - int m_maxNumOutstandingTasks; - - - -public: - SpuSampleTaskProcess(btThreadSupportInterface* threadInterface, int maxNumOutstandingTasks); - - ~SpuSampleTaskProcess(); - - ///call initialize in the beginning of the frame, before addCollisionPairToTask - void initialize(); - - void issueTask(void* sampleMainMemPtr,int sampleValue,int sampleCommand); - - ///call flush to submit potential outstanding work to SPUs and wait for all involved SPUs to be finished - void flush(); -}; - - -#if defined(USE_LIBSPE2) && defined(__SPU__) -////////////////////MAIN///////////////////////////// -#include "../SpuLibspe2Support.h" -#include -#include -#include - -void * SamplelsMemoryFunc(); -void SampleThreadFunc(void* userPtr,void* lsMemory); - -//#define DEBUG_LIBSPE2_MAINLOOP - -int main(unsigned long long speid, addr64 argp, addr64 envp) -{ - printf("SPU is up \n"); - - ATTRIBUTE_ALIGNED128(btSpuStatus status); - ATTRIBUTE_ALIGNED16( SpuSampleTaskDesc taskDesc ) ; - unsigned int received_message = Spu_Mailbox_Event_Nothing; - bool shutdown = false; - - cellDmaGet(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - status.m_status = Spu_Status_Free; - status.m_lsMemory.p = SamplelsMemoryFunc(); - - cellDmaLargePut(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - - while (!shutdown) - { - received_message = spu_read_in_mbox(); - - - - switch(received_message) - { - case Spu_Mailbox_Event_Shutdown: - shutdown = true; - break; - case Spu_Mailbox_Event_Task: - // refresh the status -#ifdef DEBUG_LIBSPE2_MAINLOOP - printf("SPU recieved Task \n"); -#endif //DEBUG_LIBSPE2_MAINLOOP - cellDmaGet(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - btAssert(status.m_status==Spu_Status_Occupied); - - cellDmaGet(&taskDesc, status.m_taskDesc.p, sizeof(SpuSampleTaskDesc), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - SampleThreadFunc((void*)&taskDesc, reinterpret_cast (taskDesc.m_mainMemoryPtr) ); - break; - case Spu_Mailbox_Event_Nothing: - default: - break; - } - - // set to status free and wait for next task - status.m_status = Spu_Status_Free; - cellDmaLargePut(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - - } - return 0; -} -////////////////////////////////////////////////////// -#endif - - - -#endif // BT_SPU_SAMPLE_TASK_PROCESS_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSync.h b/Engine/lib/bullet/src/BulletMultiThreaded/SpuSync.h deleted file mode 100644 index 4157b8f0d..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/SpuSync.h +++ /dev/null @@ -1,149 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2007 Starbreeze Studios - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -Written by: Marten Svanfeldt -*/ - -#ifndef BT_SPU_SYNC_H -#define BT_SPU_SYNC_H - - -#include "PlatformDefinitions.h" - - -#if defined(WIN32) - -#define WIN32_LEAN_AND_MEAN -#ifdef _XBOX -#include -#else -#include -#endif - -///The btSpinlock is a structure to allow multi-platform synchronization. This allows to port the SPU tasks to other platforms. -class btSpinlock -{ -public: - //typedef volatile LONG SpinVariable; - typedef CRITICAL_SECTION SpinVariable; - - btSpinlock (SpinVariable* var) - : spinVariable (var) - {} - - void Init () - { - //*spinVariable = 0; - InitializeCriticalSection(spinVariable); - } - - void Lock () - { - EnterCriticalSection(spinVariable); - } - - void Unlock () - { - LeaveCriticalSection(spinVariable); - } - -private: - SpinVariable* spinVariable; -}; - - -#elif defined (__CELLOS_LV2__) - -//#include -#include - -///The btSpinlock is a structure to allow multi-platform synchronization. This allows to port the SPU tasks to other platforms. -class btSpinlock -{ -public: - typedef CellSyncMutex SpinVariable; - - btSpinlock (SpinVariable* var) - : spinVariable (var) - {} - - void Init () - { -#ifndef __SPU__ - //*spinVariable = 1; - cellSyncMutexInitialize(spinVariable); -#endif - } - - - - void Lock () - { -#ifdef __SPU__ - // lock semaphore - /*while (cellAtomicTestAndDecr32(atomic_buf, (uint64_t)spinVariable) == 0) - { - - };*/ - cellSyncMutexLock((uint64_t)spinVariable); -#endif - } - - void Unlock () - { -#ifdef __SPU__ - //cellAtomicIncr32(atomic_buf, (uint64_t)spinVariable); - cellSyncMutexUnlock((uint64_t)spinVariable); -#endif - } - - -private: - SpinVariable* spinVariable; - ATTRIBUTE_ALIGNED128(uint32_t atomic_buf[32]); -}; - -#else -//create a dummy implementation (without any locking) useful for serial processing -class btSpinlock -{ -public: - typedef int SpinVariable; - - btSpinlock (SpinVariable* var) - : spinVariable (var) - {} - - void Init () - { - } - - void Lock () - { - } - - void Unlock () - { - } - -private: - SpinVariable* spinVariable; -}; - - -#endif - - -#endif //BT_SPU_SYNC_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/TrbDynBody.h b/Engine/lib/bullet/src/BulletMultiThreaded/TrbDynBody.h deleted file mode 100644 index a7f4bf1b3..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/TrbDynBody.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef BT_RB_DYN_BODY_H__ -#define BT_RB_DYN_BODY_H__ - -#include "vectormath/vmInclude.h" -using namespace Vectormath::Aos; - -#include "TrbStateVec.h" - -class CollObject; - -class TrbDynBody -{ -public: - TrbDynBody() - { - fMass = 0.0f; - fCollObject = NULL; - fElasticity = 0.2f; - fFriction = 0.8f; - } - - // Get methods - float getMass() const {return fMass;}; - float getElasticity() const {return fElasticity;} - float getFriction() const {return fFriction;} - CollObject* getCollObject() const {return fCollObject;} - const Matrix3 &getBodyInertia() const {return fIBody;} - const Matrix3 &getBodyInertiaInv() const {return fIBodyInv;} - float getMassInv() const {return fMassInv;} - - // Set methods - void setMass(float mass) {fMass=mass;fMassInv=mass>0.0f?1.0f/mass:0.0f;} - void setBodyInertia(const Matrix3 bodyInertia) {fIBody = bodyInertia;fIBodyInv = inverse(bodyInertia);} - void setElasticity(float elasticity) {fElasticity = elasticity;} - void setFriction(float friction) {fFriction = friction;} - void setCollObject(CollObject *collObj) {fCollObject = collObj;} - - void setBodyInertiaInv(const Matrix3 bodyInertiaInv) - { - fIBody = inverse(bodyInertiaInv); - fIBodyInv = bodyInertiaInv; - } - void setMassInv(float invMass) { - fMass= invMass>0.0f ? 1.0f/invMass :0.0f; - fMassInv=invMass; - } - - -private: - // Rigid Body constants - float fMass; // Rigid Body mass - float fMassInv; // Inverse of mass - Matrix3 fIBody; // Inertia matrix in body's coords - Matrix3 fIBodyInv; // Inertia matrix inverse in body's coords - float fElasticity; // Coefficient of restitution - float fFriction; // Coefficient of friction - -public: - CollObject* fCollObject; // Collision object corresponding the RB -} __attribute__ ((aligned(16))); - -#endif //BT_RB_DYN_BODY_H__ - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/TrbStateVec.h b/Engine/lib/bullet/src/BulletMultiThreaded/TrbStateVec.h deleted file mode 100644 index b6d895e12..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/TrbStateVec.h +++ /dev/null @@ -1,339 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef BT_TRBSTATEVEC_H__ -#define BT_TRBSTATEVEC_H__ - -#include -#ifdef PFX_USE_FREE_VECTORMATH -#include "vecmath/vmInclude.h" -#else -#include "vectormath/vmInclude.h" -#endif //PFX_USE_FREE_VECTORMATH - - -#include "PlatformDefinitions.h" - - -static inline vmVector3 read_Vector3(const float* p) -{ - vmVector3 v; - loadXYZ(v, p); - return v; -} - -static inline vmQuat read_Quat(const float* p) -{ - vmQuat vq; - loadXYZW(vq, p); - return vq; -} - -static inline void store_Vector3(const vmVector3 &src, float* p) -{ - vmVector3 v = src; - storeXYZ(v, p); -} - -static inline void store_Quat(const vmQuat &src, float* p) -{ - vmQuat vq = src; - storeXYZW(vq, p); -} - -// Motion Type -enum { - PfxMotionTypeFixed = 0, - PfxMotionTypeActive, - PfxMotionTypeKeyframe, - PfxMotionTypeOneWay, - PfxMotionTypeTrigger, - PfxMotionTypeCount -}; - -#define PFX_MOTION_MASK_DYNAMIC 0x0a // Active,OneWay -#define PFX_MOTION_MASK_STATIC 0x95 // Fixed,Keyframe,Trigger,Sleeping -#define PFX_MOTION_MASK_SLEEP 0x0e // Can sleep -#define PFX_MOTION_MASK_TYPE 0x7f - -// -// Rigid Body state -// - -#ifdef __CELLOS_LV2__ -ATTRIBUTE_ALIGNED128(class) TrbState -#else -ATTRIBUTE_ALIGNED16(class) TrbState -#endif - -{ -public: - TrbState() - { - setMotionType(PfxMotionTypeActive); - contactFilterSelf=contactFilterTarget=0xffffffff; - deleted = 0; - mSleeping = 0; - useSleep = 1; - trbBodyIdx=0; - mSleepCount=0; - useCcd = 0; - useContactCallback = 0; - useSleepCallback = 0; - linearDamping = 1.0f; - angularDamping = 0.99f; - } - - TrbState(const uint8_t m, const vmVector3& x, const vmQuat& q, const vmVector3& v, const vmVector3& omega ); - - uint16_t mSleepCount; - uint8_t mMotionType; - uint8_t deleted : 1; - uint8_t mSleeping : 1; - uint8_t useSleep : 1; - uint8_t useCcd : 1; - uint8_t useContactCallback : 1; - uint8_t useSleepCallback : 1; - - uint16_t trbBodyIdx; - uint32_t contactFilterSelf; - uint32_t contactFilterTarget; - - float center[3]; // AABB center(World) - float half[3]; // AABB half(World) - - float linearDamping; - float angularDamping; - - float deltaLinearVelocity[3]; - float deltaAngularVelocity[3]; - - float fX[3]; // position - float fQ[4]; // orientation - float fV[3]; // velocity - float fOmega[3]; // angular velocity - - inline void setZero(); // Zeroes out the elements - inline void setIdentity(); // Sets the rotation to identity and zeroes out the other elements - - bool isDeleted() const {return deleted==1;} - - uint16_t getRigidBodyId() const {return trbBodyIdx;} - void setRigidBodyId(uint16_t i) {trbBodyIdx = i;} - - - uint32_t getContactFilterSelf() const {return contactFilterSelf;} - void setContactFilterSelf(uint32_t filter) {contactFilterSelf = filter;} - - uint32_t getContactFilterTarget() const {return contactFilterTarget;} - void setContactFilterTarget(uint32_t filter) {contactFilterTarget = filter;} - - float getLinearDamping() const {return linearDamping;} - float getAngularDamping() const {return angularDamping;} - - void setLinearDamping(float damping) {linearDamping=damping;} - void setAngularDamping(float damping) {angularDamping=damping;} - - - uint8_t getMotionType() const {return mMotionType;} - void setMotionType(uint8_t t) {mMotionType = t;mSleeping=0;mSleepCount=0;} - - uint8_t getMotionMask() const {return (1< - -#include "SpuCollisionTaskProcess.h" - -#include "SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" - - - -///The number of threads should be equal to the number of available cores -///@todo: each worker should be linked to a single core, using SetThreadIdealProcessor. - -///Win32ThreadSupport helps to initialize/shutdown libspe2, start/stop SPU tasks and communication -///Setup and initialize SPU/CELL/Libspe2 -Win32ThreadSupport::Win32ThreadSupport(const Win32ThreadConstructionInfo & threadConstructionInfo) -{ - m_maxNumTasks = threadConstructionInfo.m_numThreads; - startThreads(threadConstructionInfo); -} - -///cleanup/shutdown Libspe2 -Win32ThreadSupport::~Win32ThreadSupport() -{ - stopSPU(); -} - - - - -#include - -DWORD WINAPI Thread_no_1( LPVOID lpParam ) -{ - - Win32ThreadSupport::btSpuStatus* status = (Win32ThreadSupport::btSpuStatus*)lpParam; - - - while (1) - { - WaitForSingleObject(status->m_eventStartHandle,INFINITE); - - void* userPtr = status->m_userPtr; - - if (userPtr) - { - btAssert(status->m_status); - status->m_userThreadFunc(userPtr,status->m_lsMemory); - status->m_status = 2; - SetEvent(status->m_eventCompletetHandle); - } else - { - //exit Thread - status->m_status = 3; - printf("Thread with taskId %i with handle %p exiting\n",status->m_taskId, status->m_threadHandle); - SetEvent(status->m_eventCompletetHandle); - break; - } - - } - - printf("Thread TERMINATED\n"); - return 0; - -} - -///send messages to SPUs -void Win32ThreadSupport::sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t taskId) -{ - /// gMidphaseSPU.sendRequest(CMD_GATHER_AND_PROCESS_PAIRLIST, (ppu_address_t) &taskDesc); - - ///we should spawn an SPU task here, and in 'waitForResponse' it should wait for response of the (one of) the first tasks that finished - - - - switch (uiCommand) - { - case CMD_GATHER_AND_PROCESS_PAIRLIST: - { - - -//#define SINGLE_THREADED 1 -#ifdef SINGLE_THREADED - - btSpuStatus& spuStatus = m_activeSpuStatus[0]; - spuStatus.m_userPtr=(void*)uiArgument0; - spuStatus.m_userThreadFunc(spuStatus.m_userPtr,spuStatus.m_lsMemory); - HANDLE handle =0; -#else - - - btSpuStatus& spuStatus = m_activeSpuStatus[taskId]; - btAssert(taskId>=0); - btAssert(int(taskId) 1); - spuStatus.m_status = 0; - - ///need to find an active spu - btAssert(last>=0); - -#else - last=0; - btSpuStatus& spuStatus = m_activeSpuStatus[last]; -#endif //SINGLE_THREADED - - - - *puiArgument0 = spuStatus.m_taskId; - *puiArgument1 = spuStatus.m_status; - - -} - - -///check for messages from SPUs -bool Win32ThreadSupport::isTaskCompleted(unsigned int *puiArgument0, unsigned int *puiArgument1, int timeOutInMilliseconds) -{ - ///We should wait for (one of) the first tasks to finish (or other SPU messages), and report its response - - ///A possible response can be 'yes, SPU handled it', or 'no, please do a PPU fallback' - - - btAssert(m_activeSpuStatus.size()); - - int last = -1; -#ifndef SINGLE_THREADED - DWORD res = WaitForMultipleObjects(m_completeHandles.size(), &m_completeHandles[0], FALSE, timeOutInMilliseconds); - - if ((res != STATUS_TIMEOUT) && (res != WAIT_FAILED)) - { - - btAssert(res != WAIT_FAILED); - last = res - WAIT_OBJECT_0; - - btSpuStatus& spuStatus = m_activeSpuStatus[last]; - btAssert(spuStatus.m_threadHandle); - btAssert(spuStatus.m_eventCompletetHandle); - - //WaitForSingleObject(spuStatus.m_eventCompletetHandle, INFINITE); - btAssert(spuStatus.m_status > 1); - spuStatus.m_status = 0; - - ///need to find an active spu - btAssert(last>=0); - - #else - last=0; - btSpuStatus& spuStatus = m_activeSpuStatus[last]; - #endif //SINGLE_THREADED - - - - *puiArgument0 = spuStatus.m_taskId; - *puiArgument1 = spuStatus.m_status; - - return true; - } - - return false; -} - - -void Win32ThreadSupport::startThreads(const Win32ThreadConstructionInfo& threadConstructionInfo) -{ - - m_activeSpuStatus.resize(threadConstructionInfo.m_numThreads); - m_completeHandles.resize(threadConstructionInfo.m_numThreads); - - m_maxNumTasks = threadConstructionInfo.m_numThreads; - - for (int i=0;i0) - { - WaitForSingleObject(spuStatus.m_eventCompletetHandle, INFINITE); - } - - - spuStatus.m_userPtr = 0; - SetEvent(spuStatus.m_eventStartHandle); - WaitForSingleObject(spuStatus.m_eventCompletetHandle, INFINITE); - - CloseHandle(spuStatus.m_eventCompletetHandle); - CloseHandle(spuStatus.m_eventStartHandle); - CloseHandle(spuStatus.m_threadHandle); - - } - - m_activeSpuStatus.clear(); - m_completeHandles.clear(); - -} - - - -class btWin32Barrier : public btBarrier -{ -private: - CRITICAL_SECTION mExternalCriticalSection; - CRITICAL_SECTION mLocalCriticalSection; - HANDLE mRunEvent,mNotifyEvent; - int mCounter,mEnableCounter; - int mMaxCount; - -public: - btWin32Barrier() - { - mCounter = 0; - mMaxCount = 1; - mEnableCounter = 0; - InitializeCriticalSection(&mExternalCriticalSection); - InitializeCriticalSection(&mLocalCriticalSection); - mRunEvent = CreateEvent(NULL,TRUE,FALSE,NULL); - mNotifyEvent = CreateEvent(NULL,TRUE,FALSE,NULL); - } - - virtual ~btWin32Barrier() - { - DeleteCriticalSection(&mExternalCriticalSection); - DeleteCriticalSection(&mLocalCriticalSection); - CloseHandle(mRunEvent); - CloseHandle(mNotifyEvent); - } - - void sync() - { - int eventId; - - EnterCriticalSection(&mExternalCriticalSection); - - //PFX_PRINTF("enter taskId %d count %d stage %d phase %d mEnableCounter %d\n",taskId,mCounter,debug&0xff,debug>>16,mEnableCounter); - - if(mEnableCounter > 0) { - ResetEvent(mNotifyEvent); - LeaveCriticalSection(&mExternalCriticalSection); - WaitForSingleObject(mNotifyEvent,INFINITE); - EnterCriticalSection(&mExternalCriticalSection); - } - - eventId = mCounter; - mCounter++; - - if(eventId == mMaxCount-1) { - SetEvent(mRunEvent); - - mEnableCounter = mCounter-1; - mCounter = 0; - } - else { - ResetEvent(mRunEvent); - LeaveCriticalSection(&mExternalCriticalSection); - WaitForSingleObject(mRunEvent,INFINITE); - EnterCriticalSection(&mExternalCriticalSection); - mEnableCounter--; - } - - if(mEnableCounter == 0) { - SetEvent(mNotifyEvent); - } - - //PFX_PRINTF("leave taskId %d count %d stage %d phase %d mEnableCounter %d\n",taskId,mCounter,debug&0xff,debug>>16,mEnableCounter); - - LeaveCriticalSection(&mExternalCriticalSection); - } - - virtual void setMaxCount(int n) {mMaxCount = n;} - virtual int getMaxCount() {return mMaxCount;} -}; - -class btWin32CriticalSection : public btCriticalSection -{ -private: - CRITICAL_SECTION mCriticalSection; - -public: - btWin32CriticalSection() - { - InitializeCriticalSection(&mCriticalSection); - } - - ~btWin32CriticalSection() - { - DeleteCriticalSection(&mCriticalSection); - } - - unsigned int getSharedParam(int i) - { - btAssert(i>=0&&i<31); - return mCommonBuff[i+1]; - } - - void setSharedParam(int i,unsigned int p) - { - btAssert(i>=0&&i<31); - mCommonBuff[i+1] = p; - } - - void lock() - { - EnterCriticalSection(&mCriticalSection); - mCommonBuff[0] = 1; - } - - void unlock() - { - mCommonBuff[0] = 0; - LeaveCriticalSection(&mCriticalSection); - } -}; - - -btBarrier* Win32ThreadSupport::createBarrier() -{ - unsigned char* mem = (unsigned char*)btAlignedAlloc(sizeof(btWin32Barrier),16); - btWin32Barrier* barrier = new(mem) btWin32Barrier(); - barrier->setMaxCount(getNumTasks()); - return barrier; -} - -btCriticalSection* Win32ThreadSupport::createCriticalSection() -{ - unsigned char* mem = (unsigned char*) btAlignedAlloc(sizeof(btWin32CriticalSection),16); - btWin32CriticalSection* cs = new(mem) btWin32CriticalSection(); - return cs; -} - -void Win32ThreadSupport::deleteBarrier(btBarrier* barrier) -{ - barrier->~btBarrier(); - btAlignedFree(barrier); -} - -void Win32ThreadSupport::deleteCriticalSection(btCriticalSection* criticalSection) -{ - criticalSection->~btCriticalSection(); - btAlignedFree(criticalSection); -} - - -#endif //USE_WIN32_THREADING - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/Win32ThreadSupport.h b/Engine/lib/bullet/src/BulletMultiThreaded/Win32ThreadSupport.h deleted file mode 100644 index f688e6c85..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/Win32ThreadSupport.h +++ /dev/null @@ -1,141 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#include "LinearMath/btScalar.h" -#include "PlatformDefinitions.h" - -#ifdef USE_WIN32_THREADING //platform specific defines are defined in PlatformDefinitions.h - -#ifndef BT_WIN32_THREAD_SUPPORT_H -#define BT_WIN32_THREAD_SUPPORT_H - -#include "LinearMath/btAlignedObjectArray.h" - -#include "btThreadSupportInterface.h" - - -typedef void (*Win32ThreadFunc)(void* userPtr,void* lsMemory); -typedef void* (*Win32lsMemorySetupFunc)(); - - -///Win32ThreadSupport helps to initialize/shutdown libspe2, start/stop SPU tasks and communication -class Win32ThreadSupport : public btThreadSupportInterface -{ -public: - ///placeholder, until libspe2 support is there - struct btSpuStatus - { - uint32_t m_taskId; - uint32_t m_commandId; - uint32_t m_status; - - Win32ThreadFunc m_userThreadFunc; - void* m_userPtr; //for taskDesc etc - void* m_lsMemory; //initialized using Win32LocalStoreMemorySetupFunc - - void* m_threadHandle; //this one is calling 'Win32ThreadFunc' - - void* m_eventStartHandle; - char m_eventStartHandleName[32]; - - void* m_eventCompletetHandle; - char m_eventCompletetHandleName[32]; - - - }; -private: - - btAlignedObjectArray m_activeSpuStatus; - btAlignedObjectArray m_completeHandles; - - int m_maxNumTasks; -public: - ///Setup and initialize SPU/CELL/Libspe2 - - struct Win32ThreadConstructionInfo - { - Win32ThreadConstructionInfo(const char* uniqueName, - Win32ThreadFunc userThreadFunc, - Win32lsMemorySetupFunc lsMemoryFunc, - int numThreads=1, - int threadStackSize=65535 - ) - :m_uniqueName(uniqueName), - m_userThreadFunc(userThreadFunc), - m_lsMemoryFunc(lsMemoryFunc), - m_numThreads(numThreads), - m_threadStackSize(threadStackSize) - { - - } - - const char* m_uniqueName; - Win32ThreadFunc m_userThreadFunc; - Win32lsMemorySetupFunc m_lsMemoryFunc; - int m_numThreads; - int m_threadStackSize; - - }; - - - - Win32ThreadSupport(const Win32ThreadConstructionInfo& threadConstructionInfo); - -///cleanup/shutdown Libspe2 - virtual ~Win32ThreadSupport(); - - void startThreads(const Win32ThreadConstructionInfo& threadInfo); - - -///send messages to SPUs - virtual void sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t uiArgument1); - -///check for messages from SPUs - virtual void waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1); - - virtual bool isTaskCompleted(unsigned int *puiArgument0, unsigned int *puiArgument1, int timeOutInMilliseconds); - -///start the spus (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) - virtual void startSPU(); - -///tell the task scheduler we are done with the SPU tasks - virtual void stopSPU(); - - virtual void setNumTasks(int numTasks) - { - m_maxNumTasks = numTasks; - } - - virtual int getNumTasks() const - { - return m_maxNumTasks; - } - - virtual void* getThreadLocalMemory(int taskId) - { - return m_activeSpuStatus[taskId].m_lsMemory; - } - virtual btBarrier* createBarrier(); - - virtual btCriticalSection* createCriticalSection(); - - virtual void deleteBarrier(btBarrier* barrier); - - virtual void deleteCriticalSection(btCriticalSection* criticalSection); -}; - -#endif //BT_WIN32_THREAD_SUPPORT_H - -#endif //USE_WIN32_THREADING diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp b/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp deleted file mode 100644 index e1d0219d5..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp +++ /dev/null @@ -1,590 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org -Copyright (C) 2006, 2009 Sony Computer Entertainment Inc. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -///The 3 following lines include the CPU implementation of the kernels, keep them in this order. -#include "BulletMultiThreaded/btGpuDefines.h" -#include "BulletMultiThreaded/btGpuUtilsSharedDefs.h" -#include "BulletMultiThreaded/btGpuUtilsSharedCode.h" - - - -#include "LinearMath/btAlignedAllocator.h" -#include "LinearMath/btQuickprof.h" -#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" - - - -#include "btGpuDefines.h" -#include "btGpuUtilsSharedDefs.h" - -#include "btGpu3DGridBroadphaseSharedDefs.h" - -#include "btGpu3DGridBroadphase.h" -#include //for memset - - -#include - - - -static bt3DGridBroadphaseParams s3DGridBroadphaseParams; - - - -btGpu3DGridBroadphase::btGpu3DGridBroadphase( const btVector3& worldAabbMin,const btVector3& worldAabbMax, - int gridSizeX, int gridSizeY, int gridSizeZ, - int maxSmallProxies, int maxLargeProxies, int maxPairsPerBody, - int maxBodiesPerCell, - btScalar cellFactorAABB) : - btSimpleBroadphase(maxSmallProxies, -// new (btAlignedAlloc(sizeof(btSortedOverlappingPairCache),16)) btSortedOverlappingPairCache), - new (btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16)) btHashedOverlappingPairCache), - m_bInitialized(false), - m_numBodies(0) -{ - _initialize(worldAabbMin, worldAabbMax, gridSizeX, gridSizeY, gridSizeZ, - maxSmallProxies, maxLargeProxies, maxPairsPerBody, - maxBodiesPerCell, cellFactorAABB); -} - - - -btGpu3DGridBroadphase::btGpu3DGridBroadphase( btOverlappingPairCache* overlappingPairCache, - const btVector3& worldAabbMin,const btVector3& worldAabbMax, - int gridSizeX, int gridSizeY, int gridSizeZ, - int maxSmallProxies, int maxLargeProxies, int maxPairsPerBody, - int maxBodiesPerCell, - btScalar cellFactorAABB) : - btSimpleBroadphase(maxSmallProxies, overlappingPairCache), - m_bInitialized(false), - m_numBodies(0) -{ - _initialize(worldAabbMin, worldAabbMax, gridSizeX, gridSizeY, gridSizeZ, - maxSmallProxies, maxLargeProxies, maxPairsPerBody, - maxBodiesPerCell, cellFactorAABB); -} - - - -btGpu3DGridBroadphase::~btGpu3DGridBroadphase() -{ - //btSimpleBroadphase will free memory of btSortedOverlappingPairCache, because m_ownsPairCache - btAssert(m_bInitialized); - _finalize(); -} - - - -void btGpu3DGridBroadphase::_initialize( const btVector3& worldAabbMin,const btVector3& worldAabbMax, - int gridSizeX, int gridSizeY, int gridSizeZ, - int maxSmallProxies, int maxLargeProxies, int maxPairsPerBody, - int maxBodiesPerCell, - btScalar cellFactorAABB) -{ - // set various paramerers - m_ownsPairCache = true; - m_params.m_gridSizeX = gridSizeX; - m_params.m_gridSizeY = gridSizeY; - m_params.m_gridSizeZ = gridSizeZ; - m_params.m_numCells = m_params.m_gridSizeX * m_params.m_gridSizeY * m_params.m_gridSizeZ; - btVector3 w_org = worldAabbMin; - m_params.m_worldOriginX = w_org.getX(); - m_params.m_worldOriginY = w_org.getY(); - m_params.m_worldOriginZ = w_org.getZ(); - btVector3 w_size = worldAabbMax - worldAabbMin; - m_params.m_cellSizeX = w_size.getX() / m_params.m_gridSizeX; - m_params.m_cellSizeY = w_size.getY() / m_params.m_gridSizeY; - m_params.m_cellSizeZ = w_size.getZ() / m_params.m_gridSizeZ; - m_maxRadius = btMin(btMin(m_params.m_cellSizeX, m_params.m_cellSizeY), m_params.m_cellSizeZ); - m_maxRadius *= btScalar(0.5f); - m_params.m_numBodies = m_numBodies; - m_params.m_maxBodiesPerCell = maxBodiesPerCell; - - m_numLargeHandles = 0; - m_maxLargeHandles = maxLargeProxies; - - m_maxPairsPerBody = maxPairsPerBody; - - m_cellFactorAABB = cellFactorAABB; - - m_LastLargeHandleIndex = -1; - - btAssert(!m_bInitialized); - // allocate host storage - m_hBodiesHash = new unsigned int[m_maxHandles * 2]; - memset(m_hBodiesHash, 0x00, m_maxHandles*2*sizeof(unsigned int)); - - m_hCellStart = new unsigned int[m_params.m_numCells]; - memset(m_hCellStart, 0x00, m_params.m_numCells * sizeof(unsigned int)); - - m_hPairBuffStartCurr = new unsigned int[m_maxHandles * 2 + 2]; - // --------------- for now, init with m_maxPairsPerBody for each body - m_hPairBuffStartCurr[0] = 0; - m_hPairBuffStartCurr[1] = 0; - for(int i = 1; i <= m_maxHandles; i++) - { - m_hPairBuffStartCurr[i * 2] = m_hPairBuffStartCurr[(i-1) * 2] + m_maxPairsPerBody; - m_hPairBuffStartCurr[i * 2 + 1] = 0; - } - //---------------- - unsigned int numAABB = m_maxHandles + m_maxLargeHandles; - m_hAABB = new bt3DGrid3F1U[numAABB * 2]; // AABB Min & Max - - m_hPairBuff = new unsigned int[m_maxHandles * m_maxPairsPerBody]; - memset(m_hPairBuff, 0x00, m_maxHandles * m_maxPairsPerBody * sizeof(unsigned int)); // needed? - - m_hPairScan = new unsigned int[m_maxHandles + 1]; - - m_hPairOut = new unsigned int[m_maxHandles * m_maxPairsPerBody]; - -// large proxies - - // allocate handles buffer and put all handles on free list - m_pLargeHandlesRawPtr = btAlignedAlloc(sizeof(btSimpleBroadphaseProxy) * m_maxLargeHandles, 16); - m_pLargeHandles = new(m_pLargeHandlesRawPtr) btSimpleBroadphaseProxy[m_maxLargeHandles]; - m_firstFreeLargeHandle = 0; - { - for (int i = m_firstFreeLargeHandle; i < m_maxLargeHandles; i++) - { - m_pLargeHandles[i].SetNextFree(i + 1); - m_pLargeHandles[i].m_uniqueId = m_maxHandles+2+i; - } - m_pLargeHandles[m_maxLargeHandles - 1].SetNextFree(0); - } - -// debug data - m_numPairsAdded = 0; - m_numOverflows = 0; - - m_bInitialized = true; -} - - - -void btGpu3DGridBroadphase::_finalize() -{ - btAssert(m_bInitialized); - delete [] m_hBodiesHash; - delete [] m_hCellStart; - delete [] m_hPairBuffStartCurr; - delete [] m_hAABB; - delete [] m_hPairBuff; - delete [] m_hPairScan; - delete [] m_hPairOut; - btAlignedFree(m_pLargeHandlesRawPtr); - m_bInitialized = false; -} - - - -void btGpu3DGridBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher) -{ - if(m_numHandles <= 0) - { - BT_PROFILE("addLarge2LargePairsToCache"); - addLarge2LargePairsToCache(dispatcher); - return; - } - // update constants - setParameters(&m_params); - // prepare AABB array - prepareAABB(); - // calculate hash - calcHashAABB(); - // sort bodies based on hash - sortHash(); - // find start of each cell - findCellStart(); - // findOverlappingPairs (small/small) - findOverlappingPairs(); - // findOverlappingPairs (small/large) - findPairsLarge(); - // add pairs to CPU cache - computePairCacheChanges(); - scanOverlappingPairBuff(); - squeezeOverlappingPairBuff(); - addPairsToCache(dispatcher); - // find and add large/large pairs to CPU cache - addLarge2LargePairsToCache(dispatcher); - return; -} - - - -void btGpu3DGridBroadphase::addPairsToCache(btDispatcher* dispatcher) -{ - m_numPairsAdded = 0; - m_numPairsRemoved = 0; - for(int i = 0; i < m_numHandles; i++) - { - unsigned int num = m_hPairScan[i+1] - m_hPairScan[i]; - if(!num) - { - continue; - } - unsigned int* pInp = m_hPairOut + m_hPairScan[i]; - unsigned int index0 = m_hAABB[i * 2].uw; - btSimpleBroadphaseProxy* proxy0 = &m_pHandles[index0]; - for(unsigned int j = 0; j < num; j++) - { - unsigned int indx1_s = pInp[j]; - unsigned int index1 = indx1_s & (~BT_3DGRID_PAIR_ANY_FLG); - btSimpleBroadphaseProxy* proxy1; - if(index1 < (unsigned int)m_maxHandles) - { - proxy1 = &m_pHandles[index1]; - } - else - { - index1 -= m_maxHandles; - btAssert((index1 >= 0) && (index1 < (unsigned int)m_maxLargeHandles)); - proxy1 = &m_pLargeHandles[index1]; - } - if(indx1_s & BT_3DGRID_PAIR_NEW_FLG) - { - m_pairCache->addOverlappingPair(proxy0,proxy1); - m_numPairsAdded++; - } - else - { - m_pairCache->removeOverlappingPair(proxy0,proxy1,dispatcher); - m_numPairsRemoved++; - } - } - } -} - - - -btBroadphaseProxy* btGpu3DGridBroadphase::createProxy( const btVector3& aabbMin, const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy) -{ - btBroadphaseProxy* proxy; - bool bIsLarge = isLargeProxy(aabbMin, aabbMax); - if(bIsLarge) - { - if (m_numLargeHandles >= m_maxLargeHandles) - { - ///you have to increase the cell size, so 'large' proxies become 'small' proxies (fitting a cell) - btAssert(0); - return 0; //should never happen, but don't let the game crash ;-) - } - btAssert((aabbMin[0]<= aabbMax[0]) && (aabbMin[1]<= aabbMax[1]) && (aabbMin[2]<= aabbMax[2])); - int newHandleIndex = allocLargeHandle(); - proxy = new (&m_pLargeHandles[newHandleIndex])btSimpleBroadphaseProxy(aabbMin,aabbMax,shapeType,userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy); - } - else - { - proxy = btSimpleBroadphase::createProxy(aabbMin, aabbMax, shapeType, userPtr, collisionFilterGroup, collisionFilterMask, dispatcher, multiSapProxy); - } - return proxy; -} - - - -void btGpu3DGridBroadphase::destroyProxy(btBroadphaseProxy* proxy, btDispatcher* dispatcher) -{ - bool bIsLarge = isLargeProxy(proxy); - if(bIsLarge) - { - - btSimpleBroadphaseProxy* proxy0 = static_cast(proxy); - freeLargeHandle(proxy0); - m_pairCache->removeOverlappingPairsContainingProxy(proxy,dispatcher); - } - else - { - btSimpleBroadphase::destroyProxy(proxy, dispatcher); - } - return; -} - - - -void btGpu3DGridBroadphase::resetPool(btDispatcher* dispatcher) -{ - m_hPairBuffStartCurr[0] = 0; - m_hPairBuffStartCurr[1] = 0; - for(int i = 1; i <= m_maxHandles; i++) - { - m_hPairBuffStartCurr[i * 2] = m_hPairBuffStartCurr[(i-1) * 2] + m_maxPairsPerBody; - m_hPairBuffStartCurr[i * 2 + 1] = 0; - } -} - - - -bool btGpu3DGridBroadphase::isLargeProxy(const btVector3& aabbMin, const btVector3& aabbMax) -{ - btVector3 diag = aabbMax - aabbMin; - - ///use the bounding sphere radius of this bounding box, to include rotation - btScalar radius = diag.length() * btScalar(0.5f); - radius *= m_cellFactorAABB; // user-defined factor - - return (radius > m_maxRadius); -} - - - -bool btGpu3DGridBroadphase::isLargeProxy(btBroadphaseProxy* proxy) -{ - return (proxy->getUid() >= (m_maxHandles+2)); -} - - - -void btGpu3DGridBroadphase::addLarge2LargePairsToCache(btDispatcher* dispatcher) -{ - int i,j; - if (m_numLargeHandles <= 0) - { - return; - } - int new_largest_index = -1; - for(i = 0; i <= m_LastLargeHandleIndex; i++) - { - btSimpleBroadphaseProxy* proxy0 = &m_pLargeHandles[i]; - if(!proxy0->m_clientObject) - { - continue; - } - new_largest_index = i; - for(j = i + 1; j <= m_LastLargeHandleIndex; j++) - { - btSimpleBroadphaseProxy* proxy1 = &m_pLargeHandles[j]; - if(!proxy1->m_clientObject) - { - continue; - } - btAssert(proxy0 != proxy1); - btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0); - btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1); - if(aabbOverlap(p0,p1)) - { - if (!m_pairCache->findPair(proxy0,proxy1)) - { - m_pairCache->addOverlappingPair(proxy0,proxy1); - } - } - else - { - if(m_pairCache->findPair(proxy0,proxy1)) - { - m_pairCache->removeOverlappingPair(proxy0,proxy1,dispatcher); - } - } - } - } - m_LastLargeHandleIndex = new_largest_index; - return; -} - - - -void btGpu3DGridBroadphase::rayTest(const btVector3& rayFrom,const btVector3& rayTo, btBroadphaseRayCallback& rayCallback,const btVector3& aabbMin,const btVector3& aabbMax) -{ - btSimpleBroadphase::rayTest(rayFrom, rayTo, rayCallback); - for (int i=0; i <= m_LastLargeHandleIndex; i++) - { - btSimpleBroadphaseProxy* proxy = &m_pLargeHandles[i]; - if(!proxy->m_clientObject) - { - continue; - } - rayCallback.process(proxy); - } -} - - - -// -// overrides for CPU version -// - - - -void btGpu3DGridBroadphase::prepareAABB() -{ - BT_PROFILE("prepareAABB"); - bt3DGrid3F1U* pBB = m_hAABB; - int i; - int new_largest_index = -1; - unsigned int num_small = 0; - for(i = 0; i <= m_LastHandleIndex; i++) - { - btSimpleBroadphaseProxy* proxy0 = &m_pHandles[i]; - if(!proxy0->m_clientObject) - { - continue; - } - new_largest_index = i; - pBB->fx = proxy0->m_aabbMin.getX(); - pBB->fy = proxy0->m_aabbMin.getY(); - pBB->fz = proxy0->m_aabbMin.getZ(); - pBB->uw = i; - pBB++; - pBB->fx = proxy0->m_aabbMax.getX(); - pBB->fy = proxy0->m_aabbMax.getY(); - pBB->fz = proxy0->m_aabbMax.getZ(); - pBB->uw = num_small; - pBB++; - num_small++; - } - m_LastHandleIndex = new_largest_index; - new_largest_index = -1; - unsigned int num_large = 0; - for(i = 0; i <= m_LastLargeHandleIndex; i++) - { - btSimpleBroadphaseProxy* proxy0 = &m_pLargeHandles[i]; - if(!proxy0->m_clientObject) - { - continue; - } - new_largest_index = i; - pBB->fx = proxy0->m_aabbMin.getX(); - pBB->fy = proxy0->m_aabbMin.getY(); - pBB->fz = proxy0->m_aabbMin.getZ(); - pBB->uw = i + m_maxHandles; - pBB++; - pBB->fx = proxy0->m_aabbMax.getX(); - pBB->fy = proxy0->m_aabbMax.getY(); - pBB->fz = proxy0->m_aabbMax.getZ(); - pBB->uw = num_large + m_maxHandles; - pBB++; - num_large++; - } - m_LastLargeHandleIndex = new_largest_index; - // paranoid checks - btAssert(num_small == m_numHandles); - btAssert(num_large == m_numLargeHandles); - return; -} - - - -void btGpu3DGridBroadphase::setParameters(bt3DGridBroadphaseParams* hostParams) -{ - s3DGridBroadphaseParams = *hostParams; - return; -} - - - -void btGpu3DGridBroadphase::calcHashAABB() -{ - BT_PROFILE("bt3DGrid_calcHashAABB"); - btGpu_calcHashAABB(m_hAABB, m_hBodiesHash, m_numHandles); - return; -} - - - -void btGpu3DGridBroadphase::sortHash() -{ - class bt3DGridHashKey - { - public: - unsigned int hash; - unsigned int index; - void quickSort(bt3DGridHashKey* pData, int lo, int hi) - { - int i=lo, j=hi; - bt3DGridHashKey x = pData[(lo+hi)/2]; - do - { - while(pData[i].hash > x.hash) i++; - while(x.hash > pData[j].hash) j--; - if(i <= j) - { - bt3DGridHashKey t = pData[i]; - pData[i] = pData[j]; - pData[j] = t; - i++; j--; - } - } while(i <= j); - if(lo < j) pData->quickSort(pData, lo, j); - if(i < hi) pData->quickSort(pData, i, hi); - } - }; - BT_PROFILE("bt3DGrid_sortHash"); - bt3DGridHashKey* pHash = (bt3DGridHashKey*)m_hBodiesHash; - pHash->quickSort(pHash, 0, m_numHandles - 1); - return; -} - - - -void btGpu3DGridBroadphase::findCellStart() -{ - BT_PROFILE("bt3DGrid_findCellStart"); - btGpu_findCellStart(m_hBodiesHash, m_hCellStart, m_numHandles, m_params.m_numCells); - return; -} - - - -void btGpu3DGridBroadphase::findOverlappingPairs() -{ - BT_PROFILE("bt3DGrid_findOverlappingPairs"); - btGpu_findOverlappingPairs(m_hAABB, m_hBodiesHash, m_hCellStart, m_hPairBuff, m_hPairBuffStartCurr, m_numHandles); - return; -} - - - -void btGpu3DGridBroadphase::findPairsLarge() -{ - BT_PROFILE("bt3DGrid_findPairsLarge"); - btGpu_findPairsLarge(m_hAABB, m_hBodiesHash, m_hCellStart, m_hPairBuff, m_hPairBuffStartCurr, m_numHandles, m_numLargeHandles); - return; -} - - - -void btGpu3DGridBroadphase::computePairCacheChanges() -{ - BT_PROFILE("bt3DGrid_computePairCacheChanges"); - btGpu_computePairCacheChanges(m_hPairBuff, m_hPairBuffStartCurr, m_hPairScan, m_hAABB, m_numHandles); - return; -} - - - -void btGpu3DGridBroadphase::scanOverlappingPairBuff() -{ - BT_PROFILE("bt3DGrid_scanOverlappingPairBuff"); - m_hPairScan[0] = 0; - for(int i = 1; i <= m_numHandles; i++) - { - unsigned int delta = m_hPairScan[i]; - m_hPairScan[i] = m_hPairScan[i-1] + delta; - } - return; -} - - - -void btGpu3DGridBroadphase::squeezeOverlappingPairBuff() -{ - BT_PROFILE("bt3DGrid_squeezeOverlappingPairBuff"); - btGpu_squeezeOverlappingPairBuff(m_hPairBuff, m_hPairBuffStartCurr, m_hPairScan, m_hPairOut, m_hAABB, m_numHandles); - return; -} - - - -#include "btGpu3DGridBroadphaseSharedCode.h" - - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphase.h b/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphase.h deleted file mode 100644 index 1154a5fa6..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphase.h +++ /dev/null @@ -1,140 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org -Copyright (C) 2006, 2009 Sony Computer Entertainment Inc. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -//---------------------------------------------------------------------------------------- - -#ifndef BTGPU3DGRIDBROADPHASE_H -#define BTGPU3DGRIDBROADPHASE_H - -//---------------------------------------------------------------------------------------- - -#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" - -#include "btGpu3DGridBroadphaseSharedTypes.h" - -//---------------------------------------------------------------------------------------- - -///The btGpu3DGridBroadphase uses GPU-style code compiled for CPU to compute overlapping pairs - -class btGpu3DGridBroadphase : public btSimpleBroadphase -{ -protected: - bool m_bInitialized; - unsigned int m_numBodies; - unsigned int m_numCells; - unsigned int m_maxPairsPerBody; - btScalar m_cellFactorAABB; - unsigned int m_maxBodiesPerCell; - bt3DGridBroadphaseParams m_params; - btScalar m_maxRadius; - // CPU data - unsigned int* m_hBodiesHash; - unsigned int* m_hCellStart; - unsigned int* m_hPairBuffStartCurr; - bt3DGrid3F1U* m_hAABB; - unsigned int* m_hPairBuff; - unsigned int* m_hPairScan; - unsigned int* m_hPairOut; -// large proxies - int m_numLargeHandles; - int m_maxLargeHandles; - int m_LastLargeHandleIndex; - btSimpleBroadphaseProxy* m_pLargeHandles; - void* m_pLargeHandlesRawPtr; - int m_firstFreeLargeHandle; - int allocLargeHandle() - { - btAssert(m_numLargeHandles < m_maxLargeHandles); - int freeLargeHandle = m_firstFreeLargeHandle; - m_firstFreeLargeHandle = m_pLargeHandles[freeLargeHandle].GetNextFree(); - m_numLargeHandles++; - if(freeLargeHandle > m_LastLargeHandleIndex) - { - m_LastLargeHandleIndex = freeLargeHandle; - } - return freeLargeHandle; - } - void freeLargeHandle(btSimpleBroadphaseProxy* proxy) - { - int handle = int(proxy - m_pLargeHandles); - btAssert((handle >= 0) && (handle < m_maxHandles)); - if(handle == m_LastLargeHandleIndex) - { - m_LastLargeHandleIndex--; - } - proxy->SetNextFree(m_firstFreeLargeHandle); - m_firstFreeLargeHandle = handle; - proxy->m_clientObject = 0; - m_numLargeHandles--; - } - bool isLargeProxy(const btVector3& aabbMin, const btVector3& aabbMax); - bool isLargeProxy(btBroadphaseProxy* proxy); -// debug - unsigned int m_numPairsAdded; - unsigned int m_numPairsRemoved; - unsigned int m_numOverflows; -// -public: - btGpu3DGridBroadphase(const btVector3& worldAabbMin,const btVector3& worldAabbMax, - int gridSizeX, int gridSizeY, int gridSizeZ, - int maxSmallProxies, int maxLargeProxies, int maxPairsPerBody, - int maxBodiesPerCell = 8, - btScalar cellFactorAABB = btScalar(1.0f)); - btGpu3DGridBroadphase( btOverlappingPairCache* overlappingPairCache, - const btVector3& worldAabbMin,const btVector3& worldAabbMax, - int gridSizeX, int gridSizeY, int gridSizeZ, - int maxSmallProxies, int maxLargeProxies, int maxPairsPerBody, - int maxBodiesPerCell = 8, - btScalar cellFactorAABB = btScalar(1.0f)); - virtual ~btGpu3DGridBroadphase(); - virtual void calculateOverlappingPairs(btDispatcher* dispatcher); - - virtual btBroadphaseProxy* createProxy(const btVector3& aabbMin, const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy); - virtual void destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher); - virtual void rayTest(const btVector3& rayFrom,const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin=btVector3(0,0,0),const btVector3& aabbMax=btVector3(0,0,0)); - - - virtual void resetPool(btDispatcher* dispatcher); - -protected: - void _initialize( const btVector3& worldAabbMin,const btVector3& worldAabbMax, - int gridSizeX, int gridSizeY, int gridSizeZ, - int maxSmallProxies, int maxLargeProxies, int maxPairsPerBody, - int maxBodiesPerCell = 8, - btScalar cellFactorAABB = btScalar(1.0f)); - void _finalize(); - void addPairsToCache(btDispatcher* dispatcher); - void addLarge2LargePairsToCache(btDispatcher* dispatcher); - -// overrides for CPU version - virtual void setParameters(bt3DGridBroadphaseParams* hostParams); - virtual void prepareAABB(); - virtual void calcHashAABB(); - virtual void sortHash(); - virtual void findCellStart(); - virtual void findOverlappingPairs(); - virtual void findPairsLarge(); - virtual void computePairCacheChanges(); - virtual void scanOverlappingPairBuff(); - virtual void squeezeOverlappingPairBuff(); -}; - -//---------------------------------------------------------------------------------------- - -#endif //BTGPU3DGRIDBROADPHASE_H - -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedCode.h b/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedCode.h deleted file mode 100644 index e0afb87bb..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedCode.h +++ /dev/null @@ -1,430 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org -Copyright (C) 2006, 2009 Sony Computer Entertainment Inc. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -//---------------------------------------------------------------------------------------- - -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -// K E R N E L F U N C T I O N S -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- - -// calculate position in uniform grid -BT_GPU___device__ int3 bt3DGrid_calcGridPos(float4 p) -{ - int3 gridPos; - gridPos.x = (int)floor((p.x - BT_GPU_params.m_worldOriginX) / BT_GPU_params.m_cellSizeX); - gridPos.y = (int)floor((p.y - BT_GPU_params.m_worldOriginY) / BT_GPU_params.m_cellSizeY); - gridPos.z = (int)floor((p.z - BT_GPU_params.m_worldOriginZ) / BT_GPU_params.m_cellSizeZ); - return gridPos; -} // bt3DGrid_calcGridPos() - -//---------------------------------------------------------------------------------------- - -// calculate address in grid from position (clamping to edges) -BT_GPU___device__ uint bt3DGrid_calcGridHash(int3 gridPos) -{ - gridPos.x = BT_GPU_max(0, BT_GPU_min(gridPos.x, (int)BT_GPU_params.m_gridSizeX - 1)); - gridPos.y = BT_GPU_max(0, BT_GPU_min(gridPos.y, (int)BT_GPU_params.m_gridSizeY - 1)); - gridPos.z = BT_GPU_max(0, BT_GPU_min(gridPos.z, (int)BT_GPU_params.m_gridSizeZ - 1)); - return BT_GPU___mul24(BT_GPU___mul24(gridPos.z, BT_GPU_params.m_gridSizeY), BT_GPU_params.m_gridSizeX) + BT_GPU___mul24(gridPos.y, BT_GPU_params.m_gridSizeX) + gridPos.x; -} // bt3DGrid_calcGridHash() - -//---------------------------------------------------------------------------------------- - -// calculate grid hash value for each body using its AABB -BT_GPU___global__ void calcHashAABBD(bt3DGrid3F1U* pAABB, uint2* pHash, uint numBodies) -{ - int index = BT_GPU___mul24(BT_GPU_blockIdx.x, BT_GPU_blockDim.x) + BT_GPU_threadIdx.x; - if(index >= (int)numBodies) - { - return; - } - bt3DGrid3F1U bbMin = pAABB[index*2]; - bt3DGrid3F1U bbMax = pAABB[index*2 + 1]; - float4 pos; - pos.x = (bbMin.fx + bbMax.fx) * 0.5f; - pos.y = (bbMin.fy + bbMax.fy) * 0.5f; - pos.z = (bbMin.fz + bbMax.fz) * 0.5f; - // get address in grid - int3 gridPos = bt3DGrid_calcGridPos(pos); - uint gridHash = bt3DGrid_calcGridHash(gridPos); - // store grid hash and body index - pHash[index] = BT_GPU_make_uint2(gridHash, index); -} // calcHashAABBD() - -//---------------------------------------------------------------------------------------- - -BT_GPU___global__ void findCellStartD(uint2* pHash, uint* cellStart, uint numBodies) -{ - int index = BT_GPU___mul24(BT_GPU_blockIdx.x, BT_GPU_blockDim.x) + BT_GPU_threadIdx.x; - if(index >= (int)numBodies) - { - return; - } - uint2 sortedData = pHash[index]; - // Load hash data into shared memory so that we can look - // at neighboring body's hash value without loading - // two hash values per thread - BT_GPU___shared__ uint sharedHash[257]; - sharedHash[BT_GPU_threadIdx.x+1] = sortedData.x; - if((index > 0) && (BT_GPU_threadIdx.x == 0)) - { - // first thread in block must load neighbor body hash - volatile uint2 prevData = pHash[index-1]; - sharedHash[0] = prevData.x; - } - BT_GPU___syncthreads(); - if((index == 0) || (sortedData.x != sharedHash[BT_GPU_threadIdx.x])) - { - cellStart[sortedData.x] = index; - } -} // findCellStartD() - -//---------------------------------------------------------------------------------------- - -BT_GPU___device__ uint cudaTestAABBOverlap(bt3DGrid3F1U min0, bt3DGrid3F1U max0, bt3DGrid3F1U min1, bt3DGrid3F1U max1) -{ - return (min0.fx <= max1.fx)&& (min1.fx <= max0.fx) && - (min0.fy <= max1.fy)&& (min1.fy <= max0.fy) && - (min0.fz <= max1.fz)&& (min1.fz <= max0.fz); -} // cudaTestAABBOverlap() - -//---------------------------------------------------------------------------------------- - -BT_GPU___device__ void findPairsInCell( int3 gridPos, - uint index, - uint2* pHash, - uint* pCellStart, - bt3DGrid3F1U* pAABB, - uint* pPairBuff, - uint2* pPairBuffStartCurr, - uint numBodies) -{ - if ( (gridPos.x < 0) || (gridPos.x > (int)BT_GPU_params.m_gridSizeX - 1) - || (gridPos.y < 0) || (gridPos.y > (int)BT_GPU_params.m_gridSizeY - 1) - || (gridPos.z < 0) || (gridPos.z > (int)BT_GPU_params.m_gridSizeZ - 1)) - { - return; - } - uint gridHash = bt3DGrid_calcGridHash(gridPos); - // get start of bucket for this cell - uint bucketStart = pCellStart[gridHash]; - if (bucketStart == 0xffffffff) - { - return; // cell empty - } - // iterate over bodies in this cell - uint2 sortedData = pHash[index]; - uint unsorted_indx = sortedData.y; - bt3DGrid3F1U min0 = BT_GPU_FETCH(pAABB, unsorted_indx*2); - bt3DGrid3F1U max0 = BT_GPU_FETCH(pAABB, unsorted_indx*2 + 1); - uint handleIndex = min0.uw; - uint2 start_curr = pPairBuffStartCurr[handleIndex]; - uint start = start_curr.x; - uint curr = start_curr.y; - uint2 start_curr_next = pPairBuffStartCurr[handleIndex+1]; - uint curr_max = start_curr_next.x - start - 1; - uint bucketEnd = bucketStart + BT_GPU_params.m_maxBodiesPerCell; - bucketEnd = (bucketEnd > numBodies) ? numBodies : bucketEnd; - for(uint index2 = bucketStart; index2 < bucketEnd; index2++) - { - uint2 cellData = pHash[index2]; - if (cellData.x != gridHash) - { - break; // no longer in same bucket - } - uint unsorted_indx2 = cellData.y; - if (unsorted_indx2 < unsorted_indx) // check not colliding with self - { - bt3DGrid3F1U min1 = BT_GPU_FETCH(pAABB, unsorted_indx2*2); - bt3DGrid3F1U max1 = BT_GPU_FETCH(pAABB, unsorted_indx2*2 + 1); - if(cudaTestAABBOverlap(min0, max0, min1, max1)) - { - uint handleIndex2 = min1.uw; - uint k; - for(k = 0; k < curr; k++) - { - uint old_pair = pPairBuff[start+k] & (~BT_3DGRID_PAIR_ANY_FLG); - if(old_pair == handleIndex2) - { - pPairBuff[start+k] |= BT_3DGRID_PAIR_FOUND_FLG; - break; - } - } - if(k == curr) - { - if(curr >= curr_max) - { // not a good solution, but let's avoid crash - break; - } - pPairBuff[start+curr] = handleIndex2 | BT_3DGRID_PAIR_NEW_FLG; - curr++; - } - } - } - } - pPairBuffStartCurr[handleIndex] = BT_GPU_make_uint2(start, curr); - return; -} // findPairsInCell() - -//---------------------------------------------------------------------------------------- - -BT_GPU___global__ void findOverlappingPairsD( bt3DGrid3F1U* pAABB, uint2* pHash, uint* pCellStart, - uint* pPairBuff, uint2* pPairBuffStartCurr, uint numBodies) -{ - int index = BT_GPU___mul24(BT_GPU_blockIdx.x, BT_GPU_blockDim.x) + BT_GPU_threadIdx.x; - if(index >= (int)numBodies) - { - return; - } - uint2 sortedData = pHash[index]; - uint unsorted_indx = sortedData.y; - bt3DGrid3F1U bbMin = BT_GPU_FETCH(pAABB, unsorted_indx*2); - bt3DGrid3F1U bbMax = BT_GPU_FETCH(pAABB, unsorted_indx*2 + 1); - float4 pos; - pos.x = (bbMin.fx + bbMax.fx) * 0.5f; - pos.y = (bbMin.fy + bbMax.fy) * 0.5f; - pos.z = (bbMin.fz + bbMax.fz) * 0.5f; - // get address in grid - int3 gridPos = bt3DGrid_calcGridPos(pos); - // examine only neighbouring cells - for(int z=-1; z<=1; z++) { - for(int y=-1; y<=1; y++) { - for(int x=-1; x<=1; x++) { - findPairsInCell(gridPos + BT_GPU_make_int3(x, y, z), index, pHash, pCellStart, pAABB, pPairBuff, pPairBuffStartCurr, numBodies); - } - } - } -} // findOverlappingPairsD() - -//---------------------------------------------------------------------------------------- - -BT_GPU___global__ void findPairsLargeD( bt3DGrid3F1U* pAABB, uint2* pHash, uint* pCellStart, uint* pPairBuff, - uint2* pPairBuffStartCurr, uint numBodies, uint numLarge) -{ - int index = BT_GPU___mul24(BT_GPU_blockIdx.x, BT_GPU_blockDim.x) + BT_GPU_threadIdx.x; - if(index >= (int)numBodies) - { - return; - } - uint2 sortedData = pHash[index]; - uint unsorted_indx = sortedData.y; - bt3DGrid3F1U min0 = BT_GPU_FETCH(pAABB, unsorted_indx*2); - bt3DGrid3F1U max0 = BT_GPU_FETCH(pAABB, unsorted_indx*2 + 1); - uint handleIndex = min0.uw; - uint2 start_curr = pPairBuffStartCurr[handleIndex]; - uint start = start_curr.x; - uint curr = start_curr.y; - uint2 start_curr_next = pPairBuffStartCurr[handleIndex+1]; - uint curr_max = start_curr_next.x - start - 1; - for(uint i = 0; i < numLarge; i++) - { - uint indx2 = numBodies + i; - bt3DGrid3F1U min1 = BT_GPU_FETCH(pAABB, indx2*2); - bt3DGrid3F1U max1 = BT_GPU_FETCH(pAABB, indx2*2 + 1); - if(cudaTestAABBOverlap(min0, max0, min1, max1)) - { - uint k; - uint handleIndex2 = min1.uw; - for(k = 0; k < curr; k++) - { - uint old_pair = pPairBuff[start+k] & (~BT_3DGRID_PAIR_ANY_FLG); - if(old_pair == handleIndex2) - { - pPairBuff[start+k] |= BT_3DGRID_PAIR_FOUND_FLG; - break; - } - } - if(k == curr) - { - pPairBuff[start+curr] = handleIndex2 | BT_3DGRID_PAIR_NEW_FLG; - if(curr >= curr_max) - { // not a good solution, but let's avoid crash - break; - } - curr++; - } - } - } - pPairBuffStartCurr[handleIndex] = BT_GPU_make_uint2(start, curr); - return; -} // findPairsLargeD() - -//---------------------------------------------------------------------------------------- - -BT_GPU___global__ void computePairCacheChangesD(uint* pPairBuff, uint2* pPairBuffStartCurr, - uint* pPairScan, bt3DGrid3F1U* pAABB, uint numBodies) -{ - int index = BT_GPU___mul24(BT_GPU_blockIdx.x, BT_GPU_blockDim.x) + BT_GPU_threadIdx.x; - if(index >= (int)numBodies) - { - return; - } - bt3DGrid3F1U bbMin = pAABB[index * 2]; - uint handleIndex = bbMin.uw; - uint2 start_curr = pPairBuffStartCurr[handleIndex]; - uint start = start_curr.x; - uint curr = start_curr.y; - uint *pInp = pPairBuff + start; - uint num_changes = 0; - for(uint k = 0; k < curr; k++, pInp++) - { - if(!((*pInp) & BT_3DGRID_PAIR_FOUND_FLG)) - { - num_changes++; - } - } - pPairScan[index+1] = num_changes; -} // computePairCacheChangesD() - -//---------------------------------------------------------------------------------------- - -BT_GPU___global__ void squeezeOverlappingPairBuffD(uint* pPairBuff, uint2* pPairBuffStartCurr, uint* pPairScan, - uint* pPairOut, bt3DGrid3F1U* pAABB, uint numBodies) -{ - int index = BT_GPU___mul24(BT_GPU_blockIdx.x, BT_GPU_blockDim.x) + BT_GPU_threadIdx.x; - if(index >= (int)numBodies) - { - return; - } - bt3DGrid3F1U bbMin = pAABB[index * 2]; - uint handleIndex = bbMin.uw; - uint2 start_curr = pPairBuffStartCurr[handleIndex]; - uint start = start_curr.x; - uint curr = start_curr.y; - uint* pInp = pPairBuff + start; - uint* pOut = pPairOut + pPairScan[index]; - uint* pOut2 = pInp; - uint num = 0; - for(uint k = 0; k < curr; k++, pInp++) - { - if(!((*pInp) & BT_3DGRID_PAIR_FOUND_FLG)) - { - *pOut = *pInp; - pOut++; - } - if((*pInp) & BT_3DGRID_PAIR_ANY_FLG) - { - *pOut2 = (*pInp) & (~BT_3DGRID_PAIR_ANY_FLG); - pOut2++; - num++; - } - } - pPairBuffStartCurr[handleIndex] = BT_GPU_make_uint2(start, num); -} // squeezeOverlappingPairBuffD() - - -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -// E N D O F K E R N E L F U N C T I O N S -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- - -extern "C" -{ - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(calcHashAABB)(bt3DGrid3F1U* pAABB, unsigned int* hash, unsigned int numBodies) -{ - int numThreads, numBlocks; - BT_GPU_PREF(computeGridSize)(numBodies, 256, numBlocks, numThreads); - // execute the kernel - BT_GPU_EXECKERNEL(numBlocks, numThreads, calcHashAABBD, (pAABB, (uint2*)hash, numBodies)); - // check if kernel invocation generated an error - BT_GPU_CHECK_ERROR("calcHashAABBD kernel execution failed"); -} // calcHashAABB() - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(findCellStart(unsigned int* hash, unsigned int* cellStart, unsigned int numBodies, unsigned int numCells)) -{ - int numThreads, numBlocks; - BT_GPU_PREF(computeGridSize)(numBodies, 256, numBlocks, numThreads); - BT_GPU_SAFE_CALL(BT_GPU_Memset(cellStart, 0xffffffff, numCells*sizeof(uint))); - BT_GPU_EXECKERNEL(numBlocks, numThreads, findCellStartD, ((uint2*)hash, (uint*)cellStart, numBodies)); - BT_GPU_CHECK_ERROR("Kernel execution failed: findCellStartD"); -} // findCellStart() - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(findOverlappingPairs(bt3DGrid3F1U* pAABB, unsigned int* pHash, unsigned int* pCellStart, unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int numBodies)) -{ -#if B_CUDA_USE_TEX - BT_GPU_SAFE_CALL(cudaBindTexture(0, pAABBTex, pAABB, numBodies * 2 * sizeof(bt3DGrid3F1U))); -#endif - int numThreads, numBlocks; - BT_GPU_PREF(computeGridSize)(numBodies, 64, numBlocks, numThreads); - BT_GPU_EXECKERNEL(numBlocks, numThreads, findOverlappingPairsD, (pAABB,(uint2*)pHash,(uint*)pCellStart,(uint*)pPairBuff,(uint2*)pPairBuffStartCurr,numBodies)); - BT_GPU_CHECK_ERROR("Kernel execution failed: bt_CudaFindOverlappingPairsD"); -#if B_CUDA_USE_TEX - BT_GPU_SAFE_CALL(cudaUnbindTexture(pAABBTex)); -#endif -} // findOverlappingPairs() - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(findPairsLarge(bt3DGrid3F1U* pAABB, unsigned int* pHash, unsigned int* pCellStart, unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int numBodies, unsigned int numLarge)) -{ -#if B_CUDA_USE_TEX - BT_GPU_SAFE_CALL(cudaBindTexture(0, pAABBTex, pAABB, (numBodies+numLarge) * 2 * sizeof(bt3DGrid3F1U))); -#endif - int numThreads, numBlocks; - BT_GPU_PREF(computeGridSize)(numBodies, 64, numBlocks, numThreads); - BT_GPU_EXECKERNEL(numBlocks, numThreads, findPairsLargeD, (pAABB,(uint2*)pHash,(uint*)pCellStart,(uint*)pPairBuff,(uint2*)pPairBuffStartCurr,numBodies,numLarge)); - BT_GPU_CHECK_ERROR("Kernel execution failed: btCuda_findPairsLargeD"); -#if B_CUDA_USE_TEX - BT_GPU_SAFE_CALL(cudaUnbindTexture(pAABBTex)); -#endif -} // findPairsLarge() - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(computePairCacheChanges(unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int* pPairScan, bt3DGrid3F1U* pAABB, unsigned int numBodies)) -{ - int numThreads, numBlocks; - BT_GPU_PREF(computeGridSize)(numBodies, 256, numBlocks, numThreads); - BT_GPU_EXECKERNEL(numBlocks, numThreads, computePairCacheChangesD, ((uint*)pPairBuff,(uint2*)pPairBuffStartCurr,(uint*)pPairScan,pAABB,numBodies)); - BT_GPU_CHECK_ERROR("Kernel execution failed: btCudaComputePairCacheChangesD"); -} // computePairCacheChanges() - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(squeezeOverlappingPairBuff(unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int* pPairScan, unsigned int* pPairOut, bt3DGrid3F1U* pAABB, unsigned int numBodies)) -{ - int numThreads, numBlocks; - BT_GPU_PREF(computeGridSize)(numBodies, 256, numBlocks, numThreads); - BT_GPU_EXECKERNEL(numBlocks, numThreads, squeezeOverlappingPairBuffD, ((uint*)pPairBuff,(uint2*)pPairBuffStartCurr,(uint*)pPairScan,(uint*)pPairOut,pAABB,numBodies)); - BT_GPU_CHECK_ERROR("Kernel execution failed: btCudaSqueezeOverlappingPairBuffD"); -} // btCuda_squeezeOverlappingPairBuff() - -//------------------------------------------------------------------------------------------------ - -} // extern "C" - -//------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------ diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedDefs.h b/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedDefs.h deleted file mode 100644 index 607bda7ed..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedDefs.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org -Copyright (C) 2006, 2009 Sony Computer Entertainment Inc. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -//---------------------------------------------------------------------------------------- - -// Shared definitions for GPU-based 3D Grid collision detection broadphase - -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// Keep this file free from Bullet headers -// it is included into both CUDA and CPU code -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -//---------------------------------------------------------------------------------------- - -#ifndef BTGPU3DGRIDBROADPHASESHAREDDEFS_H -#define BTGPU3DGRIDBROADPHASESHAREDDEFS_H - -//---------------------------------------------------------------------------------------- - -#include "btGpu3DGridBroadphaseSharedTypes.h" - -//---------------------------------------------------------------------------------------- - -extern "C" -{ - -//---------------------------------------------------------------------------------------- - -void BT_GPU_PREF(calcHashAABB)(bt3DGrid3F1U* pAABB, unsigned int* hash, unsigned int numBodies); - -void BT_GPU_PREF(findCellStart)(unsigned int* hash, unsigned int* cellStart, unsigned int numBodies, unsigned int numCells); - -void BT_GPU_PREF(findOverlappingPairs)(bt3DGrid3F1U* pAABB, unsigned int* pHash, unsigned int* pCellStart, unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int numBodies); - -void BT_GPU_PREF(findPairsLarge)(bt3DGrid3F1U* pAABB, unsigned int* pHash, unsigned int* pCellStart, unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int numBodies, unsigned int numLarge); - -void BT_GPU_PREF(computePairCacheChanges)(unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int* pPairScan, bt3DGrid3F1U* pAABB, unsigned int numBodies); - -void BT_GPU_PREF(squeezeOverlappingPairBuff)(unsigned int* pPairBuff, unsigned int* pPairBuffStartCurr, unsigned int* pPairScan, unsigned int* pPairOut, bt3DGrid3F1U* pAABB, unsigned int numBodies); - - -//---------------------------------------------------------------------------------------- - -} // extern "C" - -//---------------------------------------------------------------------------------------- - -#endif // BTGPU3DGRIDBROADPHASESHAREDDEFS_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedTypes.h b/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedTypes.h deleted file mode 100644 index 616a40094..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btGpu3DGridBroadphaseSharedTypes.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org -Copyright (C) 2006, 2009 Sony Computer Entertainment Inc. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -//---------------------------------------------------------------------------------------- - -// Shared definitions for GPU-based 3D Grid collision detection broadphase - -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// Keep this file free from Bullet headers -// it is included into both CUDA and CPU code -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -//---------------------------------------------------------------------------------------- - -#ifndef BTGPU3DGRIDBROADPHASESHAREDTYPES_H -#define BTGPU3DGRIDBROADPHASESHAREDTYPES_H - -//---------------------------------------------------------------------------------------- - -#define BT_3DGRID_PAIR_FOUND_FLG (0x40000000) -#define BT_3DGRID_PAIR_NEW_FLG (0x20000000) -#define BT_3DGRID_PAIR_ANY_FLG (BT_3DGRID_PAIR_FOUND_FLG | BT_3DGRID_PAIR_NEW_FLG) - -//---------------------------------------------------------------------------------------- - -struct bt3DGridBroadphaseParams -{ - unsigned int m_gridSizeX; - unsigned int m_gridSizeY; - unsigned int m_gridSizeZ; - unsigned int m_numCells; - float m_worldOriginX; - float m_worldOriginY; - float m_worldOriginZ; - float m_cellSizeX; - float m_cellSizeY; - float m_cellSizeZ; - unsigned int m_numBodies; - unsigned int m_maxBodiesPerCell; -}; - -//---------------------------------------------------------------------------------------- - -struct bt3DGrid3F1U -{ - float fx; - float fy; - float fz; - unsigned int uw; -}; - -//---------------------------------------------------------------------------------------- - -#endif // BTGPU3DGRIDBROADPHASESHAREDTYPES_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btGpuDefines.h b/Engine/lib/bullet/src/BulletMultiThreaded/btGpuDefines.h deleted file mode 100644 index f9315ab64..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btGpuDefines.h +++ /dev/null @@ -1,211 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org -Copyright (C) 2006, 2009 Sony Computer Entertainment Inc. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - - -// definitions for "GPU on CPU" code - - -#ifndef BT_GPU_DEFINES_H -#define BT_GPU_DEFINES_H - -typedef unsigned int uint; - -struct int2 -{ - int x, y; -}; - -struct uint2 -{ - unsigned int x, y; -}; - -struct int3 -{ - int x, y, z; -}; - -struct uint3 -{ - unsigned int x, y, z; -}; - -struct float4 -{ - float x, y, z, w; -}; - -struct float3 -{ - float x, y, z; -}; - - -#define BT_GPU___device__ inline -#define BT_GPU___devdata__ -#define BT_GPU___constant__ -#define BT_GPU_max(a, b) ((a) > (b) ? (a) : (b)) -#define BT_GPU_min(a, b) ((a) < (b) ? (a) : (b)) -#define BT_GPU_params s3DGridBroadphaseParams -#define BT_GPU___mul24(a, b) ((a)*(b)) -#define BT_GPU___global__ inline -#define BT_GPU___shared__ static -#define BT_GPU___syncthreads() -#define CUDART_PI_F SIMD_PI - -static inline uint2 bt3dGrid_make_uint2(unsigned int x, unsigned int y) -{ - uint2 t; t.x = x; t.y = y; return t; -} -#define BT_GPU_make_uint2(x, y) bt3dGrid_make_uint2(x, y) - -static inline int3 bt3dGrid_make_int3(int x, int y, int z) -{ - int3 t; t.x = x; t.y = y; t.z = z; return t; -} -#define BT_GPU_make_int3(x, y, z) bt3dGrid_make_int3(x, y, z) - -static inline float3 bt3dGrid_make_float3(float x, float y, float z) -{ - float3 t; t.x = x; t.y = y; t.z = z; return t; -} -#define BT_GPU_make_float3(x, y, z) bt3dGrid_make_float3(x, y, z) - -static inline float3 bt3dGrid_make_float34(float4 f) -{ - float3 t; t.x = f.x; t.y = f.y; t.z = f.z; return t; -} -#define BT_GPU_make_float34(f) bt3dGrid_make_float34(f) - -static inline float3 bt3dGrid_make_float31(float f) -{ - float3 t; t.x = t.y = t.z = f; return t; -} -#define BT_GPU_make_float31(x) bt3dGrid_make_float31(x) - -static inline float4 bt3dGrid_make_float42(float3 v, float f) -{ - float4 t; t.x = v.x; t.y = v.y; t.z = v.z; t.w = f; return t; -} -#define BT_GPU_make_float42(a, b) bt3dGrid_make_float42(a, b) - -static inline float4 bt3dGrid_make_float44(float a, float b, float c, float d) -{ - float4 t; t.x = a; t.y = b; t.z = c; t.w = d; return t; -} -#define BT_GPU_make_float44(a, b, c, d) bt3dGrid_make_float44(a, b, c, d) - -inline int3 operator+(int3 a, int3 b) -{ - return bt3dGrid_make_int3(a.x + b.x, a.y + b.y, a.z + b.z); -} - -inline float4 operator+(const float4& a, const float4& b) -{ - float4 r; r.x = a.x+b.x; r.y = a.y+b.y; r.z = a.z+b.z; r.w = a.w+b.w; return r; -} -inline float4 operator*(const float4& a, float fact) -{ - float4 r; r.x = a.x*fact; r.y = a.y*fact; r.z = a.z*fact; r.w = a.w*fact; return r; -} -inline float4 operator*(float fact, float4& a) -{ - return (a * fact); -} -inline float4& operator*=(float4& a, float fact) -{ - a = fact * a; - return a; -} -inline float4& operator+=(float4& a, const float4& b) -{ - a = a + b; - return a; -} - -inline float3 operator+(const float3& a, const float3& b) -{ - float3 r; r.x = a.x+b.x; r.y = a.y+b.y; r.z = a.z+b.z; return r; -} -inline float3 operator-(const float3& a, const float3& b) -{ - float3 r; r.x = a.x-b.x; r.y = a.y-b.y; r.z = a.z-b.z; return r; -} -static inline float bt3dGrid_dot(float3& a, float3& b) -{ - return a.x*b.x+a.y*b.y+a.z*b.z; -} -#define BT_GPU_dot(a,b) bt3dGrid_dot(a,b) - -static inline float bt3dGrid_dot4(float4& a, float4& b) -{ - return a.x*b.x+a.y*b.y+a.z*b.z+a.w*b.w; -} -#define BT_GPU_dot4(a,b) bt3dGrid_dot4(a,b) - -static inline float3 bt3dGrid_cross(const float3& a, const float3& b) -{ - float3 r; r.x = a.y*b.z-a.z*b.y; r.y = -a.x*b.z+a.z*b.x; r.z = a.x*b.y-a.y*b.x; return r; -} -#define BT_GPU_cross(a,b) bt3dGrid_cross(a,b) - - -inline float3 operator*(const float3& a, float fact) -{ - float3 r; r.x = a.x*fact; r.y = a.y*fact; r.z = a.z*fact; return r; -} - - -inline float3& operator+=(float3& a, const float3& b) -{ - a = a + b; - return a; -} -inline float3& operator-=(float3& a, const float3& b) -{ - a = a - b; - return a; -} -inline float3& operator*=(float3& a, float fact) -{ - a = a * fact; - return a; -} -inline float3 operator-(const float3& v) -{ - float3 r; r.x = -v.x; r.y = -v.y; r.z = -v.z; return r; -} - - -#define BT_GPU_FETCH(a, b) a[b] -#define BT_GPU_FETCH4(a, b) a[b] -#define BT_GPU_PREF(func) btGpu_##func -#define BT_GPU_SAFE_CALL(func) func -#define BT_GPU_Memset memset -#define BT_GPU_MemcpyToSymbol(a, b, c) memcpy(&a, b, c) -#define BT_GPU_BindTexture(a, b, c, d) -#define BT_GPU_UnbindTexture(a) - -static uint2 s_blockIdx, s_blockDim, s_threadIdx; -#define BT_GPU_blockIdx s_blockIdx -#define BT_GPU_blockDim s_blockDim -#define BT_GPU_threadIdx s_threadIdx -#define BT_GPU_EXECKERNEL(numb, numt, kfunc, args) {s_blockDim.x=numt;for(int nb=0;nb c.m_upperLimit) - { - deltaImpulse = c.m_upperLimit-c.m_appliedImpulse; - c.m_appliedImpulse = c.m_upperLimit; - } - else - { - c.m_appliedImpulse = sum; - } - - - if (body1.mMassInv) - { - btVector3 linearComponent = c.m_contactNormal1*body1.mMassInv; - body1.mDeltaLinearVelocity += vmVector3(linearComponent.getX()*deltaImpulse,linearComponent.getY()*deltaImpulse,linearComponent.getZ()*deltaImpulse); - btVector3 tmp=c.m_angularComponentA*(btVector3(deltaImpulse,deltaImpulse,deltaImpulse)); - body1.mDeltaAngularVelocity += vmVector3(tmp.getX(),tmp.getY(),tmp.getZ()); - } - - if (body2.mMassInv) - { - btVector3 linearComponent = c.m_contactNormal2*body2.mMassInv; - body2.mDeltaLinearVelocity += vmVector3(linearComponent.getX()*deltaImpulse,linearComponent.getY()*deltaImpulse,linearComponent.getZ()*deltaImpulse); - btVector3 tmp = c.m_angularComponentB*((btVector3(deltaImpulse,deltaImpulse,deltaImpulse)));//*m_angularFactor); - body2.mDeltaAngularVelocity += vmVector3(tmp.getX(),tmp.getY(),tmp.getZ()); - } - - //body1.internalApplyImpulse(c.m_contactNormal1*body1.internalGetInvMass(),c.m_angularComponentA,deltaImpulse); - //body2.internalApplyImpulse(c.m_contactNormal2*body2.internalGetInvMass(),c.m_angularComponentB,deltaImpulse); - -} - - -static SIMD_FORCE_INLINE -void pfxSolveLinearConstraintRow(btConstraintRow &constraint, - vmVector3 &deltaLinearVelocityA,vmVector3 &deltaAngularVelocityA, - float massInvA,const vmMatrix3 &inertiaInvA,const vmVector3 &rA, - vmVector3 &deltaLinearVelocityB,vmVector3 &deltaAngularVelocityB, - float massInvB,const vmMatrix3 &inertiaInvB,const vmVector3 &rB) -{ - const vmVector3 normal(btReadVector3(constraint.m_normal)); - btScalar deltaImpulse = constraint.m_rhs; - vmVector3 dVA = deltaLinearVelocityA + cross(deltaAngularVelocityA,rA); - vmVector3 dVB = deltaLinearVelocityB + cross(deltaAngularVelocityB,rB); - deltaImpulse -= constraint.m_jacDiagInv * dot(normal,dVA-dVB); - btScalar oldImpulse = constraint.m_accumImpulse; - constraint.m_accumImpulse = btClamped(oldImpulse + deltaImpulse,constraint.m_lowerLimit,constraint.m_upperLimit); - deltaImpulse = constraint.m_accumImpulse - oldImpulse; - deltaLinearVelocityA += deltaImpulse * massInvA * normal; - deltaAngularVelocityA += deltaImpulse * inertiaInvA * cross(rA,normal); - deltaLinearVelocityB -= deltaImpulse * massInvB * normal; - deltaAngularVelocityB -= deltaImpulse * inertiaInvB * cross(rB,normal); - -} - -void btSolveContactConstraint( - btConstraintRow &constraintResponse, - btConstraintRow &constraintFriction1, - btConstraintRow &constraintFriction2, - const vmVector3 &contactPointA, - const vmVector3 &contactPointB, - PfxSolverBody &solverBodyA, - PfxSolverBody &solverBodyB, - float friction - ) -{ - vmVector3 rA = rotate(solverBodyA.mOrientation,contactPointA); - vmVector3 rB = rotate(solverBodyB.mOrientation,contactPointB); - - pfxSolveLinearConstraintRow(constraintResponse, - solverBodyA.mDeltaLinearVelocity,solverBodyA.mDeltaAngularVelocity,solverBodyA.mMassInv,solverBodyA.mInertiaInv,rA, - solverBodyB.mDeltaLinearVelocity,solverBodyB.mDeltaAngularVelocity,solverBodyB.mMassInv,solverBodyB.mInertiaInv,rB); - - float mf = friction*fabsf(constraintResponse.m_accumImpulse); - constraintFriction1.m_lowerLimit = -mf; - constraintFriction1.m_upperLimit = mf; - constraintFriction2.m_lowerLimit = -mf; - constraintFriction2.m_upperLimit = mf; - - pfxSolveLinearConstraintRow(constraintFriction1, - solverBodyA.mDeltaLinearVelocity,solverBodyA.mDeltaAngularVelocity,solverBodyA.mMassInv,solverBodyA.mInertiaInv,rA, - solverBodyB.mDeltaLinearVelocity,solverBodyB.mDeltaAngularVelocity,solverBodyB.mMassInv,solverBodyB.mInertiaInv,rB); - - pfxSolveLinearConstraintRow(constraintFriction2, - solverBodyA.mDeltaLinearVelocity,solverBodyA.mDeltaAngularVelocity,solverBodyA.mMassInv,solverBodyA.mInertiaInv,rA, - solverBodyB.mDeltaLinearVelocity,solverBodyB.mDeltaAngularVelocity,solverBodyB.mMassInv,solverBodyB.mInertiaInv,rB); -} - - -void CustomSolveConstraintsTaskParallel( - const PfxParallelGroup *contactParallelGroup,const PfxParallelBatch *contactParallelBatches, - PfxConstraintPair *contactPairs,uint32_t numContactPairs, - btPersistentManifold* offsetContactManifolds, - btConstraintRow* offsetContactConstraintRows, - const PfxParallelGroup *jointParallelGroup,const PfxParallelBatch *jointParallelBatches, - PfxConstraintPair *jointPairs,uint32_t numJointPairs, - btSolverConstraint* offsetSolverConstraints, - TrbState *offsetRigStates, - PfxSolverBody *offsetSolverBodies, - uint32_t numRigidBodies, - int iteration,unsigned int taskId,unsigned int numTasks,btBarrier *barrier) -{ - - PfxSolverBody staticBody; - staticBody.mMassInv = 0.f; - staticBody.mDeltaAngularVelocity=vmVector3(0,0,0); - staticBody.mDeltaLinearVelocity =vmVector3(0,0,0); - - - for(int k=0;knumPhases;phaseId++) { - for(uint32_t batchId=0;batchIdnumBatches[phaseId];batchId++) { - uint32_t numPairs = jointParallelGroup->numPairs[phaseId*PFX_MAX_SOLVER_BATCHES+batchId]; - if(batchId%numTasks == taskId && numPairs > 0) { - const PfxParallelBatch &batch = jointParallelBatches[phaseId*PFX_MAX_SOLVER_BATCHES+batchId]; - for(uint32_t i=0;isync(); - } - - // Contact - for(uint32_t phaseId=0;phaseIdnumPhases;phaseId++) { - for(uint32_t batchId=0;batchIdnumBatches[phaseId];batchId++) { - uint32_t numPairs = contactParallelGroup->numPairs[phaseId*PFX_MAX_SOLVER_BATCHES+batchId]; - if(batchId%numTasks == taskId && numPairs > 0) { - const PfxParallelBatch &batch = contactParallelBatches[phaseId*PFX_MAX_SOLVER_BATCHES+batchId]; - for(uint32_t i=0;isync(); - } - } -} - -void CustomPostSolverTask( - TrbState *states, - PfxSolverBody *solverBodies, - uint32_t numRigidBodies) -{ - for(uint32_t i=0;i 0.707f) { - // choose p in y-z plane - float a = n[1]*n[1] + n[2]*n[2]; - float k = 1.0f/sqrtf(a); - p[0] = 0; - p[1] = -n[2]*k; - p[2] = n[1]*k; - // set q = n x p - q[0] = a*k; - q[1] = -n[0]*p[2]; - q[2] = n[0]*p[1]; - } - else { - // choose p in x-y plane - float a = n[0]*n[0] + n[1]*n[1]; - float k = 1.0f/sqrtf(a); - p[0] = -n[1]*k; - p[1] = n[0]*k; - p[2] = 0; - // set q = n x p - q[0] = -n[2]*p[1]; - q[1] = n[2]*p[0]; - q[2] = a*k; - } -} - - - -#define PFX_CONTACT_SLOP 0.001f - -void btSetupContactConstraint( - btConstraintRow &constraintResponse, - btConstraintRow &constraintFriction1, - btConstraintRow &constraintFriction2, - float penetrationDepth, - float restitution, - float friction, - const vmVector3 &contactNormal, - const vmVector3 &contactPointA, - const vmVector3 &contactPointB, - const TrbState &stateA, - const TrbState &stateB, - PfxSolverBody &solverBodyA, - PfxSolverBody &solverBodyB, - const vmVector3& linVelA, - const vmVector3& angVelA, - const vmVector3& linVelB, - const vmVector3& angVelB, - - float separateBias, - float timeStep - ) -{ - vmVector3 rA = rotate(solverBodyA.mOrientation,contactPointA); - vmVector3 rB = rotate(solverBodyB.mOrientation,contactPointB); - - vmMatrix3 K = vmMatrix3::scale(vmVector3(solverBodyA.mMassInv + solverBodyB.mMassInv)) - - crossMatrix(rA) * solverBodyA.mInertiaInv * crossMatrix(rA) - - crossMatrix(rB) * solverBodyB.mInertiaInv * crossMatrix(rB); - - //use the velocities without the applied (gravity and external) forces for restitution computation - vmVector3 vArestitution = linVelA + cross(angVelA,rA); - vmVector3 vBrestitution = linVelB + cross(angVelB,rB); - vmVector3 vABrestitution = vArestitution-vBrestitution; - - vmVector3 vA = stateA.getLinearVelocity() + cross(stateA.getAngularVelocity(),rA); - vmVector3 vB = stateB.getLinearVelocity() + cross(stateB.getAngularVelocity(),rB); - vmVector3 vAB = vA-vB; - - - vmVector3 tangent1,tangent2; - btPlaneSpace1(contactNormal,tangent1,tangent2); - -// constraintResponse.m_accumImpulse = 0.f; -// constraintFriction1.m_accumImpulse = 0.f; -// constraintFriction2.m_accumImpulse = 0.f; - - // Contact Constraint - { - vmVector3 normal = contactNormal; - - float denom = dot(K*normal,normal); - - constraintResponse.m_rhs = -(1.0f+restitution)*dot(vAB,normal); // velocity error - constraintResponse.m_rhs -= (separateBias * btMin(0.0f,penetrationDepth+PFX_CONTACT_SLOP)) / timeStep; // position error - constraintResponse.m_rhs /= denom; - constraintResponse.m_jacDiagInv = 1.0f/denom; - constraintResponse.m_lowerLimit = 0.0f; - constraintResponse.m_upperLimit = SIMD_INFINITY; - btStoreVector3(normal,constraintResponse.m_normal); - } - - // Friction Constraint 1 - { - vmVector3 normal = tangent1; - - float denom = dot(K*normal,normal); - - constraintFriction1.m_jacDiagInv = 1.0f/denom; - constraintFriction1.m_rhs = -dot(vAB,normal); - constraintFriction1.m_rhs *= constraintFriction1.m_jacDiagInv; - constraintFriction1.m_lowerLimit = 0.0f; - constraintFriction1.m_upperLimit = SIMD_INFINITY; - btStoreVector3(normal,constraintFriction1.m_normal); - } - - // Friction Constraint 2 - { - vmVector3 normal = tangent2; - - float denom = dot(K*normal,normal); - - constraintFriction2.m_jacDiagInv = 1.0f/denom; - constraintFriction2.m_rhs = -dot(vAB,normal); - constraintFriction2.m_rhs *= constraintFriction2.m_jacDiagInv; - constraintFriction2.m_lowerLimit = 0.0f; - constraintFriction2.m_upperLimit = SIMD_INFINITY; - btStoreVector3(normal,constraintFriction2.m_normal); - } -} - - -void CustomSetupContactConstraintsTask( - PfxConstraintPair *contactPairs,uint32_t numContactPairs, - btPersistentManifold* offsetContactManifolds, - btConstraintRow* offsetContactConstraintRows, - TrbState *offsetRigStates, - PfxSolverBody *offsetSolverBodies, - uint32_t numRigidBodies, - float separateBias, - float timeStep) -{ - for(uint32_t i=0;i 1) restitution = 0.0f; - - float friction = sqrtf(solverBodyA.friction * solverBodyB.friction); - - for(int j=0;jgetInvMass()>0.f)) - { - linVelA = rbA->getLinearVelocity(); - angVelA = rbA->getAngularVelocity(); - } else - { - linVelA.setValue(0,0,0); - angVelA.setValue(0,0,0); - } - - if (rbB && (rbB->getInvMass()>0.f)) - { - linVelB = rbB->getLinearVelocity(); - angVelB = rbB->getAngularVelocity(); - } else - { - linVelB.setValue(0,0,0); - angVelB.setValue(0,0,0); - } - - - - btSetupContactConstraint( - contactConstraintRows[j*3], - contactConstraintRows[j*3+1], - contactConstraintRows[j*3+2], - cp.getDistance(), - restitution, - friction, - btReadVector3(cp.m_normalWorldOnB),//.mConstraintRow[0].m_normal), - btReadVector3(cp.m_localPointA), - btReadVector3(cp.m_localPointB), - stateA, - stateB, - solverBodyA, - solverBodyB, - (const vmVector3&)linVelA, (const vmVector3&)angVelA, - (const vmVector3&)linVelB, (const vmVector3&)angVelB, - separateBias, - timeStep - ); - } - - //contact.setCompositeFriction(friction); - } -} - - -void CustomWritebackContactConstraintsTask( - PfxConstraintPair *contactPairs,uint32_t numContactPairs, - btPersistentManifold* offsetContactManifolds, - btConstraintRow* offsetContactConstraintRows, - TrbState *offsetRigStates, - PfxSolverBody *offsetSolverBodies, - uint32_t numRigidBodies, - float separateBias, - float timeStep) -{ - for(uint32_t i=0;iio); - btCriticalSection* criticalsection = io->setupContactConstraints.criticalSection; - - - //CustomCriticalSection *criticalsection = &io->m_cs; - switch(io->cmd) { - - case PFX_CONSTRAINT_SOLVER_CMD_SOLVE_CONSTRAINTS: - CustomSolveConstraintsTaskParallel( - io->solveConstraints.contactParallelGroup, - io->solveConstraints.contactParallelBatches, - io->solveConstraints.contactPairs, - io->solveConstraints.numContactPairs, - io->solveConstraints.offsetContactManifolds, - io->solveConstraints.offsetContactConstraintRows, - - io->solveConstraints.jointParallelGroup, - io->solveConstraints.jointParallelBatches, - io->solveConstraints.jointPairs, - io->solveConstraints.numJointPairs, - io->solveConstraints.offsetSolverConstraints, - io->solveConstraints.offsetRigStates1, - io->solveConstraints.offsetSolverBodies, - io->solveConstraints.numRigidBodies, - io->solveConstraints.iteration, - - io->solveConstraints.taskId, - io->maxTasks1, - io->solveConstraints.barrier - ); - break; - - case PFX_CONSTRAINT_SOLVER_CMD_POST_SOLVER: - CustomPostSolverTask( io->postSolver.states,io->postSolver.solverBodies, io->postSolver.numRigidBodies); - break; - - - case PFX_CONSTRAINT_SOLVER_CMD_SETUP_CONTACT_CONSTRAINTS: - { - bool empty = false; - while(!empty) { - int start,batch; - - criticalsection->lock(); - - start = (int)criticalsection->getSharedParam(0); - batch = (int)criticalsection->getSharedParam(1); - - //PFX_PRINTF("taskId %d start %d num %d\n",arg->taskId,start,batch); - - // Žź‚Ěobt@‚đZbg - int nextStart = start + batch; - int rest = btMax((int)io->setupContactConstraints.numContactPairs1 - nextStart,0); - int nextBatch = (rest > batch)?batch:rest; - - criticalsection->setSharedParam(0,nextStart); - criticalsection->setSharedParam(1,nextBatch); - - criticalsection->unlock(); - - if(batch > 0) { - CustomSetupContactConstraintsTask( - io->setupContactConstraints.offsetContactPairs+start,batch, - io->setupContactConstraints.offsetContactManifolds, - io->setupContactConstraints.offsetContactConstraintRows, - io->setupContactConstraints.offsetRigStates, -// io->setupContactConstraints.offsetRigBodies, - io->setupContactConstraints.offsetSolverBodies, - io->setupContactConstraints.numRigidBodies, - io->setupContactConstraints.separateBias, - io->setupContactConstraints.timeStep); - } - else { - empty = true; - } - } - } - break; - - case PFX_CONSTRAINT_SOLVER_CMD_WRITEBACK_APPLIED_IMPULSES_CONTACT_CONSTRAINTS: - { - bool empty = false; - while(!empty) { - int start,batch; - - criticalsection->lock(); - - start = (int)criticalsection->getSharedParam(0); - batch = (int)criticalsection->getSharedParam(1); - - //PFX_PRINTF("taskId %d start %d num %d\n",arg->taskId,start,batch); - - // Žź‚Ěobt@‚đZbg - int nextStart = start + batch; - int rest = btMax((int)io->setupContactConstraints.numContactPairs1 - nextStart,0); - int nextBatch = (rest > batch)?batch:rest; - - criticalsection->setSharedParam(0,nextStart); - criticalsection->setSharedParam(1,nextBatch); - - criticalsection->unlock(); - - if(batch > 0) { - CustomWritebackContactConstraintsTask( - io->setupContactConstraints.offsetContactPairs+start,batch, - io->setupContactConstraints.offsetContactManifolds, - io->setupContactConstraints.offsetContactConstraintRows, - io->setupContactConstraints.offsetRigStates, -// io->setupContactConstraints.offsetRigBodies, - io->setupContactConstraints.offsetSolverBodies, - io->setupContactConstraints.numRigidBodies, - io->setupContactConstraints.separateBias, - io->setupContactConstraints.timeStep); - } - else { - empty = true; - } - } - } - break; - - default: - { - btAssert(0); - } - } - -} - - -void CustomSetupContactConstraintsNew( - PfxConstraintPair *contactPairs1,uint32_t numContactPairs, - btPersistentManifold *offsetContactManifolds, - btConstraintRow* offsetContactConstraintRows, - TrbState *offsetRigStates, - PfxSolverBody *offsetSolverBodies, - uint32_t numRigidBodies, - float separationBias, - float timeStep, - class btThreadSupportInterface* threadSupport, - btCriticalSection* criticalSection, - btConstraintSolverIO *io , - uint8_t cmd - ) -{ - int maxTasks = threadSupport->getNumTasks(); - - int div = (int)maxTasks * 4; - int batch = ((int)numContactPairs + div - 1) / div; -#ifdef __PPU__ - BulletPE2ConstraintSolverSpursSupport* spursThread = (BulletPE2ConstraintSolverSpursSupport*) threadSupport; -#endif - if (criticalSection) - { - criticalSection->setSharedParam(0,0); - criticalSection->setSharedParam(1,btMin(batch,64)); // batched number - } else - { -#ifdef __PPU__ - spursThread->setSharedParam(0,0); - spursThread->setSharedParam(1,btMin(batch,64)); // batched number -#endif //__PPU__ - } - - for(int t=0;tgetBarrierAddress(); - io[t].criticalsectionAddr2 = (unsigned int)spursThread->getCriticalSectionAddress(); -#endif - - -//#define SEQUENTIAL_SETUP -#ifdef SEQUENTIAL_SETUP - CustomSetupContactConstraintsTask(contactPairs1,numContactPairs,offsetContactManifolds,offsetRigStates,offsetSolverBodies,numRigidBodies,separationBias,timeStep); -#else - threadSupport->sendRequest(1,(ppu_address_t)&io[t],t); -#endif - - } -#ifndef SEQUENTIAL_SETUP - unsigned int arg0,arg1; - for(int t=0;twaitForResponse(&arg0,&arg1); - } -#endif //SEQUENTIAL_SETUP - -} - - -void CustomSplitConstraints( - PfxConstraintPair *pairs,uint32_t numPairs, - PfxParallelGroup &group,PfxParallelBatch *batches, - uint32_t numTasks, - uint32_t numRigidBodies, - void *poolBuff, - uint32_t poolBytes - ) -{ - HeapManager pool((unsigned char*)poolBuff,poolBytes); - - // Xe[g`FbN—prbgt‰Oe[u‹ - int bufSize = sizeof(uint8_t)*numRigidBodies; - bufSize = ((bufSize+127)>>7)<<7; // 128 bytes alignment - uint8_t *bodyTable = (uint8_t*)pool.allocate(bufSize,HeapManager::ALIGN128); - - // yA`FbN—prbgt‰Oe[u‹ - uint32_t *pairTable; - size_t allocSize = sizeof(uint32_t)*((numPairs+31)/32); - pairTable = (uint32_t*)pool.allocate(allocSize); - memset(pairTable,0,allocSize); - - // –Ú•W‚Ć‚·‚é•ŞŠ„” - uint32_t targetCount = btMax(uint32_t(PFX_MIN_SOLVER_PAIRS),btMin(numPairs / (numTasks*2),uint32_t(PFX_MAX_SOLVER_PAIRS))); - uint32_t startIndex = 0; - - uint32_t phaseId; - uint32_t batchId; - uint32_t totalCount=0; - - uint32_t maxBatches = btMin(numTasks,uint32_t(PFX_MAX_SOLVER_BATCHES)); - - for(phaseId=0;phaseId>5; - uint32_t maskP = 1L << (i & 31); - - //pair is already assigned to a phase/batch - if(pairTable[idxP] & maskP) { - continue; - } - - uint32_t idxA = pfxGetRigidBodyIdA(pairs[i]); - uint32_t idxB = pfxGetRigidBodyIdB(pairs[i]); - - // —Ľ•ű‚Ć‚ŕANeBu‚Ĺ‚Č‚˘A‚Ü‚˝‚ÍŹŐ“Ë“_‚Ş‚O‚ĚyA‚Í“o^‘ÎŹŰ‚©‚ç‚Í‚¸‚· - if(!pfxGetActive(pairs[i]) || pfxGetNumConstraints(pairs[i]) == 0 || - ((pfxGetMotionMaskA(pairs[i])&PFX_MOTION_MASK_STATIC) && (pfxGetMotionMaskB(pairs[i])&PFX_MOTION_MASK_STATIC)) ) { - if(startIndexCheck) - startIndex++; - //assign pair -> skip it because it has no constraints - pairTable[idxP] |= maskP; - totalCount++; - continue; - } - - // Ë‘¶«‚Ě`FbN - if( (bodyTable[idxA] != batchId && bodyTable[idxA] != 0xff) || - (bodyTable[idxB] != batchId && bodyTable[idxB] != 0xff) ) { - startIndexCheck = false; - //bodies of the pair are already assigned to another batch within this phase - continue; - } - - // Ë‘¶«”»’če[u‹‚É“o^ - if(pfxGetMotionMaskA(pairs[i])&PFX_MOTION_MASK_DYNAMIC) - bodyTable[idxA] = batchId; - if(pfxGetMotionMaskB(pairs[i])&PFX_MOTION_MASK_DYNAMIC) - bodyTable[idxB] = batchId; - - if(startIndexCheck) - startIndex++; - - pairTable[idxP] |= maskP; - //add the pair 'i' to the current batch - batch.pairIndices[pairId++] = i; - pairCount++; - } - - group.numPairs[phaseId*PFX_MAX_SOLVER_BATCHES+batchId] = (uint16_t)pairId; - totalCount += pairCount; - } - - group.numBatches[phaseId] = batchId; - } - - group.numPhases = phaseId; - - pool.clear(); -} - - - -void CustomSolveConstraintsParallel( - PfxConstraintPair *contactPairs,uint32_t numContactPairs, - - PfxConstraintPair *jointPairs,uint32_t numJointPairs, - btPersistentManifold* offsetContactManifolds, - btConstraintRow* offsetContactConstraintRows, - btSolverConstraint* offsetSolverConstraints, - TrbState *offsetRigStates, - PfxSolverBody *offsetSolverBodies, - uint32_t numRigidBodies, - struct btConstraintSolverIO* io, - class btThreadSupportInterface* threadSupport, - int iteration, - void* poolBuf, - int poolBytes, - class btBarrier* barrier) - { - - int maxTasks = threadSupport->getNumTasks(); -// config.taskManager->setTaskEntry(PFX_SOLVER_ENTRY); - - HeapManager pool((unsigned char*)poolBuf,poolBytes); - - { - PfxParallelGroup *cgroup = (PfxParallelGroup*)pool.allocate(sizeof(PfxParallelGroup)); - PfxParallelBatch *cbatches = (PfxParallelBatch*)pool.allocate(sizeof(PfxParallelBatch)*(PFX_MAX_SOLVER_PHASES*PFX_MAX_SOLVER_BATCHES),128); - PfxParallelGroup *jgroup = (PfxParallelGroup*)pool.allocate(sizeof(PfxParallelGroup)); - PfxParallelBatch *jbatches = (PfxParallelBatch*)pool.allocate(sizeof(PfxParallelBatch)*(PFX_MAX_SOLVER_PHASES*PFX_MAX_SOLVER_BATCHES),128); - - uint32_t tmpBytes = poolBytes - 2 * (sizeof(PfxParallelGroup) + sizeof(PfxParallelBatch)*(PFX_MAX_SOLVER_PHASES*PFX_MAX_SOLVER_BATCHES) + 128); - void *tmpBuff = pool.allocate(tmpBytes); - - { - BT_PROFILE("CustomSplitConstraints"); - CustomSplitConstraints(contactPairs,numContactPairs,*cgroup,cbatches,maxTasks,numRigidBodies,tmpBuff,tmpBytes); - CustomSplitConstraints(jointPairs,numJointPairs,*jgroup,jbatches,maxTasks,numRigidBodies,tmpBuff,tmpBytes); - } - - { - BT_PROFILE("PFX_CONSTRAINT_SOLVER_CMD_SOLVE_CONSTRAINTS"); -//#define SOLVE_SEQUENTIAL -#ifdef SOLVE_SEQUENTIAL - CustomSolveConstraintsTask( - io->solveConstraints.contactParallelGroup, - io->solveConstraints.contactParallelBatches, - io->solveConstraints.contactPairs, - io->solveConstraints.numContactPairs, - io->solveConstraints.offsetContactManifolds, - - io->solveConstraints.jointParallelGroup, - io->solveConstraints.jointParallelBatches, - io->solveConstraints.jointPairs, - io->solveConstraints.numJointPairs, - io->solveConstraints.offsetSolverConstraints, - - io->solveConstraints.offsetRigStates1, - io->solveConstraints.offsetSolverBodies, - io->solveConstraints.numRigidBodies, - io->solveConstraints.iteration,0,1,0);//arg->taskId,1,0);//,arg->maxTasks,arg->barrier); -#else - for(int t=0;tgetBarrierAddress(); - io[t].criticalsectionAddr2 = (unsigned int)spursThread->getCriticalSectionAddress(); -#endif - - threadSupport->sendRequest(1,(ppu_address_t)&io[t],t); - } - - unsigned int arg0,arg1; - for(int t=0;twaitForResponse(&arg0,&arg1); - } -#endif - } - pool.clear(); - } - - { - BT_PROFILE("PFX_CONSTRAINT_SOLVER_CMD_POST_SOLVER"); - int batch = ((int)numRigidBodies + maxTasks - 1) / maxTasks; - int rest = (int)numRigidBodies; - int start = 0; - - for(int t=0;t 0 ? batch : rest; - io[t].cmd = PFX_CONSTRAINT_SOLVER_CMD_POST_SOLVER; - io[t].postSolver.states = offsetRigStates + start; - io[t].postSolver.solverBodies = offsetSolverBodies + start; - io[t].postSolver.numRigidBodies = (uint32_t)num; - io[t].maxTasks1 = maxTasks; -#ifdef __PPU__ - BulletPE2ConstraintSolverSpursSupport* spursThread = (BulletPE2ConstraintSolverSpursSupport*) threadSupport; - io[t].barrierAddr2 = (unsigned int)spursThread->getBarrierAddress(); - io[t].criticalsectionAddr2 = (unsigned int)spursThread->getCriticalSectionAddress(); -#endif - -#ifdef SOLVE_SEQUENTIAL - CustomPostSolverTask( io[t].postSolver.states,io[t].postSolver.solverBodies, io[t].postSolver.numRigidBodies); -#else - threadSupport->sendRequest(1,(ppu_address_t)&io[t],t); -#endif - rest -= num; - start += num; - } - - unsigned int arg0,arg1; - for(int t=0;twaitForResponse(&arg0,&arg1); -#endif - } - } - -} - - - -void BPE_customConstraintSolverSequentialNew(unsigned int new_num, PfxBroadphasePair *new_pairs1 , - btPersistentManifold* offsetContactManifolds, - PfxConstraintRow* offsetContactConstraintRows, - TrbState* states,int numRigidBodies, - struct PfxSolverBody* solverBodies, - PfxConstraintPair* jointPairs, unsigned int numJoints, - btSolverConstraint* offsetSolverConstraints, - float separateBias, - float timeStep, - int iteration, - btThreadSupportInterface* solverThreadSupport, - btCriticalSection* criticalSection, - struct btConstraintSolverIO* solverIO, - btBarrier* barrier - ) -{ - - { - BT_PROFILE("pfxSetupConstraints"); - - for(uint32_t i=0;i m_mystates; - btAlignedObjectArray m_mysolverbodies; - btAlignedObjectArray m_mypairs; - btAlignedObjectArray m_jointPairs; - btAlignedObjectArray m_constraintRows; - -}; - - -btConstraintSolverIO* createSolverIO(int numThreads) -{ - return new btConstraintSolverIO[numThreads]; -} - -btParallelConstraintSolver::btParallelConstraintSolver(btThreadSupportInterface* solverThreadSupport) -{ - - m_solverThreadSupport = solverThreadSupport;//createSolverThreadSupport(maxNumThreads); - m_solverIO = createSolverIO(m_solverThreadSupport->getNumTasks()); - - m_barrier = m_solverThreadSupport->createBarrier(); - m_criticalSection = m_solverThreadSupport->createCriticalSection(); - - m_memoryCache = new btParallelSolverMemoryCache(); -} - -btParallelConstraintSolver::~btParallelConstraintSolver() -{ - delete m_memoryCache; - delete m_solverIO; - m_solverThreadSupport->deleteBarrier(m_barrier); - m_solverThreadSupport->deleteCriticalSection(m_criticalSection); -} - - - -btScalar btParallelConstraintSolver::solveGroup(btCollisionObject** bodies1,int numRigidBodies,btPersistentManifold** manifoldPtr,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer,btDispatcher* dispatcher) -{ - -/* int sz = sizeof(PfxSolverBody); - int sz2 = sizeof(vmVector3); - int sz3 = sizeof(vmMatrix3); - int sz4 = sizeof(vmQuat); - int sz5 = sizeof(btConstraintRow); - int sz6 = sizeof(btSolverConstraint); - int sz7 = sizeof(TrbState); -*/ - - btPersistentManifold* offsetContactManifolds= (btPersistentManifold*) dispatcher->getInternalManifoldPool()->getPoolAddress(); - - - m_memoryCache->m_mysolverbodies.resize(numRigidBodies); - m_memoryCache->m_mystates.resize(numRigidBodies); - - { - BT_PROFILE("create states and solver bodies"); - for (int i=0;isetCompanionId(i); - - PfxSolverBody& solverBody = m_memoryCache->m_mysolverbodies[i]; - btRigidBody* rb = btRigidBody::upcast(obj); - TrbState& state = m_memoryCache->m_mystates[i]; - - state.reset(); - const btQuaternion& orgOri = obj->getWorldTransform().getRotation(); - vmQuat orn(orgOri.getX(),orgOri.getY(),orgOri.getZ(),orgOri.getW()); - state.setPosition(getVmVector3(obj->getWorldTransform().getOrigin())); - state.setOrientation(orn); - state.setPosition(state.getPosition()); - state.setRigidBodyId(i); - state.setAngularDamping(0); - state.setLinearDamping(0); - - - solverBody.mOrientation = state.getOrientation(); - solverBody.mDeltaLinearVelocity = vmVector3(0.0f); - solverBody.mDeltaAngularVelocity = vmVector3(0.0f); - solverBody.friction = obj->getFriction(); - solverBody.restitution = obj->getRestitution(); - - state.resetSleepCount(); - - //if(state.getMotionMask()&PFX_MOTION_MASK_DYNAMIC) { - if (rb && (rb->getInvMass()>0.f)) - { - btVector3 angVelPlusForces = rb->getAngularVelocity()+rb->getTotalTorque()*rb->getInvInertiaTensorWorld()*infoGlobal.m_timeStep; - btVector3 linVelPlusForces = rb->getLinearVelocity()+rb->getTotalForce()*rb->getInvMass()*infoGlobal.m_timeStep; - - state.setAngularVelocity(btReadVector3(angVelPlusForces)); - state.setLinearVelocity(btReadVector3(linVelPlusForces)); - - state.setMotionType(PfxMotionTypeActive); - vmMatrix3 ori(solverBody.mOrientation); - vmMatrix3 localInvInertia = vmMatrix3::identity(); - localInvInertia.setCol(0,vmVector3(rb->getInvInertiaDiagLocal().getX(),0,0)); - localInvInertia.setCol(1,vmVector3(0, rb->getInvInertiaDiagLocal().getY(),0)); - localInvInertia.setCol(2,vmVector3(0,0, rb->getInvInertiaDiagLocal().getZ())); - - solverBody.mMassInv = rb->getInvMass(); - solverBody.mInertiaInv = ori * localInvInertia * transpose(ori); - } else - { - state.setAngularVelocity(vmVector3(0)); - state.setLinearVelocity(vmVector3(0)); - - state.setMotionType(PfxMotionTypeFixed); - m_memoryCache->m_mysolverbodies[i].mMassInv = 0.f; - m_memoryCache->m_mysolverbodies[i].mInertiaInv = vmMatrix3(0.0f); - } - - } - } - - - - int totalPoints = 0; -#ifndef USE_C_ARRAYS - m_memoryCache->m_mypairs.resize(numManifolds); - //4 points per manifold and 3 rows per point makes 12 rows per manifold - m_memoryCache->m_constraintRows.resize(numManifolds*12); - m_memoryCache->m_jointPairs.resize(numConstraints); -#endif//USE_C_ARRAYS - - int actualNumManifolds= 0; - { - BT_PROFILE("convert manifolds"); - for (int i1=0;i1getNumContacts()>0) - { - btPersistentManifold* m = manifoldPtr[i1]; - btCollisionObject* obA = (btCollisionObject*)m->getBody0(); - btCollisionObject* obB = (btCollisionObject*)m->getBody1(); - bool obAisActive = !obA->isStaticOrKinematicObject() && obA->isActive(); - bool obBisActive = !obB->isStaticOrKinematicObject() && obB->isActive(); - - if (!obAisActive && !obBisActive) - continue; - - - //int contactId = i1;//actualNumManifolds; - - PfxBroadphasePair& pair = m_memoryCache->m_mypairs[actualNumManifolds]; - //init those - // float compFric = obA->getFriction()*obB->getFriction();//@todo - int idA = obA->getCompanionId(); - int idB = obB->getCompanionId(); - - m->m_companionIdA = idA; - m->m_companionIdB = idB; - - - // if ((mysolverbodies[idA].mMassInv!=0)&&(mysolverbodies[idB].mMassInv!=0)) - // continue; - int numPosPoints=0; - for (int p=0;pgetNumContacts();p++) - { - //btManifoldPoint& pt = m->getContactPoint(p); - //float dist = pt.getDistance(); - //if (dist<0.001) - numPosPoints++; - } - - - totalPoints+=numPosPoints; - pfxSetRigidBodyIdA(pair,idA); - pfxSetRigidBodyIdB(pair,idB); - pfxSetMotionMaskA(pair,m_memoryCache->m_mystates[idA].getMotionMask()); - pfxSetMotionMaskB(pair,m_memoryCache->m_mystates[idB].getMotionMask()); - pfxSetActive(pair,numPosPoints>0); - - pfxSetBroadphaseFlag(pair,0); - int contactId = m-offsetContactManifolds; - //likely the contact pool is not contiguous, make sure to allocate large enough contact pool - btAssert(contactId>=0); - btAssert(contactIdgetInternalManifoldPool()->getMaxCount()); - - pfxSetContactId(pair,contactId); - pfxSetNumConstraints(pair,numPosPoints);//manifoldPtr[i]->getNumContacts()); - actualNumManifolds++; - } - - } - } - - PfxConstraintPair* jointPairs=0; - jointPairs = numConstraints? &m_memoryCache->m_jointPairs[0]:0; - int actualNumJoints=0; - - - btSolverConstraint* offsetSolverConstraints = 0; - - //if (1) - { - - { - BT_PROFILE("convert constraints"); - - int totalNumRows = 0; - int i; - - m_tmpConstraintSizesPool.resize(numConstraints); - //calculate the total number of contraint rows - for (i=0;igetInfo1(&info1); - totalNumRows += info1.m_numConstraintRows; - } - m_tmpSolverNonContactConstraintPool.resize(totalNumRows); - offsetSolverConstraints =totalNumRows? &m_tmpSolverNonContactConstraintPool[0]:0; - - - ///setup the btSolverConstraints - int currentRow = 0; - - for (i=0;igetRigidBodyA(); - btRigidBody& rbB = constraint->getRigidBodyB(); - - int idA = constraint->getRigidBodyA().getCompanionId(); - int idB = constraint->getRigidBodyB().getCompanionId(); - - - int j; - for ( j=0;jm_contactNormal1; - info2.m_J1angularAxis = currentConstraintRow->m_relpos1CrossNormal; - info2.m_J2linearAxis = currentConstraintRow->m_contactNormal2; - info2.m_J2angularAxis = currentConstraintRow->m_relpos2CrossNormal; - info2.rowskip = sizeof(btSolverConstraint)/sizeof(btScalar);//check this - ///the size of btSolverConstraint needs be a multiple of btScalar - btAssert(info2.rowskip*sizeof(btScalar)== sizeof(btSolverConstraint)); - info2.m_constraintError = ¤tConstraintRow->m_rhs; - currentConstraintRow->m_cfm = infoGlobal.m_globalCfm; - info2.cfm = ¤tConstraintRow->m_cfm; - info2.m_lowerLimit = ¤tConstraintRow->m_lowerLimit; - info2.m_upperLimit = ¤tConstraintRow->m_upperLimit; - info2.m_numIterations = infoGlobal.m_numIterations; - constraints[i]->getInfo2(&info2); - - - - - ///finalize the constraint setup - for ( j=0;jgetRigidBodyA().getInvInertiaTensorWorld()*ftorqueAxis1*constraint->getRigidBodyA().getAngularFactor(); - } - { - const btVector3& ftorqueAxis2 = solverConstraint.m_relpos2CrossNormal; - solverConstraint.m_angularComponentB = constraint->getRigidBodyB().getInvInertiaTensorWorld()*ftorqueAxis2*constraint->getRigidBodyB().getAngularFactor(); - } - - { - btVector3 iMJlA = solverConstraint.m_contactNormal1*rbA.getInvMass(); - btVector3 iMJaA = rbA.getInvInertiaTensorWorld()*solverConstraint.m_relpos1CrossNormal; - btVector3 iMJlB = solverConstraint.m_contactNormal2*rbB.getInvMass();//sign of normal? - btVector3 iMJaB = rbB.getInvInertiaTensorWorld()*solverConstraint.m_relpos2CrossNormal; - - btScalar sum = iMJlA.dot(solverConstraint.m_contactNormal1); - sum += iMJaA.dot(solverConstraint.m_relpos1CrossNormal); - sum += iMJlB.dot(solverConstraint.m_contactNormal2); - sum += iMJaB.dot(solverConstraint.m_relpos2CrossNormal); - - solverConstraint.m_jacDiagABInv = btScalar(1.)/sum; - } - - - ///fix rhs - ///todo: add force/torque accelerators - { - btScalar rel_vel; - btScalar vel1Dotn = solverConstraint.m_contactNormal1.dot(rbA.getLinearVelocity()) + solverConstraint.m_relpos1CrossNormal.dot(rbA.getAngularVelocity()); - btScalar vel2Dotn = solverConstraint.m_contactNormal2.dot(rbB.getLinearVelocity()) + solverConstraint.m_relpos2CrossNormal.dot(rbB.getAngularVelocity()); - - rel_vel = vel1Dotn+vel2Dotn; - - btScalar restitution = 0.f; - btScalar positionalError = solverConstraint.m_rhs;//already filled in by getConstraintInfo2 - btScalar velocityError = restitution - rel_vel;// * damping; - btScalar penetrationImpulse = positionalError*solverConstraint.m_jacDiagABInv; - btScalar velocityImpulse = velocityError *solverConstraint.m_jacDiagABInv; - solverConstraint.m_rhs = penetrationImpulse+velocityImpulse; - solverConstraint.m_appliedImpulse = 0.f; - - } - } - - PfxConstraintPair& pair = jointPairs[actualNumJoints]; - - int numConstraintRows= info1.m_numConstraintRows; - pfxSetNumConstraints(pair,numConstraintRows); - - - - pfxSetRigidBodyIdA(pair,idA); - pfxSetRigidBodyIdB(pair,idB); - //is this needed? - if (idA>=0) - pfxSetMotionMaskA(pair,m_memoryCache->m_mystates[idA].getMotionMask()); - if (idB>=0) - pfxSetMotionMaskB(pair,m_memoryCache->m_mystates[idB].getMotionMask()); - - pfxSetActive(pair,true); - int id = currentConstraintRow-offsetSolverConstraints; - pfxSetContactId(pair,id); - actualNumJoints++; - - - } - currentRow+=m_tmpConstraintSizesPool[i].m_numConstraintRows; - } - } - } - - - - float separateBias=0.1;//info.m_erp;//or m_erp2? - float timeStep=infoGlobal.m_timeStep; - int iteration=infoGlobal.m_numIterations; - - //create a pair for each constraints, copy over info etc - - - - - - { - BT_PROFILE("compute num contacts"); - int totalContacts =0; - - for (int i=0;im_mypairs[i]; - totalContacts += pfxGetNumConstraints(*pair); - } - //printf("numManifolds = %d\n",numManifolds); - //printf("totalContacts=%d\n",totalContacts); - } - - - -// printf("actualNumManifolds=%d\n",actualNumManifolds); - { - BT_PROFILE("BPE_customConstraintSolverSequentialNew"); - if (numRigidBodies>0 && (actualNumManifolds+actualNumJoints)>0) - { -// PFX_PRINTF("num points = %d\n",totalPoints); -// PFX_PRINTF("num points PFX = %d\n",total); - - - PfxConstraintRow* contactRows = actualNumManifolds? &m_memoryCache->m_constraintRows[0] : 0; - PfxBroadphasePair* actualPairs = m_memoryCache->m_mypairs.size() ? &m_memoryCache->m_mypairs[0] : 0; - BPE_customConstraintSolverSequentialNew( - actualNumManifolds, - actualPairs, - offsetContactManifolds, - contactRows, - &m_memoryCache->m_mystates[0],numRigidBodies, - &m_memoryCache->m_mysolverbodies[0], - jointPairs,actualNumJoints, - offsetSolverConstraints, - separateBias,timeStep,iteration, - m_solverThreadSupport,m_criticalSection,m_solverIO,m_barrier); - } - } - - //copy results back to bodies - { - BT_PROFILE("copy back"); - for (int i=0;im_mystates[i]; - if (rb && (rb->getInvMass()>0.f)) - { - rb->setLinearVelocity(btVector3(state.getLinearVelocity().getX(),state.getLinearVelocity().getY(),state.getLinearVelocity().getZ())); - rb->setAngularVelocity(btVector3(state.getAngularVelocity().getX(),state.getAngularVelocity().getY(),state.getAngularVelocity().getZ())); - } - } - } - - - return 0.f; -} diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btParallelConstraintSolver.h b/Engine/lib/bullet/src/BulletMultiThreaded/btParallelConstraintSolver.h deleted file mode 100644 index b5b475a1b..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btParallelConstraintSolver.h +++ /dev/null @@ -1,288 +0,0 @@ -/* - Copyright (C) 2010 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef __BT_PARALLEL_CONSTRAINT_SOLVER_H -#define __BT_PARALLEL_CONSTRAINT_SOLVER_H - -#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" - - - - -#include "LinearMath/btScalar.h" -#include "PlatformDefinitions.h" - - -#define PFX_MAX_SOLVER_PHASES 64 -#define PFX_MAX_SOLVER_BATCHES 16 -#define PFX_MAX_SOLVER_PAIRS 128 -#define PFX_MIN_SOLVER_PAIRS 16 - -#ifdef __CELLOS_LV2__ -ATTRIBUTE_ALIGNED128(struct) PfxParallelBatch { -#else -ATTRIBUTE_ALIGNED16(struct) PfxParallelBatch { -#endif - uint16_t pairIndices[PFX_MAX_SOLVER_PAIRS]; -}; - -#ifdef __CELLOS_LV2__ -ATTRIBUTE_ALIGNED128(struct) PfxParallelGroup { -#else -ATTRIBUTE_ALIGNED16(struct) PfxParallelGroup { -#endif - uint16_t numPhases; - uint16_t numBatches[PFX_MAX_SOLVER_PHASES]; - uint16_t numPairs[PFX_MAX_SOLVER_PHASES*PFX_MAX_SOLVER_BATCHES]; -}; - - - -ATTRIBUTE_ALIGNED16(struct) PfxSortData16 { - union { - uint8_t i8data[16]; - uint16_t i16data[8]; - uint32_t i32data[4]; -#ifdef __SPU__ - vec_uint4 vdata; -#endif - }; - -#ifdef __SPU__ - void set8(int elem,uint8_t data) {vdata=(vec_uint4)spu_insert(data,(vec_uchar16)vdata,elem);} - void set16(int elem,uint16_t data) {vdata=(vec_uint4)spu_insert(data,(vec_ushort8)vdata,elem);} - void set32(int elem,uint32_t data) {vdata=(vec_uint4)spu_insert(data,(vec_uint4)vdata,elem);} - uint8_t get8(int elem) const {return spu_extract((vec_uchar16)vdata,elem);} - uint16_t get16(int elem) const {return spu_extract((vec_ushort8)vdata,elem);} - uint32_t get32(int elem) const {return spu_extract((vec_uint4)vdata,elem);} -#else - void set8(int elem,uint8_t data) {i8data[elem] = data;} - void set16(int elem,uint16_t data) {i16data[elem] = data;} - void set32(int elem,uint32_t data) {i32data[elem] = data;} - uint8_t get8(int elem) const {return i8data[elem];} - uint16_t get16(int elem) const {return i16data[elem];} - uint32_t get32(int elem) const {return i32data[elem];} -#endif -}; - -typedef PfxSortData16 PfxConstraintPair; - - -//J PfxBroadphasePair‚Ć‹¤’Ę - -SIMD_FORCE_INLINE void pfxSetConstraintId(PfxConstraintPair &pair,uint32_t i) {pair.set32(2,i);} -SIMD_FORCE_INLINE void pfxSetNumConstraints(PfxConstraintPair &pair,uint8_t n) {pair.set8(7,n);} - -SIMD_FORCE_INLINE uint32_t pfxGetConstraintId1(const PfxConstraintPair &pair) {return pair.get32(2);} -SIMD_FORCE_INLINE uint8_t pfxGetNumConstraints(const PfxConstraintPair &pair) {return pair.get8(7);} - -typedef PfxSortData16 PfxBroadphasePair; - -SIMD_FORCE_INLINE void pfxSetRigidBodyIdA(PfxBroadphasePair &pair,uint16_t i) {pair.set16(0,i);} -SIMD_FORCE_INLINE void pfxSetRigidBodyIdB(PfxBroadphasePair &pair,uint16_t i) {pair.set16(1,i);} -SIMD_FORCE_INLINE void pfxSetMotionMaskA(PfxBroadphasePair &pair,uint8_t i) {pair.set8(4,i);} -SIMD_FORCE_INLINE void pfxSetMotionMaskB(PfxBroadphasePair &pair,uint8_t i) {pair.set8(5,i);} -SIMD_FORCE_INLINE void pfxSetBroadphaseFlag(PfxBroadphasePair &pair,uint8_t f) {pair.set8(6,(pair.get8(6)&0xf0)|(f&0x0f));} -SIMD_FORCE_INLINE void pfxSetActive(PfxBroadphasePair &pair,bool b) {pair.set8(6,(pair.get8(6)&0x0f)|((b?1:0)<<4));} -SIMD_FORCE_INLINE void pfxSetContactId(PfxBroadphasePair &pair,uint32_t i) {pair.set32(2,i);} - -SIMD_FORCE_INLINE uint16_t pfxGetRigidBodyIdA(const PfxBroadphasePair &pair) {return pair.get16(0);} -SIMD_FORCE_INLINE uint16_t pfxGetRigidBodyIdB(const PfxBroadphasePair &pair) {return pair.get16(1);} -SIMD_FORCE_INLINE uint8_t pfxGetMotionMaskA(const PfxBroadphasePair &pair) {return pair.get8(4);} -SIMD_FORCE_INLINE uint8_t pfxGetMotionMaskB(const PfxBroadphasePair &pair) {return pair.get8(5);} -SIMD_FORCE_INLINE uint8_t pfxGetBroadphaseFlag(const PfxBroadphasePair &pair) {return pair.get8(6)&0x0f;} -SIMD_FORCE_INLINE bool pfxGetActive(const PfxBroadphasePair &pair) {return (pair.get8(6)>>4)!=0;} -SIMD_FORCE_INLINE uint32_t pfxGetContactId1(const PfxBroadphasePair &pair) {return pair.get32(2);} - - - -#if defined(__PPU__) || defined (__SPU__) -ATTRIBUTE_ALIGNED128(struct) PfxSolverBody { -#else -ATTRIBUTE_ALIGNED16(struct) PfxSolverBody { -#endif - vmVector3 mDeltaLinearVelocity; - vmVector3 mDeltaAngularVelocity; - vmMatrix3 mInertiaInv; - vmQuat mOrientation; - float mMassInv; - float friction; - float restitution; - float unused; - float unused2; - float unused3; - float unused4; - float unused5; -}; - - -#ifdef __PPU__ -#include "SpuDispatch/BulletPE2ConstraintSolverSpursSupport.h" -#endif - -static SIMD_FORCE_INLINE vmVector3 btReadVector3(const double* p) -{ - float tmp[3] = {float(p[0]),float(p[1]),float(p[2])}; - vmVector3 v; - loadXYZ(v, tmp); - return v; -} - -static SIMD_FORCE_INLINE vmQuat btReadQuat(const double* p) -{ - float tmp[4] = {float(p[0]),float(p[1]),float(p[2]),float(p[4])}; - vmQuat vq; - loadXYZW(vq, tmp); - return vq; -} - -static SIMD_FORCE_INLINE void btStoreVector3(const vmVector3 &src, double* p) -{ - float tmp[3]; - vmVector3 v = src; - storeXYZ(v, tmp); - p[0] = tmp[0]; - p[1] = tmp[1]; - p[2] = tmp[2]; -} - - -static SIMD_FORCE_INLINE vmVector3 btReadVector3(const float* p) -{ - vmVector3 v; - loadXYZ(v, p); - return v; -} - -static SIMD_FORCE_INLINE vmQuat btReadQuat(const float* p) -{ - vmQuat vq; - loadXYZW(vq, p); - return vq; -} - -static SIMD_FORCE_INLINE void btStoreVector3(const vmVector3 &src, float* p) -{ - vmVector3 v = src; - storeXYZ(v, p); -} - - - - -class btPersistentManifold; - -enum { - PFX_CONSTRAINT_SOLVER_CMD_SETUP_SOLVER_BODIES, - PFX_CONSTRAINT_SOLVER_CMD_SETUP_CONTACT_CONSTRAINTS, - PFX_CONSTRAINT_SOLVER_CMD_WRITEBACK_APPLIED_IMPULSES_CONTACT_CONSTRAINTS, - PFX_CONSTRAINT_SOLVER_CMD_SETUP_JOINT_CONSTRAINTS, - PFX_CONSTRAINT_SOLVER_CMD_SOLVE_CONSTRAINTS, - PFX_CONSTRAINT_SOLVER_CMD_POST_SOLVER -}; - - -struct PfxSetupContactConstraintsIO { - PfxConstraintPair *offsetContactPairs; - uint32_t numContactPairs1; - btPersistentManifold* offsetContactManifolds; - btConstraintRow* offsetContactConstraintRows; - class TrbState *offsetRigStates; - struct PfxSolverBody *offsetSolverBodies; - uint32_t numRigidBodies; - float separateBias; - float timeStep; - class btCriticalSection* criticalSection; -}; - - - -struct PfxSolveConstraintsIO { - PfxParallelGroup *contactParallelGroup; - PfxParallelBatch *contactParallelBatches; - PfxConstraintPair *contactPairs; - uint32_t numContactPairs; - btPersistentManifold *offsetContactManifolds; - btConstraintRow* offsetContactConstraintRows; - PfxParallelGroup *jointParallelGroup; - PfxParallelBatch *jointParallelBatches; - PfxConstraintPair *jointPairs; - uint32_t numJointPairs; - struct btSolverConstraint* offsetSolverConstraints; - TrbState *offsetRigStates1; - PfxSolverBody *offsetSolverBodies; - uint32_t numRigidBodies; - uint32_t iteration; - - uint32_t taskId; - - class btBarrier* barrier; - -}; - -struct PfxPostSolverIO { - TrbState *states; - PfxSolverBody *solverBodies; - uint32_t numRigidBodies; -}; - -ATTRIBUTE_ALIGNED16(struct) btConstraintSolverIO { - uint8_t cmd; - union { - PfxSetupContactConstraintsIO setupContactConstraints; - PfxSolveConstraintsIO solveConstraints; - PfxPostSolverIO postSolver; - }; - - //SPU only - uint32_t barrierAddr2; - uint32_t criticalsectionAddr2; - uint32_t maxTasks1; -}; - - - - -void SolverThreadFunc(void* userPtr,void* lsMemory); -void* SolverlsMemoryFunc(); -///The btParallelConstraintSolver performs computations on constraint rows in parallel -///Using the cross-platform threading it supports Windows, Linux, Mac OSX and PlayStation 3 Cell SPUs -class btParallelConstraintSolver : public btSequentialImpulseConstraintSolver -{ - -protected: - struct btParallelSolverMemoryCache* m_memoryCache; - - class btThreadSupportInterface* m_solverThreadSupport; - - struct btConstraintSolverIO* m_solverIO; - class btBarrier* m_barrier; - class btCriticalSection* m_criticalSection; - - -public: - - btParallelConstraintSolver(class btThreadSupportInterface* solverThreadSupport); - - virtual ~btParallelConstraintSolver(); - - virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer,btDispatcher* dispatcher); - -}; - - - -#endif //__BT_PARALLEL_CONSTRAINT_SOLVER_H \ No newline at end of file diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/btThreadSupportInterface.h b/Engine/lib/bullet/src/BulletMultiThreaded/btThreadSupportInterface.h deleted file mode 100644 index 54f1769cf..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/btThreadSupportInterface.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef BT_THREAD_SUPPORT_INTERFACE_H -#define BT_THREAD_SUPPORT_INTERFACE_H - - -#include //for ATTRIBUTE_ALIGNED16 -#include "PlatformDefinitions.h" -#include "PpuAddressSpace.h" - -class btBarrier { -public: - btBarrier() {} - virtual ~btBarrier() {} - - virtual void sync() = 0; - virtual void setMaxCount(int n) = 0; - virtual int getMaxCount() = 0; -}; - -class btCriticalSection { -public: - btCriticalSection() {} - virtual ~btCriticalSection() {} - - ATTRIBUTE_ALIGNED16(unsigned int mCommonBuff[32]); - - virtual unsigned int getSharedParam(int i) = 0; - virtual void setSharedParam(int i,unsigned int p) = 0; - - virtual void lock() = 0; - virtual void unlock() = 0; -}; - - -class btThreadSupportInterface -{ -public: - - virtual ~btThreadSupportInterface(); - -///send messages to SPUs - virtual void sendRequest(uint32_t uiCommand, ppu_address_t uiArgument0, uint32_t uiArgument1) =0; - -///check for messages from SPUs - virtual void waitForResponse(unsigned int *puiArgument0, unsigned int *puiArgument1) =0; - - - ///non-blocking test if a task is completed. First implement all versions, and then enable this API - ///virtual bool isTaskCompleted(unsigned int *puiArgument0, unsigned int *puiArgument1, int timeOutInMilliseconds)=0; - -///start the spus (can be called at the beginning of each frame, to make sure that the right SPU program is loaded) - virtual void startSPU() =0; - -///tell the task scheduler we are done with the SPU tasks - virtual void stopSPU()=0; - - ///tell the task scheduler to use no more than numTasks tasks - virtual void setNumTasks(int numTasks)=0; - - virtual int getNumTasks() const = 0; - - virtual btBarrier* createBarrier() = 0; - - virtual btCriticalSection* createCriticalSection() = 0; - - virtual void deleteBarrier(btBarrier* barrier)=0; - - virtual void deleteCriticalSection(btCriticalSection* criticalSection)=0; - - virtual void* getThreadLocalMemory(int taskId) { return 0; } - -}; - -#endif //BT_THREAD_SUPPORT_INTERFACE_H - diff --git a/Engine/lib/bullet/src/BulletMultiThreaded/vectormath2bullet.h b/Engine/lib/bullet/src/BulletMultiThreaded/vectormath2bullet.h deleted file mode 100644 index 4cc72ac58..000000000 --- a/Engine/lib/bullet/src/BulletMultiThreaded/vectormath2bullet.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef BT_AOS_VECTORMATH_BULLET_CONVERT_H -#define BT_AOS_VECTORMATH_BULLET_CONVERT_H - -#include "PlatformDefinitions.h" -#include "LinearMath/btVector3.h" -#include "LinearMath/btQuaternion.h" -#include "LinearMath/btMatrix3x3.h" - -inline Vectormath::Aos::Vector3 getVmVector3(const btVector3& bulletVec) -{ - return Vectormath::Aos::Vector3((float)bulletVec.getX(),(float)bulletVec.getY(),(float)bulletVec.getZ()); -} - -inline btVector3 getBtVector3(const Vectormath::Aos::Vector3& vmVec) -{ - return btVector3(vmVec.getX(),vmVec.getY(),vmVec.getZ()); -} -inline btVector3 getBtVector3(const Vectormath::Aos::Point3& vmVec) -{ - return btVector3(vmVec.getX(),vmVec.getY(),vmVec.getZ()); -} - -inline Vectormath::Aos::Quat getVmQuat(const btQuaternion& bulletQuat) -{ - Vectormath::Aos::Quat vmQuat((float)bulletQuat.getX(),(float)bulletQuat.getY(),(float)bulletQuat.getZ(),(float)bulletQuat.getW()); - return vmQuat; -} - -inline btQuaternion getBtQuat(const Vectormath::Aos::Quat& vmQuat) -{ - return btQuaternion (vmQuat.getX(),vmQuat.getY(),vmQuat.getZ(),vmQuat.getW()); -} - -inline Vectormath::Aos::Matrix3 getVmMatrix3(const btMatrix3x3& btMat) -{ - Vectormath::Aos::Matrix3 mat( - getVmVector3(btMat.getColumn(0)), - getVmVector3(btMat.getColumn(1)), - getVmVector3(btMat.getColumn(2))); - return mat; -} - - -#endif //BT_AOS_VECTORMATH_BULLET_CONVERT_H diff --git a/Engine/lib/bullet/src/BulletSoftBody/CMakeLists.txt b/Engine/lib/bullet/src/BulletSoftBody/CMakeLists.txt index e66bd02d4..d43df1c67 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/CMakeLists.txt +++ b/Engine/lib/bullet/src/BulletSoftBody/CMakeLists.txt @@ -1,7 +1,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src - + ) #SUBDIRS( Solvers ) @@ -13,6 +13,7 @@ SET(BulletSoftBody_SRCS btSoftBodyRigidBodyCollisionConfiguration.cpp btSoftRigidCollisionAlgorithm.cpp btSoftRigidDynamicsWorld.cpp + btSoftMultiBodyDynamicsWorld.cpp btSoftSoftCollisionAlgorithm.cpp btDefaultSoftBodySolver.cpp @@ -26,6 +27,7 @@ SET(BulletSoftBody_HDRS btSoftBodyRigidBodyCollisionConfiguration.h btSoftRigidCollisionAlgorithm.h btSoftRigidDynamicsWorld.h + btSoftMultiBodyDynamicsWorld.h btSoftSoftCollisionAlgorithm.h btSparseSDF.h diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.cpp b/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.cpp index a0c8cca4a..d5de7c1b4 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.cpp +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.cpp @@ -18,6 +18,8 @@ subject to the following restrictions: #include "BulletSoftBody/btSoftBodySolvers.h" #include "btSoftBodyData.h" #include "LinearMath/btSerializer.h" +#include "BulletDynamics/Featherstone/btMultiBodyLinkCollider.h" +#include "BulletDynamics/Featherstone/btMultiBodyConstraint.h" // @@ -3018,6 +3020,7 @@ void btSoftBody::PSolve_Anchors(btSoftBody* psb,btScalar kst,btScalar ti) } } + // void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti) { @@ -3027,21 +3030,65 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti) { const RContact& c = psb->m_rcontacts[i]; const sCti& cti = c.m_cti; - btRigidBody* tmpRigid = (btRigidBody*)btRigidBody::upcast(cti.m_colObj); - - const btVector3 va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0); - const btVector3 vb = c.m_node->m_x-c.m_node->m_q; - const btVector3 vr = vb-va; - const btScalar dn = btDot(vr, cti.m_normal); - if(dn<=SIMD_EPSILON) + if (cti.m_colObj->hasContactResponse()) { - const btScalar dp = btMin( (btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg ); - const btVector3 fv = vr - (cti.m_normal * dn); - // c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient - const btVector3 impulse = c.m_c0 * ( (vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst ); - c.m_node->m_x -= impulse * c.m_c2; - if (tmpRigid) - tmpRigid->applyImpulse(impulse,c.m_c1); + btVector3 va(0,0,0); + btRigidBody* rigidCol; + btMultiBodyLinkCollider* multibodyLinkCol; + btScalar* deltaV; + btMultiBodyJacobianData jacobianData; + if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY) + { + rigidCol = (btRigidBody*)btRigidBody::upcast(cti.m_colObj); + va = rigidCol ? rigidCol->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0); + } + else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK) + { + multibodyLinkCol = (btMultiBodyLinkCollider*)btMultiBodyLinkCollider::upcast(cti.m_colObj); + if (multibodyLinkCol) + { + const int ndof = multibodyLinkCol->m_multiBody->getNumDofs() + 6; + jacobianData.m_jacobians.resize(ndof); + jacobianData.m_deltaVelocitiesUnitImpulse.resize(ndof); + btScalar* jac=&jacobianData.m_jacobians[0]; + + multibodyLinkCol->m_multiBody->fillContactJacobianMultiDof(multibodyLinkCol->m_link, c.m_node->m_x, cti.m_normal, jac, jacobianData.scratch_r, jacobianData.scratch_v, jacobianData.scratch_m); + deltaV = &jacobianData.m_deltaVelocitiesUnitImpulse[0]; + multibodyLinkCol->m_multiBody->calcAccelerationDeltasMultiDof(&jacobianData.m_jacobians[0],deltaV,jacobianData.scratch_r, jacobianData.scratch_v); + + btScalar vel = 0.0; + for (int j = 0; j < ndof ; ++j) { + vel += multibodyLinkCol->m_multiBody->getVelocityVector()[j] * jac[j]; + } + va = cti.m_normal*vel*dt; + } + } + + const btVector3 vb = c.m_node->m_x-c.m_node->m_q; + const btVector3 vr = vb-va; + const btScalar dn = btDot(vr, cti.m_normal); + if(dn<=SIMD_EPSILON) + { + const btScalar dp = btMin( (btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg ); + const btVector3 fv = vr - (cti.m_normal * dn); + // c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient + const btVector3 impulse = c.m_c0 * ( (vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst ); + c.m_node->m_x -= impulse * c.m_c2; + + if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY) + { + if (rigidCol) + rigidCol->applyImpulse(impulse,c.m_c1); + } + else if (cti.m_colObj->getInternalType() == btCollisionObject::CO_FEATHERSTONE_LINK) + { + if (multibodyLinkCol) + { + double multiplier = 0.5; + multibodyLinkCol->m_multiBody->applyDeltaVeeMultiDof(deltaV,-impulse.length()*multiplier); + } + } + } } } } @@ -3603,8 +3650,8 @@ const char* btSoftBody::serialize(void* dataBuffer, class btSerializer* serializ m_joints[i]->m_refs[0].serializeFloat(memPtr->m_refs[0]); m_joints[i]->m_refs[1].serializeFloat(memPtr->m_refs[1]); memPtr->m_cfm = m_joints[i]->m_cfm; - memPtr->m_erp = m_joints[i]->m_erp; - memPtr->m_split = m_joints[i]->m_split; + memPtr->m_erp = float(m_joints[i]->m_erp); + memPtr->m_split = float(m_joints[i]->m_split); memPtr->m_delete = m_joints[i]->m_delete; for (int j=0;j<4;j++) diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.h b/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.h index ee1a3d952..bd5846bfb 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.h +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftBody.h @@ -171,6 +171,7 @@ public: /* ImplicitFn */ struct ImplicitFn { + virtual ~ImplicitFn() {} virtual btScalar Eval(const btVector3& x)=0; }; @@ -528,6 +529,7 @@ public: { struct IControl { + virtual ~IControl() {} virtual void Prepare(AJoint*) {} virtual btScalar Speed(AJoint*,btScalar current) { return(current); } static IControl* Default() { static IControl def;return(&def); } diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp index 9f0d44526..ab84bddf2 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp @@ -120,8 +120,8 @@ void btSoftBodyTriangleCallback::processTriangle(btVector3* triangle,int partId, btCollisionObjectWrapper softBody(0,m_softBody->getCollisionShape(),m_softBody,m_softBody->getWorldTransform(),-1,-1); //btCollisionObjectWrapper triBody(0,tm, ob, btTransform::getIdentity());//ob->getWorldTransform());//?? btCollisionObjectWrapper triBody(0,tm, m_triBody, m_triBody->getWorldTransform(),partId, triangleIndex); - - btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(&softBody,&triBody,0);//m_manifoldPtr); + ebtDispatcherQueryType algoType = m_resultOut->m_closestPointDistanceThreshold > 0 ? BT_CLOSEST_POINT_ALGORITHMS : BT_CONTACT_POINT_ALGORITHMS; + btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(&softBody,&triBody,0, algoType);//m_manifoldPtr); colAlgo->processCollision(&softBody,&triBody,*m_dispatchInfoPtr,m_resultOut); colAlgo->~btCollisionAlgorithm(); @@ -164,7 +164,8 @@ void btSoftBodyTriangleCallback::processTriangle(btVector3* triangle,int partId, btCollisionObjectWrapper softBody(0,m_softBody->getCollisionShape(),m_softBody,m_softBody->getWorldTransform(),-1,-1); btCollisionObjectWrapper triBody(0,tm, m_triBody, m_triBody->getWorldTransform(),partId, triangleIndex);//btTransform::getIdentity());//?? - btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(&softBody,&triBody,0);//m_manifoldPtr); + ebtDispatcherQueryType algoType = m_resultOut->m_closestPointDistanceThreshold > 0 ? BT_CLOSEST_POINT_ALGORITHMS : BT_CONTACT_POINT_ALGORITHMS; + btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(&softBody,&triBody,0, algoType);//m_manifoldPtr); colAlgo->processCollision(&softBody,&triBody,*m_dispatchInfoPtr,m_resultOut); colAlgo->~btCollisionAlgorithm(); diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.cpp b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.cpp index 36f675a6c..293a393e5 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.cpp +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.cpp @@ -480,6 +480,168 @@ void btSoftBodyHelpers::DrawClusterTree( btSoftBody* psb, drawTree(idraw,psb->m_cdbvt.m_root,0,btVector3(0,1,1),btVector3(1,0,0),mindepth,maxdepth); } + +//The btSoftBody object from the BulletSDK includes an array of Nodes and Links. These links appear +// to be first set up to connect a node to between 5 and 6 of its neighbors [480 links], +//and then to the rest of the nodes after the execution of the Floyd-Warshall graph algorithm +//[another 930 links]. +//The way the links are stored by default, we have a number of cases where adjacent links share a node in common +// - this leads to the creation of a data dependency through memory. +//The PSolve_Links() function reads and writes nodes as it iterates over each link. +//So, we now have the possibility of a data dependency between iteration X +//that processes link L with iteration X+1 that processes link L+1 +//because L and L+1 have one node in common, and iteration X updates the positions of that node, +//and iteration X+1 reads in the position of that shared node. +// +//Such a memory dependency limits the ability of a modern CPU to speculate beyond +//a certain point because it has to respect a possible dependency +//- this prevents the CPU from making full use of its out-of-order resources. +//If we re-order the links such that we minimize the cases where a link L and L+1 share a common node, +//we create a temporal gap between when the node position is written, +//and when it is subsequently read. This in turn allows the CPU to continue execution without +//risking a dependency violation. Such a reordering would result in significant speedups on +//modern CPUs with lots of execution resources. +//In our testing, we see it have a tremendous impact not only on the A7, +//but also on all x86 cores that ship with modern Macs. +//The attached source file includes a single function (ReoptimizeLinkOrder) which can be called on a +//btSoftBody object in the solveConstraints() function before the actual solver is invoked, +//or right after generateBendingConstraints() once we have all 1410 links. + + +//=================================================================== +// +// +// This function takes in a list of interdependent Links and tries +// to maximize the distance between calculation +// of dependent links. This increases the amount of parallelism that can +// be exploited by out-of-order instruction processors with large but +// (inevitably) finite instruction windows. +// +//=================================================================== + +// A small structure to track lists of dependent link calculations +class LinkDeps_t { + public: + int value; // A link calculation that is dependent on this one + // Positive values = "input A" while negative values = "input B" + LinkDeps_t *next; // Next dependence in the list +}; +typedef LinkDeps_t *LinkDepsPtr_t; + +// Dependency list constants +#define REOP_NOT_DEPENDENT -1 +#define REOP_NODE_COMPLETE -2 // Must be less than REOP_NOT_DEPENDENT + + +void btSoftBodyHelpers::ReoptimizeLinkOrder(btSoftBody *psb /* This can be replaced by a btSoftBody pointer */) +{ + int i, nLinks=psb->m_links.size(), nNodes=psb->m_nodes.size(); + btSoftBody::Link *lr; + int ar, br; + btSoftBody::Node *node0 = &(psb->m_nodes[0]); + btSoftBody::Node *node1 = &(psb->m_nodes[1]); + LinkDepsPtr_t linkDep; + int readyListHead, readyListTail, linkNum, linkDepFrees, depLink; + + // Allocate temporary buffers + int *nodeWrittenAt = new int[nNodes+1]; // What link calculation produced this node's current values? + int *linkDepA = new int[nLinks]; // Link calculation input is dependent upon prior calculation #N + int *linkDepB = new int[nLinks]; + int *readyList = new int[nLinks]; // List of ready-to-process link calculations (# of links, maximum) + LinkDeps_t *linkDepFreeList = new LinkDeps_t[2*nLinks]; // Dependent-on-me list elements (2x# of links, maximum) + LinkDepsPtr_t *linkDepListStarts = new LinkDepsPtr_t[nLinks]; // Start nodes of dependent-on-me lists, one for each link + + // Copy the original, unsorted links to a side buffer + btSoftBody::Link *linkBuffer = new btSoftBody::Link[nLinks]; + memcpy(linkBuffer, &(psb->m_links[0]), sizeof(btSoftBody::Link)*nLinks); + + // Clear out the node setup and ready list + for (i=0; i < nNodes+1; i++) { + nodeWrittenAt[i] = REOP_NOT_DEPENDENT; + } + for (i=0; i < nLinks; i++) { + linkDepListStarts[i] = NULL; + } + readyListHead = readyListTail = linkDepFrees = 0; + + // Initial link analysis to set up data structures + for (i=0; i < nLinks; i++) { + + // Note which prior link calculations we are dependent upon & build up dependence lists + lr = &(psb->m_links[i]); + ar = (lr->m_n[0] - node0)/(node1 - node0); + br = (lr->m_n[1] - node0)/(node1 - node0); + if (nodeWrittenAt[ar] > REOP_NOT_DEPENDENT) { + linkDepA[i] = nodeWrittenAt[ar]; + linkDep = &linkDepFreeList[linkDepFrees++]; + linkDep->value = i; + linkDep->next = linkDepListStarts[nodeWrittenAt[ar]]; + linkDepListStarts[nodeWrittenAt[ar]] = linkDep; + } else { + linkDepA[i] = REOP_NOT_DEPENDENT; + } + if (nodeWrittenAt[br] > REOP_NOT_DEPENDENT) { + linkDepB[i] = nodeWrittenAt[br]; + linkDep = &linkDepFreeList[linkDepFrees++]; + linkDep->value = -(i+1); + linkDep->next = linkDepListStarts[nodeWrittenAt[br]]; + linkDepListStarts[nodeWrittenAt[br]] = linkDep; + } else { + linkDepB[i] = REOP_NOT_DEPENDENT; + } + + // Add this link to the initial ready list, if it is not dependent on any other links + if ((linkDepA[i] == REOP_NOT_DEPENDENT) && (linkDepB[i] == REOP_NOT_DEPENDENT)) { + readyList[readyListTail++] = i; + linkDepA[i] = linkDepB[i] = REOP_NODE_COMPLETE; // Probably not needed now + } + + // Update the nodes to mark which ones are calculated by this link + nodeWrittenAt[ar] = nodeWrittenAt[br] = i; + } + + // Process the ready list and create the sorted list of links + // -- By treating the ready list as a queue, we maximize the distance between any + // inter-dependent node calculations + // -- All other (non-related) nodes in the ready list will automatically be inserted + // in between each set of inter-dependent link calculations by this loop + i = 0; + while (readyListHead != readyListTail) { + // Use ready list to select the next link to process + linkNum = readyList[readyListHead++]; + // Copy the next-to-calculate link back into the original link array + psb->m_links[i++] = linkBuffer[linkNum]; + + // Free up any link inputs that are dependent on this one + linkDep = linkDepListStarts[linkNum]; + while (linkDep) { + depLink = linkDep->value; + if (depLink >= 0) { + linkDepA[depLink] = REOP_NOT_DEPENDENT; + } else { + depLink = -depLink - 1; + linkDepB[depLink] = REOP_NOT_DEPENDENT; + } + // Add this dependent link calculation to the ready list if *both* inputs are clear + if ((linkDepA[depLink] == REOP_NOT_DEPENDENT) && (linkDepB[depLink] == REOP_NOT_DEPENDENT)) { + readyList[readyListTail++] = depLink; + linkDepA[depLink] = linkDepB[depLink] = REOP_NODE_COMPLETE; // Probably not needed now + } + linkDep = linkDep->next; + } + } + + // Delete the temporary buffers + delete [] nodeWrittenAt; + delete [] linkDepA; + delete [] linkDepB; + delete [] readyList; + delete [] linkDepFreeList; + delete [] linkDepListStarts; + delete [] linkBuffer; +} + + // void btSoftBodyHelpers::DrawFrame( btSoftBody* psb, btIDebugDraw* idraw) diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.h b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.h index 620a52fe3..727153010 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.h +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyHelpers.h @@ -137,7 +137,12 @@ struct btSoftBodyHelpers bool bfacelinks, bool btetralinks, bool bfacesfromtetras); - + + /// Sort the list of links to move link calculations that are dependent upon earlier + /// ones as far as possible away from the calculation of those values + /// This tends to make adjacent loop iterations not dependent upon one another, + /// so out-of-order processors can execute instructions from multiple iterations at once + static void ReoptimizeLinkOrder(btSoftBody *psb ); }; #endif //BT_SOFT_BODY_HELPERS_H diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyInternals.h b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyInternals.h index 19d0543ef..759509a1d 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyInternals.h +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftBodyInternals.h @@ -161,7 +161,7 @@ public: } virtual btScalar getMargin() const { - return getMargin(); + return btConvexInternalShape::getMargin(); } }; diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp b/Engine/lib/bullet/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp new file mode 100644 index 000000000..ffa243ebf --- /dev/null +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp @@ -0,0 +1,367 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#include "btSoftMultiBodyDynamicsWorld.h" +#include "LinearMath/btQuickprof.h" + +//softbody & helpers +#include "BulletSoftBody/btSoftBody.h" +#include "BulletSoftBody/btSoftBodyHelpers.h" +#include "BulletSoftBody/btSoftBodySolvers.h" +#include "BulletSoftBody/btDefaultSoftBodySolver.h" +#include "LinearMath/btSerializer.h" + + +btSoftMultiBodyDynamicsWorld::btSoftMultiBodyDynamicsWorld( + btDispatcher* dispatcher, + btBroadphaseInterface* pairCache, + btMultiBodyConstraintSolver* constraintSolver, + btCollisionConfiguration* collisionConfiguration, + btSoftBodySolver *softBodySolver ) : + btMultiBodyDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration), + m_softBodySolver( softBodySolver ), + m_ownsSolver(false) +{ + if( !m_softBodySolver ) + { + void* ptr = btAlignedAlloc(sizeof(btDefaultSoftBodySolver),16); + m_softBodySolver = new(ptr) btDefaultSoftBodySolver(); + m_ownsSolver = true; + } + + m_drawFlags = fDrawFlags::Std; + m_drawNodeTree = true; + m_drawFaceTree = false; + m_drawClusterTree = false; + m_sbi.m_broadphase = pairCache; + m_sbi.m_dispatcher = dispatcher; + m_sbi.m_sparsesdf.Initialize(); + m_sbi.m_sparsesdf.Reset(); + + m_sbi.air_density = (btScalar)1.2; + m_sbi.water_density = 0; + m_sbi.water_offset = 0; + m_sbi.water_normal = btVector3(0,0,0); + m_sbi.m_gravity.setValue(0,-10,0); + + m_sbi.m_sparsesdf.Initialize(); + + +} + +btSoftMultiBodyDynamicsWorld::~btSoftMultiBodyDynamicsWorld() +{ + if (m_ownsSolver) + { + m_softBodySolver->~btSoftBodySolver(); + btAlignedFree(m_softBodySolver); + } +} + +void btSoftMultiBodyDynamicsWorld::predictUnconstraintMotion(btScalar timeStep) +{ + btDiscreteDynamicsWorld::predictUnconstraintMotion( timeStep ); + { + BT_PROFILE("predictUnconstraintMotionSoftBody"); + m_softBodySolver->predictMotion( float(timeStep) ); + } +} + +void btSoftMultiBodyDynamicsWorld::internalSingleStepSimulation( btScalar timeStep ) +{ + + // Let the solver grab the soft bodies and if necessary optimize for it + m_softBodySolver->optimize( getSoftBodyArray() ); + + if( !m_softBodySolver->checkInitialized() ) + { + btAssert( "Solver initialization failed\n" ); + } + + btDiscreteDynamicsWorld::internalSingleStepSimulation( timeStep ); + + ///solve soft bodies constraints + solveSoftBodiesConstraints( timeStep ); + + //self collisions + for ( int i=0;idefaultCollisionHandler(psb); + } + + ///update soft bodies + m_softBodySolver->updateSoftBodies( ); + + // End solver-wise simulation step + // /////////////////////////////// + +} + +void btSoftMultiBodyDynamicsWorld::solveSoftBodiesConstraints( btScalar timeStep ) +{ + BT_PROFILE("solveSoftConstraints"); + + if(m_softBodies.size()) + { + btSoftBody::solveClusters(m_softBodies); + } + + // Solve constraints solver-wise + m_softBodySolver->solveConstraints( timeStep * m_softBodySolver->getTimeScale() ); + +} + +void btSoftMultiBodyDynamicsWorld::addSoftBody(btSoftBody* body,short int collisionFilterGroup,short int collisionFilterMask) +{ + m_softBodies.push_back(body); + + // Set the soft body solver that will deal with this body + // to be the world's solver + body->setSoftBodySolver( m_softBodySolver ); + + btCollisionWorld::addCollisionObject(body, + collisionFilterGroup, + collisionFilterMask); + +} + +void btSoftMultiBodyDynamicsWorld::removeSoftBody(btSoftBody* body) +{ + m_softBodies.remove(body); + + btCollisionWorld::removeCollisionObject(body); +} + +void btSoftMultiBodyDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject) +{ + btSoftBody* body = btSoftBody::upcast(collisionObject); + if (body) + removeSoftBody(body); + else + btDiscreteDynamicsWorld::removeCollisionObject(collisionObject); +} + +void btSoftMultiBodyDynamicsWorld::debugDrawWorld() +{ + btDiscreteDynamicsWorld::debugDrawWorld(); + + if (getDebugDrawer()) + { + int i; + for ( i=0;im_softBodies.size();i++) + { + btSoftBody* psb=(btSoftBody*)this->m_softBodies[i]; + if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe))) + { + btSoftBodyHelpers::DrawFrame(psb,m_debugDrawer); + btSoftBodyHelpers::Draw(psb,m_debugDrawer,m_drawFlags); + } + + if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb)) + { + if(m_drawNodeTree) btSoftBodyHelpers::DrawNodeTree(psb,m_debugDrawer); + if(m_drawFaceTree) btSoftBodyHelpers::DrawFaceTree(psb,m_debugDrawer); + if(m_drawClusterTree) btSoftBodyHelpers::DrawClusterTree(psb,m_debugDrawer); + } + } + } +} + + + + +struct btSoftSingleRayCallback : public btBroadphaseRayCallback +{ + btVector3 m_rayFromWorld; + btVector3 m_rayToWorld; + btTransform m_rayFromTrans; + btTransform m_rayToTrans; + btVector3 m_hitNormal; + + const btSoftMultiBodyDynamicsWorld* m_world; + btCollisionWorld::RayResultCallback& m_resultCallback; + + btSoftSingleRayCallback(const btVector3& rayFromWorld,const btVector3& rayToWorld,const btSoftMultiBodyDynamicsWorld* world,btCollisionWorld::RayResultCallback& resultCallback) + :m_rayFromWorld(rayFromWorld), + m_rayToWorld(rayToWorld), + m_world(world), + m_resultCallback(resultCallback) + { + m_rayFromTrans.setIdentity(); + m_rayFromTrans.setOrigin(m_rayFromWorld); + m_rayToTrans.setIdentity(); + m_rayToTrans.setOrigin(m_rayToWorld); + + btVector3 rayDir = (rayToWorld-rayFromWorld); + + rayDir.normalize (); + ///what about division by zero? --> just set rayDirection[i] to INF/1e30 + m_rayDirectionInverse[0] = rayDir[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[0]; + m_rayDirectionInverse[1] = rayDir[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[1]; + m_rayDirectionInverse[2] = rayDir[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDir[2]; + m_signs[0] = m_rayDirectionInverse[0] < 0.0; + m_signs[1] = m_rayDirectionInverse[1] < 0.0; + m_signs[2] = m_rayDirectionInverse[2] < 0.0; + + m_lambda_max = rayDir.dot(m_rayToWorld-m_rayFromWorld); + + } + + + + virtual bool process(const btBroadphaseProxy* proxy) + { + ///terminate further ray tests, once the closestHitFraction reached zero + if (m_resultCallback.m_closestHitFraction == btScalar(0.f)) + return false; + + btCollisionObject* collisionObject = (btCollisionObject*)proxy->m_clientObject; + + //only perform raycast if filterMask matches + if(m_resultCallback.needsCollision(collisionObject->getBroadphaseHandle())) + { + //RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject(); + //btVector3 collisionObjectAabbMin,collisionObjectAabbMax; +#if 0 +#ifdef RECALCULATE_AABB + btVector3 collisionObjectAabbMin,collisionObjectAabbMax; + collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax); +#else + //getBroadphase()->getAabb(collisionObject->getBroadphaseHandle(),collisionObjectAabbMin,collisionObjectAabbMax); + const btVector3& collisionObjectAabbMin = collisionObject->getBroadphaseHandle()->m_aabbMin; + const btVector3& collisionObjectAabbMax = collisionObject->getBroadphaseHandle()->m_aabbMax; +#endif +#endif + //btScalar hitLambda = m_resultCallback.m_closestHitFraction; + //culling already done by broadphase + //if (btRayAabb(m_rayFromWorld,m_rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,m_hitNormal)) + { + m_world->rayTestSingle(m_rayFromTrans,m_rayToTrans, + collisionObject, + collisionObject->getCollisionShape(), + collisionObject->getWorldTransform(), + m_resultCallback); + } + } + return true; + } +}; + +void btSoftMultiBodyDynamicsWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const +{ + BT_PROFILE("rayTest"); + /// use the broadphase to accelerate the search for objects, based on their aabb + /// and for each object with ray-aabb overlap, perform an exact ray test + btSoftSingleRayCallback rayCB(rayFromWorld,rayToWorld,this,resultCallback); + +#ifndef USE_BRUTEFORCE_RAYBROADPHASE + m_broadphasePairCache->rayTest(rayFromWorld,rayToWorld,rayCB); +#else + for (int i=0;igetNumCollisionObjects();i++) + { + rayCB.process(m_collisionObjects[i]->getBroadphaseHandle()); + } +#endif //USE_BRUTEFORCE_RAYBROADPHASE + +} + + +void btSoftMultiBodyDynamicsWorld::rayTestSingle(const btTransform& rayFromTrans,const btTransform& rayToTrans, + btCollisionObject* collisionObject, + const btCollisionShape* collisionShape, + const btTransform& colObjWorldTransform, + RayResultCallback& resultCallback) +{ + if (collisionShape->isSoftBody()) { + btSoftBody* softBody = btSoftBody::upcast(collisionObject); + if (softBody) { + btSoftBody::sRayCast softResult; + if (softBody->rayTest(rayFromTrans.getOrigin(), rayToTrans.getOrigin(), softResult)) + { + + if (softResult.fraction<= resultCallback.m_closestHitFraction) + { + + btCollisionWorld::LocalShapeInfo shapeInfo; + shapeInfo.m_shapePart = 0; + shapeInfo.m_triangleIndex = softResult.index; + // get the normal + btVector3 rayDir = rayToTrans.getOrigin() - rayFromTrans.getOrigin(); + btVector3 normal=-rayDir; + normal.normalize(); + + if (softResult.feature == btSoftBody::eFeature::Face) + { + normal = softBody->m_faces[softResult.index].m_normal; + if (normal.dot(rayDir) > 0) { + // normal always point toward origin of the ray + normal = -normal; + } + } + + btCollisionWorld::LocalRayResult rayResult + (collisionObject, + &shapeInfo, + normal, + softResult.fraction); + bool normalInWorldSpace = true; + resultCallback.addSingleResult(rayResult,normalInWorldSpace); + } + } + } + } + else { + btCollisionWorld::rayTestSingle(rayFromTrans,rayToTrans,collisionObject,collisionShape,colObjWorldTransform,resultCallback); + } +} + + +void btSoftMultiBodyDynamicsWorld::serializeSoftBodies(btSerializer* serializer) +{ + int i; + //serialize all collision objects + for (i=0;igetInternalType() & btCollisionObject::CO_SOFT_BODY) + { + int len = colObj->calculateSerializeBufferSize(); + btChunk* chunk = serializer->allocate(len,1); + const char* structType = colObj->serialize(chunk->m_oldPtr, serializer); + serializer->finalizeChunk(chunk,structType,BT_SOFTBODY_CODE,colObj); + } + } + +} + +void btSoftMultiBodyDynamicsWorld::serialize(btSerializer* serializer) +{ + + serializer->startSerialization(); + + serializeDynamicsWorldInfo( serializer); + + serializeSoftBodies(serializer); + + serializeRigidBodies(serializer); + + serializeCollisionObjects(serializer); + + serializer->finishSerialization(); +} + + diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h b/Engine/lib/bullet/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h new file mode 100644 index 000000000..2d0423a44 --- /dev/null +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h @@ -0,0 +1,108 @@ +/* +Bullet Continuous Collision Detection and Physics Library +Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H +#define BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H + +#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" +#include "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h" +#include "BulletSoftBody/btSoftBody.h" + +typedef btAlignedObjectArray btSoftBodyArray; + +class btSoftBodySolver; + +class btSoftMultiBodyDynamicsWorld : public btMultiBodyDynamicsWorld +{ + + btSoftBodyArray m_softBodies; + int m_drawFlags; + bool m_drawNodeTree; + bool m_drawFaceTree; + bool m_drawClusterTree; + btSoftBodyWorldInfo m_sbi; + ///Solver classes that encapsulate multiple soft bodies for solving + btSoftBodySolver *m_softBodySolver; + bool m_ownsSolver; + +protected: + + virtual void predictUnconstraintMotion(btScalar timeStep); + + virtual void internalSingleStepSimulation( btScalar timeStep); + + void solveSoftBodiesConstraints( btScalar timeStep ); + + void serializeSoftBodies(btSerializer* serializer); + +public: + + btSoftMultiBodyDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btMultiBodyConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration, btSoftBodySolver *softBodySolver = 0 ); + + virtual ~btSoftMultiBodyDynamicsWorld(); + + virtual void debugDrawWorld(); + + void addSoftBody(btSoftBody* body,short int collisionFilterGroup=btBroadphaseProxy::DefaultFilter,short int collisionFilterMask=btBroadphaseProxy::AllFilter); + + void removeSoftBody(btSoftBody* body); + + ///removeCollisionObject will first check if it is a rigid body, if so call removeRigidBody otherwise call btDiscreteDynamicsWorld::removeCollisionObject + virtual void removeCollisionObject(btCollisionObject* collisionObject); + + int getDrawFlags() const { return(m_drawFlags); } + void setDrawFlags(int f) { m_drawFlags=f; } + + btSoftBodyWorldInfo& getWorldInfo() + { + return m_sbi; + } + const btSoftBodyWorldInfo& getWorldInfo() const + { + return m_sbi; + } + + virtual btDynamicsWorldType getWorldType() const + { + return BT_SOFT_MULTIBODY_DYNAMICS_WORLD; + } + + btSoftBodyArray& getSoftBodyArray() + { + return m_softBodies; + } + + const btSoftBodyArray& getSoftBodyArray() const + { + return m_softBodies; + } + + + virtual void rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const; + + /// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest. + /// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape. + /// This allows more customization. + static void rayTestSingle(const btTransform& rayFromTrans,const btTransform& rayToTrans, + btCollisionObject* collisionObject, + const btCollisionShape* collisionShape, + const btTransform& colObjWorldTransform, + RayResultCallback& resultCallback); + + virtual void serialize(btSerializer* serializer); + +}; + +#endif //BT_SOFT_MULTIBODY_DYNAMICS_WORLD_H diff --git a/Engine/lib/bullet/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/Engine/lib/bullet/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp index 5f3593545..653d5a06b 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp +++ b/Engine/lib/bullet/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp @@ -76,7 +76,7 @@ void btSoftRigidDynamicsWorld::predictUnconstraintMotion(btScalar timeStep) btDiscreteDynamicsWorld::predictUnconstraintMotion( timeStep ); { BT_PROFILE("predictUnconstraintMotionSoftBody"); - m_softBodySolver->predictMotion( timeStep ); + m_softBodySolver->predictMotion( float(timeStep) ); } } diff --git a/Engine/lib/bullet/src/BulletSoftBody/premake4.lua b/Engine/lib/bullet/src/BulletSoftBody/premake4.lua index 339043f5f..ce384de2c 100644 --- a/Engine/lib/bullet/src/BulletSoftBody/premake4.lua +++ b/Engine/lib/bullet/src/BulletSoftBody/premake4.lua @@ -1,7 +1,7 @@ project "BulletSoftBody" kind "StaticLib" - targetdir "../../lib" + includedirs { "..", } diff --git a/Engine/lib/bullet/src/CMakeLists.txt b/Engine/lib/bullet/src/CMakeLists.txt index 3a736b42d..bbeabafbb 100644 --- a/Engine/lib/bullet/src/CMakeLists.txt +++ b/Engine/lib/bullet/src/CMakeLists.txt @@ -1,8 +1,11 @@ + +IF(BUILD_BULLET3) + SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common ) + SUBDIRS( BulletInverseDynamics ) +ENDIF(BUILD_BULLET3) + SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) -IF(BUILD_MULTITHREADING) - SUBDIRS(MiniCL BulletMultiThreaded) -ENDIF() IF(INSTALL_LIBS) #INSTALL of other files requires CMake 2.6 @@ -10,23 +13,7 @@ IF(INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) # Don't actually need to install any common files, the frameworks include everything ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h Bullet-C-Api.h DESTINATION ${INCLUDE_INSTALL_DIR}) - INSTALL(FILES vectormath/vmInclude.h DESTINATION ${INCLUDE_INSTALL_DIR}/vectormath) - INSTALL(FILES vectormath/scalar/boolInVec.h - vectormath/scalar/floatInVec.h - vectormath/scalar/mat_aos.h - vectormath/scalar/quat_aos.h - vectormath/scalar/vec_aos.h - vectormath/scalar/vectormath_aos.h - DESTINATION ${INCLUDE_INSTALL_DIR}/vectormath/scalar) - INSTALL(FILES vectormath/sse/boolInVec.h - vectormath/sse/floatInVec.h - vectormath/sse/mat_aos.h - vectormath/sse/quat_aos.h - vectormath/sse/vec_aos.h - vectormath/sse/vecidx_aos.h - vectormath/sse/vectormath_aos.h - DESTINATION ${INCLUDE_INSTALL_DIR}/vectormath/sse) + INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h DESTINATION ${INCLUDE_INSTALL_DIR}) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ENDIF(INSTALL_LIBS) diff --git a/Engine/lib/bullet/src/LinearMath/CMakeLists.txt b/Engine/lib/bullet/src/LinearMath/CMakeLists.txt index 8d8a54b9e..9c1980442 100644 --- a/Engine/lib/bullet/src/LinearMath/CMakeLists.txt +++ b/Engine/lib/bullet/src/LinearMath/CMakeLists.txt @@ -11,6 +11,7 @@ SET(LinearMath_SRCS btPolarDecomposition.cpp btQuickprof.cpp btSerializer.cpp + btThreads.cpp btVector3.cpp ) @@ -38,6 +39,7 @@ SET(LinearMath_HDRS btScalar.h btSerializer.h btStackAlloc.h + btThreads.h btTransform.h btTransformUtil.h btVector3.h @@ -54,7 +56,7 @@ IF (INSTALL_LIBS) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS LinearMath DESTINATION .) ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS LinearMath + INSTALL(TARGETS LinearMath RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/Engine/lib/bullet/src/LinearMath/btAlignedAllocator.cpp b/Engine/lib/bullet/src/LinearMath/btAlignedAllocator.cpp index a65296c6a..e5f6040c4 100644 --- a/Engine/lib/bullet/src/LinearMath/btAlignedAllocator.cpp +++ b/Engine/lib/bullet/src/LinearMath/btAlignedAllocator.cpp @@ -105,30 +105,94 @@ void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc) } #ifdef BT_DEBUG_MEMORY_ALLOCATIONS + +static int allocations_id[10241024]; +static int allocations_bytes[10241024]; +static int mynumallocs = 0; +#include + +int btDumpMemoryLeaks() +{ + int totalLeak = 0; + + for (int i=0;i +struct btDebugPtrMagic +{ + union + { + void** vptrptr; + void* vptr; + int* iptr; + char* cptr; + }; +}; + + void* btAlignedAllocInternal (size_t size, int alignment,int line,char* filename) { + if (size==0) + { + printf("Whaat? size==0"); + return 0; + } + static int allocId = 0; + void *ret; char *real; +// to find some particular memory leak, you could do something like this: +// if (allocId==172) +// { +// printf("catch me!\n"); +// } +// if (size>1024*1024) +// { +// printf("big alloc!%d\n", size); +// } + gTotalBytesAlignedAllocs += size; gNumAlignedAllocs++; - real = (char *)sAllocFunc(size + 2*sizeof(void *) + (alignment-1)); +int sz4prt = 4*sizeof(void *); + + real = (char *)sAllocFunc(size + sz4prt + (alignment-1)); if (real) { - ret = (void*) btAlignPointer(real + 2*sizeof(void *), alignment); - *((void **)(ret)-1) = (void *)(real); - *((int*)(ret)-2) = size; + + ret = (void*) btAlignPointer(real + sz4prt, alignment); + btDebugPtrMagic p; + p.vptr = ret; + p.cptr-=sizeof(void*); + *p.vptrptr = (void*)real; + p.cptr-=sizeof(void*); + *p.iptr = size; + p.cptr-=sizeof(void*); + *p.iptr = allocId; + + allocations_id[mynumallocs] = allocId; + allocations_bytes[mynumallocs] = size; + mynumallocs++; } else { ret = (void *)(real);//?? } - printf("allocation#%d at address %x, from %s,line %d, size %d\n",gNumAlignedAllocs,real, filename,line,size); - + printf("allocation %d at address %x, from %s,line %d, size %d (total allocated = %d)\n",allocId,real, filename,line,size,gTotalBytesAlignedAllocs); + allocId++; + int* ptr = (int*)ret; *ptr = 12; return (ret); @@ -138,19 +202,43 @@ void btAlignedFreeInternal (void* ptr,int line,char* filename) { void* real; - gNumAlignedFree++; if (ptr) { - real = *((void **)(ptr)-1); - int size = *((int*)(ptr)-2); - gTotalBytesAlignedAllocs -= size; + gNumAlignedFree++; - printf("free #%d at address %x, from %s,line %d, size %d\n",gNumAlignedFree,real, filename,line,size); + btDebugPtrMagic p; + p.vptr = ptr; + p.cptr-=sizeof(void*); + real = *p.vptrptr; + p.cptr-=sizeof(void*); + int size = *p.iptr; + p.cptr-=sizeof(void*); + int allocId = *p.iptr; + + bool found = false; + + for (int i=0;i //for placement new #endif //BT_USE_PLACEMENT_NEW +// The register keyword is deprecated in C++11 so don't use it. +#if __cplusplus > 199711L +#define BT_REGISTER +#else +#define BT_REGISTER register +#endif ///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods ///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data @@ -202,24 +208,16 @@ protected: ///when the new number of elements is smaller, the destructor will be called, but memory will not be freed, to reduce performance overhead of run-time memory (de)allocations. SIMD_FORCE_INLINE void resizeNoInitialize(int newsize) { - int curSize = size(); - - if (newsize < curSize) + if (newsize > size()) { - } else - { - if (newsize > size()) - { - reserve(newsize); - } - //leave this uninitialized + reserve(newsize); } m_size = newsize; } SIMD_FORCE_INLINE void resize(int newsize, const T& fillData=T()) { - int curSize = size(); + const BT_REGISTER int curSize = size(); if (newsize < curSize) { @@ -229,7 +227,7 @@ protected: } } else { - if (newsize > size()) + if (newsize > curSize) { reserve(newsize); } @@ -246,7 +244,7 @@ protected: } SIMD_FORCE_INLINE T& expandNonInitializing( ) { - int sz = size(); + const BT_REGISTER int sz = size(); if( sz == capacity() ) { reserve( allocSize(size()) ); @@ -259,7 +257,7 @@ protected: SIMD_FORCE_INLINE T& expand( const T& fillValue=T()) { - int sz = size(); + const BT_REGISTER int sz = size(); if( sz == capacity() ) { reserve( allocSize(size()) ); @@ -275,7 +273,7 @@ protected: SIMD_FORCE_INLINE void push_back(const T& _Val) { - int sz = size(); + const BT_REGISTER int sz = size(); if( sz == capacity() ) { reserve( allocSize(size()) ); @@ -324,7 +322,7 @@ protected: { public: - bool operator() ( const T& a, const T& b ) + bool operator() ( const T& a, const T& b ) const { return ( a < b ); } diff --git a/Engine/lib/bullet/src/LinearMath/btConvexHull.cpp b/Engine/lib/bullet/src/LinearMath/btConvexHull.cpp index 2ae855dbc..f8b79a1ab 100644 --- a/Engine/lib/bullet/src/LinearMath/btConvexHull.cpp +++ b/Engine/lib/bullet/src/LinearMath/btConvexHull.cpp @@ -87,7 +87,7 @@ btVector3 NormalOf(const btVector3 *vert, const int n); btVector3 PlaneLineIntersection(const btPlane &plane, const btVector3 &p0, const btVector3 &p1) { // returns the point where the line p0-p1 intersects the plane n&d - static btVector3 dif; + btVector3 dif; dif = p1-p0; btScalar dn= btDot(plane.normal,dif); btScalar t = -(plane.dist+btDot(plane.normal,p0) )/dn; @@ -112,7 +112,7 @@ btVector3 TriNormal(const btVector3 &v0, const btVector3 &v1, const btVector3 &v btScalar DistanceBetweenLines(const btVector3 &ustart, const btVector3 &udir, const btVector3 &vstart, const btVector3 &vdir, btVector3 *upoint, btVector3 *vpoint) { - static btVector3 cp; + btVector3 cp; cp = btCross(udir,vdir).normalized(); btScalar distu = -btDot(cp,ustart); diff --git a/Engine/lib/bullet/src/LinearMath/btCpuFeatureUtility.h b/Engine/lib/bullet/src/LinearMath/btCpuFeatureUtility.h new file mode 100644 index 000000000..d2cab52d4 --- /dev/null +++ b/Engine/lib/bullet/src/LinearMath/btCpuFeatureUtility.h @@ -0,0 +1,92 @@ + +#ifndef BT_CPU_UTILITY_H +#define BT_CPU_UTILITY_H + +#include "LinearMath/btScalar.h" + +#include //memset +#ifdef USE_SIMD +#include +#ifdef BT_ALLOW_SSE4 +#include +#endif //BT_ALLOW_SSE4 +#endif //USE_SIMD + +#if defined BT_USE_NEON +#define ARM_NEON_GCC_COMPATIBILITY 1 +#include +#include +#include //for sysctlbyname +#endif //BT_USE_NEON + +///Rudimentary btCpuFeatureUtility for CPU features: only report the features that Bullet actually uses (SSE4/FMA3, NEON_HPFP) +///We assume SSE2 in case BT_USE_SSE2 is defined in LinearMath/btScalar.h +class btCpuFeatureUtility +{ +public: + enum btCpuFeature + { + CPU_FEATURE_FMA3=1, + CPU_FEATURE_SSE4_1=2, + CPU_FEATURE_NEON_HPFP=4 + }; + + static int getCpuFeatures() + { + + static int capabilities = 0; + static bool testedCapabilities = false; + if (0 != testedCapabilities) + { + return capabilities; + } + +#ifdef BT_USE_NEON + { + uint32_t hasFeature = 0; + size_t featureSize = sizeof(hasFeature); + int err = sysctlbyname("hw.optional.neon_hpfp", &hasFeature, &featureSize, NULL, 0); + if (0 == err && hasFeature) + capabilities |= CPU_FEATURE_NEON_HPFP; + } +#endif //BT_USE_NEON + +#ifdef BT_ALLOW_SSE4 + { + int cpuInfo[4]; + memset(cpuInfo, 0, sizeof(cpuInfo)); + unsigned long long sseExt = 0; + __cpuid(cpuInfo, 1); + + bool osUsesXSAVE_XRSTORE = cpuInfo[2] & (1 << 27) || false; + bool cpuAVXSuport = cpuInfo[2] & (1 << 28) || false; + + if (osUsesXSAVE_XRSTORE && cpuAVXSuport) + { + sseExt = _xgetbv(0); + } + const int OSXSAVEFlag = (1UL << 27); + const int AVXFlag = ((1UL << 28) | OSXSAVEFlag); + const int FMAFlag = ((1UL << 12) | AVXFlag | OSXSAVEFlag); + if ((cpuInfo[2] & FMAFlag) == FMAFlag && (sseExt & 6) == 6) + { + capabilities |= btCpuFeatureUtility::CPU_FEATURE_FMA3; + } + + const int SSE41Flag = (1 << 19); + if (cpuInfo[2] & SSE41Flag) + { + capabilities |= btCpuFeatureUtility::CPU_FEATURE_SSE4_1; + } + } +#endif//BT_ALLOW_SSE4 + + testedCapabilities = true; + return capabilities; + } + + +}; + + +#endif //BT_CPU_UTILITY_H diff --git a/Engine/lib/bullet/src/LinearMath/btDefaultMotionState.h b/Engine/lib/bullet/src/LinearMath/btDefaultMotionState.h index c90b74923..01c5f8d93 100644 --- a/Engine/lib/bullet/src/LinearMath/btDefaultMotionState.h +++ b/Engine/lib/bullet/src/LinearMath/btDefaultMotionState.h @@ -25,14 +25,14 @@ ATTRIBUTE_ALIGNED16(struct) btDefaultMotionState : public btMotionState ///synchronizes world transform from user to physics virtual void getWorldTransform(btTransform& centerOfMassWorldTrans ) const { - centerOfMassWorldTrans = m_centerOfMassOffset.inverse() * m_graphicsWorldTrans ; + centerOfMassWorldTrans = m_graphicsWorldTrans * m_centerOfMassOffset.inverse() ; } ///synchronizes world transform from physics to user ///Bullet only calls the update of worldtransform for active objects virtual void setWorldTransform(const btTransform& centerOfMassWorldTrans) { - m_graphicsWorldTrans = centerOfMassWorldTrans * m_centerOfMassOffset ; + m_graphicsWorldTrans = centerOfMassWorldTrans * m_centerOfMassOffset; } diff --git a/Engine/lib/bullet/src/LinearMath/btGrahamScan2dConvexHull.h b/Engine/lib/bullet/src/LinearMath/btGrahamScan2dConvexHull.h index e658c5cf0..13a79aa58 100644 --- a/Engine/lib/bullet/src/LinearMath/btGrahamScan2dConvexHull.h +++ b/Engine/lib/bullet/src/LinearMath/btGrahamScan2dConvexHull.h @@ -85,9 +85,17 @@ inline void GrahamScanConvexHull2D(btAlignedObjectArray& original originalPoints[0].m_angle = -1e30f; for (int i=1;i& original else hull.push_back(originalPoints[i]); } + + if( hull.size() == 1 ) + { + hull.push_back( originalPoints[i] ); + } } } diff --git a/Engine/lib/bullet/src/LinearMath/btHashMap.h b/Engine/lib/bullet/src/LinearMath/btHashMap.h index ce07db3ac..ca6f326b4 100644 --- a/Engine/lib/bullet/src/LinearMath/btHashMap.h +++ b/Engine/lib/bullet/src/LinearMath/btHashMap.h @@ -395,10 +395,27 @@ protected: return &m_valueArray[index]; } + Key getKeyAtIndex(int index) + { + btAssert(index < m_keyArray.size()); + return m_keyArray[index]; + } + + const Key getKeyAtIndex(int index) const + { + btAssert(index < m_keyArray.size()); + return m_keyArray[index]; + } + + Value* operator[](const Key& key) { return find(key); } + const Value* operator[](const Key& key) const { + return find(key); + } + const Value* find(const Key& key) const { int index = findIndex(key); diff --git a/Engine/lib/bullet/src/LinearMath/btIDebugDraw.h b/Engine/lib/bullet/src/LinearMath/btIDebugDraw.h index de97c3f87..a020c3f4e 100644 --- a/Engine/lib/bullet/src/LinearMath/btIDebugDraw.h +++ b/Engine/lib/bullet/src/LinearMath/btIDebugDraw.h @@ -21,6 +21,7 @@ subject to the following restrictions: #include "btTransform.h" + ///The btIDebugDraw interface class allows hooking up a debug renderer to visually debug simulations. ///Typical use case: create a debug drawer object, and assign it to a btCollisionWorld or btDynamicsWorld using setDebugDrawer and call debugDrawWorld. ///A class that implements the btIDebugDraw interface has to implement the drawLine method at a minimum. @@ -29,6 +30,29 @@ class btIDebugDraw { public: + ATTRIBUTE_ALIGNED16(struct) DefaultColors + { + btVector3 m_activeObject; + btVector3 m_deactivatedObject; + btVector3 m_wantsDeactivationObject; + btVector3 m_disabledDeactivationObject; + btVector3 m_disabledSimulationObject; + btVector3 m_aabb; + btVector3 m_contactPoint; + + DefaultColors() + : m_activeObject(1,1,1), + m_deactivatedObject(0,1,0), + m_wantsDeactivationObject(0,1,1), + m_disabledDeactivationObject(1,0,0), + m_disabledSimulationObject(1,1,0), + m_aabb(1,0,0), + m_contactPoint(1,1,0) + { + } + }; + + enum DebugDrawModes { DBG_NoDebug=0, @@ -46,12 +70,18 @@ class btIDebugDraw DBG_DrawConstraints = (1 << 11), DBG_DrawConstraintLimits = (1 << 12), DBG_FastWireframe = (1<<13), - DBG_DrawNormals = (1<<14), + DBG_DrawNormals = (1<<14), + DBG_DrawFrames = (1<<15), DBG_MAX_DEBUG_DRAW_MODE }; virtual ~btIDebugDraw() {}; + + virtual DefaultColors getDefaultColors() const { DefaultColors colors; return colors; } + ///the default implementation for setDefaultColors has no effect. A derived class can implement it and store the colors. + virtual void setDefaultColors(const DefaultColors& /*colors*/) {} + virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color)=0; virtual void drawLine(const btVector3& from,const btVector3& to, const btVector3& fromColor, const btVector3& toColor) @@ -136,9 +166,9 @@ class btIDebugDraw virtual void drawTransform(const btTransform& transform, btScalar orthoLen) { btVector3 start = transform.getOrigin(); - drawLine(start, start+transform.getBasis() * btVector3(orthoLen, 0, 0), btVector3(0.7f,0,0)); - drawLine(start, start+transform.getBasis() * btVector3(0, orthoLen, 0), btVector3(0,0.7f,0)); - drawLine(start, start+transform.getBasis() * btVector3(0, 0, orthoLen), btVector3(0,0,0.7f)); + drawLine(start, start+transform.getBasis() * btVector3(orthoLen, 0, 0), btVector3(1.f,0.3,0.3)); + drawLine(start, start+transform.getBasis() * btVector3(0, orthoLen, 0), btVector3(0.3,1.f, 0.3)); + drawLine(start, start+transform.getBasis() * btVector3(0, 0, orthoLen), btVector3(0.3, 0.3,1.f)); } virtual void drawArc(const btVector3& center, const btVector3& normal, const btVector3& axis, btScalar radiusA, btScalar radiusB, btScalar minAngle, btScalar maxAngle, @@ -147,7 +177,7 @@ class btIDebugDraw const btVector3& vx = axis; btVector3 vy = normal.cross(axis); btScalar step = stepDegrees * SIMD_RADS_PER_DEG; - int nSteps = (int)((maxAngle - minAngle) / step); + int nSteps = (int)btFabs((maxAngle - minAngle) / step); if(!nSteps) nSteps = 1; btVector3 prev = center + radiusA * vx * btCos(minAngle) + radiusB * vy * btSin(minAngle); if(drawSect) @@ -438,6 +468,10 @@ class btIDebugDraw drawLine(transform*pt0,transform*pt1,color); drawLine(transform*pt2,transform*pt3,color); } + + virtual void flushLines() + { + } }; diff --git a/Engine/lib/bullet/src/LinearMath/btMatrix3x3.h b/Engine/lib/bullet/src/LinearMath/btMatrix3x3.h index 14fe704f8..40cd1e086 100644 --- a/Engine/lib/bullet/src/LinearMath/btMatrix3x3.h +++ b/Engine/lib/bullet/src/LinearMath/btMatrix3x3.h @@ -610,6 +610,27 @@ public: /**@brief Return the inverse of the matrix */ btMatrix3x3 inverse() const; + /// Solve A * x = b, where b is a column vector. This is more efficient + /// than computing the inverse in one-shot cases. + ///Solve33 is from Box2d, thanks to Erin Catto, + btVector3 solve33(const btVector3& b) const + { + btVector3 col1 = getColumn(0); + btVector3 col2 = getColumn(1); + btVector3 col3 = getColumn(2); + + btScalar det = btDot(col1, btCross(col2, col3)); + if (btFabs(det)>SIMD_EPSILON) + { + det = 1.0f / det; + } + btVector3 x; + x[0] = det * btDot(b, btCross(col2, col3)); + x[1] = det * btDot(col1, btCross(b, col3)); + x[2] = det * btDot(col1, btCross(col2, b)); + return x; + } + btMatrix3x3 transposeTimes(const btMatrix3x3& m) const; btMatrix3x3 timesTranspose(const btMatrix3x3& m) const; @@ -1026,7 +1047,8 @@ btMatrix3x3::inverse() const { btVector3 co(cofac(1, 1, 2, 2), cofac(1, 2, 2, 0), cofac(1, 0, 2, 1)); btScalar det = (*this)[0].dot(co); - btFullAssert(det != btScalar(0.0)); + //btFullAssert(det != btScalar(0.0)); + btAssert(det != btScalar(0.0)); btScalar s = btScalar(1.0) / det; return btMatrix3x3(co.x() * s, cofac(0, 2, 2, 1) * s, cofac(0, 1, 1, 2) * s, co.y() * s, cofac(0, 0, 2, 2) * s, cofac(0, 2, 1, 0) * s, @@ -1308,7 +1330,9 @@ SIMD_FORCE_INLINE bool operator==(const btMatrix3x3& m1, const btMatrix3x3& m2) c0 = _mm_and_ps(c0, c1); c0 = _mm_and_ps(c0, c2); - return (0x7 == _mm_movemask_ps((__m128)c0)); + int m = _mm_movemask_ps((__m128)c0); + return (0x7 == (m & 0x7)); + #else return ( m1[0][0] == m2[0][0] && m1[1][0] == m2[1][0] && m1[2][0] == m2[2][0] && diff --git a/Engine/lib/bullet/src/LinearMath/btMatrixX.h b/Engine/lib/bullet/src/LinearMath/btMatrixX.h index 1c29632c5..42caed42e 100644 --- a/Engine/lib/bullet/src/LinearMath/btMatrixX.h +++ b/Engine/lib/bullet/src/LinearMath/btMatrixX.h @@ -19,6 +19,13 @@ subject to the following restrictions: #include "LinearMath/btQuickprof.h" #include "LinearMath/btAlignedObjectArray.h" +#include + +//#define BT_DEBUG_OSTREAM +#ifdef BT_DEBUG_OSTREAM +#include +#include // std::setw +#endif //BT_DEBUG_OSTREAM class btIntSortPredicate { @@ -30,6 +37,121 @@ class btIntSortPredicate }; +template +struct btVectorX +{ + btAlignedObjectArray m_storage; + + btVectorX() + { + } + btVectorX(int numRows) + { + m_storage.resize(numRows); + } + + void resize(int rows) + { + m_storage.resize(rows); + } + int cols() const + { + return 1; + } + int rows() const + { + return m_storage.size(); + } + int size() const + { + return rows(); + } + + T nrm2() const + { + T norm = T(0); + + int nn = rows(); + + { + if (nn == 1) + { + norm = btFabs((*this)[0]); + } + else + { + T scale = 0.0; + T ssq = 1.0; + + /* The following loop is equivalent to this call to the LAPACK + auxiliary routine: CALL SLASSQ( N, X, INCX, SCALE, SSQ ) */ + + for (int ix=0;ix + void setElem(btMatrixX& mat, int row, int col, T val) + { + mat.setElem(row,col,val); + } + */ + + template struct btMatrixX { @@ -40,8 +162,7 @@ struct btMatrixX int m_setElemOperations; btAlignedObjectArray m_storage; - btAlignedObjectArray< btAlignedObjectArray > m_rowNonZeroElements1; - btAlignedObjectArray< btAlignedObjectArray > m_colNonZeroElements; + mutable btAlignedObjectArray< btAlignedObjectArray > m_rowNonZeroElements1; T* getBufferPointerWritable() { @@ -78,7 +199,6 @@ struct btMatrixX BT_PROFILE("m_storage.resize"); m_storage.resize(rows*cols); } - clearSparseInfo(); } int cols() const { @@ -109,49 +229,44 @@ struct btMatrixX } } + + void setElem(int row,int col, T val) + { + m_setElemOperations++; + m_storage[row*m_cols+col] = val; + } + + void mulElem(int row,int col, T val) + { + m_setElemOperations++; + //mul doesn't change sparsity info + + m_storage[row*m_cols+col] *= val; + } + + + + void copyLowerToUpperTriangle() { int count=0; - for (int row=0;row -struct btVectorX -{ - btAlignedObjectArray m_storage; - - btVectorX() + + void setSubMatrix(int rowstart,int colstart,int rowend,int colend,const T value) { + int numRows = rowend+1-rowstart; + int numCols = colend+1-colstart; + + for (int row=0;row& block) { - m_storage.resize(rows); + btAssert(rowend+1-rowstart == block.rows()); + btAssert(colend+1-colstart == block.cols()); + for (int row=0;row -void setElem(btMatrixX& mat, int row, int col, T val) -{ - mat.setElem(row,col,val); -} -*/ + typedef btMatrixX btMatrixXf; @@ -480,6 +489,47 @@ typedef btMatrixX btMatrixXd; typedef btVectorX btVectorXd; +#ifdef BT_DEBUG_OSTREAM +template +std::ostream& operator<< (std::ostream& os, const btMatrixX& mat) + { + + os << " ["; + //printf("%s ---------------------\n",msg); + for (int i=0;i +std::ostream& operator<< (std::ostream& os, const btVectorX& mat) + { + + os << " ["; + //printf("%s ---------------------\n",msg); + for (int i=0;i0); + //btAssert(m_freeCount>0); // should return null if all full void* result = m_firstFree; - m_firstFree = *(void**)m_firstFree; - --m_freeCount; + if (NULL != m_firstFree) + { + m_firstFree = *(void**)m_firstFree; + --m_freeCount; + } + btMutexUnlock(&m_mutex); return result; } @@ -95,9 +102,11 @@ public: if (ptr) { btAssert((unsigned char*)ptr >= m_pool && (unsigned char*)ptr < m_pool + m_maxElements * m_elemSize); + btMutexLock(&m_mutex); *(void**)ptr = m_firstFree; m_firstFree = ptr; ++m_freeCount; + btMutexUnlock(&m_mutex); } } diff --git a/Engine/lib/bullet/src/LinearMath/btQuadWord.h b/Engine/lib/bullet/src/LinearMath/btQuadWord.h index 11067ef47..fcfb3be44 100644 --- a/Engine/lib/bullet/src/LinearMath/btQuadWord.h +++ b/Engine/lib/bullet/src/LinearMath/btQuadWord.h @@ -73,7 +73,7 @@ public: public: -#if defined(BT_USE_SSE) || defined(BT_USE_NEON) +#if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON) // Set Vector SIMD_FORCE_INLINE btQuadWord(const btSimdFloat4 vec) diff --git a/Engine/lib/bullet/src/LinearMath/btQuaternion.h b/Engine/lib/bullet/src/LinearMath/btQuaternion.h index 665421de1..32f0f85d2 100644 --- a/Engine/lib/bullet/src/LinearMath/btQuaternion.h +++ b/Engine/lib/bullet/src/LinearMath/btQuaternion.h @@ -22,6 +22,13 @@ subject to the following restrictions: #include "btQuadWord.h" +#ifdef BT_USE_DOUBLE_PRECISION +#define btQuaternionData btQuaternionDoubleData +#define btQuaternionDataName "btQuaternionDoubleData" +#else +#define btQuaternionData btQuaternionFloatData +#define btQuaternionDataName "btQuaternionFloatData" +#endif //BT_USE_DOUBLE_PRECISION @@ -411,22 +418,21 @@ public: return btAcos(dot(q) / s) * btScalar(2.0); } - /**@brief Return the angle of rotation represented by this quaternion */ + /**@brief Return the angle [0, 2Pi] of rotation represented by this quaternion */ btScalar getAngle() const { btScalar s = btScalar(2.) * btAcos(m_floats[3]); return s; } - /**@brief Return the angle of rotation represented by this quaternion along the shortest path*/ + /**@brief Return the angle [0, Pi] of rotation represented by this quaternion along the shortest path */ btScalar getAngleShortestPath() const { btScalar s; - if (dot(*this) < 0) + if (m_floats[3] >= 0) s = btScalar(2.) * btAcos(m_floats[3]); else s = btScalar(2.) * btAcos(-m_floats[3]); - return s; } @@ -526,25 +532,29 @@ public: * Slerp interpolates assuming constant velocity. */ btQuaternion slerp(const btQuaternion& q, const btScalar& t) const { - btScalar magnitude = btSqrt(length2() * q.length2()); - btAssert(magnitude > btScalar(0)); - btScalar product = dot(q) / magnitude; - if (btFabs(product) < btScalar(1)) + const btScalar magnitude = btSqrt(length2() * q.length2()); + btAssert(magnitude > btScalar(0)); + + const btScalar product = dot(q) / magnitude; + const btScalar absproduct = btFabs(product); + + if(absproduct < btScalar(1.0 - SIMD_EPSILON)) { - // Take care of long angle case see http://en.wikipedia.org/wiki/Slerp - const btScalar sign = (product < 0) ? btScalar(-1) : btScalar(1); - - const btScalar theta = btAcos(sign * product); - const btScalar s1 = btSin(sign * t * theta); - const btScalar d = btScalar(1.0) / btSin(theta); - const btScalar s0 = btSin((btScalar(1.0) - t) * theta); - - return btQuaternion( - (m_floats[0] * s0 + q.x() * s1) * d, - (m_floats[1] * s0 + q.y() * s1) * d, - (m_floats[2] * s0 + q.z() * s1) * d, - (m_floats[3] * s0 + q.m_floats[3] * s1) * d); + // Take care of long angle case see http://en.wikipedia.org/wiki/Slerp + const btScalar theta = btAcos(absproduct); + const btScalar d = btSin(theta); + btAssert(d > btScalar(0)); + + const btScalar sign = (product < 0) ? btScalar(-1) : btScalar(1); + const btScalar s0 = btSin((btScalar(1.0) - t) * theta) / d; + const btScalar s1 = btSin(sign * t * theta) / d; + + return btQuaternion( + (m_floats[0] * s0 + q.x() * s1), + (m_floats[1] * s0 + q.y() * s1), + (m_floats[2] * s0 + q.z() * s1), + (m_floats[3] * s0 + q.w() * s1)); } else { @@ -560,7 +570,18 @@ public: SIMD_FORCE_INLINE const btScalar& getW() const { return m_floats[3]; } - + SIMD_FORCE_INLINE void serialize(struct btQuaternionData& dataOut) const; + + SIMD_FORCE_INLINE void deSerialize(const struct btQuaternionData& dataIn); + + SIMD_FORCE_INLINE void serializeFloat(struct btQuaternionFloatData& dataOut) const; + + SIMD_FORCE_INLINE void deSerializeFloat(const struct btQuaternionFloatData& dataIn); + + SIMD_FORCE_INLINE void serializeDouble(struct btQuaternionDoubleData& dataOut) const; + + SIMD_FORCE_INLINE void deSerializeDouble(const struct btQuaternionDoubleData& dataIn); + }; @@ -903,6 +924,62 @@ shortestArcQuatNormalize2(btVector3& v0,btVector3& v1) return shortestArcQuat(v0,v1); } + + + +struct btQuaternionFloatData +{ + float m_floats[4]; +}; + +struct btQuaternionDoubleData +{ + double m_floats[4]; + +}; + +SIMD_FORCE_INLINE void btQuaternion::serializeFloat(struct btQuaternionFloatData& dataOut) const +{ + ///could also do a memcpy, check if it is worth it + for (int i=0;i<4;i++) + dataOut.m_floats[i] = float(m_floats[i]); +} + +SIMD_FORCE_INLINE void btQuaternion::deSerializeFloat(const struct btQuaternionFloatData& dataIn) +{ + for (int i=0;i<4;i++) + m_floats[i] = btScalar(dataIn.m_floats[i]); +} + + +SIMD_FORCE_INLINE void btQuaternion::serializeDouble(struct btQuaternionDoubleData& dataOut) const +{ + ///could also do a memcpy, check if it is worth it + for (int i=0;i<4;i++) + dataOut.m_floats[i] = double(m_floats[i]); +} + +SIMD_FORCE_INLINE void btQuaternion::deSerializeDouble(const struct btQuaternionDoubleData& dataIn) +{ + for (int i=0;i<4;i++) + m_floats[i] = btScalar(dataIn.m_floats[i]); +} + + +SIMD_FORCE_INLINE void btQuaternion::serialize(struct btQuaternionData& dataOut) const +{ + ///could also do a memcpy, check if it is worth it + for (int i=0;i<4;i++) + dataOut.m_floats[i] = m_floats[i]; +} + +SIMD_FORCE_INLINE void btQuaternion::deSerialize(const struct btQuaternionData& dataIn) +{ + for (int i=0;i<4;i++) + m_floats[i] = dataIn.m_floats[i]; +} + + #endif //BT_SIMD__QUATERNION_H_ diff --git a/Engine/lib/bullet/src/LinearMath/btQuickprof.cpp b/Engine/lib/bullet/src/LinearMath/btQuickprof.cpp index 544aee89d..f587770e8 100644 --- a/Engine/lib/bullet/src/LinearMath/btQuickprof.cpp +++ b/Engine/lib/bullet/src/LinearMath/btQuickprof.cpp @@ -10,15 +10,15 @@ ** ***************************************************************************************************/ -// Credits: The Clock class was inspired by the Timer classes in +// Credits: The Clock class was inspired by the Timer classes in // Ogre (www.ogre3d.org). #include "btQuickprof.h" -#ifndef BT_NO_PROFILE - -static btClock gProfileClock; +#if BT_THREADSAFE +#include "btThreads.h" +#endif //#if BT_THREADSAFE #ifdef __CELLOS_LV2__ @@ -27,8 +27,8 @@ static btClock gProfileClock; #include #endif -#if defined (SUNOS) || defined (__SUNOS__) -#include +#if defined (SUNOS) || defined (__SUNOS__) +#include #endif #if defined(WIN32) || defined(_WIN32) @@ -37,12 +37,17 @@ static btClock gProfileClock; #define WIN32_LEAN_AND_MEAN #define NOWINRES #define NOMCX -#define NOIME +#define NOIME #ifdef _XBOX #include #else //_XBOX #include + +#if WINVER <0x0602 +#define GetTickCount64 GetTickCount +#endif + #endif //_XBOX #include @@ -59,7 +64,7 @@ struct btClockData #ifdef BT_USE_WINDOWS_TIMERS LARGE_INTEGER mClockFrequency; - DWORD mStartTick; + LONGLONG mStartTick; LONGLONG mPrevElapsedTime; LARGE_INTEGER mStartTime; #else @@ -105,7 +110,7 @@ void btClock::reset() { #ifdef BT_USE_WINDOWS_TIMERS QueryPerformanceCounter(&m_data->mStartTime); - m_data->mStartTick = GetTickCount(); + m_data->mStartTick = GetTickCount64(); m_data->mPrevElapsedTime = 0; #else #ifdef __CELLOS_LV2__ @@ -121,34 +126,34 @@ void btClock::reset() #endif } -/// Returns the time in ms since the last call to reset or since +/// Returns the time in ms since the last call to reset or since /// the btClock was created. unsigned long int btClock::getTimeMilliseconds() { #ifdef BT_USE_WINDOWS_TIMERS LARGE_INTEGER currentTime; QueryPerformanceCounter(¤tTime); - LONGLONG elapsedTime = currentTime.QuadPart - + LONGLONG elapsedTime = currentTime.QuadPart - m_data->mStartTime.QuadPart; // Compute the number of millisecond ticks elapsed. - unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / + unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / m_data->mClockFrequency.QuadPart); - // Check for unexpected leaps in the Win32 performance counter. - // (This is caused by unexpected data across the PCI to ISA + // Check for unexpected leaps in the Win32 performance counter. + // (This is caused by unexpected data across the PCI to ISA // bridge, aka south bridge. See Microsoft KB274323.) - unsigned long elapsedTicks = GetTickCount() - m_data->mStartTick; + unsigned long elapsedTicks = (unsigned long)(GetTickCount64() - m_data->mStartTick); signed long msecOff = (signed long)(msecTicks - elapsedTicks); if (msecOff < -100 || msecOff > 100) { // Adjust the starting time forwards. - LONGLONG msecAdjustment = mymin(msecOff * - m_data->mClockFrequency.QuadPart / 1000, elapsedTime - + LONGLONG msecAdjustment = mymin(msecOff * + m_data->mClockFrequency.QuadPart / 1000, elapsedTime - m_data->mPrevElapsedTime); m_data->mStartTime.QuadPart += msecAdjustment; elapsedTime -= msecAdjustment; // Recompute the number of millisecond ticks elapsed. - msecTicks = (unsigned long)(1000 * elapsedTime / + msecTicks = (unsigned long)(1000 * elapsedTime / m_data->mClockFrequency.QuadPart); } @@ -171,36 +176,36 @@ unsigned long int btClock::getTimeMilliseconds() struct timeval currentTime; gettimeofday(¤tTime, 0); - return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000 + + return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000 + (currentTime.tv_usec - m_data->mStartTime.tv_usec) / 1000; #endif //__CELLOS_LV2__ #endif } - /// Returns the time in us since the last call to reset or since + /// Returns the time in us since the last call to reset or since /// the Clock was created. unsigned long int btClock::getTimeMicroseconds() { #ifdef BT_USE_WINDOWS_TIMERS LARGE_INTEGER currentTime; QueryPerformanceCounter(¤tTime); - LONGLONG elapsedTime = currentTime.QuadPart - + LONGLONG elapsedTime = currentTime.QuadPart - m_data->mStartTime.QuadPart; // Compute the number of millisecond ticks elapsed. - unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / + unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / m_data->mClockFrequency.QuadPart); - // Check for unexpected leaps in the Win32 performance counter. - // (This is caused by unexpected data across the PCI to ISA + // Check for unexpected leaps in the Win32 performance counter. + // (This is caused by unexpected data across the PCI to ISA // bridge, aka south bridge. See Microsoft KB274323.) - unsigned long elapsedTicks = GetTickCount() - m_data->mStartTick; + unsigned long elapsedTicks = (unsigned long)(GetTickCount64() - m_data->mStartTick); signed long msecOff = (signed long)(msecTicks - elapsedTicks); if (msecOff < -100 || msecOff > 100) { // Adjust the starting time forwards. - LONGLONG msecAdjustment = mymin(msecOff * - m_data->mClockFrequency.QuadPart / 1000, elapsedTime - + LONGLONG msecAdjustment = mymin(msecOff * + m_data->mClockFrequency.QuadPart / 1000, elapsedTime - m_data->mPrevElapsedTime); m_data->mStartTime.QuadPart += msecAdjustment; elapsedTime -= msecAdjustment; @@ -210,7 +215,7 @@ unsigned long int btClock::getTimeMicroseconds() m_data->mPrevElapsedTime = elapsedTime; // Convert to microseconds. - unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / + unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / m_data->mClockFrequency.QuadPart); return usecTicks; @@ -229,14 +234,26 @@ unsigned long int btClock::getTimeMicroseconds() struct timeval currentTime; gettimeofday(¤tTime, 0); - return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000000 + + return (currentTime.tv_sec - m_data->mStartTime.tv_sec) * 1000000 + (currentTime.tv_usec - m_data->mStartTime.tv_usec); #endif//__CELLOS_LV2__ -#endif +#endif } +/// Returns the time in s since the last call to reset or since +/// the Clock was created. +btScalar btClock::getTimeSeconds() +{ + static const btScalar microseconds_to_seconds = btScalar(0.000001); + return btScalar(getTimeMicroseconds()) * microseconds_to_seconds; +} + +#ifndef BT_NO_PROFILE + + +static btClock gProfileClock; inline void Profile_Get_Ticks(unsigned long int * ticks) @@ -252,7 +269,6 @@ inline float Profile_Get_Tick_Rate(void) } - /*************************************************************************************************** ** ** CProfileNode @@ -293,8 +309,7 @@ void CProfileNode::CleanupMemory() CProfileNode::~CProfileNode( void ) { - delete ( Child); - delete ( Sibling); + CleanupMemory(); } @@ -318,7 +333,7 @@ CProfileNode * CProfileNode::Get_Sub_Node( const char * name ) } // We didn't find it, so add it - + CProfileNode * node = new CProfileNode( name, this ); node->Sibling = Child; Child = node; @@ -330,7 +345,7 @@ void CProfileNode::Reset( void ) { TotalCalls = 0; TotalTime = 0.0f; - + if ( Child ) { Child->Reset(); @@ -352,7 +367,7 @@ void CProfileNode::Call( void ) bool CProfileNode::Return( void ) { - if ( --RecursionCounter == 0 && TotalCalls != 0 ) { + if ( --RecursionCounter == 0 && TotalCalls != 0 ) { unsigned long int time; Profile_Get_Ticks(&time); time-=StartTime; @@ -443,10 +458,18 @@ unsigned long int CProfileManager::ResetTime = 0; *=============================================================================================*/ void CProfileManager::Start_Profile( const char * name ) { +#if BT_THREADSAFE + // profile system is not designed for profiling multiple threads + // disable collection on all but the main thread + if ( !btIsMainThread() ) + { + return; + } +#endif //#if BT_THREADSAFE if (name != CurrentNode->Get_Name()) { CurrentNode = CurrentNode->Get_Sub_Node( name ); - } - + } + CurrentNode->Call(); } @@ -456,6 +479,14 @@ void CProfileManager::Start_Profile( const char * name ) *=============================================================================================*/ void CProfileManager::Stop_Profile( void ) { +#if BT_THREADSAFE + // profile system is not designed for profiling multiple threads + // disable collection on all but the main thread + if ( !btIsMainThread() ) + { + return; + } +#endif //#if BT_THREADSAFE // Return will indicate whether we should back up to our parent (we may // be profiling a recursive function) if (CurrentNode->Return()) { @@ -470,7 +501,7 @@ void CProfileManager::Stop_Profile( void ) * This resets everything except for the tree structure. All of the timing data is reset. * *=============================================================================================*/ void CProfileManager::Reset( void ) -{ +{ gProfileClock.reset(); Root.Reset(); Root.Call(); @@ -516,9 +547,9 @@ void CProfileManager::dumpRecursive(CProfileIterator* profileIterator, int spaci printf("Profiling: %s (total running time: %.3f ms) ---\n", profileIterator->Get_Current_Parent_Name(), parent_time ); float totalTime = 0.f; - + int numChildren = 0; - + for (i = 0; !profileIterator->Is_Done(); i++,profileIterator->Next()) { numChildren++; @@ -535,11 +566,11 @@ void CProfileManager::dumpRecursive(CProfileIterator* profileIterator, int spaci if (parent_time < accumulated_time) { - printf("what's wrong\n"); + //printf("what's wrong\n"); } for (i=0;i SIMD_EPSILON ? ((parent_time - accumulated_time) / parent_time) * 100 : 0.f, parent_time - accumulated_time); - + for (i=0;iEnter_Child(i); diff --git a/Engine/lib/bullet/src/LinearMath/btQuickprof.h b/Engine/lib/bullet/src/LinearMath/btQuickprof.h index 93f3f4a60..49545713b 100644 --- a/Engine/lib/bullet/src/LinearMath/btQuickprof.h +++ b/Engine/lib/bullet/src/LinearMath/btQuickprof.h @@ -15,18 +15,7 @@ #ifndef BT_QUICK_PROF_H #define BT_QUICK_PROF_H -//To disable built-in profiling, please comment out next line -//#define BT_NO_PROFILE 1 -#ifndef BT_NO_PROFILE -#include //@todo remove this, backwards compatibility #include "btScalar.h" -#include "btAlignedAllocator.h" -#include - - - - - #define USE_BT_CLOCK 1 #ifdef USE_BT_CLOCK @@ -52,6 +41,11 @@ public: /// Returns the time in us since the last call to reset or since /// the Clock was created. unsigned long int getTimeMicroseconds(); + + /// Returns the time in s since the last call to reset or since + /// the Clock was created. + btScalar getTimeSeconds(); + private: struct btClockData* m_data; }; @@ -59,6 +53,20 @@ private: #endif //USE_BT_CLOCK +//To disable built-in profiling, please comment out next line +#define BT_NO_PROFILE 1 +#ifndef BT_NO_PROFILE +#include //@todo remove this, backwards compatibility + +#include "btAlignedAllocator.h" +#include + + + + + + + ///A node in the Profile Hierarchy Tree diff --git a/Engine/lib/bullet/src/LinearMath/btScalar.h b/Engine/lib/bullet/src/LinearMath/btScalar.h index 37c6dec19..df907e128 100644 --- a/Engine/lib/bullet/src/LinearMath/btScalar.h +++ b/Engine/lib/bullet/src/LinearMath/btScalar.h @@ -17,6 +17,7 @@ subject to the following restrictions: #ifndef BT_SCALAR_H #define BT_SCALAR_H + #ifdef BT_MANAGED_CODE //Aligned data types not supported in managed code #pragma unmanaged @@ -28,7 +29,7 @@ subject to the following restrictions: #include /* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/ -#define BT_BULLET_VERSION 282 +#define BT_BULLET_VERSION 285 inline int btGetVersion() { @@ -48,11 +49,16 @@ inline int btGetVersion() #define ATTRIBUTE_ALIGNED16(a) a #define ATTRIBUTE_ALIGNED64(a) a #define ATTRIBUTE_ALIGNED128(a) a + #elif (_M_ARM) + #define SIMD_FORCE_INLINE __forceinline + #define ATTRIBUTE_ALIGNED16(a) __declspec() a + #define ATTRIBUTE_ALIGNED64(a) __declspec() a + #define ATTRIBUTE_ALIGNED128(a) __declspec () a #else //#define BT_HAS_ALIGNED_ALLOCATOR #pragma warning(disable : 4324) // disable padding warning // #pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning. -// #pragma warning(disable:4996) //Turn off warnings about deprecated C routines + #pragma warning(disable:4996) //Turn off warnings about deprecated C routines // #pragma warning(disable:4786) // Disable the "debug name too long" warning #define SIMD_FORCE_INLINE __forceinline @@ -67,13 +73,20 @@ inline int btGetVersion() #define btFsel(a,b,c) __fsel((a),(b),(c)) #else -#if (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) +#if defined (_M_ARM) + //Do not turn SSE on for ARM (may want to turn on BT_USE_NEON however) +#elif (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) #if _MSC_VER>1400 #define BT_USE_SIMD_VECTOR3 #endif #define BT_USE_SSE #ifdef BT_USE_SSE + +#if (_MSC_FULL_VER >= 170050727)//Visual Studio 2012 can compile SSE4/FMA3 (but SSE4/FMA3 is not enabled by default) + #define BT_ALLOW_SSE4 +#endif //(_MSC_FULL_VER >= 160040219) + //BT_USE_SSE_IN_API is disabled under Windows by default, because //it makes it harder to integrate Bullet into your application under Windows //(structured embedding Bullet structs/classes need to be 16-byte aligned) @@ -92,7 +105,7 @@ inline int btGetVersion() #ifdef BT_DEBUG #ifdef _MSC_VER #include - #define btAssert(x) { if(!(x)){printf("Assert "__FILE__ ":%u ("#x")\n", __LINE__);__debugbreak(); }} + #define btAssert(x) { if(!(x)){printf("Assert "__FILE__ ":%u (%s)\n", __LINE__, #x);__debugbreak(); }} #else//_MSC_VER #include #define btAssert assert @@ -284,6 +297,10 @@ static int btNanMask = 0x7F800001; #ifndef BT_INFINITY static int btInfinityMask = 0x7F800000; #define BT_INFINITY (*(float*)&btInfinityMask) +inline int btGetInfinityMask()//suppress stupid compiler warning +{ + return btInfinityMask; +} #endif //use this, in case there are clashes (such as xnamath.h) @@ -334,8 +351,23 @@ inline __m128 operator * (const __m128 A, const __m128 B) #else//BT_USE_NEON #ifndef BT_INFINITY - static int btInfinityMask = 0x7F800000; - #define BT_INFINITY (*(float*)&btInfinityMask) + struct btInfMaskConverter + { + union { + float mask; + int intmask; + }; + btInfMaskConverter(int mask=0x7F800000) + :intmask(mask) + { + } + }; + static btInfMaskConverter btInfinityMask = 0x7F800000; + #define BT_INFINITY (btInfinityMask.mask) + inline int btGetInfinityMask()//suppress stupid compiler warning + { + return btInfinityMask.intmask; + } #endif #endif//BT_USE_NEON @@ -387,19 +419,30 @@ SIMD_FORCE_INLINE btScalar btFmod(btScalar x,btScalar y) { return fmod(x,y); } SIMD_FORCE_INLINE btScalar btSqrt(btScalar y) { #ifdef USE_APPROXIMATION +#ifdef __LP64__ + float xhalf = 0.5f*y; + int i = *(int*)&y; + i = 0x5f375a86 - (i>>1); + y = *(float*)&i; + y = y*(1.5f - xhalf*y*y); + y = y*(1.5f - xhalf*y*y); + y = y*(1.5f - xhalf*y*y); + y=1/y; + return y; +#else double x, z, tempf; unsigned long *tfptr = ((unsigned long *)&tempf) + 1; - - tempf = y; - *tfptr = (0xbfcdd90a - *tfptr)>>1; /* estimate of 1/sqrt(y) */ - x = tempf; - z = y*btScalar(0.5); - x = (btScalar(1.5)*x)-(x*x)*(x*z); /* iteration formula */ - x = (btScalar(1.5)*x)-(x*x)*(x*z); - x = (btScalar(1.5)*x)-(x*x)*(x*z); - x = (btScalar(1.5)*x)-(x*x)*(x*z); - x = (btScalar(1.5)*x)-(x*x)*(x*z); - return x*y; + tempf = y; + *tfptr = (0xbfcdd90a - *tfptr)>>1; /* estimate of 1/sqrt(y) */ + x = tempf; + z = y*btScalar(0.5); + x = (btScalar(1.5)*x)-(x*x)*(x*z); /* iteration formula */ + x = (btScalar(1.5)*x)-(x*x)*(x*z); + x = (btScalar(1.5)*x)-(x*x)*(x*z); + x = (btScalar(1.5)*x)-(x*x)*(x*z); + x = (btScalar(1.5)*x)-(x*x)*(x*z); + return x*y; +#endif #else return sqrtf(y); #endif @@ -432,7 +475,7 @@ SIMD_FORCE_INLINE btScalar btFmod(btScalar x,btScalar y) { return fmodf(x,y); } #endif #define SIMD_PI btScalar(3.1415926535897932384626433832795029) -#define SIMD_2_PI btScalar(2.0) * SIMD_PI +#define SIMD_2_PI (btScalar(2.0) * SIMD_PI) #define SIMD_HALF_PI (SIMD_PI * btScalar(0.5)) #define SIMD_RADS_PER_DEG (SIMD_2_PI / btScalar(360.0)) #define SIMD_DEGS_PER_RAD (btScalar(360.0) / SIMD_2_PI) @@ -444,9 +487,17 @@ SIMD_FORCE_INLINE btScalar btFmod(btScalar x,btScalar y) { return fmodf(x,y); } #ifdef BT_USE_DOUBLE_PRECISION #define SIMD_EPSILON DBL_EPSILON #define SIMD_INFINITY DBL_MAX +#define BT_ONE 1.0 +#define BT_ZERO 0.0 +#define BT_TWO 2.0 +#define BT_HALF 0.5 #else #define SIMD_EPSILON FLT_EPSILON #define SIMD_INFINITY FLT_MAX +#define BT_ONE 1.0f +#define BT_ZERO 0.0f +#define BT_TWO 2.0f +#define BT_HALF 0.5f #endif SIMD_FORCE_INLINE btScalar btAtan2Fast(btScalar y, btScalar x) @@ -728,4 +779,5 @@ template T* btAlignPointer(T* unalignedPtr, size_t alignment) return converter.ptr; } + #endif //BT_SCALAR_H diff --git a/Engine/lib/bullet/src/LinearMath/btSerializer.cpp b/Engine/lib/bullet/src/LinearMath/btSerializer.cpp index ba3449395..2b5740b40 100644 --- a/Engine/lib/bullet/src/LinearMath/btSerializer.cpp +++ b/Engine/lib/bullet/src/LinearMath/btSerializer.cpp @@ -1,5 +1,5 @@ char sBulletDNAstr[]= { -char(83),char(68),char(78),char(65),char(78),char(65),char(77),char(69),char(69),char(1),char(0),char(0),char(109),char(95),char(115),char(105),char(122),char(101),char(0),char(109), +char(83),char(68),char(78),char(65),char(78),char(65),char(77),char(69),char(-128),char(1),char(0),char(0),char(109),char(95),char(115),char(105),char(122),char(101),char(0),char(109), char(95),char(99),char(97),char(112),char(97),char(99),char(105),char(116),char(121),char(0),char(42),char(109),char(95),char(100),char(97),char(116),char(97),char(0),char(109),char(95), char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(115),char(0),char(109),char(95),char(99),char(111), char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110), @@ -90,412 +90,511 @@ char(97),char(110),char(105),char(115),char(111),char(116),char(114),char(111),c char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(99),char(116),char(80),char(114),char(111),char(99),char(101),char(115),char(115),char(105),char(110),char(103),char(84), char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(100),char(101),char(97),char(99),char(116),char(105),char(118),char(97),char(116), char(105),char(111),char(110),char(84),char(105),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109), -char(95),char(114),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(114), -char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(104),char(105),char(116),char(70),char(114),char(97),char(99), -char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(99),char(100),char(83),char(119),char(101),char(112),char(116),char(83),char(112),char(104),char(101),char(114), -char(101),char(82),char(97),char(100),char(105),char(117),char(115),char(0),char(109),char(95),char(99),char(99),char(100),char(77),char(111),char(116),char(105),char(111),char(110),char(84), -char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(104),char(97),char(115),char(65),char(110),char(105),char(115),char(111),char(116), -char(114),char(111),char(112),char(105),char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),char(108),char(108), -char(105),char(115),char(105),char(111),char(110),char(70),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(105),char(115),char(108),char(97),char(110),char(100),char(84), -char(97),char(103),char(49),char(0),char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(0),char(109),char(95), -char(97),char(99),char(116),char(105),char(118),char(97),char(116),char(105),char(111),char(110),char(83),char(116),char(97),char(116),char(101),char(49),char(0),char(109),char(95),char(105), -char(110),char(116),char(101),char(114),char(110),char(97),char(108),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),char(101),char(99),char(107),char(67), -char(111),char(108),char(108),char(105),char(100),char(101),char(87),char(105),char(116),char(104),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(73), -char(110),char(102),char(111),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(0),char(109),char(95),char(99),char(111),char(108),char(108), -char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(105),char(110), -char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(84),char(101),char(110),char(115),char(111),char(114),char(87),char(111),char(114),char(108),char(100),char(0), -char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97), -char(110),char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103), -char(117),char(108),char(97),char(114),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(70), -char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(95),char(97),char(99),char(99),char(101), -char(108),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105), -char(97),char(76),char(111),char(99),char(97),char(108),char(0),char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(70),char(111),char(114),char(99),char(101),char(0), -char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(84),char(111),char(114),char(113),char(117),char(101),char(0),char(109),char(95),char(105),char(110),char(118),char(101), -char(114),char(115),char(101),char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112), -char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103), -char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103), -char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(76), -char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108), -char(100),char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103), -char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100), -char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117), -char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108), -char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111), -char(108),char(100),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103), -char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110), -char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(111),char(110),char(115),char(116), -char(114),char(97),char(105),char(110),char(116),char(82),char(111),char(119),char(115),char(0),char(110),char(117),char(98),char(0),char(42),char(109),char(95),char(114),char(98),char(65), -char(0),char(42),char(109),char(95),char(114),char(98),char(66),char(0),char(109),char(95),char(111),char(98),char(106),char(101),char(99),char(116),char(84),char(121),char(112),char(101), -char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(84),char(121),char(112), -char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(100), -char(0),char(109),char(95),char(110),char(101),char(101),char(100),char(115),char(70),char(101),char(101),char(100),char(98),char(97),char(99),char(107),char(0),char(109),char(95),char(97), -char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(100),char(98),char(103),char(68), -char(114),char(97),char(119),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(100),char(105),char(115),char(97),char(98),char(108),char(101),char(67),char(111),char(108), -char(108),char(105),char(115),char(105),char(111),char(110),char(115),char(66),char(101),char(116),char(119),char(101),char(101),char(110),char(76),char(105),char(110),char(107),char(101),char(100), -char(66),char(111),char(100),char(105),char(101),char(115),char(0),char(109),char(95),char(111),char(118),char(101),char(114),char(114),char(105),char(100),char(101),char(78),char(117),char(109), -char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(98), -char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(104),char(114),char(101),char(115),char(104), -char(111),char(108),char(100),char(0),char(109),char(95),char(105),char(115),char(69),char(110),char(97),char(98),char(108),char(101),char(100),char(0),char(112),char(97),char(100),char(100), -char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(121),char(112),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97), -char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(65),char(0),char(109), -char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(98),char(65),char(70),char(114),char(97),char(109),char(101), -char(0),char(109),char(95),char(114),char(98),char(66),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(82),char(101),char(102), -char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108), -char(97),char(114),char(79),char(110),char(108),char(121),char(0),char(109),char(95),char(101),char(110),char(97),char(98),char(108),char(101),char(65),char(110),char(103),char(117),char(108), -char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(0),char(109),char(95),char(109),char(111),char(116),char(111),char(114),char(84),char(97),char(114),char(103),char(101), -char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(109),char(97),char(120),char(77),char(111),char(116),char(111),char(114), -char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(108),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116), -char(0),char(109),char(95),char(117),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(108),char(105),char(109),char(105), -char(116),char(83),char(111),char(102),char(116),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(98),char(105),char(97),char(115),char(70),char(97),char(99),char(116), -char(111),char(114),char(0),char(109),char(95),char(114),char(101),char(108),char(97),char(120),char(97),char(116),char(105),char(111),char(110),char(70),char(97),char(99),char(116),char(111), -char(114),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(115),char(119), -char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(49),char(0),char(109),char(95),char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110), -char(50),char(0),char(109),char(95),char(116),char(119),char(105),char(115),char(116),char(83),char(112),char(97),char(110),char(0),char(109),char(95),char(100),char(97),char(109),char(112), -char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109), -char(105),char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105), -char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105), -char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105), -char(116),char(0),char(109),char(95),char(117),char(115),char(101),char(76),char(105),char(110),char(101),char(97),char(114),char(82),char(101),char(102),char(101),char(114),char(101),char(110), -char(99),char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(117),char(115),char(101),char(79),char(102),char(102),char(115),char(101),char(116), -char(70),char(111),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(114),char(97),char(109),char(101),char(0),char(109), -char(95),char(54),char(100),char(111),char(102),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(69),char(110), -char(97),char(98),char(108),char(101),char(100),char(91),char(54),char(93),char(0),char(109),char(95),char(101),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105), -char(117),char(109),char(80),char(111),char(105),char(110),char(116),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(83), -char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103), -char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(91),char(54),char(93),char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(65), -char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(97),char(116),char(105),char(111),char(0),char(109), -char(95),char(116),char(97),char(117),char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(116),char(101),char(112),char(0),char(109),char(95),char(109),char(97), -char(120),char(69),char(114),char(114),char(111),char(114),char(82),char(101),char(100),char(117),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(115),char(111), -char(114),char(0),char(109),char(95),char(101),char(114),char(112),char(0),char(109),char(95),char(101),char(114),char(112),char(50),char(0),char(109),char(95),char(103),char(108),char(111), -char(98),char(97),char(108),char(67),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115), -char(101),char(80),char(101),char(110),char(101),char(116),char(114),char(97),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108), -char(100),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(117),char(114),char(110), -char(69),char(114),char(112),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(111),char(112),char(0),char(109),char(95),char(119), -char(97),char(114),char(109),char(115),char(116),char(97),char(114),char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95), -char(109),char(97),char(120),char(71),char(121),char(114),char(111),char(115),char(99),char(111),char(112),char(105),char(99),char(70),char(111),char(114),char(99),char(101),char(0),char(109), -char(95),char(115),char(105),char(110),char(103),char(108),char(101),char(65),char(120),char(105),char(115),char(82),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114), -char(105),char(99),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(110),char(117), -char(109),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114), -char(77),char(111),char(100),char(101),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(110),char(103),char(67),char(111),char(110),char(116),char(97),char(99), -char(116),char(82),char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108), -char(100),char(0),char(109),char(95),char(109),char(105),char(110),char(105),char(109),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(66),char(97),char(116), -char(99),char(104),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115), -char(101),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0), -char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109), -char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(42),char(109),char(95), -char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(0),char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0), -char(109),char(95),char(112),char(114),char(101),char(118),char(105),char(111),char(117),char(115),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109), -char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(99),char(99),char(117),char(109),char(117),char(108),char(97), -char(116),char(101),char(100),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(110),char(111),char(114),char(109),char(97),char(108),char(0),char(109),char(95), -char(97),char(114),char(101),char(97),char(0),char(109),char(95),char(97),char(116),char(116),char(97),char(99),char(104),char(0),char(109),char(95),char(110),char(111),char(100),char(101), -char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(76),char(101),char(110), -char(103),char(116),char(104),char(0),char(109),char(95),char(98),char(98),char(101),char(110),char(100),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(111),char(100), -char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(51),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(65),char(114), -char(101),char(97),char(0),char(109),char(95),char(99),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100), -char(105),char(99),char(101),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(86),char(111),char(108),char(117),char(109),char(101), -char(0),char(109),char(95),char(99),char(49),char(0),char(109),char(95),char(99),char(50),char(0),char(109),char(95),char(99),char(48),char(0),char(109),char(95),char(108),char(111), -char(99),char(97),char(108),char(70),char(114),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(66),char(111),char(100), -char(121),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(97),char(101),char(114),char(111), -char(77),char(111),char(100),char(101),char(108),char(0),char(109),char(95),char(98),char(97),char(117),char(109),char(103),char(97),char(114),char(116),char(101),char(0),char(109),char(95), -char(100),char(114),char(97),char(103),char(0),char(109),char(95),char(108),char(105),char(102),char(116),char(0),char(109),char(95),char(112),char(114),char(101),char(115),char(115),char(117), -char(114),char(101),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(100),char(121),char(110),char(97),char(109),char(105), -char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(111),char(115),char(101),char(77),char(97),char(116),char(99), -char(104),char(0),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100), -char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(107),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(111),char(110),char(116),char(97),char(99), -char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(67),char(111),char(110),char(116), -char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114), -char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100), -char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111), -char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100), -char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116), -char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103), -char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105), -char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116), -char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102), -char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83), -char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(109),char(97),char(120),char(86),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(116), -char(105),char(109),char(101),char(83),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(73), -char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110), -char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(100),char(114),char(105),char(102),char(116),char(73),char(116), -char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(116), -char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(114),char(111),char(116),char(0),char(109),char(95),char(115),char(99),char(97), -char(108),char(101),char(0),char(109),char(95),char(97),char(113),char(113),char(0),char(109),char(95),char(99),char(111),char(109),char(0),char(42),char(109),char(95),char(112),char(111), -char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(42),char(109),char(95),char(119),char(101),char(105),char(103),char(104),char(116),char(115),char(0),char(109), -char(95),char(110),char(117),char(109),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(87), -char(101),char(105),char(103),char(116),char(115),char(0),char(109),char(95),char(98),char(118),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(98),char(102), -char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(97),char(109),char(101),char(120),char(102),char(111),char(114),char(109),char(0),char(109),char(95), -char(108),char(111),char(99),char(105),char(105),char(0),char(109),char(95),char(105),char(110),char(118),char(119),char(105),char(0),char(109),char(95),char(118),char(105),char(109),char(112), -char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115), -char(91),char(50),char(93),char(0),char(109),char(95),char(108),char(118),char(0),char(109),char(95),char(97),char(118),char(0),char(42),char(109),char(95),char(102),char(114),char(97), -char(109),char(101),char(114),char(101),char(102),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101), -char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(114),char(97), -char(109),char(101),char(82),char(101),char(102),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(78),char(111),char(100),char(101),char(115),char(0),char(109),char(95), -char(110),char(117),char(109),char(77),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(105),char(100),char(109),char(97),char(115),char(115),char(0),char(109), -char(95),char(105),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(110),char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0), -char(109),char(95),char(110),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(97),char(109),char(112), -char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(100),char(97), -char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97),char(116),char(99),char(104),char(105),char(110),char(103),char(0),char(109),char(95),char(109), -char(97),char(120),char(83),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),char(109),char(112),char(117),char(108), -char(115),char(101),char(0),char(109),char(95),char(115),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),char(109), -char(112),char(117),char(108),char(115),char(101),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(105), -char(110),char(115),char(65),char(110),char(99),char(104),char(111),char(114),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(100),char(101),char(0),char(109), -char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(110),char(100),char(101),char(120),char(0),char(42),char(109),char(95),char(98),char(111),char(100), -char(121),char(65),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(66),char(0),char(109),char(95),char(114),char(101),char(102),char(115),char(91),char(50), -char(93),char(0),char(109),char(95),char(99),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(100),char(101), -char(108),char(101),char(116),char(101),char(0),char(109),char(95),char(114),char(101),char(108),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(91),char(50), -char(93),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(98),char(111),char(100),char(121), -char(66),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(84),char(121),char(112),char(101),char(0),char(42),char(109), -char(95),char(112),char(111),char(115),char(101),char(0),char(42),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0), -char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(115),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),char(115),char(0),char(42),char(109), -char(95),char(102),char(97),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(116),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97), -char(0),char(42),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114),char(115),char(0),char(42),char(109),char(95),char(99),char(108),char(117),char(115),char(116), -char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77), -char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(76),char(105),char(110),char(107),char(115),char(0), -char(109),char(95),char(110),char(117),char(109),char(70),char(97),char(99),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(84),char(101),char(116),char(114), -char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(109),char(95),char(110),char(117),char(109),char(65),char(110),char(99),char(104),char(111),char(114),char(115),char(0), -char(109),char(95),char(110),char(117),char(109),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(74), -char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110),char(102),char(105),char(103),char(0),char(0),char(84),char(89),char(80),char(69), -char(87),char(0),char(0),char(0),char(99),char(104),char(97),char(114),char(0),char(117),char(99),char(104),char(97),char(114),char(0),char(115),char(104),char(111),char(114),char(116), -char(0),char(117),char(115),char(104),char(111),char(114),char(116),char(0),char(105),char(110),char(116),char(0),char(108),char(111),char(110),char(103),char(0),char(117),char(108),char(111), -char(110),char(103),char(0),char(102),char(108),char(111),char(97),char(116),char(0),char(100),char(111),char(117),char(98),char(108),char(101),char(0),char(118),char(111),char(105),char(100), -char(0),char(80),char(111),char(105),char(110),char(116),char(101),char(114),char(65),char(114),char(114),char(97),char(121),char(0),char(98),char(116),char(80),char(104),char(121),char(115), -char(105),char(99),char(115),char(83),char(121),char(115),char(116),char(101),char(109),char(0),char(76),char(105),char(115),char(116),char(66),char(97),char(115),char(101),char(0),char(98), -char(116),char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98), -char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), -char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(68),char(111),char(117),char(98),char(108),char(101),char(68), -char(97),char(116),char(97),char(0),char(98),char(116),char(66),char(118),char(104),char(83),char(117),char(98),char(116),char(114),char(101),char(101),char(73),char(110),char(102),char(111), -char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78), -char(111),char(100),char(101),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109), -char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101), -char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(70), -char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100), -char(66),char(118),char(104),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108), -char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(97), -char(116),char(105),char(99),char(80),char(108),char(97),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(67),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),char(110),char(97),char(108),char(83),char(104),char(97),char(112),char(101),char(68), -char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(110),char(100),char(82),char(97),char(100), -char(105),char(117),char(115),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(83),char(112),char(104),char(101),char(114),char(101),char(83),char(104),char(97), -char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(84),char(114),char(105), -char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(104),char(97),char(114),char(73),char(110),char(100),char(101),char(120), -char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(101),char(115),char(104),char(80),char(97), -char(114),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(114),char(105),char(100),char(105),char(110),char(103),char(77),char(101),char(115), -char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105), -char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98), -char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),char(77),char(97),char(112),char(68),char(97),char(116),char(97), -char(0),char(98),char(116),char(83),char(99),char(97),char(108),char(101),char(100),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115), -char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117),char(110), -char(100),char(83),char(104),char(97),char(112),char(101),char(67),char(104),char(105),char(108),char(100),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), -char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(121), -char(108),char(105),char(110),char(100),char(101),char(114),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), -char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(97),char(112),char(115),char(117),char(108), -char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108), -char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(73),char(109),char(112),char(97),char(99),char(116),char(77), -char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(118),char(101), -char(120),char(72),char(117),char(108),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108), -char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97), -char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116), +char(95),char(114),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99), +char(111),char(110),char(116),char(97),char(99),char(116),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(99),char(111),char(110),char(116), +char(97),char(99),char(116),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105), +char(116),char(117),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(104),char(105),char(116),char(70),char(114),char(97),char(99),char(116),char(105),char(111),char(110), +char(0),char(109),char(95),char(99),char(99),char(100),char(83),char(119),char(101),char(112),char(116),char(83),char(112),char(104),char(101),char(114),char(101),char(82),char(97),char(100), +char(105),char(117),char(115),char(0),char(109),char(95),char(99),char(99),char(100),char(77),char(111),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115), +char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(104),char(97),char(115),char(65),char(110),char(105),char(115),char(111),char(116),char(114),char(111),char(112),char(105), +char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111), +char(110),char(70),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(105),char(115),char(108),char(97),char(110),char(100),char(84),char(97),char(103),char(49),char(0), +char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(0),char(109),char(95),char(97),char(99),char(116),char(105), +char(118),char(97),char(116),char(105),char(111),char(110),char(83),char(116),char(97),char(116),char(101),char(49),char(0),char(109),char(95),char(105),char(110),char(116),char(101),char(114), +char(110),char(97),char(108),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),char(101),char(99),char(107),char(67),char(111),char(108),char(108),char(105), +char(100),char(101),char(87),char(105),char(116),char(104),char(0),char(109),char(95),char(116),char(97),char(117),char(0),char(109),char(95),char(100),char(97),char(109),char(112),char(105), +char(110),char(103),char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(116),char(101),char(112),char(0),char(109),char(95),char(109),char(97),char(120),char(69), +char(114),char(114),char(111),char(114),char(82),char(101),char(100),char(117),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(115),char(111),char(114),char(0), +char(109),char(95),char(101),char(114),char(112),char(0),char(109),char(95),char(101),char(114),char(112),char(50),char(0),char(109),char(95),char(103),char(108),char(111),char(98),char(97), +char(108),char(67),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(80), +char(101),char(110),char(101),char(116),char(114),char(97),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0), +char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(117),char(114),char(110),char(69),char(114), +char(112),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(111),char(112),char(0),char(109),char(95),char(119),char(97),char(114), +char(109),char(115),char(116),char(97),char(114),char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(109),char(97), +char(120),char(71),char(121),char(114),char(111),char(115),char(99),char(111),char(112),char(105),char(99),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(115), +char(105),char(110),char(103),char(108),char(101),char(65),char(120),char(105),char(115),char(82),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99), +char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(110),char(117),char(109),char(73), +char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(77),char(111), +char(100),char(101),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(110),char(103),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(82), +char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0), +char(109),char(95),char(109),char(105),char(110),char(105),char(109),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(66),char(97),char(116),char(99),char(104), +char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0), +char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105), +char(116),char(121),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116), +char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(84),char(101),char(110), +char(115),char(111),char(114),char(87),char(111),char(114),char(108),char(100),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(86),char(101),char(108), +char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),char(111),char(99), +char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(70),char(97),char(99),char(116),char(111),char(114),char(0), +char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(103),char(114),char(97), +char(118),char(105),char(116),char(121),char(95),char(97),char(99),char(99),char(101),char(108),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95), +char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(76),char(111),char(99),char(97),char(108),char(0),char(109),char(95),char(116),char(111), +char(116),char(97),char(108),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(84),char(111),char(114),char(113), +char(117),char(101),char(0),char(109),char(95),char(105),char(110),char(118),char(101),char(114),char(115),char(101),char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(108), +char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108), +char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110), +char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(97),char(100), +char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(76),char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110), +char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105), +char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103), +char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116), +char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70), +char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105), +char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97), +char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109), +char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109), +char(95),char(110),char(117),char(109),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(82),char(111),char(119),char(115),char(0),char(110), +char(117),char(98),char(0),char(42),char(109),char(95),char(114),char(98),char(65),char(0),char(42),char(109),char(95),char(114),char(98),char(66),char(0),char(109),char(95),char(111), +char(98),char(106),char(101),char(99),char(116),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115), +char(116),char(114),char(97),char(105),char(110),char(116),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110), +char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(100),char(0),char(109),char(95),char(110),char(101),char(101),char(100),char(115),char(70),char(101),char(101), +char(100),char(98),char(97),char(99),char(107),char(0),char(109),char(95),char(97),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108), +char(115),char(101),char(0),char(109),char(95),char(100),char(98),char(103),char(68),char(114),char(97),char(119),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(100), +char(105),char(115),char(97),char(98),char(108),char(101),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(115),char(66),char(101),char(116),char(119), +char(101),char(101),char(110),char(76),char(105),char(110),char(107),char(101),char(100),char(66),char(111),char(100),char(105),char(101),char(115),char(0),char(109),char(95),char(111),char(118), +char(101),char(114),char(114),char(105),char(100),char(101),char(78),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(116),char(101),char(114),char(97), +char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(98),char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(73),char(109),char(112),char(117), +char(108),char(115),char(101),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(105),char(115),char(69),char(110),char(97), +char(98),char(108),char(101),char(100),char(0),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(121), +char(112),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(112), +char(105),char(118),char(111),char(116),char(73),char(110),char(65),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(66),char(0),char(109), +char(95),char(114),char(98),char(65),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(114),char(98),char(66),char(70),char(114),char(97),char(109),char(101), +char(0),char(109),char(95),char(117),char(115),char(101),char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101), +char(65),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(79),char(110),char(108),char(121),char(0),char(109),char(95),char(101),char(110), +char(97),char(98),char(108),char(101),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(0),char(109),char(95),char(109), +char(111),char(116),char(111),char(114),char(84),char(97),char(114),char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109), +char(95),char(109),char(97),char(120),char(77),char(111),char(116),char(111),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(108), +char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(117),char(112),char(112),char(101),char(114),char(76),char(105),char(109), +char(105),char(116),char(0),char(109),char(95),char(108),char(105),char(109),char(105),char(116),char(83),char(111),char(102),char(116),char(110),char(101),char(115),char(115),char(0),char(109), +char(95),char(98),char(105),char(97),char(115),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(114),char(101),char(108),char(97),char(120),char(97), +char(116),char(105),char(111),char(110),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103), +char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(49),char(0),char(109),char(95), +char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(50),char(0),char(109),char(95),char(116),char(119),char(105),char(115),char(116),char(83),char(112), +char(97),char(110),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105), +char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116), +char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116), +char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116), +char(0),char(109),char(95),char(117),char(115),char(101),char(76),char(105),char(110),char(101),char(97),char(114),char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99), +char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(117),char(115),char(101),char(79),char(102),char(102),char(115),char(101),char(116),char(70), +char(111),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95), +char(54),char(100),char(111),char(102),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(69),char(110),char(97), +char(98),char(108),char(101),char(100),char(91),char(54),char(93),char(0),char(109),char(95),char(101),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117), +char(109),char(80),char(111),char(105),char(110),char(116),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(83),char(116), +char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(68), +char(97),char(109),char(112),char(105),char(110),char(103),char(91),char(54),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(66),char(111), +char(117),char(110),char(99),char(101),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80), +char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(108), +char(105),char(110),char(101),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(69),char(82),char(80),char(0),char(109),char(95),char(108),char(105),char(110),char(101), +char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(67),char(70),char(77),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(84), +char(97),char(114),char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(108),char(105),char(110),char(101), +char(97),char(114),char(77),char(97),char(120),char(77),char(111),char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(108),char(105), +char(110),char(101),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(108),char(105), +char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0), +char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110), +char(103),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117), +char(109),char(80),char(111),char(105),char(110),char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(110),char(97),char(98),char(108), +char(101),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(101), +char(114),char(118),char(111),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114), +char(69),char(110),char(97),char(98),char(108),char(101),char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105), +char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(76), +char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112), +char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52), +char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(66),char(111),char(117),char(110),char(99),char(101),char(0),char(109),char(95), +char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103), +char(117),char(108),char(97),char(114),char(83),char(116),char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97), +char(114),char(77),char(111),char(116),char(111),char(114),char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77), +char(111),char(116),char(111),char(114),char(67),char(70),char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(84),char(97),char(114), +char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97), +char(114),char(77),char(97),char(120),char(77),char(111),char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(97),char(110),char(103), +char(117),char(108),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(97),char(110), +char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115), +char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112), +char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98), +char(114),char(105),char(117),char(109),char(80),char(111),char(105),char(110),char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69), +char(110),char(97),char(98),char(108),char(101),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117), +char(108),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97), +char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52), +char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105), +char(102),char(102),char(110),char(101),char(115),char(115),char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(97), +char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(76), +char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(111),char(116),char(97),char(116),char(101),char(79),char(114), +char(100),char(101),char(114),char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(65),char(0),char(109),char(95),char(97),char(120),char(105),char(115), +char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(97),char(116),char(105),char(111),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114), +char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83), +char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(83),char(116),char(105), +char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(0),char(109), +char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(114),char(101),char(118),char(105),char(111),char(117),char(115), +char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0), +char(109),char(95),char(97),char(99),char(99),char(117),char(109),char(117),char(108),char(97),char(116),char(101),char(100),char(70),char(111),char(114),char(99),char(101),char(0),char(109), +char(95),char(110),char(111),char(114),char(109),char(97),char(108),char(0),char(109),char(95),char(97),char(114),char(101),char(97),char(0),char(109),char(95),char(97),char(116),char(116), +char(97),char(99),char(104),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(50),char(93), +char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(76),char(101),char(110),char(103),char(116),char(104),char(0),char(109),char(95),char(98),char(98),char(101),char(110), +char(100),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(51), +char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(65),char(114),char(101),char(97),char(0),char(109),char(95),char(99),char(48),char(91),char(52),char(93), +char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(52),char(93),char(0),char(109),char(95), +char(114),char(101),char(115),char(116),char(86),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(99),char(49),char(0),char(109),char(95),char(99),char(50), +char(0),char(109),char(95),char(99),char(48),char(0),char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(70),char(114),char(97),char(109),char(101),char(0),char(42), +char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110), +char(100),char(101),char(120),char(0),char(109),char(95),char(97),char(101),char(114),char(111),char(77),char(111),char(100),char(101),char(108),char(0),char(109),char(95),char(98),char(97), +char(117),char(109),char(103),char(97),char(114),char(116),char(101),char(0),char(109),char(95),char(100),char(114),char(97),char(103),char(0),char(109),char(95),char(108),char(105),char(102), +char(116),char(0),char(109),char(95),char(112),char(114),char(101),char(115),char(115),char(117),char(114),char(101),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109), +char(101),char(0),char(109),char(95),char(100),char(121),char(110),char(97),char(109),char(105),char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0), +char(109),char(95),char(112),char(111),char(115),char(101),char(77),char(97),char(116),char(99),char(104),char(0),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(67), +char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(107),char(105),char(110), +char(101),char(116),char(105),char(99),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0), +char(109),char(95),char(115),char(111),char(102),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115), +char(115),char(0),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109), +char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114), +char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67), +char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102), +char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115), +char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73), +char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105), +char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83), +char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116), +char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(109),char(97),char(120), +char(86),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(99),char(97),char(108),char(101),char(0),char(109), +char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0), +char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115), +char(0),char(109),char(95),char(100),char(114),char(105),char(102),char(116),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109), +char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109), +char(95),char(114),char(111),char(116),char(0),char(109),char(95),char(115),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(97),char(113),char(113),char(0),char(109), +char(95),char(99),char(111),char(109),char(0),char(42),char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(42),char(109), +char(95),char(119),char(101),char(105),char(103),char(104),char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(80),char(111),char(115),char(105),char(116),char(105), +char(111),char(110),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(87),char(101),char(105),char(103),char(116),char(115),char(0),char(109),char(95),char(98),char(118), +char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(98),char(102),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(97), +char(109),char(101),char(120),char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(108),char(111),char(99),char(105),char(105),char(0),char(109),char(95),char(105),char(110), +char(118),char(119),char(105),char(0),char(109),char(95),char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109), +char(95),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(108),char(118),char(0),char(109), +char(95),char(97),char(118),char(0),char(42),char(109),char(95),char(102),char(114),char(97),char(109),char(101),char(114),char(101),char(102),char(115),char(0),char(42),char(109),char(95), +char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(115),char(115),char(101), +char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(114),char(97),char(109),char(101),char(82),char(101),char(102),char(115),char(0),char(109),char(95),char(110), +char(117),char(109),char(78),char(111),char(100),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(97),char(115),char(115),char(101),char(115),char(0), +char(109),char(95),char(105),char(100),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(105),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(110), +char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(105),char(109),char(112),char(117),char(108),char(115), +char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(100),char(97),char(109), +char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97), +char(116),char(99),char(104),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97),char(120),char(83),char(101),char(108),char(102),char(67),char(111),char(108),char(108), +char(105),char(115),char(105),char(111),char(110),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(115),char(101),char(108),char(102),char(67), +char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(70),char(97),char(99),char(116),char(111), +char(114),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(105),char(110),char(115),char(65),char(110),char(99),char(104),char(111),char(114),char(0),char(109), +char(95),char(99),char(111),char(108),char(108),char(105),char(100),char(101),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(110), +char(100),char(101),char(120),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121), +char(66),char(0),char(109),char(95),char(114),char(101),char(102),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(99),char(102),char(109),char(0),char(109),char(95), +char(115),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(100),char(101),char(108),char(101),char(116),char(101),char(0),char(109),char(95),char(114),char(101),char(108), +char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(91),char(50),char(93),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(116), +char(121),char(112),char(101),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(66),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(106),char(111), +char(105),char(110),char(116),char(84),char(121),char(112),char(101),char(0),char(42),char(109),char(95),char(112),char(111),char(115),char(101),char(0),char(42),char(42),char(109),char(95), +char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(115),char(0),char(42), +char(109),char(95),char(108),char(105),char(110),char(107),char(115),char(0),char(42),char(109),char(95),char(102),char(97),char(99),char(101),char(115),char(0),char(42),char(109),char(95), +char(116),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(42),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114), +char(115),char(0),char(42),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(106),char(111),char(105), +char(110),char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(109), +char(95),char(110),char(117),char(109),char(76),char(105),char(110),char(107),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(97),char(99),char(101),char(115), +char(0),char(109),char(95),char(110),char(117),char(109),char(84),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(109),char(95),char(110), +char(117),char(109),char(65),char(110),char(99),char(104),char(111),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(108),char(117),char(115),char(116), +char(101),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(74),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111), +char(110),char(102),char(105),char(103),char(0),char(109),char(95),char(122),char(101),char(114),char(111),char(82),char(111),char(116),char(80),char(97),char(114),char(101),char(110),char(116), +char(84),char(111),char(84),char(104),char(105),char(115),char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(67),char(111),char(109),char(84),char(111), +char(84),char(104),char(105),char(115),char(67),char(111),char(109),char(79),char(102),char(102),char(115),char(101),char(116),char(0),char(109),char(95),char(116),char(104),char(105),char(115), +char(80),char(105),char(118),char(111),char(116),char(84),char(111),char(84),char(104),char(105),char(115),char(67),char(111),char(109),char(79),char(102),char(102),char(115),char(101),char(116), +char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(65),char(120),char(105),char(115),char(84),char(111),char(112),char(91),char(54),char(93),char(0),char(109), +char(95),char(106),char(111),char(105),char(110),char(116),char(65),char(120),char(105),char(115),char(66),char(111),char(116),char(116),char(111),char(109),char(91),char(54),char(93),char(0), +char(109),char(95),char(108),char(105),char(110),char(107),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(108),char(105),char(110),char(107), +char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(0),char(109), +char(95),char(100),char(111),char(102),char(67),char(111),char(117),char(110),char(116),char(0),char(109),char(95),char(112),char(111),char(115),char(86),char(97),char(114),char(67),char(111), +char(117),char(110),char(116),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(80),char(111),char(115),char(91),char(55),char(93),char(0),char(109),char(95), +char(106),char(111),char(105),char(110),char(116),char(86),char(101),char(108),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(84), +char(111),char(114),char(113),char(117),char(101),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(68),char(97),char(109),char(112), +char(105),char(110),char(103),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0), +char(42),char(109),char(95),char(108),char(105),char(110),char(107),char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116), +char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114), +char(0),char(42),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(80),char(116),char(114),char(0),char(109),char(95),char(98),char(97),char(115), +char(101),char(87),char(111),char(114),char(108),char(100),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(98),char(97), +char(115),char(101),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(77),char(97),char(115),char(115), +char(0),char(42),char(109),char(95),char(98),char(97),char(115),char(101),char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(98),char(97),char(115),char(101), +char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114),char(0),char(0),char(0),char(0),char(84),char(89),char(80),char(69),char(95),char(0),char(0),char(0), +char(99),char(104),char(97),char(114),char(0),char(117),char(99),char(104),char(97),char(114),char(0),char(115),char(104),char(111),char(114),char(116),char(0),char(117),char(115),char(104), +char(111),char(114),char(116),char(0),char(105),char(110),char(116),char(0),char(108),char(111),char(110),char(103),char(0),char(117),char(108),char(111),char(110),char(103),char(0),char(102), +char(108),char(111),char(97),char(116),char(0),char(100),char(111),char(117),char(98),char(108),char(101),char(0),char(118),char(111),char(105),char(100),char(0),char(80),char(111),char(105), +char(110),char(116),char(101),char(114),char(65),char(114),char(114),char(97),char(121),char(0),char(98),char(116),char(80),char(104),char(121),char(115),char(105),char(99),char(115),char(83), +char(121),char(115),char(116),char(101),char(109),char(0),char(76),char(105),char(115),char(116),char(66),char(97),char(115),char(101),char(0),char(98),char(116),char(86),char(101),char(99), +char(116),char(111),char(114),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(86),char(101),char(99),char(116), +char(111),char(114),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(116), +char(101),char(114),char(110),char(105),char(111),char(110),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117), +char(97),char(116),char(101),char(114),char(110),char(105),char(111),char(110),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98), +char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0), +char(98),char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116), +char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(70),char(108),char(111),char(97),char(116),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(68),char(111),char(117),char(98),char(108),char(101), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(66),char(118),char(104),char(83),char(117),char(98),char(116),char(114),char(101),char(101),char(73),char(110),char(102), +char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104), +char(78),char(111),char(100),char(101),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105), +char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100), +char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104), +char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101), +char(100),char(66),char(118),char(104),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108), +char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116), +char(97),char(116),char(105),char(99),char(80),char(108),char(97),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98), +char(116),char(67),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),char(110),char(97),char(108),char(83),char(104),char(97),char(112),char(101), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(110),char(100),char(82),char(97), +char(100),char(105),char(117),char(115),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(83),char(112),char(104),char(101),char(114),char(101),char(83),char(104), +char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(84),char(114), +char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(104),char(97),char(114),char(73),char(110),char(100),char(101), +char(120),char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(101),char(115),char(104),char(80), +char(97),char(114),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(114),char(105),char(100),char(105),char(110),char(103),char(77),char(101), +char(115),char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114), +char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0), +char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),char(77),char(97),char(112),char(68),char(97),char(116), +char(97),char(0),char(98),char(116),char(83),char(99),char(97),char(108),char(101),char(100),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101), +char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117), +char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(67),char(104),char(105),char(108),char(100),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67), +char(111),char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67), +char(121),char(108),char(105),char(110),char(100),char(101),char(114),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67), +char(111),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(97),char(112),char(115),char(117), +char(108),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103), +char(108),char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(73),char(109),char(112),char(97),char(99),char(116), +char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(118), +char(101),char(120),char(72),char(117),char(108),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), +char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68), +char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99), +char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116), +char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), +char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111), char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115), -char(87),char(111),char(114),char(108),char(100),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), -char(110),char(116),char(97),char(99),char(116),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(68),char(111),char(117),char(98),char(108), -char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108), -char(100),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116), -char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0), -char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97), -char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97), -char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(110),char(102),char(111),char(49), -char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108), -char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116), -char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100), -char(121),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97), -char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110), -char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111), -char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116), -char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), -char(50),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116), -char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105), -char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68), -char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110), -char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111), -char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0), -char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110), -char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119), -char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110), -char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67), +char(87),char(111),char(114),char(108),char(100),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121), +char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108),char(100),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97), +char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116), +char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68), +char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(110),char(102),char(111), +char(49),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70), +char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115), +char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111), +char(100),char(121),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114), +char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105), +char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108), +char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110), +char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116), +char(97),char(50),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115), +char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72), +char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67), char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50), -char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103), -char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110), -char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116),char(114), -char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(83),char(108), -char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98), -char(116),char(83),char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117), -char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111),char(110),char(115),char(116),char(114), -char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114), +char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84), +char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98), +char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102), char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), -char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(68),char(97),char(116), -char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(78),char(111),char(100),char(101),char(68),char(97),char(116),char(97),char(0),char(83), -char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116), -char(66),char(111),char(100),char(121),char(70),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100), -char(121),char(84),char(101),char(116),char(114),char(97),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100), -char(65),char(110),char(99),char(104),char(111),char(114),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67), -char(111),char(110),char(102),char(105),char(103),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(80),char(111), -char(115),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(108),char(117),char(115),char(116), -char(101),char(114),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(74),char(111),char(105), -char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(70),char(108),char(111), -char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(0),char(84),char(76),char(69),char(78),char(1),char(0),char(1),char(0),char(2),char(0),char(2),char(0), -char(4),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(0),char(0),char(12),char(0),char(36),char(0),char(8),char(0),char(16),char(0), -char(32),char(0),char(48),char(0),char(96),char(0),char(64),char(0),char(-128),char(0),char(20),char(0),char(48),char(0),char(80),char(0),char(16),char(0),char(84),char(0), -char(-124),char(0),char(12),char(0),char(52),char(0),char(52),char(0),char(20),char(0),char(64),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(4),char(0), -char(32),char(0),char(28),char(0),char(60),char(0),char(56),char(0),char(76),char(0),char(76),char(0),char(24),char(0),char(60),char(0),char(60),char(0),char(60),char(0), -char(16),char(0),char(64),char(0),char(68),char(0),char(-48),char(1),char(0),char(1),char(-72),char(0),char(-104),char(0),char(104),char(0),char(88),char(0),char(-24),char(1), -char(-96),char(3),char(8),char(0),char(52),char(0),char(52),char(0),char(0),char(0),char(68),char(0),char(84),char(0),char(-124),char(0),char(116),char(0),char(92),char(1), -char(-36),char(0),char(-116),char(1),char(124),char(1),char(-44),char(0),char(-4),char(0),char(-52),char(1),char(92),char(1),char(116),char(2),char(-52),char(0),char(108),char(1), +char(50),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110), +char(103),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101), +char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116), +char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(71), +char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(50),char(67),char(111),char(110), +char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105), +char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(50),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(83),char(108),char(105),char(100), +char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83), +char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108), +char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111), +char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(83), +char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(68),char(97),char(116),char(97),char(0), +char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(78),char(111),char(100),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102), +char(116),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111), +char(100),char(121),char(70),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(84), +char(101),char(116),char(114),char(97),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(65),char(110), +char(99),char(104),char(111),char(114),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(111),char(110), +char(102),char(105),char(103),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(80),char(111),char(115),char(101), +char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(108),char(117),char(115),char(116),char(101),char(114), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(74),char(111),char(105),char(110),char(116), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107), +char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111), +char(100),char(121),char(76),char(105),char(110),char(107),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117), +char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116), +char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(0), +char(84),char(76),char(69),char(78),char(1),char(0),char(1),char(0),char(2),char(0),char(2),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(4),char(0), +char(8),char(0),char(0),char(0),char(12),char(0),char(36),char(0),char(8),char(0),char(16),char(0),char(32),char(0),char(16),char(0),char(32),char(0),char(48),char(0), +char(96),char(0),char(64),char(0),char(-128),char(0),char(20),char(0),char(48),char(0),char(80),char(0),char(16),char(0),char(84),char(0),char(-124),char(0),char(12),char(0), +char(52),char(0),char(52),char(0),char(20),char(0),char(64),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(4),char(0),char(32),char(0),char(28),char(0), +char(60),char(0),char(56),char(0),char(76),char(0),char(76),char(0),char(24),char(0),char(60),char(0),char(60),char(0),char(60),char(0),char(16),char(0),char(64),char(0), +char(68),char(0),char(-32),char(1),char(8),char(1),char(-104),char(0),char(88),char(0),char(-72),char(0),char(104),char(0),char(-16),char(1),char(-80),char(3),char(8),char(0), +char(52),char(0),char(52),char(0),char(0),char(0),char(68),char(0),char(84),char(0),char(-124),char(0),char(116),char(0),char(92),char(1),char(-36),char(0),char(-116),char(1), +char(124),char(1),char(-44),char(0),char(-4),char(0),char(-52),char(1),char(92),char(1),char(116),char(2),char(-124),char(2),char(-76),char(4),char(-52),char(0),char(108),char(1), char(92),char(0),char(-116),char(0),char(16),char(0),char(100),char(0),char(20),char(0),char(36),char(0),char(100),char(0),char(92),char(0),char(104),char(0),char(-64),char(0), -char(92),char(1),char(104),char(0),char(-84),char(1),char(0),char(0),char(83),char(84),char(82),char(67),char(76),char(0),char(0),char(0),char(10),char(0),char(3),char(0), -char(4),char(0),char(0),char(0),char(4),char(0),char(1),char(0),char(9),char(0),char(2),char(0),char(11),char(0),char(3),char(0),char(10),char(0),char(3),char(0), -char(10),char(0),char(4),char(0),char(10),char(0),char(5),char(0),char(12),char(0),char(2),char(0),char(9),char(0),char(6),char(0),char(9),char(0),char(7),char(0), -char(13),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(14),char(0),char(1),char(0),char(8),char(0),char(8),char(0),char(15),char(0),char(1),char(0), -char(13),char(0),char(9),char(0),char(16),char(0),char(1),char(0),char(14),char(0),char(9),char(0),char(17),char(0),char(2),char(0),char(15),char(0),char(10),char(0), -char(13),char(0),char(11),char(0),char(18),char(0),char(2),char(0),char(16),char(0),char(10),char(0),char(14),char(0),char(11),char(0),char(19),char(0),char(4),char(0), -char(4),char(0),char(12),char(0),char(4),char(0),char(13),char(0),char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0),char(20),char(0),char(6),char(0), -char(13),char(0),char(16),char(0),char(13),char(0),char(17),char(0),char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0), -char(0),char(0),char(21),char(0),char(21),char(0),char(6),char(0),char(14),char(0),char(16),char(0),char(14),char(0),char(17),char(0),char(4),char(0),char(18),char(0), -char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(22),char(0),char(3),char(0),char(2),char(0),char(14),char(0), -char(2),char(0),char(15),char(0),char(4),char(0),char(22),char(0),char(23),char(0),char(12),char(0),char(13),char(0),char(23),char(0),char(13),char(0),char(24),char(0), -char(13),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0), -char(20),char(0),char(30),char(0),char(22),char(0),char(31),char(0),char(19),char(0),char(32),char(0),char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0), -char(24),char(0),char(12),char(0),char(14),char(0),char(23),char(0),char(14),char(0),char(24),char(0),char(14),char(0),char(25),char(0),char(4),char(0),char(26),char(0), -char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),char(21),char(0),char(30),char(0),char(22),char(0),char(31),char(0), -char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(19),char(0),char(32),char(0),char(25),char(0),char(3),char(0),char(0),char(0),char(35),char(0), -char(4),char(0),char(36),char(0),char(0),char(0),char(37),char(0),char(26),char(0),char(5),char(0),char(25),char(0),char(38),char(0),char(13),char(0),char(39),char(0), -char(13),char(0),char(40),char(0),char(7),char(0),char(41),char(0),char(0),char(0),char(21),char(0),char(27),char(0),char(5),char(0),char(25),char(0),char(38),char(0), -char(13),char(0),char(39),char(0),char(13),char(0),char(42),char(0),char(7),char(0),char(43),char(0),char(4),char(0),char(44),char(0),char(28),char(0),char(2),char(0), -char(13),char(0),char(45),char(0),char(7),char(0),char(46),char(0),char(29),char(0),char(4),char(0),char(27),char(0),char(47),char(0),char(28),char(0),char(48),char(0), -char(4),char(0),char(49),char(0),char(0),char(0),char(37),char(0),char(30),char(0),char(1),char(0),char(4),char(0),char(50),char(0),char(31),char(0),char(2),char(0), -char(2),char(0),char(50),char(0),char(0),char(0),char(51),char(0),char(32),char(0),char(2),char(0),char(2),char(0),char(52),char(0),char(0),char(0),char(51),char(0), -char(33),char(0),char(2),char(0),char(0),char(0),char(52),char(0),char(0),char(0),char(53),char(0),char(34),char(0),char(8),char(0),char(13),char(0),char(54),char(0), -char(14),char(0),char(55),char(0),char(30),char(0),char(56),char(0),char(32),char(0),char(57),char(0),char(33),char(0),char(58),char(0),char(31),char(0),char(59),char(0), -char(4),char(0),char(60),char(0),char(4),char(0),char(61),char(0),char(35),char(0),char(4),char(0),char(34),char(0),char(62),char(0),char(13),char(0),char(63),char(0), -char(4),char(0),char(64),char(0),char(0),char(0),char(37),char(0),char(36),char(0),char(7),char(0),char(25),char(0),char(38),char(0),char(35),char(0),char(65),char(0), -char(23),char(0),char(66),char(0),char(24),char(0),char(67),char(0),char(37),char(0),char(68),char(0),char(7),char(0),char(43),char(0),char(0),char(0),char(69),char(0), -char(38),char(0),char(2),char(0),char(36),char(0),char(70),char(0),char(13),char(0),char(39),char(0),char(39),char(0),char(4),char(0),char(17),char(0),char(71),char(0), -char(25),char(0),char(72),char(0),char(4),char(0),char(73),char(0),char(7),char(0),char(74),char(0),char(40),char(0),char(4),char(0),char(25),char(0),char(38),char(0), -char(39),char(0),char(75),char(0),char(4),char(0),char(76),char(0),char(7),char(0),char(43),char(0),char(41),char(0),char(3),char(0),char(27),char(0),char(47),char(0), -char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(42),char(0),char(3),char(0),char(27),char(0),char(47),char(0),char(4),char(0),char(78),char(0), -char(0),char(0),char(37),char(0),char(43),char(0),char(3),char(0),char(27),char(0),char(47),char(0),char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0), -char(44),char(0),char(4),char(0),char(4),char(0),char(79),char(0),char(7),char(0),char(80),char(0),char(7),char(0),char(81),char(0),char(7),char(0),char(82),char(0), -char(37),char(0),char(14),char(0),char(4),char(0),char(83),char(0),char(4),char(0),char(84),char(0),char(44),char(0),char(85),char(0),char(4),char(0),char(86),char(0), -char(7),char(0),char(87),char(0),char(7),char(0),char(88),char(0),char(7),char(0),char(89),char(0),char(7),char(0),char(90),char(0),char(7),char(0),char(91),char(0), -char(4),char(0),char(92),char(0),char(4),char(0),char(93),char(0),char(4),char(0),char(94),char(0),char(4),char(0),char(95),char(0),char(0),char(0),char(37),char(0), -char(45),char(0),char(5),char(0),char(25),char(0),char(38),char(0),char(35),char(0),char(65),char(0),char(13),char(0),char(39),char(0),char(7),char(0),char(43),char(0), -char(4),char(0),char(96),char(0),char(46),char(0),char(5),char(0),char(27),char(0),char(47),char(0),char(13),char(0),char(97),char(0),char(14),char(0),char(98),char(0), -char(4),char(0),char(99),char(0),char(0),char(0),char(100),char(0),char(47),char(0),char(25),char(0),char(9),char(0),char(101),char(0),char(9),char(0),char(102),char(0), -char(25),char(0),char(103),char(0),char(0),char(0),char(35),char(0),char(18),char(0),char(104),char(0),char(18),char(0),char(105),char(0),char(14),char(0),char(106),char(0), -char(14),char(0),char(107),char(0),char(14),char(0),char(108),char(0),char(8),char(0),char(109),char(0),char(8),char(0),char(110),char(0),char(8),char(0),char(111),char(0), -char(8),char(0),char(112),char(0),char(8),char(0),char(113),char(0),char(8),char(0),char(114),char(0),char(8),char(0),char(115),char(0),char(8),char(0),char(116),char(0), -char(4),char(0),char(117),char(0),char(4),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0),char(4),char(0),char(121),char(0), -char(4),char(0),char(122),char(0),char(4),char(0),char(123),char(0),char(0),char(0),char(37),char(0),char(48),char(0),char(25),char(0),char(9),char(0),char(101),char(0), -char(9),char(0),char(102),char(0),char(25),char(0),char(103),char(0),char(0),char(0),char(35),char(0),char(17),char(0),char(104),char(0),char(17),char(0),char(105),char(0), -char(13),char(0),char(106),char(0),char(13),char(0),char(107),char(0),char(13),char(0),char(108),char(0),char(7),char(0),char(109),char(0),char(7),char(0),char(110),char(0), -char(7),char(0),char(111),char(0),char(7),char(0),char(112),char(0),char(7),char(0),char(113),char(0),char(7),char(0),char(114),char(0),char(7),char(0),char(115),char(0), -char(7),char(0),char(116),char(0),char(4),char(0),char(117),char(0),char(4),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0), -char(4),char(0),char(121),char(0),char(4),char(0),char(122),char(0),char(4),char(0),char(123),char(0),char(0),char(0),char(37),char(0),char(49),char(0),char(2),char(0), -char(50),char(0),char(124),char(0),char(14),char(0),char(125),char(0),char(51),char(0),char(2),char(0),char(52),char(0),char(124),char(0),char(13),char(0),char(125),char(0), -char(53),char(0),char(21),char(0),char(48),char(0),char(126),char(0),char(15),char(0),char(127),char(0),char(13),char(0),char(-128),char(0),char(13),char(0),char(-127),char(0), -char(13),char(0),char(-126),char(0),char(13),char(0),char(-125),char(0),char(13),char(0),char(125),char(0),char(13),char(0),char(-124),char(0),char(13),char(0),char(-123),char(0), -char(13),char(0),char(-122),char(0),char(13),char(0),char(-121),char(0),char(7),char(0),char(-120),char(0),char(7),char(0),char(-119),char(0),char(7),char(0),char(-118),char(0), -char(7),char(0),char(-117),char(0),char(7),char(0),char(-116),char(0),char(7),char(0),char(-115),char(0),char(7),char(0),char(-114),char(0),char(7),char(0),char(-113),char(0), -char(7),char(0),char(-112),char(0),char(4),char(0),char(-111),char(0),char(54),char(0),char(22),char(0),char(47),char(0),char(126),char(0),char(16),char(0),char(127),char(0), -char(14),char(0),char(-128),char(0),char(14),char(0),char(-127),char(0),char(14),char(0),char(-126),char(0),char(14),char(0),char(-125),char(0),char(14),char(0),char(125),char(0), -char(14),char(0),char(-124),char(0),char(14),char(0),char(-123),char(0),char(14),char(0),char(-122),char(0),char(14),char(0),char(-121),char(0),char(8),char(0),char(-120),char(0), -char(8),char(0),char(-119),char(0),char(8),char(0),char(-118),char(0),char(8),char(0),char(-117),char(0),char(8),char(0),char(-116),char(0),char(8),char(0),char(-115),char(0), -char(8),char(0),char(-114),char(0),char(8),char(0),char(-113),char(0),char(8),char(0),char(-112),char(0),char(4),char(0),char(-111),char(0),char(0),char(0),char(37),char(0), -char(55),char(0),char(2),char(0),char(4),char(0),char(-110),char(0),char(4),char(0),char(-109),char(0),char(56),char(0),char(13),char(0),char(53),char(0),char(-108),char(0), -char(53),char(0),char(-107),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-106),char(0),char(4),char(0),char(-105),char(0),char(4),char(0),char(-104),char(0), -char(4),char(0),char(-103),char(0),char(7),char(0),char(-102),char(0),char(7),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),char(4),char(0),char(-99),char(0), -char(7),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0),char(57),char(0),char(13),char(0),char(58),char(0),char(-108),char(0),char(58),char(0),char(-107),char(0), -char(0),char(0),char(35),char(0),char(4),char(0),char(-106),char(0),char(4),char(0),char(-105),char(0),char(4),char(0),char(-104),char(0),char(4),char(0),char(-103),char(0), -char(7),char(0),char(-102),char(0),char(7),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),char(4),char(0),char(-99),char(0),char(7),char(0),char(-98),char(0), -char(4),char(0),char(-97),char(0),char(59),char(0),char(14),char(0),char(54),char(0),char(-108),char(0),char(54),char(0),char(-107),char(0),char(0),char(0),char(35),char(0), -char(4),char(0),char(-106),char(0),char(4),char(0),char(-105),char(0),char(4),char(0),char(-104),char(0),char(4),char(0),char(-103),char(0),char(8),char(0),char(-102),char(0), -char(8),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),char(4),char(0),char(-99),char(0),char(8),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0), -char(0),char(0),char(-96),char(0),char(60),char(0),char(3),char(0),char(57),char(0),char(-95),char(0),char(13),char(0),char(-94),char(0),char(13),char(0),char(-93),char(0), -char(61),char(0),char(3),char(0),char(59),char(0),char(-95),char(0),char(14),char(0),char(-94),char(0),char(14),char(0),char(-93),char(0),char(62),char(0),char(3),char(0), -char(57),char(0),char(-95),char(0),char(14),char(0),char(-94),char(0),char(14),char(0),char(-93),char(0),char(63),char(0),char(13),char(0),char(57),char(0),char(-95),char(0), -char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0), -char(7),char(0),char(-87),char(0),char(7),char(0),char(-86),char(0),char(7),char(0),char(-85),char(0),char(7),char(0),char(-84),char(0),char(7),char(0),char(-83),char(0), -char(7),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(64),char(0),char(13),char(0),char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0), -char(17),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0),char(7),char(0),char(-87),char(0), -char(7),char(0),char(-86),char(0),char(7),char(0),char(-85),char(0),char(7),char(0),char(-84),char(0),char(7),char(0),char(-83),char(0),char(7),char(0),char(-82),char(0), -char(7),char(0),char(-81),char(0),char(65),char(0),char(14),char(0),char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0), -char(4),char(0),char(-90),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0),char(8),char(0),char(-87),char(0),char(8),char(0),char(-86),char(0), -char(8),char(0),char(-85),char(0),char(8),char(0),char(-84),char(0),char(8),char(0),char(-83),char(0),char(8),char(0),char(-82),char(0),char(8),char(0),char(-81),char(0), -char(0),char(0),char(-80),char(0),char(66),char(0),char(10),char(0),char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0), -char(8),char(0),char(-79),char(0),char(8),char(0),char(-78),char(0),char(8),char(0),char(-77),char(0),char(8),char(0),char(-83),char(0),char(8),char(0),char(-82),char(0), -char(8),char(0),char(-81),char(0),char(8),char(0),char(-76),char(0),char(67),char(0),char(11),char(0),char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0), -char(17),char(0),char(-91),char(0),char(7),char(0),char(-79),char(0),char(7),char(0),char(-78),char(0),char(7),char(0),char(-77),char(0),char(7),char(0),char(-83),char(0), -char(7),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(7),char(0),char(-76),char(0),char(0),char(0),char(21),char(0),char(68),char(0),char(9),char(0), -char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0),char(17),char(0),char(-91),char(0),char(13),char(0),char(-75),char(0),char(13),char(0),char(-74),char(0), -char(13),char(0),char(-73),char(0),char(13),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0),char(4),char(0),char(-70),char(0),char(69),char(0),char(9),char(0), -char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0),char(14),char(0),char(-75),char(0),char(14),char(0),char(-74),char(0), -char(14),char(0),char(-73),char(0),char(14),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0),char(4),char(0),char(-70),char(0),char(70),char(0),char(5),char(0), -char(68),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(7),char(0),char(-67),char(0),char(7),char(0),char(-66),char(0),char(7),char(0),char(-65),char(0), -char(71),char(0),char(5),char(0),char(69),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(8),char(0),char(-67),char(0),char(8),char(0),char(-66),char(0), -char(8),char(0),char(-65),char(0),char(72),char(0),char(9),char(0),char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0),char(17),char(0),char(-91),char(0), -char(7),char(0),char(-75),char(0),char(7),char(0),char(-74),char(0),char(7),char(0),char(-73),char(0),char(7),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0), -char(4),char(0),char(-70),char(0),char(73),char(0),char(9),char(0),char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0), -char(8),char(0),char(-75),char(0),char(8),char(0),char(-74),char(0),char(8),char(0),char(-73),char(0),char(8),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0), -char(4),char(0),char(-70),char(0),char(74),char(0),char(5),char(0),char(56),char(0),char(-95),char(0),char(13),char(0),char(-64),char(0),char(13),char(0),char(-63),char(0), -char(7),char(0),char(-62),char(0),char(0),char(0),char(37),char(0),char(75),char(0),char(4),char(0),char(59),char(0),char(-95),char(0),char(14),char(0),char(-64),char(0), -char(14),char(0),char(-63),char(0),char(8),char(0),char(-62),char(0),char(50),char(0),char(22),char(0),char(8),char(0),char(-61),char(0),char(8),char(0),char(-76),char(0), -char(8),char(0),char(111),char(0),char(8),char(0),char(-60),char(0),char(8),char(0),char(113),char(0),char(8),char(0),char(-59),char(0),char(8),char(0),char(-58),char(0), -char(8),char(0),char(-57),char(0),char(8),char(0),char(-56),char(0),char(8),char(0),char(-55),char(0),char(8),char(0),char(-54),char(0),char(8),char(0),char(-53),char(0), -char(8),char(0),char(-52),char(0),char(8),char(0),char(-51),char(0),char(8),char(0),char(-50),char(0),char(8),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0), -char(4),char(0),char(-47),char(0),char(4),char(0),char(-46),char(0),char(4),char(0),char(-45),char(0),char(4),char(0),char(-44),char(0),char(0),char(0),char(37),char(0), -char(52),char(0),char(22),char(0),char(7),char(0),char(-61),char(0),char(7),char(0),char(-76),char(0),char(7),char(0),char(111),char(0),char(7),char(0),char(-60),char(0), -char(7),char(0),char(113),char(0),char(7),char(0),char(-59),char(0),char(7),char(0),char(-58),char(0),char(7),char(0),char(-57),char(0),char(7),char(0),char(-56),char(0), -char(7),char(0),char(-55),char(0),char(7),char(0),char(-54),char(0),char(7),char(0),char(-53),char(0),char(7),char(0),char(-52),char(0),char(7),char(0),char(-51),char(0), -char(7),char(0),char(-50),char(0),char(7),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0),char(4),char(0),char(-47),char(0),char(4),char(0),char(-46),char(0), -char(4),char(0),char(-45),char(0),char(4),char(0),char(-44),char(0),char(0),char(0),char(37),char(0),char(76),char(0),char(4),char(0),char(7),char(0),char(-43),char(0), -char(7),char(0),char(-42),char(0),char(7),char(0),char(-41),char(0),char(4),char(0),char(79),char(0),char(77),char(0),char(10),char(0),char(76),char(0),char(-40),char(0), -char(13),char(0),char(-39),char(0),char(13),char(0),char(-38),char(0),char(13),char(0),char(-37),char(0),char(13),char(0),char(-36),char(0),char(13),char(0),char(-35),char(0), -char(7),char(0),char(-120),char(0),char(7),char(0),char(-34),char(0),char(4),char(0),char(-33),char(0),char(4),char(0),char(53),char(0),char(78),char(0),char(4),char(0), -char(76),char(0),char(-40),char(0),char(4),char(0),char(-32),char(0),char(7),char(0),char(-31),char(0),char(4),char(0),char(-30),char(0),char(79),char(0),char(4),char(0), -char(13),char(0),char(-35),char(0),char(76),char(0),char(-40),char(0),char(4),char(0),char(-29),char(0),char(7),char(0),char(-28),char(0),char(80),char(0),char(7),char(0), -char(13),char(0),char(-27),char(0),char(76),char(0),char(-40),char(0),char(4),char(0),char(-26),char(0),char(7),char(0),char(-25),char(0),char(7),char(0),char(-24),char(0), -char(7),char(0),char(-23),char(0),char(4),char(0),char(53),char(0),char(81),char(0),char(6),char(0),char(15),char(0),char(-22),char(0),char(13),char(0),char(-24),char(0), -char(13),char(0),char(-21),char(0),char(58),char(0),char(-20),char(0),char(4),char(0),char(-19),char(0),char(7),char(0),char(-23),char(0),char(82),char(0),char(26),char(0), -char(4),char(0),char(-18),char(0),char(7),char(0),char(-17),char(0),char(7),char(0),char(-76),char(0),char(7),char(0),char(-16),char(0),char(7),char(0),char(-15),char(0), -char(7),char(0),char(-14),char(0),char(7),char(0),char(-13),char(0),char(7),char(0),char(-12),char(0),char(7),char(0),char(-11),char(0),char(7),char(0),char(-10),char(0), -char(7),char(0),char(-9),char(0),char(7),char(0),char(-8),char(0),char(7),char(0),char(-7),char(0),char(7),char(0),char(-6),char(0),char(7),char(0),char(-5),char(0), -char(7),char(0),char(-4),char(0),char(7),char(0),char(-3),char(0),char(7),char(0),char(-2),char(0),char(7),char(0),char(-1),char(0),char(7),char(0),char(0),char(1), -char(7),char(0),char(1),char(1),char(4),char(0),char(2),char(1),char(4),char(0),char(3),char(1),char(4),char(0),char(4),char(1),char(4),char(0),char(5),char(1), -char(4),char(0),char(118),char(0),char(83),char(0),char(12),char(0),char(15),char(0),char(6),char(1),char(15),char(0),char(7),char(1),char(15),char(0),char(8),char(1), -char(13),char(0),char(9),char(1),char(13),char(0),char(10),char(1),char(7),char(0),char(11),char(1),char(4),char(0),char(12),char(1),char(4),char(0),char(13),char(1), -char(4),char(0),char(14),char(1),char(4),char(0),char(15),char(1),char(7),char(0),char(-25),char(0),char(4),char(0),char(53),char(0),char(84),char(0),char(27),char(0), -char(17),char(0),char(16),char(1),char(15),char(0),char(17),char(1),char(15),char(0),char(18),char(1),char(13),char(0),char(9),char(1),char(13),char(0),char(19),char(1), -char(13),char(0),char(20),char(1),char(13),char(0),char(21),char(1),char(13),char(0),char(22),char(1),char(13),char(0),char(23),char(1),char(4),char(0),char(24),char(1), -char(7),char(0),char(25),char(1),char(4),char(0),char(26),char(1),char(4),char(0),char(27),char(1),char(4),char(0),char(28),char(1),char(7),char(0),char(29),char(1), -char(7),char(0),char(30),char(1),char(4),char(0),char(31),char(1),char(4),char(0),char(32),char(1),char(7),char(0),char(33),char(1),char(7),char(0),char(34),char(1), -char(7),char(0),char(35),char(1),char(7),char(0),char(36),char(1),char(7),char(0),char(37),char(1),char(7),char(0),char(38),char(1),char(4),char(0),char(39),char(1), -char(4),char(0),char(40),char(1),char(4),char(0),char(41),char(1),char(85),char(0),char(12),char(0),char(9),char(0),char(42),char(1),char(9),char(0),char(43),char(1), -char(13),char(0),char(44),char(1),char(7),char(0),char(45),char(1),char(7),char(0),char(-57),char(0),char(7),char(0),char(46),char(1),char(4),char(0),char(47),char(1), -char(13),char(0),char(48),char(1),char(4),char(0),char(49),char(1),char(4),char(0),char(50),char(1),char(4),char(0),char(51),char(1),char(4),char(0),char(53),char(0), -char(86),char(0),char(19),char(0),char(48),char(0),char(126),char(0),char(83),char(0),char(52),char(1),char(76),char(0),char(53),char(1),char(77),char(0),char(54),char(1), -char(78),char(0),char(55),char(1),char(79),char(0),char(56),char(1),char(80),char(0),char(57),char(1),char(81),char(0),char(58),char(1),char(84),char(0),char(59),char(1), -char(85),char(0),char(60),char(1),char(4),char(0),char(61),char(1),char(4),char(0),char(27),char(1),char(4),char(0),char(62),char(1),char(4),char(0),char(63),char(1), -char(4),char(0),char(64),char(1),char(4),char(0),char(65),char(1),char(4),char(0),char(66),char(1),char(4),char(0),char(67),char(1),char(82),char(0),char(68),char(1), -}; +char(92),char(1),char(104),char(0),char(-76),char(1),char(-48),char(2),char(120),char(1),char(-64),char(0),char(100),char(0),char(0),char(0),char(83),char(84),char(82),char(67), +char(84),char(0),char(0),char(0),char(10),char(0),char(3),char(0),char(4),char(0),char(0),char(0),char(4),char(0),char(1),char(0),char(9),char(0),char(2),char(0), +char(11),char(0),char(3),char(0),char(10),char(0),char(3),char(0),char(10),char(0),char(4),char(0),char(10),char(0),char(5),char(0),char(12),char(0),char(2),char(0), +char(9),char(0),char(6),char(0),char(9),char(0),char(7),char(0),char(13),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(14),char(0),char(1),char(0), +char(8),char(0),char(8),char(0),char(15),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(16),char(0),char(1),char(0),char(8),char(0),char(8),char(0), +char(17),char(0),char(1),char(0),char(13),char(0),char(9),char(0),char(18),char(0),char(1),char(0),char(14),char(0),char(9),char(0),char(19),char(0),char(2),char(0), +char(17),char(0),char(10),char(0),char(13),char(0),char(11),char(0),char(20),char(0),char(2),char(0),char(18),char(0),char(10),char(0),char(14),char(0),char(11),char(0), +char(21),char(0),char(4),char(0),char(4),char(0),char(12),char(0),char(4),char(0),char(13),char(0),char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0), +char(22),char(0),char(6),char(0),char(13),char(0),char(16),char(0),char(13),char(0),char(17),char(0),char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0), +char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(23),char(0),char(6),char(0),char(14),char(0),char(16),char(0),char(14),char(0),char(17),char(0), +char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(24),char(0),char(3),char(0), +char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0),char(4),char(0),char(22),char(0),char(25),char(0),char(12),char(0),char(13),char(0),char(23),char(0), +char(13),char(0),char(24),char(0),char(13),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0), +char(4),char(0),char(29),char(0),char(22),char(0),char(30),char(0),char(24),char(0),char(31),char(0),char(21),char(0),char(32),char(0),char(4),char(0),char(33),char(0), +char(4),char(0),char(34),char(0),char(26),char(0),char(12),char(0),char(14),char(0),char(23),char(0),char(14),char(0),char(24),char(0),char(14),char(0),char(25),char(0), +char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),char(23),char(0),char(30),char(0), +char(24),char(0),char(31),char(0),char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(21),char(0),char(32),char(0),char(27),char(0),char(3),char(0), +char(0),char(0),char(35),char(0),char(4),char(0),char(36),char(0),char(0),char(0),char(37),char(0),char(28),char(0),char(5),char(0),char(27),char(0),char(38),char(0), +char(13),char(0),char(39),char(0),char(13),char(0),char(40),char(0),char(7),char(0),char(41),char(0),char(0),char(0),char(21),char(0),char(29),char(0),char(5),char(0), +char(27),char(0),char(38),char(0),char(13),char(0),char(39),char(0),char(13),char(0),char(42),char(0),char(7),char(0),char(43),char(0),char(4),char(0),char(44),char(0), +char(30),char(0),char(2),char(0),char(13),char(0),char(45),char(0),char(7),char(0),char(46),char(0),char(31),char(0),char(4),char(0),char(29),char(0),char(47),char(0), +char(30),char(0),char(48),char(0),char(4),char(0),char(49),char(0),char(0),char(0),char(37),char(0),char(32),char(0),char(1),char(0),char(4),char(0),char(50),char(0), +char(33),char(0),char(2),char(0),char(2),char(0),char(50),char(0),char(0),char(0),char(51),char(0),char(34),char(0),char(2),char(0),char(2),char(0),char(52),char(0), +char(0),char(0),char(51),char(0),char(35),char(0),char(2),char(0),char(0),char(0),char(52),char(0),char(0),char(0),char(53),char(0),char(36),char(0),char(8),char(0), +char(13),char(0),char(54),char(0),char(14),char(0),char(55),char(0),char(32),char(0),char(56),char(0),char(34),char(0),char(57),char(0),char(35),char(0),char(58),char(0), +char(33),char(0),char(59),char(0),char(4),char(0),char(60),char(0),char(4),char(0),char(61),char(0),char(37),char(0),char(4),char(0),char(36),char(0),char(62),char(0), +char(13),char(0),char(63),char(0),char(4),char(0),char(64),char(0),char(0),char(0),char(37),char(0),char(38),char(0),char(7),char(0),char(27),char(0),char(38),char(0), +char(37),char(0),char(65),char(0),char(25),char(0),char(66),char(0),char(26),char(0),char(67),char(0),char(39),char(0),char(68),char(0),char(7),char(0),char(43),char(0), +char(0),char(0),char(69),char(0),char(40),char(0),char(2),char(0),char(38),char(0),char(70),char(0),char(13),char(0),char(39),char(0),char(41),char(0),char(4),char(0), +char(19),char(0),char(71),char(0),char(27),char(0),char(72),char(0),char(4),char(0),char(73),char(0),char(7),char(0),char(74),char(0),char(42),char(0),char(4),char(0), +char(27),char(0),char(38),char(0),char(41),char(0),char(75),char(0),char(4),char(0),char(76),char(0),char(7),char(0),char(43),char(0),char(43),char(0),char(3),char(0), +char(29),char(0),char(47),char(0),char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(44),char(0),char(3),char(0),char(29),char(0),char(47),char(0), +char(4),char(0),char(78),char(0),char(0),char(0),char(37),char(0),char(45),char(0),char(3),char(0),char(29),char(0),char(47),char(0),char(4),char(0),char(77),char(0), +char(0),char(0),char(37),char(0),char(46),char(0),char(4),char(0),char(4),char(0),char(79),char(0),char(7),char(0),char(80),char(0),char(7),char(0),char(81),char(0), +char(7),char(0),char(82),char(0),char(39),char(0),char(14),char(0),char(4),char(0),char(83),char(0),char(4),char(0),char(84),char(0),char(46),char(0),char(85),char(0), +char(4),char(0),char(86),char(0),char(7),char(0),char(87),char(0),char(7),char(0),char(88),char(0),char(7),char(0),char(89),char(0),char(7),char(0),char(90),char(0), +char(7),char(0),char(91),char(0),char(4),char(0),char(92),char(0),char(4),char(0),char(93),char(0),char(4),char(0),char(94),char(0),char(4),char(0),char(95),char(0), +char(0),char(0),char(37),char(0),char(47),char(0),char(5),char(0),char(27),char(0),char(38),char(0),char(37),char(0),char(65),char(0),char(13),char(0),char(39),char(0), +char(7),char(0),char(43),char(0),char(4),char(0),char(96),char(0),char(48),char(0),char(5),char(0),char(29),char(0),char(47),char(0),char(13),char(0),char(97),char(0), +char(14),char(0),char(98),char(0),char(4),char(0),char(99),char(0),char(0),char(0),char(100),char(0),char(49),char(0),char(27),char(0),char(9),char(0),char(101),char(0), +char(9),char(0),char(102),char(0),char(27),char(0),char(103),char(0),char(0),char(0),char(35),char(0),char(20),char(0),char(104),char(0),char(20),char(0),char(105),char(0), +char(14),char(0),char(106),char(0),char(14),char(0),char(107),char(0),char(14),char(0),char(108),char(0),char(8),char(0),char(109),char(0),char(8),char(0),char(110),char(0), +char(8),char(0),char(111),char(0),char(8),char(0),char(112),char(0),char(8),char(0),char(113),char(0),char(8),char(0),char(114),char(0),char(8),char(0),char(115),char(0), +char(8),char(0),char(116),char(0),char(8),char(0),char(117),char(0),char(8),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0), +char(4),char(0),char(121),char(0),char(4),char(0),char(122),char(0),char(4),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0), +char(0),char(0),char(37),char(0),char(50),char(0),char(27),char(0),char(9),char(0),char(101),char(0),char(9),char(0),char(102),char(0),char(27),char(0),char(103),char(0), +char(0),char(0),char(35),char(0),char(19),char(0),char(104),char(0),char(19),char(0),char(105),char(0),char(13),char(0),char(106),char(0),char(13),char(0),char(107),char(0), +char(13),char(0),char(108),char(0),char(7),char(0),char(109),char(0),char(7),char(0),char(110),char(0),char(7),char(0),char(111),char(0),char(7),char(0),char(112),char(0), +char(7),char(0),char(113),char(0),char(7),char(0),char(114),char(0),char(7),char(0),char(115),char(0),char(7),char(0),char(116),char(0),char(7),char(0),char(117),char(0), +char(7),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0),char(4),char(0),char(121),char(0),char(4),char(0),char(122),char(0), +char(4),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0),char(0),char(0),char(37),char(0),char(51),char(0),char(22),char(0), +char(8),char(0),char(126),char(0),char(8),char(0),char(127),char(0),char(8),char(0),char(111),char(0),char(8),char(0),char(-128),char(0),char(8),char(0),char(115),char(0), +char(8),char(0),char(-127),char(0),char(8),char(0),char(-126),char(0),char(8),char(0),char(-125),char(0),char(8),char(0),char(-124),char(0),char(8),char(0),char(-123),char(0), +char(8),char(0),char(-122),char(0),char(8),char(0),char(-121),char(0),char(8),char(0),char(-120),char(0),char(8),char(0),char(-119),char(0),char(8),char(0),char(-118),char(0), +char(8),char(0),char(-117),char(0),char(4),char(0),char(-116),char(0),char(4),char(0),char(-115),char(0),char(4),char(0),char(-114),char(0),char(4),char(0),char(-113),char(0), +char(4),char(0),char(-112),char(0),char(0),char(0),char(37),char(0),char(52),char(0),char(22),char(0),char(7),char(0),char(126),char(0),char(7),char(0),char(127),char(0), +char(7),char(0),char(111),char(0),char(7),char(0),char(-128),char(0),char(7),char(0),char(115),char(0),char(7),char(0),char(-127),char(0),char(7),char(0),char(-126),char(0), +char(7),char(0),char(-125),char(0),char(7),char(0),char(-124),char(0),char(7),char(0),char(-123),char(0),char(7),char(0),char(-122),char(0),char(7),char(0),char(-121),char(0), +char(7),char(0),char(-120),char(0),char(7),char(0),char(-119),char(0),char(7),char(0),char(-118),char(0),char(7),char(0),char(-117),char(0),char(4),char(0),char(-116),char(0), +char(4),char(0),char(-115),char(0),char(4),char(0),char(-114),char(0),char(4),char(0),char(-113),char(0),char(4),char(0),char(-112),char(0),char(0),char(0),char(37),char(0), +char(53),char(0),char(2),char(0),char(51),char(0),char(-111),char(0),char(14),char(0),char(-110),char(0),char(54),char(0),char(2),char(0),char(52),char(0),char(-111),char(0), +char(13),char(0),char(-110),char(0),char(55),char(0),char(21),char(0),char(50),char(0),char(-109),char(0),char(17),char(0),char(-108),char(0),char(13),char(0),char(-107),char(0), +char(13),char(0),char(-106),char(0),char(13),char(0),char(-105),char(0),char(13),char(0),char(-104),char(0),char(13),char(0),char(-110),char(0),char(13),char(0),char(-103),char(0), +char(13),char(0),char(-102),char(0),char(13),char(0),char(-101),char(0),char(13),char(0),char(-100),char(0),char(7),char(0),char(-99),char(0),char(7),char(0),char(-98),char(0), +char(7),char(0),char(-97),char(0),char(7),char(0),char(-96),char(0),char(7),char(0),char(-95),char(0),char(7),char(0),char(-94),char(0),char(7),char(0),char(-93),char(0), +char(7),char(0),char(-92),char(0),char(7),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0),char(56),char(0),char(22),char(0),char(49),char(0),char(-109),char(0), +char(18),char(0),char(-108),char(0),char(14),char(0),char(-107),char(0),char(14),char(0),char(-106),char(0),char(14),char(0),char(-105),char(0),char(14),char(0),char(-104),char(0), +char(14),char(0),char(-110),char(0),char(14),char(0),char(-103),char(0),char(14),char(0),char(-102),char(0),char(14),char(0),char(-101),char(0),char(14),char(0),char(-100),char(0), +char(8),char(0),char(-99),char(0),char(8),char(0),char(-98),char(0),char(8),char(0),char(-97),char(0),char(8),char(0),char(-96),char(0),char(8),char(0),char(-95),char(0), +char(8),char(0),char(-94),char(0),char(8),char(0),char(-93),char(0),char(8),char(0),char(-92),char(0),char(8),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0), +char(0),char(0),char(37),char(0),char(57),char(0),char(2),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0),char(58),char(0),char(13),char(0), +char(55),char(0),char(-87),char(0),char(55),char(0),char(-86),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-85),char(0),char(4),char(0),char(-84),char(0), +char(4),char(0),char(-83),char(0),char(4),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(7),char(0),char(-80),char(0),char(4),char(0),char(-79),char(0), +char(4),char(0),char(-78),char(0),char(7),char(0),char(-77),char(0),char(4),char(0),char(-76),char(0),char(59),char(0),char(13),char(0),char(60),char(0),char(-87),char(0), +char(60),char(0),char(-86),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-85),char(0),char(4),char(0),char(-84),char(0),char(4),char(0),char(-83),char(0), +char(4),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(7),char(0),char(-80),char(0),char(4),char(0),char(-79),char(0),char(4),char(0),char(-78),char(0), +char(7),char(0),char(-77),char(0),char(4),char(0),char(-76),char(0),char(61),char(0),char(14),char(0),char(56),char(0),char(-87),char(0),char(56),char(0),char(-86),char(0), +char(0),char(0),char(35),char(0),char(4),char(0),char(-85),char(0),char(4),char(0),char(-84),char(0),char(4),char(0),char(-83),char(0),char(4),char(0),char(-82),char(0), +char(8),char(0),char(-81),char(0),char(8),char(0),char(-80),char(0),char(4),char(0),char(-79),char(0),char(4),char(0),char(-78),char(0),char(8),char(0),char(-77),char(0), +char(4),char(0),char(-76),char(0),char(0),char(0),char(-75),char(0),char(62),char(0),char(3),char(0),char(59),char(0),char(-74),char(0),char(13),char(0),char(-73),char(0), +char(13),char(0),char(-72),char(0),char(63),char(0),char(3),char(0),char(61),char(0),char(-74),char(0),char(14),char(0),char(-73),char(0),char(14),char(0),char(-72),char(0), +char(64),char(0),char(3),char(0),char(59),char(0),char(-74),char(0),char(14),char(0),char(-73),char(0),char(14),char(0),char(-72),char(0),char(65),char(0),char(13),char(0), +char(59),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0),char(4),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0), +char(4),char(0),char(-67),char(0),char(7),char(0),char(-66),char(0),char(7),char(0),char(-65),char(0),char(7),char(0),char(-64),char(0),char(7),char(0),char(-63),char(0), +char(7),char(0),char(-62),char(0),char(7),char(0),char(-61),char(0),char(7),char(0),char(-60),char(0),char(66),char(0),char(13),char(0),char(59),char(0),char(-74),char(0), +char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0),char(4),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(4),char(0),char(-67),char(0), +char(7),char(0),char(-66),char(0),char(7),char(0),char(-65),char(0),char(7),char(0),char(-64),char(0),char(7),char(0),char(-63),char(0),char(7),char(0),char(-62),char(0), +char(7),char(0),char(-61),char(0),char(7),char(0),char(-60),char(0),char(67),char(0),char(14),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0), +char(20),char(0),char(-70),char(0),char(4),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(4),char(0),char(-67),char(0),char(8),char(0),char(-66),char(0), +char(8),char(0),char(-65),char(0),char(8),char(0),char(-64),char(0),char(8),char(0),char(-63),char(0),char(8),char(0),char(-62),char(0),char(8),char(0),char(-61),char(0), +char(8),char(0),char(-60),char(0),char(0),char(0),char(-59),char(0),char(68),char(0),char(10),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0), +char(20),char(0),char(-70),char(0),char(8),char(0),char(-58),char(0),char(8),char(0),char(-57),char(0),char(8),char(0),char(-56),char(0),char(8),char(0),char(-62),char(0), +char(8),char(0),char(-61),char(0),char(8),char(0),char(-60),char(0),char(8),char(0),char(127),char(0),char(69),char(0),char(11),char(0),char(59),char(0),char(-74),char(0), +char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0),char(7),char(0),char(-58),char(0),char(7),char(0),char(-57),char(0),char(7),char(0),char(-56),char(0), +char(7),char(0),char(-62),char(0),char(7),char(0),char(-61),char(0),char(7),char(0),char(-60),char(0),char(7),char(0),char(127),char(0),char(0),char(0),char(21),char(0), +char(70),char(0),char(9),char(0),char(59),char(0),char(-74),char(0),char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0),char(13),char(0),char(-55),char(0), +char(13),char(0),char(-54),char(0),char(13),char(0),char(-53),char(0),char(13),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0),char(4),char(0),char(-50),char(0), +char(71),char(0),char(9),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0),char(14),char(0),char(-55),char(0), +char(14),char(0),char(-54),char(0),char(14),char(0),char(-53),char(0),char(14),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0),char(4),char(0),char(-50),char(0), +char(72),char(0),char(5),char(0),char(70),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0),char(7),char(0),char(-47),char(0),char(7),char(0),char(-46),char(0), +char(7),char(0),char(-45),char(0),char(73),char(0),char(5),char(0),char(71),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0),char(8),char(0),char(-47),char(0), +char(8),char(0),char(-46),char(0),char(8),char(0),char(-45),char(0),char(74),char(0),char(41),char(0),char(59),char(0),char(-74),char(0),char(19),char(0),char(-71),char(0), +char(19),char(0),char(-70),char(0),char(13),char(0),char(-55),char(0),char(13),char(0),char(-54),char(0),char(13),char(0),char(-44),char(0),char(13),char(0),char(-43),char(0), +char(13),char(0),char(-42),char(0),char(13),char(0),char(-41),char(0),char(13),char(0),char(-40),char(0),char(13),char(0),char(-39),char(0),char(13),char(0),char(-38),char(0), +char(13),char(0),char(-37),char(0),char(13),char(0),char(-36),char(0),char(13),char(0),char(-35),char(0),char(13),char(0),char(-34),char(0),char(0),char(0),char(-33),char(0), +char(0),char(0),char(-32),char(0),char(0),char(0),char(-31),char(0),char(0),char(0),char(-30),char(0),char(0),char(0),char(-29),char(0),char(0),char(0),char(-59),char(0), +char(13),char(0),char(-53),char(0),char(13),char(0),char(-52),char(0),char(13),char(0),char(-28),char(0),char(13),char(0),char(-27),char(0),char(13),char(0),char(-26),char(0), +char(13),char(0),char(-25),char(0),char(13),char(0),char(-24),char(0),char(13),char(0),char(-23),char(0),char(13),char(0),char(-22),char(0),char(13),char(0),char(-21),char(0), +char(13),char(0),char(-20),char(0),char(13),char(0),char(-19),char(0),char(13),char(0),char(-18),char(0),char(0),char(0),char(-17),char(0),char(0),char(0),char(-16),char(0), +char(0),char(0),char(-15),char(0),char(0),char(0),char(-14),char(0),char(0),char(0),char(-13),char(0),char(4),char(0),char(-12),char(0),char(75),char(0),char(41),char(0), +char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0),char(14),char(0),char(-55),char(0),char(14),char(0),char(-54),char(0), +char(14),char(0),char(-44),char(0),char(14),char(0),char(-43),char(0),char(14),char(0),char(-42),char(0),char(14),char(0),char(-41),char(0),char(14),char(0),char(-40),char(0), +char(14),char(0),char(-39),char(0),char(14),char(0),char(-38),char(0),char(14),char(0),char(-37),char(0),char(14),char(0),char(-36),char(0),char(14),char(0),char(-35),char(0), +char(14),char(0),char(-34),char(0),char(0),char(0),char(-33),char(0),char(0),char(0),char(-32),char(0),char(0),char(0),char(-31),char(0),char(0),char(0),char(-30),char(0), +char(0),char(0),char(-29),char(0),char(0),char(0),char(-59),char(0),char(14),char(0),char(-53),char(0),char(14),char(0),char(-52),char(0),char(14),char(0),char(-28),char(0), +char(14),char(0),char(-27),char(0),char(14),char(0),char(-26),char(0),char(14),char(0),char(-25),char(0),char(14),char(0),char(-24),char(0),char(14),char(0),char(-23),char(0), +char(14),char(0),char(-22),char(0),char(14),char(0),char(-21),char(0),char(14),char(0),char(-20),char(0),char(14),char(0),char(-19),char(0),char(14),char(0),char(-18),char(0), +char(0),char(0),char(-17),char(0),char(0),char(0),char(-16),char(0),char(0),char(0),char(-15),char(0),char(0),char(0),char(-14),char(0),char(0),char(0),char(-13),char(0), +char(4),char(0),char(-12),char(0),char(76),char(0),char(9),char(0),char(59),char(0),char(-74),char(0),char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0), +char(7),char(0),char(-55),char(0),char(7),char(0),char(-54),char(0),char(7),char(0),char(-53),char(0),char(7),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0), +char(4),char(0),char(-50),char(0),char(77),char(0),char(9),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0), +char(8),char(0),char(-55),char(0),char(8),char(0),char(-54),char(0),char(8),char(0),char(-53),char(0),char(8),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0), +char(4),char(0),char(-50),char(0),char(78),char(0),char(5),char(0),char(58),char(0),char(-74),char(0),char(13),char(0),char(-11),char(0),char(13),char(0),char(-10),char(0), +char(7),char(0),char(-9),char(0),char(0),char(0),char(37),char(0),char(79),char(0),char(4),char(0),char(61),char(0),char(-74),char(0),char(14),char(0),char(-11),char(0), +char(14),char(0),char(-10),char(0),char(8),char(0),char(-9),char(0),char(80),char(0),char(4),char(0),char(7),char(0),char(-8),char(0),char(7),char(0),char(-7),char(0), +char(7),char(0),char(-6),char(0),char(4),char(0),char(79),char(0),char(81),char(0),char(10),char(0),char(80),char(0),char(-5),char(0),char(13),char(0),char(-4),char(0), +char(13),char(0),char(-3),char(0),char(13),char(0),char(-2),char(0),char(13),char(0),char(-1),char(0),char(13),char(0),char(0),char(1),char(7),char(0),char(-99),char(0), +char(7),char(0),char(1),char(1),char(4),char(0),char(2),char(1),char(4),char(0),char(53),char(0),char(82),char(0),char(4),char(0),char(80),char(0),char(-5),char(0), +char(4),char(0),char(3),char(1),char(7),char(0),char(4),char(1),char(4),char(0),char(5),char(1),char(83),char(0),char(4),char(0),char(13),char(0),char(0),char(1), +char(80),char(0),char(-5),char(0),char(4),char(0),char(6),char(1),char(7),char(0),char(7),char(1),char(84),char(0),char(7),char(0),char(13),char(0),char(8),char(1), +char(80),char(0),char(-5),char(0),char(4),char(0),char(9),char(1),char(7),char(0),char(10),char(1),char(7),char(0),char(11),char(1),char(7),char(0),char(12),char(1), +char(4),char(0),char(53),char(0),char(85),char(0),char(6),char(0),char(17),char(0),char(13),char(1),char(13),char(0),char(11),char(1),char(13),char(0),char(14),char(1), +char(60),char(0),char(15),char(1),char(4),char(0),char(16),char(1),char(7),char(0),char(12),char(1),char(86),char(0),char(26),char(0),char(4),char(0),char(17),char(1), +char(7),char(0),char(18),char(1),char(7),char(0),char(127),char(0),char(7),char(0),char(19),char(1),char(7),char(0),char(20),char(1),char(7),char(0),char(21),char(1), +char(7),char(0),char(22),char(1),char(7),char(0),char(23),char(1),char(7),char(0),char(24),char(1),char(7),char(0),char(25),char(1),char(7),char(0),char(26),char(1), +char(7),char(0),char(27),char(1),char(7),char(0),char(28),char(1),char(7),char(0),char(29),char(1),char(7),char(0),char(30),char(1),char(7),char(0),char(31),char(1), +char(7),char(0),char(32),char(1),char(7),char(0),char(33),char(1),char(7),char(0),char(34),char(1),char(7),char(0),char(35),char(1),char(7),char(0),char(36),char(1), +char(4),char(0),char(37),char(1),char(4),char(0),char(38),char(1),char(4),char(0),char(39),char(1),char(4),char(0),char(40),char(1),char(4),char(0),char(120),char(0), +char(87),char(0),char(12),char(0),char(17),char(0),char(41),char(1),char(17),char(0),char(42),char(1),char(17),char(0),char(43),char(1),char(13),char(0),char(44),char(1), +char(13),char(0),char(45),char(1),char(7),char(0),char(46),char(1),char(4),char(0),char(47),char(1),char(4),char(0),char(48),char(1),char(4),char(0),char(49),char(1), +char(4),char(0),char(50),char(1),char(7),char(0),char(10),char(1),char(4),char(0),char(53),char(0),char(88),char(0),char(27),char(0),char(19),char(0),char(51),char(1), +char(17),char(0),char(52),char(1),char(17),char(0),char(53),char(1),char(13),char(0),char(44),char(1),char(13),char(0),char(54),char(1),char(13),char(0),char(55),char(1), +char(13),char(0),char(56),char(1),char(13),char(0),char(57),char(1),char(13),char(0),char(58),char(1),char(4),char(0),char(59),char(1),char(7),char(0),char(60),char(1), +char(4),char(0),char(61),char(1),char(4),char(0),char(62),char(1),char(4),char(0),char(63),char(1),char(7),char(0),char(64),char(1),char(7),char(0),char(65),char(1), +char(4),char(0),char(66),char(1),char(4),char(0),char(67),char(1),char(7),char(0),char(68),char(1),char(7),char(0),char(69),char(1),char(7),char(0),char(70),char(1), +char(7),char(0),char(71),char(1),char(7),char(0),char(72),char(1),char(7),char(0),char(73),char(1),char(4),char(0),char(74),char(1),char(4),char(0),char(75),char(1), +char(4),char(0),char(76),char(1),char(89),char(0),char(12),char(0),char(9),char(0),char(77),char(1),char(9),char(0),char(78),char(1),char(13),char(0),char(79),char(1), +char(7),char(0),char(80),char(1),char(7),char(0),char(-125),char(0),char(7),char(0),char(81),char(1),char(4),char(0),char(82),char(1),char(13),char(0),char(83),char(1), +char(4),char(0),char(84),char(1),char(4),char(0),char(85),char(1),char(4),char(0),char(86),char(1),char(4),char(0),char(53),char(0),char(90),char(0),char(19),char(0), +char(50),char(0),char(-109),char(0),char(87),char(0),char(87),char(1),char(80),char(0),char(88),char(1),char(81),char(0),char(89),char(1),char(82),char(0),char(90),char(1), +char(83),char(0),char(91),char(1),char(84),char(0),char(92),char(1),char(85),char(0),char(93),char(1),char(88),char(0),char(94),char(1),char(89),char(0),char(95),char(1), +char(4),char(0),char(96),char(1),char(4),char(0),char(62),char(1),char(4),char(0),char(97),char(1),char(4),char(0),char(98),char(1),char(4),char(0),char(99),char(1), +char(4),char(0),char(100),char(1),char(4),char(0),char(101),char(1),char(4),char(0),char(102),char(1),char(86),char(0),char(103),char(1),char(91),char(0),char(20),char(0), +char(16),char(0),char(104),char(1),char(14),char(0),char(105),char(1),char(14),char(0),char(106),char(1),char(14),char(0),char(107),char(1),char(14),char(0),char(108),char(1), +char(14),char(0),char(109),char(1),char(8),char(0),char(110),char(1),char(4),char(0),char(111),char(1),char(4),char(0),char(86),char(1),char(4),char(0),char(112),char(1), +char(4),char(0),char(113),char(1),char(8),char(0),char(114),char(1),char(8),char(0),char(115),char(1),char(8),char(0),char(116),char(1),char(8),char(0),char(117),char(1), +char(8),char(0),char(118),char(1),char(0),char(0),char(119),char(1),char(0),char(0),char(120),char(1),char(49),char(0),char(121),char(1),char(0),char(0),char(122),char(1), +char(92),char(0),char(20),char(0),char(15),char(0),char(104),char(1),char(13),char(0),char(105),char(1),char(13),char(0),char(106),char(1),char(13),char(0),char(107),char(1), +char(13),char(0),char(108),char(1),char(13),char(0),char(109),char(1),char(4),char(0),char(112),char(1),char(7),char(0),char(110),char(1),char(4),char(0),char(111),char(1), +char(4),char(0),char(86),char(1),char(7),char(0),char(114),char(1),char(7),char(0),char(115),char(1),char(7),char(0),char(116),char(1),char(4),char(0),char(113),char(1), +char(7),char(0),char(117),char(1),char(7),char(0),char(118),char(1),char(0),char(0),char(119),char(1),char(0),char(0),char(120),char(1),char(50),char(0),char(121),char(1), +char(0),char(0),char(122),char(1),char(93),char(0),char(9),char(0),char(20),char(0),char(123),char(1),char(14),char(0),char(124),char(1),char(8),char(0),char(125),char(1), +char(0),char(0),char(126),char(1),char(91),char(0),char(90),char(1),char(49),char(0),char(127),char(1),char(0),char(0),char(122),char(1),char(4),char(0),char(97),char(1), +char(0),char(0),char(37),char(0),char(94),char(0),char(7),char(0),char(0),char(0),char(126),char(1),char(92),char(0),char(90),char(1),char(50),char(0),char(127),char(1), +char(19),char(0),char(123),char(1),char(13),char(0),char(124),char(1),char(7),char(0),char(125),char(1),char(4),char(0),char(97),char(1),}; int sBulletDNAlen= sizeof(sBulletDNAstr); char sBulletDNAstr64[]= { -char(83),char(68),char(78),char(65),char(78),char(65),char(77),char(69),char(69),char(1),char(0),char(0),char(109),char(95),char(115),char(105),char(122),char(101),char(0),char(109), +char(83),char(68),char(78),char(65),char(78),char(65),char(77),char(69),char(-128),char(1),char(0),char(0),char(109),char(95),char(115),char(105),char(122),char(101),char(0),char(109), char(95),char(99),char(97),char(112),char(97),char(99),char(105),char(116),char(121),char(0),char(42),char(109),char(95),char(100),char(97),char(116),char(97),char(0),char(109),char(95), char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(115),char(0),char(109),char(95),char(99),char(111), char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110), @@ -586,406 +685,505 @@ char(97),char(110),char(105),char(115),char(111),char(116),char(114),char(111),c char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(99),char(116),char(80),char(114),char(111),char(99),char(101),char(115),char(115),char(105),char(110),char(103),char(84), char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(100),char(101),char(97),char(99),char(116),char(105),char(118),char(97),char(116), char(105),char(111),char(110),char(84),char(105),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109), -char(95),char(114),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(114), -char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(104),char(105),char(116),char(70),char(114),char(97),char(99), -char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(99),char(100),char(83),char(119),char(101),char(112),char(116),char(83),char(112),char(104),char(101),char(114), -char(101),char(82),char(97),char(100),char(105),char(117),char(115),char(0),char(109),char(95),char(99),char(99),char(100),char(77),char(111),char(116),char(105),char(111),char(110),char(84), -char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(104),char(97),char(115),char(65),char(110),char(105),char(115),char(111),char(116), -char(114),char(111),char(112),char(105),char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),char(108),char(108), -char(105),char(115),char(105),char(111),char(110),char(70),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(105),char(115),char(108),char(97),char(110),char(100),char(84), -char(97),char(103),char(49),char(0),char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(0),char(109),char(95), -char(97),char(99),char(116),char(105),char(118),char(97),char(116),char(105),char(111),char(110),char(83),char(116),char(97),char(116),char(101),char(49),char(0),char(109),char(95),char(105), -char(110),char(116),char(101),char(114),char(110),char(97),char(108),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),char(101),char(99),char(107),char(67), -char(111),char(108),char(108),char(105),char(100),char(101),char(87),char(105),char(116),char(104),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(73), -char(110),char(102),char(111),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(0),char(109),char(95),char(99),char(111),char(108),char(108), -char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(105),char(110), -char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(84),char(101),char(110),char(115),char(111),char(114),char(87),char(111),char(114),char(108),char(100),char(0), -char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97), -char(110),char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103), -char(117),char(108),char(97),char(114),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(70), -char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105),char(116),char(121),char(95),char(97),char(99),char(99),char(101), -char(108),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105), -char(97),char(76),char(111),char(99),char(97),char(108),char(0),char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(70),char(111),char(114),char(99),char(101),char(0), -char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(84),char(111),char(114),char(113),char(117),char(101),char(0),char(109),char(95),char(105),char(110),char(118),char(101), -char(114),char(115),char(101),char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112), -char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103), -char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103), -char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(76), -char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108), -char(100),char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103), -char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100), -char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117), -char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108), -char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111), -char(108),char(100),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103), -char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110), -char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(111),char(110),char(115),char(116), -char(114),char(97),char(105),char(110),char(116),char(82),char(111),char(119),char(115),char(0),char(110),char(117),char(98),char(0),char(42),char(109),char(95),char(114),char(98),char(65), -char(0),char(42),char(109),char(95),char(114),char(98),char(66),char(0),char(109),char(95),char(111),char(98),char(106),char(101),char(99),char(116),char(84),char(121),char(112),char(101), -char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(84),char(121),char(112), -char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(100), -char(0),char(109),char(95),char(110),char(101),char(101),char(100),char(115),char(70),char(101),char(101),char(100),char(98),char(97),char(99),char(107),char(0),char(109),char(95),char(97), -char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(100),char(98),char(103),char(68), -char(114),char(97),char(119),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(100),char(105),char(115),char(97),char(98),char(108),char(101),char(67),char(111),char(108), -char(108),char(105),char(115),char(105),char(111),char(110),char(115),char(66),char(101),char(116),char(119),char(101),char(101),char(110),char(76),char(105),char(110),char(107),char(101),char(100), -char(66),char(111),char(100),char(105),char(101),char(115),char(0),char(109),char(95),char(111),char(118),char(101),char(114),char(114),char(105),char(100),char(101),char(78),char(117),char(109), -char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(98), -char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(104),char(114),char(101),char(115),char(104), -char(111),char(108),char(100),char(0),char(109),char(95),char(105),char(115),char(69),char(110),char(97),char(98),char(108),char(101),char(100),char(0),char(112),char(97),char(100),char(100), -char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(121),char(112),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97), -char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(65),char(0),char(109), -char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(98),char(65),char(70),char(114),char(97),char(109),char(101), -char(0),char(109),char(95),char(114),char(98),char(66),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(82),char(101),char(102), -char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108), -char(97),char(114),char(79),char(110),char(108),char(121),char(0),char(109),char(95),char(101),char(110),char(97),char(98),char(108),char(101),char(65),char(110),char(103),char(117),char(108), -char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(0),char(109),char(95),char(109),char(111),char(116),char(111),char(114),char(84),char(97),char(114),char(103),char(101), -char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(109),char(97),char(120),char(77),char(111),char(116),char(111),char(114), -char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(108),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116), -char(0),char(109),char(95),char(117),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(108),char(105),char(109),char(105), -char(116),char(83),char(111),char(102),char(116),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(98),char(105),char(97),char(115),char(70),char(97),char(99),char(116), -char(111),char(114),char(0),char(109),char(95),char(114),char(101),char(108),char(97),char(120),char(97),char(116),char(105),char(111),char(110),char(70),char(97),char(99),char(116),char(111), -char(114),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(115),char(119), -char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(49),char(0),char(109),char(95),char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110), -char(50),char(0),char(109),char(95),char(116),char(119),char(105),char(115),char(116),char(83),char(112),char(97),char(110),char(0),char(109),char(95),char(100),char(97),char(109),char(112), -char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109), -char(105),char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105), -char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105), -char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105), -char(116),char(0),char(109),char(95),char(117),char(115),char(101),char(76),char(105),char(110),char(101),char(97),char(114),char(82),char(101),char(102),char(101),char(114),char(101),char(110), -char(99),char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(117),char(115),char(101),char(79),char(102),char(102),char(115),char(101),char(116), -char(70),char(111),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(114),char(97),char(109),char(101),char(0),char(109), -char(95),char(54),char(100),char(111),char(102),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(69),char(110), -char(97),char(98),char(108),char(101),char(100),char(91),char(54),char(93),char(0),char(109),char(95),char(101),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105), -char(117),char(109),char(80),char(111),char(105),char(110),char(116),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(83), -char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103), -char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(91),char(54),char(93),char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(65), -char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(97),char(116),char(105),char(111),char(0),char(109), -char(95),char(116),char(97),char(117),char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(116),char(101),char(112),char(0),char(109),char(95),char(109),char(97), -char(120),char(69),char(114),char(114),char(111),char(114),char(82),char(101),char(100),char(117),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(115),char(111), -char(114),char(0),char(109),char(95),char(101),char(114),char(112),char(0),char(109),char(95),char(101),char(114),char(112),char(50),char(0),char(109),char(95),char(103),char(108),char(111), -char(98),char(97),char(108),char(67),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115), -char(101),char(80),char(101),char(110),char(101),char(116),char(114),char(97),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108), -char(100),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(117),char(114),char(110), -char(69),char(114),char(112),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(111),char(112),char(0),char(109),char(95),char(119), -char(97),char(114),char(109),char(115),char(116),char(97),char(114),char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95), -char(109),char(97),char(120),char(71),char(121),char(114),char(111),char(115),char(99),char(111),char(112),char(105),char(99),char(70),char(111),char(114),char(99),char(101),char(0),char(109), -char(95),char(115),char(105),char(110),char(103),char(108),char(101),char(65),char(120),char(105),char(115),char(82),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114), -char(105),char(99),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(110),char(117), -char(109),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114), -char(77),char(111),char(100),char(101),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(110),char(103),char(67),char(111),char(110),char(116),char(97),char(99), -char(116),char(82),char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108), -char(100),char(0),char(109),char(95),char(109),char(105),char(110),char(105),char(109),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(66),char(97),char(116), -char(99),char(104),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115), -char(101),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0), -char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109), -char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(42),char(109),char(95), -char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(0),char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0), -char(109),char(95),char(112),char(114),char(101),char(118),char(105),char(111),char(117),char(115),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109), -char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(99),char(99),char(117),char(109),char(117),char(108),char(97), -char(116),char(101),char(100),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(110),char(111),char(114),char(109),char(97),char(108),char(0),char(109),char(95), -char(97),char(114),char(101),char(97),char(0),char(109),char(95),char(97),char(116),char(116),char(97),char(99),char(104),char(0),char(109),char(95),char(110),char(111),char(100),char(101), -char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(76),char(101),char(110), -char(103),char(116),char(104),char(0),char(109),char(95),char(98),char(98),char(101),char(110),char(100),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(111),char(100), -char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(51),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(65),char(114), -char(101),char(97),char(0),char(109),char(95),char(99),char(48),char(91),char(52),char(93),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100), -char(105),char(99),char(101),char(115),char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(86),char(111),char(108),char(117),char(109),char(101), -char(0),char(109),char(95),char(99),char(49),char(0),char(109),char(95),char(99),char(50),char(0),char(109),char(95),char(99),char(48),char(0),char(109),char(95),char(108),char(111), -char(99),char(97),char(108),char(70),char(114),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(66),char(111),char(100), -char(121),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(101),char(120),char(0),char(109),char(95),char(97),char(101),char(114),char(111), -char(77),char(111),char(100),char(101),char(108),char(0),char(109),char(95),char(98),char(97),char(117),char(109),char(103),char(97),char(114),char(116),char(101),char(0),char(109),char(95), -char(100),char(114),char(97),char(103),char(0),char(109),char(95),char(108),char(105),char(102),char(116),char(0),char(109),char(95),char(112),char(114),char(101),char(115),char(115),char(117), -char(114),char(101),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(100),char(121),char(110),char(97),char(109),char(105), -char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(111),char(115),char(101),char(77),char(97),char(116),char(99), -char(104),char(0),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100), -char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(107),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(111),char(110),char(116),char(97),char(99), -char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(67),char(111),char(110),char(116), -char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114), -char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100), -char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111), -char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100), -char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116), -char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103), -char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105), -char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116), -char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102), -char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83), -char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(109),char(97),char(120),char(86),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(116), -char(105),char(109),char(101),char(83),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(73), -char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110), -char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(100),char(114),char(105),char(102),char(116),char(73),char(116), -char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(116), -char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(114),char(111),char(116),char(0),char(109),char(95),char(115),char(99),char(97), -char(108),char(101),char(0),char(109),char(95),char(97),char(113),char(113),char(0),char(109),char(95),char(99),char(111),char(109),char(0),char(42),char(109),char(95),char(112),char(111), -char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(42),char(109),char(95),char(119),char(101),char(105),char(103),char(104),char(116),char(115),char(0),char(109), -char(95),char(110),char(117),char(109),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(87), -char(101),char(105),char(103),char(116),char(115),char(0),char(109),char(95),char(98),char(118),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(98),char(102), -char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(97),char(109),char(101),char(120),char(102),char(111),char(114),char(109),char(0),char(109),char(95), -char(108),char(111),char(99),char(105),char(105),char(0),char(109),char(95),char(105),char(110),char(118),char(119),char(105),char(0),char(109),char(95),char(118),char(105),char(109),char(112), -char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115), -char(91),char(50),char(93),char(0),char(109),char(95),char(108),char(118),char(0),char(109),char(95),char(97),char(118),char(0),char(42),char(109),char(95),char(102),char(114),char(97), -char(109),char(101),char(114),char(101),char(102),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101), -char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(114),char(97), -char(109),char(101),char(82),char(101),char(102),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(78),char(111),char(100),char(101),char(115),char(0),char(109),char(95), -char(110),char(117),char(109),char(77),char(97),char(115),char(115),char(101),char(115),char(0),char(109),char(95),char(105),char(100),char(109),char(97),char(115),char(115),char(0),char(109), -char(95),char(105),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(110),char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0), -char(109),char(95),char(110),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(97),char(109),char(112), -char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(100),char(97), -char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97),char(116),char(99),char(104),char(105),char(110),char(103),char(0),char(109),char(95),char(109), -char(97),char(120),char(83),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),char(109),char(112),char(117),char(108), -char(115),char(101),char(0),char(109),char(95),char(115),char(101),char(108),char(102),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),char(109), -char(112),char(117),char(108),char(115),char(101),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(105), -char(110),char(115),char(65),char(110),char(99),char(104),char(111),char(114),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(100),char(101),char(0),char(109), -char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(110),char(100),char(101),char(120),char(0),char(42),char(109),char(95),char(98),char(111),char(100), -char(121),char(65),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(66),char(0),char(109),char(95),char(114),char(101),char(102),char(115),char(91),char(50), -char(93),char(0),char(109),char(95),char(99),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(100),char(101), -char(108),char(101),char(116),char(101),char(0),char(109),char(95),char(114),char(101),char(108),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(91),char(50), -char(93),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(98),char(111),char(100),char(121), -char(66),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(84),char(121),char(112),char(101),char(0),char(42),char(109), -char(95),char(112),char(111),char(115),char(101),char(0),char(42),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0), -char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(115),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),char(115),char(0),char(42),char(109), -char(95),char(102),char(97),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(116),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97), -char(0),char(42),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114),char(115),char(0),char(42),char(109),char(95),char(99),char(108),char(117),char(115),char(116), -char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77), -char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(76),char(105),char(110),char(107),char(115),char(0), -char(109),char(95),char(110),char(117),char(109),char(70),char(97),char(99),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(84),char(101),char(116),char(114), -char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(109),char(95),char(110),char(117),char(109),char(65),char(110),char(99),char(104),char(111),char(114),char(115),char(0), -char(109),char(95),char(110),char(117),char(109),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(74), -char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111),char(110),char(102),char(105),char(103),char(0),char(0),char(84),char(89),char(80),char(69), -char(87),char(0),char(0),char(0),char(99),char(104),char(97),char(114),char(0),char(117),char(99),char(104),char(97),char(114),char(0),char(115),char(104),char(111),char(114),char(116), -char(0),char(117),char(115),char(104),char(111),char(114),char(116),char(0),char(105),char(110),char(116),char(0),char(108),char(111),char(110),char(103),char(0),char(117),char(108),char(111), -char(110),char(103),char(0),char(102),char(108),char(111),char(97),char(116),char(0),char(100),char(111),char(117),char(98),char(108),char(101),char(0),char(118),char(111),char(105),char(100), -char(0),char(80),char(111),char(105),char(110),char(116),char(101),char(114),char(65),char(114),char(114),char(97),char(121),char(0),char(98),char(116),char(80),char(104),char(121),char(115), -char(105),char(99),char(115),char(83),char(121),char(115),char(116),char(101),char(109),char(0),char(76),char(105),char(115),char(116),char(66),char(97),char(115),char(101),char(0),char(98), -char(116),char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(86),char(101),char(99),char(116),char(111),char(114),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98), -char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), -char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(68),char(111),char(117),char(98),char(108),char(101),char(68), -char(97),char(116),char(97),char(0),char(98),char(116),char(66),char(118),char(104),char(83),char(117),char(98),char(116),char(114),char(101),char(101),char(73),char(110),char(102),char(111), -char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78), -char(111),char(100),char(101),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109), -char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101), -char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(70), -char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100), -char(66),char(118),char(104),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108), -char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(97), -char(116),char(105),char(99),char(80),char(108),char(97),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(67),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),char(110),char(97),char(108),char(83),char(104),char(97),char(112),char(101),char(68), -char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(110),char(100),char(82),char(97),char(100), -char(105),char(117),char(115),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(83),char(112),char(104),char(101),char(114),char(101),char(83),char(104),char(97), -char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97),char(116), -char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(84),char(114),char(105), -char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(104),char(97),char(114),char(73),char(110),char(100),char(101),char(120), -char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(101),char(115),char(104),char(80),char(97), -char(114),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(114),char(105),char(100),char(105),char(110),char(103),char(77),char(101),char(115), -char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105), -char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98), -char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),char(77),char(97),char(112),char(68),char(97),char(116),char(97), -char(0),char(98),char(116),char(83),char(99),char(97),char(108),char(101),char(100),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115), -char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117),char(110), -char(100),char(83),char(104),char(97),char(112),char(101),char(67),char(104),char(105),char(108),char(100),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), -char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(121), -char(108),char(105),char(110),char(100),char(101),char(114),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), -char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(97),char(112),char(115),char(117),char(108), -char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108), -char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(73),char(109),char(112),char(97),char(99),char(116),char(77), -char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(118),char(101), -char(120),char(72),char(117),char(108),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108), -char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97), -char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116), +char(95),char(114),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99), +char(111),char(110),char(116),char(97),char(99),char(116),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(99),char(111),char(110),char(116), +char(97),char(99),char(116),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105), +char(116),char(117),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(104),char(105),char(116),char(70),char(114),char(97),char(99),char(116),char(105),char(111),char(110), +char(0),char(109),char(95),char(99),char(99),char(100),char(83),char(119),char(101),char(112),char(116),char(83),char(112),char(104),char(101),char(114),char(101),char(82),char(97),char(100), +char(105),char(117),char(115),char(0),char(109),char(95),char(99),char(99),char(100),char(77),char(111),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115), +char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(104),char(97),char(115),char(65),char(110),char(105),char(115),char(111),char(116),char(114),char(111),char(112),char(105), +char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111), +char(110),char(70),char(108),char(97),char(103),char(115),char(0),char(109),char(95),char(105),char(115),char(108),char(97),char(110),char(100),char(84),char(97),char(103),char(49),char(0), +char(109),char(95),char(99),char(111),char(109),char(112),char(97),char(110),char(105),char(111),char(110),char(73),char(100),char(0),char(109),char(95),char(97),char(99),char(116),char(105), +char(118),char(97),char(116),char(105),char(111),char(110),char(83),char(116),char(97),char(116),char(101),char(49),char(0),char(109),char(95),char(105),char(110),char(116),char(101),char(114), +char(110),char(97),char(108),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(99),char(104),char(101),char(99),char(107),char(67),char(111),char(108),char(108),char(105), +char(100),char(101),char(87),char(105),char(116),char(104),char(0),char(109),char(95),char(116),char(97),char(117),char(0),char(109),char(95),char(100),char(97),char(109),char(112),char(105), +char(110),char(103),char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(116),char(101),char(112),char(0),char(109),char(95),char(109),char(97),char(120),char(69), +char(114),char(114),char(111),char(114),char(82),char(101),char(100),char(117),char(99),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(115),char(111),char(114),char(0), +char(109),char(95),char(101),char(114),char(112),char(0),char(109),char(95),char(101),char(114),char(112),char(50),char(0),char(109),char(95),char(103),char(108),char(111),char(98),char(97), +char(108),char(67),char(102),char(109),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(80), +char(101),char(110),char(101),char(116),char(114),char(97),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0), +char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(84),char(117),char(114),char(110),char(69),char(114), +char(112),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(111),char(112),char(0),char(109),char(95),char(119),char(97),char(114), +char(109),char(115),char(116),char(97),char(114),char(116),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(109),char(97), +char(120),char(71),char(121),char(114),char(111),char(115),char(99),char(111),char(112),char(105),char(99),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(115), +char(105),char(110),char(103),char(108),char(101),char(65),char(120),char(105),char(115),char(82),char(111),char(108),char(108),char(105),char(110),char(103),char(70),char(114),char(105),char(99), +char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(110),char(117),char(109),char(73), +char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(77),char(111), +char(100),char(101),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(105),char(110),char(103),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(82), +char(101),char(115),char(116),char(105),char(116),char(117),char(116),char(105),char(111),char(110),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0), +char(109),char(95),char(109),char(105),char(110),char(105),char(109),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(66),char(97),char(116),char(99),char(104), +char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(115),char(112),char(108),char(105),char(116),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0), +char(109),char(95),char(115),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(0),char(109),char(95),char(103),char(114),char(97),char(118),char(105), +char(116),char(121),char(0),char(109),char(95),char(99),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116), +char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(84),char(101),char(110), +char(115),char(111),char(114),char(87),char(111),char(114),char(108),char(100),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(86),char(101),char(108), +char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(86),char(101),char(108),char(111),char(99), +char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(70),char(97),char(99),char(116),char(111),char(114),char(0), +char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(103),char(114),char(97), +char(118),char(105),char(116),char(121),char(95),char(97),char(99),char(99),char(101),char(108),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(0),char(109),char(95), +char(105),char(110),char(118),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(76),char(111),char(99),char(97),char(108),char(0),char(109),char(95),char(116),char(111), +char(116),char(97),char(108),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(116),char(111),char(116),char(97),char(108),char(84),char(111),char(114),char(113), +char(117),char(101),char(0),char(109),char(95),char(105),char(110),char(118),char(101),char(114),char(115),char(101),char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(108), +char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108), +char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110), +char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(97),char(100), +char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(76),char(105),char(110),char(101),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110), +char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105), +char(116),char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103), +char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(83),char(113),char(114),char(0),char(109),char(95),char(97),char(100),char(100),char(105),char(116), +char(105),char(111),char(110),char(97),char(108),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(70), +char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(108),char(101),char(101),char(112),char(105), +char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97), +char(114),char(83),char(108),char(101),char(101),char(112),char(105),char(110),char(103),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109), +char(95),char(97),char(100),char(100),char(105),char(116),char(105),char(111),char(110),char(97),char(108),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109), +char(95),char(110),char(117),char(109),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(82),char(111),char(119),char(115),char(0),char(110), +char(117),char(98),char(0),char(42),char(109),char(95),char(114),char(98),char(65),char(0),char(42),char(109),char(95),char(114),char(98),char(66),char(0),char(109),char(95),char(111), +char(98),char(106),char(101),char(99),char(116),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110),char(115), +char(116),char(114),char(97),char(105),char(110),char(116),char(84),char(121),char(112),char(101),char(0),char(109),char(95),char(117),char(115),char(101),char(114),char(67),char(111),char(110), +char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(100),char(0),char(109),char(95),char(110),char(101),char(101),char(100),char(115),char(70),char(101),char(101), +char(100),char(98),char(97),char(99),char(107),char(0),char(109),char(95),char(97),char(112),char(112),char(108),char(105),char(101),char(100),char(73),char(109),char(112),char(117),char(108), +char(115),char(101),char(0),char(109),char(95),char(100),char(98),char(103),char(68),char(114),char(97),char(119),char(83),char(105),char(122),char(101),char(0),char(109),char(95),char(100), +char(105),char(115),char(97),char(98),char(108),char(101),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(115),char(66),char(101),char(116),char(119), +char(101),char(101),char(110),char(76),char(105),char(110),char(107),char(101),char(100),char(66),char(111),char(100),char(105),char(101),char(115),char(0),char(109),char(95),char(111),char(118), +char(101),char(114),char(114),char(105),char(100),char(101),char(78),char(117),char(109),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(116),char(101),char(114),char(97), +char(116),char(105),char(111),char(110),char(115),char(0),char(109),char(95),char(98),char(114),char(101),char(97),char(107),char(105),char(110),char(103),char(73),char(109),char(112),char(117), +char(108),char(115),char(101),char(84),char(104),char(114),char(101),char(115),char(104),char(111),char(108),char(100),char(0),char(109),char(95),char(105),char(115),char(69),char(110),char(97), +char(98),char(108),char(101),char(100),char(0),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(116),char(121), +char(112),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(112), +char(105),char(118),char(111),char(116),char(73),char(110),char(65),char(0),char(109),char(95),char(112),char(105),char(118),char(111),char(116),char(73),char(110),char(66),char(0),char(109), +char(95),char(114),char(98),char(65),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(114),char(98),char(66),char(70),char(114),char(97),char(109),char(101), +char(0),char(109),char(95),char(117),char(115),char(101),char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99),char(101),char(70),char(114),char(97),char(109),char(101), +char(65),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(79),char(110),char(108),char(121),char(0),char(109),char(95),char(101),char(110), +char(97),char(98),char(108),char(101),char(65),char(110),char(103),char(117),char(108),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(0),char(109),char(95),char(109), +char(111),char(116),char(111),char(114),char(84),char(97),char(114),char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109), +char(95),char(109),char(97),char(120),char(77),char(111),char(116),char(111),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(108), +char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116),char(0),char(109),char(95),char(117),char(112),char(112),char(101),char(114),char(76),char(105),char(109), +char(105),char(116),char(0),char(109),char(95),char(108),char(105),char(109),char(105),char(116),char(83),char(111),char(102),char(116),char(110),char(101),char(115),char(115),char(0),char(109), +char(95),char(98),char(105),char(97),char(115),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(114),char(101),char(108),char(97),char(120),char(97), +char(116),char(105),char(111),char(110),char(70),char(97),char(99),char(116),char(111),char(114),char(0),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103), +char(49),char(91),char(52),char(93),char(0),char(109),char(95),char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(49),char(0),char(109),char(95), +char(115),char(119),char(105),char(110),char(103),char(83),char(112),char(97),char(110),char(50),char(0),char(109),char(95),char(116),char(119),char(105),char(115),char(116),char(83),char(112), +char(97),char(110),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105), +char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116), +char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(85),char(112),char(112),char(101),char(114),char(76),char(105),char(109),char(105),char(116), +char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(76),char(111),char(119),char(101),char(114),char(76),char(105),char(109),char(105),char(116), +char(0),char(109),char(95),char(117),char(115),char(101),char(76),char(105),char(110),char(101),char(97),char(114),char(82),char(101),char(102),char(101),char(114),char(101),char(110),char(99), +char(101),char(70),char(114),char(97),char(109),char(101),char(65),char(0),char(109),char(95),char(117),char(115),char(101),char(79),char(102),char(102),char(115),char(101),char(116),char(70), +char(111),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(114),char(97),char(109),char(101),char(0),char(109),char(95), +char(54),char(100),char(111),char(102),char(68),char(97),char(116),char(97),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(69),char(110),char(97), +char(98),char(108),char(101),char(100),char(91),char(54),char(93),char(0),char(109),char(95),char(101),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117), +char(109),char(80),char(111),char(105),char(110),char(116),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(83),char(116), +char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(91),char(54),char(93),char(0),char(109),char(95),char(115),char(112),char(114),char(105),char(110),char(103),char(68), +char(97),char(109),char(112),char(105),char(110),char(103),char(91),char(54),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(66),char(111), +char(117),char(110),char(99),char(101),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80), +char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(116),char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(108), +char(105),char(110),char(101),char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(69),char(82),char(80),char(0),char(109),char(95),char(108),char(105),char(110),char(101), +char(97),char(114),char(77),char(111),char(116),char(111),char(114),char(67),char(70),char(77),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(84), +char(97),char(114),char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(108),char(105),char(110),char(101), +char(97),char(114),char(77),char(97),char(120),char(77),char(111),char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(108),char(105), +char(110),char(101),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(108),char(105), +char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0), +char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110), +char(103),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98),char(114),char(105),char(117), +char(109),char(80),char(111),char(105),char(110),char(116),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(69),char(110),char(97),char(98),char(108), +char(101),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(101), +char(114),char(118),char(111),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114), +char(69),char(110),char(97),char(98),char(108),char(101),char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105), +char(110),char(101),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(76), +char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114),char(83),char(112), +char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52), +char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(66),char(111),char(117),char(110),char(99),char(101),char(0),char(109),char(95), +char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(116),char(111),char(112),char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103), +char(117),char(108),char(97),char(114),char(83),char(116),char(111),char(112),char(67),char(70),char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97), +char(114),char(77),char(111),char(116),char(111),char(114),char(69),char(82),char(80),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(77), +char(111),char(116),char(111),char(114),char(67),char(70),char(77),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(84),char(97),char(114), +char(103),char(101),char(116),char(86),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97), +char(114),char(77),char(97),char(120),char(77),char(111),char(116),char(111),char(114),char(70),char(111),char(114),char(99),char(101),char(0),char(109),char(95),char(97),char(110),char(103), +char(117),char(108),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(84),char(97),char(114),char(103),char(101),char(116),char(0),char(109),char(95),char(97),char(110), +char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115), +char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112), +char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(113),char(117),char(105),char(108),char(105),char(98), +char(114),char(105),char(117),char(109),char(80),char(111),char(105),char(110),char(116),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(69), +char(110),char(97),char(98),char(108),char(101),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117), +char(108),char(97),char(114),char(83),char(101),char(114),char(118),char(111),char(77),char(111),char(116),char(111),char(114),char(91),char(52),char(93),char(0),char(109),char(95),char(97), +char(110),char(103),char(117),char(108),char(97),char(114),char(69),char(110),char(97),char(98),char(108),char(101),char(83),char(112),char(114),char(105),char(110),char(103),char(91),char(52), +char(93),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(83),char(116),char(105), +char(102),char(102),char(110),char(101),char(115),char(115),char(76),char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(97), +char(110),char(103),char(117),char(108),char(97),char(114),char(83),char(112),char(114),char(105),char(110),char(103),char(68),char(97),char(109),char(112),char(105),char(110),char(103),char(76), +char(105),char(109),char(105),char(116),char(101),char(100),char(91),char(52),char(93),char(0),char(109),char(95),char(114),char(111),char(116),char(97),char(116),char(101),char(79),char(114), +char(100),char(101),char(114),char(0),char(109),char(95),char(97),char(120),char(105),char(115),char(73),char(110),char(65),char(0),char(109),char(95),char(97),char(120),char(105),char(115), +char(73),char(110),char(66),char(0),char(109),char(95),char(114),char(97),char(116),char(105),char(111),char(0),char(109),char(95),char(108),char(105),char(110),char(101),char(97),char(114), +char(83),char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(97),char(110),char(103),char(117),char(108),char(97),char(114),char(83), +char(116),char(105),char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109),char(101),char(83),char(116),char(105), +char(102),char(102),char(110),char(101),char(115),char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(0),char(109), +char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(112),char(114),char(101),char(118),char(105),char(111),char(117),char(115), +char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(0),char(109),char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(0), +char(109),char(95),char(97),char(99),char(99),char(117),char(109),char(117),char(108),char(97),char(116),char(101),char(100),char(70),char(111),char(114),char(99),char(101),char(0),char(109), +char(95),char(110),char(111),char(114),char(109),char(97),char(108),char(0),char(109),char(95),char(97),char(114),char(101),char(97),char(0),char(109),char(95),char(97),char(116),char(116), +char(97),char(99),char(104),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(50),char(93), +char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(76),char(101),char(110),char(103),char(116),char(104),char(0),char(109),char(95),char(98),char(98),char(101),char(110), +char(100),char(105),char(110),char(103),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(51), +char(93),char(0),char(109),char(95),char(114),char(101),char(115),char(116),char(65),char(114),char(101),char(97),char(0),char(109),char(95),char(99),char(48),char(91),char(52),char(93), +char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(91),char(52),char(93),char(0),char(109),char(95), +char(114),char(101),char(115),char(116),char(86),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(99),char(49),char(0),char(109),char(95),char(99),char(50), +char(0),char(109),char(95),char(99),char(48),char(0),char(109),char(95),char(108),char(111),char(99),char(97),char(108),char(70),char(114),char(97),char(109),char(101),char(0),char(42), +char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(0),char(109),char(95),char(110),char(111),char(100),char(101),char(73),char(110), +char(100),char(101),char(120),char(0),char(109),char(95),char(97),char(101),char(114),char(111),char(77),char(111),char(100),char(101),char(108),char(0),char(109),char(95),char(98),char(97), +char(117),char(109),char(103),char(97),char(114),char(116),char(101),char(0),char(109),char(95),char(100),char(114),char(97),char(103),char(0),char(109),char(95),char(108),char(105),char(102), +char(116),char(0),char(109),char(95),char(112),char(114),char(101),char(115),char(115),char(117),char(114),char(101),char(0),char(109),char(95),char(118),char(111),char(108),char(117),char(109), +char(101),char(0),char(109),char(95),char(100),char(121),char(110),char(97),char(109),char(105),char(99),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0), +char(109),char(95),char(112),char(111),char(115),char(101),char(77),char(97),char(116),char(99),char(104),char(0),char(109),char(95),char(114),char(105),char(103),char(105),char(100),char(67), +char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(107),char(105),char(110), +char(101),char(116),char(105),char(99),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0), +char(109),char(95),char(115),char(111),char(102),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(72),char(97),char(114),char(100),char(110),char(101),char(115), +char(115),char(0),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109), +char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114), +char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105),char(110),char(101),char(116),char(105),char(99),char(67), +char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115),char(0),char(109),char(95),char(115),char(111),char(102), +char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(72),char(97),char(114),char(100),char(110),char(101),char(115),char(115), +char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73), +char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(75),char(105), +char(110),char(101),char(116),char(105),char(99),char(67),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83), +char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(115),char(111),char(102),char(116),char(83),char(111),char(102),char(116),char(67),char(108),char(117),char(115),char(116), +char(101),char(114),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(83),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(109),char(97),char(120), +char(86),char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(116),char(105),char(109),char(101),char(83),char(99),char(97),char(108),char(101),char(0),char(109), +char(95),char(118),char(101),char(108),char(111),char(99),char(105),char(116),char(121),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0), +char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115), +char(0),char(109),char(95),char(100),char(114),char(105),char(102),char(116),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109), +char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(116),char(101),char(114),char(97),char(116),char(105),char(111),char(110),char(115),char(0),char(109), +char(95),char(114),char(111),char(116),char(0),char(109),char(95),char(115),char(99),char(97),char(108),char(101),char(0),char(109),char(95),char(97),char(113),char(113),char(0),char(109), +char(95),char(99),char(111),char(109),char(0),char(42),char(109),char(95),char(112),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(115),char(0),char(42),char(109), +char(95),char(119),char(101),char(105),char(103),char(104),char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(80),char(111),char(115),char(105),char(116),char(105), +char(111),char(110),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(87),char(101),char(105),char(103),char(116),char(115),char(0),char(109),char(95),char(98),char(118), +char(111),char(108),char(117),char(109),char(101),char(0),char(109),char(95),char(98),char(102),char(114),char(97),char(109),char(101),char(0),char(109),char(95),char(102),char(114),char(97), +char(109),char(101),char(120),char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(108),char(111),char(99),char(105),char(105),char(0),char(109),char(95),char(105),char(110), +char(118),char(119),char(105),char(0),char(109),char(95),char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109), +char(95),char(100),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(108),char(118),char(0),char(109), +char(95),char(97),char(118),char(0),char(42),char(109),char(95),char(102),char(114),char(97),char(109),char(101),char(114),char(101),char(102),char(115),char(0),char(42),char(109),char(95), +char(110),char(111),char(100),char(101),char(73),char(110),char(100),char(105),char(99),char(101),char(115),char(0),char(42),char(109),char(95),char(109),char(97),char(115),char(115),char(101), +char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(114),char(97),char(109),char(101),char(82),char(101),char(102),char(115),char(0),char(109),char(95),char(110), +char(117),char(109),char(78),char(111),char(100),char(101),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(97),char(115),char(115),char(101),char(115),char(0), +char(109),char(95),char(105),char(100),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(105),char(109),char(97),char(115),char(115),char(0),char(109),char(95),char(110), +char(118),char(105),char(109),char(112),char(117),char(108),char(115),char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(105),char(109),char(112),char(117),char(108),char(115), +char(101),char(115),char(0),char(109),char(95),char(110),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(108),char(100),char(97),char(109), +char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(97),char(100),char(97),char(109),char(112),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97), +char(116),char(99),char(104),char(105),char(110),char(103),char(0),char(109),char(95),char(109),char(97),char(120),char(83),char(101),char(108),char(102),char(67),char(111),char(108),char(108), +char(105),char(115),char(105),char(111),char(110),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(0),char(109),char(95),char(115),char(101),char(108),char(102),char(67), +char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(73),char(109),char(112),char(117),char(108),char(115),char(101),char(70),char(97),char(99),char(116),char(111), +char(114),char(0),char(109),char(95),char(99),char(111),char(110),char(116),char(97),char(105),char(110),char(115),char(65),char(110),char(99),char(104),char(111),char(114),char(0),char(109), +char(95),char(99),char(111),char(108),char(108),char(105),char(100),char(101),char(0),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(73),char(110), +char(100),char(101),char(120),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(0),char(42),char(109),char(95),char(98),char(111),char(100),char(121), +char(66),char(0),char(109),char(95),char(114),char(101),char(102),char(115),char(91),char(50),char(93),char(0),char(109),char(95),char(99),char(102),char(109),char(0),char(109),char(95), +char(115),char(112),char(108),char(105),char(116),char(0),char(109),char(95),char(100),char(101),char(108),char(101),char(116),char(101),char(0),char(109),char(95),char(114),char(101),char(108), +char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(91),char(50),char(93),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(65),char(116), +char(121),char(112),char(101),char(0),char(109),char(95),char(98),char(111),char(100),char(121),char(66),char(116),char(121),char(112),char(101),char(0),char(109),char(95),char(106),char(111), +char(105),char(110),char(116),char(84),char(121),char(112),char(101),char(0),char(42),char(109),char(95),char(112),char(111),char(115),char(101),char(0),char(42),char(42),char(109),char(95), +char(109),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(42),char(109),char(95),char(110),char(111),char(100),char(101),char(115),char(0),char(42), +char(109),char(95),char(108),char(105),char(110),char(107),char(115),char(0),char(42),char(109),char(95),char(102),char(97),char(99),char(101),char(115),char(0),char(42),char(109),char(95), +char(116),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(42),char(109),char(95),char(97),char(110),char(99),char(104),char(111),char(114), +char(115),char(0),char(42),char(109),char(95),char(99),char(108),char(117),char(115),char(116),char(101),char(114),char(115),char(0),char(42),char(109),char(95),char(106),char(111),char(105), +char(110),char(116),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(115),char(0),char(109), +char(95),char(110),char(117),char(109),char(76),char(105),char(110),char(107),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(70),char(97),char(99),char(101),char(115), +char(0),char(109),char(95),char(110),char(117),char(109),char(84),char(101),char(116),char(114),char(97),char(104),char(101),char(100),char(114),char(97),char(0),char(109),char(95),char(110), +char(117),char(109),char(65),char(110),char(99),char(104),char(111),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(67),char(108),char(117),char(115),char(116), +char(101),char(114),char(115),char(0),char(109),char(95),char(110),char(117),char(109),char(74),char(111),char(105),char(110),char(116),char(115),char(0),char(109),char(95),char(99),char(111), +char(110),char(102),char(105),char(103),char(0),char(109),char(95),char(122),char(101),char(114),char(111),char(82),char(111),char(116),char(80),char(97),char(114),char(101),char(110),char(116), +char(84),char(111),char(84),char(104),char(105),char(115),char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(67),char(111),char(109),char(84),char(111), +char(84),char(104),char(105),char(115),char(67),char(111),char(109),char(79),char(102),char(102),char(115),char(101),char(116),char(0),char(109),char(95),char(116),char(104),char(105),char(115), +char(80),char(105),char(118),char(111),char(116),char(84),char(111),char(84),char(104),char(105),char(115),char(67),char(111),char(109),char(79),char(102),char(102),char(115),char(101),char(116), +char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(65),char(120),char(105),char(115),char(84),char(111),char(112),char(91),char(54),char(93),char(0),char(109), +char(95),char(106),char(111),char(105),char(110),char(116),char(65),char(120),char(105),char(115),char(66),char(111),char(116),char(116),char(111),char(109),char(91),char(54),char(93),char(0), +char(109),char(95),char(108),char(105),char(110),char(107),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(108),char(105),char(110),char(107), +char(77),char(97),char(115),char(115),char(0),char(109),char(95),char(112),char(97),char(114),char(101),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(0),char(109), +char(95),char(100),char(111),char(102),char(67),char(111),char(117),char(110),char(116),char(0),char(109),char(95),char(112),char(111),char(115),char(86),char(97),char(114),char(67),char(111), +char(117),char(110),char(116),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(80),char(111),char(115),char(91),char(55),char(93),char(0),char(109),char(95), +char(106),char(111),char(105),char(110),char(116),char(86),char(101),char(108),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(84), +char(111),char(114),char(113),char(117),char(101),char(91),char(54),char(93),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(68),char(97),char(109),char(112), +char(105),char(110),char(103),char(0),char(109),char(95),char(106),char(111),char(105),char(110),char(116),char(70),char(114),char(105),char(99),char(116),char(105),char(111),char(110),char(0), +char(42),char(109),char(95),char(108),char(105),char(110),char(107),char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(106),char(111),char(105),char(110),char(116), +char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(108),char(105),char(110),char(107),char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114), +char(0),char(42),char(109),char(95),char(112),char(97),char(100),char(100),char(105),char(110),char(103),char(80),char(116),char(114),char(0),char(109),char(95),char(98),char(97),char(115), +char(101),char(87),char(111),char(114),char(108),char(100),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(0),char(109),char(95),char(98),char(97), +char(115),char(101),char(73),char(110),char(101),char(114),char(116),char(105),char(97),char(0),char(109),char(95),char(98),char(97),char(115),char(101),char(77),char(97),char(115),char(115), +char(0),char(42),char(109),char(95),char(98),char(97),char(115),char(101),char(78),char(97),char(109),char(101),char(0),char(42),char(109),char(95),char(98),char(97),char(115),char(101), +char(67),char(111),char(108),char(108),char(105),char(100),char(101),char(114),char(0),char(0),char(0),char(0),char(84),char(89),char(80),char(69),char(95),char(0),char(0),char(0), +char(99),char(104),char(97),char(114),char(0),char(117),char(99),char(104),char(97),char(114),char(0),char(115),char(104),char(111),char(114),char(116),char(0),char(117),char(115),char(104), +char(111),char(114),char(116),char(0),char(105),char(110),char(116),char(0),char(108),char(111),char(110),char(103),char(0),char(117),char(108),char(111),char(110),char(103),char(0),char(102), +char(108),char(111),char(97),char(116),char(0),char(100),char(111),char(117),char(98),char(108),char(101),char(0),char(118),char(111),char(105),char(100),char(0),char(80),char(111),char(105), +char(110),char(116),char(101),char(114),char(65),char(114),char(114),char(97),char(121),char(0),char(98),char(116),char(80),char(104),char(121),char(115),char(105),char(99),char(115),char(83), +char(121),char(115),char(116),char(101),char(109),char(0),char(76),char(105),char(115),char(116),char(66),char(97),char(115),char(101),char(0),char(98),char(116),char(86),char(101),char(99), +char(116),char(111),char(114),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(86),char(101),char(99),char(116), +char(111),char(114),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(116), +char(101),char(114),char(110),char(105),char(111),char(110),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117), +char(97),char(116),char(101),char(114),char(110),char(105),char(111),char(110),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98), +char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0), +char(98),char(116),char(77),char(97),char(116),char(114),char(105),char(120),char(51),char(120),char(51),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116), +char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(70),char(108),char(111),char(97),char(116),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(97),char(110),char(115),char(102),char(111),char(114),char(109),char(68),char(111),char(117),char(98),char(108),char(101), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(66),char(118),char(104),char(83),char(117),char(98),char(116),char(114),char(101),char(101),char(73),char(110),char(102), +char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105),char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104), +char(78),char(111),char(100),char(101),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(79),char(112),char(116),char(105), +char(109),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100),char(101),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104),char(78),char(111),char(100), +char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101),char(100),char(66),char(118),char(104), +char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(81),char(117),char(97),char(110),char(116),char(105),char(122),char(101), +char(100),char(66),char(118),char(104),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108), +char(108),char(105),char(115),char(105),char(111),char(110),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116), +char(97),char(116),char(105),char(99),char(80),char(108),char(97),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98), +char(116),char(67),char(111),char(110),char(118),char(101),char(120),char(73),char(110),char(116),char(101),char(114),char(110),char(97),char(108),char(83),char(104),char(97),char(112),char(101), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(115),char(105),char(116),char(105),char(111),char(110),char(65),char(110),char(100),char(82),char(97), +char(100),char(105),char(117),char(115),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(83),char(112),char(104),char(101),char(114),char(101),char(83),char(104), +char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(68),char(97), +char(116),char(97),char(0),char(98),char(116),char(83),char(104),char(111),char(114),char(116),char(73),char(110),char(116),char(73),char(110),char(100),char(101),char(120),char(84),char(114), +char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(104),char(97),char(114),char(73),char(110),char(100),char(101), +char(120),char(84),char(114),char(105),char(112),char(108),char(101),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(101),char(115),char(104),char(80), +char(97),char(114),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(116),char(114),char(105),char(100),char(105),char(110),char(103),char(77),char(101), +char(115),char(104),char(73),char(110),char(116),char(101),char(114),char(102),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114), +char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0), +char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(73),char(110),char(102),char(111),char(77),char(97),char(112),char(68),char(97),char(116), +char(97),char(0),char(98),char(116),char(83),char(99),char(97),char(108),char(101),char(100),char(84),char(114),char(105),char(97),char(110),char(103),char(108),char(101),char(77),char(101), +char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(109),char(112),char(111),char(117), +char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(67),char(104),char(105),char(108),char(100),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67), +char(111),char(109),char(112),char(111),char(117),char(110),char(100),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67), +char(121),char(108),char(105),char(110),char(100),char(101),char(114),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67), +char(111),char(110),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(97),char(112),char(115),char(117), +char(108),char(101),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(114),char(105),char(97),char(110),char(103), +char(108),char(101),char(73),char(110),char(102),char(111),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(73),char(109),char(112),char(97),char(99),char(116), +char(77),char(101),char(115),char(104),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(118), +char(101),char(120),char(72),char(117),char(108),char(108),char(83),char(104),char(97),char(112),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), +char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68), +char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(108),char(108),char(105),char(115),char(105),char(111),char(110),char(79),char(98),char(106),char(101),char(99), +char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116), +char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), +char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111), char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115), -char(87),char(111),char(114),char(108),char(100),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111), -char(110),char(116),char(97),char(99),char(116),char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(68),char(111),char(117),char(98),char(108), -char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121),char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108), -char(100),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(116),char(97),char(99),char(116), -char(83),char(111),char(108),char(118),char(101),char(114),char(73),char(110),char(102),char(111),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0), -char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97), -char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97), -char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(110),char(102),char(111),char(49), -char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108), -char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116), -char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100), -char(121),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97), -char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110), -char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108),char(111), -char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116), -char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), -char(50),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116), -char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105), -char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68), -char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110), -char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111), -char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0), -char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110), -char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119), -char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116), -char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110), -char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67), +char(87),char(111),char(114),char(108),char(100),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(68),char(121), +char(110),char(97),char(109),char(105),char(99),char(115),char(87),char(111),char(114),char(108),char(100),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97), +char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116), +char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68), +char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(73),char(110),char(102),char(111), +char(49),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70), +char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115), +char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(82),char(105),char(103),char(105),char(100),char(66),char(111), +char(100),char(121),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(84),char(121),char(112),char(101),char(100),char(67),char(111),char(110),char(115),char(116),char(114), +char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105), +char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(70),char(108), +char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110), +char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116), +char(97),char(50),char(0),char(98),char(116),char(80),char(111),char(105),char(110),char(116),char(50),char(80),char(111),char(105),char(110),char(116),char(67),char(111),char(110),char(115), +char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72), +char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(72),char(105),char(110),char(103),char(101),char(67), char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50), -char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103), -char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110), -char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116),char(114), -char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(83),char(108), -char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98), -char(116),char(83),char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117), -char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111),char(110),char(115),char(116),char(114), -char(97),char(105),char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114), +char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84),char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(67),char(111),char(110),char(101),char(84), +char(119),char(105),char(115),char(116),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98), +char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102), char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97), -char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(68),char(97),char(116), -char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(78),char(111),char(100),char(101),char(68),char(97),char(116),char(97),char(0),char(83), -char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116), -char(66),char(111),char(100),char(121),char(70),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100), -char(121),char(84),char(101),char(116),char(114),char(97),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100), -char(65),char(110),char(99),char(104),char(111),char(114),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67), -char(111),char(110),char(102),char(105),char(103),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(80),char(111), -char(115),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(108),char(117),char(115),char(116), -char(101),char(114),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(74),char(111),char(105), -char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(70),char(108),char(111), -char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(0),char(84),char(76),char(69),char(78),char(1),char(0),char(1),char(0),char(2),char(0),char(2),char(0), -char(4),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(0),char(0),char(16),char(0),char(48),char(0),char(16),char(0),char(16),char(0), -char(32),char(0),char(48),char(0),char(96),char(0),char(64),char(0),char(-128),char(0),char(20),char(0),char(48),char(0),char(80),char(0),char(16),char(0),char(96),char(0), -char(-112),char(0),char(16),char(0),char(56),char(0),char(56),char(0),char(20),char(0),char(72),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(4),char(0), -char(56),char(0),char(32),char(0),char(80),char(0),char(72),char(0),char(96),char(0),char(80),char(0),char(32),char(0),char(64),char(0),char(64),char(0),char(64),char(0), -char(16),char(0),char(72),char(0),char(80),char(0),char(-32),char(1),char(16),char(1),char(-72),char(0),char(-104),char(0),char(104),char(0),char(88),char(0),char(-8),char(1), -char(-80),char(3),char(8),char(0),char(64),char(0),char(64),char(0),char(0),char(0),char(80),char(0),char(96),char(0),char(-112),char(0),char(-128),char(0),char(104),char(1), -char(-24),char(0),char(-104),char(1),char(-120),char(1),char(-32),char(0),char(8),char(1),char(-40),char(1),char(104),char(1),char(-128),char(2),char(-40),char(0),char(120),char(1), +char(50),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110), +char(103),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101), +char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(67),char(111),char(110),char(115),char(116), +char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(71), +char(101),char(110),char(101),char(114),char(105),char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(50),char(67),char(111),char(110), +char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(110),char(101),char(114),char(105), +char(99),char(54),char(68),char(111),char(102),char(83),char(112),char(114),char(105),char(110),char(103),char(50),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(50),char(0),char(98),char(116),char(83),char(108),char(105),char(100), +char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83), +char(108),char(105),char(100),char(101),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108), +char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111),char(110),char(115),char(116),char(114),char(97),char(105), +char(110),char(116),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(71),char(101),char(97),char(114),char(67),char(111), +char(110),char(115),char(116),char(114),char(97),char(105),char(110),char(116),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(83), +char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(77),char(97),char(116),char(101),char(114),char(105),char(97),char(108),char(68),char(97),char(116),char(97),char(0), +char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(78),char(111),char(100),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102), +char(116),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111), +char(100),char(121),char(70),char(97),char(99),char(101),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(84), +char(101),char(116),char(114),char(97),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(82),char(105),char(103),char(105),char(100),char(65),char(110), +char(99),char(104),char(111),char(114),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(111),char(110), +char(102),char(105),char(103),char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(80),char(111),char(115),char(101), +char(68),char(97),char(116),char(97),char(0),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(67),char(108),char(117),char(115),char(116),char(101),char(114), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(74),char(111),char(105),char(110),char(116), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(83),char(111),char(102),char(116),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116), +char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(76),char(105),char(110),char(107), +char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117),char(108),char(116),char(105),char(66),char(111), +char(100),char(121),char(76),char(105),char(110),char(107),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(98),char(116),char(77),char(117), +char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(68),char(111),char(117),char(98),char(108),char(101),char(68),char(97),char(116),char(97),char(0),char(98),char(116), +char(77),char(117),char(108),char(116),char(105),char(66),char(111),char(100),char(121),char(70),char(108),char(111),char(97),char(116),char(68),char(97),char(116),char(97),char(0),char(0), +char(84),char(76),char(69),char(78),char(1),char(0),char(1),char(0),char(2),char(0),char(2),char(0),char(4),char(0),char(4),char(0),char(4),char(0),char(4),char(0), +char(8),char(0),char(0),char(0),char(16),char(0),char(48),char(0),char(16),char(0),char(16),char(0),char(32),char(0),char(16),char(0),char(32),char(0),char(48),char(0), +char(96),char(0),char(64),char(0),char(-128),char(0),char(20),char(0),char(48),char(0),char(80),char(0),char(16),char(0),char(96),char(0),char(-112),char(0),char(16),char(0), +char(56),char(0),char(56),char(0),char(20),char(0),char(72),char(0),char(4),char(0),char(4),char(0),char(8),char(0),char(4),char(0),char(56),char(0),char(32),char(0), +char(80),char(0),char(72),char(0),char(96),char(0),char(80),char(0),char(32),char(0),char(64),char(0),char(64),char(0),char(64),char(0),char(16),char(0),char(72),char(0), +char(80),char(0),char(-16),char(1),char(24),char(1),char(-104),char(0),char(88),char(0),char(-72),char(0),char(104),char(0),char(0),char(2),char(-64),char(3),char(8),char(0), +char(64),char(0),char(64),char(0),char(0),char(0),char(80),char(0),char(96),char(0),char(-112),char(0),char(-128),char(0),char(104),char(1),char(-24),char(0),char(-104),char(1), +char(-120),char(1),char(-32),char(0),char(8),char(1),char(-40),char(1),char(104),char(1),char(-128),char(2),char(-112),char(2),char(-64),char(4),char(-40),char(0),char(120),char(1), char(104),char(0),char(-104),char(0),char(16),char(0),char(104),char(0),char(24),char(0),char(40),char(0),char(104),char(0),char(96),char(0),char(104),char(0),char(-56),char(0), -char(104),char(1),char(112),char(0),char(-32),char(1),char(0),char(0),char(83),char(84),char(82),char(67),char(76),char(0),char(0),char(0),char(10),char(0),char(3),char(0), -char(4),char(0),char(0),char(0),char(4),char(0),char(1),char(0),char(9),char(0),char(2),char(0),char(11),char(0),char(3),char(0),char(10),char(0),char(3),char(0), -char(10),char(0),char(4),char(0),char(10),char(0),char(5),char(0),char(12),char(0),char(2),char(0),char(9),char(0),char(6),char(0),char(9),char(0),char(7),char(0), -char(13),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(14),char(0),char(1),char(0),char(8),char(0),char(8),char(0),char(15),char(0),char(1),char(0), -char(13),char(0),char(9),char(0),char(16),char(0),char(1),char(0),char(14),char(0),char(9),char(0),char(17),char(0),char(2),char(0),char(15),char(0),char(10),char(0), -char(13),char(0),char(11),char(0),char(18),char(0),char(2),char(0),char(16),char(0),char(10),char(0),char(14),char(0),char(11),char(0),char(19),char(0),char(4),char(0), -char(4),char(0),char(12),char(0),char(4),char(0),char(13),char(0),char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0),char(20),char(0),char(6),char(0), -char(13),char(0),char(16),char(0),char(13),char(0),char(17),char(0),char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0), -char(0),char(0),char(21),char(0),char(21),char(0),char(6),char(0),char(14),char(0),char(16),char(0),char(14),char(0),char(17),char(0),char(4),char(0),char(18),char(0), -char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(22),char(0),char(3),char(0),char(2),char(0),char(14),char(0), -char(2),char(0),char(15),char(0),char(4),char(0),char(22),char(0),char(23),char(0),char(12),char(0),char(13),char(0),char(23),char(0),char(13),char(0),char(24),char(0), -char(13),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0), -char(20),char(0),char(30),char(0),char(22),char(0),char(31),char(0),char(19),char(0),char(32),char(0),char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0), -char(24),char(0),char(12),char(0),char(14),char(0),char(23),char(0),char(14),char(0),char(24),char(0),char(14),char(0),char(25),char(0),char(4),char(0),char(26),char(0), -char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),char(21),char(0),char(30),char(0),char(22),char(0),char(31),char(0), -char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(19),char(0),char(32),char(0),char(25),char(0),char(3),char(0),char(0),char(0),char(35),char(0), -char(4),char(0),char(36),char(0),char(0),char(0),char(37),char(0),char(26),char(0),char(5),char(0),char(25),char(0),char(38),char(0),char(13),char(0),char(39),char(0), -char(13),char(0),char(40),char(0),char(7),char(0),char(41),char(0),char(0),char(0),char(21),char(0),char(27),char(0),char(5),char(0),char(25),char(0),char(38),char(0), -char(13),char(0),char(39),char(0),char(13),char(0),char(42),char(0),char(7),char(0),char(43),char(0),char(4),char(0),char(44),char(0),char(28),char(0),char(2),char(0), -char(13),char(0),char(45),char(0),char(7),char(0),char(46),char(0),char(29),char(0),char(4),char(0),char(27),char(0),char(47),char(0),char(28),char(0),char(48),char(0), -char(4),char(0),char(49),char(0),char(0),char(0),char(37),char(0),char(30),char(0),char(1),char(0),char(4),char(0),char(50),char(0),char(31),char(0),char(2),char(0), -char(2),char(0),char(50),char(0),char(0),char(0),char(51),char(0),char(32),char(0),char(2),char(0),char(2),char(0),char(52),char(0),char(0),char(0),char(51),char(0), -char(33),char(0),char(2),char(0),char(0),char(0),char(52),char(0),char(0),char(0),char(53),char(0),char(34),char(0),char(8),char(0),char(13),char(0),char(54),char(0), -char(14),char(0),char(55),char(0),char(30),char(0),char(56),char(0),char(32),char(0),char(57),char(0),char(33),char(0),char(58),char(0),char(31),char(0),char(59),char(0), -char(4),char(0),char(60),char(0),char(4),char(0),char(61),char(0),char(35),char(0),char(4),char(0),char(34),char(0),char(62),char(0),char(13),char(0),char(63),char(0), -char(4),char(0),char(64),char(0),char(0),char(0),char(37),char(0),char(36),char(0),char(7),char(0),char(25),char(0),char(38),char(0),char(35),char(0),char(65),char(0), -char(23),char(0),char(66),char(0),char(24),char(0),char(67),char(0),char(37),char(0),char(68),char(0),char(7),char(0),char(43),char(0),char(0),char(0),char(69),char(0), -char(38),char(0),char(2),char(0),char(36),char(0),char(70),char(0),char(13),char(0),char(39),char(0),char(39),char(0),char(4),char(0),char(17),char(0),char(71),char(0), -char(25),char(0),char(72),char(0),char(4),char(0),char(73),char(0),char(7),char(0),char(74),char(0),char(40),char(0),char(4),char(0),char(25),char(0),char(38),char(0), -char(39),char(0),char(75),char(0),char(4),char(0),char(76),char(0),char(7),char(0),char(43),char(0),char(41),char(0),char(3),char(0),char(27),char(0),char(47),char(0), -char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(42),char(0),char(3),char(0),char(27),char(0),char(47),char(0),char(4),char(0),char(78),char(0), -char(0),char(0),char(37),char(0),char(43),char(0),char(3),char(0),char(27),char(0),char(47),char(0),char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0), -char(44),char(0),char(4),char(0),char(4),char(0),char(79),char(0),char(7),char(0),char(80),char(0),char(7),char(0),char(81),char(0),char(7),char(0),char(82),char(0), -char(37),char(0),char(14),char(0),char(4),char(0),char(83),char(0),char(4),char(0),char(84),char(0),char(44),char(0),char(85),char(0),char(4),char(0),char(86),char(0), -char(7),char(0),char(87),char(0),char(7),char(0),char(88),char(0),char(7),char(0),char(89),char(0),char(7),char(0),char(90),char(0),char(7),char(0),char(91),char(0), -char(4),char(0),char(92),char(0),char(4),char(0),char(93),char(0),char(4),char(0),char(94),char(0),char(4),char(0),char(95),char(0),char(0),char(0),char(37),char(0), -char(45),char(0),char(5),char(0),char(25),char(0),char(38),char(0),char(35),char(0),char(65),char(0),char(13),char(0),char(39),char(0),char(7),char(0),char(43),char(0), -char(4),char(0),char(96),char(0),char(46),char(0),char(5),char(0),char(27),char(0),char(47),char(0),char(13),char(0),char(97),char(0),char(14),char(0),char(98),char(0), -char(4),char(0),char(99),char(0),char(0),char(0),char(100),char(0),char(47),char(0),char(25),char(0),char(9),char(0),char(101),char(0),char(9),char(0),char(102),char(0), -char(25),char(0),char(103),char(0),char(0),char(0),char(35),char(0),char(18),char(0),char(104),char(0),char(18),char(0),char(105),char(0),char(14),char(0),char(106),char(0), -char(14),char(0),char(107),char(0),char(14),char(0),char(108),char(0),char(8),char(0),char(109),char(0),char(8),char(0),char(110),char(0),char(8),char(0),char(111),char(0), -char(8),char(0),char(112),char(0),char(8),char(0),char(113),char(0),char(8),char(0),char(114),char(0),char(8),char(0),char(115),char(0),char(8),char(0),char(116),char(0), -char(4),char(0),char(117),char(0),char(4),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0),char(4),char(0),char(121),char(0), -char(4),char(0),char(122),char(0),char(4),char(0),char(123),char(0),char(0),char(0),char(37),char(0),char(48),char(0),char(25),char(0),char(9),char(0),char(101),char(0), -char(9),char(0),char(102),char(0),char(25),char(0),char(103),char(0),char(0),char(0),char(35),char(0),char(17),char(0),char(104),char(0),char(17),char(0),char(105),char(0), -char(13),char(0),char(106),char(0),char(13),char(0),char(107),char(0),char(13),char(0),char(108),char(0),char(7),char(0),char(109),char(0),char(7),char(0),char(110),char(0), -char(7),char(0),char(111),char(0),char(7),char(0),char(112),char(0),char(7),char(0),char(113),char(0),char(7),char(0),char(114),char(0),char(7),char(0),char(115),char(0), -char(7),char(0),char(116),char(0),char(4),char(0),char(117),char(0),char(4),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0), -char(4),char(0),char(121),char(0),char(4),char(0),char(122),char(0),char(4),char(0),char(123),char(0),char(0),char(0),char(37),char(0),char(49),char(0),char(2),char(0), -char(50),char(0),char(124),char(0),char(14),char(0),char(125),char(0),char(51),char(0),char(2),char(0),char(52),char(0),char(124),char(0),char(13),char(0),char(125),char(0), -char(53),char(0),char(21),char(0),char(48),char(0),char(126),char(0),char(15),char(0),char(127),char(0),char(13),char(0),char(-128),char(0),char(13),char(0),char(-127),char(0), -char(13),char(0),char(-126),char(0),char(13),char(0),char(-125),char(0),char(13),char(0),char(125),char(0),char(13),char(0),char(-124),char(0),char(13),char(0),char(-123),char(0), -char(13),char(0),char(-122),char(0),char(13),char(0),char(-121),char(0),char(7),char(0),char(-120),char(0),char(7),char(0),char(-119),char(0),char(7),char(0),char(-118),char(0), -char(7),char(0),char(-117),char(0),char(7),char(0),char(-116),char(0),char(7),char(0),char(-115),char(0),char(7),char(0),char(-114),char(0),char(7),char(0),char(-113),char(0), -char(7),char(0),char(-112),char(0),char(4),char(0),char(-111),char(0),char(54),char(0),char(22),char(0),char(47),char(0),char(126),char(0),char(16),char(0),char(127),char(0), -char(14),char(0),char(-128),char(0),char(14),char(0),char(-127),char(0),char(14),char(0),char(-126),char(0),char(14),char(0),char(-125),char(0),char(14),char(0),char(125),char(0), -char(14),char(0),char(-124),char(0),char(14),char(0),char(-123),char(0),char(14),char(0),char(-122),char(0),char(14),char(0),char(-121),char(0),char(8),char(0),char(-120),char(0), -char(8),char(0),char(-119),char(0),char(8),char(0),char(-118),char(0),char(8),char(0),char(-117),char(0),char(8),char(0),char(-116),char(0),char(8),char(0),char(-115),char(0), -char(8),char(0),char(-114),char(0),char(8),char(0),char(-113),char(0),char(8),char(0),char(-112),char(0),char(4),char(0),char(-111),char(0),char(0),char(0),char(37),char(0), -char(55),char(0),char(2),char(0),char(4),char(0),char(-110),char(0),char(4),char(0),char(-109),char(0),char(56),char(0),char(13),char(0),char(53),char(0),char(-108),char(0), -char(53),char(0),char(-107),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-106),char(0),char(4),char(0),char(-105),char(0),char(4),char(0),char(-104),char(0), -char(4),char(0),char(-103),char(0),char(7),char(0),char(-102),char(0),char(7),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),char(4),char(0),char(-99),char(0), -char(7),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0),char(57),char(0),char(13),char(0),char(58),char(0),char(-108),char(0),char(58),char(0),char(-107),char(0), -char(0),char(0),char(35),char(0),char(4),char(0),char(-106),char(0),char(4),char(0),char(-105),char(0),char(4),char(0),char(-104),char(0),char(4),char(0),char(-103),char(0), -char(7),char(0),char(-102),char(0),char(7),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),char(4),char(0),char(-99),char(0),char(7),char(0),char(-98),char(0), -char(4),char(0),char(-97),char(0),char(59),char(0),char(14),char(0),char(54),char(0),char(-108),char(0),char(54),char(0),char(-107),char(0),char(0),char(0),char(35),char(0), -char(4),char(0),char(-106),char(0),char(4),char(0),char(-105),char(0),char(4),char(0),char(-104),char(0),char(4),char(0),char(-103),char(0),char(8),char(0),char(-102),char(0), -char(8),char(0),char(-101),char(0),char(4),char(0),char(-100),char(0),char(4),char(0),char(-99),char(0),char(8),char(0),char(-98),char(0),char(4),char(0),char(-97),char(0), -char(0),char(0),char(-96),char(0),char(60),char(0),char(3),char(0),char(57),char(0),char(-95),char(0),char(13),char(0),char(-94),char(0),char(13),char(0),char(-93),char(0), -char(61),char(0),char(3),char(0),char(59),char(0),char(-95),char(0),char(14),char(0),char(-94),char(0),char(14),char(0),char(-93),char(0),char(62),char(0),char(3),char(0), -char(57),char(0),char(-95),char(0),char(14),char(0),char(-94),char(0),char(14),char(0),char(-93),char(0),char(63),char(0),char(13),char(0),char(57),char(0),char(-95),char(0), -char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0), -char(7),char(0),char(-87),char(0),char(7),char(0),char(-86),char(0),char(7),char(0),char(-85),char(0),char(7),char(0),char(-84),char(0),char(7),char(0),char(-83),char(0), -char(7),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(64),char(0),char(13),char(0),char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0), -char(17),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0),char(7),char(0),char(-87),char(0), -char(7),char(0),char(-86),char(0),char(7),char(0),char(-85),char(0),char(7),char(0),char(-84),char(0),char(7),char(0),char(-83),char(0),char(7),char(0),char(-82),char(0), -char(7),char(0),char(-81),char(0),char(65),char(0),char(14),char(0),char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0), -char(4),char(0),char(-90),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0),char(8),char(0),char(-87),char(0),char(8),char(0),char(-86),char(0), -char(8),char(0),char(-85),char(0),char(8),char(0),char(-84),char(0),char(8),char(0),char(-83),char(0),char(8),char(0),char(-82),char(0),char(8),char(0),char(-81),char(0), -char(0),char(0),char(-80),char(0),char(66),char(0),char(10),char(0),char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0), -char(8),char(0),char(-79),char(0),char(8),char(0),char(-78),char(0),char(8),char(0),char(-77),char(0),char(8),char(0),char(-83),char(0),char(8),char(0),char(-82),char(0), -char(8),char(0),char(-81),char(0),char(8),char(0),char(-76),char(0),char(67),char(0),char(11),char(0),char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0), -char(17),char(0),char(-91),char(0),char(7),char(0),char(-79),char(0),char(7),char(0),char(-78),char(0),char(7),char(0),char(-77),char(0),char(7),char(0),char(-83),char(0), -char(7),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(7),char(0),char(-76),char(0),char(0),char(0),char(21),char(0),char(68),char(0),char(9),char(0), -char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0),char(17),char(0),char(-91),char(0),char(13),char(0),char(-75),char(0),char(13),char(0),char(-74),char(0), -char(13),char(0),char(-73),char(0),char(13),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0),char(4),char(0),char(-70),char(0),char(69),char(0),char(9),char(0), -char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0),char(14),char(0),char(-75),char(0),char(14),char(0),char(-74),char(0), -char(14),char(0),char(-73),char(0),char(14),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0),char(4),char(0),char(-70),char(0),char(70),char(0),char(5),char(0), -char(68),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(7),char(0),char(-67),char(0),char(7),char(0),char(-66),char(0),char(7),char(0),char(-65),char(0), -char(71),char(0),char(5),char(0),char(69),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(8),char(0),char(-67),char(0),char(8),char(0),char(-66),char(0), -char(8),char(0),char(-65),char(0),char(72),char(0),char(9),char(0),char(57),char(0),char(-95),char(0),char(17),char(0),char(-92),char(0),char(17),char(0),char(-91),char(0), -char(7),char(0),char(-75),char(0),char(7),char(0),char(-74),char(0),char(7),char(0),char(-73),char(0),char(7),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0), -char(4),char(0),char(-70),char(0),char(73),char(0),char(9),char(0),char(59),char(0),char(-95),char(0),char(18),char(0),char(-92),char(0),char(18),char(0),char(-91),char(0), -char(8),char(0),char(-75),char(0),char(8),char(0),char(-74),char(0),char(8),char(0),char(-73),char(0),char(8),char(0),char(-72),char(0),char(4),char(0),char(-71),char(0), -char(4),char(0),char(-70),char(0),char(74),char(0),char(5),char(0),char(56),char(0),char(-95),char(0),char(13),char(0),char(-64),char(0),char(13),char(0),char(-63),char(0), -char(7),char(0),char(-62),char(0),char(0),char(0),char(37),char(0),char(75),char(0),char(4),char(0),char(59),char(0),char(-95),char(0),char(14),char(0),char(-64),char(0), -char(14),char(0),char(-63),char(0),char(8),char(0),char(-62),char(0),char(50),char(0),char(22),char(0),char(8),char(0),char(-61),char(0),char(8),char(0),char(-76),char(0), -char(8),char(0),char(111),char(0),char(8),char(0),char(-60),char(0),char(8),char(0),char(113),char(0),char(8),char(0),char(-59),char(0),char(8),char(0),char(-58),char(0), -char(8),char(0),char(-57),char(0),char(8),char(0),char(-56),char(0),char(8),char(0),char(-55),char(0),char(8),char(0),char(-54),char(0),char(8),char(0),char(-53),char(0), -char(8),char(0),char(-52),char(0),char(8),char(0),char(-51),char(0),char(8),char(0),char(-50),char(0),char(8),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0), -char(4),char(0),char(-47),char(0),char(4),char(0),char(-46),char(0),char(4),char(0),char(-45),char(0),char(4),char(0),char(-44),char(0),char(0),char(0),char(37),char(0), -char(52),char(0),char(22),char(0),char(7),char(0),char(-61),char(0),char(7),char(0),char(-76),char(0),char(7),char(0),char(111),char(0),char(7),char(0),char(-60),char(0), -char(7),char(0),char(113),char(0),char(7),char(0),char(-59),char(0),char(7),char(0),char(-58),char(0),char(7),char(0),char(-57),char(0),char(7),char(0),char(-56),char(0), -char(7),char(0),char(-55),char(0),char(7),char(0),char(-54),char(0),char(7),char(0),char(-53),char(0),char(7),char(0),char(-52),char(0),char(7),char(0),char(-51),char(0), -char(7),char(0),char(-50),char(0),char(7),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0),char(4),char(0),char(-47),char(0),char(4),char(0),char(-46),char(0), -char(4),char(0),char(-45),char(0),char(4),char(0),char(-44),char(0),char(0),char(0),char(37),char(0),char(76),char(0),char(4),char(0),char(7),char(0),char(-43),char(0), -char(7),char(0),char(-42),char(0),char(7),char(0),char(-41),char(0),char(4),char(0),char(79),char(0),char(77),char(0),char(10),char(0),char(76),char(0),char(-40),char(0), -char(13),char(0),char(-39),char(0),char(13),char(0),char(-38),char(0),char(13),char(0),char(-37),char(0),char(13),char(0),char(-36),char(0),char(13),char(0),char(-35),char(0), -char(7),char(0),char(-120),char(0),char(7),char(0),char(-34),char(0),char(4),char(0),char(-33),char(0),char(4),char(0),char(53),char(0),char(78),char(0),char(4),char(0), -char(76),char(0),char(-40),char(0),char(4),char(0),char(-32),char(0),char(7),char(0),char(-31),char(0),char(4),char(0),char(-30),char(0),char(79),char(0),char(4),char(0), -char(13),char(0),char(-35),char(0),char(76),char(0),char(-40),char(0),char(4),char(0),char(-29),char(0),char(7),char(0),char(-28),char(0),char(80),char(0),char(7),char(0), -char(13),char(0),char(-27),char(0),char(76),char(0),char(-40),char(0),char(4),char(0),char(-26),char(0),char(7),char(0),char(-25),char(0),char(7),char(0),char(-24),char(0), -char(7),char(0),char(-23),char(0),char(4),char(0),char(53),char(0),char(81),char(0),char(6),char(0),char(15),char(0),char(-22),char(0),char(13),char(0),char(-24),char(0), -char(13),char(0),char(-21),char(0),char(58),char(0),char(-20),char(0),char(4),char(0),char(-19),char(0),char(7),char(0),char(-23),char(0),char(82),char(0),char(26),char(0), -char(4),char(0),char(-18),char(0),char(7),char(0),char(-17),char(0),char(7),char(0),char(-76),char(0),char(7),char(0),char(-16),char(0),char(7),char(0),char(-15),char(0), -char(7),char(0),char(-14),char(0),char(7),char(0),char(-13),char(0),char(7),char(0),char(-12),char(0),char(7),char(0),char(-11),char(0),char(7),char(0),char(-10),char(0), -char(7),char(0),char(-9),char(0),char(7),char(0),char(-8),char(0),char(7),char(0),char(-7),char(0),char(7),char(0),char(-6),char(0),char(7),char(0),char(-5),char(0), -char(7),char(0),char(-4),char(0),char(7),char(0),char(-3),char(0),char(7),char(0),char(-2),char(0),char(7),char(0),char(-1),char(0),char(7),char(0),char(0),char(1), -char(7),char(0),char(1),char(1),char(4),char(0),char(2),char(1),char(4),char(0),char(3),char(1),char(4),char(0),char(4),char(1),char(4),char(0),char(5),char(1), -char(4),char(0),char(118),char(0),char(83),char(0),char(12),char(0),char(15),char(0),char(6),char(1),char(15),char(0),char(7),char(1),char(15),char(0),char(8),char(1), -char(13),char(0),char(9),char(1),char(13),char(0),char(10),char(1),char(7),char(0),char(11),char(1),char(4),char(0),char(12),char(1),char(4),char(0),char(13),char(1), -char(4),char(0),char(14),char(1),char(4),char(0),char(15),char(1),char(7),char(0),char(-25),char(0),char(4),char(0),char(53),char(0),char(84),char(0),char(27),char(0), -char(17),char(0),char(16),char(1),char(15),char(0),char(17),char(1),char(15),char(0),char(18),char(1),char(13),char(0),char(9),char(1),char(13),char(0),char(19),char(1), -char(13),char(0),char(20),char(1),char(13),char(0),char(21),char(1),char(13),char(0),char(22),char(1),char(13),char(0),char(23),char(1),char(4),char(0),char(24),char(1), -char(7),char(0),char(25),char(1),char(4),char(0),char(26),char(1),char(4),char(0),char(27),char(1),char(4),char(0),char(28),char(1),char(7),char(0),char(29),char(1), -char(7),char(0),char(30),char(1),char(4),char(0),char(31),char(1),char(4),char(0),char(32),char(1),char(7),char(0),char(33),char(1),char(7),char(0),char(34),char(1), -char(7),char(0),char(35),char(1),char(7),char(0),char(36),char(1),char(7),char(0),char(37),char(1),char(7),char(0),char(38),char(1),char(4),char(0),char(39),char(1), -char(4),char(0),char(40),char(1),char(4),char(0),char(41),char(1),char(85),char(0),char(12),char(0),char(9),char(0),char(42),char(1),char(9),char(0),char(43),char(1), -char(13),char(0),char(44),char(1),char(7),char(0),char(45),char(1),char(7),char(0),char(-57),char(0),char(7),char(0),char(46),char(1),char(4),char(0),char(47),char(1), -char(13),char(0),char(48),char(1),char(4),char(0),char(49),char(1),char(4),char(0),char(50),char(1),char(4),char(0),char(51),char(1),char(4),char(0),char(53),char(0), -char(86),char(0),char(19),char(0),char(48),char(0),char(126),char(0),char(83),char(0),char(52),char(1),char(76),char(0),char(53),char(1),char(77),char(0),char(54),char(1), -char(78),char(0),char(55),char(1),char(79),char(0),char(56),char(1),char(80),char(0),char(57),char(1),char(81),char(0),char(58),char(1),char(84),char(0),char(59),char(1), -char(85),char(0),char(60),char(1),char(4),char(0),char(61),char(1),char(4),char(0),char(27),char(1),char(4),char(0),char(62),char(1),char(4),char(0),char(63),char(1), -char(4),char(0),char(64),char(1),char(4),char(0),char(65),char(1),char(4),char(0),char(66),char(1),char(4),char(0),char(67),char(1),char(82),char(0),char(68),char(1), -}; +char(104),char(1),char(112),char(0),char(-24),char(1),char(-32),char(2),char(-120),char(1),char(-48),char(0),char(112),char(0),char(0),char(0),char(83),char(84),char(82),char(67), +char(84),char(0),char(0),char(0),char(10),char(0),char(3),char(0),char(4),char(0),char(0),char(0),char(4),char(0),char(1),char(0),char(9),char(0),char(2),char(0), +char(11),char(0),char(3),char(0),char(10),char(0),char(3),char(0),char(10),char(0),char(4),char(0),char(10),char(0),char(5),char(0),char(12),char(0),char(2),char(0), +char(9),char(0),char(6),char(0),char(9),char(0),char(7),char(0),char(13),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(14),char(0),char(1),char(0), +char(8),char(0),char(8),char(0),char(15),char(0),char(1),char(0),char(7),char(0),char(8),char(0),char(16),char(0),char(1),char(0),char(8),char(0),char(8),char(0), +char(17),char(0),char(1),char(0),char(13),char(0),char(9),char(0),char(18),char(0),char(1),char(0),char(14),char(0),char(9),char(0),char(19),char(0),char(2),char(0), +char(17),char(0),char(10),char(0),char(13),char(0),char(11),char(0),char(20),char(0),char(2),char(0),char(18),char(0),char(10),char(0),char(14),char(0),char(11),char(0), +char(21),char(0),char(4),char(0),char(4),char(0),char(12),char(0),char(4),char(0),char(13),char(0),char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0), +char(22),char(0),char(6),char(0),char(13),char(0),char(16),char(0),char(13),char(0),char(17),char(0),char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0), +char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(23),char(0),char(6),char(0),char(14),char(0),char(16),char(0),char(14),char(0),char(17),char(0), +char(4),char(0),char(18),char(0),char(4),char(0),char(19),char(0),char(4),char(0),char(20),char(0),char(0),char(0),char(21),char(0),char(24),char(0),char(3),char(0), +char(2),char(0),char(14),char(0),char(2),char(0),char(15),char(0),char(4),char(0),char(22),char(0),char(25),char(0),char(12),char(0),char(13),char(0),char(23),char(0), +char(13),char(0),char(24),char(0),char(13),char(0),char(25),char(0),char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0), +char(4),char(0),char(29),char(0),char(22),char(0),char(30),char(0),char(24),char(0),char(31),char(0),char(21),char(0),char(32),char(0),char(4),char(0),char(33),char(0), +char(4),char(0),char(34),char(0),char(26),char(0),char(12),char(0),char(14),char(0),char(23),char(0),char(14),char(0),char(24),char(0),char(14),char(0),char(25),char(0), +char(4),char(0),char(26),char(0),char(4),char(0),char(27),char(0),char(4),char(0),char(28),char(0),char(4),char(0),char(29),char(0),char(23),char(0),char(30),char(0), +char(24),char(0),char(31),char(0),char(4),char(0),char(33),char(0),char(4),char(0),char(34),char(0),char(21),char(0),char(32),char(0),char(27),char(0),char(3),char(0), +char(0),char(0),char(35),char(0),char(4),char(0),char(36),char(0),char(0),char(0),char(37),char(0),char(28),char(0),char(5),char(0),char(27),char(0),char(38),char(0), +char(13),char(0),char(39),char(0),char(13),char(0),char(40),char(0),char(7),char(0),char(41),char(0),char(0),char(0),char(21),char(0),char(29),char(0),char(5),char(0), +char(27),char(0),char(38),char(0),char(13),char(0),char(39),char(0),char(13),char(0),char(42),char(0),char(7),char(0),char(43),char(0),char(4),char(0),char(44),char(0), +char(30),char(0),char(2),char(0),char(13),char(0),char(45),char(0),char(7),char(0),char(46),char(0),char(31),char(0),char(4),char(0),char(29),char(0),char(47),char(0), +char(30),char(0),char(48),char(0),char(4),char(0),char(49),char(0),char(0),char(0),char(37),char(0),char(32),char(0),char(1),char(0),char(4),char(0),char(50),char(0), +char(33),char(0),char(2),char(0),char(2),char(0),char(50),char(0),char(0),char(0),char(51),char(0),char(34),char(0),char(2),char(0),char(2),char(0),char(52),char(0), +char(0),char(0),char(51),char(0),char(35),char(0),char(2),char(0),char(0),char(0),char(52),char(0),char(0),char(0),char(53),char(0),char(36),char(0),char(8),char(0), +char(13),char(0),char(54),char(0),char(14),char(0),char(55),char(0),char(32),char(0),char(56),char(0),char(34),char(0),char(57),char(0),char(35),char(0),char(58),char(0), +char(33),char(0),char(59),char(0),char(4),char(0),char(60),char(0),char(4),char(0),char(61),char(0),char(37),char(0),char(4),char(0),char(36),char(0),char(62),char(0), +char(13),char(0),char(63),char(0),char(4),char(0),char(64),char(0),char(0),char(0),char(37),char(0),char(38),char(0),char(7),char(0),char(27),char(0),char(38),char(0), +char(37),char(0),char(65),char(0),char(25),char(0),char(66),char(0),char(26),char(0),char(67),char(0),char(39),char(0),char(68),char(0),char(7),char(0),char(43),char(0), +char(0),char(0),char(69),char(0),char(40),char(0),char(2),char(0),char(38),char(0),char(70),char(0),char(13),char(0),char(39),char(0),char(41),char(0),char(4),char(0), +char(19),char(0),char(71),char(0),char(27),char(0),char(72),char(0),char(4),char(0),char(73),char(0),char(7),char(0),char(74),char(0),char(42),char(0),char(4),char(0), +char(27),char(0),char(38),char(0),char(41),char(0),char(75),char(0),char(4),char(0),char(76),char(0),char(7),char(0),char(43),char(0),char(43),char(0),char(3),char(0), +char(29),char(0),char(47),char(0),char(4),char(0),char(77),char(0),char(0),char(0),char(37),char(0),char(44),char(0),char(3),char(0),char(29),char(0),char(47),char(0), +char(4),char(0),char(78),char(0),char(0),char(0),char(37),char(0),char(45),char(0),char(3),char(0),char(29),char(0),char(47),char(0),char(4),char(0),char(77),char(0), +char(0),char(0),char(37),char(0),char(46),char(0),char(4),char(0),char(4),char(0),char(79),char(0),char(7),char(0),char(80),char(0),char(7),char(0),char(81),char(0), +char(7),char(0),char(82),char(0),char(39),char(0),char(14),char(0),char(4),char(0),char(83),char(0),char(4),char(0),char(84),char(0),char(46),char(0),char(85),char(0), +char(4),char(0),char(86),char(0),char(7),char(0),char(87),char(0),char(7),char(0),char(88),char(0),char(7),char(0),char(89),char(0),char(7),char(0),char(90),char(0), +char(7),char(0),char(91),char(0),char(4),char(0),char(92),char(0),char(4),char(0),char(93),char(0),char(4),char(0),char(94),char(0),char(4),char(0),char(95),char(0), +char(0),char(0),char(37),char(0),char(47),char(0),char(5),char(0),char(27),char(0),char(38),char(0),char(37),char(0),char(65),char(0),char(13),char(0),char(39),char(0), +char(7),char(0),char(43),char(0),char(4),char(0),char(96),char(0),char(48),char(0),char(5),char(0),char(29),char(0),char(47),char(0),char(13),char(0),char(97),char(0), +char(14),char(0),char(98),char(0),char(4),char(0),char(99),char(0),char(0),char(0),char(100),char(0),char(49),char(0),char(27),char(0),char(9),char(0),char(101),char(0), +char(9),char(0),char(102),char(0),char(27),char(0),char(103),char(0),char(0),char(0),char(35),char(0),char(20),char(0),char(104),char(0),char(20),char(0),char(105),char(0), +char(14),char(0),char(106),char(0),char(14),char(0),char(107),char(0),char(14),char(0),char(108),char(0),char(8),char(0),char(109),char(0),char(8),char(0),char(110),char(0), +char(8),char(0),char(111),char(0),char(8),char(0),char(112),char(0),char(8),char(0),char(113),char(0),char(8),char(0),char(114),char(0),char(8),char(0),char(115),char(0), +char(8),char(0),char(116),char(0),char(8),char(0),char(117),char(0),char(8),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0), +char(4),char(0),char(121),char(0),char(4),char(0),char(122),char(0),char(4),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0), +char(0),char(0),char(37),char(0),char(50),char(0),char(27),char(0),char(9),char(0),char(101),char(0),char(9),char(0),char(102),char(0),char(27),char(0),char(103),char(0), +char(0),char(0),char(35),char(0),char(19),char(0),char(104),char(0),char(19),char(0),char(105),char(0),char(13),char(0),char(106),char(0),char(13),char(0),char(107),char(0), +char(13),char(0),char(108),char(0),char(7),char(0),char(109),char(0),char(7),char(0),char(110),char(0),char(7),char(0),char(111),char(0),char(7),char(0),char(112),char(0), +char(7),char(0),char(113),char(0),char(7),char(0),char(114),char(0),char(7),char(0),char(115),char(0),char(7),char(0),char(116),char(0),char(7),char(0),char(117),char(0), +char(7),char(0),char(118),char(0),char(4),char(0),char(119),char(0),char(4),char(0),char(120),char(0),char(4),char(0),char(121),char(0),char(4),char(0),char(122),char(0), +char(4),char(0),char(123),char(0),char(4),char(0),char(124),char(0),char(4),char(0),char(125),char(0),char(0),char(0),char(37),char(0),char(51),char(0),char(22),char(0), +char(8),char(0),char(126),char(0),char(8),char(0),char(127),char(0),char(8),char(0),char(111),char(0),char(8),char(0),char(-128),char(0),char(8),char(0),char(115),char(0), +char(8),char(0),char(-127),char(0),char(8),char(0),char(-126),char(0),char(8),char(0),char(-125),char(0),char(8),char(0),char(-124),char(0),char(8),char(0),char(-123),char(0), +char(8),char(0),char(-122),char(0),char(8),char(0),char(-121),char(0),char(8),char(0),char(-120),char(0),char(8),char(0),char(-119),char(0),char(8),char(0),char(-118),char(0), +char(8),char(0),char(-117),char(0),char(4),char(0),char(-116),char(0),char(4),char(0),char(-115),char(0),char(4),char(0),char(-114),char(0),char(4),char(0),char(-113),char(0), +char(4),char(0),char(-112),char(0),char(0),char(0),char(37),char(0),char(52),char(0),char(22),char(0),char(7),char(0),char(126),char(0),char(7),char(0),char(127),char(0), +char(7),char(0),char(111),char(0),char(7),char(0),char(-128),char(0),char(7),char(0),char(115),char(0),char(7),char(0),char(-127),char(0),char(7),char(0),char(-126),char(0), +char(7),char(0),char(-125),char(0),char(7),char(0),char(-124),char(0),char(7),char(0),char(-123),char(0),char(7),char(0),char(-122),char(0),char(7),char(0),char(-121),char(0), +char(7),char(0),char(-120),char(0),char(7),char(0),char(-119),char(0),char(7),char(0),char(-118),char(0),char(7),char(0),char(-117),char(0),char(4),char(0),char(-116),char(0), +char(4),char(0),char(-115),char(0),char(4),char(0),char(-114),char(0),char(4),char(0),char(-113),char(0),char(4),char(0),char(-112),char(0),char(0),char(0),char(37),char(0), +char(53),char(0),char(2),char(0),char(51),char(0),char(-111),char(0),char(14),char(0),char(-110),char(0),char(54),char(0),char(2),char(0),char(52),char(0),char(-111),char(0), +char(13),char(0),char(-110),char(0),char(55),char(0),char(21),char(0),char(50),char(0),char(-109),char(0),char(17),char(0),char(-108),char(0),char(13),char(0),char(-107),char(0), +char(13),char(0),char(-106),char(0),char(13),char(0),char(-105),char(0),char(13),char(0),char(-104),char(0),char(13),char(0),char(-110),char(0),char(13),char(0),char(-103),char(0), +char(13),char(0),char(-102),char(0),char(13),char(0),char(-101),char(0),char(13),char(0),char(-100),char(0),char(7),char(0),char(-99),char(0),char(7),char(0),char(-98),char(0), +char(7),char(0),char(-97),char(0),char(7),char(0),char(-96),char(0),char(7),char(0),char(-95),char(0),char(7),char(0),char(-94),char(0),char(7),char(0),char(-93),char(0), +char(7),char(0),char(-92),char(0),char(7),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0),char(56),char(0),char(22),char(0),char(49),char(0),char(-109),char(0), +char(18),char(0),char(-108),char(0),char(14),char(0),char(-107),char(0),char(14),char(0),char(-106),char(0),char(14),char(0),char(-105),char(0),char(14),char(0),char(-104),char(0), +char(14),char(0),char(-110),char(0),char(14),char(0),char(-103),char(0),char(14),char(0),char(-102),char(0),char(14),char(0),char(-101),char(0),char(14),char(0),char(-100),char(0), +char(8),char(0),char(-99),char(0),char(8),char(0),char(-98),char(0),char(8),char(0),char(-97),char(0),char(8),char(0),char(-96),char(0),char(8),char(0),char(-95),char(0), +char(8),char(0),char(-94),char(0),char(8),char(0),char(-93),char(0),char(8),char(0),char(-92),char(0),char(8),char(0),char(-91),char(0),char(4),char(0),char(-90),char(0), +char(0),char(0),char(37),char(0),char(57),char(0),char(2),char(0),char(4),char(0),char(-89),char(0),char(4),char(0),char(-88),char(0),char(58),char(0),char(13),char(0), +char(55),char(0),char(-87),char(0),char(55),char(0),char(-86),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-85),char(0),char(4),char(0),char(-84),char(0), +char(4),char(0),char(-83),char(0),char(4),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(7),char(0),char(-80),char(0),char(4),char(0),char(-79),char(0), +char(4),char(0),char(-78),char(0),char(7),char(0),char(-77),char(0),char(4),char(0),char(-76),char(0),char(59),char(0),char(13),char(0),char(60),char(0),char(-87),char(0), +char(60),char(0),char(-86),char(0),char(0),char(0),char(35),char(0),char(4),char(0),char(-85),char(0),char(4),char(0),char(-84),char(0),char(4),char(0),char(-83),char(0), +char(4),char(0),char(-82),char(0),char(7),char(0),char(-81),char(0),char(7),char(0),char(-80),char(0),char(4),char(0),char(-79),char(0),char(4),char(0),char(-78),char(0), +char(7),char(0),char(-77),char(0),char(4),char(0),char(-76),char(0),char(61),char(0),char(14),char(0),char(56),char(0),char(-87),char(0),char(56),char(0),char(-86),char(0), +char(0),char(0),char(35),char(0),char(4),char(0),char(-85),char(0),char(4),char(0),char(-84),char(0),char(4),char(0),char(-83),char(0),char(4),char(0),char(-82),char(0), +char(8),char(0),char(-81),char(0),char(8),char(0),char(-80),char(0),char(4),char(0),char(-79),char(0),char(4),char(0),char(-78),char(0),char(8),char(0),char(-77),char(0), +char(4),char(0),char(-76),char(0),char(0),char(0),char(-75),char(0),char(62),char(0),char(3),char(0),char(59),char(0),char(-74),char(0),char(13),char(0),char(-73),char(0), +char(13),char(0),char(-72),char(0),char(63),char(0),char(3),char(0),char(61),char(0),char(-74),char(0),char(14),char(0),char(-73),char(0),char(14),char(0),char(-72),char(0), +char(64),char(0),char(3),char(0),char(59),char(0),char(-74),char(0),char(14),char(0),char(-73),char(0),char(14),char(0),char(-72),char(0),char(65),char(0),char(13),char(0), +char(59),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0),char(4),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0), +char(4),char(0),char(-67),char(0),char(7),char(0),char(-66),char(0),char(7),char(0),char(-65),char(0),char(7),char(0),char(-64),char(0),char(7),char(0),char(-63),char(0), +char(7),char(0),char(-62),char(0),char(7),char(0),char(-61),char(0),char(7),char(0),char(-60),char(0),char(66),char(0),char(13),char(0),char(59),char(0),char(-74),char(0), +char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0),char(4),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(4),char(0),char(-67),char(0), +char(7),char(0),char(-66),char(0),char(7),char(0),char(-65),char(0),char(7),char(0),char(-64),char(0),char(7),char(0),char(-63),char(0),char(7),char(0),char(-62),char(0), +char(7),char(0),char(-61),char(0),char(7),char(0),char(-60),char(0),char(67),char(0),char(14),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0), +char(20),char(0),char(-70),char(0),char(4),char(0),char(-69),char(0),char(4),char(0),char(-68),char(0),char(4),char(0),char(-67),char(0),char(8),char(0),char(-66),char(0), +char(8),char(0),char(-65),char(0),char(8),char(0),char(-64),char(0),char(8),char(0),char(-63),char(0),char(8),char(0),char(-62),char(0),char(8),char(0),char(-61),char(0), +char(8),char(0),char(-60),char(0),char(0),char(0),char(-59),char(0),char(68),char(0),char(10),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0), +char(20),char(0),char(-70),char(0),char(8),char(0),char(-58),char(0),char(8),char(0),char(-57),char(0),char(8),char(0),char(-56),char(0),char(8),char(0),char(-62),char(0), +char(8),char(0),char(-61),char(0),char(8),char(0),char(-60),char(0),char(8),char(0),char(127),char(0),char(69),char(0),char(11),char(0),char(59),char(0),char(-74),char(0), +char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0),char(7),char(0),char(-58),char(0),char(7),char(0),char(-57),char(0),char(7),char(0),char(-56),char(0), +char(7),char(0),char(-62),char(0),char(7),char(0),char(-61),char(0),char(7),char(0),char(-60),char(0),char(7),char(0),char(127),char(0),char(0),char(0),char(21),char(0), +char(70),char(0),char(9),char(0),char(59),char(0),char(-74),char(0),char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0),char(13),char(0),char(-55),char(0), +char(13),char(0),char(-54),char(0),char(13),char(0),char(-53),char(0),char(13),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0),char(4),char(0),char(-50),char(0), +char(71),char(0),char(9),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0),char(14),char(0),char(-55),char(0), +char(14),char(0),char(-54),char(0),char(14),char(0),char(-53),char(0),char(14),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0),char(4),char(0),char(-50),char(0), +char(72),char(0),char(5),char(0),char(70),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0),char(7),char(0),char(-47),char(0),char(7),char(0),char(-46),char(0), +char(7),char(0),char(-45),char(0),char(73),char(0),char(5),char(0),char(71),char(0),char(-49),char(0),char(4),char(0),char(-48),char(0),char(8),char(0),char(-47),char(0), +char(8),char(0),char(-46),char(0),char(8),char(0),char(-45),char(0),char(74),char(0),char(41),char(0),char(59),char(0),char(-74),char(0),char(19),char(0),char(-71),char(0), +char(19),char(0),char(-70),char(0),char(13),char(0),char(-55),char(0),char(13),char(0),char(-54),char(0),char(13),char(0),char(-44),char(0),char(13),char(0),char(-43),char(0), +char(13),char(0),char(-42),char(0),char(13),char(0),char(-41),char(0),char(13),char(0),char(-40),char(0),char(13),char(0),char(-39),char(0),char(13),char(0),char(-38),char(0), +char(13),char(0),char(-37),char(0),char(13),char(0),char(-36),char(0),char(13),char(0),char(-35),char(0),char(13),char(0),char(-34),char(0),char(0),char(0),char(-33),char(0), +char(0),char(0),char(-32),char(0),char(0),char(0),char(-31),char(0),char(0),char(0),char(-30),char(0),char(0),char(0),char(-29),char(0),char(0),char(0),char(-59),char(0), +char(13),char(0),char(-53),char(0),char(13),char(0),char(-52),char(0),char(13),char(0),char(-28),char(0),char(13),char(0),char(-27),char(0),char(13),char(0),char(-26),char(0), +char(13),char(0),char(-25),char(0),char(13),char(0),char(-24),char(0),char(13),char(0),char(-23),char(0),char(13),char(0),char(-22),char(0),char(13),char(0),char(-21),char(0), +char(13),char(0),char(-20),char(0),char(13),char(0),char(-19),char(0),char(13),char(0),char(-18),char(0),char(0),char(0),char(-17),char(0),char(0),char(0),char(-16),char(0), +char(0),char(0),char(-15),char(0),char(0),char(0),char(-14),char(0),char(0),char(0),char(-13),char(0),char(4),char(0),char(-12),char(0),char(75),char(0),char(41),char(0), +char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0),char(14),char(0),char(-55),char(0),char(14),char(0),char(-54),char(0), +char(14),char(0),char(-44),char(0),char(14),char(0),char(-43),char(0),char(14),char(0),char(-42),char(0),char(14),char(0),char(-41),char(0),char(14),char(0),char(-40),char(0), +char(14),char(0),char(-39),char(0),char(14),char(0),char(-38),char(0),char(14),char(0),char(-37),char(0),char(14),char(0),char(-36),char(0),char(14),char(0),char(-35),char(0), +char(14),char(0),char(-34),char(0),char(0),char(0),char(-33),char(0),char(0),char(0),char(-32),char(0),char(0),char(0),char(-31),char(0),char(0),char(0),char(-30),char(0), +char(0),char(0),char(-29),char(0),char(0),char(0),char(-59),char(0),char(14),char(0),char(-53),char(0),char(14),char(0),char(-52),char(0),char(14),char(0),char(-28),char(0), +char(14),char(0),char(-27),char(0),char(14),char(0),char(-26),char(0),char(14),char(0),char(-25),char(0),char(14),char(0),char(-24),char(0),char(14),char(0),char(-23),char(0), +char(14),char(0),char(-22),char(0),char(14),char(0),char(-21),char(0),char(14),char(0),char(-20),char(0),char(14),char(0),char(-19),char(0),char(14),char(0),char(-18),char(0), +char(0),char(0),char(-17),char(0),char(0),char(0),char(-16),char(0),char(0),char(0),char(-15),char(0),char(0),char(0),char(-14),char(0),char(0),char(0),char(-13),char(0), +char(4),char(0),char(-12),char(0),char(76),char(0),char(9),char(0),char(59),char(0),char(-74),char(0),char(19),char(0),char(-71),char(0),char(19),char(0),char(-70),char(0), +char(7),char(0),char(-55),char(0),char(7),char(0),char(-54),char(0),char(7),char(0),char(-53),char(0),char(7),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0), +char(4),char(0),char(-50),char(0),char(77),char(0),char(9),char(0),char(61),char(0),char(-74),char(0),char(20),char(0),char(-71),char(0),char(20),char(0),char(-70),char(0), +char(8),char(0),char(-55),char(0),char(8),char(0),char(-54),char(0),char(8),char(0),char(-53),char(0),char(8),char(0),char(-52),char(0),char(4),char(0),char(-51),char(0), +char(4),char(0),char(-50),char(0),char(78),char(0),char(5),char(0),char(58),char(0),char(-74),char(0),char(13),char(0),char(-11),char(0),char(13),char(0),char(-10),char(0), +char(7),char(0),char(-9),char(0),char(0),char(0),char(37),char(0),char(79),char(0),char(4),char(0),char(61),char(0),char(-74),char(0),char(14),char(0),char(-11),char(0), +char(14),char(0),char(-10),char(0),char(8),char(0),char(-9),char(0),char(80),char(0),char(4),char(0),char(7),char(0),char(-8),char(0),char(7),char(0),char(-7),char(0), +char(7),char(0),char(-6),char(0),char(4),char(0),char(79),char(0),char(81),char(0),char(10),char(0),char(80),char(0),char(-5),char(0),char(13),char(0),char(-4),char(0), +char(13),char(0),char(-3),char(0),char(13),char(0),char(-2),char(0),char(13),char(0),char(-1),char(0),char(13),char(0),char(0),char(1),char(7),char(0),char(-99),char(0), +char(7),char(0),char(1),char(1),char(4),char(0),char(2),char(1),char(4),char(0),char(53),char(0),char(82),char(0),char(4),char(0),char(80),char(0),char(-5),char(0), +char(4),char(0),char(3),char(1),char(7),char(0),char(4),char(1),char(4),char(0),char(5),char(1),char(83),char(0),char(4),char(0),char(13),char(0),char(0),char(1), +char(80),char(0),char(-5),char(0),char(4),char(0),char(6),char(1),char(7),char(0),char(7),char(1),char(84),char(0),char(7),char(0),char(13),char(0),char(8),char(1), +char(80),char(0),char(-5),char(0),char(4),char(0),char(9),char(1),char(7),char(0),char(10),char(1),char(7),char(0),char(11),char(1),char(7),char(0),char(12),char(1), +char(4),char(0),char(53),char(0),char(85),char(0),char(6),char(0),char(17),char(0),char(13),char(1),char(13),char(0),char(11),char(1),char(13),char(0),char(14),char(1), +char(60),char(0),char(15),char(1),char(4),char(0),char(16),char(1),char(7),char(0),char(12),char(1),char(86),char(0),char(26),char(0),char(4),char(0),char(17),char(1), +char(7),char(0),char(18),char(1),char(7),char(0),char(127),char(0),char(7),char(0),char(19),char(1),char(7),char(0),char(20),char(1),char(7),char(0),char(21),char(1), +char(7),char(0),char(22),char(1),char(7),char(0),char(23),char(1),char(7),char(0),char(24),char(1),char(7),char(0),char(25),char(1),char(7),char(0),char(26),char(1), +char(7),char(0),char(27),char(1),char(7),char(0),char(28),char(1),char(7),char(0),char(29),char(1),char(7),char(0),char(30),char(1),char(7),char(0),char(31),char(1), +char(7),char(0),char(32),char(1),char(7),char(0),char(33),char(1),char(7),char(0),char(34),char(1),char(7),char(0),char(35),char(1),char(7),char(0),char(36),char(1), +char(4),char(0),char(37),char(1),char(4),char(0),char(38),char(1),char(4),char(0),char(39),char(1),char(4),char(0),char(40),char(1),char(4),char(0),char(120),char(0), +char(87),char(0),char(12),char(0),char(17),char(0),char(41),char(1),char(17),char(0),char(42),char(1),char(17),char(0),char(43),char(1),char(13),char(0),char(44),char(1), +char(13),char(0),char(45),char(1),char(7),char(0),char(46),char(1),char(4),char(0),char(47),char(1),char(4),char(0),char(48),char(1),char(4),char(0),char(49),char(1), +char(4),char(0),char(50),char(1),char(7),char(0),char(10),char(1),char(4),char(0),char(53),char(0),char(88),char(0),char(27),char(0),char(19),char(0),char(51),char(1), +char(17),char(0),char(52),char(1),char(17),char(0),char(53),char(1),char(13),char(0),char(44),char(1),char(13),char(0),char(54),char(1),char(13),char(0),char(55),char(1), +char(13),char(0),char(56),char(1),char(13),char(0),char(57),char(1),char(13),char(0),char(58),char(1),char(4),char(0),char(59),char(1),char(7),char(0),char(60),char(1), +char(4),char(0),char(61),char(1),char(4),char(0),char(62),char(1),char(4),char(0),char(63),char(1),char(7),char(0),char(64),char(1),char(7),char(0),char(65),char(1), +char(4),char(0),char(66),char(1),char(4),char(0),char(67),char(1),char(7),char(0),char(68),char(1),char(7),char(0),char(69),char(1),char(7),char(0),char(70),char(1), +char(7),char(0),char(71),char(1),char(7),char(0),char(72),char(1),char(7),char(0),char(73),char(1),char(4),char(0),char(74),char(1),char(4),char(0),char(75),char(1), +char(4),char(0),char(76),char(1),char(89),char(0),char(12),char(0),char(9),char(0),char(77),char(1),char(9),char(0),char(78),char(1),char(13),char(0),char(79),char(1), +char(7),char(0),char(80),char(1),char(7),char(0),char(-125),char(0),char(7),char(0),char(81),char(1),char(4),char(0),char(82),char(1),char(13),char(0),char(83),char(1), +char(4),char(0),char(84),char(1),char(4),char(0),char(85),char(1),char(4),char(0),char(86),char(1),char(4),char(0),char(53),char(0),char(90),char(0),char(19),char(0), +char(50),char(0),char(-109),char(0),char(87),char(0),char(87),char(1),char(80),char(0),char(88),char(1),char(81),char(0),char(89),char(1),char(82),char(0),char(90),char(1), +char(83),char(0),char(91),char(1),char(84),char(0),char(92),char(1),char(85),char(0),char(93),char(1),char(88),char(0),char(94),char(1),char(89),char(0),char(95),char(1), +char(4),char(0),char(96),char(1),char(4),char(0),char(62),char(1),char(4),char(0),char(97),char(1),char(4),char(0),char(98),char(1),char(4),char(0),char(99),char(1), +char(4),char(0),char(100),char(1),char(4),char(0),char(101),char(1),char(4),char(0),char(102),char(1),char(86),char(0),char(103),char(1),char(91),char(0),char(20),char(0), +char(16),char(0),char(104),char(1),char(14),char(0),char(105),char(1),char(14),char(0),char(106),char(1),char(14),char(0),char(107),char(1),char(14),char(0),char(108),char(1), +char(14),char(0),char(109),char(1),char(8),char(0),char(110),char(1),char(4),char(0),char(111),char(1),char(4),char(0),char(86),char(1),char(4),char(0),char(112),char(1), +char(4),char(0),char(113),char(1),char(8),char(0),char(114),char(1),char(8),char(0),char(115),char(1),char(8),char(0),char(116),char(1),char(8),char(0),char(117),char(1), +char(8),char(0),char(118),char(1),char(0),char(0),char(119),char(1),char(0),char(0),char(120),char(1),char(49),char(0),char(121),char(1),char(0),char(0),char(122),char(1), +char(92),char(0),char(20),char(0),char(15),char(0),char(104),char(1),char(13),char(0),char(105),char(1),char(13),char(0),char(106),char(1),char(13),char(0),char(107),char(1), +char(13),char(0),char(108),char(1),char(13),char(0),char(109),char(1),char(4),char(0),char(112),char(1),char(7),char(0),char(110),char(1),char(4),char(0),char(111),char(1), +char(4),char(0),char(86),char(1),char(7),char(0),char(114),char(1),char(7),char(0),char(115),char(1),char(7),char(0),char(116),char(1),char(4),char(0),char(113),char(1), +char(7),char(0),char(117),char(1),char(7),char(0),char(118),char(1),char(0),char(0),char(119),char(1),char(0),char(0),char(120),char(1),char(50),char(0),char(121),char(1), +char(0),char(0),char(122),char(1),char(93),char(0),char(9),char(0),char(20),char(0),char(123),char(1),char(14),char(0),char(124),char(1),char(8),char(0),char(125),char(1), +char(0),char(0),char(126),char(1),char(91),char(0),char(90),char(1),char(49),char(0),char(127),char(1),char(0),char(0),char(122),char(1),char(4),char(0),char(97),char(1), +char(0),char(0),char(37),char(0),char(94),char(0),char(7),char(0),char(0),char(0),char(126),char(1),char(92),char(0),char(90),char(1),char(50),char(0),char(127),char(1), +char(19),char(0),char(123),char(1),char(13),char(0),char(124),char(1),char(7),char(0),char(125),char(1),char(4),char(0),char(97),char(1),}; int sBulletDNAlen64= sizeof(sBulletDNAstr64); diff --git a/Engine/lib/bullet/src/LinearMath/btSerializer.h b/Engine/lib/bullet/src/LinearMath/btSerializer.h index ff1dc574c..6f03df158 100644 --- a/Engine/lib/bullet/src/LinearMath/btSerializer.h +++ b/Engine/lib/bullet/src/LinearMath/btSerializer.h @@ -4,8 +4,8 @@ Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. @@ -32,12 +32,12 @@ extern int sBulletDNAlen; extern char sBulletDNAstr64[]; extern int sBulletDNAlen64; -SIMD_FORCE_INLINE int btStrLen(const char* str) +SIMD_FORCE_INLINE int btStrLen(const char* str) { - if (!str) + if (!str) return(0); int len = 0; - + while (*str != 0) { str++; @@ -85,7 +85,7 @@ public: virtual void* getUniquePointer(void*oldPtr) = 0; virtual void startSerialization() = 0; - + virtual void finishSerialization() = 0; virtual const char* findNameForPointer(const void* ptr) const = 0; @@ -98,6 +98,9 @@ public: virtual void setSerializationFlags(int flags) = 0; + virtual int getNumChunks() const = 0; + + virtual const btChunk* getChunk(int chunkIndex) const = 0; }; @@ -110,6 +113,8 @@ public: # define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) #endif + +#define BT_MULTIBODY_CODE BT_MAKE_ID('M','B','D','Y') #define BT_SOFTBODY_CODE BT_MAKE_ID('S','B','D','Y') #define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J') #define BT_RIGIDBODY_CODE BT_MAKE_ID('R','B','D','Y') @@ -134,21 +139,46 @@ struct btPointerUid }; }; +struct btBulletSerializedArrays +{ + btBulletSerializedArrays() + { + } + btAlignedObjectArray m_bvhsDouble; + btAlignedObjectArray m_bvhsFloat; + btAlignedObjectArray m_colShapeData; + btAlignedObjectArray m_dynamicWorldInfoDataDouble; + btAlignedObjectArray m_dynamicWorldInfoDataFloat; + btAlignedObjectArray m_rigidBodyDataDouble; + btAlignedObjectArray m_rigidBodyDataFloat; + btAlignedObjectArray m_collisionObjectDataDouble; + btAlignedObjectArray m_collisionObjectDataFloat; + btAlignedObjectArray m_constraintDataFloat; + btAlignedObjectArray m_constraintDataDouble; + btAlignedObjectArray m_constraintData;//for backwards compatibility + btAlignedObjectArray m_softBodyFloatData; + btAlignedObjectArray m_softBodyDoubleData; + +}; + + ///The btDefaultSerializer is the main Bullet serialization class. ///The constructor takes an optional argument for backwards compatibility, it is recommended to leave this empty/zero. class btDefaultSerializer : public btSerializer { +protected: btAlignedObjectArray mTypes; btAlignedObjectArray mStructs; btAlignedObjectArray mTlens; btHashMap mStructReverse; btHashMap mTypeLookup; + + - btHashMap m_chunkP; - + btHashMap m_nameMap; btHashMap m_uniquePointers; @@ -156,6 +186,7 @@ class btDefaultSerializer : public btSerializer int m_totalSize; unsigned char* m_buffer; + bool m_ownsBuffer; int m_currentSize; void* m_dna; int m_dnaLength; @@ -164,10 +195,11 @@ class btDefaultSerializer : public btSerializer btAlignedObjectArray m_chunkPtrs; - + protected: - virtual void* findPointer(void* oldPtr) + + virtual void* findPointer(void* oldPtr) { void** ptr = m_chunkP.find(oldPtr); if (ptr && *ptr) @@ -175,11 +207,11 @@ protected: return 0; } - - void writeDNA() + + virtual void writeDNA() { btChunk* dnaChunk = allocate(m_dnaLength,1); memcpy(dnaChunk->m_oldPtr,m_dna,m_dnaLength); @@ -193,7 +225,7 @@ protected: const int* valuePtr = mTypeLookup.find(key); if (valuePtr) return *valuePtr; - + return -1; } @@ -205,7 +237,7 @@ protected: int littleEndian= 1; littleEndian= ((char*)&littleEndian)[0]; - + m_dna = btAlignedAlloc(dnalen,16); memcpy(m_dna,bdnaOrg,dnalen); @@ -233,16 +265,16 @@ protected: // Parse names if (!littleEndian) *intPtr = btSwapEndian(*intPtr); - + dataLen = *intPtr; - + intPtr++; cp = (char*)intPtr; int i; for ( i=0; i m_skipPointers; - btDefaultSerializer(int totalSize=0) - :m_totalSize(totalSize), + + btDefaultSerializer(int totalSize=0, unsigned char* buffer=0) + :m_uniqueIdGenerator(0), + m_totalSize(totalSize), m_currentSize(0), m_dna(0), m_dnaLength(0), m_serializationFlags(0) { - m_buffer = m_totalSize?(unsigned char*)btAlignedAlloc(totalSize,16):0; - + if (buffer==0) + { + m_buffer = m_totalSize?(unsigned char*)btAlignedAlloc(totalSize,16):0; + m_ownsBuffer = true; + } else + { + m_buffer = buffer; + m_ownsBuffer = false; + } + const bool VOID_IS_8 = ((sizeof(void*)==8)); #ifdef BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES @@ -385,7 +426,7 @@ public: btAssert(0); #endif } - + #else //BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES if (VOID_IS_8) { @@ -395,27 +436,53 @@ public: initDNA((const char*)sBulletDNAstr,sBulletDNAlen); } #endif //BT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES - + } - virtual ~btDefaultSerializer() + virtual ~btDefaultSerializer() { - if (m_buffer) + if (m_buffer && m_ownsBuffer) btAlignedFree(m_buffer); if (m_dna) btAlignedFree(m_dna); } + static int getMemoryDnaSizeInBytes() + { + const bool VOID_IS_8 = ((sizeof(void*) == 8)); + + if (VOID_IS_8) + { + return sBulletDNAlen64; + } + return sBulletDNAlen; + } + static const char* getMemoryDna() + { + const bool VOID_IS_8 = ((sizeof(void*) == 8)); + if (VOID_IS_8) + { + return (const char*)sBulletDNAstr64; + } + return (const char*)sBulletDNAstr; + } + + void insertHeader() + { + writeHeader(m_buffer); + m_currentSize += BT_HEADER_LENGTH; + } + void writeHeader(unsigned char* buffer) const { - + #ifdef BT_USE_DOUBLE_PRECISION memcpy(buffer, "BULLETd", 7); #else memcpy(buffer, "BULLETf", 7); #endif //BT_USE_DOUBLE_PRECISION - + int littleEndian= 1; littleEndian= ((char*)&littleEndian)[0]; @@ -429,7 +496,7 @@ public: if (littleEndian) { - buffer[8]='v'; + buffer[8]='v'; } else { buffer[8]='V'; @@ -438,7 +505,7 @@ public: buffer[9] = '2'; buffer[10] = '8'; - buffer[11] = '2'; + buffer[11] = '5'; } @@ -450,7 +517,7 @@ public: unsigned char* buffer = internalAlloc(BT_HEADER_LENGTH); writeHeader(buffer); } - + } virtual void finishSerialization() @@ -486,6 +553,7 @@ public: mTlens.clear(); mStructReverse.clear(); mTypeLookup.clear(); + m_skipPointers.clear(); m_chunkP.clear(); m_nameMap.clear(); m_uniquePointers.clear(); @@ -494,6 +562,7 @@ public: virtual void* getUniquePointer(void*oldPtr) { + btAssert(m_uniqueIdGenerator >= 0); if (!oldPtr) return 0; @@ -502,8 +571,15 @@ public: { return uptr->m_ptr; } + + void** ptr2 = m_skipPointers[oldPtr]; + if (ptr2) + { + return 0; + } + m_uniqueIdGenerator++; - + btPointerUid uid; uid.m_uniqueIds[0] = m_uniqueIdGenerator; uid.m_uniqueIds[1] = m_uniqueIdGenerator; @@ -530,17 +606,17 @@ public: } chunk->m_dna_nr = getReverseType(structType); - + chunk->m_chunkCode = chunkCode; - + void* uniquePtr = getUniquePointer(oldPtr); - + m_chunkP.insert(oldPtr,uniquePtr);//chunk->m_oldPtr); chunk->m_oldPtr = uniquePtr;//oldPtr; - + } - + virtual unsigned char* internalAlloc(size_t size) { unsigned char* ptr = 0; @@ -558,7 +634,7 @@ public: return ptr; } - + virtual btChunk* allocate(size_t size, int numElements) { @@ -566,15 +642,15 @@ public: unsigned char* ptr = internalAlloc(int(size)*numElements+sizeof(btChunk)); unsigned char* data = ptr + sizeof(btChunk); - + btChunk* chunk = (btChunk*)ptr; chunk->m_chunkCode = 0; chunk->m_oldPtr = data; chunk->m_length = int(size)*numElements; chunk->m_number = numElements; - + m_chunkPtrs.push_back(chunk); - + return chunk; } @@ -631,9 +707,202 @@ public: { m_serializationFlags = flags; } + int getNumChunks() const + { + return m_chunkPtrs.size(); + } + const btChunk* getChunk(int chunkIndex) const + { + return m_chunkPtrs[chunkIndex]; + } }; +///In general it is best to use btDefaultSerializer, +///in particular when writing the data to disk or sending it over the network. +///The btInMemorySerializer is experimental and only suitable in a few cases. +///The btInMemorySerializer takes a shortcut and can be useful to create a deep-copy +///of objects. There will be a demo on how to use the btInMemorySerializer. +#ifdef ENABLE_INMEMORY_SERIALIZER + +struct btInMemorySerializer : public btDefaultSerializer +{ + btHashMap m_uid2ChunkPtr; + btHashMap m_orgPtr2UniqueDataPtr; + btHashMap m_names2Ptr; + + + btBulletSerializedArrays m_arrays; + + btInMemorySerializer(int totalSize=0, unsigned char* buffer=0) + :btDefaultSerializer(totalSize,buffer) + { + + } + + virtual void startSerialization() + { + m_uid2ChunkPtr.clear(); + //todo: m_arrays.clear(); + btDefaultSerializer::startSerialization(); + } + + + + btChunk* findChunkFromUniquePointer(void* uniquePointer) + { + btChunk** chkPtr = m_uid2ChunkPtr[uniquePointer]; + if (chkPtr) + { + return *chkPtr; + } + return 0; + } + + virtual void registerNameForPointer(const void* ptr, const char* name) + { + btDefaultSerializer::registerNameForPointer(ptr,name); + m_names2Ptr.insert(name,ptr); + } + + virtual void finishSerialization() + { + } + + virtual void* getUniquePointer(void*oldPtr) + { + if (oldPtr==0) + return 0; + + // void* uniquePtr = getUniquePointer(oldPtr); + btChunk* chunk = findChunkFromUniquePointer(oldPtr); + if (chunk) + { + return chunk->m_oldPtr; + } else + { + const char* n = (const char*) oldPtr; + const void** ptr = m_names2Ptr[n]; + if (ptr) + { + return oldPtr; + } else + { + void** ptr2 = m_skipPointers[oldPtr]; + if (ptr2) + { + return 0; + } else + { + //If this assert hit, serialization happened in the wrong order + // 'getUniquePointer' + btAssert(0); + } + + } + return 0; + } + return oldPtr; + } + + virtual void finalizeChunk(btChunk* chunk, const char* structType, int chunkCode,void* oldPtr) + { + if (!(m_serializationFlags&BT_SERIALIZE_NO_DUPLICATE_ASSERT)) + { + btAssert(!findPointer(oldPtr)); + } + + chunk->m_dna_nr = getReverseType(structType); + chunk->m_chunkCode = chunkCode; + //void* uniquePtr = getUniquePointer(oldPtr); + m_chunkP.insert(oldPtr,oldPtr);//chunk->m_oldPtr); + // chunk->m_oldPtr = uniquePtr;//oldPtr; + + void* uid = findPointer(oldPtr); + m_uid2ChunkPtr.insert(uid,chunk); + + switch (chunk->m_chunkCode) + { + case BT_SOFTBODY_CODE: + { + #ifdef BT_USE_DOUBLE_PRECISION + m_arrays.m_softBodyDoubleData.push_back((btSoftBodyDoubleData*) chunk->m_oldPtr); + #else + m_arrays.m_softBodyFloatData.push_back((btSoftBodyFloatData*) chunk->m_oldPtr); + #endif + break; + } + case BT_COLLISIONOBJECT_CODE: + { + #ifdef BT_USE_DOUBLE_PRECISION + m_arrays.m_collisionObjectDataDouble.push_back((btCollisionObjectDoubleData*)chunk->m_oldPtr); + #else//BT_USE_DOUBLE_PRECISION + m_arrays.m_collisionObjectDataFloat.push_back((btCollisionObjectFloatData*)chunk->m_oldPtr); + #endif //BT_USE_DOUBLE_PRECISION + break; + } + case BT_RIGIDBODY_CODE: + { + #ifdef BT_USE_DOUBLE_PRECISION + m_arrays.m_rigidBodyDataDouble.push_back((btRigidBodyDoubleData*)chunk->m_oldPtr); + #else + m_arrays.m_rigidBodyDataFloat.push_back((btRigidBodyFloatData*)chunk->m_oldPtr); + #endif//BT_USE_DOUBLE_PRECISION + break; + }; + case BT_CONSTRAINT_CODE: + { + #ifdef BT_USE_DOUBLE_PRECISION + m_arrays.m_constraintDataDouble.push_back((btTypedConstraintDoubleData*)chunk->m_oldPtr); + #else + m_arrays.m_constraintDataFloat.push_back((btTypedConstraintFloatData*)chunk->m_oldPtr); + #endif + break; + } + case BT_QUANTIZED_BVH_CODE: + { + #ifdef BT_USE_DOUBLE_PRECISION + m_arrays.m_bvhsDouble.push_back((btQuantizedBvhDoubleData*) chunk->m_oldPtr); + #else + m_arrays.m_bvhsFloat.push_back((btQuantizedBvhFloatData*) chunk->m_oldPtr); + #endif + break; + } + + case BT_SHAPE_CODE: + { + btCollisionShapeData* shapeData = (btCollisionShapeData*) chunk->m_oldPtr; + m_arrays.m_colShapeData.push_back(shapeData); + break; + } + case BT_TRIANLGE_INFO_MAP: + case BT_ARRAY_CODE: + case BT_SBMATERIAL_CODE: + case BT_SBNODE_CODE: + case BT_DYNAMICSWORLD_CODE: + case BT_DNA_CODE: + { + break; + } + default: + { + } + }; + } + + int getNumChunks() const + { + return m_uid2ChunkPtr.size(); + } + + const btChunk* getChunk(int chunkIndex) const + { + return *m_uid2ChunkPtr.getAtIndex(chunkIndex); + } + +}; +#endif //ENABLE_INMEMORY_SERIALIZER + #endif //BT_SERIALIZER_H diff --git a/Engine/lib/bullet/src/LinearMath/btSpatialAlgebra.h b/Engine/lib/bullet/src/LinearMath/btSpatialAlgebra.h new file mode 100644 index 000000000..8e59658bc --- /dev/null +++ b/Engine/lib/bullet/src/LinearMath/btSpatialAlgebra.h @@ -0,0 +1,331 @@ +/* +Copyright (c) 2003-2015 Erwin Coumans, Jakub Stepien + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + +///These spatial algebra classes are used for btMultiBody, +///see BulletDynamics/Featherstone + +#ifndef BT_SPATIAL_ALGEBRA_H +#define BT_SPATIAL_ALGEBRA_H + + +#include "btMatrix3x3.h" + +struct btSpatialForceVector +{ + btVector3 m_topVec, m_bottomVec; + // + btSpatialForceVector() { setZero(); } + btSpatialForceVector(const btVector3 &angular, const btVector3 &linear) : m_topVec(linear), m_bottomVec(angular) {} + btSpatialForceVector(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz) + { + setValue(ax, ay, az, lx, ly, lz); + } + // + void setVector(const btVector3 &angular, const btVector3 &linear) { m_topVec = linear; m_bottomVec = angular; } + void setValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz) + { + m_bottomVec.setValue(ax, ay, az); m_topVec.setValue(lx, ly, lz); + } + // + void addVector(const btVector3 &angular, const btVector3 &linear) { m_topVec += linear; m_bottomVec += angular; } + void addValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz) + { + m_bottomVec[0] += ax; m_bottomVec[1] += ay; m_bottomVec[2] += az; + m_topVec[0] += lx; m_topVec[1] += ly; m_topVec[2] += lz; + } + // + const btVector3 & getLinear() const { return m_topVec; } + const btVector3 & getAngular() const { return m_bottomVec; } + // + void setLinear(const btVector3 &linear) { m_topVec = linear; } + void setAngular(const btVector3 &angular) { m_bottomVec = angular; } + // + void addAngular(const btVector3 &angular) { m_bottomVec += angular; } + void addLinear(const btVector3 &linear) { m_topVec += linear; } + // + void setZero() { m_topVec.setZero(); m_bottomVec.setZero(); } + // + btSpatialForceVector & operator += (const btSpatialForceVector &vec) { m_topVec += vec.m_topVec; m_bottomVec += vec.m_bottomVec; return *this; } + btSpatialForceVector & operator -= (const btSpatialForceVector &vec) { m_topVec -= vec.m_topVec; m_bottomVec -= vec.m_bottomVec; return *this; } + btSpatialForceVector operator - (const btSpatialForceVector &vec) const { return btSpatialForceVector(m_bottomVec - vec.m_bottomVec, m_topVec - vec.m_topVec); } + btSpatialForceVector operator + (const btSpatialForceVector &vec) const { return btSpatialForceVector(m_bottomVec + vec.m_bottomVec, m_topVec + vec.m_topVec); } + btSpatialForceVector operator - () const { return btSpatialForceVector(-m_bottomVec, -m_topVec); } + btSpatialForceVector operator * (const btScalar &s) const { return btSpatialForceVector(s * m_bottomVec, s * m_topVec); } + //btSpatialForceVector & operator = (const btSpatialForceVector &vec) { m_topVec = vec.m_topVec; m_bottomVec = vec.m_bottomVec; return *this; } +}; + +struct btSpatialMotionVector +{ + btVector3 m_topVec, m_bottomVec; + // + btSpatialMotionVector() { setZero(); } + btSpatialMotionVector(const btVector3 &angular, const btVector3 &linear) : m_topVec(angular), m_bottomVec(linear) {} + // + void setVector(const btVector3 &angular, const btVector3 &linear) { m_topVec = angular; m_bottomVec = linear; } + void setValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz) + { + m_topVec.setValue(ax, ay, az); m_bottomVec.setValue(lx, ly, lz); + } + // + void addVector(const btVector3 &angular, const btVector3 &linear) { m_topVec += linear; m_bottomVec += angular; } + void addValue(const btScalar &ax, const btScalar &ay, const btScalar &az, const btScalar &lx, const btScalar &ly, const btScalar &lz) + { + m_topVec[0] += ax; m_topVec[1] += ay; m_topVec[2] += az; + m_bottomVec[0] += lx; m_bottomVec[1] += ly; m_bottomVec[2] += lz; + } + // + const btVector3 & getAngular() const { return m_topVec; } + const btVector3 & getLinear() const { return m_bottomVec; } + // + void setAngular(const btVector3 &angular) { m_topVec = angular; } + void setLinear(const btVector3 &linear) { m_bottomVec = linear; } + // + void addAngular(const btVector3 &angular) { m_topVec += angular; } + void addLinear(const btVector3 &linear) { m_bottomVec += linear; } + // + void setZero() { m_topVec.setZero(); m_bottomVec.setZero(); } + // + btScalar dot(const btSpatialForceVector &b) const + { + return m_bottomVec.dot(b.m_topVec) + m_topVec.dot(b.m_bottomVec); + } + // + template + void cross(const SpatialVectorType &b, SpatialVectorType &out) const + { + out.m_topVec = m_topVec.cross(b.m_topVec); + out.m_bottomVec = m_bottomVec.cross(b.m_topVec) + m_topVec.cross(b.m_bottomVec); + } + template + SpatialVectorType cross(const SpatialVectorType &b) const + { + SpatialVectorType out; + out.m_topVec = m_topVec.cross(b.m_topVec); + out.m_bottomVec = m_bottomVec.cross(b.m_topVec) + m_topVec.cross(b.m_bottomVec); + return out; + } + // + btSpatialMotionVector & operator += (const btSpatialMotionVector &vec) { m_topVec += vec.m_topVec; m_bottomVec += vec.m_bottomVec; return *this; } + btSpatialMotionVector & operator -= (const btSpatialMotionVector &vec) { m_topVec -= vec.m_topVec; m_bottomVec -= vec.m_bottomVec; return *this; } + btSpatialMotionVector & operator *= (const btScalar &s) { m_topVec *= s; m_bottomVec *= s; return *this; } + btSpatialMotionVector operator - (const btSpatialMotionVector &vec) const { return btSpatialMotionVector(m_topVec - vec.m_topVec, m_bottomVec - vec.m_bottomVec); } + btSpatialMotionVector operator + (const btSpatialMotionVector &vec) const { return btSpatialMotionVector(m_topVec + vec.m_topVec, m_bottomVec + vec.m_bottomVec); } + btSpatialMotionVector operator - () const { return btSpatialMotionVector(-m_topVec, -m_bottomVec); } + btSpatialMotionVector operator * (const btScalar &s) const { return btSpatialMotionVector(s * m_topVec, s * m_bottomVec); } +}; + +struct btSymmetricSpatialDyad +{ + btMatrix3x3 m_topLeftMat, m_topRightMat, m_bottomLeftMat; + // + btSymmetricSpatialDyad() { setIdentity(); } + btSymmetricSpatialDyad(const btMatrix3x3 &topLeftMat, const btMatrix3x3 &topRightMat, const btMatrix3x3 &bottomLeftMat) { setMatrix(topLeftMat, topRightMat, bottomLeftMat); } + // + void setMatrix(const btMatrix3x3 &topLeftMat, const btMatrix3x3 &topRightMat, const btMatrix3x3 &bottomLeftMat) + { + m_topLeftMat = topLeftMat; + m_topRightMat = topRightMat; + m_bottomLeftMat = bottomLeftMat; + } + // + void addMatrix(const btMatrix3x3 &topLeftMat, const btMatrix3x3 &topRightMat, const btMatrix3x3 &bottomLeftMat) + { + m_topLeftMat += topLeftMat; + m_topRightMat += topRightMat; + m_bottomLeftMat += bottomLeftMat; + } + // + void setIdentity() { m_topLeftMat.setIdentity(); m_topRightMat.setIdentity(); m_bottomLeftMat.setIdentity(); } + // + btSymmetricSpatialDyad & operator -= (const btSymmetricSpatialDyad &mat) + { + m_topLeftMat -= mat.m_topLeftMat; + m_topRightMat -= mat.m_topRightMat; + m_bottomLeftMat -= mat.m_bottomLeftMat; + return *this; + } + // + btSpatialForceVector operator * (const btSpatialMotionVector &vec) + { + return btSpatialForceVector(m_bottomLeftMat * vec.m_topVec + m_topLeftMat.transpose() * vec.m_bottomVec, m_topLeftMat * vec.m_topVec + m_topRightMat * vec.m_bottomVec); + } +}; + +struct btSpatialTransformationMatrix +{ + btMatrix3x3 m_rotMat; //btMatrix3x3 m_trnCrossMat; + btVector3 m_trnVec; + // + enum eOutputOperation + { + None = 0, + Add = 1, + Subtract = 2 + }; + // + template + void transform( const SpatialVectorType &inVec, + SpatialVectorType &outVec, + eOutputOperation outOp = None) + { + if(outOp == None) + { + outVec.m_topVec = m_rotMat * inVec.m_topVec; + outVec.m_bottomVec = -m_trnVec.cross(outVec.m_topVec) + m_rotMat * inVec.m_bottomVec; + } + else if(outOp == Add) + { + outVec.m_topVec += m_rotMat * inVec.m_topVec; + outVec.m_bottomVec += -m_trnVec.cross(outVec.m_topVec) + m_rotMat * inVec.m_bottomVec; + } + else if(outOp == Subtract) + { + outVec.m_topVec -= m_rotMat * inVec.m_topVec; + outVec.m_bottomVec -= -m_trnVec.cross(outVec.m_topVec) + m_rotMat * inVec.m_bottomVec; + } + + } + + template + void transformRotationOnly( const SpatialVectorType &inVec, + SpatialVectorType &outVec, + eOutputOperation outOp = None) + { + if(outOp == None) + { + outVec.m_topVec = m_rotMat * inVec.m_topVec; + outVec.m_bottomVec = m_rotMat * inVec.m_bottomVec; + } + else if(outOp == Add) + { + outVec.m_topVec += m_rotMat * inVec.m_topVec; + outVec.m_bottomVec += m_rotMat * inVec.m_bottomVec; + } + else if(outOp == Subtract) + { + outVec.m_topVec -= m_rotMat * inVec.m_topVec; + outVec.m_bottomVec -= m_rotMat * inVec.m_bottomVec; + } + + } + + template + void transformInverse( const SpatialVectorType &inVec, + SpatialVectorType &outVec, + eOutputOperation outOp = None) + { + if(outOp == None) + { + outVec.m_topVec = m_rotMat.transpose() * inVec.m_topVec; + outVec.m_bottomVec = m_rotMat.transpose() * (inVec.m_bottomVec + m_trnVec.cross(inVec.m_topVec)); + } + else if(outOp == Add) + { + outVec.m_topVec += m_rotMat.transpose() * inVec.m_topVec; + outVec.m_bottomVec += m_rotMat.transpose() * (inVec.m_bottomVec + m_trnVec.cross(inVec.m_topVec)); + } + else if(outOp == Subtract) + { + outVec.m_topVec -= m_rotMat.transpose() * inVec.m_topVec; + outVec.m_bottomVec -= m_rotMat.transpose() * (inVec.m_bottomVec + m_trnVec.cross(inVec.m_topVec)); + } + } + + template + void transformInverseRotationOnly( const SpatialVectorType &inVec, + SpatialVectorType &outVec, + eOutputOperation outOp = None) + { + if(outOp == None) + { + outVec.m_topVec = m_rotMat.transpose() * inVec.m_topVec; + outVec.m_bottomVec = m_rotMat.transpose() * inVec.m_bottomVec; + } + else if(outOp == Add) + { + outVec.m_topVec += m_rotMat.transpose() * inVec.m_topVec; + outVec.m_bottomVec += m_rotMat.transpose() * inVec.m_bottomVec; + } + else if(outOp == Subtract) + { + outVec.m_topVec -= m_rotMat.transpose() * inVec.m_topVec; + outVec.m_bottomVec -= m_rotMat.transpose() * inVec.m_bottomVec; + } + + } + + void transformInverse( const btSymmetricSpatialDyad &inMat, + btSymmetricSpatialDyad &outMat, + eOutputOperation outOp = None) + { + const btMatrix3x3 r_cross( 0, -m_trnVec[2], m_trnVec[1], + m_trnVec[2], 0, -m_trnVec[0], + -m_trnVec[1], m_trnVec[0], 0); + + + if(outOp == None) + { + outMat.m_topLeftMat = m_rotMat.transpose() * ( inMat.m_topLeftMat - inMat.m_topRightMat * r_cross ) * m_rotMat; + outMat.m_topRightMat = m_rotMat.transpose() * inMat.m_topRightMat * m_rotMat; + outMat.m_bottomLeftMat = m_rotMat.transpose() * (r_cross * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) + inMat.m_bottomLeftMat - inMat.m_topLeftMat.transpose() * r_cross) * m_rotMat; + } + else if(outOp == Add) + { + outMat.m_topLeftMat += m_rotMat.transpose() * ( inMat.m_topLeftMat - inMat.m_topRightMat * r_cross ) * m_rotMat; + outMat.m_topRightMat += m_rotMat.transpose() * inMat.m_topRightMat * m_rotMat; + outMat.m_bottomLeftMat += m_rotMat.transpose() * (r_cross * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) + inMat.m_bottomLeftMat - inMat.m_topLeftMat.transpose() * r_cross) * m_rotMat; + } + else if(outOp == Subtract) + { + outMat.m_topLeftMat -= m_rotMat.transpose() * ( inMat.m_topLeftMat - inMat.m_topRightMat * r_cross ) * m_rotMat; + outMat.m_topRightMat -= m_rotMat.transpose() * inMat.m_topRightMat * m_rotMat; + outMat.m_bottomLeftMat -= m_rotMat.transpose() * (r_cross * (inMat.m_topLeftMat - inMat.m_topRightMat * r_cross) + inMat.m_bottomLeftMat - inMat.m_topLeftMat.transpose() * r_cross) * m_rotMat; + } + } + + template + SpatialVectorType operator * (const SpatialVectorType &vec) + { + SpatialVectorType out; + transform(vec, out); + return out; + } +}; + +template +void symmetricSpatialOuterProduct(const SpatialVectorType &a, const SpatialVectorType &b, btSymmetricSpatialDyad &out) +{ + //output op maybe? + + out.m_topLeftMat = outerProduct(a.m_topVec, b.m_bottomVec); + out.m_topRightMat = outerProduct(a.m_topVec, b.m_topVec); + out.m_topLeftMat = outerProduct(a.m_bottomVec, b.m_bottomVec); + //maybe simple a*spatTranspose(a) would be nicer? +} + +template +btSymmetricSpatialDyad symmetricSpatialOuterProduct(const SpatialVectorType &a, const SpatialVectorType &b) +{ + btSymmetricSpatialDyad out; + + out.m_topLeftMat = outerProduct(a.m_topVec, b.m_bottomVec); + out.m_topRightMat = outerProduct(a.m_topVec, b.m_topVec); + out.m_bottomLeftMat = outerProduct(a.m_bottomVec, b.m_bottomVec); + + return out; + //maybe simple a*spatTranspose(a) would be nicer? +} + +#endif //BT_SPATIAL_ALGEBRA_H + diff --git a/Engine/lib/bullet/src/LinearMath/btThreads.cpp b/Engine/lib/bullet/src/LinearMath/btThreads.cpp new file mode 100644 index 000000000..4bef499f7 --- /dev/null +++ b/Engine/lib/bullet/src/LinearMath/btThreads.cpp @@ -0,0 +1,230 @@ +/* +Copyright (c) 2003-2014 Erwin Coumans http://bullet.googlecode.com + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + +#include "btThreads.h" + +// +// Lightweight spin-mutex based on atomics +// Using ordinary system-provided mutexes like Windows critical sections was noticeably slower +// presumably because when it fails to lock at first it would sleep the thread and trigger costly +// context switching. +// + +#if BT_THREADSAFE + +#if __cplusplus >= 201103L + +// for anything claiming full C++11 compliance, use C++11 atomics +// on GCC or Clang you need to compile with -std=c++11 +#define USE_CPP11_ATOMICS 1 + +#elif defined( _MSC_VER ) + +// on MSVC, use intrinsics instead +#define USE_MSVC_INTRINSICS 1 + +#elif defined( __GNUC__ ) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) + +// available since GCC 4.7 and some versions of clang +// todo: check for clang +#define USE_GCC_BUILTIN_ATOMICS 1 + +#elif defined( __GNUC__ ) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + +// available since GCC 4.1 +#define USE_GCC_BUILTIN_ATOMICS_OLD 1 + +#endif + + +#if USE_CPP11_ATOMICS + +#include +#include + +#define THREAD_LOCAL_STATIC thread_local static + +bool btSpinMutex::tryLock() +{ + std::atomic* aDest = reinterpret_cast*>(&mLock); + int expected = 0; + return std::atomic_compare_exchange_weak_explicit( aDest, &expected, int(1), std::memory_order_acq_rel, std::memory_order_acquire ); +} + +void btSpinMutex::lock() +{ + // note: this lock does not sleep the thread. + while (! tryLock()) + { + // spin + } +} + +void btSpinMutex::unlock() +{ + std::atomic* aDest = reinterpret_cast*>(&mLock); + std::atomic_store_explicit( aDest, int(0), std::memory_order_release ); +} + + +#elif USE_MSVC_INTRINSICS + +#define WIN32_LEAN_AND_MEAN + +#include +#include + +#define THREAD_LOCAL_STATIC __declspec( thread ) static + + +bool btSpinMutex::tryLock() +{ + volatile long* aDest = reinterpret_cast(&mLock); + return ( 0 == _InterlockedCompareExchange( aDest, 1, 0) ); +} + +void btSpinMutex::lock() +{ + // note: this lock does not sleep the thread + while (! tryLock()) + { + // spin + } +} + +void btSpinMutex::unlock() +{ + volatile long* aDest = reinterpret_cast( &mLock ); + _InterlockedExchange( aDest, 0 ); +} + +#elif USE_GCC_BUILTIN_ATOMICS + +#define THREAD_LOCAL_STATIC static __thread + + +bool btSpinMutex::tryLock() +{ + int expected = 0; + bool weak = false; + const int memOrderSuccess = __ATOMIC_ACQ_REL; + const int memOrderFail = __ATOMIC_ACQUIRE; + return __atomic_compare_exchange_n(&mLock, &expected, int(1), weak, memOrderSuccess, memOrderFail); +} + +void btSpinMutex::lock() +{ + // note: this lock does not sleep the thread + while (! tryLock()) + { + // spin + } +} + +void btSpinMutex::unlock() +{ + __atomic_store_n(&mLock, int(0), __ATOMIC_RELEASE); +} + +#elif USE_GCC_BUILTIN_ATOMICS_OLD + + +#define THREAD_LOCAL_STATIC static __thread + +bool btSpinMutex::tryLock() +{ + return __sync_bool_compare_and_swap(&mLock, int(0), int(1)); +} + +void btSpinMutex::lock() +{ + // note: this lock does not sleep the thread + while (! tryLock()) + { + // spin + } +} + +void btSpinMutex::unlock() +{ + // write 0 + __sync_fetch_and_and(&mLock, int(0)); +} + +#else //#elif USE_MSVC_INTRINSICS + +#error "no threading primitives defined -- unknown platform" + +#endif //#else //#elif USE_MSVC_INTRINSICS + + +struct ThreadsafeCounter +{ + unsigned int mCounter; + btSpinMutex mMutex; + + ThreadsafeCounter() {mCounter=0;} + + unsigned int getNext() + { + // no need to optimize this with atomics, it is only called ONCE per thread! + mMutex.lock(); + unsigned int val = mCounter++; + mMutex.unlock(); + return val; + } +}; + +static ThreadsafeCounter gThreadCounter; + + +// return a unique index per thread, starting with 0 and counting up +unsigned int btGetCurrentThreadIndex() +{ + const unsigned int kNullIndex = ~0U; + THREAD_LOCAL_STATIC unsigned int sThreadIndex = kNullIndex; + if ( sThreadIndex == kNullIndex ) + { + sThreadIndex = gThreadCounter.getNext(); + } + return sThreadIndex; +} + +bool btIsMainThread() +{ + return btGetCurrentThreadIndex() == 0; +} + +#else // #if BT_THREADSAFE + +// These should not be called ever +void btSpinMutex::lock() +{ + btAssert(!"unimplemented btSpinMutex::lock() called"); +} + +void btSpinMutex::unlock() +{ + btAssert(!"unimplemented btSpinMutex::unlock() called"); +} + +bool btSpinMutex::tryLock() +{ + btAssert(!"unimplemented btSpinMutex::tryLock() called"); + return true; +} + +#endif // #else // #if BT_THREADSAFE + diff --git a/Engine/lib/bullet/src/LinearMath/btThreads.h b/Engine/lib/bullet/src/LinearMath/btThreads.h new file mode 100644 index 000000000..db710979f --- /dev/null +++ b/Engine/lib/bullet/src/LinearMath/btThreads.h @@ -0,0 +1,76 @@ +/* +Copyright (c) 2003-2014 Erwin Coumans http://bullet.googlecode.com + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +*/ + + + +#ifndef BT_THREADS_H +#define BT_THREADS_H + +#include "btScalar.h" // has definitions like SIMD_FORCE_INLINE + +/// +/// btSpinMutex -- lightweight spin-mutex implemented with atomic ops, never puts +/// a thread to sleep because it is designed to be used with a task scheduler +/// which has one thread per core and the threads don't sleep until they +/// run out of tasks. Not good for general purpose use. +/// +class btSpinMutex +{ + int mLock; + +public: + btSpinMutex() + { + mLock = 0; + } + void lock(); + void unlock(); + bool tryLock(); +}; + +#if BT_THREADSAFE + +// for internal Bullet use only +SIMD_FORCE_INLINE void btMutexLock( btSpinMutex* mutex ) +{ + mutex->lock(); +} + +SIMD_FORCE_INLINE void btMutexUnlock( btSpinMutex* mutex ) +{ + mutex->unlock(); +} + +SIMD_FORCE_INLINE bool btMutexTryLock( btSpinMutex* mutex ) +{ + return mutex->tryLock(); +} + +// for internal use only +bool btIsMainThread(); +unsigned int btGetCurrentThreadIndex(); +const unsigned int BT_MAX_THREAD_COUNT = 64; + +#else + +// for internal Bullet use only +// if BT_THREADSAFE is undefined or 0, should optimize away to nothing +SIMD_FORCE_INLINE void btMutexLock( btSpinMutex* ) {} +SIMD_FORCE_INLINE void btMutexUnlock( btSpinMutex* ) {} +SIMD_FORCE_INLINE bool btMutexTryLock( btSpinMutex* ) {return true;} + +#endif + + +#endif //BT_THREADS_H diff --git a/Engine/lib/bullet/src/LinearMath/btTransform.h b/Engine/lib/bullet/src/LinearMath/btTransform.h index 907627379..d4f939a5d 100644 --- a/Engine/lib/bullet/src/LinearMath/btTransform.h +++ b/Engine/lib/bullet/src/LinearMath/btTransform.h @@ -127,7 +127,7 @@ public: /**@brief Set from an array - * @param m A pointer to a 15 element array (12 rotation(row major padded on the right by 1), and 3 translation */ + * @param m A pointer to a 16 element array (12 rotation(row major padded on the right by 1), and 3 translation */ void setFromOpenGLMatrix(const btScalar *m) { m_basis.setFromOpenGLSubMatrix(m); @@ -135,7 +135,7 @@ public: } /**@brief Fill an array representation - * @param m A pointer to a 15 element array (12 rotation(row major padded on the right by 1), and 3 translation */ + * @param m A pointer to a 16 element array (12 rotation(row major padded on the right by 1), and 3 translation */ void getOpenGLMatrix(btScalar *m) const { m_basis.getOpenGLSubMatrix(m); diff --git a/Engine/lib/bullet/src/LinearMath/btVector3.cpp b/Engine/lib/bullet/src/LinearMath/btVector3.cpp index 9389a25ca..e05bdccd6 100644 --- a/Engine/lib/bullet/src/LinearMath/btVector3.cpp +++ b/Engine/lib/bullet/src/LinearMath/btVector3.cpp @@ -63,7 +63,7 @@ long _maxdot_large( const float *vv, const float *vec, unsigned long count, floa float4 stack_array[ STACK_ARRAY_COUNT ]; #if DEBUG - memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) ); + //memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) ); #endif size_t index; @@ -448,7 +448,7 @@ long _mindot_large( const float *vv, const float *vec, unsigned long count, floa float4 stack_array[ STACK_ARRAY_COUNT ]; #if DEBUG - memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) ); + //memset( stack_array, -1, STACK_ARRAY_COUNT * sizeof(stack_array[0]) ); #endif size_t index; @@ -821,6 +821,7 @@ long _mindot_large( const float *vv, const float *vec, unsigned long count, floa #elif defined BT_USE_NEON + #define ARM_NEON_GCC_COMPATIBILITY 1 #include #include @@ -884,7 +885,12 @@ static long _mindot_large_sel( const float *vv, const float *vec, unsigned long -#define vld1q_f32_aligned_postincrement( _ptr ) ({ float32x4_t _r; asm( "vld1.f32 {%0}, [%1, :128]!\n" : "=w" (_r), "+r" (_ptr) ); /*return*/ _r; }) +#if defined __arm__ +# define vld1q_f32_aligned_postincrement( _ptr ) ({ float32x4_t _r; asm( "vld1.f32 {%0}, [%1, :128]!\n" : "=w" (_r), "+r" (_ptr) ); /*return*/ _r; }) +#else +//support 64bit arm +# define vld1q_f32_aligned_postincrement( _ptr) ({ float32x4_t _r = ((float32x4_t*)(_ptr))[0]; (_ptr) = (const float*) ((const char*)(_ptr) + 16L); /*return*/ _r; }) +#endif long _maxdot_large_v0( const float *vv, const float *vec, unsigned long count, float *dotResult ) diff --git a/Engine/lib/bullet/src/LinearMath/btVector3.h b/Engine/lib/bullet/src/LinearMath/btVector3.h index 896859292..487670009 100644 --- a/Engine/lib/bullet/src/LinearMath/btVector3.h +++ b/Engine/lib/bullet/src/LinearMath/btVector3.h @@ -267,10 +267,20 @@ public: /**@brief Return the norm (length) of the vector */ SIMD_FORCE_INLINE btScalar norm() const - { + { return length(); } + /**@brief Return the norm (length) of the vector */ + SIMD_FORCE_INLINE btScalar safeNorm() const + { + btScalar d = length2(); + //workaround for some clang/gcc issue of sqrtf(tiny number) = -INF + if (d>SIMD_EPSILON) + return btSqrt(d); + return btScalar(0); + } + /**@brief Return the distance squared between the ends of this and another vector * This is symantically treating the vector like a point */ SIMD_FORCE_INLINE btScalar distance2(const btVector3& v) const; @@ -297,7 +307,7 @@ public: SIMD_FORCE_INLINE btVector3& normalize() { - btAssert(length() != btScalar(0)); + btAssert(!fuzzyZero()); #if defined(BT_USE_SSE_IN_API) && defined (BT_USE_SSE) // dot product first @@ -501,10 +511,10 @@ public: __m128 tmp3 = _mm_add_ps(r0,r1); mVec128 = tmp3; #elif defined(BT_USE_NEON) - mVec128 = vsubq_f32(v1.mVec128, v0.mVec128); - mVec128 = vmulq_n_f32(mVec128, rt); - mVec128 = vaddq_f32(mVec128, v0.mVec128); -#else + float32x4_t vl = vsubq_f32(v1.mVec128, v0.mVec128); + vl = vmulq_n_f32(vl, rt); + mVec128 = vaddq_f32(vl, v0.mVec128); +#else btScalar s = btScalar(1.0) - rt; m_floats[0] = s * v0.m_floats[0] + rt * v1.m_floats[0]; m_floats[1] = s * v0.m_floats[1] + rt * v1.m_floats[1]; @@ -685,9 +695,10 @@ public: return m_floats[0] == btScalar(0) && m_floats[1] == btScalar(0) && m_floats[2] == btScalar(0); } + SIMD_FORCE_INLINE bool fuzzyZero() const { - return length2() < SIMD_EPSILON; + return length2() < SIMD_EPSILON*SIMD_EPSILON; } SIMD_FORCE_INLINE void serialize(struct btVector3Data& dataOut) const; @@ -950,9 +961,9 @@ SIMD_FORCE_INLINE btScalar btVector3::distance(const btVector3& v) const SIMD_FORCE_INLINE btVector3 btVector3::normalized() const { - btVector3 norm = *this; + btVector3 nrm = *this; - return norm.normalize(); + return nrm.normalize(); } SIMD_FORCE_INLINE btVector3 btVector3::rotate( const btVector3& wAxis, const btScalar _angle ) const @@ -1010,21 +1021,21 @@ SIMD_FORCE_INLINE long btVector3::maxDot( const btVector3 *array, long arra if( array_count < scalar_cutoff ) #endif { - btScalar maxDot = -SIMD_INFINITY; + btScalar maxDot1 = -SIMD_INFINITY; int i = 0; int ptIndex = -1; for( i = 0; i < array_count; i++ ) { btScalar dot = array[i].dot(*this); - if( dot > maxDot ) + if( dot > maxDot1 ) { - maxDot = dot; + maxDot1 = dot; ptIndex = i; } } - dotOut = maxDot; + dotOut = maxDot1; return ptIndex; } #if (defined BT_USE_SSE && defined BT_USE_SIMD_VECTOR3 && defined BT_USE_SSE_IN_API) || defined (BT_USE_NEON) diff --git a/Engine/lib/bullet/src/LinearMath/premake4.lua b/Engine/lib/bullet/src/LinearMath/premake4.lua index 0f0a88a4e..524e2c316 100644 --- a/Engine/lib/bullet/src/LinearMath/premake4.lua +++ b/Engine/lib/bullet/src/LinearMath/premake4.lua @@ -1,11 +1,10 @@ project "LinearMath" - + kind "StaticLib" - targetdir "../../lib" includedirs { "..", } files { - "**.cpp", - "**.h" - } \ No newline at end of file + "*.cpp", + "*.h" + } diff --git a/Engine/lib/bullet/src/Makefile.am b/Engine/lib/bullet/src/Makefile.am deleted file mode 100644 index 0ecb5c9f5..000000000 --- a/Engine/lib/bullet/src/Makefile.am +++ /dev/null @@ -1,612 +0,0 @@ -bullet_includedir = $(includedir)/bullet -nobase_bullet_include_HEADERS = \ - btBulletDynamicsCommon.h \ - Bullet-C-Api.h \ - btBulletCollisionCommon.h - -if CONDITIONAL_BUILD_MULTITHREADED -nobase_bullet_include_HEADERS += \ - BulletMultiThreaded/PosixThreadSupport.h \ - BulletMultiThreaded/vectormath/scalar/cpp/mat_aos.h \ - BulletMultiThreaded/vectormath/scalar/cpp/vec_aos.h \ - BulletMultiThreaded/vectormath/scalar/cpp/quat_aos.h \ - BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h \ - BulletMultiThreaded/PpuAddressSpace.h \ - BulletMultiThreaded/SpuCollisionTaskProcess.h \ - BulletMultiThreaded/PlatformDefinitions.h \ - BulletMultiThreaded/vectormath2bullet.h \ - BulletMultiThreaded/SpuGatheringCollisionDispatcher.h \ - BulletMultiThreaded/SpuCollisionObjectWrapper.h \ - BulletMultiThreaded/SpuSampleTaskProcess.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \ - BulletMultiThreaded/SpuSync.h \ - BulletMultiThreaded/btThreadSupportInterface.h \ - BulletMultiThreaded/SpuLibspe2Support.h \ - BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h \ - BulletMultiThreaded/SpuFakeDma.h \ - BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h \ - BulletMultiThreaded/SpuDoubleBuffer.h \ - BulletMultiThreaded/Win32ThreadSupport.h \ - BulletMultiThreaded/SequentialThreadSupport.h - -lib_LTLIBRARIES = libLinearMath.la libBulletCollision.la libBulletDynamics.la libBulletSoftBody.la libBulletMultiThreaded.la - -libBulletMultiThreaded_la_CXXFLAGS = ${CXXFLAGS} -I./BulletMultiThreaded/vectormath/scalar/cpp -libBulletMultiThreaded_la_SOURCES =\ - BulletMultiThreaded/SpuCollisionObjectWrapper.cpp \ - BulletMultiThreaded/SpuSampleTask/SpuSampleTask.cpp \ - BulletMultiThreaded/SpuLibspe2Support.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp \ - BulletMultiThreaded/btThreadSupportInterface.cpp \ - BulletMultiThreaded/SequentialThreadSupport.cpp \ - BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp \ - BulletMultiThreaded/Win32ThreadSupport.cpp \ - BulletMultiThreaded/SpuFakeDma.cpp \ - BulletMultiThreaded/PosixThreadSupport.cpp \ - BulletMultiThreaded/SpuCollisionTaskProcess.cpp \ - BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.cpp \ - BulletMultiThreaded/SpuSampleTaskProcess.cpp \ - BulletMultiThreaded/SpuSampleTask/SpuSampleTask.h \ - BulletMultiThreaded/PpuAddressSpace.h \ - BulletMultiThreaded/SpuSampleTaskProcess.h \ - BulletMultiThreaded/SequentialThreadSupport.h \ - BulletMultiThreaded/PlatformDefinitions.h \ - BulletMultiThreaded/Win32ThreadSupport.h \ - BulletMultiThreaded/SpuContactManifoldCollisionAlgorithm.h \ - BulletMultiThreaded/btThreadSupportInterface.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuLocalSupport.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h \ - BulletMultiThreaded/SpuGatheringCollisionDispatcher.h \ - BulletMultiThreaded/SpuFakeDma.h \ - BulletMultiThreaded/SpuSync.h \ - BulletMultiThreaded/SpuCollisionObjectWrapper.h \ - BulletMultiThreaded/SpuDoubleBuffer.h \ - BulletMultiThreaded/SpuCollisionTaskProcess.h \ - BulletMultiThreaded/PosixThreadSupport.h \ - BulletMultiThreaded/SpuLibspe2Support.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/boxBoxDistance.h \ - BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h - -else -lib_LTLIBRARIES = libLinearMath.la libBulletCollision.la libBulletDynamics.la libBulletSoftBody.la -endif - - -libLinearMath_la_SOURCES = \ - LinearMath/btQuickprof.cpp \ - LinearMath/btGeometryUtil.cpp \ - LinearMath/btAlignedAllocator.cpp \ - LinearMath/btSerializer.cpp \ - LinearMath/btConvexHull.cpp \ - LinearMath/btPolarDecomposition.cpp \ - LinearMath/btVector3.cpp \ - LinearMath/btConvexHullComputer.cpp \ - LinearMath/btHashMap.h \ - LinearMath/btConvexHull.h \ - LinearMath/btAabbUtil2.h \ - LinearMath/btGeometryUtil.h \ - LinearMath/btQuadWord.h \ - LinearMath/btPoolAllocator.h \ - LinearMath/btPolarDecomposition.h \ - LinearMath/btScalar.h \ - LinearMath/btMinMax.h \ - LinearMath/btVector3.h \ - LinearMath/btList.h \ - LinearMath/btStackAlloc.h \ - LinearMath/btMatrix3x3.h \ - LinearMath/btMotionState.h \ - LinearMath/btAlignedAllocator.h \ - LinearMath/btQuaternion.h \ - LinearMath/btAlignedObjectArray.h \ - LinearMath/btQuickprof.h \ - LinearMath/btSerializer.h \ - LinearMath/btTransformUtil.h \ - LinearMath/btTransform.h \ - LinearMath/btDefaultMotionState.h \ - LinearMath/btIDebugDraw.h \ - LinearMath/btRandom.h - - -libBulletCollision_la_SOURCES = \ - BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp \ - BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp \ - BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp \ - BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp \ - BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp \ - BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp \ - BulletCollision/NarrowPhaseCollision/btConvexCast.cpp \ - BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp \ - BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp \ - BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp \ - BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp \ - BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp \ - BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btCollisionObject.cpp \ - BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btGhostObject.cpp \ - BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp \ - BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp \ - BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp \ - BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp \ - BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp \ - BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp \ - BulletCollision/CollisionDispatch/btManifoldResult.cpp \ - BulletCollision/CollisionDispatch/btCollisionWorld.cpp \ - BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btUnionFind.cpp \ - BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp \ - BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp \ - BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp \ - BulletCollision/CollisionShapes/btTetrahedronShape.cpp \ - BulletCollision/CollisionShapes/btShapeHull.cpp \ - BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp \ - BulletCollision/CollisionShapes/btCompoundShape.cpp \ - BulletCollision/CollisionShapes/btConeShape.cpp \ - BulletCollision/CollisionShapes/btConvexPolyhedron.cpp \ - BulletCollision/CollisionShapes/btMultiSphereShape.cpp \ - BulletCollision/CollisionShapes/btUniformScalingShape.cpp \ - BulletCollision/CollisionShapes/btSphereShape.cpp \ - BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp \ - BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp \ - BulletCollision/CollisionShapes/btTriangleMeshShape.cpp \ - BulletCollision/CollisionShapes/btTriangleBuffer.cpp \ - BulletCollision/CollisionShapes/btStaticPlaneShape.cpp \ - BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp \ - BulletCollision/CollisionShapes/btEmptyShape.cpp \ - BulletCollision/CollisionShapes/btCollisionShape.cpp \ - BulletCollision/CollisionShapes/btConvexShape.cpp \ - BulletCollision/CollisionShapes/btConvex2dShape.cpp \ - BulletCollision/CollisionShapes/btConvexInternalShape.cpp \ - BulletCollision/CollisionShapes/btConvexHullShape.cpp \ - BulletCollision/CollisionShapes/btTriangleCallback.cpp \ - BulletCollision/CollisionShapes/btCapsuleShape.cpp \ - BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp \ - BulletCollision/CollisionShapes/btConcaveShape.cpp \ - BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp \ - BulletCollision/CollisionShapes/btBoxShape.cpp \ - BulletCollision/CollisionShapes/btBox2dShape.cpp \ - BulletCollision/CollisionShapes/btOptimizedBvh.cpp \ - BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp \ - BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp \ - BulletCollision/CollisionShapes/btCylinderShape.cpp \ - BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp \ - BulletCollision/CollisionShapes/btStridingMeshInterface.cpp \ - BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp \ - BulletCollision/CollisionShapes/btTriangleMesh.cpp \ - BulletCollision/BroadphaseCollision/btAxisSweep3.cpp \ - BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp \ - BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp \ - BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp \ - BulletCollision/BroadphaseCollision/btDispatcher.cpp \ - BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp \ - BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp \ - BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp \ - BulletCollision/BroadphaseCollision/btDbvt.cpp \ - BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp \ - BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h \ - BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h \ - BulletCollision/NarrowPhaseCollision/btConvexCast.h \ - BulletCollision/NarrowPhaseCollision/btGjkEpa2.h \ - BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h \ - BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h \ - BulletCollision/NarrowPhaseCollision/btPointCollector.h \ - BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h \ - BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h \ - BulletCollision/NarrowPhaseCollision/btRaycastCallback.h \ - BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h \ - BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h \ - BulletCollision/NarrowPhaseCollision/btPersistentManifold.h \ - BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h \ - BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \ - BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \ - BulletCollision/CollisionDispatch/btCollisionObject.h \ - BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h \ - BulletCollision/CollisionDispatch/btGhostObject.h \ - BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \ - BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \ - BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h \ - BulletCollision/CollisionDispatch/btBoxBoxDetector.h \ - BulletCollision/CollisionDispatch/btCollisionDispatcher.h \ - BulletCollision/CollisionDispatch/SphereTriangleDetector.h \ - BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btUnionFind.h \ - BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btHashedSimplePairCache.h \ - BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btSimulationIslandManager.h \ - BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \ - BulletCollision/CollisionDispatch/btCollisionWorld.h \ - BulletCollision/CollisionDispatch/btInternalEdgeUtility.h \ - BulletCollision/CollisionDispatch/btManifoldResult.h \ - BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btCollisionConfiguration.h \ - BulletCollision/CollisionShapes/btConvexShape.h \ - BulletCollision/CollisionShapes/btConvex2dShape.h \ - BulletCollision/CollisionShapes/btTriangleCallback.h \ - BulletCollision/CollisionShapes/btPolyhedralConvexShape.h \ - BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btCompoundShape.h \ - BulletCollision/CollisionShapes/btBoxShape.h \ - BulletCollision/CollisionShapes/btBox2dShape.h \ - BulletCollision/CollisionShapes/btMultiSphereShape.h \ - BulletCollision/CollisionShapes/btCollisionMargin.h \ - BulletCollision/CollisionShapes/btConcaveShape.h \ - BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btEmptyShape.h \ - BulletCollision/CollisionShapes/btUniformScalingShape.h \ - BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btMaterial.h \ - BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \ - BulletCollision/CollisionShapes/btTriangleInfoMap.h \ - BulletCollision/CollisionShapes/btSphereShape.h \ - BulletCollision/CollisionShapes/btConvexPointCloudShape.h \ - BulletCollision/CollisionShapes/btCapsuleShape.h \ - BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h \ - BulletCollision/CollisionShapes/btCollisionShape.h \ - BulletCollision/CollisionShapes/btStaticPlaneShape.h \ - BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btStridingMeshInterface.h \ - BulletCollision/CollisionShapes/btTriangleMesh.h \ - BulletCollision/CollisionShapes/btTriangleBuffer.h \ - BulletCollision/CollisionShapes/btShapeHull.h \ - BulletCollision/CollisionShapes/btMinkowskiSumShape.h \ - BulletCollision/CollisionShapes/btOptimizedBvh.h \ - BulletCollision/CollisionShapes/btTriangleShape.h \ - BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h \ - BulletCollision/CollisionShapes/btCylinderShape.h \ - BulletCollision/CollisionShapes/btTetrahedronShape.h \ - BulletCollision/CollisionShapes/btConvexInternalShape.h \ - BulletCollision/CollisionShapes/btConeShape.h \ - BulletCollision/CollisionShapes/btConvexHullShape.h \ - BulletCollision/BroadphaseCollision/btAxisSweep3.h \ - BulletCollision/BroadphaseCollision/btDbvtBroadphase.h \ - BulletCollision/BroadphaseCollision/btSimpleBroadphase.h \ - BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h \ - BulletCollision/BroadphaseCollision/btDbvt.h \ - BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h \ - BulletCollision/BroadphaseCollision/btDispatcher.h \ - BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h \ - BulletCollision/BroadphaseCollision/btBroadphaseProxy.h \ - BulletCollision/BroadphaseCollision/btOverlappingPairCache.h \ - BulletCollision/BroadphaseCollision/btBroadphaseInterface.h \ - BulletCollision/BroadphaseCollision/btQuantizedBvh.h \ - BulletCollision/Gimpact/btGImpactBvh.cpp\ - BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp\ - BulletCollision/Gimpact/btTriangleShapeEx.cpp\ - BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp\ - BulletCollision/Gimpact/btGImpactShape.cpp\ - BulletCollision/Gimpact/gim_box_set.cpp\ - BulletCollision/Gimpact/gim_contact.cpp\ - BulletCollision/Gimpact/gim_memory.cpp\ - BulletCollision/Gimpact/gim_tri_collision.cpp - -libBulletDynamics_la_SOURCES = \ - BulletDynamics/Dynamics/btRigidBody.cpp \ - BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp \ - BulletDynamics/Dynamics/Bullet-C-API.cpp \ - BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp \ - BulletDynamics/ConstraintSolver/btFixedConstraint.cpp \ - BulletDynamics/ConstraintSolver/btGearConstraint.cpp \ - BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp \ - BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp \ - BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp \ - BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp \ - BulletDynamics/ConstraintSolver/btTypedConstraint.cpp \ - BulletDynamics/ConstraintSolver/btContactConstraint.cpp \ - BulletDynamics/ConstraintSolver/btSliderConstraint.cpp \ - BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp \ - BulletDynamics/ConstraintSolver/btHingeConstraint.cpp \ - BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp \ - BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp \ - BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp \ - BulletDynamics/Vehicle/btWheelInfo.cpp \ - BulletDynamics/Vehicle/btRaycastVehicle.cpp \ - BulletDynamics/Character/btKinematicCharacterController.cpp \ - BulletDynamics/Character/btKinematicCharacterController.h \ - BulletDynamics/Character/btCharacterControllerInterface.h \ - BulletDynamics/Dynamics/btActionInterface.h \ - BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \ - BulletDynamics/Dynamics/btRigidBody.h \ - BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \ - BulletDynamics/Dynamics/btDynamicsWorld.h \ - BulletDynamics/ConstraintSolver/btSolverBody.h \ - BulletDynamics/ConstraintSolver/btConstraintSolver.h \ - BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \ - BulletDynamics/ConstraintSolver/btTypedConstraint.h \ - BulletDynamics/ConstraintSolver/btContactSolverInfo.h \ - BulletDynamics/ConstraintSolver/btContactConstraint.h \ - BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h \ - BulletDynamics/ConstraintSolver/btJacobianEntry.h \ - BulletDynamics/ConstraintSolver/btSolverConstraint.h \ - BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h \ - BulletDynamics/ConstraintSolver/btGearConstraint.h \ - BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \ - BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \ - BulletDynamics/ConstraintSolver/btSliderConstraint.h \ - BulletDynamics/ConstraintSolver/btHingeConstraint.h \ - BulletDynamics/ConstraintSolver/btHinge2Constraint.h \ - BulletDynamics/ConstraintSolver/btUniversalConstraint.h \ - BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h \ - BulletDynamics/Vehicle/btVehicleRaycaster.h \ - BulletDynamics/Vehicle/btRaycastVehicle.h \ - BulletDynamics/Vehicle/btWheelInfo.h \ - BulletDynamics/Featherstone/btMultiBody.cpp \ - BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp \ - BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp \ - BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp \ - BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp \ - BulletDynamics/Featherstone/btMultiBodyJointMotor.h \ - BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h \ - BulletDynamics/Featherstone/btMultiBody.h \ - BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h \ - BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h \ - BulletDynamics/Featherstone/btMultiBodyLink.h \ - BulletDynamics/Featherstone/btMultiBodyLinkCollider.h \ - BulletDynamics/Featherstone/btMultiBodySolverConstraint.h \ - BulletDynamics/Featherstone/btMultiBodyConstraint.h \ - BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \ - BulletDynamics/Featherstone/btMultiBodyConstraint.cpp \ - BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp \ - BulletDynamics/MLCPSolvers/btDantzigLCP.cpp \ - BulletDynamics/MLCPSolvers/btMLCPSolver.cpp \ - BulletDynamics/MLCPSolvers/btDantzigLCP.h \ - BulletDynamics/MLCPSolvers/btDantzigSolver.h \ - BulletDynamics/MLCPSolvers/btMLCPSolver.h \ - BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h \ - BulletDynamics/MLCPSolvers/btPATHSolver.h \ - BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h - - - - -libBulletSoftBody_la_SOURCES = \ - BulletSoftBody/btDefaultSoftBodySolver.cpp \ - BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp \ - BulletSoftBody/btSoftBody.cpp \ - BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp \ - BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp \ - BulletSoftBody/btSoftRigidDynamicsWorld.cpp \ - BulletSoftBody/btSoftBodyHelpers.cpp \ - BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp \ - BulletSoftBody/btSparseSDF.h \ - BulletSoftBody/btSoftRigidCollisionAlgorithm.h \ - BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h \ - BulletSoftBody/btSoftBody.h \ - BulletSoftBody/btSoftSoftCollisionAlgorithm.h \ - BulletSoftBody/btSoftBodyInternals.h \ - BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h \ - BulletSoftBody/btSoftRigidDynamicsWorld.h \ - BulletSoftBody/btSoftBodyHelpers.h - - - -nobase_bullet_include_HEADERS += \ - BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h \ - BulletSoftBody/btSoftBodyInternals.h \ - BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h \ - BulletSoftBody/btSoftSoftCollisionAlgorithm.h \ - BulletSoftBody/btSoftBody.h \ - BulletSoftBody/btSoftBodyHelpers.h \ - BulletSoftBody/btSparseSDF.h \ - BulletSoftBody/btSoftRigidCollisionAlgorithm.h \ - BulletSoftBody/btSoftRigidDynamicsWorld.h \ - BulletDynamics/Vehicle/btRaycastVehicle.h \ - BulletDynamics/Vehicle/btWheelInfo.h \ - BulletDynamics/Vehicle/btVehicleRaycaster.h \ - BulletDynamics/Dynamics/btActionInterface.h \ - BulletDynamics/Dynamics/btRigidBody.h \ - BulletDynamics/Dynamics/btDynamicsWorld.h \ - BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \ - BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h \ - BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h \ - BulletDynamics/ConstraintSolver/btSolverConstraint.h \ - BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h \ - BulletDynamics/ConstraintSolver/btTypedConstraint.h \ - BulletDynamics/ConstraintSolver/btSliderConstraint.h \ - BulletDynamics/ConstraintSolver/btConstraintSolver.h \ - BulletDynamics/ConstraintSolver/btContactConstraint.h \ - BulletDynamics/ConstraintSolver/btContactSolverInfo.h \ - BulletDynamics/ConstraintSolver/btGearConstraint.h \ - BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h \ - BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h \ - BulletDynamics/ConstraintSolver/btJacobianEntry.h \ - BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h \ - BulletDynamics/ConstraintSolver/btConeTwistConstraint.h \ - BulletDynamics/ConstraintSolver/btHingeConstraint.h \ - BulletDynamics/ConstraintSolver/btHinge2Constraint.h \ - BulletDynamics/ConstraintSolver/btUniversalConstraint.h \ - BulletDynamics/ConstraintSolver/btSolverBody.h \ - BulletDynamics/Character/btCharacterControllerInterface.h \ - BulletDynamics/Character/btKinematicCharacterController.h \ - BulletDynamics/Featherstone/btMultiBody.h \ - BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h \ - BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h \ - BulletDynamics/Featherstone/btMultiBodyLink.h \ - BulletDynamics/Featherstone/btMultiBodyLinkCollider.h \ - BulletDynamics/Featherstone/btMultiBodySolverConstraint.h \ - BulletDynamics/Featherstone/btMultiBodyConstraint.h \ - BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \ - BulletDynamics/MLCPSolvers/btDantzigLCP.h \ - BulletDynamics/MLCPSolvers/btDantzigSolver.h \ - BulletDynamics/MLCPSolvers/btMLCPSolver.h \ - BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h \ - BulletDynamics/MLCPSolvers/btPATHSolver.h \ - BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h \ - BulletCollision/CollisionShapes/btShapeHull.h \ - BulletCollision/CollisionShapes/btConcaveShape.h \ - BulletCollision/CollisionShapes/btCollisionMargin.h \ - BulletCollision/CollisionShapes/btCompoundShape.h \ - BulletCollision/CollisionShapes/btConvexHullShape.h \ - BulletCollision/CollisionShapes/btCylinderShape.h \ - BulletCollision/CollisionShapes/btTriangleMesh.h \ - BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h \ - BulletCollision/CollisionShapes/btUniformScalingShape.h \ - BulletCollision/CollisionShapes/btConvexPointCloudShape.h \ - BulletCollision/CollisionShapes/btTetrahedronShape.h \ - BulletCollision/CollisionShapes/btCapsuleShape.h \ - BulletCollision/CollisionShapes/btSphereShape.h \ - BulletCollision/CollisionShapes/btMultiSphereShape.h \ - BulletCollision/CollisionShapes/btConvexInternalShape.h \ - BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btStridingMeshInterface.h \ - BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btEmptyShape.h \ - BulletCollision/CollisionShapes/btOptimizedBvh.h \ - BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btTriangleCallback.h \ - BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h \ - BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h \ - BulletCollision/CollisionShapes/btTriangleInfoMap.h \ - BulletCollision/CollisionShapes/btTriangleBuffer.h \ - BulletCollision/CollisionShapes/btConvexShape.h \ - BulletCollision/CollisionShapes/btConvex2dShape.h \ - BulletCollision/CollisionShapes/btStaticPlaneShape.h \ - BulletCollision/CollisionShapes/btConeShape.h \ - BulletCollision/CollisionShapes/btCollisionShape.h \ - BulletCollision/CollisionShapes/btTriangleShape.h \ - BulletCollision/CollisionShapes/btBoxShape.h \ - BulletCollision/CollisionShapes/btBox2dShape.h \ - BulletCollision/CollisionShapes/btMinkowskiSumShape.h \ - BulletCollision/CollisionShapes/btTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btMaterial.h \ - BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h \ - BulletCollision/CollisionShapes/btPolyhedralConvexShape.h \ - BulletCollision/NarrowPhaseCollision/btConvexCast.h \ - BulletCollision/NarrowPhaseCollision/btGjkEpa2.h \ - BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h \ - BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h \ - BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h \ - BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h \ - BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h \ - BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h \ - BulletCollision/NarrowPhaseCollision/btPersistentManifold.h \ - BulletCollision/NarrowPhaseCollision/btManifoldPoint.h \ - BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h \ - BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h \ - BulletCollision/NarrowPhaseCollision/btRaycastCallback.h \ - BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h \ - BulletCollision/NarrowPhaseCollision/btPointCollector.h \ - BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h \ - BulletCollision/BroadphaseCollision/btDbvt.h \ - BulletCollision/BroadphaseCollision/btDispatcher.h \ - BulletCollision/BroadphaseCollision/btDbvtBroadphase.h \ - BulletCollision/BroadphaseCollision/btSimpleBroadphase.h \ - BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h \ - BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h \ - BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h \ - BulletCollision/BroadphaseCollision/btQuantizedBvh.h \ - BulletCollision/BroadphaseCollision/btAxisSweep3.h \ - BulletCollision/BroadphaseCollision/btBroadphaseInterface.h \ - BulletCollision/BroadphaseCollision/btOverlappingPairCache.h \ - BulletCollision/BroadphaseCollision/btBroadphaseProxy.h \ - BulletCollision/CollisionDispatch/btUnionFind.h \ - BulletCollision/CollisionDispatch/btCollisionConfiguration.h \ - BulletCollision/CollisionDispatch/btCollisionDispatcher.h \ - BulletCollision/CollisionDispatch/SphereTriangleDetector.h \ - BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btCollisionWorld.h \ - BulletCollision/CollisionDispatch/btCollisionCreateFunc.h \ - BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h \ - BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h \ - BulletCollision/CollisionDispatch/btCollisionObject.h \ - BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h \ - BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \ - BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btHashedSimplePairCache.h \ - BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btGhostObject.h \ - BulletCollision/CollisionDispatch/btSimulationIslandManager.h \ - BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btBoxBoxDetector.h \ - BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h \ - BulletCollision/CollisionDispatch/btInternalEdgeUtility.h \ - BulletCollision/CollisionDispatch/btManifoldResult.h \ - BulletCollision/Gimpact/gim_memory.h \ - BulletCollision/Gimpact/gim_clip_polygon.h \ - BulletCollision/Gimpact/gim_bitset.h \ - BulletCollision/Gimpact/gim_linear_math.h \ - BulletCollision/Gimpact/btGeometryOperations.h \ - BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h \ - BulletCollision/Gimpact/btGImpactBvh.h \ - BulletCollision/Gimpact/gim_box_set.h \ - BulletCollision/Gimpact/gim_array.h \ - BulletCollision/Gimpact/btGImpactShape.h \ - BulletCollision/Gimpact/btTriangleShapeEx.h \ - BulletCollision/Gimpact/btClipPolygon.h \ - BulletCollision/Gimpact/gim_box_collision.h \ - BulletCollision/Gimpact/gim_tri_collision.h \ - BulletCollision/Gimpact/gim_geometry.h \ - BulletCollision/Gimpact/gim_math.h \ - BulletCollision/Gimpact/btQuantization.h \ - BulletCollision/Gimpact/btGImpactQuantizedBvh.h \ - BulletCollision/Gimpact/gim_geom_types.h \ - BulletCollision/Gimpact/gim_basic_geometry_operations.h \ - BulletCollision/Gimpact/gim_contact.h \ - BulletCollision/Gimpact/gim_hash_table.h \ - BulletCollision/Gimpact/gim_radixsort.h \ - BulletCollision/Gimpact/btGImpactMassUtil.h \ - BulletCollision/Gimpact/btGenericPoolAllocator.h \ - BulletCollision/Gimpact/btBoxCollision.h \ - BulletCollision/Gimpact/btContactProcessing.h \ - LinearMath/btGeometryUtil.h \ - LinearMath/btConvexHull.h \ - LinearMath/btList.h \ - LinearMath/btMatrix3x3.h \ - LinearMath/btVector3.h \ - LinearMath/btPoolAllocator.h \ - LinearMath/btPolarDecomposition.h \ - LinearMath/btScalar.h \ - LinearMath/btDefaultMotionState.h \ - LinearMath/btTransform.h \ - LinearMath/btQuadWord.h \ - LinearMath/btAabbUtil2.h \ - LinearMath/btTransformUtil.h \ - LinearMath/btRandom.h \ - LinearMath/btQuaternion.h \ - LinearMath/btMinMax.h \ - LinearMath/btMotionState.h \ - LinearMath/btIDebugDraw.h \ - LinearMath/btAlignedAllocator.h \ - LinearMath/btStackAlloc.h \ - LinearMath/btAlignedObjectArray.h \ - LinearMath/btHashMap.h \ - LinearMath/btQuickprof.h\ - LinearMath/btSerializer.h diff --git a/Engine/lib/bullet/src/MiniCL/CMakeLists.txt b/Engine/lib/bullet/src/MiniCL/CMakeLists.txt deleted file mode 100644 index f351b1ce7..000000000 --- a/Engine/lib/bullet/src/MiniCL/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -#MiniCL provides a small subset of OpenCL - -INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/src - ${VECTOR_MATH_INCLUDE} -) - -SET(MiniCL_SRCS - MiniCL.cpp - MiniCLTaskScheduler.cpp - MiniCLTask/MiniCLTask.cpp -) - -SET(Root_HDRS - MiniCLTaskScheduler.h - cl.h - cl_gl.h - cl_platform.h - cl_MiniCL_Defs.h -) - -SET(MiniCLTask_HDRS - MiniCLTask/MiniCLTask.h -) - -SET(MiniCL_HDRS - ${Root_HDRS} - ${MiniCLTask_HDRS} -) - -ADD_LIBRARY(MiniCL ${MiniCL_SRCS} ${MiniCL_HDRS} ) -SET_TARGET_PROPERTIES(MiniCL PROPERTIES VERSION ${BULLET_VERSION}) -SET_TARGET_PROPERTIES(MiniCL PROPERTIES SOVERSION ${BULLET_VERSION}) - - -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(MiniCL BulletMultiThreaded BulletDynamics BulletCollision) -ENDIF (BUILD_SHARED_LIBS) - -IF (INSTALL_LIBS) - IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - #INSTALL of other files requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) -# IF(INSTALL_EXTRA_LIBS) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS MiniCL DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS MiniCL - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY -${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING -PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -# ENDIF (INSTALL_EXTRA_LIBS) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(MiniCL PROPERTIES FRAMEWORK true) - - SET_TARGET_PROPERTIES(MiniCL PROPERTIES PUBLIC_HEADER "${Root_HDRS}") - # Have to list out sub-directories manually: - SET_PROPERTY(SOURCE ${MiniCLTask_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MiniCLTask) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) -ENDIF (INSTALL_LIBS) - diff --git a/Engine/lib/bullet/src/MiniCL/MiniCL.cpp b/Engine/lib/bullet/src/MiniCL/MiniCL.cpp deleted file mode 100644 index ba0865aa7..000000000 --- a/Engine/lib/bullet/src/MiniCL/MiniCL.cpp +++ /dev/null @@ -1,788 +0,0 @@ -/* - Copyright (C) 2010 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - - -#include "MiniCL/cl.h" -#define __PHYSICS_COMMON_H__ 1 -#ifdef _WIN32 -#include "BulletMultiThreaded/Win32ThreadSupport.h" -#endif - -#include "BulletMultiThreaded/PlatformDefinitions.h" -#ifdef USE_PTHREADS -#include "BulletMultiThreaded/PosixThreadSupport.h" -#endif - - -#include "BulletMultiThreaded/SequentialThreadSupport.h" -#include "MiniCLTaskScheduler.h" -#include "MiniCLTask/MiniCLTask.h" -#include "LinearMath/btMinMax.h" -#include -#include - -//#define DEBUG_MINICL_KERNELS 1 - -static const char* spPlatformID = "MiniCL, SCEA"; -static const char* spDriverVersion= "1.0"; - -CL_API_ENTRY cl_int CL_API_CALL clGetPlatformIDs( - cl_uint num_entries, - cl_platform_id * platforms, - cl_uint * num_platforms ) CL_API_SUFFIX__VERSION_1_0 -{ - if(platforms != NULL) - { - if(num_entries <= 0) - { - return CL_INVALID_VALUE; - } - *((const char**)platforms) = spPlatformID; - } - if(num_platforms != NULL) - { - *num_platforms = 1; - } - return CL_SUCCESS; -} - - -CL_API_ENTRY cl_int CL_API_CALL clGetPlatformInfo( - cl_platform_id platform, - cl_platform_info param_name, - size_t param_value_size, - void * param_value, - size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_1_0 -{ - char* pId = (char*)platform; - if(strcmp(pId, spPlatformID)) - { - return CL_INVALID_PLATFORM; - } - switch(param_name) - { - case CL_PLATFORM_VERSION: - { - if(param_value_size < (strlen(spDriverVersion) + 1)) - { - return CL_INVALID_VALUE; - } - strcpy((char*)param_value, spDriverVersion); - if(param_value_size_ret != NULL) - { - *param_value_size_ret = strlen(spDriverVersion) + 1; - } - break; - } - case CL_PLATFORM_NAME: - case CL_PLATFORM_VENDOR : - if(param_value_size < (strlen(spPlatformID) + 1)) - { - return CL_INVALID_VALUE; - } - strcpy((char*)param_value, spPlatformID); - if(param_value_size_ret != NULL) - { - *param_value_size_ret = strlen(spPlatformID) + 1; - } - break; - default : - return CL_INVALID_VALUE; - } - return CL_SUCCESS; -} - - - - -CL_API_ENTRY cl_int CL_API_CALL clGetDeviceInfo( - cl_device_id device , - cl_device_info param_name , - size_t param_value_size , - void * param_value , - size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_1_0 -{ - - switch (param_name) - { - case CL_DEVICE_NAME: - { - char deviceName[] = "MiniCL CPU"; - unsigned int nameLen = (unsigned int)strlen(deviceName)+1; - btAssert(param_value_size>strlen(deviceName)); - if (nameLen < param_value_size) - { - const char* cpuName = "MiniCL CPU"; - sprintf((char*)param_value,"%s",cpuName); - } else - { - printf("error: param_value_size should be at least %d, but it is %zu\n",nameLen,param_value_size); - return CL_INVALID_VALUE; - } - break; - } - case CL_DEVICE_TYPE: - { - if (param_value_size>=sizeof(cl_device_type)) - { - cl_device_type* deviceType = (cl_device_type*)param_value; - *deviceType = CL_DEVICE_TYPE_CPU; - } else - { - printf("error: param_value_size should be at least %zu\n",sizeof(cl_device_type)); - return CL_INVALID_VALUE; - } - break; - } - case CL_DEVICE_MAX_COMPUTE_UNITS: - { - if (param_value_size>=sizeof(cl_uint)) - { - cl_uint* numUnits = (cl_uint*)param_value; - *numUnits= 4; - } else - { - printf("error: param_value_size should be at least %zu\n",sizeof(cl_uint)); - return CL_INVALID_VALUE; - } - - break; - } - case CL_DEVICE_MAX_WORK_ITEM_SIZES: - { - size_t workitem_size[3]; - - if (param_value_size>=sizeof(workitem_size)) - { - size_t* workItemSize = (size_t*)param_value; - workItemSize[0] = 64; - workItemSize[1] = 24; - workItemSize[2] = 16; - } else - { - printf("error: param_value_size should be at least %zu\n",sizeof(cl_uint)); - return CL_INVALID_VALUE; - } - break; - } - case CL_DEVICE_MAX_CLOCK_FREQUENCY: - { - cl_uint* clock_frequency = (cl_uint*)param_value; - *clock_frequency = 3*1024; - break; - } - - case CL_DEVICE_VENDOR : - { - if(param_value_size < (strlen(spPlatformID) + 1)) - { - return CL_INVALID_VALUE; - } - strcpy((char*)param_value, spPlatformID); - if(param_value_size_ret != NULL) - { - *param_value_size_ret = strlen(spPlatformID) + 1; - } - break; - } - case CL_DRIVER_VERSION: - { - if(param_value_size < (strlen(spDriverVersion) + 1)) - { - return CL_INVALID_VALUE; - } - strcpy((char*)param_value, spDriverVersion); - if(param_value_size_ret != NULL) - { - *param_value_size_ret = strlen(spDriverVersion) + 1; - } - - break; - } - case CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS: - { - cl_uint* maxDimensions = (cl_uint*)param_value; - *maxDimensions = 1; - break; - } - case CL_DEVICE_MAX_WORK_GROUP_SIZE: - { - cl_uint* maxWorkGroupSize = (cl_uint*)param_value; - *maxWorkGroupSize = 128;//1; - break; - } - case CL_DEVICE_ADDRESS_BITS: - { - cl_uint* addressBits = (cl_uint*)param_value; - *addressBits= 32; //@todo: should this be 64 for 64bit builds? - break; - } - case CL_DEVICE_MAX_MEM_ALLOC_SIZE: - { - cl_ulong* maxMemAlloc = (cl_ulong*)param_value; - *maxMemAlloc= 512*1024*1024; //this "should be enough for everyone" ? - break; - } - case CL_DEVICE_GLOBAL_MEM_SIZE: - { - cl_ulong* maxMemAlloc = (cl_ulong*)param_value; - *maxMemAlloc= 1024*1024*1024; //this "should be enough for everyone" ? - break; - } - - case CL_DEVICE_ERROR_CORRECTION_SUPPORT: - { - cl_bool* error_correction_support = (cl_bool*)param_value; - *error_correction_support = CL_FALSE; - break; - } - - case CL_DEVICE_LOCAL_MEM_TYPE: - { - cl_device_local_mem_type* local_mem_type = (cl_device_local_mem_type*)param_value; - *local_mem_type = CL_GLOBAL; - break; - } - case CL_DEVICE_LOCAL_MEM_SIZE: - { - cl_ulong* localmem = (cl_ulong*) param_value; - *localmem = 32*1024; - break; - } - - case CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE: - { - cl_ulong* localmem = (cl_ulong*) param_value; - *localmem = 64*1024; - break; - } - case CL_DEVICE_QUEUE_PROPERTIES: - { - cl_command_queue_properties* queueProp = (cl_command_queue_properties*) param_value; - memset(queueProp,0,param_value_size); - - break; - } - case CL_DEVICE_IMAGE_SUPPORT: - { - cl_bool* imageSupport = (cl_bool*) param_value; - *imageSupport = CL_FALSE; - break; - } - - case CL_DEVICE_MAX_WRITE_IMAGE_ARGS: - case CL_DEVICE_MAX_READ_IMAGE_ARGS: - { - cl_uint* imageArgs = (cl_uint*) param_value; - *imageArgs = 0; - break; - } - case CL_DEVICE_IMAGE3D_MAX_DEPTH: - case CL_DEVICE_IMAGE3D_MAX_HEIGHT: - case CL_DEVICE_IMAGE2D_MAX_HEIGHT: - case CL_DEVICE_IMAGE3D_MAX_WIDTH: - case CL_DEVICE_IMAGE2D_MAX_WIDTH: - { - size_t* maxSize = (size_t*) param_value; - *maxSize = 0; - break; - } - - case CL_DEVICE_EXTENSIONS: - { - char* extensions = (char*) param_value; - *extensions = 0; - break; - } - - case CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE: - case CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT: - case CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG: - case CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT: - case CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT: - case CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR: - { - cl_uint* width = (cl_uint*) param_value; - *width = 1; - break; - } - - default: - { - printf("error: unsupported param_name:%d\n",param_name); - } - } - - - return 0; -} - -CL_API_ENTRY cl_int CL_API_CALL clReleaseMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0 -{ - return 0; -} - - - -CL_API_ENTRY cl_int CL_API_CALL clReleaseCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0 -{ - return 0; -} - -CL_API_ENTRY cl_int CL_API_CALL clReleaseProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0 -{ - return 0; -} - -CL_API_ENTRY cl_int CL_API_CALL clReleaseKernel(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0 -{ - return 0; -} - - -// Enqueued Commands APIs -CL_API_ENTRY cl_int CL_API_CALL clEnqueueReadBuffer(cl_command_queue command_queue , - cl_mem buffer , - cl_bool /* blocking_read */, - size_t offset , - size_t cb , - void * ptr , - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0 -{ - MiniCLTaskScheduler* scheduler = (MiniCLTaskScheduler*) command_queue; - - ///wait for all work items to be completed - scheduler->flush(); - - memcpy(ptr,(char*)buffer + offset,cb); - return 0; -} - - -CL_API_ENTRY cl_int clGetProgramBuildInfo(cl_program /* program */, - cl_device_id /* device */, - cl_program_build_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0 -{ - - return 0; -} - - -// Program Object APIs -CL_API_ENTRY cl_program -clCreateProgramWithSource(cl_context context , - cl_uint /* count */, - const char ** /* strings */, - const size_t * /* lengths */, - cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - *errcode_ret = CL_SUCCESS; - return (cl_program)context; -} - -CL_API_ENTRY cl_int CL_API_CALL clEnqueueWriteBuffer(cl_command_queue command_queue , - cl_mem buffer , - cl_bool /* blocking_read */, - size_t offset, - size_t cb , - const void * ptr , - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0 -{ - MiniCLTaskScheduler* scheduler = (MiniCLTaskScheduler*) command_queue; - - ///wait for all work items to be completed - scheduler->flush(); - - memcpy((char*)buffer + offset, ptr,cb); - return 0; -} - -CL_API_ENTRY cl_int CL_API_CALL clFlush(cl_command_queue command_queue) -{ - MiniCLTaskScheduler* scheduler = (MiniCLTaskScheduler*) command_queue; - ///wait for all work items to be completed - scheduler->flush(); - return 0; -} - - -CL_API_ENTRY cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue /* command_queue */, - cl_kernel clKernel , - cl_uint work_dim , - const size_t * /* global_work_offset */, - const size_t * global_work_size , - const size_t * /* local_work_size */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0 -{ - - - MiniCLKernel* kernel = (MiniCLKernel*) clKernel; - for (unsigned int ii=0;iim_scheduler->getMaxNumOutstandingTasks(); - int numWorkItems = global_work_size[ii]; - -// //at minimum 64 work items per task -// int numWorkItemsPerTask = btMax(64,numWorkItems / maxTask); - int numWorkItemsPerTask = numWorkItems / maxTask; - if (!numWorkItemsPerTask) numWorkItemsPerTask = 1; - - for (int t=0;tm_scheduler->issueTask(t, endIndex, kernel); - t = endIndex; - } - } -/* - - void* bla = 0; - - scheduler->issueTask(bla,2,3); - scheduler->flush(); - - */ - - return 0; -} - -#define LOCAL_BUF_SIZE 32768 -static int sLocalMemBuf[LOCAL_BUF_SIZE * 4 + 16]; -static int* spLocalBufCurr = NULL; -static int sLocalBufUsed = LOCAL_BUF_SIZE; // so it will be reset at the first call -static void* localBufMalloc(int size) -{ - int size16 = (size + 15) >> 4; // in 16-byte units - if((sLocalBufUsed + size16) > LOCAL_BUF_SIZE) - { // reset - spLocalBufCurr = sLocalMemBuf; - while((size_t)spLocalBufCurr & 0x0F) spLocalBufCurr++; // align to 16 bytes - sLocalBufUsed = 0; - } - void* ret = spLocalBufCurr; - spLocalBufCurr += size16 * 4; - sLocalBufUsed += size; - return ret; -} - - - -CL_API_ENTRY cl_int CL_API_CALL clSetKernelArg(cl_kernel clKernel , - cl_uint arg_index , - size_t arg_size , - const void * arg_value ) CL_API_SUFFIX__VERSION_1_0 -{ - MiniCLKernel* kernel = (MiniCLKernel* ) clKernel; - btAssert(arg_size <= MINICL_MAX_ARGLENGTH); - if (arg_index>MINI_CL_MAX_ARG) - { - printf("error: clSetKernelArg arg_index (%u) exceeds %u\n",arg_index,MINI_CL_MAX_ARG); - } else - { - if (arg_size>MINICL_MAX_ARGLENGTH) - //if (arg_size != MINICL_MAX_ARGLENGTH) - { - printf("error: clSetKernelArg argdata too large: %zu (maximum is %zu)\n",arg_size,MINICL_MAX_ARGLENGTH); - } - else - { - if(arg_value == NULL) - { // this is only for __local memory qualifier - void* ptr = localBufMalloc(arg_size); - kernel->m_argData[arg_index] = ptr; - } - else - { - memcpy(&(kernel->m_argData[arg_index]), arg_value, arg_size); - } - kernel->m_argSizes[arg_index] = arg_size; - if(arg_index >= kernel->m_numArgs) - { - kernel->m_numArgs = arg_index + 1; - kernel->updateLauncher(); - } - } - } - return 0; -} - -// Kernel Object APIs -CL_API_ENTRY cl_kernel CL_API_CALL clCreateKernel(cl_program program , - const char * kernel_name , - cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - MiniCLTaskScheduler* scheduler = (MiniCLTaskScheduler*) program; - int nameLen = strlen(kernel_name); - if(nameLen >= MINI_CL_MAX_KERNEL_NAME) - { - *errcode_ret = CL_INVALID_KERNEL_NAME; - return NULL; - } - - MiniCLKernel* kernel = new MiniCLKernel(); - - strcpy(kernel->m_name, kernel_name); - kernel->m_numArgs = 0; - - //kernel->m_kernelProgramCommandId = scheduler->findProgramCommandIdByName(kernel_name); - //if (kernel->m_kernelProgramCommandId>=0) - //{ - // *errcode_ret = CL_SUCCESS; - //} else - //{ - // *errcode_ret = CL_INVALID_KERNEL_NAME; - //} - kernel->m_scheduler = scheduler; - if(kernel->registerSelf() == NULL) - { - *errcode_ret = CL_INVALID_KERNEL_NAME; - delete kernel; - return NULL; - } - else - { - *errcode_ret = CL_SUCCESS; - } - - return (cl_kernel)kernel; - -} - - -CL_API_ENTRY cl_int CL_API_CALL clBuildProgram(cl_program /* program */, - cl_uint /* num_devices */, - const cl_device_id * /* device_list */, - const char * /* options */, - void (*pfn_notify)(cl_program /* program */, void * /* user_data */), - void * /* user_data */) CL_API_SUFFIX__VERSION_1_0 -{ - return CL_SUCCESS; -} - -CL_API_ENTRY cl_program CL_API_CALL clCreateProgramWithBinary(cl_context context , - cl_uint /* num_devices */, - const cl_device_id * /* device_list */, - const size_t * /* lengths */, - const unsigned char ** /* binaries */, - cl_int * /* binary_status */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0 -{ - return (cl_program)context; -} - - -// Memory Object APIs -CL_API_ENTRY cl_mem CL_API_CALL clCreateBuffer(cl_context /* context */, - cl_mem_flags flags , - size_t size, - void * host_ptr , - cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - cl_mem buf = (cl_mem)malloc(size); - if ((flags&CL_MEM_COPY_HOST_PTR) && host_ptr) - { - memcpy(buf,host_ptr,size); - } - *errcode_ret = 0; - return buf; -} - -// Command Queue APIs -CL_API_ENTRY cl_command_queue CL_API_CALL clCreateCommandQueue(cl_context context , - cl_device_id /* device */, - cl_command_queue_properties /* properties */, - cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - *errcode_ret = 0; - return (cl_command_queue) context; -} - -extern CL_API_ENTRY cl_int CL_API_CALL clGetContextInfo(cl_context /* context */, - cl_context_info param_name , - size_t param_value_size , - void * param_value, - size_t * param_value_size_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - - switch (param_name) - { - case CL_CONTEXT_DEVICES: - { - if (!param_value_size) - { - *param_value_size_ret = 13; - } else - { - const char* testName = "MiniCL_Test."; - sprintf((char*)param_value,"%s",testName); - } - break; - }; - default: - { - printf("unsupported\n"); - } - } - - return 0; -} - - - -CL_API_ENTRY cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties * /* properties */, - cl_device_type device_type , - void (*pfn_notify)(const char *, const void *, size_t, void *) /* pfn_notify */, - void * /* user_data */, - cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - int maxNumOutstandingTasks = 4; -// int maxNumOutstandingTasks = 2; -// int maxNumOutstandingTasks = 1; - gMiniCLNumOutstandingTasks = maxNumOutstandingTasks; - const int maxNumOfThreadSupports = 8; - static int sUniqueThreadSupportIndex = 0; - static const char* sUniqueThreadSupportName[maxNumOfThreadSupports] = - { - "MiniCL_0", "MiniCL_1", "MiniCL_2", "MiniCL_3", "MiniCL_4", "MiniCL_5", "MiniCL_6", "MiniCL_7" - }; - - btThreadSupportInterface* threadSupport = 0; - - if (device_type==CL_DEVICE_TYPE_DEBUG) - { - SequentialThreadSupport::SequentialThreadConstructionInfo stc("MiniCL",processMiniCLTask,createMiniCLLocalStoreMemory); - threadSupport = new SequentialThreadSupport(stc); - } else - { - -#if _WIN32 - btAssert(sUniqueThreadSupportIndex < maxNumOfThreadSupports); - const char* bla = "MiniCL"; - threadSupport = new Win32ThreadSupport(Win32ThreadSupport::Win32ThreadConstructionInfo( -// bla, - sUniqueThreadSupportName[sUniqueThreadSupportIndex++], - processMiniCLTask, //processCollisionTask, - createMiniCLLocalStoreMemory,//createCollisionLocalStoreMemory, - maxNumOutstandingTasks)); -#else - -#ifdef USE_PTHREADS - PosixThreadSupport::ThreadConstructionInfo constructionInfo("PosixThreads", - processMiniCLTask, - createMiniCLLocalStoreMemory, - maxNumOutstandingTasks); - threadSupport = new PosixThreadSupport(constructionInfo); - -#else - ///todo: add posix thread support for other platforms - SequentialThreadSupport::SequentialThreadConstructionInfo stc("MiniCL",processMiniCLTask,createMiniCLLocalStoreMemory); - threadSupport = new SequentialThreadSupport(stc); -#endif //USE_PTHREADS -#endif - - } - - - MiniCLTaskScheduler* scheduler = new MiniCLTaskScheduler(threadSupport,maxNumOutstandingTasks); - - *errcode_ret = 0; - return (cl_context)scheduler; -} - -CL_API_ENTRY cl_int CL_API_CALL -clGetDeviceIDs(cl_platform_id /* platform */, - cl_device_type /* device_type */, - cl_uint /* num_entries */, - cl_device_id * /* devices */, - cl_uint * /* num_devices */) CL_API_SUFFIX__VERSION_1_0 -{ - return 0; -} - -CL_API_ENTRY cl_context CL_API_CALL -clCreateContext(const cl_context_properties * properties , - cl_uint num_devices , - const cl_device_id * devices , - void (*pfn_notify)(const char *, const void *, size_t, void *), - void * user_data , - cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 -{ - - return clCreateContextFromType(properties,CL_DEVICE_TYPE_ALL,pfn_notify,user_data,errcode_ret); -} - -CL_API_ENTRY cl_int CL_API_CALL clReleaseContext(cl_context context ) CL_API_SUFFIX__VERSION_1_0 -{ - - MiniCLTaskScheduler* scheduler = (MiniCLTaskScheduler*) context; - - btThreadSupportInterface* threadSupport = scheduler->getThreadSupportInterface(); - delete scheduler; - delete threadSupport; - - return 0; -} -extern CL_API_ENTRY cl_int CL_API_CALL -clFinish(cl_command_queue command_queue ) CL_API_SUFFIX__VERSION_1_0 -{ - MiniCLTaskScheduler* scheduler = (MiniCLTaskScheduler*) command_queue; - ///wait for all work items to be completed - scheduler->flush(); - return CL_SUCCESS; -} - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetProgramInfo(cl_program /* program */, - cl_program_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0 -{ - return 0; -} - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetKernelWorkGroupInfo(cl_kernel kernel , - cl_device_id /* device */, - cl_kernel_work_group_info wgi/* param_name */, - size_t sz /* param_value_size */, - void * ptr /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0 -{ - if((wgi == CL_KERNEL_WORK_GROUP_SIZE) - &&(sz == sizeof(size_t)) - &&(ptr != NULL)) - { - MiniCLKernel* miniCLKernel = (MiniCLKernel*)kernel; - MiniCLTaskScheduler* scheduler = miniCLKernel->m_scheduler; - *((size_t*)ptr) = scheduler->getMaxNumOutstandingTasks(); - return CL_SUCCESS; - } - else - { - return CL_INVALID_VALUE; - } -} diff --git a/Engine/lib/bullet/src/MiniCL/MiniCLTask/MiniCLTask.cpp b/Engine/lib/bullet/src/MiniCL/MiniCLTask/MiniCLTask.cpp deleted file mode 100644 index a56e96a0c..000000000 --- a/Engine/lib/bullet/src/MiniCL/MiniCLTask/MiniCLTask.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, Copyright (c) 2007 Erwin Coumans - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - - -#include "MiniCLTask.h" -#include "BulletMultiThreaded/PlatformDefinitions.h" -#include "BulletMultiThreaded/SpuFakeDma.h" -#include "LinearMath/btMinMax.h" -#include "MiniCLTask.h" -#include "MiniCL/MiniCLTaskScheduler.h" - - -#ifdef __SPU__ -#include -#else -#include -#define spu_printf printf -#endif - -int gMiniCLNumOutstandingTasks = 0; - -struct MiniCLTask_LocalStoreMemory -{ - -}; - - -//-- MAIN METHOD -void processMiniCLTask(void* userPtr, void* lsMemory) -{ - // BT_PROFILE("processSampleTask"); - - MiniCLTask_LocalStoreMemory* localMemory = (MiniCLTask_LocalStoreMemory*)lsMemory; - - MiniCLTaskDesc* taskDescPtr = (MiniCLTaskDesc*)userPtr; - MiniCLTaskDesc& taskDesc = *taskDescPtr; - - for (unsigned int i=taskDesc.m_firstWorkUnit;im_launcher(&taskDesc, i); - } - -// printf("Compute Unit[%d] executed kernel %d work items [%d..%d)\n",taskDesc.m_taskId,taskDesc.m_kernelProgramId,taskDesc.m_firstWorkUnit,taskDesc.m_lastWorkUnit); - -} - - -#if defined(__CELLOS_LV2__) || defined (LIBSPE2) - -ATTRIBUTE_ALIGNED16(MiniCLTask_LocalStoreMemory gLocalStoreMemory); - -void* createMiniCLLocalStoreMemory() -{ - return &gLocalStoreMemory; -} -#else -void* createMiniCLLocalStoreMemory() -{ - return new MiniCLTask_LocalStoreMemory; -}; - -#endif diff --git a/Engine/lib/bullet/src/MiniCL/MiniCLTask/MiniCLTask.h b/Engine/lib/bullet/src/MiniCL/MiniCLTask/MiniCLTask.h deleted file mode 100644 index 7e78be085..000000000 --- a/Engine/lib/bullet/src/MiniCL/MiniCLTask/MiniCLTask.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, Copyright (c) 2007 Erwin Coumans - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef MINICL__TASK_H -#define MINICL__TASK_H - -#include "BulletMultiThreaded/PlatformDefinitions.h" -#include "LinearMath/btScalar.h" - -#include "LinearMath/btAlignedAllocator.h" - - -#define MINICL_MAX_ARGLENGTH (sizeof(void*)) -#define MINI_CL_MAX_ARG 16 -#define MINI_CL_MAX_KERNEL_NAME 256 - -struct MiniCLKernel; - -ATTRIBUTE_ALIGNED16(struct) MiniCLTaskDesc -{ - BT_DECLARE_ALIGNED_ALLOCATOR(); - - MiniCLTaskDesc() - { - for (int i=0;i - -#ifdef __SPU__ - - - -void SampleThreadFunc(void* userPtr,void* lsMemory) -{ - //do nothing - printf("hello world\n"); -} - - -void* SamplelsMemoryFunc() -{ - //don't create local store memory, just return 0 - return 0; -} - - -#else - - -#include "BulletMultiThreaded/btThreadSupportInterface.h" - -//# include "SPUAssert.h" -#include - -#include "MiniCL/cl_platform.h" - -extern "C" { - extern char SPU_SAMPLE_ELF_SYMBOL[]; -} - - -MiniCLTaskScheduler::MiniCLTaskScheduler(btThreadSupportInterface* threadInterface, int maxNumOutstandingTasks) -:m_threadInterface(threadInterface), -m_maxNumOutstandingTasks(maxNumOutstandingTasks) -{ - - m_taskBusy.resize(m_maxNumOutstandingTasks); - m_spuSampleTaskDesc.resize(m_maxNumOutstandingTasks); - - m_kernels.resize(0); - - for (int i = 0; i < m_maxNumOutstandingTasks; i++) - { - m_taskBusy[i] = false; - } - m_numBusyTasks = 0; - m_currentTask = 0; - - m_initialized = false; - - m_threadInterface->startSPU(); - - -} - -MiniCLTaskScheduler::~MiniCLTaskScheduler() -{ - m_threadInterface->stopSPU(); - -} - - - -void MiniCLTaskScheduler::initialize() -{ -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("MiniCLTaskScheduler::initialize()\n"); -#endif //DEBUG_SPU_TASK_SCHEDULING - - for (int i = 0; i < m_maxNumOutstandingTasks; i++) - { - m_taskBusy[i] = false; - } - m_numBusyTasks = 0; - m_currentTask = 0; - m_initialized = true; - -} - - -void MiniCLTaskScheduler::issueTask(int firstWorkUnit, int lastWorkUnit, MiniCLKernel* kernel) -{ - -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("MiniCLTaskScheduler::issueTask (m_currentTask= %d\)n", m_currentTask); -#endif //DEBUG_SPU_TASK_SCHEDULING - - m_taskBusy[m_currentTask] = true; - m_numBusyTasks++; - - MiniCLTaskDesc& taskDesc = m_spuSampleTaskDesc[m_currentTask]; - { - // send task description in event message - taskDesc.m_firstWorkUnit = firstWorkUnit; - taskDesc.m_lastWorkUnit = lastWorkUnit; - taskDesc.m_kernel = kernel; - //some bookkeeping to recognize finished tasks - taskDesc.m_taskId = m_currentTask; - -// for (int i=0;im_numArgs; i++) - { - taskDesc.m_argSizes[i] = kernel->m_argSizes[i]; - if (taskDesc.m_argSizes[i]) - { - taskDesc.m_argData[i] = kernel->m_argData[i]; -// memcpy(&taskDesc.m_argData[i],&argData[MINICL_MAX_ARGLENGTH*i],taskDesc.m_argSizes[i]); - } - } - } - - - m_threadInterface->sendRequest(1, (ppu_address_t) &taskDesc, m_currentTask); - - // if all tasks busy, wait for spu event to clear the task. - - if (m_numBusyTasks >= m_maxNumOutstandingTasks) - { - unsigned int taskId; - unsigned int outputSize; - - for (int i=0;iwaitForResponse(&taskId, &outputSize); - - //printf("PPU: after issue, received event: %u %d\n", taskId, outputSize); - - postProcess(taskId, outputSize); - - m_taskBusy[taskId] = false; - - m_numBusyTasks--; - } - - // find new task buffer - for (int i = 0; i < m_maxNumOutstandingTasks; i++) - { - if (!m_taskBusy[i]) - { - m_currentTask = i; - break; - } - } -} - - -///Optional PPU-size post processing for each task -void MiniCLTaskScheduler::postProcess(int taskId, int outputSize) -{ - -} - - -void MiniCLTaskScheduler::flush() -{ -#ifdef DEBUG_SPU_TASK_SCHEDULING - printf("\nSpuCollisionTaskProcess::flush()\n"); -#endif //DEBUG_SPU_TASK_SCHEDULING - - - // all tasks are issued, wait for all tasks to be complete - while(m_numBusyTasks > 0) - { -// Consolidating SPU code - unsigned int taskId; - unsigned int outputSize; - - for (int i=0;iwaitForResponse(&taskId, &outputSize); - } - - //printf("PPU: flushing, received event: %u %d\n", taskId, outputSize); - - postProcess(taskId, outputSize); - - m_taskBusy[taskId] = false; - - m_numBusyTasks--; - } - - -} - - - -typedef void (*MiniCLKernelLauncher0)(int); -typedef void (*MiniCLKernelLauncher1)(void*, int); -typedef void (*MiniCLKernelLauncher2)(void*, void*, int); -typedef void (*MiniCLKernelLauncher3)(void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher4)(void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher5)(void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher6)(void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher7)(void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher8)(void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher9)(void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher10)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher11)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher12)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher13)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher14)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher15)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); -typedef void (*MiniCLKernelLauncher16)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, int); - - -static void kernelLauncher0(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher0)(taskDesc->m_kernel->m_launcher))(guid); -} -static void kernelLauncher1(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher1)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - guid); -} -static void kernelLauncher2(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher2)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - guid); -} -static void kernelLauncher3(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher3)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - guid); -} -static void kernelLauncher4(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher4)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - guid); -} -static void kernelLauncher5(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher5)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - guid); -} -static void kernelLauncher6(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher6)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - guid); -} -static void kernelLauncher7(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher7)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - guid); -} -static void kernelLauncher8(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher8)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - guid); -} -static void kernelLauncher9(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher9)(taskDesc->m_kernel->m_pCode))( taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - guid); -} -static void kernelLauncher10(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher10)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - guid); -} -static void kernelLauncher11(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher11)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - taskDesc->m_argData[10], - guid); -} -static void kernelLauncher12(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher12)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - taskDesc->m_argData[10], - taskDesc->m_argData[11], - guid); -} -static void kernelLauncher13(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher13)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - taskDesc->m_argData[10], - taskDesc->m_argData[11], - taskDesc->m_argData[12], - guid); -} -static void kernelLauncher14(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher14)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - taskDesc->m_argData[10], - taskDesc->m_argData[11], - taskDesc->m_argData[12], - taskDesc->m_argData[13], - guid); -} -static void kernelLauncher15(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher15)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - taskDesc->m_argData[10], - taskDesc->m_argData[11], - taskDesc->m_argData[12], - taskDesc->m_argData[13], - taskDesc->m_argData[14], - guid); -} -static void kernelLauncher16(MiniCLTaskDesc* taskDesc, int guid) -{ - ((MiniCLKernelLauncher16)(taskDesc->m_kernel->m_pCode))(taskDesc->m_argData[0], - taskDesc->m_argData[1], - taskDesc->m_argData[2], - taskDesc->m_argData[3], - taskDesc->m_argData[4], - taskDesc->m_argData[5], - taskDesc->m_argData[6], - taskDesc->m_argData[7], - taskDesc->m_argData[8], - taskDesc->m_argData[9], - taskDesc->m_argData[10], - taskDesc->m_argData[11], - taskDesc->m_argData[12], - taskDesc->m_argData[13], - taskDesc->m_argData[14], - taskDesc->m_argData[15], - guid); -} - -static kernelLauncherCB spLauncherList[MINI_CL_MAX_ARG+1] = -{ - kernelLauncher0, - kernelLauncher1, - kernelLauncher2, - kernelLauncher3, - kernelLauncher4, - kernelLauncher5, - kernelLauncher6, - kernelLauncher7, - kernelLauncher8, - kernelLauncher9, - kernelLauncher10, - kernelLauncher11, - kernelLauncher12, - kernelLauncher13, - kernelLauncher14, - kernelLauncher15, - kernelLauncher16 -}; - -void MiniCLKernel::updateLauncher() -{ - m_launcher = spLauncherList[m_numArgs]; -} - -struct MiniCLKernelDescEntry -{ - void* pCode; - const char* pName; -}; -static MiniCLKernelDescEntry spKernelDesc[256]; -static int sNumKernelDesc = 0; - -MiniCLKernelDesc::MiniCLKernelDesc(void* pCode, const char* pName) -{ - for(int i = 0; i < sNumKernelDesc; i++) - { - if(!strcmp(pName, spKernelDesc[i].pName)) - { // already registered - btAssert(spKernelDesc[i].pCode == pCode); - return; - } - } - spKernelDesc[sNumKernelDesc].pCode = pCode; - spKernelDesc[sNumKernelDesc].pName = pName; - sNumKernelDesc++; -} - - -MiniCLKernel* MiniCLKernel::registerSelf() -{ - m_scheduler->registerKernel(this); - for(int i = 0; i < sNumKernelDesc; i++) - { - if(!strcmp(m_name, spKernelDesc[i].pName)) - { - m_pCode = spKernelDesc[i].pCode; - return this; - } - } - return NULL; -} - -#endif - - -#endif //USE_SAMPLE_PROCESS diff --git a/Engine/lib/bullet/src/MiniCL/MiniCLTaskScheduler.h b/Engine/lib/bullet/src/MiniCL/MiniCLTaskScheduler.h deleted file mode 100644 index 3061a7134..000000000 --- a/Engine/lib/bullet/src/MiniCL/MiniCLTaskScheduler.h +++ /dev/null @@ -1,194 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library -Copyright (c) 2003-2007 Erwin Coumans http://bulletphysics.com - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -*/ - - - -#ifndef MINICL_TASK_SCHEDULER_H -#define MINICL_TASK_SCHEDULER_H - -#include - - -#include "BulletMultiThreaded/PlatformDefinitions.h" - -#include - -#include "LinearMath/btAlignedObjectArray.h" - - -#include "MiniCLTask/MiniCLTask.h" - -//just add your commands here, try to keep them globally unique for debugging purposes -#define CMD_SAMPLE_TASK_COMMAND 10 - -struct MiniCLKernel; - -/// MiniCLTaskScheduler handles SPU processing of collision pairs. -/// When PPU issues a task, it will look for completed task buffers -/// PPU will do postprocessing, dependent on workunit output (not likely) -class MiniCLTaskScheduler -{ - // track task buffers that are being used, and total busy tasks - btAlignedObjectArray m_taskBusy; - btAlignedObjectArray m_spuSampleTaskDesc; - - - btAlignedObjectArray m_kernels; - - - int m_numBusyTasks; - - // the current task and the current entry to insert a new work unit - int m_currentTask; - - bool m_initialized; - - void postProcess(int taskId, int outputSize); - - class btThreadSupportInterface* m_threadInterface; - - int m_maxNumOutstandingTasks; - - - -public: - MiniCLTaskScheduler(btThreadSupportInterface* threadInterface, int maxNumOutstandingTasks); - - ~MiniCLTaskScheduler(); - - ///call initialize in the beginning of the frame, before addCollisionPairToTask - void initialize(); - - void issueTask(int firstWorkUnit, int lastWorkUnit, MiniCLKernel* kernel); - - ///call flush to submit potential outstanding work to SPUs and wait for all involved SPUs to be finished - void flush(); - - class btThreadSupportInterface* getThreadSupportInterface() - { - return m_threadInterface; - } - - int findProgramCommandIdByName(const char* programName) const; - - int getMaxNumOutstandingTasks() const - { - return m_maxNumOutstandingTasks; - } - - void registerKernel(MiniCLKernel* kernel) - { - m_kernels.push_back(kernel); - } -}; - -typedef void (*kernelLauncherCB)(MiniCLTaskDesc* taskDesc, int guid); - -struct MiniCLKernel -{ - MiniCLTaskScheduler* m_scheduler; - -// int m_kernelProgramCommandId; - - char m_name[MINI_CL_MAX_KERNEL_NAME]; - unsigned int m_numArgs; - kernelLauncherCB m_launcher; - void* m_pCode; - void updateLauncher(); - MiniCLKernel* registerSelf(); - - void* m_argData[MINI_CL_MAX_ARG]; - int m_argSizes[MINI_CL_MAX_ARG]; -}; - - -#if defined(USE_LIBSPE2) && defined(__SPU__) -////////////////////MAIN///////////////////////////// -#include "../SpuLibspe2Support.h" -#include -#include -#include - -void * SamplelsMemoryFunc(); -void SampleThreadFunc(void* userPtr,void* lsMemory); - -//#define DEBUG_LIBSPE2_MAINLOOP - -int main(unsigned long long speid, addr64 argp, addr64 envp) -{ - printf("SPU is up \n"); - - ATTRIBUTE_ALIGNED128(btSpuStatus status); - ATTRIBUTE_ALIGNED16( SpuSampleTaskDesc taskDesc ) ; - unsigned int received_message = Spu_Mailbox_Event_Nothing; - bool shutdown = false; - - cellDmaGet(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - status.m_status = Spu_Status_Free; - status.m_lsMemory.p = SamplelsMemoryFunc(); - - cellDmaLargePut(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - - while (!shutdown) - { - received_message = spu_read_in_mbox(); - - - - switch(received_message) - { - case Spu_Mailbox_Event_Shutdown: - shutdown = true; - break; - case Spu_Mailbox_Event_Task: - // refresh the status -#ifdef DEBUG_LIBSPE2_MAINLOOP - printf("SPU recieved Task \n"); -#endif //DEBUG_LIBSPE2_MAINLOOP - cellDmaGet(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - btAssert(status.m_status==Spu_Status_Occupied); - - cellDmaGet(&taskDesc, status.m_taskDesc.p, sizeof(SpuSampleTaskDesc), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - SampleThreadFunc((void*)&taskDesc, reinterpret_cast (taskDesc.m_mainMemoryPtr) ); - break; - case Spu_Mailbox_Event_Nothing: - default: - break; - } - - // set to status free and wait for next task - status.m_status = Spu_Status_Free; - cellDmaLargePut(&status, argp.ull, sizeof(btSpuStatus), DMA_TAG(3), 0, 0); - cellDmaWaitTagStatusAll(DMA_MASK(3)); - - - } - return 0; -} -////////////////////////////////////////////////////// -#endif - - - -#endif // MINICL_TASK_SCHEDULER_H - diff --git a/Engine/lib/bullet/src/MiniCL/cl.h b/Engine/lib/bullet/src/MiniCL/cl.h deleted file mode 100644 index 352829883..000000000 --- a/Engine/lib/bullet/src/MiniCL/cl.h +++ /dev/null @@ -1,867 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008-2009 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - ******************************************************************************/ - -#ifndef __OPENCL_CL_H -#define __OPENCL_CL_H - -#ifdef __APPLE__ -#include -#else -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/******************************************************************************/ - -typedef struct _cl_platform_id * cl_platform_id; -typedef struct _cl_device_id * cl_device_id; -typedef struct _cl_context * cl_context; -typedef struct _cl_command_queue * cl_command_queue; -typedef struct _cl_mem * cl_mem; -typedef struct _cl_program * cl_program; -typedef struct _cl_kernel * cl_kernel; -typedef struct _cl_event * cl_event; -typedef struct _cl_sampler * cl_sampler; - -typedef cl_uint cl_bool; /* WARNING! Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */ -typedef cl_ulong cl_bitfield; -typedef cl_bitfield cl_device_type; -typedef cl_uint cl_platform_info; -typedef cl_uint cl_device_info; -typedef cl_bitfield cl_device_address_info; -typedef cl_bitfield cl_device_fp_config; -typedef cl_uint cl_device_mem_cache_type; -typedef cl_uint cl_device_local_mem_type; -typedef cl_bitfield cl_device_exec_capabilities; -typedef cl_bitfield cl_command_queue_properties; - -typedef intptr_t cl_context_properties; -typedef cl_uint cl_context_info; -typedef cl_uint cl_command_queue_info; -typedef cl_uint cl_channel_order; -typedef cl_uint cl_channel_type; -typedef cl_bitfield cl_mem_flags; -typedef cl_uint cl_mem_object_type; -typedef cl_uint cl_mem_info; -typedef cl_uint cl_image_info; -typedef cl_uint cl_addressing_mode; -typedef cl_uint cl_filter_mode; -typedef cl_uint cl_sampler_info; -typedef cl_bitfield cl_map_flags; -typedef cl_uint cl_program_info; -typedef cl_uint cl_program_build_info; -typedef cl_int cl_build_status; -typedef cl_uint cl_kernel_info; -typedef cl_uint cl_kernel_work_group_info; -typedef cl_uint cl_event_info; -typedef cl_uint cl_command_type; -typedef cl_uint cl_profiling_info; - -typedef struct _cl_image_format { - cl_channel_order image_channel_order; - cl_channel_type image_channel_data_type; -} cl_image_format; - -/******************************************************************************/ - -// Error Codes -#define CL_SUCCESS 0 -#define CL_DEVICE_NOT_FOUND -1 -#define CL_DEVICE_NOT_AVAILABLE -2 -#define CL_DEVICE_COMPILER_NOT_AVAILABLE -3 -#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4 -#define CL_OUT_OF_RESOURCES -5 -#define CL_OUT_OF_HOST_MEMORY -6 -#define CL_PROFILING_INFO_NOT_AVAILABLE -7 -#define CL_MEM_COPY_OVERLAP -8 -#define CL_IMAGE_FORMAT_MISMATCH -9 -#define CL_IMAGE_FORMAT_NOT_SUPPORTED -10 -#define CL_BUILD_PROGRAM_FAILURE -11 -#define CL_MAP_FAILURE -12 - -#define CL_INVALID_VALUE -30 -#define CL_INVALID_DEVICE_TYPE -31 -#define CL_INVALID_PLATFORM -32 -#define CL_INVALID_DEVICE -33 -#define CL_INVALID_CONTEXT -34 -#define CL_INVALID_QUEUE_PROPERTIES -35 -#define CL_INVALID_COMMAND_QUEUE -36 -#define CL_INVALID_HOST_PTR -37 -#define CL_INVALID_MEM_OBJECT -38 -#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR -39 -#define CL_INVALID_IMAGE_SIZE -40 -#define CL_INVALID_SAMPLER -41 -#define CL_INVALID_BINARY -42 -#define CL_INVALID_BUILD_OPTIONS -43 -#define CL_INVALID_PROGRAM -44 -#define CL_INVALID_PROGRAM_EXECUTABLE -45 -#define CL_INVALID_KERNEL_NAME -46 -#define CL_INVALID_KERNEL_DEFINITION -47 -#define CL_INVALID_KERNEL -48 -#define CL_INVALID_ARG_INDEX -49 -#define CL_INVALID_ARG_VALUE -50 -#define CL_INVALID_ARG_SIZE -51 -#define CL_INVALID_KERNEL_ARGS -52 -#define CL_INVALID_WORK_DIMENSION -53 -#define CL_INVALID_WORK_GROUP_SIZE -54 -#define CL_INVALID_WORK_ITEM_SIZE -55 -#define CL_INVALID_GLOBAL_OFFSET -56 -#define CL_INVALID_EVENT_WAIT_LIST -57 -#define CL_INVALID_EVENT -58 -#define CL_INVALID_OPERATION -59 -#define CL_INVALID_GL_OBJECT -60 -#define CL_INVALID_BUFFER_SIZE -61 -#define CL_INVALID_MIP_LEVEL -62 - -// OpenCL Version -#define CL_VERSION_1_0 1 - -// cl_bool -#define CL_FALSE 0 -#define CL_TRUE 1 - -// cl_platform_info -#define CL_PLATFORM_PROFILE 0x0900 -#define CL_PLATFORM_VERSION 0x0901 -#define CL_PLATFORM_NAME 0x0902 -#define CL_PLATFORM_VENDOR 0x0903 -#define CL_PLATFORM_EXTENSIONS 0x0904 - -// cl_device_type - bitfield -#define CL_DEVICE_TYPE_DEFAULT (1 << 0) -#define CL_DEVICE_TYPE_CPU (1 << 1) -#define CL_DEVICE_TYPE_GPU (1 << 2) -#define CL_DEVICE_TYPE_ACCELERATOR (1 << 3) -#define CL_DEVICE_TYPE_DEBUG (1 << 4) -#define CL_DEVICE_TYPE_ALL 0xFFFFFFFF - - -// cl_device_info -#define CL_DEVICE_TYPE 0x1000 -#define CL_DEVICE_VENDOR_ID 0x1001 -#define CL_DEVICE_MAX_COMPUTE_UNITS 0x1002 -#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS 0x1003 -#define CL_DEVICE_MAX_WORK_GROUP_SIZE 0x1004 -#define CL_DEVICE_MAX_WORK_ITEM_SIZES 0x1005 -#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006 -#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT 0x1007 -#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT 0x1008 -#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG 0x1009 -#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A -#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B -#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C -#define CL_DEVICE_ADDRESS_BITS 0x100D -#define CL_DEVICE_MAX_READ_IMAGE_ARGS 0x100E -#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS 0x100F -#define CL_DEVICE_MAX_MEM_ALLOC_SIZE 0x1010 -#define CL_DEVICE_IMAGE2D_MAX_WIDTH 0x1011 -#define CL_DEVICE_IMAGE2D_MAX_HEIGHT 0x1012 -#define CL_DEVICE_IMAGE3D_MAX_WIDTH 0x1013 -#define CL_DEVICE_IMAGE3D_MAX_HEIGHT 0x1014 -#define CL_DEVICE_IMAGE3D_MAX_DEPTH 0x1015 -#define CL_DEVICE_IMAGE_SUPPORT 0x1016 -#define CL_DEVICE_MAX_PARAMETER_SIZE 0x1017 -#define CL_DEVICE_MAX_SAMPLERS 0x1018 -#define CL_DEVICE_MEM_BASE_ADDR_ALIGN 0x1019 -#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 0x101A -#define CL_DEVICE_SINGLE_FP_CONFIG 0x101B -#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE 0x101C -#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 0x101D -#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE 0x101E -#define CL_DEVICE_GLOBAL_MEM_SIZE 0x101F -#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE 0x1020 -#define CL_DEVICE_MAX_CONSTANT_ARGS 0x1021 -#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022 -#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023 -#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024 -#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025 -#define CL_DEVICE_ENDIAN_LITTLE 0x1026 -#define CL_DEVICE_AVAILABLE 0x1027 -#define CL_DEVICE_COMPILER_AVAILABLE 0x1028 -#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029 -#define CL_DEVICE_QUEUE_PROPERTIES 0x102A -#define CL_DEVICE_NAME 0x102B -#define CL_DEVICE_VENDOR 0x102C -#define CL_DRIVER_VERSION 0x102D -#define CL_DEVICE_PROFILE 0x102E -#define CL_DEVICE_VERSION 0x102F -#define CL_DEVICE_EXTENSIONS 0x1030 -#define CL_DEVICE_PLATFORM 0x1031 - -// cl_device_address_info - bitfield -#define CL_DEVICE_ADDRESS_32_BITS (1 << 0) -#define CL_DEVICE_ADDRESS_64_BITS (1 << 1) - -// cl_device_fp_config - bitfield -#define CL_FP_DENORM (1 << 0) -#define CL_FP_INF_NAN (1 << 1) -#define CL_FP_ROUND_TO_NEAREST (1 << 2) -#define CL_FP_ROUND_TO_ZERO (1 << 3) -#define CL_FP_ROUND_TO_INF (1 << 4) -#define CL_FP_FMA (1 << 5) - -// cl_device_mem_cache_type -#define CL_NONE 0x0 -#define CL_READ_ONLY_CACHE 0x1 -#define CL_READ_WRITE_CACHE 0x2 - -// cl_device_local_mem_type -#define CL_LOCAL 0x1 -#define CL_GLOBAL 0x2 - -// cl_device_exec_capabilities - bitfield -#define CL_EXEC_KERNEL (1 << 0) -#define CL_EXEC_NATIVE_KERNEL (1 << 1) - -// cl_command_queue_properties - bitfield -#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE (1 << 0) -#define CL_QUEUE_PROFILING_ENABLE (1 << 1) - -// cl_context_info -#define CL_CONTEXT_REFERENCE_COUNT 0x1080 -#define CL_CONTEXT_NUM_DEVICES 0x1081 -#define CL_CONTEXT_DEVICES 0x1082 -#define CL_CONTEXT_PROPERTIES 0x1083 -#define CL_CONTEXT_PLATFORM 0x1084 - -// cl_command_queue_info -#define CL_QUEUE_CONTEXT 0x1090 -#define CL_QUEUE_DEVICE 0x1091 -#define CL_QUEUE_REFERENCE_COUNT 0x1092 -#define CL_QUEUE_PROPERTIES 0x1093 - -// cl_mem_flags - bitfield -#define CL_MEM_READ_WRITE (1 << 0) -#define CL_MEM_WRITE_ONLY (1 << 1) -#define CL_MEM_READ_ONLY (1 << 2) -#define CL_MEM_USE_HOST_PTR (1 << 3) -#define CL_MEM_ALLOC_HOST_PTR (1 << 4) -#define CL_MEM_COPY_HOST_PTR (1 << 5) - -// cl_channel_order -#define CL_R 0x10B0 -#define CL_A 0x10B1 -#define CL_RG 0x10B2 -#define CL_RA 0x10B3 -#define CL_RGB 0x10B4 -#define CL_RGBA 0x10B5 -#define CL_BGRA 0x10B6 -#define CL_ARGB 0x10B7 -#define CL_INTENSITY 0x10B8 -#define CL_LUMINANCE 0x10B9 - -// cl_channel_type -#define CL_SNORM_INT8 0x10D0 -#define CL_SNORM_INT16 0x10D1 -#define CL_UNORM_INT8 0x10D2 -#define CL_UNORM_INT16 0x10D3 -#define CL_UNORM_SHORT_565 0x10D4 -#define CL_UNORM_SHORT_555 0x10D5 -#define CL_UNORM_INT_101010 0x10D6 -#define CL_SIGNED_INT8 0x10D7 -#define CL_SIGNED_INT16 0x10D8 -#define CL_SIGNED_INT32 0x10D9 -#define CL_UNSIGNED_INT8 0x10DA -#define CL_UNSIGNED_INT16 0x10DB -#define CL_UNSIGNED_INT32 0x10DC -#define CL_HALF_FLOAT 0x10DD -#define CL_FLOAT 0x10DE - -// cl_mem_object_type -#define CL_MEM_OBJECT_BUFFER 0x10F0 -#define CL_MEM_OBJECT_IMAGE2D 0x10F1 -#define CL_MEM_OBJECT_IMAGE3D 0x10F2 - -// cl_mem_info -#define CL_MEM_TYPE 0x1100 -#define CL_MEM_FLAGS 0x1101 -#define CL_MEM_SIZE 0x1102 -#define CL_MEM_HOST_PTR 0x1103 -#define CL_MEM_MAP_COUNT 0x1104 -#define CL_MEM_REFERENCE_COUNT 0x1105 -#define CL_MEM_CONTEXT 0x1106 - -// cl_image_info -#define CL_IMAGE_FORMAT 0x1110 -#define CL_IMAGE_ELEMENT_SIZE 0x1111 -#define CL_IMAGE_ROW_PITCH 0x1112 -#define CL_IMAGE_SLICE_PITCH 0x1113 -#define CL_IMAGE_WIDTH 0x1114 -#define CL_IMAGE_HEIGHT 0x1115 -#define CL_IMAGE_DEPTH 0x1116 - -// cl_addressing_mode -#define CL_ADDRESS_NONE 0x1130 -#define CL_ADDRESS_CLAMP_TO_EDGE 0x1131 -#define CL_ADDRESS_CLAMP 0x1132 -#define CL_ADDRESS_REPEAT 0x1133 - -// cl_filter_mode -#define CL_FILTER_NEAREST 0x1140 -#define CL_FILTER_LINEAR 0x1141 - -// cl_sampler_info -#define CL_SAMPLER_REFERENCE_COUNT 0x1150 -#define CL_SAMPLER_CONTEXT 0x1151 -#define CL_SAMPLER_NORMALIZED_COORDS 0x1152 -#define CL_SAMPLER_ADDRESSING_MODE 0x1153 -#define CL_SAMPLER_FILTER_MODE 0x1154 - -// cl_map_flags - bitfield -#define CL_MAP_READ (1 << 0) -#define CL_MAP_WRITE (1 << 1) - -// cl_program_info -#define CL_PROGRAM_REFERENCE_COUNT 0x1160 -#define CL_PROGRAM_CONTEXT 0x1161 -#define CL_PROGRAM_NUM_DEVICES 0x1162 -#define CL_PROGRAM_DEVICES 0x1163 -#define CL_PROGRAM_SOURCE 0x1164 -#define CL_PROGRAM_BINARY_SIZES 0x1165 -#define CL_PROGRAM_BINARIES 0x1166 - -// cl_program_build_info -#define CL_PROGRAM_BUILD_STATUS 0x1181 -#define CL_PROGRAM_BUILD_OPTIONS 0x1182 -#define CL_PROGRAM_BUILD_LOG 0x1183 - -// cl_build_status -#define CL_BUILD_SUCCESS 0 -#define CL_BUILD_NONE -1 -#define CL_BUILD_ERROR -2 -#define CL_BUILD_IN_PROGRESS -3 - -// cl_kernel_info -#define CL_KERNEL_FUNCTION_NAME 0x1190 -#define CL_KERNEL_NUM_ARGS 0x1191 -#define CL_KERNEL_REFERENCE_COUNT 0x1192 -#define CL_KERNEL_CONTEXT 0x1193 -#define CL_KERNEL_PROGRAM 0x1194 - -// cl_kernel_work_group_info -#define CL_KERNEL_WORK_GROUP_SIZE 0x11B0 -#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1 -#define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2 - -// cl_event_info -#define CL_EVENT_COMMAND_QUEUE 0x11D0 -#define CL_EVENT_COMMAND_TYPE 0x11D1 -#define CL_EVENT_REFERENCE_COUNT 0x11D2 -#define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3 - -// cl_command_type -#define CL_COMMAND_NDRANGE_KERNEL 0x11F0 -#define CL_COMMAND_TASK 0x11F1 -#define CL_COMMAND_NATIVE_KERNEL 0x11F2 -#define CL_COMMAND_READ_BUFFER 0x11F3 -#define CL_COMMAND_WRITE_BUFFER 0x11F4 -#define CL_COMMAND_COPY_BUFFER 0x11F5 -#define CL_COMMAND_READ_IMAGE 0x11F6 -#define CL_COMMAND_WRITE_IMAGE 0x11F7 -#define CL_COMMAND_COPY_IMAGE 0x11F8 -#define CL_COMMAND_COPY_IMAGE_TO_BUFFER 0x11F9 -#define CL_COMMAND_COPY_BUFFER_TO_IMAGE 0x11FA -#define CL_COMMAND_MAP_BUFFER 0x11FB -#define CL_COMMAND_MAP_IMAGE 0x11FC -#define CL_COMMAND_UNMAP_MEM_OBJECT 0x11FD -#define CL_COMMAND_MARKER 0x11FE -#define CL_COMMAND_WAIT_FOR_EVENTS 0x11FF -#define CL_COMMAND_BARRIER 0x1200 -#define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x1201 -#define CL_COMMAND_RELEASE_GL_OBJECTS 0x1202 - -// command execution status -#define CL_COMPLETE 0x0 -#define CL_RUNNING 0x1 -#define CL_SUBMITTED 0x2 -#define CL_QUEUED 0x3 - -// cl_profiling_info -#define CL_PROFILING_COMMAND_QUEUED 0x1280 -#define CL_PROFILING_COMMAND_SUBMIT 0x1281 -#define CL_PROFILING_COMMAND_START 0x1282 -#define CL_PROFILING_COMMAND_END 0x1283 - -/********************************************************************************************************/ - -// Platform API -extern CL_API_ENTRY cl_int CL_API_CALL -clGetPlatformIDs(cl_uint /* num_entries */, - cl_platform_id * /* platforms */, - cl_uint * /* num_platforms */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetPlatformInfo(cl_platform_id /* platform */, - cl_platform_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Device APIs -extern CL_API_ENTRY cl_int CL_API_CALL -clGetDeviceIDs(cl_platform_id /* platform */, - cl_device_type /* device_type */, - cl_uint /* num_entries */, - cl_device_id * /* devices */, - cl_uint * /* num_devices */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetDeviceInfo(cl_device_id /* device */, - cl_device_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Context APIs -extern CL_API_ENTRY cl_context CL_API_CALL -clCreateContext(const cl_context_properties * /* properties */, - cl_uint /* num_devices */, - const cl_device_id * /* devices */, - void (*pfn_notify)(const char *, const void *, size_t, void *) /* pfn_notify */, - void * /* user_data */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_context CL_API_CALL -clCreateContextFromType(const cl_context_properties * /* properties */, - cl_device_type /* device_type */, - void (*pfn_notify)(const char *, const void *, size_t, void *) /* pfn_notify */, - void * /* user_data */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetContextInfo(cl_context /* context */, - cl_context_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Command Queue APIs -extern CL_API_ENTRY cl_command_queue CL_API_CALL -clCreateCommandQueue(cl_context /* context */, - cl_device_id /* device */, - cl_command_queue_properties /* properties */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetCommandQueueInfo(cl_command_queue /* command_queue */, - cl_command_queue_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clSetCommandQueueProperty(cl_command_queue /* command_queue */, - cl_command_queue_properties /* properties */, - cl_bool /* enable */, - cl_command_queue_properties * /* old_properties */) CL_API_SUFFIX__VERSION_1_0; - -// Memory Object APIs -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateBuffer(cl_context /* context */, - cl_mem_flags /* flags */, - size_t /* size */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateImage2D(cl_context /* context */, - cl_mem_flags /* flags */, - const cl_image_format * /* image_format */, - size_t /* image_width */, - size_t /* image_height */, - size_t /* image_row_pitch */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateImage3D(cl_context /* context */, - cl_mem_flags /* flags */, - const cl_image_format * /* image_format */, - size_t /* image_width */, - size_t /* image_height */, - size_t /* image_depth */, - size_t /* image_row_pitch */, - size_t /* image_slice_pitch */, - void * /* host_ptr */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetSupportedImageFormats(cl_context /* context */, - cl_mem_flags /* flags */, - cl_mem_object_type /* image_type */, - cl_uint /* num_entries */, - cl_image_format * /* image_formats */, - cl_uint * /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetMemObjectInfo(cl_mem /* memobj */, - cl_mem_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetImageInfo(cl_mem /* image */, - cl_image_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Sampler APIs -extern CL_API_ENTRY cl_sampler CL_API_CALL -clCreateSampler(cl_context /* context */, - cl_bool /* normalized_coords */, - cl_addressing_mode /* addressing_mode */, - cl_filter_mode /* filter_mode */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetSamplerInfo(cl_sampler /* sampler */, - cl_sampler_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Program Object APIs -extern CL_API_ENTRY cl_program CL_API_CALL -clCreateProgramWithSource(cl_context /* context */, - cl_uint /* count */, - const char ** /* strings */, - const size_t * /* lengths */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_program CL_API_CALL -clCreateProgramWithBinary(cl_context /* context */, - cl_uint /* num_devices */, - const cl_device_id * /* device_list */, - const size_t * /* lengths */, - const unsigned char ** /* binaries */, - cl_int * /* binary_status */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clBuildProgram(cl_program /* program */, - cl_uint /* num_devices */, - const cl_device_id * /* device_list */, - const char * /* options */, - void (*pfn_notify)(cl_program /* program */, void * /* user_data */), - void * /* user_data */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetProgramInfo(cl_program /* program */, - cl_program_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetProgramBuildInfo(cl_program /* program */, - cl_device_id /* device */, - cl_program_build_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Kernel Object APIs -extern CL_API_ENTRY cl_kernel CL_API_CALL -clCreateKernel(cl_program /* program */, - const char * /* kernel_name */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clCreateKernelsInProgram(cl_program /* program */, - cl_uint /* num_kernels */, - cl_kernel * /* kernels */, - cl_uint * /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainKernel(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseKernel(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clSetKernelArg(cl_kernel /* kernel */, - cl_uint /* arg_index */, - size_t /* arg_size */, - const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetKernelInfo(cl_kernel /* kernel */, - cl_kernel_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetKernelWorkGroupInfo(cl_kernel /* kernel */, - cl_device_id /* device */, - cl_kernel_work_group_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Event Object APIs -extern CL_API_ENTRY cl_int CL_API_CALL -clWaitForEvents(cl_uint /* num_events */, - const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetEventInfo(cl_event /* event */, - cl_event_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clRetainEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; - -// Profiling APIs -extern CL_API_ENTRY cl_int CL_API_CALL -clGetEventProfilingInfo(cl_event /* event */, - cl_profiling_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -// Flush and Finish APIs -extern CL_API_ENTRY cl_int CL_API_CALL -clFlush(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clFinish(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; - -// Enqueued Commands APIs -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReadBuffer(cl_command_queue /* command_queue */, - cl_mem /* buffer */, - cl_bool /* blocking_read */, - size_t /* offset */, - size_t /* cb */, - void * /* ptr */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueWriteBuffer(cl_command_queue /* command_queue */, - cl_mem /* buffer */, - cl_bool /* blocking_write */, - size_t /* offset */, - size_t /* cb */, - const void * /* ptr */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueCopyBuffer(cl_command_queue /* command_queue */, - cl_mem /* src_buffer */, - cl_mem /* dst_buffer */, - size_t /* src_offset */, - size_t /* dst_offset */, - size_t /* cb */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReadImage(cl_command_queue /* command_queue */, - cl_mem /* image */, - cl_bool /* blocking_read */, - const size_t * /* origin[3] */, - const size_t * /* region[3] */, - size_t /* row_pitch */, - size_t /* slice_pitch */, - void * /* ptr */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueWriteImage(cl_command_queue /* command_queue */, - cl_mem /* image */, - cl_bool /* blocking_write */, - const size_t * /* origin[3] */, - const size_t * /* region[3] */, - size_t /* input_row_pitch */, - size_t /* input_slice_pitch */, - const void * /* ptr */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueCopyImage(cl_command_queue /* command_queue */, - cl_mem /* src_image */, - cl_mem /* dst_image */, - const size_t * /* src_origin[3] */, - const size_t * /* dst_origin[3] */, - const size_t * /* region[3] */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueCopyImageToBuffer(cl_command_queue /* command_queue */, - cl_mem /* src_image */, - cl_mem /* dst_buffer */, - const size_t * /* src_origin[3] */, - const size_t * /* region[3] */, - size_t /* dst_offset */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueCopyBufferToImage(cl_command_queue /* command_queue */, - cl_mem /* src_buffer */, - cl_mem /* dst_image */, - size_t /* src_offset */, - const size_t * /* dst_origin[3] */, - const size_t * /* region[3] */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY void * CL_API_CALL -clEnqueueMapBuffer(cl_command_queue /* command_queue */, - cl_mem /* buffer */, - cl_bool /* blocking_map */, - cl_map_flags /* map_flags */, - size_t /* offset */, - size_t /* cb */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY void * CL_API_CALL -clEnqueueMapImage(cl_command_queue /* command_queue */, - cl_mem /* image */, - cl_bool /* blocking_map */, - cl_map_flags /* map_flags */, - const size_t * /* origin[3] */, - const size_t * /* region[3] */, - size_t * /* image_row_pitch */, - size_t * /* image_slice_pitch */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueUnmapMemObject(cl_command_queue /* command_queue */, - cl_mem /* memobj */, - void * /* mapped_ptr */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueNDRangeKernel(cl_command_queue /* command_queue */, - cl_kernel /* kernel */, - cl_uint /* work_dim */, - const size_t * /* global_work_offset */, - const size_t * /* global_work_size */, - const size_t * /* local_work_size */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueTask(cl_command_queue /* command_queue */, - cl_kernel /* kernel */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueNativeKernel(cl_command_queue /* command_queue */, - void (*user_func)(void *), - void * /* args */, - size_t /* cb_args */, - cl_uint /* num_mem_objects */, - const cl_mem * /* mem_list */, - const void ** /* args_mem_loc */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueMarker(cl_command_queue /* command_queue */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueWaitForEvents(cl_command_queue /* command_queue */, - cl_uint /* num_events */, - const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueBarrier(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; - -#ifdef __cplusplus -} -#endif - -#endif // __OPENCL_CL_H - diff --git a/Engine/lib/bullet/src/MiniCL/cl_MiniCL_Defs.h b/Engine/lib/bullet/src/MiniCL/cl_MiniCL_Defs.h deleted file mode 100644 index 0773c8575..000000000 --- a/Engine/lib/bullet/src/MiniCL/cl_MiniCL_Defs.h +++ /dev/null @@ -1,439 +0,0 @@ -/* -Bullet Continuous Collision Detection and Physics Library, Copyright (c) 2007 Erwin Coumans - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#include -#include -#include "LinearMath/btScalar.h" - -#include "MiniCL/cl.h" - - -#define __kernel -#define __global -#define __local -#define get_global_id(a) __guid_arg -#define get_local_id(a) ((__guid_arg) % gMiniCLNumOutstandingTasks) -#define get_local_size(a) (gMiniCLNumOutstandingTasks) -#define get_group_id(a) ((__guid_arg) / gMiniCLNumOutstandingTasks) - -//static unsigned int as_uint(float val) { return *((unsigned int*)&val); } - - -#define CLK_LOCAL_MEM_FENCE 0x01 -#define CLK_GLOBAL_MEM_FENCE 0x02 - -static void barrier(unsigned int a) -{ - // TODO : implement -} - -//ATTRIBUTE_ALIGNED16(struct) float8 -struct float8 -{ - float s0; - float s1; - float s2; - float s3; - float s4; - float s5; - float s6; - float s7; - - float8(float scalar) - { - s0=s1=s2=s3=s4=s5=s6=s7=scalar; - } -}; - - -float select( float arg0, float arg1, bool select) -{ - if (select) - return arg0; - return arg1; -} - -#define __constant - - -struct float3 -{ - float x,y,z; - - float3& operator+=(const float3& other) - { - x += other.x; - y += other.y; - z += other.z; - return *this; - } - - float3& operator-=(const float3& other) - { - x -= other.x; - y -= other.y; - z -= other.z; - return *this; - } - -}; - -static float dot(const float3&a ,const float3& b) -{ - float3 tmp; - tmp.x = a.x*b.x; - tmp.y = a.y*b.y; - tmp.z = a.z*b.z; - return tmp.x+tmp.y+tmp.z; -} - -static float3 operator-(const float3& a,const float3& b) -{ - float3 tmp; - tmp.x = a.x - b.x; - tmp.y = a.y - b.y; - tmp.z = a.z - b.z; - return tmp; -} - -static float3 operator*(const float& scalar,const float3& b) -{ - float3 tmp; - tmp.x = scalar * b.x; - tmp.y = scalar * b.y; - tmp.z = scalar * b.z; - return tmp; -} - -static float3 operator*(const float3& a,const float& scalar) -{ - float3 tmp; - tmp.x = a.x * scalar; - tmp.y = a.y * scalar; - tmp.z = a.z * scalar; - return tmp; -} - - -static float3 operator*(const float3& a,const float3& b) -{ - float3 tmp; - tmp.x = a.x * b.x; - tmp.y = a.y * b.y; - tmp.z = a.z * b.z; - return tmp; -} - - -//ATTRIBUTE_ALIGNED16(struct) float4 -struct float4 -{ - union - { - struct { - float x; - float y; - float z; - }; - float3 xyz; - }; - float w; - - float4() {} - - float4(float v0, float v1, float v2, float v3) - { - x=v0; - y=v1; - z=v2; - w=v3; - - } - float4(float3 xyz, float scalarW) - { - x = xyz.x; - y = xyz.y; - z = xyz.z; - w = scalarW; - } - - float4(float v) - { - x = y = z = w = v; - } - float4 operator*(const float4& other) - { - float4 tmp; - tmp.x = x*other.x; - tmp.y = y*other.y; - tmp.z = z*other.z; - tmp.w = w*other.w; - return tmp; - } - - - - float4 operator*(const float& other) - { - float4 tmp; - tmp.x = x*other; - tmp.y = y*other; - tmp.z = z*other; - tmp.w = w*other; - return tmp; - } - - - - float4& operator+=(const float4& other) - { - x += other.x; - y += other.y; - z += other.z; - w += other.w; - return *this; - } - - float4& operator-=(const float4& other) - { - x -= other.x; - y -= other.y; - z -= other.z; - w -= other.w; - return *this; - } - - float4& operator *=(float scalar) - { - x *= scalar; - y *= scalar; - z *= scalar; - w *= scalar; - return (*this); - } - - - - - -}; - -static float4 fabs(const float4& a) -{ - float4 tmp; - tmp.x = a.x < 0.f ? 0.f : a.x; - tmp.y = a.y < 0.f ? 0.f : a.y; - tmp.z = a.z < 0.f ? 0.f : a.z; - tmp.w = a.w < 0.f ? 0.f : a.w; - return tmp; -} -static float4 operator+(const float4& a,const float4& b) -{ - float4 tmp; - tmp.x = a.x + b.x; - tmp.y = a.y + b.y; - tmp.z = a.z + b.z; - tmp.w = a.w + b.w; - return tmp; -} - - -static float8 operator+(const float8& a,const float8& b) -{ - float8 tmp(0); - tmp.s0 = a.s0 + b.s0; - tmp.s1 = a.s1 + b.s1; - tmp.s2 = a.s2 + b.s2; - tmp.s3 = a.s3 + b.s3; - tmp.s4 = a.s4 + b.s4; - tmp.s5 = a.s5 + b.s5; - tmp.s6 = a.s6 + b.s6; - tmp.s7 = a.s7 + b.s7; - return tmp; -} - - -static float4 operator-(const float4& a,const float4& b) -{ - float4 tmp; - tmp.x = a.x - b.x; - tmp.y = a.y - b.y; - tmp.z = a.z - b.z; - tmp.w = a.w - b.w; - return tmp; -} - -static float8 operator-(const float8& a,const float8& b) -{ - float8 tmp(0); - tmp.s0 = a.s0 - b.s0; - tmp.s1 = a.s1 - b.s1; - tmp.s2 = a.s2 - b.s2; - tmp.s3 = a.s3 - b.s3; - tmp.s4 = a.s4 - b.s4; - tmp.s5 = a.s5 - b.s5; - tmp.s6 = a.s6 - b.s6; - tmp.s7 = a.s7 - b.s7; - return tmp; -} - -static float4 operator*(float a,const float4& b) -{ - float4 tmp; - tmp.x = a * b.x; - tmp.y = a * b.y; - tmp.z = a * b.z; - tmp.w = a * b.w; - return tmp; -} - -static float4 operator/(const float4& b,float a) -{ - float4 tmp; - tmp.x = b.x/a; - tmp.y = b.y/a; - tmp.z = b.z/a; - tmp.w = b.w/a; - return tmp; -} - - - - - -static float dot(const float4&a ,const float4& b) -{ - float4 tmp; - tmp.x = a.x*b.x; - tmp.y = a.y*b.y; - tmp.z = a.z*b.z; - tmp.w = a.w*b.w; - return tmp.x+tmp.y+tmp.z+tmp.w; -} - -static float length(const float4&a) -{ - float l = sqrtf(a.x*a.x+a.y*a.y+a.z*a.z); - return l; -} - -static float4 normalize(const float4&a) -{ - float4 tmp; - float l = length(a); - tmp = 1.f/l*a; - return tmp; -} - - - -static float4 cross(const float4&a ,const float4& b) -{ - float4 tmp; - tmp.x = a.y*b.z - a.z*b.y; - tmp.y = -a.x*b.z + a.z*b.x; - tmp.z = a.x*b.y - a.y*b.x; - tmp.w = 0.f; - return tmp; -} - -static float max(float a, float b) -{ - return (a >= b) ? a : b; -} - - -static float min(float a, float b) -{ - return (a <= b) ? a : b; -} - -static float fmax(float a, float b) -{ - return (a >= b) ? a : b; -} - -static float fmin(float a, float b) -{ - return (a <= b) ? a : b; -} - -struct int2 -{ - int x,y; -}; - -struct uint2 -{ - unsigned int x,y; -}; - -//typedef int2 uint2; - -typedef unsigned int uint; - -struct int4 -{ - int x,y,z,w; -}; - -struct uint4 -{ - unsigned int x,y,z,w; - uint4() {} - uint4(uint val) { x = y = z = w = val; } - uint4& operator+=(const uint4& other) - { - x += other.x; - y += other.y; - z += other.z; - w += other.w; - return *this; - } -}; -static uint4 operator+(const uint4& a,const uint4& b) -{ - uint4 tmp; - tmp.x = a.x + b.x; - tmp.y = a.y + b.y; - tmp.z = a.z + b.z; - tmp.w = a.w + b.w; - return tmp; -} -static uint4 operator-(const uint4& a,const uint4& b) -{ - uint4 tmp; - tmp.x = a.x - b.x; - tmp.y = a.y - b.y; - tmp.z = a.z - b.z; - tmp.w = a.w - b.w; - return tmp; -} - -#define native_sqrt sqrtf -#define native_sin sinf -#define native_cos cosf -#define native_powr powf - -#define GUID_ARG ,int __guid_arg -#define GUID_ARG_VAL ,__guid_arg - - -#define as_int(a) (*((int*)&(a))) - -extern "C" int gMiniCLNumOutstandingTasks; -// extern "C" void __kernel_func(); - - diff --git a/Engine/lib/bullet/src/MiniCL/cl_gl.h b/Engine/lib/bullet/src/MiniCL/cl_gl.h deleted file mode 100644 index 0a69d6ecb..000000000 --- a/Engine/lib/bullet/src/MiniCL/cl_gl.h +++ /dev/null @@ -1,113 +0,0 @@ -/********************************************************************************** - * Copyright (c) 2008-2009 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - **********************************************************************************/ - -#ifndef __OPENCL_CL_GL_H -#define __OPENCL_CL_GL_H - -#ifdef __APPLE__ -#include -#else -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -// NOTE: Make sure that appropriate GL header file is included separately - -typedef cl_uint cl_gl_object_type; -typedef cl_uint cl_gl_texture_info; -typedef cl_uint cl_gl_platform_info; - -// cl_gl_object_type -#define CL_GL_OBJECT_BUFFER 0x2000 -#define CL_GL_OBJECT_TEXTURE2D 0x2001 -#define CL_GL_OBJECT_TEXTURE3D 0x2002 -#define CL_GL_OBJECT_RENDERBUFFER 0x2003 - -// cl_gl_texture_info -#define CL_GL_TEXTURE_TARGET 0x2004 -#define CL_GL_MIPMAP_LEVEL 0x2005 - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLBuffer(cl_context /* context */, - cl_mem_flags /* flags */, - GLuint /* bufobj */, - int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLTexture2D(cl_context /* context */, - cl_mem_flags /* flags */, - GLenum /* target */, - GLint /* miplevel */, - GLuint /* texture */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLTexture3D(cl_context /* context */, - cl_mem_flags /* flags */, - GLenum /* target */, - GLint /* miplevel */, - GLuint /* texture */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromGLRenderbuffer(cl_context /* context */, - cl_mem_flags /* flags */, - GLuint /* renderbuffer */, - cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetGLObjectInfo(cl_mem /* memobj */, - cl_gl_object_type * /* gl_object_type */, - GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clGetGLTextureInfo(cl_mem /* memobj */, - cl_gl_texture_info /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueAcquireGLObjects(cl_command_queue /* command_queue */, - cl_uint /* num_objects */, - const cl_mem * /* mem_objects */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReleaseGLObjects(cl_command_queue /* command_queue */, - cl_uint /* num_objects */, - const cl_mem * /* mem_objects */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; - -#ifdef __cplusplus -} -#endif - -#endif // __OPENCL_CL_GL_H diff --git a/Engine/lib/bullet/src/MiniCL/cl_platform.h b/Engine/lib/bullet/src/MiniCL/cl_platform.h deleted file mode 100644 index 43219e141..000000000 --- a/Engine/lib/bullet/src/MiniCL/cl_platform.h +++ /dev/null @@ -1,254 +0,0 @@ -/********************************************************************************** - * Copyright (c) 2008-2009 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - **********************************************************************************/ - -#ifndef __CL_PLATFORM_H -#define __CL_PLATFORM_H - -#define CL_PLATFORM_MINI_CL 0x12345 - -struct MiniCLKernelDesc -{ - MiniCLKernelDesc(void* pCode, const char* pName); -}; - -#define MINICL_REGISTER(__kernel_func) static MiniCLKernelDesc __kernel_func##Desc((void*)__kernel_func, #__kernel_func); - - -#ifdef __APPLE__ - /* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */ - #include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define CL_API_ENTRY -#define CL_API_CALL -#ifdef __APPLE__ -#define CL_API_SUFFIX__VERSION_1_0 // AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER -#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) -#else -#define CL_API_SUFFIX__VERSION_1_0 -#define CL_EXTENSION_WEAK_LINK -#endif - -#if defined (_WIN32) && ! defined (__MINGW32__) -typedef signed __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef signed __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef signed __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - -typedef int8_t cl_char; -typedef uint8_t cl_uchar; -typedef int16_t cl_short ; -typedef uint16_t cl_ushort ; -typedef int32_t cl_int ; -typedef uint32_t cl_uint ; -typedef int64_t cl_long ; -typedef uint64_t cl_ulong ; - -typedef uint16_t cl_half ; -typedef float cl_float ; -typedef double cl_double ; - - -typedef int8_t cl_char2[2] ; -typedef int8_t cl_char4[4] ; -typedef int8_t cl_char8[8] ; -typedef int8_t cl_char16[16] ; -typedef uint8_t cl_uchar2[2] ; -typedef uint8_t cl_uchar4[4] ; -typedef uint8_t cl_uchar8[8] ; -typedef uint8_t cl_uchar16[16] ; - -typedef int16_t cl_short2[2] ; -typedef int16_t cl_short4[4] ; -typedef int16_t cl_short8[8] ; -typedef int16_t cl_short16[16] ; -typedef uint16_t cl_ushort2[2] ; -typedef uint16_t cl_ushort4[4] ; -typedef uint16_t cl_ushort8[8] ; -typedef uint16_t cl_ushort16[16] ; - -typedef int32_t cl_int2[2] ; -typedef int32_t cl_int4[4] ; -typedef int32_t cl_int8[8] ; -typedef int32_t cl_int16[16] ; -typedef uint32_t cl_uint2[2] ; -typedef uint32_t cl_uint4[4] ; -typedef uint32_t cl_uint8[8] ; -typedef uint32_t cl_uint16[16] ; - -typedef int64_t cl_long2[2] ; -typedef int64_t cl_long4[4] ; -typedef int64_t cl_long8[8] ; -typedef int64_t cl_long16[16] ; -typedef uint64_t cl_ulong2[2] ; -typedef uint64_t cl_ulong4[4] ; -typedef uint64_t cl_ulong8[8] ; -typedef uint64_t cl_ulong16[16] ; - -typedef float cl_float2[2] ; -typedef float cl_float4[4] ; -typedef float cl_float8[8] ; -typedef float cl_float16[16] ; - -typedef double cl_double2[2] ; -typedef double cl_double4[4] ; -typedef double cl_double8[8] ; -typedef double cl_double16[16] ; - - -#else -#include - -/* scalar types */ -typedef int8_t cl_char; -typedef uint8_t cl_uchar; -typedef int16_t cl_short __attribute__((aligned(2))); -typedef uint16_t cl_ushort __attribute__((aligned(2))); -typedef int32_t cl_int __attribute__((aligned(4))); -typedef uint32_t cl_uint __attribute__((aligned(4))); -typedef int64_t cl_long __attribute__((aligned(8))); -typedef uint64_t cl_ulong __attribute__((aligned(8))); - -typedef uint16_t cl_half __attribute__((aligned(2))); -typedef float cl_float __attribute__((aligned(4))); -typedef double cl_double __attribute__((aligned(8))); - - -/* - * Vector types - * - * Note: OpenCL requires that all types be naturally aligned. - * This means that vector types must be naturally aligned. - * For example, a vector of four floats must be aligned to - * a 16 byte boundary (calculated as 4 * the natural 4-byte - * alignment of the float). The alignment qualifiers here - * will only function properly if your compiler supports them - * and if you don't actively work to defeat them. For example, - * in order for a cl_float4 to be 16 byte aligned in a struct, - * the start of the struct must itself be 16-byte aligned. - * - * Maintaining proper alignment is the user's responsibility. - */ -typedef int8_t cl_char2[2] __attribute__((aligned(2))); -typedef int8_t cl_char4[4] __attribute__((aligned(4))); -typedef int8_t cl_char8[8] __attribute__((aligned(8))); -typedef int8_t cl_char16[16] __attribute__((aligned(16))); -typedef uint8_t cl_uchar2[2] __attribute__((aligned(2))); -typedef uint8_t cl_uchar4[4] __attribute__((aligned(4))); -typedef uint8_t cl_uchar8[8] __attribute__((aligned(8))); -typedef uint8_t cl_uchar16[16] __attribute__((aligned(16))); - -typedef int16_t cl_short2[2] __attribute__((aligned(4))); -typedef int16_t cl_short4[4] __attribute__((aligned(8))); -typedef int16_t cl_short8[8] __attribute__((aligned(16))); -typedef int16_t cl_short16[16] __attribute__((aligned(32))); -typedef uint16_t cl_ushort2[2] __attribute__((aligned(4))); -typedef uint16_t cl_ushort4[4] __attribute__((aligned(8))); -typedef uint16_t cl_ushort8[8] __attribute__((aligned(16))); -typedef uint16_t cl_ushort16[16] __attribute__((aligned(32))); - -typedef int32_t cl_int2[2] __attribute__((aligned(8))); -typedef int32_t cl_int4[4] __attribute__((aligned(16))); -typedef int32_t cl_int8[8] __attribute__((aligned(32))); -typedef int32_t cl_int16[16] __attribute__((aligned(64))); -typedef uint32_t cl_uint2[2] __attribute__((aligned(8))); -typedef uint32_t cl_uint4[4] __attribute__((aligned(16))); -typedef uint32_t cl_uint8[8] __attribute__((aligned(32))); -typedef uint32_t cl_uint16[16] __attribute__((aligned(64))); - -typedef int64_t cl_long2[2] __attribute__((aligned(16))); -typedef int64_t cl_long4[4] __attribute__((aligned(32))); -typedef int64_t cl_long8[8] __attribute__((aligned(64))); -typedef int64_t cl_long16[16] __attribute__((aligned(128))); -typedef uint64_t cl_ulong2[2] __attribute__((aligned(16))); -typedef uint64_t cl_ulong4[4] __attribute__((aligned(32))); -typedef uint64_t cl_ulong8[8] __attribute__((aligned(64))); -typedef uint64_t cl_ulong16[16] __attribute__((aligned(128))); - -typedef float cl_float2[2] __attribute__((aligned(8))); -typedef float cl_float4[4] __attribute__((aligned(16))); -typedef float cl_float8[8] __attribute__((aligned(32))); -typedef float cl_float16[16] __attribute__((aligned(64))); - -typedef double cl_double2[2] __attribute__((aligned(16))); -typedef double cl_double4[4] __attribute__((aligned(32))); -typedef double cl_double8[8] __attribute__((aligned(64))); -typedef double cl_double16[16] __attribute__((aligned(128))); -#endif - -#include - -/* and a few goodies to go with them */ -#define CL_CHAR_BIT 8 -#define CL_SCHAR_MAX 127 -#define CL_SCHAR_MIN (-127-1) -#define CL_CHAR_MAX CL_SCHAR_MAX -#define CL_CHAR_MIN CL_SCHAR_MIN -#define CL_UCHAR_MAX 255 -#define CL_SHRT_MAX 32767 -#define CL_SHRT_MIN (-32767-1) -#define CL_USHRT_MAX 65535 -#define CL_INT_MAX 2147483647 -#define CL_INT_MIN (-2147483647-1) -#define CL_UINT_MAX 0xffffffffU -#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL) -#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL) -#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL) - -#define CL_FLT_DIG 6 -#define CL_FLT_MANT_DIG 24 -#define CL_FLT_MAX_10_EXP +38 -#define CL_FLT_MAX_EXP +128 -#define CL_FLT_MIN_10_EXP -37 -#define CL_FLT_MIN_EXP -125 -#define CL_FLT_RADIX 2 -#define CL_FLT_MAX 0x1.fffffep127f -#define CL_FLT_MIN 0x1.0p-126f -#define CL_FLT_EPSILON 0x1.0p-23f - -#define CL_DBL_DIG 15 -#define CL_DBL_MANT_DIG 53 -#define CL_DBL_MAX_10_EXP +308 -#define CL_DBL_MAX_EXP +1024 -#define CL_DBL_MIN_10_EXP -307 -#define CL_DBL_MIN_EXP -1021 -#define CL_DBL_RADIX 2 -#define CL_DBL_MAX 0x1.fffffffffffffp1023 -#define CL_DBL_MIN 0x1.0p-1022 -#define CL_DBL_EPSILON 0x1.0p-52 - -/* There are no vector types for half */ - -#ifdef __cplusplus -} -#endif - -#endif // __CL_PLATFORM_H diff --git a/Engine/lib/bullet/src/clew/clew.c b/Engine/lib/bullet/src/clew/clew.c new file mode 100644 index 000000000..a07b0aad7 --- /dev/null +++ b/Engine/lib/bullet/src/clew/clew.c @@ -0,0 +1,312 @@ +////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2009 Organic Vectory B.V. +// Written by George van Venrooij +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file license.txt) +////////////////////////////////////////////////////////////////////////// + +#include "clew.h" + +#ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN + #define VC_EXTRALEAN + #include + + typedef HMODULE CLEW_DYNLIB_HANDLE; + + #define CLEW_DYNLIB_OPEN LoadLibrary + #define CLEW_DYNLIB_CLOSE FreeLibrary + #define CLEW_DYNLIB_IMPORT GetProcAddress +#else + #include + + typedef void* CLEW_DYNLIB_HANDLE; + + #define CLEW_DYNLIB_OPEN(path) dlopen(path, RTLD_NOW | RTLD_GLOBAL) + #define CLEW_DYNLIB_CLOSE dlclose + #define CLEW_DYNLIB_IMPORT dlsym +#endif + +#include + +//! \brief module handle +static CLEW_DYNLIB_HANDLE module = NULL; + +// Variables holding function entry points +PFNCLGETPLATFORMIDS __clewGetPlatformIDs = NULL; +PFNCLGETPLATFORMINFO __clewGetPlatformInfo = NULL; +PFNCLGETDEVICEIDS __clewGetDeviceIDs = NULL; +PFNCLGETDEVICEINFO __clewGetDeviceInfo = NULL; +PFNCLCREATECONTEXT __clewCreateContext = NULL; +PFNCLCREATECONTEXTFROMTYPE __clewCreateContextFromType = NULL; +PFNCLRETAINCONTEXT __clewRetainContext = NULL; +PFNCLRELEASECONTEXT __clewReleaseContext = NULL; +PFNCLGETCONTEXTINFO __clewGetContextInfo = NULL; +PFNCLCREATECOMMANDQUEUE __clewCreateCommandQueue = NULL; +PFNCLRETAINCOMMANDQUEUE __clewRetainCommandQueue = NULL; +PFNCLRELEASECOMMANDQUEUE __clewReleaseCommandQueue = NULL; +PFNCLGETCOMMANDQUEUEINFO __clewGetCommandQueueInfo = NULL; +#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS +PFNCLSETCOMMANDQUEUEPROPERTY __clewSetCommandQueueProperty = NULL; +#endif +PFNCLCREATEBUFFER __clewCreateBuffer = NULL; +PFNCLCREATESUBBUFFER __clewCreateSubBuffer = NULL; +PFNCLCREATEIMAGE2D __clewCreateImage2D = NULL; +PFNCLCREATEIMAGE3D __clewCreateImage3D = NULL; +PFNCLRETAINMEMOBJECT __clewRetainMemObject = NULL; +PFNCLRELEASEMEMOBJECT __clewReleaseMemObject = NULL; +PFNCLGETSUPPORTEDIMAGEFORMATS __clewGetSupportedImageFormats = NULL; +PFNCLGETMEMOBJECTINFO __clewGetMemObjectInfo = NULL; +PFNCLGETIMAGEINFO __clewGetImageInfo = NULL; +PFNCLSETMEMOBJECTDESTRUCTORCALLBACK __clewSetMemObjectDestructorCallback = NULL; +PFNCLCREATESAMPLER __clewCreateSampler = NULL; +PFNCLRETAINSAMPLER __clewRetainSampler = NULL; +PFNCLRELEASESAMPLER __clewReleaseSampler = NULL; +PFNCLGETSAMPLERINFO __clewGetSamplerInfo = NULL; +PFNCLCREATEPROGRAMWITHSOURCE __clewCreateProgramWithSource = NULL; +PFNCLCREATEPROGRAMWITHBINARY __clewCreateProgramWithBinary = NULL; +PFNCLRETAINPROGRAM __clewRetainProgram = NULL; +PFNCLRELEASEPROGRAM __clewReleaseProgram = NULL; +PFNCLBUILDPROGRAM __clewBuildProgram = NULL; +PFNCLUNLOADCOMPILER __clewUnloadCompiler = NULL; +PFNCLGETPROGRAMINFO __clewGetProgramInfo = NULL; +PFNCLGETPROGRAMBUILDINFO __clewGetProgramBuildInfo = NULL; +PFNCLCREATEKERNEL __clewCreateKernel = NULL; +PFNCLCREATEKERNELSINPROGRAM __clewCreateKernelsInProgram = NULL; +PFNCLRETAINKERNEL __clewRetainKernel = NULL; +PFNCLRELEASEKERNEL __clewReleaseKernel = NULL; +PFNCLSETKERNELARG __clewSetKernelArg = NULL; +PFNCLGETKERNELINFO __clewGetKernelInfo = NULL; +PFNCLGETKERNELWORKGROUPINFO __clewGetKernelWorkGroupInfo = NULL; +PFNCLWAITFOREVENTS __clewWaitForEvents = NULL; +PFNCLGETEVENTINFO __clewGetEventInfo = NULL; +PFNCLCREATEUSEREVENT __clewCreateUserEvent = NULL; +PFNCLRETAINEVENT __clewRetainEvent = NULL; +PFNCLRELEASEEVENT __clewReleaseEvent = NULL; +PFNCLSETUSEREVENTSTATUS __clewSetUserEventStatus = NULL; +PFNCLSETEVENTCALLBACK __clewSetEventCallback = NULL; +PFNCLGETEVENTPROFILINGINFO __clewGetEventProfilingInfo = NULL; +PFNCLFLUSH __clewFlush = NULL; +PFNCLFINISH __clewFinish = NULL; +PFNCLENQUEUEREADBUFFER __clewEnqueueReadBuffer = NULL; +PFNCLENQUEUEREADBUFFERRECT __clewEnqueueReadBufferRect = NULL; +PFNCLENQUEUEWRITEBUFFER __clewEnqueueWriteBuffer = NULL; +PFNCLENQUEUEWRITEBUFFERRECT __clewEnqueueWriteBufferRect = NULL; +PFNCLENQUEUECOPYBUFFER __clewEnqueueCopyBuffer = NULL; +PFNCLENQUEUEREADIMAGE __clewEnqueueReadImage = NULL; +PFNCLENQUEUEWRITEIMAGE __clewEnqueueWriteImage = NULL; +PFNCLENQUEUECOPYIMAGE __clewEnqueueCopyImage = NULL; +PFNCLENQUEUECOPYBUFFERRECT __clewEnqueueCopyBufferRect = NULL; +PFNCLENQUEUECOPYIMAGETOBUFFER __clewEnqueueCopyImageToBuffer = NULL; +PFNCLENQUEUECOPYBUFFERTOIMAGE __clewEnqueueCopyBufferToImage = NULL; +PFNCLENQUEUEMAPBUFFER __clewEnqueueMapBuffer = NULL; +PFNCLENQUEUEMAPIMAGE __clewEnqueueMapImage = NULL; +PFNCLENQUEUEUNMAPMEMOBJECT __clewEnqueueUnmapMemObject = NULL; +PFNCLENQUEUENDRANGEKERNEL __clewEnqueueNDRangeKernel = NULL; +PFNCLENQUEUETASK __clewEnqueueTask = NULL; +PFNCLENQUEUENATIVEKERNEL __clewEnqueueNativeKernel = NULL; +PFNCLENQUEUEMARKER __clewEnqueueMarker = NULL; +PFNCLENQUEUEWAITFOREVENTS __clewEnqueueWaitForEvents = NULL; +PFNCLENQUEUEBARRIER __clewEnqueueBarrier = NULL; +PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress = NULL; + + +void clewExit(void) +{ + if (module != NULL) + { + // Ignore errors + CLEW_DYNLIB_CLOSE(module); + module = NULL; + } +} + +int clewInit(const char* path) +{ + int error = 0; + + // Check if already initialized + if (module != NULL) + { + return CLEW_SUCCESS; + } + + // Load library + module = CLEW_DYNLIB_OPEN(path); + + // Check for errors + if (module == NULL) + { + return CLEW_ERROR_OPEN_FAILED; + } + + // Set unloading + error = atexit(clewExit); + + if (error) + { + // Failure queuing atexit, shutdown with error + CLEW_DYNLIB_CLOSE(module); + module = NULL; + + return CLEW_ERROR_ATEXIT_FAILED; + } + + // Determine function entry-points + __clewGetPlatformIDs = (PFNCLGETPLATFORMIDS )CLEW_DYNLIB_IMPORT(module, "clGetPlatformIDs"); + __clewGetPlatformInfo = (PFNCLGETPLATFORMINFO )CLEW_DYNLIB_IMPORT(module, "clGetPlatformInfo"); + __clewGetDeviceIDs = (PFNCLGETDEVICEIDS )CLEW_DYNLIB_IMPORT(module, "clGetDeviceIDs"); + __clewGetDeviceInfo = (PFNCLGETDEVICEINFO )CLEW_DYNLIB_IMPORT(module, "clGetDeviceInfo"); + __clewCreateContext = (PFNCLCREATECONTEXT )CLEW_DYNLIB_IMPORT(module, "clCreateContext"); + __clewCreateContextFromType = (PFNCLCREATECONTEXTFROMTYPE )CLEW_DYNLIB_IMPORT(module, "clCreateContextFromType"); + __clewRetainContext = (PFNCLRETAINCONTEXT )CLEW_DYNLIB_IMPORT(module, "clRetainContext"); + __clewReleaseContext = (PFNCLRELEASECONTEXT )CLEW_DYNLIB_IMPORT(module, "clReleaseContext"); + __clewGetContextInfo = (PFNCLGETCONTEXTINFO )CLEW_DYNLIB_IMPORT(module, "clGetContextInfo"); + __clewCreateCommandQueue = (PFNCLCREATECOMMANDQUEUE )CLEW_DYNLIB_IMPORT(module, "clCreateCommandQueue"); + __clewRetainCommandQueue = (PFNCLRETAINCOMMANDQUEUE )CLEW_DYNLIB_IMPORT(module, "clRetainCommandQueue"); + __clewReleaseCommandQueue = (PFNCLRELEASECOMMANDQUEUE )CLEW_DYNLIB_IMPORT(module, "clReleaseCommandQueue"); + __clewGetCommandQueueInfo = (PFNCLGETCOMMANDQUEUEINFO )CLEW_DYNLIB_IMPORT(module, "clGetCommandQueueInfo"); +#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS + __clewSetCommandQueueProperty = (PFNCLSETCOMMANDQUEUEPROPERTY )CLEW_DYNLIB_IMPORT(module, "clSetCommandQueueProperty"); +#endif + __clewCreateBuffer = (PFNCLCREATEBUFFER )CLEW_DYNLIB_IMPORT(module, "clCreateBuffer"); + __clewCreateSubBuffer = (PFNCLCREATESUBBUFFER )CLEW_DYNLIB_IMPORT(module, "clCreateBuffer"); + __clewCreateImage2D = (PFNCLCREATEIMAGE2D )CLEW_DYNLIB_IMPORT(module, "clCreateImage2D"); + __clewCreateImage3D = (PFNCLCREATEIMAGE3D )CLEW_DYNLIB_IMPORT(module, "clCreateImage3D"); + __clewRetainMemObject = (PFNCLRETAINMEMOBJECT )CLEW_DYNLIB_IMPORT(module, "clRetainMemObject"); + __clewReleaseMemObject = (PFNCLRELEASEMEMOBJECT )CLEW_DYNLIB_IMPORT(module, "clReleaseMemObject"); + __clewGetSupportedImageFormats = (PFNCLGETSUPPORTEDIMAGEFORMATS )CLEW_DYNLIB_IMPORT(module, "clGetSupportedImageFormats"); + __clewGetMemObjectInfo = (PFNCLGETMEMOBJECTINFO )CLEW_DYNLIB_IMPORT(module, "clGetMemObjectInfo"); + __clewGetImageInfo = (PFNCLGETIMAGEINFO )CLEW_DYNLIB_IMPORT(module, "clGetImageInfo"); + __clewSetMemObjectDestructorCallback = (PFNCLSETMEMOBJECTDESTRUCTORCALLBACK)CLEW_DYNLIB_IMPORT(module, "clSetMemObjectDestructorCallback"); + __clewCreateSampler = (PFNCLCREATESAMPLER )CLEW_DYNLIB_IMPORT(module, "clCreateSampler"); + __clewRetainSampler = (PFNCLRETAINSAMPLER )CLEW_DYNLIB_IMPORT(module, "clRetainSampler"); + __clewReleaseSampler = (PFNCLRELEASESAMPLER )CLEW_DYNLIB_IMPORT(module, "clReleaseSampler"); + __clewGetSamplerInfo = (PFNCLGETSAMPLERINFO )CLEW_DYNLIB_IMPORT(module, "clGetSamplerInfo"); + __clewCreateProgramWithSource = (PFNCLCREATEPROGRAMWITHSOURCE )CLEW_DYNLIB_IMPORT(module, "clCreateProgramWithSource"); + __clewCreateProgramWithBinary = (PFNCLCREATEPROGRAMWITHBINARY )CLEW_DYNLIB_IMPORT(module, "clCreateProgramWithBinary"); + __clewRetainProgram = (PFNCLRETAINPROGRAM )CLEW_DYNLIB_IMPORT(module, "clRetainProgram"); + __clewReleaseProgram = (PFNCLRELEASEPROGRAM )CLEW_DYNLIB_IMPORT(module, "clReleaseProgram"); + __clewBuildProgram = (PFNCLBUILDPROGRAM )CLEW_DYNLIB_IMPORT(module, "clBuildProgram"); + __clewUnloadCompiler = (PFNCLUNLOADCOMPILER )CLEW_DYNLIB_IMPORT(module, "clUnloadCompiler"); + __clewGetProgramInfo = (PFNCLGETPROGRAMINFO )CLEW_DYNLIB_IMPORT(module, "clGetProgramInfo"); + __clewGetProgramBuildInfo = (PFNCLGETPROGRAMBUILDINFO )CLEW_DYNLIB_IMPORT(module, "clGetProgramBuildInfo"); + __clewCreateKernel = (PFNCLCREATEKERNEL )CLEW_DYNLIB_IMPORT(module, "clCreateKernel"); + __clewCreateKernelsInProgram = (PFNCLCREATEKERNELSINPROGRAM )CLEW_DYNLIB_IMPORT(module, "clCreateKernelsInProgram"); + __clewRetainKernel = (PFNCLRETAINKERNEL )CLEW_DYNLIB_IMPORT(module, "clRetainKernel"); + __clewReleaseKernel = (PFNCLRELEASEKERNEL )CLEW_DYNLIB_IMPORT(module, "clReleaseKernel"); + __clewSetKernelArg = (PFNCLSETKERNELARG )CLEW_DYNLIB_IMPORT(module, "clSetKernelArg"); + __clewGetKernelInfo = (PFNCLGETKERNELINFO )CLEW_DYNLIB_IMPORT(module, "clGetKernelInfo"); + __clewGetKernelWorkGroupInfo = (PFNCLGETKERNELWORKGROUPINFO )CLEW_DYNLIB_IMPORT(module, "clGetKernelWorkGroupInfo"); + __clewWaitForEvents = (PFNCLWAITFOREVENTS )CLEW_DYNLIB_IMPORT(module, "clWaitForEvents"); + __clewGetEventInfo = (PFNCLGETEVENTINFO )CLEW_DYNLIB_IMPORT(module, "clGetEventInfo"); + __clewCreateUserEvent = (PFNCLCREATEUSEREVENT )CLEW_DYNLIB_IMPORT(module, "clCreateUserEvent"); + __clewRetainEvent = (PFNCLRETAINEVENT )CLEW_DYNLIB_IMPORT(module, "clRetainEvent"); + __clewReleaseEvent = (PFNCLRELEASEEVENT )CLEW_DYNLIB_IMPORT(module, "clReleaseEvent"); + __clewSetUserEventStatus = (PFNCLSETUSEREVENTSTATUS )CLEW_DYNLIB_IMPORT(module, "clSetUserEventStatus"); + __clewSetEventCallback = (PFNCLSETEVENTCALLBACK )CLEW_DYNLIB_IMPORT(module, "clSetEventCallback"); + __clewGetEventProfilingInfo = (PFNCLGETEVENTPROFILINGINFO )CLEW_DYNLIB_IMPORT(module, "clGetEventProfilingInfo"); + __clewFlush = (PFNCLFLUSH )CLEW_DYNLIB_IMPORT(module, "clFlush"); + __clewFinish = (PFNCLFINISH )CLEW_DYNLIB_IMPORT(module, "clFinish"); + __clewEnqueueReadBuffer = (PFNCLENQUEUEREADBUFFER )CLEW_DYNLIB_IMPORT(module, "clEnqueueReadBuffer"); + __clewEnqueueReadBufferRect = (PFNCLENQUEUEREADBUFFERRECT )CLEW_DYNLIB_IMPORT(module, "clEnqueueReadBufferRect"); + __clewEnqueueWriteBuffer = (PFNCLENQUEUEWRITEBUFFER )CLEW_DYNLIB_IMPORT(module, "clEnqueueWriteBuffer"); + __clewEnqueueWriteBufferRect = (PFNCLENQUEUEWRITEBUFFERRECT )CLEW_DYNLIB_IMPORT(module, "clEnqueueWriteBufferRect"); + __clewEnqueueCopyBuffer = (PFNCLENQUEUECOPYBUFFER )CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyBuffer"); + __clewEnqueueCopyBufferRect = (PFNCLENQUEUECOPYBUFFERRECT )CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyBufferRect"); + __clewEnqueueReadImage = (PFNCLENQUEUEREADIMAGE )CLEW_DYNLIB_IMPORT(module, "clEnqueueReadImage"); + __clewEnqueueWriteImage = (PFNCLENQUEUEWRITEIMAGE )CLEW_DYNLIB_IMPORT(module, "clEnqueueWriteImage"); + __clewEnqueueCopyImage = (PFNCLENQUEUECOPYIMAGE )CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyImage"); + __clewEnqueueCopyImageToBuffer = (PFNCLENQUEUECOPYIMAGETOBUFFER )CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyImageToBuffer"); + __clewEnqueueCopyBufferToImage = (PFNCLENQUEUECOPYBUFFERTOIMAGE )CLEW_DYNLIB_IMPORT(module, "clEnqueueCopyBufferToImage"); + __clewEnqueueMapBuffer = (PFNCLENQUEUEMAPBUFFER )CLEW_DYNLIB_IMPORT(module, "clEnqueueMapBuffer"); + __clewEnqueueMapImage = (PFNCLENQUEUEMAPIMAGE )CLEW_DYNLIB_IMPORT(module, "clEnqueueMapImage"); + __clewEnqueueUnmapMemObject = (PFNCLENQUEUEUNMAPMEMOBJECT )CLEW_DYNLIB_IMPORT(module, "clEnqueueUnmapMemObject"); + __clewEnqueueNDRangeKernel = (PFNCLENQUEUENDRANGEKERNEL )CLEW_DYNLIB_IMPORT(module, "clEnqueueNDRangeKernel"); + __clewEnqueueTask = (PFNCLENQUEUETASK )CLEW_DYNLIB_IMPORT(module, "clEnqueueTask"); + __clewEnqueueNativeKernel = (PFNCLENQUEUENATIVEKERNEL )CLEW_DYNLIB_IMPORT(module, "clEnqueueNativeKernel"); + __clewEnqueueMarker = (PFNCLENQUEUEMARKER )CLEW_DYNLIB_IMPORT(module, "clEnqueueMarker"); + __clewEnqueueWaitForEvents = (PFNCLENQUEUEWAITFOREVENTS )CLEW_DYNLIB_IMPORT(module, "clEnqueueWaitForEvents"); + __clewEnqueueBarrier = (PFNCLENQUEUEBARRIER )CLEW_DYNLIB_IMPORT(module, "clEnqueueBarrier"); + __clewGetExtensionFunctionAddress = (PFNCLGETEXTENSIONFUNCTIONADDRESS )CLEW_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress"); + + return CLEW_SUCCESS; +} + +const char* clewErrorString(cl_int error) +{ + static const char* strings[] = + { + // Error Codes + "CL_SUCCESS" // 0 + , "CL_DEVICE_NOT_FOUND" // -1 + , "CL_DEVICE_NOT_AVAILABLE" // -2 + , "CL_COMPILER_NOT_AVAILABLE" // -3 + , "CL_MEM_OBJECT_ALLOCATION_FAILURE" // -4 + , "CL_OUT_OF_RESOURCES" // -5 + , "CL_OUT_OF_HOST_MEMORY" // -6 + , "CL_PROFILING_INFO_NOT_AVAILABLE" // -7 + , "CL_MEM_COPY_OVERLAP" // -8 + , "CL_IMAGE_FORMAT_MISMATCH" // -9 + , "CL_IMAGE_FORMAT_NOT_SUPPORTED" // -10 + , "CL_BUILD_PROGRAM_FAILURE" // -11 + , "CL_MAP_FAILURE" // -12 + + , "" // -13 + , "" // -14 + , "" // -15 + , "" // -16 + , "" // -17 + , "" // -18 + , "" // -19 + + , "" // -20 + , "" // -21 + , "" // -22 + , "" // -23 + , "" // -24 + , "" // -25 + , "" // -26 + , "" // -27 + , "" // -28 + , "" // -29 + + , "CL_INVALID_VALUE" // -30 + , "CL_INVALID_DEVICE_TYPE" // -31 + , "CL_INVALID_PLATFORM" // -32 + , "CL_INVALID_DEVICE" // -33 + , "CL_INVALID_CONTEXT" // -34 + , "CL_INVALID_QUEUE_PROPERTIES" // -35 + , "CL_INVALID_COMMAND_QUEUE" // -36 + , "CL_INVALID_HOST_PTR" // -37 + , "CL_INVALID_MEM_OBJECT" // -38 + , "CL_INVALID_IMAGE_FORMAT_DESCRIPTOR" // -39 + , "CL_INVALID_IMAGE_SIZE" // -40 + , "CL_INVALID_SAMPLER" // -41 + , "CL_INVALID_BINARY" // -42 + , "CL_INVALID_BUILD_OPTIONS" // -43 + , "CL_INVALID_PROGRAM" // -44 + , "CL_INVALID_PROGRAM_EXECUTABLE" // -45 + , "CL_INVALID_KERNEL_NAME" // -46 + , "CL_INVALID_KERNEL_DEFINITION" // -47 + , "CL_INVALID_KERNEL" // -48 + , "CL_INVALID_ARG_INDEX" // -49 + , "CL_INVALID_ARG_VALUE" // -50 + , "CL_INVALID_ARG_SIZE" // -51 + , "CL_INVALID_KERNEL_ARGS" // -52 + , "CL_INVALID_WORK_DIMENSION" // -53 + , "CL_INVALID_WORK_GROUP_SIZE" // -54 + , "CL_INVALID_WORK_ITEM_SIZE" // -55 + , "CL_INVALID_GLOBAL_OFFSET" // -56 + , "CL_INVALID_EVENT_WAIT_LIST" // -57 + , "CL_INVALID_EVENT" // -58 + , "CL_INVALID_OPERATION" // -59 + , "CL_INVALID_GL_OBJECT" // -60 + , "CL_INVALID_BUFFER_SIZE" // -61 + , "CL_INVALID_MIP_LEVEL" // -62 + , "CL_INVALID_GLOBAL_WORK_SIZE" // -63 + }; + + return strings[-error]; +} diff --git a/Engine/lib/bullet/src/clew/clew.h b/Engine/lib/bullet/src/clew/clew.h new file mode 100644 index 000000000..ee0fef18b --- /dev/null +++ b/Engine/lib/bullet/src/clew/clew.h @@ -0,0 +1,2397 @@ +#ifndef CLEW_HPP_INCLUDED +#define CLEW_HPP_INCLUDED + +////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2009-2011 Organic Vectory B.V., KindDragon +// Written by George van Venrooij +// +// Distributed under the MIT License. +////////////////////////////////////////////////////////////////////////// + +//! \file clew.h +//! \brief OpenCL run-time loader header +//! +//! This file contains a copy of the contents of CL.H and CL_PLATFORM.H from the +//! official OpenCL spec. The purpose of this code is to load the OpenCL dynamic +//! library at run-time and thus allow the executable to function on many +//! platforms regardless of the vendor of the OpenCL driver actually installed. +//! Some of the techniques used here were inspired by work done in the GLEW +//! library (http://glew.sourceforge.net/) + +// Run-time dynamic linking functionality based on concepts used in GLEW +#ifdef __OPENCL_CL_H +#error cl.h included before clew.h +#endif + +#ifdef __OPENCL_CL_PLATFORM_H +#error cl_platform.h included before clew.h +#endif + +// Prevent cl.h inclusion +#define __OPENCL_CL_H +// Prevent cl_platform.h inclusion +#define __CL_PLATFORM_H + +/******************************************************************************* +* Copyright (c) 2008-2010 The Khronos Group Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and/or associated documentation files (the +* "Materials"), to deal in the Materials without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Materials, and to +* permit persons to whom the Materials are furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Materials. +* +* THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +******************************************************************************/ +#ifdef __APPLE__ + /* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */ + #include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(_WIN32) + #define CL_API_ENTRY + #define CL_API_CALL __stdcall + #define CL_CALLBACK __stdcall +#else + #define CL_API_ENTRY + #define CL_API_CALL + #define CL_CALLBACK +#endif +//disabled the APPLE thing, don't know why it is there, is just causes tons of warnings + +#ifdef __APPLE1__ + #define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) + #define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER + #define CL_EXT_SUFFIX__VERSION_1_0 CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER + #define CL_API_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK + #define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER +#else + #define CL_EXTENSION_WEAK_LINK + #define CL_API_SUFFIX__VERSION_1_0 + #define CL_EXT_SUFFIX__VERSION_1_0 + #define CL_API_SUFFIX__VERSION_1_1 + #define CL_EXT_SUFFIX__VERSION_1_1 + #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED +#endif + +#if (defined (_WIN32) && defined(_MSC_VER)) + +/* scalar types */ +typedef signed __int8 cl_char; +typedef unsigned __int8 cl_uchar; +typedef signed __int16 cl_short; +typedef unsigned __int16 cl_ushort; +typedef signed __int32 cl_int; +typedef unsigned __int32 cl_uint; +typedef signed __int64 cl_long; +typedef unsigned __int64 cl_ulong; + +typedef unsigned __int16 cl_half; +typedef float cl_float; +typedef double cl_double; + +/* Macro names and corresponding values defined by OpenCL */ +#define CL_CHAR_BIT 8 +#define CL_SCHAR_MAX 127 +#define CL_SCHAR_MIN (-127-1) +#define CL_CHAR_MAX CL_SCHAR_MAX +#define CL_CHAR_MIN CL_SCHAR_MIN +#define CL_UCHAR_MAX 255 +#define CL_SHRT_MAX 32767 +#define CL_SHRT_MIN (-32767-1) +#define CL_USHRT_MAX 65535 +#define CL_INT_MAX 2147483647 +#define CL_INT_MIN (-2147483647-1) +#define CL_UINT_MAX 0xffffffffU +#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL) +#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL) +#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL) + +#define CL_FLT_DIG 6 +#define CL_FLT_MANT_DIG 24 +#define CL_FLT_MAX_10_EXP +38 +#define CL_FLT_MAX_EXP +128 +#define CL_FLT_MIN_10_EXP -37 +#define CL_FLT_MIN_EXP -125 +#define CL_FLT_RADIX 2 +#define CL_FLT_MAX 340282346638528859811704183484516925440.0f +#define CL_FLT_MIN 1.175494350822287507969e-38f +#define CL_FLT_EPSILON 0x1.0p-23f + +#define CL_DBL_DIG 15 +#define CL_DBL_MANT_DIG 53 +#define CL_DBL_MAX_10_EXP +308 +#define CL_DBL_MAX_EXP +1024 +#define CL_DBL_MIN_10_EXP -307 +#define CL_DBL_MIN_EXP -1021 +#define CL_DBL_RADIX 2 +#define CL_DBL_MAX 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0 +#define CL_DBL_MIN 2.225073858507201383090e-308 +#define CL_DBL_EPSILON 2.220446049250313080847e-16 + +#define CL_M_E 2.718281828459045090796 +#define CL_M_LOG2E 1.442695040888963387005 +#define CL_M_LOG10E 0.434294481903251816668 +#define CL_M_LN2 0.693147180559945286227 +#define CL_M_LN10 2.302585092994045901094 +#define CL_M_PI 3.141592653589793115998 +#define CL_M_PI_2 1.570796326794896557999 +#define CL_M_PI_4 0.785398163397448278999 +#define CL_M_1_PI 0.318309886183790691216 +#define CL_M_2_PI 0.636619772367581382433 +#define CL_M_2_SQRTPI 1.128379167095512558561 +#define CL_M_SQRT2 1.414213562373095145475 +#define CL_M_SQRT1_2 0.707106781186547572737 + +#define CL_M_E_F 2.71828174591064f +#define CL_M_LOG2E_F 1.44269502162933f +#define CL_M_LOG10E_F 0.43429449200630f +#define CL_M_LN2_F 0.69314718246460f +#define CL_M_LN10_F 2.30258512496948f +#define CL_M_PI_F 3.14159274101257f +#define CL_M_PI_2_F 1.57079637050629f +#define CL_M_PI_4_F 0.78539818525314f +#define CL_M_1_PI_F 0.31830987334251f +#define CL_M_2_PI_F 0.63661974668503f +#define CL_M_2_SQRTPI_F 1.12837922573090f +#define CL_M_SQRT2_F 1.41421353816986f +#define CL_M_SQRT1_2_F 0.70710676908493f + +#define CL_NAN (CL_INFINITY - CL_INFINITY) +#define CL_HUGE_VALF ((cl_float) 1e50) +#define CL_HUGE_VAL ((cl_double) 1e500) +#define CL_MAXFLOAT CL_FLT_MAX +#define CL_INFINITY CL_HUGE_VALF + +#else + +#include + +/* scalar types */ +typedef int8_t cl_char; +typedef uint8_t cl_uchar; +typedef int16_t cl_short __attribute__((aligned(2))); +typedef uint16_t cl_ushort __attribute__((aligned(2))); +typedef int32_t cl_int __attribute__((aligned(4))); +typedef uint32_t cl_uint __attribute__((aligned(4))); +typedef int64_t cl_long __attribute__((aligned(8))); +typedef uint64_t cl_ulong __attribute__((aligned(8))); + +typedef uint16_t cl_half __attribute__((aligned(2))); +typedef float cl_float __attribute__((aligned(4))); +typedef double cl_double __attribute__((aligned(8))); + +/* Macro names and corresponding values defined by OpenCL */ +#define CL_CHAR_BIT 8 +#define CL_SCHAR_MAX 127 +#define CL_SCHAR_MIN (-127-1) +#define CL_CHAR_MAX CL_SCHAR_MAX +#define CL_CHAR_MIN CL_SCHAR_MIN +#define CL_UCHAR_MAX 255 +#define CL_SHRT_MAX 32767 +#define CL_SHRT_MIN (-32767-1) +#define CL_USHRT_MAX 65535 +#define CL_INT_MAX 2147483647 +#define CL_INT_MIN (-2147483647-1) +#define CL_UINT_MAX 0xffffffffU +#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL) +#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL) +#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL) + +#define CL_FLT_DIG 6 +#define CL_FLT_MANT_DIG 24 +#define CL_FLT_MAX_10_EXP +38 +#define CL_FLT_MAX_EXP +128 +#define CL_FLT_MIN_10_EXP -37 +#define CL_FLT_MIN_EXP -125 +#define CL_FLT_RADIX 2 +#define CL_FLT_MAX 0x1.fffffep127f +#define CL_FLT_MIN 0x1.0p-126f +#define CL_FLT_EPSILON 0x1.0p-23f + +#define CL_DBL_DIG 15 +#define CL_DBL_MANT_DIG 53 +#define CL_DBL_MAX_10_EXP +308 +#define CL_DBL_MAX_EXP +1024 +#define CL_DBL_MIN_10_EXP -307 +#define CL_DBL_MIN_EXP -1021 +#define CL_DBL_RADIX 2 +#define CL_DBL_MAX 0x1.fffffffffffffp1023 +#define CL_DBL_MIN 0x1.0p-1022 +#define CL_DBL_EPSILON 0x1.0p-52 + +#define CL_M_E 2.718281828459045090796 +#define CL_M_LOG2E 1.442695040888963387005 +#define CL_M_LOG10E 0.434294481903251816668 +#define CL_M_LN2 0.693147180559945286227 +#define CL_M_LN10 2.302585092994045901094 +#define CL_M_PI 3.141592653589793115998 +#define CL_M_PI_2 1.570796326794896557999 +#define CL_M_PI_4 0.785398163397448278999 +#define CL_M_1_PI 0.318309886183790691216 +#define CL_M_2_PI 0.636619772367581382433 +#define CL_M_2_SQRTPI 1.128379167095512558561 +#define CL_M_SQRT2 1.414213562373095145475 +#define CL_M_SQRT1_2 0.707106781186547572737 + +#define CL_M_E_F 2.71828174591064f +#define CL_M_LOG2E_F 1.44269502162933f +#define CL_M_LOG10E_F 0.43429449200630f +#define CL_M_LN2_F 0.69314718246460f +#define CL_M_LN10_F 2.30258512496948f +#define CL_M_PI_F 3.14159274101257f +#define CL_M_PI_2_F 1.57079637050629f +#define CL_M_PI_4_F 0.78539818525314f +#define CL_M_1_PI_F 0.31830987334251f +#define CL_M_2_PI_F 0.63661974668503f +#define CL_M_2_SQRTPI_F 1.12837922573090f +#define CL_M_SQRT2_F 1.41421353816986f +#define CL_M_SQRT1_2_F 0.70710676908493f + +#if defined( __GNUC__ ) + #define CL_HUGE_VALF __builtin_huge_valf() + #define CL_HUGE_VAL __builtin_huge_val() + #define CL_NAN __builtin_nanf( "" ) +#else + #define CL_HUGE_VALF ((cl_float) 1e50) + #define CL_HUGE_VAL ((cl_double) 1e500) + float nanf( const char * ); + #define CL_NAN nanf( "" ) +#endif +#define CL_MAXFLOAT CL_FLT_MAX +#define CL_INFINITY CL_HUGE_VALF + +#endif + +#include + +/* Mirror types to GL types. Mirror types allow us to avoid deciding which headers to load based on whether we are using GL or GLES here. */ +typedef unsigned int cl_GLuint; +typedef int cl_GLint; +typedef unsigned int cl_GLenum; + +/* + * Vector types + * + * Note: OpenCL requires that all types be naturally aligned. + * This means that vector types must be naturally aligned. + * For example, a vector of four floats must be aligned to + * a 16 byte boundary (calculated as 4 * the natural 4-byte + * alignment of the float). The alignment qualifiers here + * will only function properly if your compiler supports them + * and if you don't actively work to defeat them. For example, + * in order for a cl_float4 to be 16 byte aligned in a struct, + * the start of the struct must itself be 16-byte aligned. + * + * Maintaining proper alignment is the user's responsibility. + */ + + +#ifdef _MSC_VER +#if defined(_M_IX86) +#if _M_IX86_FP >= 0 +#define __SSE__ +#endif +#if _M_IX86_FP >= 1 +#define __SSE2__ +#endif +#elif defined(_M_X64) +#define __SSE__ +#define __SSE2__ +#endif +#endif + +/* Define basic vector types */ +#if defined( __VEC__ ) + #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ + typedef vector unsigned char __cl_uchar16; + typedef vector signed char __cl_char16; + typedef vector unsigned short __cl_ushort8; + typedef vector signed short __cl_short8; + typedef vector unsigned int __cl_uint4; + typedef vector signed int __cl_int4; + typedef vector float __cl_float4; + #define __CL_UCHAR16__ 1 + #define __CL_CHAR16__ 1 + #define __CL_USHORT8__ 1 + #define __CL_SHORT8__ 1 + #define __CL_UINT4__ 1 + #define __CL_INT4__ 1 + #define __CL_FLOAT4__ 1 +#endif + +#if defined( __SSE__ ) + #if defined( __MINGW64__ ) + #include + #else + #include + #endif + #if defined( __GNUC__ ) && !defined( __ICC ) + typedef float __cl_float4 __attribute__((vector_size(16))); + #else + typedef __m128 __cl_float4; + #endif + #define __CL_FLOAT4__ 1 +#endif + +#if defined( __SSE2__ ) + #if defined( __MINGW64__ ) + #include + #else + #include + #endif + #if defined( __GNUC__ ) && !defined( __ICC ) + typedef cl_uchar __cl_uchar16 __attribute__((vector_size(16))); + typedef cl_char __cl_char16 __attribute__((vector_size(16))); + typedef cl_ushort __cl_ushort8 __attribute__((vector_size(16))); + typedef cl_short __cl_short8 __attribute__((vector_size(16))); + typedef cl_uint __cl_uint4 __attribute__((vector_size(16))); + typedef cl_int __cl_int4 __attribute__((vector_size(16))); + typedef cl_ulong __cl_ulong2 __attribute__((vector_size(16))); + typedef cl_long __cl_long2 __attribute__((vector_size(16))); + typedef cl_double __cl_double2 __attribute__((vector_size(16))); + #else + typedef __m128i __cl_uchar16; + typedef __m128i __cl_char16; + typedef __m128i __cl_ushort8; + typedef __m128i __cl_short8; + typedef __m128i __cl_uint4; + typedef __m128i __cl_int4; + typedef __m128i __cl_ulong2; + typedef __m128i __cl_long2; + typedef __m128d __cl_double2; + #endif + #define __CL_UCHAR16__ 1 + #define __CL_CHAR16__ 1 + #define __CL_USHORT8__ 1 + #define __CL_SHORT8__ 1 + #define __CL_INT4__ 1 + #define __CL_UINT4__ 1 + #define __CL_ULONG2__ 1 + #define __CL_LONG2__ 1 + #define __CL_DOUBLE2__ 1 +#endif + +#if defined( __MMX__ ) + #include + #if defined( __GNUC__ ) && !defined( __ICC ) + typedef cl_uchar __cl_uchar8 __attribute__((vector_size(8))); + typedef cl_char __cl_char8 __attribute__((vector_size(8))); + typedef cl_ushort __cl_ushort4 __attribute__((vector_size(8))); + typedef cl_short __cl_short4 __attribute__((vector_size(8))); + typedef cl_uint __cl_uint2 __attribute__((vector_size(8))); + typedef cl_int __cl_int2 __attribute__((vector_size(8))); + typedef cl_ulong __cl_ulong1 __attribute__((vector_size(8))); + typedef cl_long __cl_long1 __attribute__((vector_size(8))); + typedef cl_float __cl_float2 __attribute__((vector_size(8))); + #else + typedef __m64 __cl_uchar8; + typedef __m64 __cl_char8; + typedef __m64 __cl_ushort4; + typedef __m64 __cl_short4; + typedef __m64 __cl_uint2; + typedef __m64 __cl_int2; + typedef __m64 __cl_ulong1; + typedef __m64 __cl_long1; + typedef __m64 __cl_float2; + #endif + #define __CL_UCHAR8__ 1 + #define __CL_CHAR8__ 1 + #define __CL_USHORT4__ 1 + #define __CL_SHORT4__ 1 + #define __CL_INT2__ 1 + #define __CL_UINT2__ 1 + #define __CL_ULONG1__ 1 + #define __CL_LONG1__ 1 + #define __CL_FLOAT2__ 1 +#endif + +#if defined( __AVX__ ) + #if defined( __MINGW64__ ) + #include + #else + #include + #endif + #if defined( __GNUC__ ) && !defined( __ICC ) + typedef cl_float __cl_float8 __attribute__((vector_size(32))); + typedef cl_double __cl_double4 __attribute__((vector_size(32))); + #else + typedef __m256 __cl_float8; + typedef __m256d __cl_double4; + #endif + #define __CL_FLOAT8__ 1 + #define __CL_DOUBLE4__ 1 +#endif + +/* Define alignment keys */ +#if defined( __GNUC__ ) + #define CL_ALIGNED(_x) __attribute__ ((aligned(_x))) +#elif defined( _WIN32) && (_MSC_VER) + /* Alignment keys neutered on windows because MSVC can't swallow function arguments with alignment requirements */ + /* http://msdn.microsoft.com/en-us/library/373ak2y1%28VS.71%29.aspx */ + /* #include */ + /* #define CL_ALIGNED(_x) _CRT_ALIGN(_x) */ + #define CL_ALIGNED(_x) +#else + #warning Need to implement some method to align data here + #define CL_ALIGNED(_x) +#endif + +/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */ +#if (defined( __GNUC__) && ! defined( __STRICT_ANSI__ )) || (defined( _MSC_VER ) && ! defined( __STDC__ )) + /* .xyzw and .s0123...{f|F} are supported */ + #define CL_HAS_NAMED_VECTOR_FIELDS 1 + /* .hi and .lo are supported */ + #define CL_HAS_HI_LO_VECTOR_FIELDS 1 + + #define CL_NAMED_STRUCT_SUPPORTED +#endif + +#if defined( CL_NAMED_STRUCT_SUPPORTED) && defined( _MSC_VER ) +#define __extension__ __pragma(warning(suppress:4201)) +#endif + +/* Define cl_vector types */ + +/* ---- cl_charn ---- */ +typedef union +{ + cl_char CL_ALIGNED(2) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_char x, y; }; + __extension__ struct{ cl_char s0, s1; }; + __extension__ struct{ cl_char lo, hi; }; +#endif +#if defined( __CL_CHAR2__) + __cl_char2 v2; +#endif +}cl_char2; + +typedef union +{ + cl_char CL_ALIGNED(4) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_char x, y, z, w; }; + __extension__ struct{ cl_char s0, s1, s2, s3; }; + __extension__ struct{ cl_char2 lo, hi; }; +#endif +#if defined( __CL_CHAR2__) + __cl_char2 v2[2]; +#endif +#if defined( __CL_CHAR4__) + __cl_char4 v4; +#endif +}cl_char4; + +/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */ +typedef cl_char4 cl_char3; + +typedef union +{ + cl_char CL_ALIGNED(8) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_char x, y, z, w; }; + __extension__ struct{ cl_char s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_char4 lo, hi; }; +#endif +#if defined( __CL_CHAR2__) + __cl_char2 v2[4]; +#endif +#if defined( __CL_CHAR4__) + __cl_char4 v4[2]; +#endif +#if defined( __CL_CHAR8__ ) + __cl_char8 v8; +#endif +}cl_char8; + +typedef union +{ + cl_char CL_ALIGNED(16) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_char x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_char s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_char8 lo, hi; }; +#endif +#if defined( __CL_CHAR2__) + __cl_char2 v2[8]; +#endif +#if defined( __CL_CHAR4__) + __cl_char4 v4[4]; +#endif +#if defined( __CL_CHAR8__ ) + __cl_char8 v8[2]; +#endif +#if defined( __CL_CHAR16__ ) + __cl_char16 v16; +#endif +}cl_char16; + + +/* ---- cl_ucharn ---- */ +typedef union +{ + cl_uchar CL_ALIGNED(2) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uchar x, y; }; + __extension__ struct{ cl_uchar s0, s1; }; + __extension__ struct{ cl_uchar lo, hi; }; +#endif +#if defined( __cl_uchar2__) + __cl_uchar2 v2; +#endif +}cl_uchar2; + +typedef union +{ + cl_uchar CL_ALIGNED(4) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uchar x, y, z, w; }; + __extension__ struct{ cl_uchar s0, s1, s2, s3; }; + __extension__ struct{ cl_uchar2 lo, hi; }; +#endif +#if defined( __CL_UCHAR2__) + __cl_uchar2 v2[2]; +#endif +#if defined( __CL_UCHAR4__) + __cl_uchar4 v4; +#endif +}cl_uchar4; + +/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */ +typedef cl_uchar4 cl_uchar3; + +typedef union +{ + cl_uchar CL_ALIGNED(8) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uchar x, y, z, w; }; + __extension__ struct{ cl_uchar s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_uchar4 lo, hi; }; +#endif +#if defined( __CL_UCHAR2__) + __cl_uchar2 v2[4]; +#endif +#if defined( __CL_UCHAR4__) + __cl_uchar4 v4[2]; +#endif +#if defined( __CL_UCHAR8__ ) + __cl_uchar8 v8; +#endif +}cl_uchar8; + +typedef union +{ + cl_uchar CL_ALIGNED(16) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uchar x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_uchar s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_uchar8 lo, hi; }; +#endif +#if defined( __CL_UCHAR2__) + __cl_uchar2 v2[8]; +#endif +#if defined( __CL_UCHAR4__) + __cl_uchar4 v4[4]; +#endif +#if defined( __CL_UCHAR8__ ) + __cl_uchar8 v8[2]; +#endif +#if defined( __CL_UCHAR16__ ) + __cl_uchar16 v16; +#endif +}cl_uchar16; + + +/* ---- cl_shortn ---- */ +typedef union +{ + cl_short CL_ALIGNED(4) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_short x, y; }; + __extension__ struct{ cl_short s0, s1; }; + __extension__ struct{ cl_short lo, hi; }; +#endif +#if defined( __CL_SHORT2__) + __cl_short2 v2; +#endif +}cl_short2; + +typedef union +{ + cl_short CL_ALIGNED(8) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_short x, y, z, w; }; + __extension__ struct{ cl_short s0, s1, s2, s3; }; + __extension__ struct{ cl_short2 lo, hi; }; +#endif +#if defined( __CL_SHORT2__) + __cl_short2 v2[2]; +#endif +#if defined( __CL_SHORT4__) + __cl_short4 v4; +#endif +}cl_short4; + +/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */ +typedef cl_short4 cl_short3; + +typedef union +{ + cl_short CL_ALIGNED(16) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_short x, y, z, w; }; + __extension__ struct{ cl_short s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_short4 lo, hi; }; +#endif +#if defined( __CL_SHORT2__) + __cl_short2 v2[4]; +#endif +#if defined( __CL_SHORT4__) + __cl_short4 v4[2]; +#endif +#if defined( __CL_SHORT8__ ) + __cl_short8 v8; +#endif +}cl_short8; + +typedef union +{ + cl_short CL_ALIGNED(32) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_short x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_short s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_short8 lo, hi; }; +#endif +#if defined( __CL_SHORT2__) + __cl_short2 v2[8]; +#endif +#if defined( __CL_SHORT4__) + __cl_short4 v4[4]; +#endif +#if defined( __CL_SHORT8__ ) + __cl_short8 v8[2]; +#endif +#if defined( __CL_SHORT16__ ) + __cl_short16 v16; +#endif +}cl_short16; + + +/* ---- cl_ushortn ---- */ +typedef union +{ + cl_ushort CL_ALIGNED(4) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ushort x, y; }; + __extension__ struct{ cl_ushort s0, s1; }; + __extension__ struct{ cl_ushort lo, hi; }; +#endif +#if defined( __CL_USHORT2__) + __cl_ushort2 v2; +#endif +}cl_ushort2; + +typedef union +{ + cl_ushort CL_ALIGNED(8) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ushort x, y, z, w; }; + __extension__ struct{ cl_ushort s0, s1, s2, s3; }; + __extension__ struct{ cl_ushort2 lo, hi; }; +#endif +#if defined( __CL_USHORT2__) + __cl_ushort2 v2[2]; +#endif +#if defined( __CL_USHORT4__) + __cl_ushort4 v4; +#endif +}cl_ushort4; + +/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */ +typedef cl_ushort4 cl_ushort3; + +typedef union +{ + cl_ushort CL_ALIGNED(16) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ushort x, y, z, w; }; + __extension__ struct{ cl_ushort s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_ushort4 lo, hi; }; +#endif +#if defined( __CL_USHORT2__) + __cl_ushort2 v2[4]; +#endif +#if defined( __CL_USHORT4__) + __cl_ushort4 v4[2]; +#endif +#if defined( __CL_USHORT8__ ) + __cl_ushort8 v8; +#endif +}cl_ushort8; + +typedef union +{ + cl_ushort CL_ALIGNED(32) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ushort x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_ushort s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_ushort8 lo, hi; }; +#endif +#if defined( __CL_USHORT2__) + __cl_ushort2 v2[8]; +#endif +#if defined( __CL_USHORT4__) + __cl_ushort4 v4[4]; +#endif +#if defined( __CL_USHORT8__ ) + __cl_ushort8 v8[2]; +#endif +#if defined( __CL_USHORT16__ ) + __cl_ushort16 v16; +#endif +}cl_ushort16; + +/* ---- cl_intn ---- */ +typedef union +{ + cl_int CL_ALIGNED(8) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_int x, y; }; + __extension__ struct{ cl_int s0, s1; }; + __extension__ struct{ cl_int lo, hi; }; +#endif +#if defined( __CL_INT2__) + __cl_int2 v2; +#endif +}cl_int2; + +typedef union +{ + cl_int CL_ALIGNED(16) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_int x, y, z, w; }; + __extension__ struct{ cl_int s0, s1, s2, s3; }; + __extension__ struct{ cl_int2 lo, hi; }; +#endif +#if defined( __CL_INT2__) + __cl_int2 v2[2]; +#endif +#if defined( __CL_INT4__) + __cl_int4 v4; +#endif +}cl_int4; + +/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */ +typedef cl_int4 cl_int3; + +typedef union +{ + cl_int CL_ALIGNED(32) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_int x, y, z, w; }; + __extension__ struct{ cl_int s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_int4 lo, hi; }; +#endif +#if defined( __CL_INT2__) + __cl_int2 v2[4]; +#endif +#if defined( __CL_INT4__) + __cl_int4 v4[2]; +#endif +#if defined( __CL_INT8__ ) + __cl_int8 v8; +#endif +}cl_int8; + +typedef union +{ + cl_int CL_ALIGNED(64) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_int x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_int s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_int8 lo, hi; }; +#endif +#if defined( __CL_INT2__) + __cl_int2 v2[8]; +#endif +#if defined( __CL_INT4__) + __cl_int4 v4[4]; +#endif +#if defined( __CL_INT8__ ) + __cl_int8 v8[2]; +#endif +#if defined( __CL_INT16__ ) + __cl_int16 v16; +#endif +}cl_int16; + + +/* ---- cl_uintn ---- */ +typedef union +{ + cl_uint CL_ALIGNED(8) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uint x, y; }; + __extension__ struct{ cl_uint s0, s1; }; + __extension__ struct{ cl_uint lo, hi; }; +#endif +#if defined( __CL_UINT2__) + __cl_uint2 v2; +#endif +}cl_uint2; + +typedef union +{ + cl_uint CL_ALIGNED(16) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uint x, y, z, w; }; + __extension__ struct{ cl_uint s0, s1, s2, s3; }; + __extension__ struct{ cl_uint2 lo, hi; }; +#endif +#if defined( __CL_UINT2__) + __cl_uint2 v2[2]; +#endif +#if defined( __CL_UINT4__) + __cl_uint4 v4; +#endif +}cl_uint4; + +/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */ +typedef cl_uint4 cl_uint3; + +typedef union +{ + cl_uint CL_ALIGNED(32) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uint x, y, z, w; }; + __extension__ struct{ cl_uint s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_uint4 lo, hi; }; +#endif +#if defined( __CL_UINT2__) + __cl_uint2 v2[4]; +#endif +#if defined( __CL_UINT4__) + __cl_uint4 v4[2]; +#endif +#if defined( __CL_UINT8__ ) + __cl_uint8 v8; +#endif +}cl_uint8; + +typedef union +{ + cl_uint CL_ALIGNED(64) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_uint x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_uint s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_uint8 lo, hi; }; +#endif +#if defined( __CL_UINT2__) + __cl_uint2 v2[8]; +#endif +#if defined( __CL_UINT4__) + __cl_uint4 v4[4]; +#endif +#if defined( __CL_UINT8__ ) + __cl_uint8 v8[2]; +#endif +#if defined( __CL_UINT16__ ) + __cl_uint16 v16; +#endif +}cl_uint16; + +/* ---- cl_longn ---- */ +typedef union +{ + cl_long CL_ALIGNED(16) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_long x, y; }; + __extension__ struct{ cl_long s0, s1; }; + __extension__ struct{ cl_long lo, hi; }; +#endif +#if defined( __CL_LONG2__) + __cl_long2 v2; +#endif +}cl_long2; + +typedef union +{ + cl_long CL_ALIGNED(32) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_long x, y, z, w; }; + __extension__ struct{ cl_long s0, s1, s2, s3; }; + __extension__ struct{ cl_long2 lo, hi; }; +#endif +#if defined( __CL_LONG2__) + __cl_long2 v2[2]; +#endif +#if defined( __CL_LONG4__) + __cl_long4 v4; +#endif +}cl_long4; + +/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */ +typedef cl_long4 cl_long3; + +typedef union +{ + cl_long CL_ALIGNED(64) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_long x, y, z, w; }; + __extension__ struct{ cl_long s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_long4 lo, hi; }; +#endif +#if defined( __CL_LONG2__) + __cl_long2 v2[4]; +#endif +#if defined( __CL_LONG4__) + __cl_long4 v4[2]; +#endif +#if defined( __CL_LONG8__ ) + __cl_long8 v8; +#endif +}cl_long8; + +typedef union +{ + cl_long CL_ALIGNED(128) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_long x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_long s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_long8 lo, hi; }; +#endif +#if defined( __CL_LONG2__) + __cl_long2 v2[8]; +#endif +#if defined( __CL_LONG4__) + __cl_long4 v4[4]; +#endif +#if defined( __CL_LONG8__ ) + __cl_long8 v8[2]; +#endif +#if defined( __CL_LONG16__ ) + __cl_long16 v16; +#endif +}cl_long16; + + +/* ---- cl_ulongn ---- */ +typedef union +{ + cl_ulong CL_ALIGNED(16) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ulong x, y; }; + __extension__ struct{ cl_ulong s0, s1; }; + __extension__ struct{ cl_ulong lo, hi; }; +#endif +#if defined( __CL_ULONG2__) + __cl_ulong2 v2; +#endif +}cl_ulong2; + +typedef union +{ + cl_ulong CL_ALIGNED(32) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ulong x, y, z, w; }; + __extension__ struct{ cl_ulong s0, s1, s2, s3; }; + __extension__ struct{ cl_ulong2 lo, hi; }; +#endif +#if defined( __CL_ULONG2__) + __cl_ulong2 v2[2]; +#endif +#if defined( __CL_ULONG4__) + __cl_ulong4 v4; +#endif +}cl_ulong4; + +/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */ +typedef cl_ulong4 cl_ulong3; + +typedef union +{ + cl_ulong CL_ALIGNED(64) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ulong x, y, z, w; }; + __extension__ struct{ cl_ulong s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_ulong4 lo, hi; }; +#endif +#if defined( __CL_ULONG2__) + __cl_ulong2 v2[4]; +#endif +#if defined( __CL_ULONG4__) + __cl_ulong4 v4[2]; +#endif +#if defined( __CL_ULONG8__ ) + __cl_ulong8 v8; +#endif +}cl_ulong8; + +typedef union +{ + cl_ulong CL_ALIGNED(128) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_ulong x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_ulong s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_ulong8 lo, hi; }; +#endif +#if defined( __CL_ULONG2__) + __cl_ulong2 v2[8]; +#endif +#if defined( __CL_ULONG4__) + __cl_ulong4 v4[4]; +#endif +#if defined( __CL_ULONG8__ ) + __cl_ulong8 v8[2]; +#endif +#if defined( __CL_ULONG16__ ) + __cl_ulong16 v16; +#endif +}cl_ulong16; + + +/* --- cl_floatn ---- */ + +typedef union +{ + cl_float CL_ALIGNED(8) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_float x, y; }; + __extension__ struct{ cl_float s0, s1; }; + __extension__ struct{ cl_float lo, hi; }; +#endif +#if defined( __CL_FLOAT2__) + __cl_float2 v2; +#endif +}cl_float2; + +typedef union +{ + cl_float CL_ALIGNED(16) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_float x, y, z, w; }; + __extension__ struct{ cl_float s0, s1, s2, s3; }; + __extension__ struct{ cl_float2 lo, hi; }; +#endif +#if defined( __CL_FLOAT2__) + __cl_float2 v2[2]; +#endif +#if defined( __CL_FLOAT4__) + __cl_float4 v4; +#endif +}cl_float4; + +/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */ +typedef cl_float4 cl_float3; + +typedef union +{ + cl_float CL_ALIGNED(32) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_float x, y, z, w; }; + __extension__ struct{ cl_float s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_float4 lo, hi; }; +#endif +#if defined( __CL_FLOAT2__) + __cl_float2 v2[4]; +#endif +#if defined( __CL_FLOAT4__) + __cl_float4 v4[2]; +#endif +#if defined( __CL_FLOAT8__ ) + __cl_float8 v8; +#endif +}cl_float8; + +typedef union +{ + cl_float CL_ALIGNED(64) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_float x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_float s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_float8 lo, hi; }; +#endif +#if defined( __CL_FLOAT2__) + __cl_float2 v2[8]; +#endif +#if defined( __CL_FLOAT4__) + __cl_float4 v4[4]; +#endif +#if defined( __CL_FLOAT8__ ) + __cl_float8 v8[2]; +#endif +#if defined( __CL_FLOAT16__ ) + __cl_float16 v16; +#endif +}cl_float16; + +/* --- cl_doublen ---- */ + +typedef union +{ + cl_double CL_ALIGNED(16) s[2]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_double x, y; }; + __extension__ struct{ cl_double s0, s1; }; + __extension__ struct{ cl_double lo, hi; }; +#endif +#if defined( __CL_DOUBLE2__) + __cl_double2 v2; +#endif +}cl_double2; + +typedef union +{ + cl_double CL_ALIGNED(32) s[4]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_double x, y, z, w; }; + __extension__ struct{ cl_double s0, s1, s2, s3; }; + __extension__ struct{ cl_double2 lo, hi; }; +#endif +#if defined( __CL_DOUBLE2__) + __cl_double2 v2[2]; +#endif +#if defined( __CL_DOUBLE4__) + __cl_double4 v4; +#endif +}cl_double4; + +/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */ +typedef cl_double4 cl_double3; + +typedef union +{ + cl_double CL_ALIGNED(64) s[8]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_double x, y, z, w; }; + __extension__ struct{ cl_double s0, s1, s2, s3, s4, s5, s6, s7; }; + __extension__ struct{ cl_double4 lo, hi; }; +#endif +#if defined( __CL_DOUBLE2__) + __cl_double2 v2[4]; +#endif +#if defined( __CL_DOUBLE4__) + __cl_double4 v4[2]; +#endif +#if defined( __CL_DOUBLE8__ ) + __cl_double8 v8; +#endif +}cl_double8; + +typedef union +{ + cl_double CL_ALIGNED(128) s[16]; +#if defined( CL_NAMED_STRUCT_SUPPORTED ) + __extension__ struct{ cl_double x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; }; + __extension__ struct{ cl_double s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; }; + __extension__ struct{ cl_double8 lo, hi; }; +#endif +#if defined( __CL_DOUBLE2__) + __cl_double2 v2[8]; +#endif +#if defined( __CL_DOUBLE4__) + __cl_double4 v4[4]; +#endif +#if defined( __CL_DOUBLE8__ ) + __cl_double8 v8[2]; +#endif +#if defined( __CL_DOUBLE16__ ) + __cl_double16 v16; +#endif +}cl_double16; + +/* Macro to facilitate debugging + * Usage: + * Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source. + * The first line ends with: CL_PROGRAM_STRING_BEGIN \" + * Each line thereafter of OpenCL C source must end with: \n\ + * The last line ends in "; + * + * Example: + * + * const char *my_program = CL_PROGRAM_STRING_BEGIN "\ + * kernel void foo( int a, float * b ) \n\ + * { \n\ + * // my comment \n\ + * *b[ get_global_id(0)] = a; \n\ + * } \n\ + * "; + * + * This should correctly set up the line, (column) and file information for your source + * string so you can do source level debugging. + */ +#define __CL_STRINGIFY( _x ) # _x +#define _CL_STRINGIFY( _x ) __CL_STRINGIFY( _x ) +#define CL_PROGRAM_STRING_DEBUG_INFO "#line " _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n" + +// CL.h contents +/******************************************************************************/ + +typedef struct _cl_platform_id * cl_platform_id; +typedef struct _cl_device_id * cl_device_id; +typedef struct _cl_context * cl_context; +typedef struct _cl_command_queue * cl_command_queue; +typedef struct _cl_mem * cl_mem; +typedef struct _cl_program * cl_program; +typedef struct _cl_kernel * cl_kernel; +typedef struct _cl_event * cl_event; +typedef struct _cl_sampler * cl_sampler; + +typedef cl_uint cl_bool; /* WARNING! Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */ +typedef cl_ulong cl_bitfield; +typedef cl_bitfield cl_device_type; +typedef cl_uint cl_platform_info; +typedef cl_uint cl_device_info; +typedef cl_bitfield cl_device_fp_config; +typedef cl_uint cl_device_mem_cache_type; +typedef cl_uint cl_device_local_mem_type; +typedef cl_bitfield cl_device_exec_capabilities; +typedef cl_bitfield cl_command_queue_properties; + +typedef intptr_t cl_context_properties; +typedef cl_uint cl_context_info; +typedef cl_uint cl_command_queue_info; +typedef cl_uint cl_channel_order; +typedef cl_uint cl_channel_type; +typedef cl_bitfield cl_mem_flags; +typedef cl_uint cl_mem_object_type; +typedef cl_uint cl_mem_info; +typedef cl_uint cl_image_info; +typedef cl_uint cl_buffer_create_type; +typedef cl_uint cl_addressing_mode; +typedef cl_uint cl_filter_mode; +typedef cl_uint cl_sampler_info; +typedef cl_bitfield cl_map_flags; +typedef cl_uint cl_program_info; +typedef cl_uint cl_program_build_info; +typedef cl_int cl_build_status; +typedef cl_uint cl_kernel_info; +typedef cl_uint cl_kernel_work_group_info; +typedef cl_uint cl_event_info; +typedef cl_uint cl_command_type; +typedef cl_uint cl_profiling_info; + +typedef struct _cl_image_format { + cl_channel_order image_channel_order; + cl_channel_type image_channel_data_type; +} cl_image_format; + + +typedef struct _cl_buffer_region { + size_t origin; + size_t size; +} cl_buffer_region; + +/******************************************************************************/ + +/* Error Codes */ +#define CL_SUCCESS 0 +#define CL_DEVICE_NOT_FOUND -1 +#define CL_DEVICE_NOT_AVAILABLE -2 +#define CL_COMPILER_NOT_AVAILABLE -3 +#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4 +#define CL_OUT_OF_RESOURCES -5 +#define CL_OUT_OF_HOST_MEMORY -6 +#define CL_PROFILING_INFO_NOT_AVAILABLE -7 +#define CL_MEM_COPY_OVERLAP -8 +#define CL_IMAGE_FORMAT_MISMATCH -9 +#define CL_IMAGE_FORMAT_NOT_SUPPORTED -10 +#define CL_BUILD_PROGRAM_FAILURE -11 +#define CL_MAP_FAILURE -12 +#define CL_MISALIGNED_SUB_BUFFER_OFFSET -13 +#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14 + +#define CL_INVALID_VALUE -30 +#define CL_INVALID_DEVICE_TYPE -31 +#define CL_INVALID_PLATFORM -32 +#define CL_INVALID_DEVICE -33 +#define CL_INVALID_CONTEXT -34 +#define CL_INVALID_QUEUE_PROPERTIES -35 +#define CL_INVALID_COMMAND_QUEUE -36 +#define CL_INVALID_HOST_PTR -37 +#define CL_INVALID_MEM_OBJECT -38 +#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR -39 +#define CL_INVALID_IMAGE_SIZE -40 +#define CL_INVALID_SAMPLER -41 +#define CL_INVALID_BINARY -42 +#define CL_INVALID_BUILD_OPTIONS -43 +#define CL_INVALID_PROGRAM -44 +#define CL_INVALID_PROGRAM_EXECUTABLE -45 +#define CL_INVALID_KERNEL_NAME -46 +#define CL_INVALID_KERNEL_DEFINITION -47 +#define CL_INVALID_KERNEL -48 +#define CL_INVALID_ARG_INDEX -49 +#define CL_INVALID_ARG_VALUE -50 +#define CL_INVALID_ARG_SIZE -51 +#define CL_INVALID_KERNEL_ARGS -52 +#define CL_INVALID_WORK_DIMENSION -53 +#define CL_INVALID_WORK_GROUP_SIZE -54 +#define CL_INVALID_WORK_ITEM_SIZE -55 +#define CL_INVALID_GLOBAL_OFFSET -56 +#define CL_INVALID_EVENT_WAIT_LIST -57 +#define CL_INVALID_EVENT -58 +#define CL_INVALID_OPERATION -59 +#define CL_INVALID_GL_OBJECT -60 +#define CL_INVALID_BUFFER_SIZE -61 +#define CL_INVALID_MIP_LEVEL -62 +#define CL_INVALID_GLOBAL_WORK_SIZE -63 +#define CL_INVALID_PROPERTY -64 + +/* OpenCL Version */ +#define CL_VERSION_1_0 1 +#define CL_VERSION_1_1 1 + +/* cl_bool */ +#define CL_FALSE 0 +#define CL_TRUE 1 + +/* cl_platform_info */ +#define CL_PLATFORM_PROFILE 0x0900 +#define CL_PLATFORM_VERSION 0x0901 +#define CL_PLATFORM_NAME 0x0902 +#define CL_PLATFORM_VENDOR 0x0903 +#define CL_PLATFORM_EXTENSIONS 0x0904 + +/* cl_device_type - bitfield */ +#define CL_DEVICE_TYPE_DEFAULT (1 << 0) +#define CL_DEVICE_TYPE_CPU (1 << 1) +#define CL_DEVICE_TYPE_GPU (1 << 2) +#define CL_DEVICE_TYPE_ACCELERATOR (1 << 3) +#define CL_DEVICE_TYPE_ALL 0xFFFFFFFF + +/* cl_device_info */ +#define CL_DEVICE_TYPE 0x1000 +#define CL_DEVICE_VENDOR_ID 0x1001 +#define CL_DEVICE_MAX_COMPUTE_UNITS 0x1002 +#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS 0x1003 +#define CL_DEVICE_MAX_WORK_GROUP_SIZE 0x1004 +#define CL_DEVICE_MAX_WORK_ITEM_SIZES 0x1005 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT 0x1007 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT 0x1008 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG 0x1009 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B +#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C +#define CL_DEVICE_ADDRESS_BITS 0x100D +#define CL_DEVICE_MAX_READ_IMAGE_ARGS 0x100E +#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS 0x100F +#define CL_DEVICE_MAX_MEM_ALLOC_SIZE 0x1010 +#define CL_DEVICE_IMAGE2D_MAX_WIDTH 0x1011 +#define CL_DEVICE_IMAGE2D_MAX_HEIGHT 0x1012 +#define CL_DEVICE_IMAGE3D_MAX_WIDTH 0x1013 +#define CL_DEVICE_IMAGE3D_MAX_HEIGHT 0x1014 +#define CL_DEVICE_IMAGE3D_MAX_DEPTH 0x1015 +#define CL_DEVICE_IMAGE_SUPPORT 0x1016 +#define CL_DEVICE_MAX_PARAMETER_SIZE 0x1017 +#define CL_DEVICE_MAX_SAMPLERS 0x1018 +#define CL_DEVICE_MEM_BASE_ADDR_ALIGN 0x1019 +#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 0x101A +#define CL_DEVICE_SINGLE_FP_CONFIG 0x101B +#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE 0x101C +#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 0x101D +#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE 0x101E +#define CL_DEVICE_GLOBAL_MEM_SIZE 0x101F +#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE 0x1020 +#define CL_DEVICE_MAX_CONSTANT_ARGS 0x1021 +#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022 +#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023 +#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024 +#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025 +#define CL_DEVICE_ENDIAN_LITTLE 0x1026 +#define CL_DEVICE_AVAILABLE 0x1027 +#define CL_DEVICE_COMPILER_AVAILABLE 0x1028 +#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029 +#define CL_DEVICE_QUEUE_PROPERTIES 0x102A +#define CL_DEVICE_NAME 0x102B +#define CL_DEVICE_VENDOR 0x102C +#define CL_DRIVER_VERSION 0x102D +#define CL_DEVICE_PROFILE 0x102E +#define CL_DEVICE_VERSION 0x102F +#define CL_DEVICE_EXTENSIONS 0x1030 +#define CL_DEVICE_PLATFORM 0x1031 +/* 0x1032 reserved for CL_DEVICE_DOUBLE_FP_CONFIG */ +/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */ +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034 +#define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 0x1037 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 0x1038 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 0x1039 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 0x103A +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 0x103B +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 0x103C +#define CL_DEVICE_OPENCL_C_VERSION 0x103D + +/* cl_device_fp_config - bitfield */ +#define CL_FP_DENORM (1 << 0) +#define CL_FP_INF_NAN (1 << 1) +#define CL_FP_ROUND_TO_NEAREST (1 << 2) +#define CL_FP_ROUND_TO_ZERO (1 << 3) +#define CL_FP_ROUND_TO_INF (1 << 4) +#define CL_FP_FMA (1 << 5) +#define CL_FP_SOFT_FLOAT (1 << 6) + +/* cl_device_mem_cache_type */ +#define CL_NONE 0x0 +#define CL_READ_ONLY_CACHE 0x1 +#define CL_READ_WRITE_CACHE 0x2 + +/* cl_device_local_mem_type */ +#define CL_LOCAL 0x1 +#define CL_GLOBAL 0x2 + +/* cl_device_exec_capabilities - bitfield */ +#define CL_EXEC_KERNEL (1 << 0) +#define CL_EXEC_NATIVE_KERNEL (1 << 1) + +/* cl_command_queue_properties - bitfield */ +#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE (1 << 0) +#define CL_QUEUE_PROFILING_ENABLE (1 << 1) + +/* cl_context_info */ +#define CL_CONTEXT_REFERENCE_COUNT 0x1080 +#define CL_CONTEXT_DEVICES 0x1081 +#define CL_CONTEXT_PROPERTIES 0x1082 +#define CL_CONTEXT_NUM_DEVICES 0x1083 + +/* cl_context_info + cl_context_properties */ +#define CL_CONTEXT_PLATFORM 0x1084 + +/* cl_command_queue_info */ +#define CL_QUEUE_CONTEXT 0x1090 +#define CL_QUEUE_DEVICE 0x1091 +#define CL_QUEUE_REFERENCE_COUNT 0x1092 +#define CL_QUEUE_PROPERTIES 0x1093 + +/* cl_mem_flags - bitfield */ +#define CL_MEM_READ_WRITE (1 << 0) +#define CL_MEM_WRITE_ONLY (1 << 1) +#define CL_MEM_READ_ONLY (1 << 2) +#define CL_MEM_USE_HOST_PTR (1 << 3) +#define CL_MEM_ALLOC_HOST_PTR (1 << 4) +#define CL_MEM_COPY_HOST_PTR (1 << 5) + +/* cl_channel_order */ +#define CL_R 0x10B0 +#define CL_A 0x10B1 +#define CL_RG 0x10B2 +#define CL_RA 0x10B3 +#define CL_RGB 0x10B4 +#define CL_RGBA 0x10B5 +#define CL_BGRA 0x10B6 +#define CL_ARGB 0x10B7 +#define CL_INTENSITY 0x10B8 +#define CL_LUMINANCE 0x10B9 +#define CL_Rx 0x10BA +#define CL_RGx 0x10BB +#define CL_RGBx 0x10BC + +/* cl_channel_type */ +#define CL_SNORM_INT8 0x10D0 +#define CL_SNORM_INT16 0x10D1 +#define CL_UNORM_INT8 0x10D2 +#define CL_UNORM_INT16 0x10D3 +#define CL_UNORM_SHORT_565 0x10D4 +#define CL_UNORM_SHORT_555 0x10D5 +#define CL_UNORM_INT_101010 0x10D6 +#define CL_SIGNED_INT8 0x10D7 +#define CL_SIGNED_INT16 0x10D8 +#define CL_SIGNED_INT32 0x10D9 +#define CL_UNSIGNED_INT8 0x10DA +#define CL_UNSIGNED_INT16 0x10DB +#define CL_UNSIGNED_INT32 0x10DC +#define CL_HALF_FLOAT 0x10DD +#define CL_FLOAT 0x10DE + +/* cl_mem_object_type */ +#define CL_MEM_OBJECT_BUFFER 0x10F0 +#define CL_MEM_OBJECT_IMAGE2D 0x10F1 +#define CL_MEM_OBJECT_IMAGE3D 0x10F2 + +/* cl_mem_info */ +#define CL_MEM_TYPE 0x1100 +#define CL_MEM_FLAGS 0x1101 +#define CL_MEM_SIZE 0x1102 +#define CL_MEM_HOST_PTR 0x1103 +#define CL_MEM_MAP_COUNT 0x1104 +#define CL_MEM_REFERENCE_COUNT 0x1105 +#define CL_MEM_CONTEXT 0x1106 +#define CL_MEM_ASSOCIATED_MEMOBJECT 0x1107 +#define CL_MEM_OFFSET 0x1108 + +/* cl_image_info */ +#define CL_IMAGE_FORMAT 0x1110 +#define CL_IMAGE_ELEMENT_SIZE 0x1111 +#define CL_IMAGE_ROW_PITCH 0x1112 +#define CL_IMAGE_SLICE_PITCH 0x1113 +#define CL_IMAGE_WIDTH 0x1114 +#define CL_IMAGE_HEIGHT 0x1115 +#define CL_IMAGE_DEPTH 0x1116 + +/* cl_addressing_mode */ +#define CL_ADDRESS_NONE 0x1130 +#define CL_ADDRESS_CLAMP_TO_EDGE 0x1131 +#define CL_ADDRESS_CLAMP 0x1132 +#define CL_ADDRESS_REPEAT 0x1133 +#define CL_ADDRESS_MIRRORED_REPEAT 0x1134 + +/* cl_filter_mode */ +#define CL_FILTER_NEAREST 0x1140 +#define CL_FILTER_LINEAR 0x1141 + +/* cl_sampler_info */ +#define CL_SAMPLER_REFERENCE_COUNT 0x1150 +#define CL_SAMPLER_CONTEXT 0x1151 +#define CL_SAMPLER_NORMALIZED_COORDS 0x1152 +#define CL_SAMPLER_ADDRESSING_MODE 0x1153 +#define CL_SAMPLER_FILTER_MODE 0x1154 + +/* cl_map_flags - bitfield */ +#define CL_MAP_READ (1 << 0) +#define CL_MAP_WRITE (1 << 1) + +/* cl_program_info */ +#define CL_PROGRAM_REFERENCE_COUNT 0x1160 +#define CL_PROGRAM_CONTEXT 0x1161 +#define CL_PROGRAM_NUM_DEVICES 0x1162 +#define CL_PROGRAM_DEVICES 0x1163 +#define CL_PROGRAM_SOURCE 0x1164 +#define CL_PROGRAM_BINARY_SIZES 0x1165 +#define CL_PROGRAM_BINARIES 0x1166 + +/* cl_program_build_info */ +#define CL_PROGRAM_BUILD_STATUS 0x1181 +#define CL_PROGRAM_BUILD_OPTIONS 0x1182 +#define CL_PROGRAM_BUILD_LOG 0x1183 + +/* cl_build_status */ +#define CL_BUILD_SUCCESS 0 +#define CL_BUILD_NONE -1 +#define CL_BUILD_ERROR -2 +#define CL_BUILD_IN_PROGRESS -3 + +/* cl_kernel_info */ +#define CL_KERNEL_FUNCTION_NAME 0x1190 +#define CL_KERNEL_NUM_ARGS 0x1191 +#define CL_KERNEL_REFERENCE_COUNT 0x1192 +#define CL_KERNEL_CONTEXT 0x1193 +#define CL_KERNEL_PROGRAM 0x1194 + +/* cl_kernel_work_group_info */ +#define CL_KERNEL_WORK_GROUP_SIZE 0x11B0 +#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1 +#define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2 +#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3 +#define CL_KERNEL_PRIVATE_MEM_SIZE 0x11B4 + +/* cl_event_info */ +#define CL_EVENT_COMMAND_QUEUE 0x11D0 +#define CL_EVENT_COMMAND_TYPE 0x11D1 +#define CL_EVENT_REFERENCE_COUNT 0x11D2 +#define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3 +#define CL_EVENT_CONTEXT 0x11D4 + +/* cl_command_type */ +#define CL_COMMAND_NDRANGE_KERNEL 0x11F0 +#define CL_COMMAND_TASK 0x11F1 +#define CL_COMMAND_NATIVE_KERNEL 0x11F2 +#define CL_COMMAND_READ_BUFFER 0x11F3 +#define CL_COMMAND_WRITE_BUFFER 0x11F4 +#define CL_COMMAND_COPY_BUFFER 0x11F5 +#define CL_COMMAND_READ_IMAGE 0x11F6 +#define CL_COMMAND_WRITE_IMAGE 0x11F7 +#define CL_COMMAND_COPY_IMAGE 0x11F8 +#define CL_COMMAND_COPY_IMAGE_TO_BUFFER 0x11F9 +#define CL_COMMAND_COPY_BUFFER_TO_IMAGE 0x11FA +#define CL_COMMAND_MAP_BUFFER 0x11FB +#define CL_COMMAND_MAP_IMAGE 0x11FC +#define CL_COMMAND_UNMAP_MEM_OBJECT 0x11FD +#define CL_COMMAND_MARKER 0x11FE +#define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF +#define CL_COMMAND_RELEASE_GL_OBJECTS 0x1200 +#define CL_COMMAND_READ_BUFFER_RECT 0x1201 +#define CL_COMMAND_WRITE_BUFFER_RECT 0x1202 +#define CL_COMMAND_COPY_BUFFER_RECT 0x1203 +#define CL_COMMAND_USER 0x1204 + +/* command execution status */ +#define CL_COMPLETE 0x0 +#define CL_RUNNING 0x1 +#define CL_SUBMITTED 0x2 +#define CL_QUEUED 0x3 + +/* cl_buffer_create_type */ +#define CL_BUFFER_CREATE_TYPE_REGION 0x1220 + +/* cl_profiling_info */ +#define CL_PROFILING_COMMAND_QUEUED 0x1280 +#define CL_PROFILING_COMMAND_SUBMIT 0x1281 +#define CL_PROFILING_COMMAND_START 0x1282 +#define CL_PROFILING_COMMAND_END 0x1283 + +/********************************************************************************************************/ + +/********************************************************************************************************/ + +/* Function signature typedef's */ + +/* Platform API */ +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPLATFORMIDS)(cl_uint /* num_entries */, + cl_platform_id * /* platforms */, + cl_uint * /* num_platforms */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPLATFORMINFO)(cl_platform_id /* platform */, + cl_platform_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +/* Device APIs */ +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETDEVICEIDS)(cl_platform_id /* platform */, + cl_device_type /* device_type */, + cl_uint /* num_entries */, + cl_device_id * /* devices */, + cl_uint * /* num_devices */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETDEVICEINFO)(cl_device_id /* device */, + cl_device_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Context APIs +typedef CL_API_ENTRY cl_context (CL_API_CALL * +PFNCLCREATECONTEXT)(const cl_context_properties * /* properties */, + cl_uint /* num_devices */, + const cl_device_id * /* devices */, + void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *), + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_context (CL_API_CALL * +PFNCLCREATECONTEXTFROMTYPE)(const cl_context_properties * /* properties */, + cl_device_type /* device_type */, + void (CL_CALLBACK * /* pfn_notify*/ )(const char *, const void *, size_t, void *), + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINCONTEXT)(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASECONTEXT)(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETCONTEXTINFO)(cl_context /* context */, + cl_context_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +/* Command Queue APIs */ +typedef CL_API_ENTRY cl_command_queue (CL_API_CALL * +PFNCLCREATECOMMANDQUEUE)(cl_context /* context */, + cl_device_id /* device */, + cl_command_queue_properties /* properties */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINCOMMANDQUEUE)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASECOMMANDQUEUE)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETCOMMANDQUEUEINFO)(cl_command_queue /* command_queue */, + cl_command_queue_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETCOMMANDQUEUEPROPERTY)(cl_command_queue /* command_queue */, + cl_command_queue_properties /* properties */, + cl_bool /* enable */, + cl_command_queue_properties * /* old_properties */) CL_API_SUFFIX__VERSION_1_0; + +/* Memory Object APIs */ +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATEBUFFER)(cl_context /* context */, + cl_mem_flags /* flags */, + size_t /* size */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATESUBBUFFER)(cl_mem /* buffer */, + cl_mem_flags /* flags */, + cl_buffer_create_type /* buffer_create_type */, + const void * /* buffer_create_info */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATEIMAGE2D)(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_row_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATEIMAGE3D)(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_depth */, + size_t /* image_row_pitch */, + size_t /* image_slice_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINMEMOBJECT)(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEMEMOBJECT)(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETSUPPORTEDIMAGEFORMATS)(cl_context /* context */, + cl_mem_flags /* flags */, + cl_mem_object_type /* image_type */, + cl_uint /* num_entries */, + cl_image_format * /* image_formats */, + cl_uint * /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETMEMOBJECTINFO)(cl_mem /* memobj */, + cl_mem_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETIMAGEINFO)(cl_mem /* image */, + cl_image_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETMEMOBJECTDESTRUCTORCALLBACK)( cl_mem /* memobj */, + void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), + void * /*user_data */ ) CL_API_SUFFIX__VERSION_1_1; + +/* Sampler APIs */ +typedef CL_API_ENTRY cl_sampler (CL_API_CALL * +PFNCLCREATESAMPLER)(cl_context /* context */, + cl_bool /* normalized_coords */, + cl_addressing_mode /* addressing_mode */, + cl_filter_mode /* filter_mode */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINSAMPLER)(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASESAMPLER)(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETSAMPLERINFO)(cl_sampler /* sampler */, + cl_sampler_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +/* Program Object APIs */ +typedef CL_API_ENTRY cl_program (CL_API_CALL * +PFNCLCREATEPROGRAMWITHSOURCE)(cl_context /* context */, + cl_uint /* count */, + const char ** /* strings */, + const size_t * /* lengths */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_program (CL_API_CALL * +PFNCLCREATEPROGRAMWITHBINARY)(cl_context /* context */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const size_t * /* lengths */, + const unsigned char ** /* binaries */, + cl_int * /* binary_status */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINPROGRAM)(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEPROGRAM)(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLBUILDPROGRAM)(cl_program /* program */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* options */, + void (CL_CALLBACK * /* pfn_notify */)(cl_program /* program */, void * /* user_data */), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLUNLOADCOMPILER)(void) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPROGRAMINFO)(cl_program /* program */, + cl_program_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPROGRAMBUILDINFO)(cl_program /* program */, + cl_device_id /* device */, + cl_program_build_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +/* Kernel Object APIs */ +typedef CL_API_ENTRY cl_kernel (CL_API_CALL * +PFNCLCREATEKERNEL)(cl_program /* program */, + const char * /* kernel_name */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLCREATEKERNELSINPROGRAM)(cl_program /* program */, + cl_uint /* num_kernels */, + cl_kernel * /* kernels */, + cl_uint * /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINKERNEL)(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEKERNEL)(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETKERNELARG)(cl_kernel /* kernel */, + cl_uint /* arg_index */, + size_t /* arg_size */, + const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETKERNELINFO)(cl_kernel /* kernel */, + cl_kernel_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETKERNELWORKGROUPINFO)(cl_kernel /* kernel */, + cl_device_id /* device */, + cl_kernel_work_group_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Event Object APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLWAITFOREVENTS)(cl_uint /* num_events */, + const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETEVENTINFO)(cl_event /* event */, + cl_event_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_event (CL_API_CALL * +PFNCLCREATEUSEREVENT)(cl_context /* context */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINEVENT)(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEEVENT)(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETUSEREVENTSTATUS)(cl_event /* event */, + cl_int /* execution_status */) CL_API_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETEVENTCALLBACK)( cl_event /* event */, + cl_int /* command_exec_callback_type */, + void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_1; + +/* Profiling APIs */ +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETEVENTPROFILINGINFO)(cl_event /* event */, + cl_profiling_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Flush and Finish APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLFLUSH)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLFINISH)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +/* Enqueued Commands APIs */ +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEREADBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_read */, + size_t /* offset */, + size_t /* cb */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEREADBUFFERRECT)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_read */, + const size_t * /* buffer_origin */, + const size_t * /* host_origin */, + const size_t * /* region */, + size_t /* buffer_row_pitch */, + size_t /* buffer_slice_pitch */, + size_t /* host_row_pitch */, + size_t /* host_slice_pitch */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWRITEBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_write */, + size_t /* offset */, + size_t /* cb */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWRITEBUFFERRECT)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_write */, + const size_t * /* buffer_origin */, + const size_t * /* host_origin */, + const size_t * /* region */, + size_t /* buffer_row_pitch */, + size_t /* buffer_slice_pitch */, + size_t /* host_row_pitch */, + size_t /* host_slice_pitch */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_buffer */, + size_t /* src_offset */, + size_t /* dst_offset */, + size_t /* cb */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYBUFFERRECT)(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_buffer */, + const size_t * /* src_origin */, + const size_t * /* dst_origin */, + const size_t * /* region */, + size_t /* src_row_pitch */, + size_t /* src_slice_pitch */, + size_t /* dst_row_pitch */, + size_t /* dst_slice_pitch */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_1; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEREADIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* image */, + cl_bool /* blocking_read */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + size_t /* row_pitch */, + size_t /* slice_pitch */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWRITEIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* image */, + cl_bool /* blocking_write */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + size_t /* input_row_pitch */, + size_t /* input_slice_pitch */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* src_image */, + cl_mem /* dst_image */, + const size_t * /* src_origin[3] */, + const size_t * /* dst_origin[3] */, + const size_t * /* region[3] */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYIMAGETOBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* src_image */, + cl_mem /* dst_buffer */, + const size_t * /* src_origin[3] */, + const size_t * /* region[3] */, + size_t /* dst_offset */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYBUFFERTOIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_image */, + size_t /* src_offset */, + const size_t * /* dst_origin[3] */, + const size_t * /* region[3] */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY void * (CL_API_CALL * +PFNCLENQUEUEMAPBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_map */, + cl_map_flags /* map_flags */, + size_t /* offset */, + size_t /* cb */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY void * (CL_API_CALL * +PFNCLENQUEUEMAPIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* image */, + cl_bool /* blocking_map */, + cl_map_flags /* map_flags */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + size_t * /* image_row_pitch */, + size_t * /* image_slice_pitch */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEUNMAPMEMOBJECT)(cl_command_queue /* command_queue */, + cl_mem /* memobj */, + void * /* mapped_ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUENDRANGEKERNEL)(cl_command_queue /* command_queue */, + cl_kernel /* kernel */, + cl_uint /* work_dim */, + const size_t * /* global_work_offset */, + const size_t * /* global_work_size */, + const size_t * /* local_work_size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUETASK)(cl_command_queue /* command_queue */, + cl_kernel /* kernel */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUENATIVEKERNEL)(cl_command_queue /* command_queue */, + void (*user_func)(void *), + void * /* args */, + size_t /* cb_args */, + cl_uint /* num_mem_objects */, + const cl_mem * /* mem_list */, + const void ** /* args_mem_loc */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEMARKER)(cl_command_queue /* command_queue */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWAITFOREVENTS)(cl_command_queue /* command_queue */, + cl_uint /* num_events */, + const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEBARRIER)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +// Extension function access +// +// Returns the extension function address for the given function name, +// or NULL if a valid function can not be found. The client must +// check to make sure the address is not NULL, before using or +// calling the returned function address. +// +typedef CL_API_ENTRY void * (CL_API_CALL * PFNCLGETEXTENSIONFUNCTIONADDRESS)(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0; + + +#define CLEW_STATIC + +#ifdef CLEW_STATIC +# define CLEWAPI extern +#else +# ifdef CLEW_BUILD +# define CLEWAPI extern __declspec(dllexport) +# else +# define CLEWAPI extern __declspec(dllimport) +# endif +#endif + +#if defined(_WIN32) +#define CLEW_FUN_EXPORT extern +#else +#define CLEW_FUN_EXPORT CLEWAPI +#endif + +#define CLEW_GET_FUN(x) x + + +// Variables holding function entry points +CLEW_FUN_EXPORT PFNCLGETPLATFORMIDS __clewGetPlatformIDs ; +CLEW_FUN_EXPORT PFNCLGETPLATFORMINFO __clewGetPlatformInfo ; +CLEW_FUN_EXPORT PFNCLGETDEVICEIDS __clewGetDeviceIDs ; +CLEW_FUN_EXPORT PFNCLGETDEVICEINFO __clewGetDeviceInfo ; +CLEW_FUN_EXPORT PFNCLCREATECONTEXT __clewCreateContext ; +CLEW_FUN_EXPORT PFNCLCREATECONTEXTFROMTYPE __clewCreateContextFromType ; +CLEW_FUN_EXPORT PFNCLRETAINCONTEXT __clewRetainContext ; +CLEW_FUN_EXPORT PFNCLRELEASECONTEXT __clewReleaseContext ; +CLEW_FUN_EXPORT PFNCLGETCONTEXTINFO __clewGetContextInfo ; +CLEW_FUN_EXPORT PFNCLCREATECOMMANDQUEUE __clewCreateCommandQueue ; +CLEW_FUN_EXPORT PFNCLRETAINCOMMANDQUEUE __clewRetainCommandQueue ; +CLEW_FUN_EXPORT PFNCLRELEASECOMMANDQUEUE __clewReleaseCommandQueue ; +CLEW_FUN_EXPORT PFNCLGETCOMMANDQUEUEINFO __clewGetCommandQueueInfo ; +#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS +CLEW_FUN_EXPORT PFNCLSETCOMMANDQUEUEPROPERTY __clewSetCommandQueueProperty ; +#endif +CLEW_FUN_EXPORT PFNCLCREATEBUFFER __clewCreateBuffer ; +CLEW_FUN_EXPORT PFNCLCREATESUBBUFFER __clewCreateSubBuffer ; +CLEW_FUN_EXPORT PFNCLCREATEIMAGE2D __clewCreateImage2D ; +CLEW_FUN_EXPORT PFNCLCREATEIMAGE3D __clewCreateImage3D ; +CLEW_FUN_EXPORT PFNCLRETAINMEMOBJECT __clewRetainMemObject ; +CLEW_FUN_EXPORT PFNCLRELEASEMEMOBJECT __clewReleaseMemObject ; +CLEW_FUN_EXPORT PFNCLGETSUPPORTEDIMAGEFORMATS __clewGetSupportedImageFormats ; +CLEW_FUN_EXPORT PFNCLGETMEMOBJECTINFO __clewGetMemObjectInfo ; +CLEW_FUN_EXPORT PFNCLGETIMAGEINFO __clewGetImageInfo ; +CLEW_FUN_EXPORT PFNCLSETMEMOBJECTDESTRUCTORCALLBACK __clewSetMemObjectDestructorCallback; +CLEW_FUN_EXPORT PFNCLCREATESAMPLER __clewCreateSampler ; +CLEW_FUN_EXPORT PFNCLRETAINSAMPLER __clewRetainSampler ; +CLEW_FUN_EXPORT PFNCLRELEASESAMPLER __clewReleaseSampler ; +CLEW_FUN_EXPORT PFNCLGETSAMPLERINFO __clewGetSamplerInfo ; +CLEW_FUN_EXPORT PFNCLCREATEPROGRAMWITHSOURCE __clewCreateProgramWithSource ; +CLEW_FUN_EXPORT PFNCLCREATEPROGRAMWITHBINARY __clewCreateProgramWithBinary ; +CLEW_FUN_EXPORT PFNCLRETAINPROGRAM __clewRetainProgram ; +CLEW_FUN_EXPORT PFNCLRELEASEPROGRAM __clewReleaseProgram ; +CLEW_FUN_EXPORT PFNCLBUILDPROGRAM __clewBuildProgram ; +CLEW_FUN_EXPORT PFNCLUNLOADCOMPILER __clewUnloadCompiler ; +CLEW_FUN_EXPORT PFNCLGETPROGRAMINFO __clewGetProgramInfo ; +CLEW_FUN_EXPORT PFNCLGETPROGRAMBUILDINFO __clewGetProgramBuildInfo ; +CLEW_FUN_EXPORT PFNCLCREATEKERNEL __clewCreateKernel ; +CLEW_FUN_EXPORT PFNCLCREATEKERNELSINPROGRAM __clewCreateKernelsInProgram ; +CLEW_FUN_EXPORT PFNCLRETAINKERNEL __clewRetainKernel ; +CLEW_FUN_EXPORT PFNCLRELEASEKERNEL __clewReleaseKernel ; +CLEW_FUN_EXPORT PFNCLSETKERNELARG __clewSetKernelArg ; +CLEW_FUN_EXPORT PFNCLGETKERNELINFO __clewGetKernelInfo ; +CLEW_FUN_EXPORT PFNCLGETKERNELWORKGROUPINFO __clewGetKernelWorkGroupInfo ; +CLEW_FUN_EXPORT PFNCLWAITFOREVENTS __clewWaitForEvents ; +CLEW_FUN_EXPORT PFNCLGETEVENTINFO __clewGetEventInfo ; +CLEW_FUN_EXPORT PFNCLCREATEUSEREVENT __clewCreateUserEvent ; +CLEW_FUN_EXPORT PFNCLRETAINEVENT __clewRetainEvent ; +CLEW_FUN_EXPORT PFNCLRELEASEEVENT __clewReleaseEvent ; +CLEW_FUN_EXPORT PFNCLSETUSEREVENTSTATUS __clewSetUserEventStatus ; +CLEW_FUN_EXPORT PFNCLSETEVENTCALLBACK __clewSetEventCallback ; +CLEW_FUN_EXPORT PFNCLGETEVENTPROFILINGINFO __clewGetEventProfilingInfo ; +CLEW_FUN_EXPORT PFNCLFLUSH __clewFlush ; +CLEW_FUN_EXPORT PFNCLFINISH __clewFinish ; +CLEW_FUN_EXPORT PFNCLENQUEUEREADBUFFER __clewEnqueueReadBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUEREADBUFFERRECT __clewEnqueueReadBufferRect ; +CLEW_FUN_EXPORT PFNCLENQUEUEWRITEBUFFER __clewEnqueueWriteBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUEWRITEBUFFERRECT __clewEnqueueWriteBufferRect ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFER __clewEnqueueCopyBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFERRECT __clewEnqueueCopyBufferRect ; +CLEW_FUN_EXPORT PFNCLENQUEUEREADIMAGE __clewEnqueueReadImage ; +CLEW_FUN_EXPORT PFNCLENQUEUEWRITEIMAGE __clewEnqueueWriteImage ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYIMAGE __clewEnqueueCopyImage ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYIMAGETOBUFFER __clewEnqueueCopyImageToBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFERTOIMAGE __clewEnqueueCopyBufferToImage ; +CLEW_FUN_EXPORT PFNCLENQUEUEMAPBUFFER __clewEnqueueMapBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUEMAPIMAGE __clewEnqueueMapImage ; +CLEW_FUN_EXPORT PFNCLENQUEUEUNMAPMEMOBJECT __clewEnqueueUnmapMemObject ; +CLEW_FUN_EXPORT PFNCLENQUEUENDRANGEKERNEL __clewEnqueueNDRangeKernel ; +CLEW_FUN_EXPORT PFNCLENQUEUETASK __clewEnqueueTask ; +CLEW_FUN_EXPORT PFNCLENQUEUENATIVEKERNEL __clewEnqueueNativeKernel ; +CLEW_FUN_EXPORT PFNCLENQUEUEMARKER __clewEnqueueMarker ; +CLEW_FUN_EXPORT PFNCLENQUEUEWAITFOREVENTS __clewEnqueueWaitForEvents ; +CLEW_FUN_EXPORT PFNCLENQUEUEBARRIER __clewEnqueueBarrier ; +CLEW_FUN_EXPORT PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress ; + + +#define clGetPlatformIDs CLEW_GET_FUN(__clewGetPlatformIDs ) +#define clGetPlatformInfo CLEW_GET_FUN(__clewGetPlatformInfo ) +#define clGetDeviceIDs CLEW_GET_FUN(__clewGetDeviceIDs ) +#define clGetDeviceInfo CLEW_GET_FUN(__clewGetDeviceInfo ) +#define clCreateContext CLEW_GET_FUN(__clewCreateContext ) +#define clCreateContextFromType CLEW_GET_FUN(__clewCreateContextFromType ) +#define clRetainContext CLEW_GET_FUN(__clewRetainContext ) +#define clReleaseContext CLEW_GET_FUN(__clewReleaseContext ) +#define clGetContextInfo CLEW_GET_FUN(__clewGetContextInfo ) +#define clCreateCommandQueue CLEW_GET_FUN(__clewCreateCommandQueue ) +#define clRetainCommandQueue CLEW_GET_FUN(__clewRetainCommandQueue ) +#define clReleaseCommandQueue CLEW_GET_FUN(__clewReleaseCommandQueue ) +#define clGetCommandQueueInfo CLEW_GET_FUN(__clewGetCommandQueueInfo ) +#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS +#warning CL_USE_DEPRECATED_OPENCL_1_0_APIS is defined. These APIs are unsupported and untested in OpenCL 1.1! +/* + * WARNING: + * This API introduces mutable state into the OpenCL implementation. It has been REMOVED + * to better facilitate thread safety. The 1.0 API is not thread safe. It is not tested by the + * OpenCL 1.1 conformance test, and consequently may not work or may not work dependably. + * It is likely to be non-performant. Use of this API is not advised. Use at your own risk. + * + * Software developers previously relying on this API are instructed to set the command queue + * properties when creating the queue, instead. + */ +#define clSetCommandQueueProperty CLEW_GET_FUN(__clewSetCommandQueueProperty ) +#endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */ +#define clCreateBuffer CLEW_GET_FUN(__clewCreateBuffer ) +#define clCreateSubBuffer CLEW_GET_FUN(__clewCreateSubBuffer ) +#define clCreateImage2D CLEW_GET_FUN(__clewCreateImage2D ) +#define clCreateImage3D CLEW_GET_FUN(__clewCreateImage3D ) +#define clRetainMemObject CLEW_GET_FUN(__clewRetainMemObject ) +#define clReleaseMemObject CLEW_GET_FUN(__clewReleaseMemObject ) +#define clGetSupportedImageFormats CLEW_GET_FUN(__clewGetSupportedImageFormats ) +#define clGetMemObjectInfo CLEW_GET_FUN(__clewGetMemObjectInfo ) +#define clGetImageInfo CLEW_GET_FUN(__clewGetImageInfo ) +#define clSetMemObjectDestructorCallback CLEW_GET_FUN(__clewSetMemObjectDestructorCallback) +#define clCreateSampler CLEW_GET_FUN(__clewCreateSampler ) +#define clRetainSampler CLEW_GET_FUN(__clewRetainSampler ) +#define clReleaseSampler CLEW_GET_FUN(__clewReleaseSampler ) +#define clGetSamplerInfo CLEW_GET_FUN(__clewGetSamplerInfo ) +#define clCreateProgramWithSource CLEW_GET_FUN(__clewCreateProgramWithSource ) +#define clCreateProgramWithBinary CLEW_GET_FUN(__clewCreateProgramWithBinary ) +#define clRetainProgram CLEW_GET_FUN(__clewRetainProgram ) +#define clReleaseProgram CLEW_GET_FUN(__clewReleaseProgram ) +#define clBuildProgram CLEW_GET_FUN(__clewBuildProgram ) +#define clUnloadCompiler CLEW_GET_FUN(__clewUnloadCompiler ) +#define clGetProgramInfo CLEW_GET_FUN(__clewGetProgramInfo ) +#define clGetProgramBuildInfo CLEW_GET_FUN(__clewGetProgramBuildInfo ) +#define clCreateKernel CLEW_GET_FUN(__clewCreateKernel ) +#define clCreateKernelsInProgram CLEW_GET_FUN(__clewCreateKernelsInProgram ) +#define clRetainKernel CLEW_GET_FUN(__clewRetainKernel ) +#define clReleaseKernel CLEW_GET_FUN(__clewReleaseKernel ) +#define clSetKernelArg CLEW_GET_FUN(__clewSetKernelArg ) +#define clGetKernelInfo CLEW_GET_FUN(__clewGetKernelInfo ) +#define clGetKernelWorkGroupInfo CLEW_GET_FUN(__clewGetKernelWorkGroupInfo ) +#define clWaitForEvents CLEW_GET_FUN(__clewWaitForEvents ) +#define clGetEventInfo CLEW_GET_FUN(__clewGetEventInfo ) +#define clCreateUserEvent CLEW_GET_FUN(__clewCreateUserEvent ) +#define clRetainEvent CLEW_GET_FUN(__clewRetainEvent ) +#define clReleaseEvent CLEW_GET_FUN(__clewReleaseEvent ) +#define clSetUserEventStatus CLEW_GET_FUN(__clewSetUserEventStatus ) +#define clSetEventCallback CLEW_GET_FUN(__clewSetEventCallback ) +#define clGetEventProfilingInfo CLEW_GET_FUN(__clewGetEventProfilingInfo ) +#define clFlush CLEW_GET_FUN(__clewFlush ) +#define clFinish CLEW_GET_FUN(__clewFinish ) +#define clEnqueueReadBuffer CLEW_GET_FUN(__clewEnqueueReadBuffer ) +#define clEnqueueReadBufferRect CLEW_GET_FUN(__clewEnqueueReadBufferRect ) +#define clEnqueueWriteBuffer CLEW_GET_FUN(__clewEnqueueWriteBuffer ) +#define clEnqueueWriteBufferRect CLEW_GET_FUN(__clewEnqueueWriteBufferRect ) +#define clEnqueueCopyBuffer CLEW_GET_FUN(__clewEnqueueCopyBuffer ) +#define clEnqueueCopyBufferRect CLEW_GET_FUN(__clewEnqueueCopyBufferRect ) +#define clEnqueueReadImage CLEW_GET_FUN(__clewEnqueueReadImage ) +#define clEnqueueWriteImage CLEW_GET_FUN(__clewEnqueueWriteImage ) +#define clEnqueueCopyImage CLEW_GET_FUN(__clewEnqueueCopyImage ) +#define clEnqueueCopyImageToBuffer CLEW_GET_FUN(__clewEnqueueCopyImageToBuffer ) +#define clEnqueueCopyBufferToImage CLEW_GET_FUN(__clewEnqueueCopyBufferToImage ) +#define clEnqueueMapBuffer CLEW_GET_FUN(__clewEnqueueMapBuffer ) +#define clEnqueueMapImage CLEW_GET_FUN(__clewEnqueueMapImage ) +#define clEnqueueUnmapMemObject CLEW_GET_FUN(__clewEnqueueUnmapMemObject ) +#define clEnqueueNDRangeKernel CLEW_GET_FUN(__clewEnqueueNDRangeKernel ) +#define clEnqueueTask CLEW_GET_FUN(__clewEnqueueTask ) +#define clEnqueueNativeKernel CLEW_GET_FUN(__clewEnqueueNativeKernel ) +#define clEnqueueMarker CLEW_GET_FUN(__clewEnqueueMarker ) +#define clEnqueueWaitForEvents CLEW_GET_FUN(__clewEnqueueWaitForEvents ) +#define clEnqueueBarrier CLEW_GET_FUN(__clewEnqueueBarrier ) +#define clGetExtensionFunctionAddress CLEW_GET_FUN(__clewGetExtensionFunctionAddress ) + + +#define CLEW_SUCCESS 0 //!< Success error code +#define CLEW_ERROR_OPEN_FAILED -1 //!< Error code for failing to open the dynamic library +#define CLEW_ERROR_ATEXIT_FAILED -2 //!< Error code for failing to queue the closing of the dynamic library to atexit() + +//! \brief Load OpenCL dynamic library and set function entry points +int clewInit (const char*); + +//! \brief Exit clew and unload OpenCL dynamic library +void clewExit(); + +//! \brief Convert an OpenCL error code to its string equivalent +const char* clewErrorString (cl_int error); + +#ifdef __cplusplus +} +#endif + +#endif // CLEW_HPP_INCLUDED diff --git a/Engine/lib/bullet/src/vectormath/neon/boolInVec.h b/Engine/lib/bullet/src/vectormath/neon/boolInVec.h deleted file mode 100644 index ba16838c0..000000000 --- a/Engine/lib/bullet/src/vectormath/neon/boolInVec.h +++ /dev/null @@ -1,226 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _BOOLINVEC_H -#define _BOOLINVEC_H - -#include -namespace Vectormath { - -class floatInVec; - -//-------------------------------------------------------------------------------------------------- -// boolInVec class -// - -class boolInVec -{ -private: - unsigned int mData; - -public: - // Default constructor; does no initialization - // - inline boolInVec( ) { }; - - // Construct from a value converted from float - // - inline boolInVec(floatInVec vec); - - // Explicit cast from bool - // - explicit inline boolInVec(bool scalar); - - // Explicit cast to bool - // - inline bool getAsBool() const; - -#ifndef _VECTORMATH_NO_SCALAR_CAST - // Implicit cast to bool - // - inline operator bool() const; -#endif - - // Boolean negation operator - // - inline const boolInVec operator ! () const; - - // Assignment operator - // - inline boolInVec& operator = (boolInVec vec); - - // Boolean and assignment operator - // - inline boolInVec& operator &= (boolInVec vec); - - // Boolean exclusive or assignment operator - // - inline boolInVec& operator ^= (boolInVec vec); - - // Boolean or assignment operator - // - inline boolInVec& operator |= (boolInVec vec); - -}; - -// Equal operator -// -inline const boolInVec operator == (boolInVec vec0, boolInVec vec1); - -// Not equal operator -// -inline const boolInVec operator != (boolInVec vec0, boolInVec vec1); - -// And operator -// -inline const boolInVec operator & (boolInVec vec0, boolInVec vec1); - -// Exclusive or operator -// -inline const boolInVec operator ^ (boolInVec vec0, boolInVec vec1); - -// Or operator -// -inline const boolInVec operator | (boolInVec vec0, boolInVec vec1); - -// Conditionally select between two values -// -inline const boolInVec select(boolInVec vec0, boolInVec vec1, boolInVec select_vec1); - - -} // namespace Vectormath - - -//-------------------------------------------------------------------------------------------------- -// boolInVec implementation -// - -#include "floatInVec.h" - -namespace Vectormath { - -inline -boolInVec::boolInVec(floatInVec vec) -{ - *this = (vec != floatInVec(0.0f)); -} - -inline -boolInVec::boolInVec(bool scalar) -{ - mData = -(int)scalar; -} - -inline -bool -boolInVec::getAsBool() const -{ - return (mData > 0); -} - -#ifndef _VECTORMATH_NO_SCALAR_CAST -inline -boolInVec::operator bool() const -{ - return getAsBool(); -} -#endif - -inline -const boolInVec -boolInVec::operator ! () const -{ - return boolInVec(!mData); -} - -inline -boolInVec& -boolInVec::operator = (boolInVec vec) -{ - mData = vec.mData; - return *this; -} - -inline -boolInVec& -boolInVec::operator &= (boolInVec vec) -{ - *this = *this & vec; - return *this; -} - -inline -boolInVec& -boolInVec::operator ^= (boolInVec vec) -{ - *this = *this ^ vec; - return *this; -} - -inline -boolInVec& -boolInVec::operator |= (boolInVec vec) -{ - *this = *this | vec; - return *this; -} - -inline -const boolInVec -operator == (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() == vec1.getAsBool()); -} - -inline -const boolInVec -operator != (boolInVec vec0, boolInVec vec1) -{ - return !(vec0 == vec1); -} - -inline -const boolInVec -operator & (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() & vec1.getAsBool()); -} - -inline -const boolInVec -operator | (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() | vec1.getAsBool()); -} - -inline -const boolInVec -operator ^ (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() ^ vec1.getAsBool()); -} - -inline -const boolInVec -select(boolInVec vec0, boolInVec vec1, boolInVec select_vec1) -{ - return (select_vec1.getAsBool() == 0) ? vec0 : vec1; -} - -} // namespace Vectormath - -#endif // boolInVec_h - diff --git a/Engine/lib/bullet/src/vectormath/neon/floatInVec.h b/Engine/lib/bullet/src/vectormath/neon/floatInVec.h deleted file mode 100644 index 26147d22b..000000000 --- a/Engine/lib/bullet/src/vectormath/neon/floatInVec.h +++ /dev/null @@ -1,344 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ -#ifndef _FLOATINVEC_H -#define _FLOATINVEC_H - -#include -namespace Vectormath { - -class boolInVec; - -//-------------------------------------------------------------------------------------------------- -// floatInVec class -// - -// A class representing a scalar float value contained in a vector register -// This class does not support fastmath -class floatInVec -{ -private: - float mData; - -public: - // Default constructor; does no initialization - // - inline floatInVec( ) { }; - - // Construct from a value converted from bool - // - inline floatInVec(boolInVec vec); - - // Explicit cast from float - // - explicit inline floatInVec(float scalar); - - // Explicit cast to float - // - inline float getAsFloat() const; - -#ifndef _VECTORMATH_NO_SCALAR_CAST - // Implicit cast to float - // - inline operator float() const; -#endif - - // Post increment (add 1.0f) - // - inline const floatInVec operator ++ (int); - - // Post decrement (subtract 1.0f) - // - inline const floatInVec operator -- (int); - - // Pre increment (add 1.0f) - // - inline floatInVec& operator ++ (); - - // Pre decrement (subtract 1.0f) - // - inline floatInVec& operator -- (); - - // Negation operator - // - inline const floatInVec operator - () const; - - // Assignment operator - // - inline floatInVec& operator = (floatInVec vec); - - // Multiplication assignment operator - // - inline floatInVec& operator *= (floatInVec vec); - - // Division assignment operator - // - inline floatInVec& operator /= (floatInVec vec); - - // Addition assignment operator - // - inline floatInVec& operator += (floatInVec vec); - - // Subtraction assignment operator - // - inline floatInVec& operator -= (floatInVec vec); - -}; - -// Multiplication operator -// -inline const floatInVec operator * (floatInVec vec0, floatInVec vec1); - -// Division operator -// -inline const floatInVec operator / (floatInVec vec0, floatInVec vec1); - -// Addition operator -// -inline const floatInVec operator + (floatInVec vec0, floatInVec vec1); - -// Subtraction operator -// -inline const floatInVec operator - (floatInVec vec0, floatInVec vec1); - -// Less than operator -// -inline const boolInVec operator < (floatInVec vec0, floatInVec vec1); - -// Less than or equal operator -// -inline const boolInVec operator <= (floatInVec vec0, floatInVec vec1); - -// Greater than operator -// -inline const boolInVec operator > (floatInVec vec0, floatInVec vec1); - -// Greater than or equal operator -// -inline const boolInVec operator >= (floatInVec vec0, floatInVec vec1); - -// Equal operator -// -inline const boolInVec operator == (floatInVec vec0, floatInVec vec1); - -// Not equal operator -// -inline const boolInVec operator != (floatInVec vec0, floatInVec vec1); - -// Conditionally select between two values -// -inline const floatInVec select(floatInVec vec0, floatInVec vec1, boolInVec select_vec1); - - -} // namespace Vectormath - - -//-------------------------------------------------------------------------------------------------- -// floatInVec implementation -// - -#include "boolInVec.h" - -namespace Vectormath { - -inline -floatInVec::floatInVec(boolInVec vec) -{ - mData = float(vec.getAsBool()); -} - -inline -floatInVec::floatInVec(float scalar) -{ - mData = scalar; -} - -inline -float -floatInVec::getAsFloat() const -{ - return mData; -} - -#ifndef _VECTORMATH_NO_SCALAR_CAST -inline -floatInVec::operator float() const -{ - return getAsFloat(); -} -#endif - -inline -const floatInVec -floatInVec::operator ++ (int) -{ - float olddata = mData; - operator ++(); - return floatInVec(olddata); -} - -inline -const floatInVec -floatInVec::operator -- (int) -{ - float olddata = mData; - operator --(); - return floatInVec(olddata); -} - -inline -floatInVec& -floatInVec::operator ++ () -{ - *this += floatInVec(1.0f); - return *this; -} - -inline -floatInVec& -floatInVec::operator -- () -{ - *this -= floatInVec(1.0f); - return *this; -} - -inline -const floatInVec -floatInVec::operator - () const -{ - return floatInVec(-mData); -} - -inline -floatInVec& -floatInVec::operator = (floatInVec vec) -{ - mData = vec.mData; - return *this; -} - -inline -floatInVec& -floatInVec::operator *= (floatInVec vec) -{ - *this = *this * vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator /= (floatInVec vec) -{ - *this = *this / vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator += (floatInVec vec) -{ - *this = *this + vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator -= (floatInVec vec) -{ - *this = *this - vec; - return *this; -} - -inline -const floatInVec -operator * (floatInVec vec0, floatInVec vec1) -{ - return floatInVec(vec0.getAsFloat() * vec1.getAsFloat()); -} - -inline -const floatInVec -operator / (floatInVec num, floatInVec den) -{ - return floatInVec(num.getAsFloat() / den.getAsFloat()); -} - -inline -const floatInVec -operator + (floatInVec vec0, floatInVec vec1) -{ - return floatInVec(vec0.getAsFloat() + vec1.getAsFloat()); -} - -inline -const floatInVec -operator - (floatInVec vec0, floatInVec vec1) -{ - return floatInVec(vec0.getAsFloat() - vec1.getAsFloat()); -} - -inline -const boolInVec -operator < (floatInVec vec0, floatInVec vec1) -{ - return boolInVec(vec0.getAsFloat() < vec1.getAsFloat()); -} - -inline -const boolInVec -operator <= (floatInVec vec0, floatInVec vec1) -{ - return !(vec0 > vec1); -} - -inline -const boolInVec -operator > (floatInVec vec0, floatInVec vec1) -{ - return boolInVec(vec0.getAsFloat() > vec1.getAsFloat()); -} - -inline -const boolInVec -operator >= (floatInVec vec0, floatInVec vec1) -{ - return !(vec0 < vec1); -} - -inline -const boolInVec -operator == (floatInVec vec0, floatInVec vec1) -{ - return boolInVec(vec0.getAsFloat() == vec1.getAsFloat()); -} - -inline -const boolInVec -operator != (floatInVec vec0, floatInVec vec1) -{ - return !(vec0 == vec1); -} - -inline -const floatInVec -select(floatInVec vec0, floatInVec vec1, boolInVec select_vec1) -{ - return (select_vec1.getAsBool() == 0) ? vec0 : vec1; -} - -} // namespace Vectormath - -#endif // floatInVec_h - diff --git a/Engine/lib/bullet/src/vectormath/neon/mat_aos.h b/Engine/lib/bullet/src/vectormath/neon/mat_aos.h deleted file mode 100644 index e61f601c3..000000000 --- a/Engine/lib/bullet/src/vectormath/neon/mat_aos.h +++ /dev/null @@ -1,1631 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_MAT_AOS_CPP_H -#define _VECTORMATH_MAT_AOS_CPP_H - -namespace Vectormath { -namespace Aos { - -//----------------------------------------------------------------------------- -// Constants - -#define _VECTORMATH_PI_OVER_2 1.570796327f - -//----------------------------------------------------------------------------- -// Definitions - -inline Matrix3::Matrix3( const Matrix3 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; -} - -inline Matrix3::Matrix3( float scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); -} - -inline Matrix3::Matrix3( const Quat & unitQuat ) -{ - float qx, qy, qz, qw, qx2, qy2, qz2, qxqx2, qyqy2, qzqz2, qxqy2, qyqz2, qzqw2, qxqz2, qyqw2, qxqw2; - qx = unitQuat.getX(); - qy = unitQuat.getY(); - qz = unitQuat.getZ(); - qw = unitQuat.getW(); - qx2 = ( qx + qx ); - qy2 = ( qy + qy ); - qz2 = ( qz + qz ); - qxqx2 = ( qx * qx2 ); - qxqy2 = ( qx * qy2 ); - qxqz2 = ( qx * qz2 ); - qxqw2 = ( qw * qx2 ); - qyqy2 = ( qy * qy2 ); - qyqz2 = ( qy * qz2 ); - qyqw2 = ( qw * qy2 ); - qzqz2 = ( qz * qz2 ); - qzqw2 = ( qw * qz2 ); - mCol0 = Vector3( ( ( 1.0f - qyqy2 ) - qzqz2 ), ( qxqy2 + qzqw2 ), ( qxqz2 - qyqw2 ) ); - mCol1 = Vector3( ( qxqy2 - qzqw2 ), ( ( 1.0f - qxqx2 ) - qzqz2 ), ( qyqz2 + qxqw2 ) ); - mCol2 = Vector3( ( qxqz2 + qyqw2 ), ( qyqz2 - qxqw2 ), ( ( 1.0f - qxqx2 ) - qyqy2 ) ); -} - -inline Matrix3::Matrix3( const Vector3 & _col0, const Vector3 & _col1, const Vector3 & _col2 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; -} - -inline Matrix3 & Matrix3::setCol0( const Vector3 & _col0 ) -{ - mCol0 = _col0; - return *this; -} - -inline Matrix3 & Matrix3::setCol1( const Vector3 & _col1 ) -{ - mCol1 = _col1; - return *this; -} - -inline Matrix3 & Matrix3::setCol2( const Vector3 & _col2 ) -{ - mCol2 = _col2; - return *this; -} - -inline Matrix3 & Matrix3::setCol( int col, const Vector3 & vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -inline Matrix3 & Matrix3::setRow( int row, const Vector3 & vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - return *this; -} - -inline Matrix3 & Matrix3::setElem( int col, int row, float val ) -{ - Vector3 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -inline float Matrix3::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -inline const Vector3 Matrix3::getCol0( ) const -{ - return mCol0; -} - -inline const Vector3 Matrix3::getCol1( ) const -{ - return mCol1; -} - -inline const Vector3 Matrix3::getCol2( ) const -{ - return mCol2; -} - -inline const Vector3 Matrix3::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -inline const Vector3 Matrix3::getRow( int row ) const -{ - return Vector3( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ) ); -} - -inline Vector3 & Matrix3::operator []( int col ) -{ - return *(&mCol0 + col); -} - -inline const Vector3 Matrix3::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -inline Matrix3 & Matrix3::operator =( const Matrix3 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - return *this; -} - -inline const Matrix3 transpose( const Matrix3 & mat ) -{ - return Matrix3( - Vector3( mat.getCol0().getX(), mat.getCol1().getX(), mat.getCol2().getX() ), - Vector3( mat.getCol0().getY(), mat.getCol1().getY(), mat.getCol2().getY() ), - Vector3( mat.getCol0().getZ(), mat.getCol1().getZ(), mat.getCol2().getZ() ) - ); -} - -inline const Matrix3 inverse( const Matrix3 & mat ) -{ - Vector3 tmp0, tmp1, tmp2; - float detinv; - tmp0 = cross( mat.getCol1(), mat.getCol2() ); - tmp1 = cross( mat.getCol2(), mat.getCol0() ); - tmp2 = cross( mat.getCol0(), mat.getCol1() ); - detinv = ( 1.0f / dot( mat.getCol2(), tmp2 ) ); - return Matrix3( - Vector3( ( tmp0.getX() * detinv ), ( tmp1.getX() * detinv ), ( tmp2.getX() * detinv ) ), - Vector3( ( tmp0.getY() * detinv ), ( tmp1.getY() * detinv ), ( tmp2.getY() * detinv ) ), - Vector3( ( tmp0.getZ() * detinv ), ( tmp1.getZ() * detinv ), ( tmp2.getZ() * detinv ) ) - ); -} - -inline float determinant( const Matrix3 & mat ) -{ - return dot( mat.getCol2(), cross( mat.getCol0(), mat.getCol1() ) ); -} - -inline const Matrix3 Matrix3::operator +( const Matrix3 & mat ) const -{ - return Matrix3( - ( mCol0 + mat.mCol0 ), - ( mCol1 + mat.mCol1 ), - ( mCol2 + mat.mCol2 ) - ); -} - -inline const Matrix3 Matrix3::operator -( const Matrix3 & mat ) const -{ - return Matrix3( - ( mCol0 - mat.mCol0 ), - ( mCol1 - mat.mCol1 ), - ( mCol2 - mat.mCol2 ) - ); -} - -inline Matrix3 & Matrix3::operator +=( const Matrix3 & mat ) -{ - *this = *this + mat; - return *this; -} - -inline Matrix3 & Matrix3::operator -=( const Matrix3 & mat ) -{ - *this = *this - mat; - return *this; -} - -inline const Matrix3 Matrix3::operator -( ) const -{ - return Matrix3( - ( -mCol0 ), - ( -mCol1 ), - ( -mCol2 ) - ); -} - -inline const Matrix3 absPerElem( const Matrix3 & mat ) -{ - return Matrix3( - absPerElem( mat.getCol0() ), - absPerElem( mat.getCol1() ), - absPerElem( mat.getCol2() ) - ); -} - -inline const Matrix3 Matrix3::operator *( float scalar ) const -{ - return Matrix3( - ( mCol0 * scalar ), - ( mCol1 * scalar ), - ( mCol2 * scalar ) - ); -} - -inline Matrix3 & Matrix3::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Matrix3 operator *( float scalar, const Matrix3 & mat ) -{ - return mat * scalar; -} - -inline const Vector3 Matrix3::operator *( const Vector3 & vec ) const -{ - return Vector3( - ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ), - ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ), - ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ) - ); -} - -inline const Matrix3 Matrix3::operator *( const Matrix3 & mat ) const -{ - return Matrix3( - ( *this * mat.mCol0 ), - ( *this * mat.mCol1 ), - ( *this * mat.mCol2 ) - ); -} - -inline Matrix3 & Matrix3::operator *=( const Matrix3 & mat ) -{ - *this = *this * mat; - return *this; -} - -inline const Matrix3 mulPerElem( const Matrix3 & mat0, const Matrix3 & mat1 ) -{ - return Matrix3( - mulPerElem( mat0.getCol0(), mat1.getCol0() ), - mulPerElem( mat0.getCol1(), mat1.getCol1() ), - mulPerElem( mat0.getCol2(), mat1.getCol2() ) - ); -} - -inline const Matrix3 Matrix3::identity( ) -{ - return Matrix3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ) - ); -} - -inline const Matrix3 Matrix3::rotationX( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix3( - Vector3::xAxis( ), - Vector3( 0.0f, c, s ), - Vector3( 0.0f, -s, c ) - ); -} - -inline const Matrix3 Matrix3::rotationY( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix3( - Vector3( c, 0.0f, -s ), - Vector3::yAxis( ), - Vector3( s, 0.0f, c ) - ); -} - -inline const Matrix3 Matrix3::rotationZ( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix3( - Vector3( c, s, 0.0f ), - Vector3( -s, c, 0.0f ), - Vector3::zAxis( ) - ); -} - -inline const Matrix3 Matrix3::rotationZYX( const Vector3 & radiansXYZ ) -{ - float sX, cX, sY, cY, sZ, cZ, tmp0, tmp1; - sX = sinf( radiansXYZ.getX() ); - cX = cosf( radiansXYZ.getX() ); - sY = sinf( radiansXYZ.getY() ); - cY = cosf( radiansXYZ.getY() ); - sZ = sinf( radiansXYZ.getZ() ); - cZ = cosf( radiansXYZ.getZ() ); - tmp0 = ( cZ * sY ); - tmp1 = ( sZ * sY ); - return Matrix3( - Vector3( ( cZ * cY ), ( sZ * cY ), -sY ), - Vector3( ( ( tmp0 * sX ) - ( sZ * cX ) ), ( ( tmp1 * sX ) + ( cZ * cX ) ), ( cY * sX ) ), - Vector3( ( ( tmp0 * cX ) + ( sZ * sX ) ), ( ( tmp1 * cX ) - ( cZ * sX ) ), ( cY * cX ) ) - ); -} - -inline const Matrix3 Matrix3::rotation( float radians, const Vector3 & unitVec ) -{ - float x, y, z, s, c, oneMinusC, xy, yz, zx; - s = sinf( radians ); - c = cosf( radians ); - x = unitVec.getX(); - y = unitVec.getY(); - z = unitVec.getZ(); - xy = ( x * y ); - yz = ( y * z ); - zx = ( z * x ); - oneMinusC = ( 1.0f - c ); - return Matrix3( - Vector3( ( ( ( x * x ) * oneMinusC ) + c ), ( ( xy * oneMinusC ) + ( z * s ) ), ( ( zx * oneMinusC ) - ( y * s ) ) ), - Vector3( ( ( xy * oneMinusC ) - ( z * s ) ), ( ( ( y * y ) * oneMinusC ) + c ), ( ( yz * oneMinusC ) + ( x * s ) ) ), - Vector3( ( ( zx * oneMinusC ) + ( y * s ) ), ( ( yz * oneMinusC ) - ( x * s ) ), ( ( ( z * z ) * oneMinusC ) + c ) ) - ); -} - -inline const Matrix3 Matrix3::rotation( const Quat & unitQuat ) -{ - return Matrix3( unitQuat ); -} - -inline const Matrix3 Matrix3::scale( const Vector3 & scaleVec ) -{ - return Matrix3( - Vector3( scaleVec.getX(), 0.0f, 0.0f ), - Vector3( 0.0f, scaleVec.getY(), 0.0f ), - Vector3( 0.0f, 0.0f, scaleVec.getZ() ) - ); -} - -inline const Matrix3 appendScale( const Matrix3 & mat, const Vector3 & scaleVec ) -{ - return Matrix3( - ( mat.getCol0() * scaleVec.getX( ) ), - ( mat.getCol1() * scaleVec.getY( ) ), - ( mat.getCol2() * scaleVec.getZ( ) ) - ); -} - -inline const Matrix3 prependScale( const Vector3 & scaleVec, const Matrix3 & mat ) -{ - return Matrix3( - mulPerElem( mat.getCol0(), scaleVec ), - mulPerElem( mat.getCol1(), scaleVec ), - mulPerElem( mat.getCol2(), scaleVec ) - ); -} - -inline const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, bool select1 ) -{ - return Matrix3( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Matrix3 & mat ) -{ - print( mat.getRow( 0 ) ); - print( mat.getRow( 1 ) ); - print( mat.getRow( 2 ) ); -} - -inline void print( const Matrix3 & mat, const char * name ) -{ - printf("%s:\n", name); - print( mat ); -} - -#endif - -inline Matrix4::Matrix4( const Matrix4 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - mCol3 = mat.mCol3; -} - -inline Matrix4::Matrix4( float scalar ) -{ - mCol0 = Vector4( scalar ); - mCol1 = Vector4( scalar ); - mCol2 = Vector4( scalar ); - mCol3 = Vector4( scalar ); -} - -inline Matrix4::Matrix4( const Transform3 & mat ) -{ - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( mat.getCol3(), 1.0f ); -} - -inline Matrix4::Matrix4( const Vector4 & _col0, const Vector4 & _col1, const Vector4 & _col2, const Vector4 & _col3 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; - mCol3 = _col3; -} - -inline Matrix4::Matrix4( const Matrix3 & mat, const Vector3 & translateVec ) -{ - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( translateVec, 1.0f ); -} - -inline Matrix4::Matrix4( const Quat & unitQuat, const Vector3 & translateVec ) -{ - Matrix3 mat; - mat = Matrix3( unitQuat ); - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( translateVec, 1.0f ); -} - -inline Matrix4 & Matrix4::setCol0( const Vector4 & _col0 ) -{ - mCol0 = _col0; - return *this; -} - -inline Matrix4 & Matrix4::setCol1( const Vector4 & _col1 ) -{ - mCol1 = _col1; - return *this; -} - -inline Matrix4 & Matrix4::setCol2( const Vector4 & _col2 ) -{ - mCol2 = _col2; - return *this; -} - -inline Matrix4 & Matrix4::setCol3( const Vector4 & _col3 ) -{ - mCol3 = _col3; - return *this; -} - -inline Matrix4 & Matrix4::setCol( int col, const Vector4 & vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -inline Matrix4 & Matrix4::setRow( int row, const Vector4 & vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - mCol3.setElem( row, vec.getElem( 3 ) ); - return *this; -} - -inline Matrix4 & Matrix4::setElem( int col, int row, float val ) -{ - Vector4 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -inline float Matrix4::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -inline const Vector4 Matrix4::getCol0( ) const -{ - return mCol0; -} - -inline const Vector4 Matrix4::getCol1( ) const -{ - return mCol1; -} - -inline const Vector4 Matrix4::getCol2( ) const -{ - return mCol2; -} - -inline const Vector4 Matrix4::getCol3( ) const -{ - return mCol3; -} - -inline const Vector4 Matrix4::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -inline const Vector4 Matrix4::getRow( int row ) const -{ - return Vector4( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ), mCol3.getElem( row ) ); -} - -inline Vector4 & Matrix4::operator []( int col ) -{ - return *(&mCol0 + col); -} - -inline const Vector4 Matrix4::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -inline Matrix4 & Matrix4::operator =( const Matrix4 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - mCol3 = mat.mCol3; - return *this; -} - -inline const Matrix4 transpose( const Matrix4 & mat ) -{ - return Matrix4( - Vector4( mat.getCol0().getX(), mat.getCol1().getX(), mat.getCol2().getX(), mat.getCol3().getX() ), - Vector4( mat.getCol0().getY(), mat.getCol1().getY(), mat.getCol2().getY(), mat.getCol3().getY() ), - Vector4( mat.getCol0().getZ(), mat.getCol1().getZ(), mat.getCol2().getZ(), mat.getCol3().getZ() ), - Vector4( mat.getCol0().getW(), mat.getCol1().getW(), mat.getCol2().getW(), mat.getCol3().getW() ) - ); -} - -inline const Matrix4 inverse( const Matrix4 & mat ) -{ - Vector4 res0, res1, res2, res3; - float mA, mB, mC, mD, mE, mF, mG, mH, mI, mJ, mK, mL, mM, mN, mO, mP, tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, detInv; - mA = mat.getCol0().getX(); - mB = mat.getCol0().getY(); - mC = mat.getCol0().getZ(); - mD = mat.getCol0().getW(); - mE = mat.getCol1().getX(); - mF = mat.getCol1().getY(); - mG = mat.getCol1().getZ(); - mH = mat.getCol1().getW(); - mI = mat.getCol2().getX(); - mJ = mat.getCol2().getY(); - mK = mat.getCol2().getZ(); - mL = mat.getCol2().getW(); - mM = mat.getCol3().getX(); - mN = mat.getCol3().getY(); - mO = mat.getCol3().getZ(); - mP = mat.getCol3().getW(); - tmp0 = ( ( mK * mD ) - ( mC * mL ) ); - tmp1 = ( ( mO * mH ) - ( mG * mP ) ); - tmp2 = ( ( mB * mK ) - ( mJ * mC ) ); - tmp3 = ( ( mF * mO ) - ( mN * mG ) ); - tmp4 = ( ( mJ * mD ) - ( mB * mL ) ); - tmp5 = ( ( mN * mH ) - ( mF * mP ) ); - res0.setX( ( ( ( mJ * tmp1 ) - ( mL * tmp3 ) ) - ( mK * tmp5 ) ) ); - res0.setY( ( ( ( mN * tmp0 ) - ( mP * tmp2 ) ) - ( mO * tmp4 ) ) ); - res0.setZ( ( ( ( mD * tmp3 ) + ( mC * tmp5 ) ) - ( mB * tmp1 ) ) ); - res0.setW( ( ( ( mH * tmp2 ) + ( mG * tmp4 ) ) - ( mF * tmp0 ) ) ); - detInv = ( 1.0f / ( ( ( ( mA * res0.getX() ) + ( mE * res0.getY() ) ) + ( mI * res0.getZ() ) ) + ( mM * res0.getW() ) ) ); - res1.setX( ( mI * tmp1 ) ); - res1.setY( ( mM * tmp0 ) ); - res1.setZ( ( mA * tmp1 ) ); - res1.setW( ( mE * tmp0 ) ); - res3.setX( ( mI * tmp3 ) ); - res3.setY( ( mM * tmp2 ) ); - res3.setZ( ( mA * tmp3 ) ); - res3.setW( ( mE * tmp2 ) ); - res2.setX( ( mI * tmp5 ) ); - res2.setY( ( mM * tmp4 ) ); - res2.setZ( ( mA * tmp5 ) ); - res2.setW( ( mE * tmp4 ) ); - tmp0 = ( ( mI * mB ) - ( mA * mJ ) ); - tmp1 = ( ( mM * mF ) - ( mE * mN ) ); - tmp2 = ( ( mI * mD ) - ( mA * mL ) ); - tmp3 = ( ( mM * mH ) - ( mE * mP ) ); - tmp4 = ( ( mI * mC ) - ( mA * mK ) ); - tmp5 = ( ( mM * mG ) - ( mE * mO ) ); - res2.setX( ( ( ( mL * tmp1 ) - ( mJ * tmp3 ) ) + res2.getX() ) ); - res2.setY( ( ( ( mP * tmp0 ) - ( mN * tmp2 ) ) + res2.getY() ) ); - res2.setZ( ( ( ( mB * tmp3 ) - ( mD * tmp1 ) ) - res2.getZ() ) ); - res2.setW( ( ( ( mF * tmp2 ) - ( mH * tmp0 ) ) - res2.getW() ) ); - res3.setX( ( ( ( mJ * tmp5 ) - ( mK * tmp1 ) ) + res3.getX() ) ); - res3.setY( ( ( ( mN * tmp4 ) - ( mO * tmp0 ) ) + res3.getY() ) ); - res3.setZ( ( ( ( mC * tmp1 ) - ( mB * tmp5 ) ) - res3.getZ() ) ); - res3.setW( ( ( ( mG * tmp0 ) - ( mF * tmp4 ) ) - res3.getW() ) ); - res1.setX( ( ( ( mK * tmp3 ) - ( mL * tmp5 ) ) - res1.getX() ) ); - res1.setY( ( ( ( mO * tmp2 ) - ( mP * tmp4 ) ) - res1.getY() ) ); - res1.setZ( ( ( ( mD * tmp5 ) - ( mC * tmp3 ) ) + res1.getZ() ) ); - res1.setW( ( ( ( mH * tmp4 ) - ( mG * tmp2 ) ) + res1.getW() ) ); - return Matrix4( - ( res0 * detInv ), - ( res1 * detInv ), - ( res2 * detInv ), - ( res3 * detInv ) - ); -} - -inline const Matrix4 affineInverse( const Matrix4 & mat ) -{ - Transform3 affineMat; - affineMat.setCol0( mat.getCol0().getXYZ( ) ); - affineMat.setCol1( mat.getCol1().getXYZ( ) ); - affineMat.setCol2( mat.getCol2().getXYZ( ) ); - affineMat.setCol3( mat.getCol3().getXYZ( ) ); - return Matrix4( inverse( affineMat ) ); -} - -inline const Matrix4 orthoInverse( const Matrix4 & mat ) -{ - Transform3 affineMat; - affineMat.setCol0( mat.getCol0().getXYZ( ) ); - affineMat.setCol1( mat.getCol1().getXYZ( ) ); - affineMat.setCol2( mat.getCol2().getXYZ( ) ); - affineMat.setCol3( mat.getCol3().getXYZ( ) ); - return Matrix4( orthoInverse( affineMat ) ); -} - -inline float determinant( const Matrix4 & mat ) -{ - float dx, dy, dz, dw, mA, mB, mC, mD, mE, mF, mG, mH, mI, mJ, mK, mL, mM, mN, mO, mP, tmp0, tmp1, tmp2, tmp3, tmp4, tmp5; - mA = mat.getCol0().getX(); - mB = mat.getCol0().getY(); - mC = mat.getCol0().getZ(); - mD = mat.getCol0().getW(); - mE = mat.getCol1().getX(); - mF = mat.getCol1().getY(); - mG = mat.getCol1().getZ(); - mH = mat.getCol1().getW(); - mI = mat.getCol2().getX(); - mJ = mat.getCol2().getY(); - mK = mat.getCol2().getZ(); - mL = mat.getCol2().getW(); - mM = mat.getCol3().getX(); - mN = mat.getCol3().getY(); - mO = mat.getCol3().getZ(); - mP = mat.getCol3().getW(); - tmp0 = ( ( mK * mD ) - ( mC * mL ) ); - tmp1 = ( ( mO * mH ) - ( mG * mP ) ); - tmp2 = ( ( mB * mK ) - ( mJ * mC ) ); - tmp3 = ( ( mF * mO ) - ( mN * mG ) ); - tmp4 = ( ( mJ * mD ) - ( mB * mL ) ); - tmp5 = ( ( mN * mH ) - ( mF * mP ) ); - dx = ( ( ( mJ * tmp1 ) - ( mL * tmp3 ) ) - ( mK * tmp5 ) ); - dy = ( ( ( mN * tmp0 ) - ( mP * tmp2 ) ) - ( mO * tmp4 ) ); - dz = ( ( ( mD * tmp3 ) + ( mC * tmp5 ) ) - ( mB * tmp1 ) ); - dw = ( ( ( mH * tmp2 ) + ( mG * tmp4 ) ) - ( mF * tmp0 ) ); - return ( ( ( ( mA * dx ) + ( mE * dy ) ) + ( mI * dz ) ) + ( mM * dw ) ); -} - -inline const Matrix4 Matrix4::operator +( const Matrix4 & mat ) const -{ - return Matrix4( - ( mCol0 + mat.mCol0 ), - ( mCol1 + mat.mCol1 ), - ( mCol2 + mat.mCol2 ), - ( mCol3 + mat.mCol3 ) - ); -} - -inline const Matrix4 Matrix4::operator -( const Matrix4 & mat ) const -{ - return Matrix4( - ( mCol0 - mat.mCol0 ), - ( mCol1 - mat.mCol1 ), - ( mCol2 - mat.mCol2 ), - ( mCol3 - mat.mCol3 ) - ); -} - -inline Matrix4 & Matrix4::operator +=( const Matrix4 & mat ) -{ - *this = *this + mat; - return *this; -} - -inline Matrix4 & Matrix4::operator -=( const Matrix4 & mat ) -{ - *this = *this - mat; - return *this; -} - -inline const Matrix4 Matrix4::operator -( ) const -{ - return Matrix4( - ( -mCol0 ), - ( -mCol1 ), - ( -mCol2 ), - ( -mCol3 ) - ); -} - -inline const Matrix4 absPerElem( const Matrix4 & mat ) -{ - return Matrix4( - absPerElem( mat.getCol0() ), - absPerElem( mat.getCol1() ), - absPerElem( mat.getCol2() ), - absPerElem( mat.getCol3() ) - ); -} - -inline const Matrix4 Matrix4::operator *( float scalar ) const -{ - return Matrix4( - ( mCol0 * scalar ), - ( mCol1 * scalar ), - ( mCol2 * scalar ), - ( mCol3 * scalar ) - ); -} - -inline Matrix4 & Matrix4::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Matrix4 operator *( float scalar, const Matrix4 & mat ) -{ - return mat * scalar; -} - -inline const Vector4 Matrix4::operator *( const Vector4 & vec ) const -{ - return Vector4( - ( ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ) + ( mCol3.getX() * vec.getW() ) ), - ( ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ) + ( mCol3.getY() * vec.getW() ) ), - ( ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ) + ( mCol3.getZ() * vec.getW() ) ), - ( ( ( ( mCol0.getW() * vec.getX() ) + ( mCol1.getW() * vec.getY() ) ) + ( mCol2.getW() * vec.getZ() ) ) + ( mCol3.getW() * vec.getW() ) ) - ); -} - -inline const Vector4 Matrix4::operator *( const Vector3 & vec ) const -{ - return Vector4( - ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ), - ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ), - ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ), - ( ( ( mCol0.getW() * vec.getX() ) + ( mCol1.getW() * vec.getY() ) ) + ( mCol2.getW() * vec.getZ() ) ) - ); -} - -inline const Vector4 Matrix4::operator *( const Point3 & pnt ) const -{ - return Vector4( - ( ( ( ( mCol0.getX() * pnt.getX() ) + ( mCol1.getX() * pnt.getY() ) ) + ( mCol2.getX() * pnt.getZ() ) ) + mCol3.getX() ), - ( ( ( ( mCol0.getY() * pnt.getX() ) + ( mCol1.getY() * pnt.getY() ) ) + ( mCol2.getY() * pnt.getZ() ) ) + mCol3.getY() ), - ( ( ( ( mCol0.getZ() * pnt.getX() ) + ( mCol1.getZ() * pnt.getY() ) ) + ( mCol2.getZ() * pnt.getZ() ) ) + mCol3.getZ() ), - ( ( ( ( mCol0.getW() * pnt.getX() ) + ( mCol1.getW() * pnt.getY() ) ) + ( mCol2.getW() * pnt.getZ() ) ) + mCol3.getW() ) - ); -} - -inline const Matrix4 Matrix4::operator *( const Matrix4 & mat ) const -{ - return Matrix4( - ( *this * mat.mCol0 ), - ( *this * mat.mCol1 ), - ( *this * mat.mCol2 ), - ( *this * mat.mCol3 ) - ); -} - -inline Matrix4 & Matrix4::operator *=( const Matrix4 & mat ) -{ - *this = *this * mat; - return *this; -} - -inline const Matrix4 Matrix4::operator *( const Transform3 & tfrm ) const -{ - return Matrix4( - ( *this * tfrm.getCol0() ), - ( *this * tfrm.getCol1() ), - ( *this * tfrm.getCol2() ), - ( *this * Point3( tfrm.getCol3() ) ) - ); -} - -inline Matrix4 & Matrix4::operator *=( const Transform3 & tfrm ) -{ - *this = *this * tfrm; - return *this; -} - -inline const Matrix4 mulPerElem( const Matrix4 & mat0, const Matrix4 & mat1 ) -{ - return Matrix4( - mulPerElem( mat0.getCol0(), mat1.getCol0() ), - mulPerElem( mat0.getCol1(), mat1.getCol1() ), - mulPerElem( mat0.getCol2(), mat1.getCol2() ), - mulPerElem( mat0.getCol3(), mat1.getCol3() ) - ); -} - -inline const Matrix4 Matrix4::identity( ) -{ - return Matrix4( - Vector4::xAxis( ), - Vector4::yAxis( ), - Vector4::zAxis( ), - Vector4::wAxis( ) - ); -} - -inline Matrix4 & Matrix4::setUpper3x3( const Matrix3 & mat3 ) -{ - mCol0.setXYZ( mat3.getCol0() ); - mCol1.setXYZ( mat3.getCol1() ); - mCol2.setXYZ( mat3.getCol2() ); - return *this; -} - -inline const Matrix3 Matrix4::getUpper3x3( ) const -{ - return Matrix3( - mCol0.getXYZ( ), - mCol1.getXYZ( ), - mCol2.getXYZ( ) - ); -} - -inline Matrix4 & Matrix4::setTranslation( const Vector3 & translateVec ) -{ - mCol3.setXYZ( translateVec ); - return *this; -} - -inline const Vector3 Matrix4::getTranslation( ) const -{ - return mCol3.getXYZ( ); -} - -inline const Matrix4 Matrix4::rotationX( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix4( - Vector4::xAxis( ), - Vector4( 0.0f, c, s, 0.0f ), - Vector4( 0.0f, -s, c, 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotationY( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix4( - Vector4( c, 0.0f, -s, 0.0f ), - Vector4::yAxis( ), - Vector4( s, 0.0f, c, 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotationZ( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix4( - Vector4( c, s, 0.0f, 0.0f ), - Vector4( -s, c, 0.0f, 0.0f ), - Vector4::zAxis( ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotationZYX( const Vector3 & radiansXYZ ) -{ - float sX, cX, sY, cY, sZ, cZ, tmp0, tmp1; - sX = sinf( radiansXYZ.getX() ); - cX = cosf( radiansXYZ.getX() ); - sY = sinf( radiansXYZ.getY() ); - cY = cosf( radiansXYZ.getY() ); - sZ = sinf( radiansXYZ.getZ() ); - cZ = cosf( radiansXYZ.getZ() ); - tmp0 = ( cZ * sY ); - tmp1 = ( sZ * sY ); - return Matrix4( - Vector4( ( cZ * cY ), ( sZ * cY ), -sY, 0.0f ), - Vector4( ( ( tmp0 * sX ) - ( sZ * cX ) ), ( ( tmp1 * sX ) + ( cZ * cX ) ), ( cY * sX ), 0.0f ), - Vector4( ( ( tmp0 * cX ) + ( sZ * sX ) ), ( ( tmp1 * cX ) - ( cZ * sX ) ), ( cY * cX ), 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotation( float radians, const Vector3 & unitVec ) -{ - float x, y, z, s, c, oneMinusC, xy, yz, zx; - s = sinf( radians ); - c = cosf( radians ); - x = unitVec.getX(); - y = unitVec.getY(); - z = unitVec.getZ(); - xy = ( x * y ); - yz = ( y * z ); - zx = ( z * x ); - oneMinusC = ( 1.0f - c ); - return Matrix4( - Vector4( ( ( ( x * x ) * oneMinusC ) + c ), ( ( xy * oneMinusC ) + ( z * s ) ), ( ( zx * oneMinusC ) - ( y * s ) ), 0.0f ), - Vector4( ( ( xy * oneMinusC ) - ( z * s ) ), ( ( ( y * y ) * oneMinusC ) + c ), ( ( yz * oneMinusC ) + ( x * s ) ), 0.0f ), - Vector4( ( ( zx * oneMinusC ) + ( y * s ) ), ( ( yz * oneMinusC ) - ( x * s ) ), ( ( ( z * z ) * oneMinusC ) + c ), 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotation( const Quat & unitQuat ) -{ - return Matrix4( Transform3::rotation( unitQuat ) ); -} - -inline const Matrix4 Matrix4::scale( const Vector3 & scaleVec ) -{ - return Matrix4( - Vector4( scaleVec.getX(), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, scaleVec.getY(), 0.0f, 0.0f ), - Vector4( 0.0f, 0.0f, scaleVec.getZ(), 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 appendScale( const Matrix4 & mat, const Vector3 & scaleVec ) -{ - return Matrix4( - ( mat.getCol0() * scaleVec.getX( ) ), - ( mat.getCol1() * scaleVec.getY( ) ), - ( mat.getCol2() * scaleVec.getZ( ) ), - mat.getCol3() - ); -} - -inline const Matrix4 prependScale( const Vector3 & scaleVec, const Matrix4 & mat ) -{ - Vector4 scale4; - scale4 = Vector4( scaleVec, 1.0f ); - return Matrix4( - mulPerElem( mat.getCol0(), scale4 ), - mulPerElem( mat.getCol1(), scale4 ), - mulPerElem( mat.getCol2(), scale4 ), - mulPerElem( mat.getCol3(), scale4 ) - ); -} - -inline const Matrix4 Matrix4::translation( const Vector3 & translateVec ) -{ - return Matrix4( - Vector4::xAxis( ), - Vector4::yAxis( ), - Vector4::zAxis( ), - Vector4( translateVec, 1.0f ) - ); -} - -inline const Matrix4 Matrix4::lookAt( const Point3 & eyePos, const Point3 & lookAtPos, const Vector3 & upVec ) -{ - Matrix4 m4EyeFrame; - Vector3 v3X, v3Y, v3Z; - v3Y = normalize( upVec ); - v3Z = normalize( ( eyePos - lookAtPos ) ); - v3X = normalize( cross( v3Y, v3Z ) ); - v3Y = cross( v3Z, v3X ); - m4EyeFrame = Matrix4( Vector4( v3X ), Vector4( v3Y ), Vector4( v3Z ), Vector4( eyePos ) ); - return orthoInverse( m4EyeFrame ); -} - -inline const Matrix4 Matrix4::perspective( float fovyRadians, float aspect, float zNear, float zFar ) -{ - float f, rangeInv; - f = tanf( ( (float)( _VECTORMATH_PI_OVER_2 ) - ( 0.5f * fovyRadians ) ) ); - rangeInv = ( 1.0f / ( zNear - zFar ) ); - return Matrix4( - Vector4( ( f / aspect ), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, f, 0.0f, 0.0f ), - Vector4( 0.0f, 0.0f, ( ( zNear + zFar ) * rangeInv ), -1.0f ), - Vector4( 0.0f, 0.0f, ( ( ( zNear * zFar ) * rangeInv ) * 2.0f ), 0.0f ) - ); -} - -inline const Matrix4 Matrix4::frustum( float left, float right, float bottom, float top, float zNear, float zFar ) -{ - float sum_rl, sum_tb, sum_nf, inv_rl, inv_tb, inv_nf, n2; - sum_rl = ( right + left ); - sum_tb = ( top + bottom ); - sum_nf = ( zNear + zFar ); - inv_rl = ( 1.0f / ( right - left ) ); - inv_tb = ( 1.0f / ( top - bottom ) ); - inv_nf = ( 1.0f / ( zNear - zFar ) ); - n2 = ( zNear + zNear ); - return Matrix4( - Vector4( ( n2 * inv_rl ), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, ( n2 * inv_tb ), 0.0f, 0.0f ), - Vector4( ( sum_rl * inv_rl ), ( sum_tb * inv_tb ), ( sum_nf * inv_nf ), -1.0f ), - Vector4( 0.0f, 0.0f, ( ( n2 * inv_nf ) * zFar ), 0.0f ) - ); -} - -inline const Matrix4 Matrix4::orthographic( float left, float right, float bottom, float top, float zNear, float zFar ) -{ - float sum_rl, sum_tb, sum_nf, inv_rl, inv_tb, inv_nf; - sum_rl = ( right + left ); - sum_tb = ( top + bottom ); - sum_nf = ( zNear + zFar ); - inv_rl = ( 1.0f / ( right - left ) ); - inv_tb = ( 1.0f / ( top - bottom ) ); - inv_nf = ( 1.0f / ( zNear - zFar ) ); - return Matrix4( - Vector4( ( inv_rl + inv_rl ), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, ( inv_tb + inv_tb ), 0.0f, 0.0f ), - Vector4( 0.0f, 0.0f, ( inv_nf + inv_nf ), 0.0f ), - Vector4( ( -sum_rl * inv_rl ), ( -sum_tb * inv_tb ), ( sum_nf * inv_nf ), 1.0f ) - ); -} - -inline const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, bool select1 ) -{ - return Matrix4( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ), - select( mat0.getCol3(), mat1.getCol3(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Matrix4 & mat ) -{ - print( mat.getRow( 0 ) ); - print( mat.getRow( 1 ) ); - print( mat.getRow( 2 ) ); - print( mat.getRow( 3 ) ); -} - -inline void print( const Matrix4 & mat, const char * name ) -{ - printf("%s:\n", name); - print( mat ); -} - -#endif - -inline Transform3::Transform3( const Transform3 & tfrm ) -{ - mCol0 = tfrm.mCol0; - mCol1 = tfrm.mCol1; - mCol2 = tfrm.mCol2; - mCol3 = tfrm.mCol3; -} - -inline Transform3::Transform3( float scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); - mCol3 = Vector3( scalar ); -} - -inline Transform3::Transform3( const Vector3 & _col0, const Vector3 & _col1, const Vector3 & _col2, const Vector3 & _col3 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; - mCol3 = _col3; -} - -inline Transform3::Transform3( const Matrix3 & tfrm, const Vector3 & translateVec ) -{ - this->setUpper3x3( tfrm ); - this->setTranslation( translateVec ); -} - -inline Transform3::Transform3( const Quat & unitQuat, const Vector3 & translateVec ) -{ - this->setUpper3x3( Matrix3( unitQuat ) ); - this->setTranslation( translateVec ); -} - -inline Transform3 & Transform3::setCol0( const Vector3 & _col0 ) -{ - mCol0 = _col0; - return *this; -} - -inline Transform3 & Transform3::setCol1( const Vector3 & _col1 ) -{ - mCol1 = _col1; - return *this; -} - -inline Transform3 & Transform3::setCol2( const Vector3 & _col2 ) -{ - mCol2 = _col2; - return *this; -} - -inline Transform3 & Transform3::setCol3( const Vector3 & _col3 ) -{ - mCol3 = _col3; - return *this; -} - -inline Transform3 & Transform3::setCol( int col, const Vector3 & vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -inline Transform3 & Transform3::setRow( int row, const Vector4 & vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - mCol3.setElem( row, vec.getElem( 3 ) ); - return *this; -} - -inline Transform3 & Transform3::setElem( int col, int row, float val ) -{ - Vector3 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -inline float Transform3::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -inline const Vector3 Transform3::getCol0( ) const -{ - return mCol0; -} - -inline const Vector3 Transform3::getCol1( ) const -{ - return mCol1; -} - -inline const Vector3 Transform3::getCol2( ) const -{ - return mCol2; -} - -inline const Vector3 Transform3::getCol3( ) const -{ - return mCol3; -} - -inline const Vector3 Transform3::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -inline const Vector4 Transform3::getRow( int row ) const -{ - return Vector4( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ), mCol3.getElem( row ) ); -} - -inline Vector3 & Transform3::operator []( int col ) -{ - return *(&mCol0 + col); -} - -inline const Vector3 Transform3::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -inline Transform3 & Transform3::operator =( const Transform3 & tfrm ) -{ - mCol0 = tfrm.mCol0; - mCol1 = tfrm.mCol1; - mCol2 = tfrm.mCol2; - mCol3 = tfrm.mCol3; - return *this; -} - -inline const Transform3 inverse( const Transform3 & tfrm ) -{ - Vector3 tmp0, tmp1, tmp2, inv0, inv1, inv2; - float detinv; - tmp0 = cross( tfrm.getCol1(), tfrm.getCol2() ); - tmp1 = cross( tfrm.getCol2(), tfrm.getCol0() ); - tmp2 = cross( tfrm.getCol0(), tfrm.getCol1() ); - detinv = ( 1.0f / dot( tfrm.getCol2(), tmp2 ) ); - inv0 = Vector3( ( tmp0.getX() * detinv ), ( tmp1.getX() * detinv ), ( tmp2.getX() * detinv ) ); - inv1 = Vector3( ( tmp0.getY() * detinv ), ( tmp1.getY() * detinv ), ( tmp2.getY() * detinv ) ); - inv2 = Vector3( ( tmp0.getZ() * detinv ), ( tmp1.getZ() * detinv ), ( tmp2.getZ() * detinv ) ); - return Transform3( - inv0, - inv1, - inv2, - Vector3( ( -( ( inv0 * tfrm.getCol3().getX() ) + ( ( inv1 * tfrm.getCol3().getY() ) + ( inv2 * tfrm.getCol3().getZ() ) ) ) ) ) - ); -} - -inline const Transform3 orthoInverse( const Transform3 & tfrm ) -{ - Vector3 inv0, inv1, inv2; - inv0 = Vector3( tfrm.getCol0().getX(), tfrm.getCol1().getX(), tfrm.getCol2().getX() ); - inv1 = Vector3( tfrm.getCol0().getY(), tfrm.getCol1().getY(), tfrm.getCol2().getY() ); - inv2 = Vector3( tfrm.getCol0().getZ(), tfrm.getCol1().getZ(), tfrm.getCol2().getZ() ); - return Transform3( - inv0, - inv1, - inv2, - Vector3( ( -( ( inv0 * tfrm.getCol3().getX() ) + ( ( inv1 * tfrm.getCol3().getY() ) + ( inv2 * tfrm.getCol3().getZ() ) ) ) ) ) - ); -} - -inline const Transform3 absPerElem( const Transform3 & tfrm ) -{ - return Transform3( - absPerElem( tfrm.getCol0() ), - absPerElem( tfrm.getCol1() ), - absPerElem( tfrm.getCol2() ), - absPerElem( tfrm.getCol3() ) - ); -} - -inline const Vector3 Transform3::operator *( const Vector3 & vec ) const -{ - return Vector3( - ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ), - ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ), - ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ) - ); -} - -inline const Point3 Transform3::operator *( const Point3 & pnt ) const -{ - return Point3( - ( ( ( ( mCol0.getX() * pnt.getX() ) + ( mCol1.getX() * pnt.getY() ) ) + ( mCol2.getX() * pnt.getZ() ) ) + mCol3.getX() ), - ( ( ( ( mCol0.getY() * pnt.getX() ) + ( mCol1.getY() * pnt.getY() ) ) + ( mCol2.getY() * pnt.getZ() ) ) + mCol3.getY() ), - ( ( ( ( mCol0.getZ() * pnt.getX() ) + ( mCol1.getZ() * pnt.getY() ) ) + ( mCol2.getZ() * pnt.getZ() ) ) + mCol3.getZ() ) - ); -} - -inline const Transform3 Transform3::operator *( const Transform3 & tfrm ) const -{ - return Transform3( - ( *this * tfrm.mCol0 ), - ( *this * tfrm.mCol1 ), - ( *this * tfrm.mCol2 ), - Vector3( ( *this * Point3( tfrm.mCol3 ) ) ) - ); -} - -inline Transform3 & Transform3::operator *=( const Transform3 & tfrm ) -{ - *this = *this * tfrm; - return *this; -} - -inline const Transform3 mulPerElem( const Transform3 & tfrm0, const Transform3 & tfrm1 ) -{ - return Transform3( - mulPerElem( tfrm0.getCol0(), tfrm1.getCol0() ), - mulPerElem( tfrm0.getCol1(), tfrm1.getCol1() ), - mulPerElem( tfrm0.getCol2(), tfrm1.getCol2() ), - mulPerElem( tfrm0.getCol3(), tfrm1.getCol3() ) - ); -} - -inline const Transform3 Transform3::identity( ) -{ - return Transform3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ), - Vector3( 0.0f ) - ); -} - -inline Transform3 & Transform3::setUpper3x3( const Matrix3 & tfrm ) -{ - mCol0 = tfrm.getCol0(); - mCol1 = tfrm.getCol1(); - mCol2 = tfrm.getCol2(); - return *this; -} - -inline const Matrix3 Transform3::getUpper3x3( ) const -{ - return Matrix3( mCol0, mCol1, mCol2 ); -} - -inline Transform3 & Transform3::setTranslation( const Vector3 & translateVec ) -{ - mCol3 = translateVec; - return *this; -} - -inline const Vector3 Transform3::getTranslation( ) const -{ - return mCol3; -} - -inline const Transform3 Transform3::rotationX( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Transform3( - Vector3::xAxis( ), - Vector3( 0.0f, c, s ), - Vector3( 0.0f, -s, c ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotationY( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Transform3( - Vector3( c, 0.0f, -s ), - Vector3::yAxis( ), - Vector3( s, 0.0f, c ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotationZ( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Transform3( - Vector3( c, s, 0.0f ), - Vector3( -s, c, 0.0f ), - Vector3::zAxis( ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotationZYX( const Vector3 & radiansXYZ ) -{ - float sX, cX, sY, cY, sZ, cZ, tmp0, tmp1; - sX = sinf( radiansXYZ.getX() ); - cX = cosf( radiansXYZ.getX() ); - sY = sinf( radiansXYZ.getY() ); - cY = cosf( radiansXYZ.getY() ); - sZ = sinf( radiansXYZ.getZ() ); - cZ = cosf( radiansXYZ.getZ() ); - tmp0 = ( cZ * sY ); - tmp1 = ( sZ * sY ); - return Transform3( - Vector3( ( cZ * cY ), ( sZ * cY ), -sY ), - Vector3( ( ( tmp0 * sX ) - ( sZ * cX ) ), ( ( tmp1 * sX ) + ( cZ * cX ) ), ( cY * sX ) ), - Vector3( ( ( tmp0 * cX ) + ( sZ * sX ) ), ( ( tmp1 * cX ) - ( cZ * sX ) ), ( cY * cX ) ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotation( float radians, const Vector3 & unitVec ) -{ - return Transform3( Matrix3::rotation( radians, unitVec ), Vector3( 0.0f ) ); -} - -inline const Transform3 Transform3::rotation( const Quat & unitQuat ) -{ - return Transform3( Matrix3( unitQuat ), Vector3( 0.0f ) ); -} - -inline const Transform3 Transform3::scale( const Vector3 & scaleVec ) -{ - return Transform3( - Vector3( scaleVec.getX(), 0.0f, 0.0f ), - Vector3( 0.0f, scaleVec.getY(), 0.0f ), - Vector3( 0.0f, 0.0f, scaleVec.getZ() ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 appendScale( const Transform3 & tfrm, const Vector3 & scaleVec ) -{ - return Transform3( - ( tfrm.getCol0() * scaleVec.getX( ) ), - ( tfrm.getCol1() * scaleVec.getY( ) ), - ( tfrm.getCol2() * scaleVec.getZ( ) ), - tfrm.getCol3() - ); -} - -inline const Transform3 prependScale( const Vector3 & scaleVec, const Transform3 & tfrm ) -{ - return Transform3( - mulPerElem( tfrm.getCol0(), scaleVec ), - mulPerElem( tfrm.getCol1(), scaleVec ), - mulPerElem( tfrm.getCol2(), scaleVec ), - mulPerElem( tfrm.getCol3(), scaleVec ) - ); -} - -inline const Transform3 Transform3::translation( const Vector3 & translateVec ) -{ - return Transform3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ), - translateVec - ); -} - -inline const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, bool select1 ) -{ - return Transform3( - select( tfrm0.getCol0(), tfrm1.getCol0(), select1 ), - select( tfrm0.getCol1(), tfrm1.getCol1(), select1 ), - select( tfrm0.getCol2(), tfrm1.getCol2(), select1 ), - select( tfrm0.getCol3(), tfrm1.getCol3(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Transform3 & tfrm ) -{ - print( tfrm.getRow( 0 ) ); - print( tfrm.getRow( 1 ) ); - print( tfrm.getRow( 2 ) ); -} - -inline void print( const Transform3 & tfrm, const char * name ) -{ - printf("%s:\n", name); - print( tfrm ); -} - -#endif - -inline Quat::Quat( const Matrix3 & tfrm ) -{ - float trace, radicand, scale, xx, yx, zx, xy, yy, zy, xz, yz, zz, tmpx, tmpy, tmpz, tmpw, qx, qy, qz, qw; - int negTrace, ZgtX, ZgtY, YgtX; - int largestXorY, largestYorZ, largestZorX; - - xx = tfrm.getCol0().getX(); - yx = tfrm.getCol0().getY(); - zx = tfrm.getCol0().getZ(); - xy = tfrm.getCol1().getX(); - yy = tfrm.getCol1().getY(); - zy = tfrm.getCol1().getZ(); - xz = tfrm.getCol2().getX(); - yz = tfrm.getCol2().getY(); - zz = tfrm.getCol2().getZ(); - - trace = ( ( xx + yy ) + zz ); - - negTrace = ( trace < 0.0f ); - ZgtX = zz > xx; - ZgtY = zz > yy; - YgtX = yy > xx; - largestXorY = ( !ZgtX || !ZgtY ) && negTrace; - largestYorZ = ( YgtX || ZgtX ) && negTrace; - largestZorX = ( ZgtY || !YgtX ) && negTrace; - - if ( largestXorY ) - { - zz = -zz; - xy = -xy; - } - if ( largestYorZ ) - { - xx = -xx; - yz = -yz; - } - if ( largestZorX ) - { - yy = -yy; - zx = -zx; - } - - radicand = ( ( ( xx + yy ) + zz ) + 1.0f ); - scale = ( 0.5f * ( 1.0f / sqrtf( radicand ) ) ); - - tmpx = ( ( zy - yz ) * scale ); - tmpy = ( ( xz - zx ) * scale ); - tmpz = ( ( yx - xy ) * scale ); - tmpw = ( radicand * scale ); - qx = tmpx; - qy = tmpy; - qz = tmpz; - qw = tmpw; - - if ( largestXorY ) - { - qx = tmpw; - qy = tmpz; - qz = tmpy; - qw = tmpx; - } - if ( largestYorZ ) - { - tmpx = qx; - tmpz = qz; - qx = qy; - qy = tmpx; - qz = qw; - qw = tmpz; - } - - mXYZW[0] = qx; - mXYZW[1] = qy; - mXYZW[2] = qz; - mXYZW[3] = qw; -} - -inline const Matrix3 outer( const Vector3 & tfrm0, const Vector3 & tfrm1 ) -{ - return Matrix3( - ( tfrm0 * tfrm1.getX( ) ), - ( tfrm0 * tfrm1.getY( ) ), - ( tfrm0 * tfrm1.getZ( ) ) - ); -} - -inline const Matrix4 outer( const Vector4 & tfrm0, const Vector4 & tfrm1 ) -{ - return Matrix4( - ( tfrm0 * tfrm1.getX( ) ), - ( tfrm0 * tfrm1.getY( ) ), - ( tfrm0 * tfrm1.getZ( ) ), - ( tfrm0 * tfrm1.getW( ) ) - ); -} - -inline const Vector3 rowMul( const Vector3 & vec, const Matrix3 & mat ) -{ - return Vector3( - ( ( ( vec.getX() * mat.getCol0().getX() ) + ( vec.getY() * mat.getCol0().getY() ) ) + ( vec.getZ() * mat.getCol0().getZ() ) ), - ( ( ( vec.getX() * mat.getCol1().getX() ) + ( vec.getY() * mat.getCol1().getY() ) ) + ( vec.getZ() * mat.getCol1().getZ() ) ), - ( ( ( vec.getX() * mat.getCol2().getX() ) + ( vec.getY() * mat.getCol2().getY() ) ) + ( vec.getZ() * mat.getCol2().getZ() ) ) - ); -} - -inline const Matrix3 crossMatrix( const Vector3 & vec ) -{ - return Matrix3( - Vector3( 0.0f, vec.getZ(), -vec.getY() ), - Vector3( -vec.getZ(), 0.0f, vec.getX() ), - Vector3( vec.getY(), -vec.getX(), 0.0f ) - ); -} - -inline const Matrix3 crossMatrixMul( const Vector3 & vec, const Matrix3 & mat ) -{ - return Matrix3( cross( vec, mat.getCol0() ), cross( vec, mat.getCol1() ), cross( vec, mat.getCol2() ) ); -} - -} // namespace Aos -} // namespace Vectormath - -#endif - diff --git a/Engine/lib/bullet/src/vectormath/neon/quat_aos.h b/Engine/lib/bullet/src/vectormath/neon/quat_aos.h deleted file mode 100644 index d06184603..000000000 --- a/Engine/lib/bullet/src/vectormath/neon/quat_aos.h +++ /dev/null @@ -1,413 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_QUAT_AOS_CPP_H -#define _VECTORMATH_QUAT_AOS_CPP_H - -//----------------------------------------------------------------------------- -// Definitions - -#ifndef _VECTORMATH_INTERNAL_FUNCTIONS -#define _VECTORMATH_INTERNAL_FUNCTIONS - -#endif - -namespace Vectormath { -namespace Aos { - - inline Quat::Quat( const Quat & quat ) - { - vXYZW = quat.vXYZW; - } - - inline Quat::Quat( float _x, float _y, float _z, float _w ) - { - mXYZW[0] = _x; - mXYZW[1] = _y; - mXYZW[2] = _z; - mXYZW[3] = _w; - } - - inline Quat::Quat( float32x4_t fXYZW ) - { - vXYZW = fXYZW; - } - - inline Quat::Quat( const Vector3 & xyz, float _w ) - { - this->setXYZ( xyz ); - this->setW( _w ); - } - - inline Quat::Quat( const Vector4 & vec ) - { - mXYZW[0] = vec.getX(); - mXYZW[1] = vec.getY(); - mXYZW[2] = vec.getZ(); - mXYZW[3] = vec.getW(); - } - - inline Quat::Quat( float scalar ) - { - vXYZW = vdupq_n_f32(scalar); - } - - inline const Quat Quat::identity( ) - { - return Quat( 0.0f, 0.0f, 0.0f, 1.0f ); - } - - inline const Quat lerp( float t, const Quat & quat0, const Quat & quat1 ) - { - return ( quat0 + ( ( quat1 - quat0 ) * t ) ); - } - - inline const Quat slerp( float t, const Quat & unitQuat0, const Quat & unitQuat1 ) - { - Quat start; - float recipSinAngle, scale0, scale1, cosAngle, angle; - cosAngle = dot( unitQuat0, unitQuat1 ); - if ( cosAngle < 0.0f ) { - cosAngle = -cosAngle; - start = ( -unitQuat0 ); - } else { - start = unitQuat0; - } - if ( cosAngle < _VECTORMATH_SLERP_TOL ) { - angle = acosf( cosAngle ); - recipSinAngle = ( 1.0f / sinf( angle ) ); - scale0 = ( sinf( ( ( 1.0f - t ) * angle ) ) * recipSinAngle ); - scale1 = ( sinf( ( t * angle ) ) * recipSinAngle ); - } else { - scale0 = ( 1.0f - t ); - scale1 = t; - } - return ( ( start * scale0 ) + ( unitQuat1 * scale1 ) ); - } - - inline const Quat squad( float t, const Quat & unitQuat0, const Quat & unitQuat1, const Quat & unitQuat2, const Quat & unitQuat3 ) - { - Quat tmp0, tmp1; - tmp0 = slerp( t, unitQuat0, unitQuat3 ); - tmp1 = slerp( t, unitQuat1, unitQuat2 ); - return slerp( ( ( 2.0f * t ) * ( 1.0f - t ) ), tmp0, tmp1 ); - } - - inline void loadXYZW( Quat & quat, const float * fptr ) - { - quat = Quat( fptr[0], fptr[1], fptr[2], fptr[3] ); - } - - inline void storeXYZW( const Quat & quat, float * fptr ) - { - vst1q_f32(fptr, quat.getvXYZW()); - } - - inline Quat & Quat::operator =( const Quat & quat ) - { - vXYZW = quat.getvXYZW(); - return *this; - } - - inline Quat & Quat::setXYZ( const Vector3 & vec ) - { - mXYZW[0] = vec.getX(); - mXYZW[1] = vec.getY(); - mXYZW[2] = vec.getZ(); - return *this; - } - - inline const Vector3 Quat::getXYZ( ) const - { - return Vector3( mXYZW[0], mXYZW[1], mXYZW[2] ); - } - - inline float32x4_t Quat::getvXYZW( ) const - { - return vXYZW; - } - - inline Quat & Quat::setX( float _x ) - { - mXYZW[0] = _x; - return *this; - } - - inline float Quat::getX( ) const - { - return mXYZW[0]; - } - - inline Quat & Quat::setY( float _y ) - { - mXYZW[1] = _y; - return *this; - } - - inline float Quat::getY( ) const - { - return mXYZW[1]; - } - - inline Quat & Quat::setZ( float _z ) - { - mXYZW[2] = _z; - return *this; - } - - inline float Quat::getZ( ) const - { - return mXYZW[2]; - } - - inline Quat & Quat::setW( float _w ) - { - mXYZW[3] = _w; - return *this; - } - - inline float Quat::getW( ) const - { - return mXYZW[3]; - } - - inline Quat & Quat::setElem( int idx, float value ) - { - *(&mXYZW[0] + idx) = value; - return *this; - } - - inline float Quat::getElem( int idx ) const - { - return *(&mXYZW[0] + idx); - } - - inline float & Quat::operator []( int idx ) - { - return *(&mXYZW[0] + idx); - } - - inline float Quat::operator []( int idx ) const - { - return *(&mXYZW[0] + idx); - } - - inline const Quat Quat::operator +( const Quat & quat ) const - { - return Quat( vaddq_f32(vXYZW, quat.vXYZW) ); - } - - inline const Quat Quat::operator -( const Quat & quat ) const - { - return Quat( vsubq_f32(vXYZW, quat.vXYZW) ); - } - - inline const Quat Quat::operator *( float scalar ) const - { - float32x4_t v_scalar = vdupq_n_f32(scalar); - return Quat( vmulq_f32(vXYZW, v_scalar) ); - } - - inline Quat & Quat::operator +=( const Quat & quat ) - { - *this = *this + quat; - return *this; - } - - inline Quat & Quat::operator -=( const Quat & quat ) - { - *this = *this - quat; - return *this; - } - - inline Quat & Quat::operator *=( float scalar ) - { - *this = *this * scalar; - return *this; - } - - inline const Quat Quat::operator /( float scalar ) const - { - return Quat( - ( mXYZW[0] / scalar ), - ( mXYZW[1] / scalar ), - ( mXYZW[2] / scalar ), - ( mXYZW[3] / scalar ) - ); - } - - inline Quat & Quat::operator /=( float scalar ) - { - *this = *this / scalar; - return *this; - } - - inline const Quat Quat::operator -( ) const - { - return Quat( vnegq_f32(vXYZW) ); - } - - inline const Quat operator *( float scalar, const Quat & quat ) - { - return quat * scalar; - } - - inline float dot( const Quat & quat0, const Quat & quat1 ) - { - float result; - result = ( quat0.getX() * quat1.getX() ); - result = ( result + ( quat0.getY() * quat1.getY() ) ); - result = ( result + ( quat0.getZ() * quat1.getZ() ) ); - result = ( result + ( quat0.getW() * quat1.getW() ) ); - return result; - } - - inline float norm( const Quat & quat ) - { - float result; - result = ( quat.getX() * quat.getX() ); - result = ( result + ( quat.getY() * quat.getY() ) ); - result = ( result + ( quat.getZ() * quat.getZ() ) ); - result = ( result + ( quat.getW() * quat.getW() ) ); - return result; - } - - inline float length( const Quat & quat ) - { - return ::sqrtf( norm( quat ) ); - } - - inline const Quat normalize( const Quat & quat ) - { - float lenSqr, lenInv; - lenSqr = norm( quat ); - lenInv = ( 1.0f / sqrtf( lenSqr ) ); - return Quat( - ( quat.getX() * lenInv ), - ( quat.getY() * lenInv ), - ( quat.getZ() * lenInv ), - ( quat.getW() * lenInv ) - ); - } - - inline const Quat Quat::rotation( const Vector3 & unitVec0, const Vector3 & unitVec1 ) - { - float cosHalfAngleX2, recipCosHalfAngleX2; - cosHalfAngleX2 = sqrtf( ( 2.0f * ( 1.0f + dot( unitVec0, unitVec1 ) ) ) ); - recipCosHalfAngleX2 = ( 1.0f / cosHalfAngleX2 ); - return Quat( ( cross( unitVec0, unitVec1 ) * recipCosHalfAngleX2 ), ( cosHalfAngleX2 * 0.5f ) ); - } - - inline const Quat Quat::rotation( float radians, const Vector3 & unitVec ) - { - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( ( unitVec * s ), c ); - } - - inline const Quat Quat::rotationX( float radians ) - { - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( s, 0.0f, 0.0f, c ); - } - - inline const Quat Quat::rotationY( float radians ) - { - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( 0.0f, s, 0.0f, c ); - } - - inline const Quat Quat::rotationZ( float radians ) - { - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( 0.0f, 0.0f, s, c ); - } - - inline const Quat Quat::operator *( const Quat & quat ) const - { - return Quat( - ( ( ( ( mXYZW[3] * quat.mXYZW[0] ) + ( mXYZW[0] * quat.mXYZW[3] ) ) + ( mXYZW[1] * quat.mXYZW[2] ) ) - ( mXYZW[2] * quat.mXYZW[1] ) ), - ( ( ( ( mXYZW[3] * quat.mXYZW[1] ) + ( mXYZW[1] * quat.mXYZW[3] ) ) + ( mXYZW[2] * quat.mXYZW[0] ) ) - ( mXYZW[0] * quat.mXYZW[2] ) ), - ( ( ( ( mXYZW[3] * quat.mXYZW[2] ) + ( mXYZW[2] * quat.mXYZW[3] ) ) + ( mXYZW[0] * quat.mXYZW[1] ) ) - ( mXYZW[1] * quat.mXYZW[0] ) ), - ( ( ( ( mXYZW[3] * quat.mXYZW[3] ) - ( mXYZW[0] * quat.mXYZW[0] ) ) - ( mXYZW[1] * quat.mXYZW[1] ) ) - ( mXYZW[2] * quat.mXYZW[2] ) ) - ); - } - - inline Quat & Quat::operator *=( const Quat & quat ) - { - *this = *this * quat; - return *this; - } - - inline const Vector3 rotate( const Quat & quat, const Vector3 & vec ) - { - float tmpX, tmpY, tmpZ, tmpW; - tmpX = ( ( ( quat.getW() * vec.getX() ) + ( quat.getY() * vec.getZ() ) ) - ( quat.getZ() * vec.getY() ) ); - tmpY = ( ( ( quat.getW() * vec.getY() ) + ( quat.getZ() * vec.getX() ) ) - ( quat.getX() * vec.getZ() ) ); - tmpZ = ( ( ( quat.getW() * vec.getZ() ) + ( quat.getX() * vec.getY() ) ) - ( quat.getY() * vec.getX() ) ); - tmpW = ( ( ( quat.getX() * vec.getX() ) + ( quat.getY() * vec.getY() ) ) + ( quat.getZ() * vec.getZ() ) ); - return Vector3( - ( ( ( ( tmpW * quat.getX() ) + ( tmpX * quat.getW() ) ) - ( tmpY * quat.getZ() ) ) + ( tmpZ * quat.getY() ) ), - ( ( ( ( tmpW * quat.getY() ) + ( tmpY * quat.getW() ) ) - ( tmpZ * quat.getX() ) ) + ( tmpX * quat.getZ() ) ), - ( ( ( ( tmpW * quat.getZ() ) + ( tmpZ * quat.getW() ) ) - ( tmpX * quat.getY() ) ) + ( tmpY * quat.getX() ) ) - ); - } - - inline const Quat conj( const Quat & quat ) - { - return Quat( -quat.getX(), -quat.getY(), -quat.getZ(), quat.getW() ); - } - - inline const Quat select( const Quat & quat0, const Quat & quat1, bool select1 ) - { - return Quat( - ( select1 )? quat1.getX() : quat0.getX(), - ( select1 )? quat1.getY() : quat0.getY(), - ( select1 )? quat1.getZ() : quat0.getZ(), - ( select1 )? quat1.getW() : quat0.getW() - ); - } - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Quat & quat ) -{ - printf( "( %f %f %f %f )\n", quat.getX(), quat.getY(), quat.getZ(), quat.getW() ); -} - -inline void print( const Quat & quat, const char * name ) -{ - printf( "%s: ( %f %f %f %f )\n", name, quat.getX(), quat.getY(), quat.getZ(), quat.getW() ); -} - -#endif - -} // namespace Aos -} // namespace Vectormath - -#endif - diff --git a/Engine/lib/bullet/src/vectormath/neon/vec_aos.h b/Engine/lib/bullet/src/vectormath/neon/vec_aos.h deleted file mode 100644 index 7bcf8dbec..000000000 --- a/Engine/lib/bullet/src/vectormath/neon/vec_aos.h +++ /dev/null @@ -1,1427 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_VEC_AOS_CPP_H -#define _VECTORMATH_VEC_AOS_CPP_H - -//----------------------------------------------------------------------------- -// Constants - -#define _VECTORMATH_SLERP_TOL 0.999f - -//----------------------------------------------------------------------------- -// Definitions - -#ifndef _VECTORMATH_INTERNAL_FUNCTIONS -#define _VECTORMATH_INTERNAL_FUNCTIONS - -#endif - -namespace Vectormath { -namespace Aos { - -inline Vector3::Vector3( const Vector3 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; -} - -inline Vector3::Vector3( float _x, float _y, float _z ) -{ - mX = _x; - mY = _y; - mZ = _z; -} - -inline Vector3::Vector3( const Point3 & pnt ) -{ - mX = pnt.getX(); - mY = pnt.getY(); - mZ = pnt.getZ(); -} - -inline Vector3::Vector3( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; -} - -inline const Vector3 Vector3::xAxis( ) -{ - return Vector3( 1.0f, 0.0f, 0.0f ); -} - -inline const Vector3 Vector3::yAxis( ) -{ - return Vector3( 0.0f, 1.0f, 0.0f ); -} - -inline const Vector3 Vector3::zAxis( ) -{ - return Vector3( 0.0f, 0.0f, 1.0f ); -} - -inline const Vector3 lerp( float t, const Vector3 & vec0, const Vector3 & vec1 ) -{ - return ( vec0 + ( ( vec1 - vec0 ) * t ) ); -} - -inline const Vector3 slerp( float t, const Vector3 & unitVec0, const Vector3 & unitVec1 ) -{ - float recipSinAngle, scale0, scale1, cosAngle, angle; - cosAngle = dot( unitVec0, unitVec1 ); - if ( cosAngle < _VECTORMATH_SLERP_TOL ) { - angle = acosf( cosAngle ); - recipSinAngle = ( 1.0f / sinf( angle ) ); - scale0 = ( sinf( ( ( 1.0f - t ) * angle ) ) * recipSinAngle ); - scale1 = ( sinf( ( t * angle ) ) * recipSinAngle ); - } else { - scale0 = ( 1.0f - t ); - scale1 = t; - } - return ( ( unitVec0 * scale0 ) + ( unitVec1 * scale1 ) ); -} - -inline void loadXYZ( Vector3 & vec, const float * fptr ) -{ - vec = Vector3( fptr[0], fptr[1], fptr[2] ); -} - -inline void storeXYZ( const Vector3 & vec, float * fptr ) -{ - fptr[0] = vec.getX(); - fptr[1] = vec.getY(); - fptr[2] = vec.getZ(); -} - -inline void loadHalfFloats( Vector3 & vec, const unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - unsigned short fp16 = hfptr[i]; - unsigned int sign = fp16 >> 15; - unsigned int exponent = (fp16 >> 10) & ((1 << 5) - 1); - unsigned int mantissa = fp16 & ((1 << 10) - 1); - - if (exponent == 0) { - // zero - mantissa = 0; - - } else if (exponent == 31) { - // infinity or nan -> infinity - exponent = 255; - mantissa = 0; - - } else { - exponent += 127 - 15; - mantissa <<= 13; - } - - Data32 d; - d.u32 = (sign << 31) | (exponent << 23) | mantissa; - vec[i] = d.f32; - } -} - -inline void storeHalfFloats( const Vector3 & vec, unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - Data32 d; - d.f32 = vec[i]; - - unsigned int sign = d.u32 >> 31; - unsigned int exponent = (d.u32 >> 23) & ((1 << 8) - 1); - unsigned int mantissa = d.u32 & ((1 << 23) - 1);; - - if (exponent == 0) { - // zero or denorm -> zero - mantissa = 0; - - } else if (exponent == 255 && mantissa != 0) { - // nan -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent >= 127 - 15 + 31) { - // overflow or infinity -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent <= 127 - 15) { - // underflow -> zero - exponent = 0; - mantissa = 0; - - } else { - exponent -= 127 - 15; - mantissa >>= 13; - } - - hfptr[i] = (unsigned short)((sign << 15) | (exponent << 10) | mantissa); - } -} - -inline Vector3 & Vector3::operator =( const Vector3 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; - return *this; -} - -inline Vector3 & Vector3::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Vector3::getX( ) const -{ - return mX; -} - -inline Vector3 & Vector3::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Vector3::getY( ) const -{ - return mY; -} - -inline Vector3 & Vector3::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Vector3::getZ( ) const -{ - return mZ; -} - -inline Vector3 & Vector3::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Vector3::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Vector3::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Vector3::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Vector3 Vector3::operator +( const Vector3 & vec ) const -{ - return Vector3( - ( mX + vec.mX ), - ( mY + vec.mY ), - ( mZ + vec.mZ ) - ); -} - -inline const Vector3 Vector3::operator -( const Vector3 & vec ) const -{ - return Vector3( - ( mX - vec.mX ), - ( mY - vec.mY ), - ( mZ - vec.mZ ) - ); -} - -inline const Point3 Vector3::operator +( const Point3 & pnt ) const -{ - return Point3( - ( mX + pnt.getX() ), - ( mY + pnt.getY() ), - ( mZ + pnt.getZ() ) - ); -} - -inline const Vector3 Vector3::operator *( float scalar ) const -{ - return Vector3( - ( mX * scalar ), - ( mY * scalar ), - ( mZ * scalar ) - ); -} - -inline Vector3 & Vector3::operator +=( const Vector3 & vec ) -{ - *this = *this + vec; - return *this; -} - -inline Vector3 & Vector3::operator -=( const Vector3 & vec ) -{ - *this = *this - vec; - return *this; -} - -inline Vector3 & Vector3::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Vector3 Vector3::operator /( float scalar ) const -{ - return Vector3( - ( mX / scalar ), - ( mY / scalar ), - ( mZ / scalar ) - ); -} - -inline Vector3 & Vector3::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -inline const Vector3 Vector3::operator -( ) const -{ - return Vector3( - -mX, - -mY, - -mZ - ); -} - -inline const Vector3 operator *( float scalar, const Vector3 & vec ) -{ - return vec * scalar; -} - -inline const Vector3 mulPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( vec0.getX() * vec1.getX() ), - ( vec0.getY() * vec1.getY() ), - ( vec0.getZ() * vec1.getZ() ) - ); -} - -inline const Vector3 divPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( vec0.getX() / vec1.getX() ), - ( vec0.getY() / vec1.getY() ), - ( vec0.getZ() / vec1.getZ() ) - ); -} - -inline const Vector3 recipPerElem( const Vector3 & vec ) -{ - return Vector3( - ( 1.0f / vec.getX() ), - ( 1.0f / vec.getY() ), - ( 1.0f / vec.getZ() ) - ); -} - -inline const Vector3 sqrtPerElem( const Vector3 & vec ) -{ - return Vector3( - sqrtf( vec.getX() ), - sqrtf( vec.getY() ), - sqrtf( vec.getZ() ) - ); -} - -inline const Vector3 rsqrtPerElem( const Vector3 & vec ) -{ - return Vector3( - ( 1.0f / sqrtf( vec.getX() ) ), - ( 1.0f / sqrtf( vec.getY() ) ), - ( 1.0f / sqrtf( vec.getZ() ) ) - ); -} - -inline const Vector3 absPerElem( const Vector3 & vec ) -{ - return Vector3( - fabsf( vec.getX() ), - fabsf( vec.getY() ), - fabsf( vec.getZ() ) - ); -} - -inline const Vector3 copySignPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( vec1.getX() < 0.0f )? -fabsf( vec0.getX() ) : fabsf( vec0.getX() ), - ( vec1.getY() < 0.0f )? -fabsf( vec0.getY() ) : fabsf( vec0.getY() ), - ( vec1.getZ() < 0.0f )? -fabsf( vec0.getZ() ) : fabsf( vec0.getZ() ) - ); -} - -inline const Vector3 maxPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - (vec0.getX() > vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() > vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() > vec1.getZ())? vec0.getZ() : vec1.getZ() - ); -} - -inline float maxElem( const Vector3 & vec ) -{ - float result; - result = (vec.getX() > vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() > result)? vec.getZ() : result; - return result; -} - -inline const Vector3 minPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - (vec0.getX() < vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() < vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() < vec1.getZ())? vec0.getZ() : vec1.getZ() - ); -} - -inline float minElem( const Vector3 & vec ) -{ - float result; - result = (vec.getX() < vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() < result)? vec.getZ() : result; - return result; -} - -inline float sum( const Vector3 & vec ) -{ - float result; - result = ( vec.getX() + vec.getY() ); - result = ( result + vec.getZ() ); - return result; -} - -inline float dot( const Vector3 & vec0, const Vector3 & vec1 ) -{ - float result; - result = ( vec0.getX() * vec1.getX() ); - result = ( result + ( vec0.getY() * vec1.getY() ) ); - result = ( result + ( vec0.getZ() * vec1.getZ() ) ); - return result; -} - -inline float lengthSqr( const Vector3 & vec ) -{ - float result; - result = ( vec.getX() * vec.getX() ); - result = ( result + ( vec.getY() * vec.getY() ) ); - result = ( result + ( vec.getZ() * vec.getZ() ) ); - return result; -} - -inline float length( const Vector3 & vec ) -{ - return ::sqrtf( lengthSqr( vec ) ); -} - -inline const Vector3 normalize( const Vector3 & vec ) -{ - float lenSqr, lenInv; - lenSqr = lengthSqr( vec ); - lenInv = ( 1.0f / sqrtf( lenSqr ) ); - return Vector3( - ( vec.getX() * lenInv ), - ( vec.getY() * lenInv ), - ( vec.getZ() * lenInv ) - ); -} - -inline const Vector3 cross( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( ( vec0.getY() * vec1.getZ() ) - ( vec0.getZ() * vec1.getY() ) ), - ( ( vec0.getZ() * vec1.getX() ) - ( vec0.getX() * vec1.getZ() ) ), - ( ( vec0.getX() * vec1.getY() ) - ( vec0.getY() * vec1.getX() ) ) - ); -} - -inline const Vector3 select( const Vector3 & vec0, const Vector3 & vec1, bool select1 ) -{ - return Vector3( - ( select1 )? vec1.getX() : vec0.getX(), - ( select1 )? vec1.getY() : vec0.getY(), - ( select1 )? vec1.getZ() : vec0.getZ() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Vector3 & vec ) -{ - printf( "( %f %f %f )\n", vec.getX(), vec.getY(), vec.getZ() ); -} - -inline void print( const Vector3 & vec, const char * name ) -{ - printf( "%s: ( %f %f %f )\n", name, vec.getX(), vec.getY(), vec.getZ() ); -} - -#endif - -inline Vector4::Vector4( const Vector4 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; - mW = vec.mW; -} - -inline Vector4::Vector4( float _x, float _y, float _z, float _w ) -{ - mX = _x; - mY = _y; - mZ = _z; - mW = _w; -} - -inline Vector4::Vector4( const Vector3 & xyz, float _w ) -{ - this->setXYZ( xyz ); - this->setW( _w ); -} - -inline Vector4::Vector4( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); - mW = 0.0f; -} - -inline Vector4::Vector4( const Point3 & pnt ) -{ - mX = pnt.getX(); - mY = pnt.getY(); - mZ = pnt.getZ(); - mW = 1.0f; -} - -inline Vector4::Vector4( const Quat & quat ) -{ - mX = quat.getX(); - mY = quat.getY(); - mZ = quat.getZ(); - mW = quat.getW(); -} - -inline Vector4::Vector4( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; - mW = scalar; -} - -inline const Vector4 Vector4::xAxis( ) -{ - return Vector4( 1.0f, 0.0f, 0.0f, 0.0f ); -} - -inline const Vector4 Vector4::yAxis( ) -{ - return Vector4( 0.0f, 1.0f, 0.0f, 0.0f ); -} - -inline const Vector4 Vector4::zAxis( ) -{ - return Vector4( 0.0f, 0.0f, 1.0f, 0.0f ); -} - -inline const Vector4 Vector4::wAxis( ) -{ - return Vector4( 0.0f, 0.0f, 0.0f, 1.0f ); -} - -inline const Vector4 lerp( float t, const Vector4 & vec0, const Vector4 & vec1 ) -{ - return ( vec0 + ( ( vec1 - vec0 ) * t ) ); -} - -inline const Vector4 slerp( float t, const Vector4 & unitVec0, const Vector4 & unitVec1 ) -{ - float recipSinAngle, scale0, scale1, cosAngle, angle; - cosAngle = dot( unitVec0, unitVec1 ); - if ( cosAngle < _VECTORMATH_SLERP_TOL ) { - angle = acosf( cosAngle ); - recipSinAngle = ( 1.0f / sinf( angle ) ); - scale0 = ( sinf( ( ( 1.0f - t ) * angle ) ) * recipSinAngle ); - scale1 = ( sinf( ( t * angle ) ) * recipSinAngle ); - } else { - scale0 = ( 1.0f - t ); - scale1 = t; - } - return ( ( unitVec0 * scale0 ) + ( unitVec1 * scale1 ) ); -} - -inline void loadXYZW( Vector4 & vec, const float * fptr ) -{ - vec = Vector4( fptr[0], fptr[1], fptr[2], fptr[3] ); -} - -inline void storeXYZW( const Vector4 & vec, float * fptr ) -{ - fptr[0] = vec.getX(); - fptr[1] = vec.getY(); - fptr[2] = vec.getZ(); - fptr[3] = vec.getW(); -} - -inline void loadHalfFloats( Vector4 & vec, const unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 4; i++) { - unsigned short fp16 = hfptr[i]; - unsigned int sign = fp16 >> 15; - unsigned int exponent = (fp16 >> 10) & ((1 << 5) - 1); - unsigned int mantissa = fp16 & ((1 << 10) - 1); - - if (exponent == 0) { - // zero - mantissa = 0; - - } else if (exponent == 31) { - // infinity or nan -> infinity - exponent = 255; - mantissa = 0; - - } else { - exponent += 127 - 15; - mantissa <<= 13; - } - - Data32 d; - d.u32 = (sign << 31) | (exponent << 23) | mantissa; - vec[i] = d.f32; - } -} - -inline void storeHalfFloats( const Vector4 & vec, unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 4; i++) { - Data32 d; - d.f32 = vec[i]; - - unsigned int sign = d.u32 >> 31; - unsigned int exponent = (d.u32 >> 23) & ((1 << 8) - 1); - unsigned int mantissa = d.u32 & ((1 << 23) - 1);; - - if (exponent == 0) { - // zero or denorm -> zero - mantissa = 0; - - } else if (exponent == 255 && mantissa != 0) { - // nan -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent >= 127 - 15 + 31) { - // overflow or infinity -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent <= 127 - 15) { - // underflow -> zero - exponent = 0; - mantissa = 0; - - } else { - exponent -= 127 - 15; - mantissa >>= 13; - } - - hfptr[i] = (unsigned short)((sign << 15) | (exponent << 10) | mantissa); - } -} - -inline Vector4 & Vector4::operator =( const Vector4 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; - mW = vec.mW; - return *this; -} - -inline Vector4 & Vector4::setXYZ( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); - return *this; -} - -inline const Vector3 Vector4::getXYZ( ) const -{ - return Vector3( mX, mY, mZ ); -} - -inline Vector4 & Vector4::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Vector4::getX( ) const -{ - return mX; -} - -inline Vector4 & Vector4::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Vector4::getY( ) const -{ - return mY; -} - -inline Vector4 & Vector4::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Vector4::getZ( ) const -{ - return mZ; -} - -inline Vector4 & Vector4::setW( float _w ) -{ - mW = _w; - return *this; -} - -inline float Vector4::getW( ) const -{ - return mW; -} - -inline Vector4 & Vector4::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Vector4::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Vector4::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Vector4::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Vector4 Vector4::operator +( const Vector4 & vec ) const -{ - return Vector4( - ( mX + vec.mX ), - ( mY + vec.mY ), - ( mZ + vec.mZ ), - ( mW + vec.mW ) - ); -} - -inline const Vector4 Vector4::operator -( const Vector4 & vec ) const -{ - return Vector4( - ( mX - vec.mX ), - ( mY - vec.mY ), - ( mZ - vec.mZ ), - ( mW - vec.mW ) - ); -} - -inline const Vector4 Vector4::operator *( float scalar ) const -{ - return Vector4( - ( mX * scalar ), - ( mY * scalar ), - ( mZ * scalar ), - ( mW * scalar ) - ); -} - -inline Vector4 & Vector4::operator +=( const Vector4 & vec ) -{ - *this = *this + vec; - return *this; -} - -inline Vector4 & Vector4::operator -=( const Vector4 & vec ) -{ - *this = *this - vec; - return *this; -} - -inline Vector4 & Vector4::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Vector4 Vector4::operator /( float scalar ) const -{ - return Vector4( - ( mX / scalar ), - ( mY / scalar ), - ( mZ / scalar ), - ( mW / scalar ) - ); -} - -inline Vector4 & Vector4::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -inline const Vector4 Vector4::operator -( ) const -{ - return Vector4( - -mX, - -mY, - -mZ, - -mW - ); -} - -inline const Vector4 operator *( float scalar, const Vector4 & vec ) -{ - return vec * scalar; -} - -inline const Vector4 mulPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - ( vec0.getX() * vec1.getX() ), - ( vec0.getY() * vec1.getY() ), - ( vec0.getZ() * vec1.getZ() ), - ( vec0.getW() * vec1.getW() ) - ); -} - -inline const Vector4 divPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - ( vec0.getX() / vec1.getX() ), - ( vec0.getY() / vec1.getY() ), - ( vec0.getZ() / vec1.getZ() ), - ( vec0.getW() / vec1.getW() ) - ); -} - -inline const Vector4 recipPerElem( const Vector4 & vec ) -{ - return Vector4( - ( 1.0f / vec.getX() ), - ( 1.0f / vec.getY() ), - ( 1.0f / vec.getZ() ), - ( 1.0f / vec.getW() ) - ); -} - -inline const Vector4 sqrtPerElem( const Vector4 & vec ) -{ - return Vector4( - sqrtf( vec.getX() ), - sqrtf( vec.getY() ), - sqrtf( vec.getZ() ), - sqrtf( vec.getW() ) - ); -} - -inline const Vector4 rsqrtPerElem( const Vector4 & vec ) -{ - return Vector4( - ( 1.0f / sqrtf( vec.getX() ) ), - ( 1.0f / sqrtf( vec.getY() ) ), - ( 1.0f / sqrtf( vec.getZ() ) ), - ( 1.0f / sqrtf( vec.getW() ) ) - ); -} - -inline const Vector4 absPerElem( const Vector4 & vec ) -{ - return Vector4( - fabsf( vec.getX() ), - fabsf( vec.getY() ), - fabsf( vec.getZ() ), - fabsf( vec.getW() ) - ); -} - -inline const Vector4 copySignPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - ( vec1.getX() < 0.0f )? -fabsf( vec0.getX() ) : fabsf( vec0.getX() ), - ( vec1.getY() < 0.0f )? -fabsf( vec0.getY() ) : fabsf( vec0.getY() ), - ( vec1.getZ() < 0.0f )? -fabsf( vec0.getZ() ) : fabsf( vec0.getZ() ), - ( vec1.getW() < 0.0f )? -fabsf( vec0.getW() ) : fabsf( vec0.getW() ) - ); -} - -inline const Vector4 maxPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - (vec0.getX() > vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() > vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() > vec1.getZ())? vec0.getZ() : vec1.getZ(), - (vec0.getW() > vec1.getW())? vec0.getW() : vec1.getW() - ); -} - -inline float maxElem( const Vector4 & vec ) -{ - float result; - result = (vec.getX() > vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() > result)? vec.getZ() : result; - result = (vec.getW() > result)? vec.getW() : result; - return result; -} - -inline const Vector4 minPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - (vec0.getX() < vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() < vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() < vec1.getZ())? vec0.getZ() : vec1.getZ(), - (vec0.getW() < vec1.getW())? vec0.getW() : vec1.getW() - ); -} - -inline float minElem( const Vector4 & vec ) -{ - float result; - result = (vec.getX() < vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() < result)? vec.getZ() : result; - result = (vec.getW() < result)? vec.getW() : result; - return result; -} - -inline float sum( const Vector4 & vec ) -{ - float result; - result = ( vec.getX() + vec.getY() ); - result = ( result + vec.getZ() ); - result = ( result + vec.getW() ); - return result; -} - -inline float dot( const Vector4 & vec0, const Vector4 & vec1 ) -{ - float result; - result = ( vec0.getX() * vec1.getX() ); - result = ( result + ( vec0.getY() * vec1.getY() ) ); - result = ( result + ( vec0.getZ() * vec1.getZ() ) ); - result = ( result + ( vec0.getW() * vec1.getW() ) ); - return result; -} - -inline float lengthSqr( const Vector4 & vec ) -{ - float result; - result = ( vec.getX() * vec.getX() ); - result = ( result + ( vec.getY() * vec.getY() ) ); - result = ( result + ( vec.getZ() * vec.getZ() ) ); - result = ( result + ( vec.getW() * vec.getW() ) ); - return result; -} - -inline float length( const Vector4 & vec ) -{ - return ::sqrtf( lengthSqr( vec ) ); -} - -inline const Vector4 normalize( const Vector4 & vec ) -{ - float lenSqr, lenInv; - lenSqr = lengthSqr( vec ); - lenInv = ( 1.0f / sqrtf( lenSqr ) ); - return Vector4( - ( vec.getX() * lenInv ), - ( vec.getY() * lenInv ), - ( vec.getZ() * lenInv ), - ( vec.getW() * lenInv ) - ); -} - -inline const Vector4 select( const Vector4 & vec0, const Vector4 & vec1, bool select1 ) -{ - return Vector4( - ( select1 )? vec1.getX() : vec0.getX(), - ( select1 )? vec1.getY() : vec0.getY(), - ( select1 )? vec1.getZ() : vec0.getZ(), - ( select1 )? vec1.getW() : vec0.getW() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Vector4 & vec ) -{ - printf( "( %f %f %f %f )\n", vec.getX(), vec.getY(), vec.getZ(), vec.getW() ); -} - -inline void print( const Vector4 & vec, const char * name ) -{ - printf( "%s: ( %f %f %f %f )\n", name, vec.getX(), vec.getY(), vec.getZ(), vec.getW() ); -} - -#endif - -inline Point3::Point3( const Point3 & pnt ) -{ - mX = pnt.mX; - mY = pnt.mY; - mZ = pnt.mZ; -} - -inline Point3::Point3( float _x, float _y, float _z ) -{ - mX = _x; - mY = _y; - mZ = _z; -} - -inline Point3::Point3( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); -} - -inline Point3::Point3( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; -} - -inline const Point3 lerp( float t, const Point3 & pnt0, const Point3 & pnt1 ) -{ - return ( pnt0 + ( ( pnt1 - pnt0 ) * t ) ); -} - -inline void loadXYZ( Point3 & pnt, const float * fptr ) -{ - pnt = Point3( fptr[0], fptr[1], fptr[2] ); -} - -inline void storeXYZ( const Point3 & pnt, float * fptr ) -{ - fptr[0] = pnt.getX(); - fptr[1] = pnt.getY(); - fptr[2] = pnt.getZ(); -} - -inline void loadHalfFloats( Point3 & vec, const unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - unsigned short fp16 = hfptr[i]; - unsigned int sign = fp16 >> 15; - unsigned int exponent = (fp16 >> 10) & ((1 << 5) - 1); - unsigned int mantissa = fp16 & ((1 << 10) - 1); - - if (exponent == 0) { - // zero - mantissa = 0; - - } else if (exponent == 31) { - // infinity or nan -> infinity - exponent = 255; - mantissa = 0; - - } else { - exponent += 127 - 15; - mantissa <<= 13; - } - - Data32 d; - d.u32 = (sign << 31) | (exponent << 23) | mantissa; - vec[i] = d.f32; - } -} - -inline void storeHalfFloats( const Point3 & vec, unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - Data32 d; - d.f32 = vec[i]; - - unsigned int sign = d.u32 >> 31; - unsigned int exponent = (d.u32 >> 23) & ((1 << 8) - 1); - unsigned int mantissa = d.u32 & ((1 << 23) - 1);; - - if (exponent == 0) { - // zero or denorm -> zero - mantissa = 0; - - } else if (exponent == 255 && mantissa != 0) { - // nan -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent >= 127 - 15 + 31) { - // overflow or infinity -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent <= 127 - 15) { - // underflow -> zero - exponent = 0; - mantissa = 0; - - } else { - exponent -= 127 - 15; - mantissa >>= 13; - } - - hfptr[i] = (unsigned short)((sign << 15) | (exponent << 10) | mantissa); - } -} - -inline Point3 & Point3::operator =( const Point3 & pnt ) -{ - mX = pnt.mX; - mY = pnt.mY; - mZ = pnt.mZ; - return *this; -} - -inline Point3 & Point3::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Point3::getX( ) const -{ - return mX; -} - -inline Point3 & Point3::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Point3::getY( ) const -{ - return mY; -} - -inline Point3 & Point3::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Point3::getZ( ) const -{ - return mZ; -} - -inline Point3 & Point3::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Point3::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Point3::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Point3::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Vector3 Point3::operator -( const Point3 & pnt ) const -{ - return Vector3( - ( mX - pnt.mX ), - ( mY - pnt.mY ), - ( mZ - pnt.mZ ) - ); -} - -inline const Point3 Point3::operator +( const Vector3 & vec ) const -{ - return Point3( - ( mX + vec.getX() ), - ( mY + vec.getY() ), - ( mZ + vec.getZ() ) - ); -} - -inline const Point3 Point3::operator -( const Vector3 & vec ) const -{ - return Point3( - ( mX - vec.getX() ), - ( mY - vec.getY() ), - ( mZ - vec.getZ() ) - ); -} - -inline Point3 & Point3::operator +=( const Vector3 & vec ) -{ - *this = *this + vec; - return *this; -} - -inline Point3 & Point3::operator -=( const Vector3 & vec ) -{ - *this = *this - vec; - return *this; -} - -inline const Point3 mulPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - ( pnt0.getX() * pnt1.getX() ), - ( pnt0.getY() * pnt1.getY() ), - ( pnt0.getZ() * pnt1.getZ() ) - ); -} - -inline const Point3 divPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - ( pnt0.getX() / pnt1.getX() ), - ( pnt0.getY() / pnt1.getY() ), - ( pnt0.getZ() / pnt1.getZ() ) - ); -} - -inline const Point3 recipPerElem( const Point3 & pnt ) -{ - return Point3( - ( 1.0f / pnt.getX() ), - ( 1.0f / pnt.getY() ), - ( 1.0f / pnt.getZ() ) - ); -} - -inline const Point3 sqrtPerElem( const Point3 & pnt ) -{ - return Point3( - sqrtf( pnt.getX() ), - sqrtf( pnt.getY() ), - sqrtf( pnt.getZ() ) - ); -} - -inline const Point3 rsqrtPerElem( const Point3 & pnt ) -{ - return Point3( - ( 1.0f / sqrtf( pnt.getX() ) ), - ( 1.0f / sqrtf( pnt.getY() ) ), - ( 1.0f / sqrtf( pnt.getZ() ) ) - ); -} - -inline const Point3 absPerElem( const Point3 & pnt ) -{ - return Point3( - fabsf( pnt.getX() ), - fabsf( pnt.getY() ), - fabsf( pnt.getZ() ) - ); -} - -inline const Point3 copySignPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - ( pnt1.getX() < 0.0f )? -fabsf( pnt0.getX() ) : fabsf( pnt0.getX() ), - ( pnt1.getY() < 0.0f )? -fabsf( pnt0.getY() ) : fabsf( pnt0.getY() ), - ( pnt1.getZ() < 0.0f )? -fabsf( pnt0.getZ() ) : fabsf( pnt0.getZ() ) - ); -} - -inline const Point3 maxPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - (pnt0.getX() > pnt1.getX())? pnt0.getX() : pnt1.getX(), - (pnt0.getY() > pnt1.getY())? pnt0.getY() : pnt1.getY(), - (pnt0.getZ() > pnt1.getZ())? pnt0.getZ() : pnt1.getZ() - ); -} - -inline float maxElem( const Point3 & pnt ) -{ - float result; - result = (pnt.getX() > pnt.getY())? pnt.getX() : pnt.getY(); - result = (pnt.getZ() > result)? pnt.getZ() : result; - return result; -} - -inline const Point3 minPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - (pnt0.getX() < pnt1.getX())? pnt0.getX() : pnt1.getX(), - (pnt0.getY() < pnt1.getY())? pnt0.getY() : pnt1.getY(), - (pnt0.getZ() < pnt1.getZ())? pnt0.getZ() : pnt1.getZ() - ); -} - -inline float minElem( const Point3 & pnt ) -{ - float result; - result = (pnt.getX() < pnt.getY())? pnt.getX() : pnt.getY(); - result = (pnt.getZ() < result)? pnt.getZ() : result; - return result; -} - -inline float sum( const Point3 & pnt ) -{ - float result; - result = ( pnt.getX() + pnt.getY() ); - result = ( result + pnt.getZ() ); - return result; -} - -inline const Point3 scale( const Point3 & pnt, float scaleVal ) -{ - return mulPerElem( pnt, Point3( scaleVal ) ); -} - -inline const Point3 scale( const Point3 & pnt, const Vector3 & scaleVec ) -{ - return mulPerElem( pnt, Point3( scaleVec ) ); -} - -inline float projection( const Point3 & pnt, const Vector3 & unitVec ) -{ - float result; - result = ( pnt.getX() * unitVec.getX() ); - result = ( result + ( pnt.getY() * unitVec.getY() ) ); - result = ( result + ( pnt.getZ() * unitVec.getZ() ) ); - return result; -} - -inline float distSqrFromOrigin( const Point3 & pnt ) -{ - return lengthSqr( Vector3( pnt ) ); -} - -inline float distFromOrigin( const Point3 & pnt ) -{ - return length( Vector3( pnt ) ); -} - -inline float distSqr( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return lengthSqr( ( pnt1 - pnt0 ) ); -} - -inline float dist( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return length( ( pnt1 - pnt0 ) ); -} - -inline const Point3 select( const Point3 & pnt0, const Point3 & pnt1, bool select1 ) -{ - return Point3( - ( select1 )? pnt1.getX() : pnt0.getX(), - ( select1 )? pnt1.getY() : pnt0.getY(), - ( select1 )? pnt1.getZ() : pnt0.getZ() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Point3 & pnt ) -{ - printf( "( %f %f %f )\n", pnt.getX(), pnt.getY(), pnt.getZ() ); -} - -inline void print( const Point3 & pnt, const char * name ) -{ - printf( "%s: ( %f %f %f )\n", name, pnt.getX(), pnt.getY(), pnt.getZ() ); -} - -#endif - -} // namespace Aos -} // namespace Vectormath - -#endif - diff --git a/Engine/lib/bullet/src/vectormath/neon/vectormath_aos.h b/Engine/lib/bullet/src/vectormath/neon/vectormath_aos.h deleted file mode 100644 index 97bdc278a..000000000 --- a/Engine/lib/bullet/src/vectormath/neon/vectormath_aos.h +++ /dev/null @@ -1,1890 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -This source version has been altered. - -*/ - -#ifndef _VECTORMATH_AOS_CPP_H -#define _VECTORMATH_AOS_CPP_H - -#include - -#ifdef _VECTORMATH_DEBUG -#include -#endif - -namespace Vectormath { - -namespace Aos { - -//----------------------------------------------------------------------------- -// Forward Declarations -// - -class Vector3; -class Vector4; -class Point3; -class Quat; -class Matrix3; -class Matrix4; -class Transform3; - -// A 3-D vector in array-of-structures format -// -class Vector3 -{ - float mX; - float mY; - float mZ; -#ifndef __GNUC__ - float d; -#endif - -public: - // Default constructor; does no initialization - // - inline Vector3( ) { }; - - // Copy a 3-D vector - // - inline Vector3( const Vector3 & vec ); - - // Construct a 3-D vector from x, y, and z elements - // - inline Vector3( float x, float y, float z ); - - // Copy elements from a 3-D point into a 3-D vector - // - explicit inline Vector3( const Point3 & pnt ); - - // Set all elements of a 3-D vector to the same scalar value - // - explicit inline Vector3( float scalar ); - - // Assign one 3-D vector to another - // - inline Vector3 & operator =( const Vector3 & vec ); - - // Set the x element of a 3-D vector - // - inline Vector3 & setX( float x ); - - // Set the y element of a 3-D vector - // - inline Vector3 & setY( float y ); - - // Set the z element of a 3-D vector - // - inline Vector3 & setZ( float z ); - - // Get the x element of a 3-D vector - // - inline float getX( ) const; - - // Get the y element of a 3-D vector - // - inline float getY( ) const; - - // Get the z element of a 3-D vector - // - inline float getZ( ) const; - - // Set an x, y, or z element of a 3-D vector by index - // - inline Vector3 & setElem( int idx, float value ); - - // Get an x, y, or z element of a 3-D vector by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Add two 3-D vectors - // - inline const Vector3 operator +( const Vector3 & vec ) const; - - // Subtract a 3-D vector from another 3-D vector - // - inline const Vector3 operator -( const Vector3 & vec ) const; - - // Add a 3-D vector to a 3-D point - // - inline const Point3 operator +( const Point3 & pnt ) const; - - // Multiply a 3-D vector by a scalar - // - inline const Vector3 operator *( float scalar ) const; - - // Divide a 3-D vector by a scalar - // - inline const Vector3 operator /( float scalar ) const; - - // Perform compound assignment and addition with a 3-D vector - // - inline Vector3 & operator +=( const Vector3 & vec ); - - // Perform compound assignment and subtraction by a 3-D vector - // - inline Vector3 & operator -=( const Vector3 & vec ); - - // Perform compound assignment and multiplication by a scalar - // - inline Vector3 & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - inline Vector3 & operator /=( float scalar ); - - // Negate all elements of a 3-D vector - // - inline const Vector3 operator -( ) const; - - // Construct x axis - // - static inline const Vector3 xAxis( ); - - // Construct y axis - // - static inline const Vector3 yAxis( ); - - // Construct z axis - // - static inline const Vector3 zAxis( ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply a 3-D vector by a scalar -// -inline const Vector3 operator *( float scalar, const Vector3 & vec ); - -// Multiply two 3-D vectors per element -// -inline const Vector3 mulPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Divide two 3-D vectors per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -inline const Vector3 divPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Compute the reciprocal of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -inline const Vector3 recipPerElem( const Vector3 & vec ); - -// Compute the square root of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function sqrtf4. -// -inline const Vector3 sqrtPerElem( const Vector3 & vec ); - -// Compute the reciprocal square root of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function rsqrtf4. -// -inline const Vector3 rsqrtPerElem( const Vector3 & vec ); - -// Compute the absolute value of a 3-D vector per element -// -inline const Vector3 absPerElem( const Vector3 & vec ); - -// Copy sign from one 3-D vector to another, per element -// -inline const Vector3 copySignPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Maximum of two 3-D vectors per element -// -inline const Vector3 maxPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Minimum of two 3-D vectors per element -// -inline const Vector3 minPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Maximum element of a 3-D vector -// -inline float maxElem( const Vector3 & vec ); - -// Minimum element of a 3-D vector -// -inline float minElem( const Vector3 & vec ); - -// Compute the sum of all elements of a 3-D vector -// -inline float sum( const Vector3 & vec ); - -// Compute the dot product of two 3-D vectors -// -inline float dot( const Vector3 & vec0, const Vector3 & vec1 ); - -// Compute the square of the length of a 3-D vector -// -inline float lengthSqr( const Vector3 & vec ); - -// Compute the length of a 3-D vector -// -inline float length( const Vector3 & vec ); - -// Normalize a 3-D vector -// NOTE: -// The result is unpredictable when all elements of vec are at or near zero. -// -inline const Vector3 normalize( const Vector3 & vec ); - -// Compute cross product of two 3-D vectors -// -inline const Vector3 cross( const Vector3 & vec0, const Vector3 & vec1 ); - -// Outer product of two 3-D vectors -// -inline const Matrix3 outer( const Vector3 & vec0, const Vector3 & vec1 ); - -// Pre-multiply a row vector by a 3x3 matrix -// -inline const Vector3 rowMul( const Vector3 & vec, const Matrix3 & mat ); - -// Cross-product matrix of a 3-D vector -// -inline const Matrix3 crossMatrix( const Vector3 & vec ); - -// Create cross-product matrix and multiply -// NOTE: -// Faster than separately creating a cross-product matrix and multiplying. -// -inline const Matrix3 crossMatrixMul( const Vector3 & vec, const Matrix3 & mat ); - -// Linear interpolation between two 3-D vectors -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Vector3 lerp( float t, const Vector3 & vec0, const Vector3 & vec1 ); - -// Spherical linear interpolation between two 3-D vectors -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -inline const Vector3 slerp( float t, const Vector3 & unitVec0, const Vector3 & unitVec1 ); - -// Conditionally select between two 3-D vectors -// -inline const Vector3 select( const Vector3 & vec0, const Vector3 & vec1, bool select1 ); - -// Load x, y, and z elements from the first three words of a float array. -// -// -inline void loadXYZ( Vector3 & vec, const float * fptr ); - -// Store x, y, and z elements of a 3-D vector in the first three words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZ( const Vector3 & vec, float * fptr ); - -// Load three-half-floats as a 3-D vector -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. -// -inline void loadHalfFloats( Vector3 & vec, const unsigned short * hfptr ); - -// Store a 3-D vector as half-floats. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// -inline void storeHalfFloats( const Vector3 & vec, unsigned short * hfptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3-D vector -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector3 & vec ); - -// Print a 3-D vector and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector3 & vec, const char * name ); - -#endif - -// A 4-D vector in array-of-structures format -// -class Vector4 -{ - float mX; - float mY; - float mZ; - float mW; - -public: - // Default constructor; does no initialization - // - inline Vector4( ) { }; - - // Copy a 4-D vector - // - inline Vector4( const Vector4 & vec ); - - // Construct a 4-D vector from x, y, z, and w elements - // - inline Vector4( float x, float y, float z, float w ); - - // Construct a 4-D vector from a 3-D vector and a scalar - // - inline Vector4( const Vector3 & xyz, float w ); - - // Copy x, y, and z from a 3-D vector into a 4-D vector, and set w to 0 - // - explicit inline Vector4( const Vector3 & vec ); - - // Copy x, y, and z from a 3-D point into a 4-D vector, and set w to 1 - // - explicit inline Vector4( const Point3 & pnt ); - - // Copy elements from a quaternion into a 4-D vector - // - explicit inline Vector4( const Quat & quat ); - - // Set all elements of a 4-D vector to the same scalar value - // - explicit inline Vector4( float scalar ); - - // Assign one 4-D vector to another - // - inline Vector4 & operator =( const Vector4 & vec ); - - // Set the x, y, and z elements of a 4-D vector - // NOTE: - // This function does not change the w element. - // - inline Vector4 & setXYZ( const Vector3 & vec ); - - // Get the x, y, and z elements of a 4-D vector - // - inline const Vector3 getXYZ( ) const; - - // Set the x element of a 4-D vector - // - inline Vector4 & setX( float x ); - - // Set the y element of a 4-D vector - // - inline Vector4 & setY( float y ); - - // Set the z element of a 4-D vector - // - inline Vector4 & setZ( float z ); - - // Set the w element of a 4-D vector - // - inline Vector4 & setW( float w ); - - // Get the x element of a 4-D vector - // - inline float getX( ) const; - - // Get the y element of a 4-D vector - // - inline float getY( ) const; - - // Get the z element of a 4-D vector - // - inline float getZ( ) const; - - // Get the w element of a 4-D vector - // - inline float getW( ) const; - - // Set an x, y, z, or w element of a 4-D vector by index - // - inline Vector4 & setElem( int idx, float value ); - - // Get an x, y, z, or w element of a 4-D vector by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Add two 4-D vectors - // - inline const Vector4 operator +( const Vector4 & vec ) const; - - // Subtract a 4-D vector from another 4-D vector - // - inline const Vector4 operator -( const Vector4 & vec ) const; - - // Multiply a 4-D vector by a scalar - // - inline const Vector4 operator *( float scalar ) const; - - // Divide a 4-D vector by a scalar - // - inline const Vector4 operator /( float scalar ) const; - - // Perform compound assignment and addition with a 4-D vector - // - inline Vector4 & operator +=( const Vector4 & vec ); - - // Perform compound assignment and subtraction by a 4-D vector - // - inline Vector4 & operator -=( const Vector4 & vec ); - - // Perform compound assignment and multiplication by a scalar - // - inline Vector4 & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - inline Vector4 & operator /=( float scalar ); - - // Negate all elements of a 4-D vector - // - inline const Vector4 operator -( ) const; - - // Construct x axis - // - static inline const Vector4 xAxis( ); - - // Construct y axis - // - static inline const Vector4 yAxis( ); - - // Construct z axis - // - static inline const Vector4 zAxis( ); - - // Construct w axis - // - static inline const Vector4 wAxis( ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply a 4-D vector by a scalar -// -inline const Vector4 operator *( float scalar, const Vector4 & vec ); - -// Multiply two 4-D vectors per element -// -inline const Vector4 mulPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Divide two 4-D vectors per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -inline const Vector4 divPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Compute the reciprocal of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -inline const Vector4 recipPerElem( const Vector4 & vec ); - -// Compute the square root of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function sqrtf4. -// -inline const Vector4 sqrtPerElem( const Vector4 & vec ); - -// Compute the reciprocal square root of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function rsqrtf4. -// -inline const Vector4 rsqrtPerElem( const Vector4 & vec ); - -// Compute the absolute value of a 4-D vector per element -// -inline const Vector4 absPerElem( const Vector4 & vec ); - -// Copy sign from one 4-D vector to another, per element -// -inline const Vector4 copySignPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Maximum of two 4-D vectors per element -// -inline const Vector4 maxPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Minimum of two 4-D vectors per element -// -inline const Vector4 minPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Maximum element of a 4-D vector -// -inline float maxElem( const Vector4 & vec ); - -// Minimum element of a 4-D vector -// -inline float minElem( const Vector4 & vec ); - -// Compute the sum of all elements of a 4-D vector -// -inline float sum( const Vector4 & vec ); - -// Compute the dot product of two 4-D vectors -// -inline float dot( const Vector4 & vec0, const Vector4 & vec1 ); - -// Compute the square of the length of a 4-D vector -// -inline float lengthSqr( const Vector4 & vec ); - -// Compute the length of a 4-D vector -// -inline float length( const Vector4 & vec ); - -// Normalize a 4-D vector -// NOTE: -// The result is unpredictable when all elements of vec are at or near zero. -// -inline const Vector4 normalize( const Vector4 & vec ); - -// Outer product of two 4-D vectors -// -inline const Matrix4 outer( const Vector4 & vec0, const Vector4 & vec1 ); - -// Linear interpolation between two 4-D vectors -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Vector4 lerp( float t, const Vector4 & vec0, const Vector4 & vec1 ); - -// Spherical linear interpolation between two 4-D vectors -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -inline const Vector4 slerp( float t, const Vector4 & unitVec0, const Vector4 & unitVec1 ); - -// Conditionally select between two 4-D vectors -// -inline const Vector4 select( const Vector4 & vec0, const Vector4 & vec1, bool select1 ); - -// Load x, y, z, and w elements from the first four words of a float array. -// -// -inline void loadXYZW( Vector4 & vec, const float * fptr ); - -// Store x, y, z, and w elements of a 4-D vector in the first four words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZW( const Vector4 & vec, float * fptr ); - -// Load four-half-floats as a 4-D vector -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. -// -inline void loadHalfFloats( Vector4 & vec, const unsigned short * hfptr ); - -// Store a 4-D vector as half-floats. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// -inline void storeHalfFloats( const Vector4 & vec, unsigned short * hfptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 4-D vector -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector4 & vec ); - -// Print a 4-D vector and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector4 & vec, const char * name ); - -#endif - -// A 3-D point in array-of-structures format -// -class Point3 -{ - float mX; - float mY; - float mZ; -#ifndef __GNUC__ - float d; -#endif - -public: - // Default constructor; does no initialization - // - inline Point3( ) { }; - - // Copy a 3-D point - // - inline Point3( const Point3 & pnt ); - - // Construct a 3-D point from x, y, and z elements - // - inline Point3( float x, float y, float z ); - - // Copy elements from a 3-D vector into a 3-D point - // - explicit inline Point3( const Vector3 & vec ); - - // Set all elements of a 3-D point to the same scalar value - // - explicit inline Point3( float scalar ); - - // Assign one 3-D point to another - // - inline Point3 & operator =( const Point3 & pnt ); - - // Set the x element of a 3-D point - // - inline Point3 & setX( float x ); - - // Set the y element of a 3-D point - // - inline Point3 & setY( float y ); - - // Set the z element of a 3-D point - // - inline Point3 & setZ( float z ); - - // Get the x element of a 3-D point - // - inline float getX( ) const; - - // Get the y element of a 3-D point - // - inline float getY( ) const; - - // Get the z element of a 3-D point - // - inline float getZ( ) const; - - // Set an x, y, or z element of a 3-D point by index - // - inline Point3 & setElem( int idx, float value ); - - // Get an x, y, or z element of a 3-D point by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Subtract a 3-D point from another 3-D point - // - inline const Vector3 operator -( const Point3 & pnt ) const; - - // Add a 3-D point to a 3-D vector - // - inline const Point3 operator +( const Vector3 & vec ) const; - - // Subtract a 3-D vector from a 3-D point - // - inline const Point3 operator -( const Vector3 & vec ) const; - - // Perform compound assignment and addition with a 3-D vector - // - inline Point3 & operator +=( const Vector3 & vec ); - - // Perform compound assignment and subtraction by a 3-D vector - // - inline Point3 & operator -=( const Vector3 & vec ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply two 3-D points per element -// -inline const Point3 mulPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Divide two 3-D points per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -inline const Point3 divPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Compute the reciprocal of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -inline const Point3 recipPerElem( const Point3 & pnt ); - -// Compute the square root of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function sqrtf4. -// -inline const Point3 sqrtPerElem( const Point3 & pnt ); - -// Compute the reciprocal square root of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function rsqrtf4. -// -inline const Point3 rsqrtPerElem( const Point3 & pnt ); - -// Compute the absolute value of a 3-D point per element -// -inline const Point3 absPerElem( const Point3 & pnt ); - -// Copy sign from one 3-D point to another, per element -// -inline const Point3 copySignPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Maximum of two 3-D points per element -// -inline const Point3 maxPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Minimum of two 3-D points per element -// -inline const Point3 minPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Maximum element of a 3-D point -// -inline float maxElem( const Point3 & pnt ); - -// Minimum element of a 3-D point -// -inline float minElem( const Point3 & pnt ); - -// Compute the sum of all elements of a 3-D point -// -inline float sum( const Point3 & pnt ); - -// Apply uniform scale to a 3-D point -// -inline const Point3 scale( const Point3 & pnt, float scaleVal ); - -// Apply non-uniform scale to a 3-D point -// -inline const Point3 scale( const Point3 & pnt, const Vector3 & scaleVec ); - -// Scalar projection of a 3-D point on a unit-length 3-D vector -// -inline float projection( const Point3 & pnt, const Vector3 & unitVec ); - -// Compute the square of the distance of a 3-D point from the coordinate-system origin -// -inline float distSqrFromOrigin( const Point3 & pnt ); - -// Compute the distance of a 3-D point from the coordinate-system origin -// -inline float distFromOrigin( const Point3 & pnt ); - -// Compute the square of the distance between two 3-D points -// -inline float distSqr( const Point3 & pnt0, const Point3 & pnt1 ); - -// Compute the distance between two 3-D points -// -inline float dist( const Point3 & pnt0, const Point3 & pnt1 ); - -// Linear interpolation between two 3-D points -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Point3 lerp( float t, const Point3 & pnt0, const Point3 & pnt1 ); - -// Conditionally select between two 3-D points -// -inline const Point3 select( const Point3 & pnt0, const Point3 & pnt1, bool select1 ); - -// Load x, y, and z elements from the first three words of a float array. -// -// -inline void loadXYZ( Point3 & pnt, const float * fptr ); - -// Store x, y, and z elements of a 3-D point in the first three words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZ( const Point3 & pnt, float * fptr ); - -// Load three-half-floats as a 3-D point -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. -// -inline void loadHalfFloats( Point3 & pnt, const unsigned short * hfptr ); - -// Store a 3-D point as half-floats. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// -inline void storeHalfFloats( const Point3 & pnt, unsigned short * hfptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3-D point -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Point3 & pnt ); - -// Print a 3-D point and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Point3 & pnt, const char * name ); - -#endif - -// A quaternion in array-of-structures format -// -class Quat -{ -#if defined( __APPLE__ ) && defined( BT_USE_NEON ) - union{ - float32x4_t vXYZW; - float mXYZW[4]; - }; -#else - float mX; - float mY; - float mZ; - float mW; -#endif - -public: - // Default constructor; does no initialization - // - inline Quat( ) { }; - - // Copy a quaternion - // - inline Quat( const Quat & quat ); - - // Construct a quaternion from x, y, z, and w elements - // - inline Quat( float x, float y, float z, float w ); - - // Construct a quaternion from vector of x, y, z, and w elements - // - inline Quat( float32x4_t fXYZW ); - - // Construct a quaternion from a 3-D vector and a scalar - // - inline Quat( const Vector3 & xyz, float w ); - - // Copy elements from a 4-D vector into a quaternion - // - explicit inline Quat( const Vector4 & vec ); - - // Convert a rotation matrix to a unit-length quaternion - // - explicit inline Quat( const Matrix3 & rotMat ); - - // Set all elements of a quaternion to the same scalar value - // - explicit inline Quat( float scalar ); - - // Assign one quaternion to another - // - inline Quat & operator =( const Quat & quat ); - - // Set the x, y, and z elements of a quaternion - // NOTE: - // This function does not change the w element. - // - inline Quat & setXYZ( const Vector3 & vec ); - - // Get the x, y, and z elements of a quaternion - // - inline const Vector3 getXYZ( ) const; - - // Set the x element of a quaternion - // - inline Quat & setX( float x ); - - // Set the y element of a quaternion - // - inline Quat & setY( float y ); - - // Set the z element of a quaternion - // - inline Quat & setZ( float z ); - - // Set the w element of a quaternion - // - inline Quat & setW( float w ); - -#if defined( __APPLE__ ) && defined( BT_USE_NEON ) - inline float32x4_t getvXYZW( ) const; -#endif - - // Get the x element of a quaternion - // - inline float getX( ) const; - - // Get the y element of a quaternion - // - inline float getY( ) const; - - // Get the z element of a quaternion - // - inline float getZ( ) const; - - // Get the w element of a quaternion - // - inline float getW( ) const; - - // Set an x, y, z, or w element of a quaternion by index - // - inline Quat & setElem( int idx, float value ); - - // Get an x, y, z, or w element of a quaternion by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Add two quaternions - // - inline const Quat operator +( const Quat & quat ) const; - - // Subtract a quaternion from another quaternion - // - inline const Quat operator -( const Quat & quat ) const; - - // Multiply two quaternions - // - inline const Quat operator *( const Quat & quat ) const; - - // Multiply a quaternion by a scalar - // - inline const Quat operator *( float scalar ) const; - - // Divide a quaternion by a scalar - // - inline const Quat operator /( float scalar ) const; - - // Perform compound assignment and addition with a quaternion - // - inline Quat & operator +=( const Quat & quat ); - - // Perform compound assignment and subtraction by a quaternion - // - inline Quat & operator -=( const Quat & quat ); - - // Perform compound assignment and multiplication by a quaternion - // - inline Quat & operator *=( const Quat & quat ); - - // Perform compound assignment and multiplication by a scalar - // - inline Quat & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - inline Quat & operator /=( float scalar ); - - // Negate all elements of a quaternion - // - inline const Quat operator -( ) const; - - // Construct an identity quaternion - // - static inline const Quat identity( ); - - // Construct a quaternion to rotate between two unit-length 3-D vectors - // NOTE: - // The result is unpredictable if unitVec0 and unitVec1 point in opposite directions. - // - static inline const Quat rotation( const Vector3 & unitVec0, const Vector3 & unitVec1 ); - - // Construct a quaternion to rotate around a unit-length 3-D vector - // - static inline const Quat rotation( float radians, const Vector3 & unitVec ); - - // Construct a quaternion to rotate around the x axis - // - static inline const Quat rotationX( float radians ); - - // Construct a quaternion to rotate around the y axis - // - static inline const Quat rotationY( float radians ); - - // Construct a quaternion to rotate around the z axis - // - static inline const Quat rotationZ( float radians ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply a quaternion by a scalar -// -inline const Quat operator *( float scalar, const Quat & quat ); - -// Compute the conjugate of a quaternion -// -inline const Quat conj( const Quat & quat ); - -// Use a unit-length quaternion to rotate a 3-D vector -// -inline const Vector3 rotate( const Quat & unitQuat, const Vector3 & vec ); - -// Compute the dot product of two quaternions -// -inline float dot( const Quat & quat0, const Quat & quat1 ); - -// Compute the norm of a quaternion -// -inline float norm( const Quat & quat ); - -// Compute the length of a quaternion -// -inline float length( const Quat & quat ); - -// Normalize a quaternion -// NOTE: -// The result is unpredictable when all elements of quat are at or near zero. -// -inline const Quat normalize( const Quat & quat ); - -// Linear interpolation between two quaternions -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Quat lerp( float t, const Quat & quat0, const Quat & quat1 ); - -// Spherical linear interpolation between two quaternions -// NOTE: -// Interpolates along the shortest path between orientations. -// Does not clamp t between 0 and 1. -// -inline const Quat slerp( float t, const Quat & unitQuat0, const Quat & unitQuat1 ); - -// Spherical quadrangle interpolation -// -inline const Quat squad( float t, const Quat & unitQuat0, const Quat & unitQuat1, const Quat & unitQuat2, const Quat & unitQuat3 ); - -// Conditionally select between two quaternions -// -inline const Quat select( const Quat & quat0, const Quat & quat1, bool select1 ); - -// Load x, y, z, and w elements from the first four words of a float array. -// -// -inline void loadXYZW( Quat & quat, const float * fptr ); - -// Store x, y, z, and w elements of a quaternion in the first four words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZW( const Quat & quat, float * fptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a quaternion -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Quat & quat ); - -// Print a quaternion and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Quat & quat, const char * name ); - -#endif - -// A 3x3 matrix in array-of-structures format -// -class Matrix3 -{ - Vector3 mCol0; - Vector3 mCol1; - Vector3 mCol2; - -public: - // Default constructor; does no initialization - // - inline Matrix3( ) { }; - - // Copy a 3x3 matrix - // - inline Matrix3( const Matrix3 & mat ); - - // Construct a 3x3 matrix containing the specified columns - // - inline Matrix3( const Vector3 & col0, const Vector3 & col1, const Vector3 & col2 ); - - // Construct a 3x3 rotation matrix from a unit-length quaternion - // - explicit inline Matrix3( const Quat & unitQuat ); - - // Set all elements of a 3x3 matrix to the same scalar value - // - explicit inline Matrix3( float scalar ); - - // Assign one 3x3 matrix to another - // - inline Matrix3 & operator =( const Matrix3 & mat ); - - // Set column 0 of a 3x3 matrix - // - inline Matrix3 & setCol0( const Vector3 & col0 ); - - // Set column 1 of a 3x3 matrix - // - inline Matrix3 & setCol1( const Vector3 & col1 ); - - // Set column 2 of a 3x3 matrix - // - inline Matrix3 & setCol2( const Vector3 & col2 ); - - // Get column 0 of a 3x3 matrix - // - inline const Vector3 getCol0( ) const; - - // Get column 1 of a 3x3 matrix - // - inline const Vector3 getCol1( ) const; - - // Get column 2 of a 3x3 matrix - // - inline const Vector3 getCol2( ) const; - - // Set the column of a 3x3 matrix referred to by the specified index - // - inline Matrix3 & setCol( int col, const Vector3 & vec ); - - // Set the row of a 3x3 matrix referred to by the specified index - // - inline Matrix3 & setRow( int row, const Vector3 & vec ); - - // Get the column of a 3x3 matrix referred to by the specified index - // - inline const Vector3 getCol( int col ) const; - - // Get the row of a 3x3 matrix referred to by the specified index - // - inline const Vector3 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - inline Vector3 & operator []( int col ); - - // Subscripting operator to get a column - // - inline const Vector3 operator []( int col ) const; - - // Set the element of a 3x3 matrix referred to by column and row indices - // - inline Matrix3 & setElem( int col, int row, float val ); - - // Get the element of a 3x3 matrix referred to by column and row indices - // - inline float getElem( int col, int row ) const; - - // Add two 3x3 matrices - // - inline const Matrix3 operator +( const Matrix3 & mat ) const; - - // Subtract a 3x3 matrix from another 3x3 matrix - // - inline const Matrix3 operator -( const Matrix3 & mat ) const; - - // Negate all elements of a 3x3 matrix - // - inline const Matrix3 operator -( ) const; - - // Multiply a 3x3 matrix by a scalar - // - inline const Matrix3 operator *( float scalar ) const; - - // Multiply a 3x3 matrix by a 3-D vector - // - inline const Vector3 operator *( const Vector3 & vec ) const; - - // Multiply two 3x3 matrices - // - inline const Matrix3 operator *( const Matrix3 & mat ) const; - - // Perform compound assignment and addition with a 3x3 matrix - // - inline Matrix3 & operator +=( const Matrix3 & mat ); - - // Perform compound assignment and subtraction by a 3x3 matrix - // - inline Matrix3 & operator -=( const Matrix3 & mat ); - - // Perform compound assignment and multiplication by a scalar - // - inline Matrix3 & operator *=( float scalar ); - - // Perform compound assignment and multiplication by a 3x3 matrix - // - inline Matrix3 & operator *=( const Matrix3 & mat ); - - // Construct an identity 3x3 matrix - // - static inline const Matrix3 identity( ); - - // Construct a 3x3 matrix to rotate around the x axis - // - static inline const Matrix3 rotationX( float radians ); - - // Construct a 3x3 matrix to rotate around the y axis - // - static inline const Matrix3 rotationY( float radians ); - - // Construct a 3x3 matrix to rotate around the z axis - // - static inline const Matrix3 rotationZ( float radians ); - - // Construct a 3x3 matrix to rotate around the x, y, and z axes - // - static inline const Matrix3 rotationZYX( const Vector3 & radiansXYZ ); - - // Construct a 3x3 matrix to rotate around a unit-length 3-D vector - // - static inline const Matrix3 rotation( float radians, const Vector3 & unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static inline const Matrix3 rotation( const Quat & unitQuat ); - - // Construct a 3x3 matrix to perform scaling - // - static inline const Matrix3 scale( const Vector3 & scaleVec ); - -}; -// Multiply a 3x3 matrix by a scalar -// -inline const Matrix3 operator *( float scalar, const Matrix3 & mat ); - -// Append (post-multiply) a scale transformation to a 3x3 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix3 appendScale( const Matrix3 & mat, const Vector3 & scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 3x3 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix3 prependScale( const Vector3 & scaleVec, const Matrix3 & mat ); - -// Multiply two 3x3 matrices per element -// -inline const Matrix3 mulPerElem( const Matrix3 & mat0, const Matrix3 & mat1 ); - -// Compute the absolute value of a 3x3 matrix per element -// -inline const Matrix3 absPerElem( const Matrix3 & mat ); - -// Transpose of a 3x3 matrix -// -inline const Matrix3 transpose( const Matrix3 & mat ); - -// Compute the inverse of a 3x3 matrix -// NOTE: -// Result is unpredictable when the determinant of mat is equal to or near 0. -// -inline const Matrix3 inverse( const Matrix3 & mat ); - -// Determinant of a 3x3 matrix -// -inline float determinant( const Matrix3 & mat ); - -// Conditionally select between two 3x3 matrices -// -inline const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, bool select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3x3 matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix3 & mat ); - -// Print a 3x3 matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix3 & mat, const char * name ); - -#endif - -// A 4x4 matrix in array-of-structures format -// -class Matrix4 -{ - Vector4 mCol0; - Vector4 mCol1; - Vector4 mCol2; - Vector4 mCol3; - -public: - // Default constructor; does no initialization - // - inline Matrix4( ) { }; - - // Copy a 4x4 matrix - // - inline Matrix4( const Matrix4 & mat ); - - // Construct a 4x4 matrix containing the specified columns - // - inline Matrix4( const Vector4 & col0, const Vector4 & col1, const Vector4 & col2, const Vector4 & col3 ); - - // Construct a 4x4 matrix from a 3x4 transformation matrix - // - explicit inline Matrix4( const Transform3 & mat ); - - // Construct a 4x4 matrix from a 3x3 matrix and a 3-D vector - // - inline Matrix4( const Matrix3 & mat, const Vector3 & translateVec ); - - // Construct a 4x4 matrix from a unit-length quaternion and a 3-D vector - // - inline Matrix4( const Quat & unitQuat, const Vector3 & translateVec ); - - // Set all elements of a 4x4 matrix to the same scalar value - // - explicit inline Matrix4( float scalar ); - - // Assign one 4x4 matrix to another - // - inline Matrix4 & operator =( const Matrix4 & mat ); - - // Set the upper-left 3x3 submatrix - // NOTE: - // This function does not change the bottom row elements. - // - inline Matrix4 & setUpper3x3( const Matrix3 & mat3 ); - - // Get the upper-left 3x3 submatrix of a 4x4 matrix - // - inline const Matrix3 getUpper3x3( ) const; - - // Set translation component - // NOTE: - // This function does not change the bottom row elements. - // - inline Matrix4 & setTranslation( const Vector3 & translateVec ); - - // Get the translation component of a 4x4 matrix - // - inline const Vector3 getTranslation( ) const; - - // Set column 0 of a 4x4 matrix - // - inline Matrix4 & setCol0( const Vector4 & col0 ); - - // Set column 1 of a 4x4 matrix - // - inline Matrix4 & setCol1( const Vector4 & col1 ); - - // Set column 2 of a 4x4 matrix - // - inline Matrix4 & setCol2( const Vector4 & col2 ); - - // Set column 3 of a 4x4 matrix - // - inline Matrix4 & setCol3( const Vector4 & col3 ); - - // Get column 0 of a 4x4 matrix - // - inline const Vector4 getCol0( ) const; - - // Get column 1 of a 4x4 matrix - // - inline const Vector4 getCol1( ) const; - - // Get column 2 of a 4x4 matrix - // - inline const Vector4 getCol2( ) const; - - // Get column 3 of a 4x4 matrix - // - inline const Vector4 getCol3( ) const; - - // Set the column of a 4x4 matrix referred to by the specified index - // - inline Matrix4 & setCol( int col, const Vector4 & vec ); - - // Set the row of a 4x4 matrix referred to by the specified index - // - inline Matrix4 & setRow( int row, const Vector4 & vec ); - - // Get the column of a 4x4 matrix referred to by the specified index - // - inline const Vector4 getCol( int col ) const; - - // Get the row of a 4x4 matrix referred to by the specified index - // - inline const Vector4 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - inline Vector4 & operator []( int col ); - - // Subscripting operator to get a column - // - inline const Vector4 operator []( int col ) const; - - // Set the element of a 4x4 matrix referred to by column and row indices - // - inline Matrix4 & setElem( int col, int row, float val ); - - // Get the element of a 4x4 matrix referred to by column and row indices - // - inline float getElem( int col, int row ) const; - - // Add two 4x4 matrices - // - inline const Matrix4 operator +( const Matrix4 & mat ) const; - - // Subtract a 4x4 matrix from another 4x4 matrix - // - inline const Matrix4 operator -( const Matrix4 & mat ) const; - - // Negate all elements of a 4x4 matrix - // - inline const Matrix4 operator -( ) const; - - // Multiply a 4x4 matrix by a scalar - // - inline const Matrix4 operator *( float scalar ) const; - - // Multiply a 4x4 matrix by a 4-D vector - // - inline const Vector4 operator *( const Vector4 & vec ) const; - - // Multiply a 4x4 matrix by a 3-D vector - // - inline const Vector4 operator *( const Vector3 & vec ) const; - - // Multiply a 4x4 matrix by a 3-D point - // - inline const Vector4 operator *( const Point3 & pnt ) const; - - // Multiply two 4x4 matrices - // - inline const Matrix4 operator *( const Matrix4 & mat ) const; - - // Multiply a 4x4 matrix by a 3x4 transformation matrix - // - inline const Matrix4 operator *( const Transform3 & tfrm ) const; - - // Perform compound assignment and addition with a 4x4 matrix - // - inline Matrix4 & operator +=( const Matrix4 & mat ); - - // Perform compound assignment and subtraction by a 4x4 matrix - // - inline Matrix4 & operator -=( const Matrix4 & mat ); - - // Perform compound assignment and multiplication by a scalar - // - inline Matrix4 & operator *=( float scalar ); - - // Perform compound assignment and multiplication by a 4x4 matrix - // - inline Matrix4 & operator *=( const Matrix4 & mat ); - - // Perform compound assignment and multiplication by a 3x4 transformation matrix - // - inline Matrix4 & operator *=( const Transform3 & tfrm ); - - // Construct an identity 4x4 matrix - // - static inline const Matrix4 identity( ); - - // Construct a 4x4 matrix to rotate around the x axis - // - static inline const Matrix4 rotationX( float radians ); - - // Construct a 4x4 matrix to rotate around the y axis - // - static inline const Matrix4 rotationY( float radians ); - - // Construct a 4x4 matrix to rotate around the z axis - // - static inline const Matrix4 rotationZ( float radians ); - - // Construct a 4x4 matrix to rotate around the x, y, and z axes - // - static inline const Matrix4 rotationZYX( const Vector3 & radiansXYZ ); - - // Construct a 4x4 matrix to rotate around a unit-length 3-D vector - // - static inline const Matrix4 rotation( float radians, const Vector3 & unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static inline const Matrix4 rotation( const Quat & unitQuat ); - - // Construct a 4x4 matrix to perform scaling - // - static inline const Matrix4 scale( const Vector3 & scaleVec ); - - // Construct a 4x4 matrix to perform translation - // - static inline const Matrix4 translation( const Vector3 & translateVec ); - - // Construct viewing matrix based on eye position, position looked at, and up direction - // - static inline const Matrix4 lookAt( const Point3 & eyePos, const Point3 & lookAtPos, const Vector3 & upVec ); - - // Construct a perspective projection matrix - // - static inline const Matrix4 perspective( float fovyRadians, float aspect, float zNear, float zFar ); - - // Construct a perspective projection matrix based on frustum - // - static inline const Matrix4 frustum( float left, float right, float bottom, float top, float zNear, float zFar ); - - // Construct an orthographic projection matrix - // - static inline const Matrix4 orthographic( float left, float right, float bottom, float top, float zNear, float zFar ); - -}; -// Multiply a 4x4 matrix by a scalar -// -inline const Matrix4 operator *( float scalar, const Matrix4 & mat ); - -// Append (post-multiply) a scale transformation to a 4x4 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix4 appendScale( const Matrix4 & mat, const Vector3 & scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 4x4 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix4 prependScale( const Vector3 & scaleVec, const Matrix4 & mat ); - -// Multiply two 4x4 matrices per element -// -inline const Matrix4 mulPerElem( const Matrix4 & mat0, const Matrix4 & mat1 ); - -// Compute the absolute value of a 4x4 matrix per element -// -inline const Matrix4 absPerElem( const Matrix4 & mat ); - -// Transpose of a 4x4 matrix -// -inline const Matrix4 transpose( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix -// NOTE: -// Result is unpredictable when the determinant of mat is equal to or near 0. -// -inline const Matrix4 inverse( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix, which is expected to be an affine matrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 4x4 matrix meets the given restrictions. The result is unpredictable when the determinant of mat is equal to or near 0. -// -inline const Matrix4 affineInverse( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix, which is expected to be an affine matrix with an orthogonal upper-left 3x3 submatrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 4x4 matrix meets the given restrictions. -// -inline const Matrix4 orthoInverse( const Matrix4 & mat ); - -// Determinant of a 4x4 matrix -// -inline float determinant( const Matrix4 & mat ); - -// Conditionally select between two 4x4 matrices -// -inline const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, bool select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 4x4 matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix4 & mat ); - -// Print a 4x4 matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix4 & mat, const char * name ); - -#endif - -// A 3x4 transformation matrix in array-of-structures format -// -class Transform3 -{ - Vector3 mCol0; - Vector3 mCol1; - Vector3 mCol2; - Vector3 mCol3; - -public: - // Default constructor; does no initialization - // - inline Transform3( ) { }; - - // Copy a 3x4 transformation matrix - // - inline Transform3( const Transform3 & tfrm ); - - // Construct a 3x4 transformation matrix containing the specified columns - // - inline Transform3( const Vector3 & col0, const Vector3 & col1, const Vector3 & col2, const Vector3 & col3 ); - - // Construct a 3x4 transformation matrix from a 3x3 matrix and a 3-D vector - // - inline Transform3( const Matrix3 & tfrm, const Vector3 & translateVec ); - - // Construct a 3x4 transformation matrix from a unit-length quaternion and a 3-D vector - // - inline Transform3( const Quat & unitQuat, const Vector3 & translateVec ); - - // Set all elements of a 3x4 transformation matrix to the same scalar value - // - explicit inline Transform3( float scalar ); - - // Assign one 3x4 transformation matrix to another - // - inline Transform3 & operator =( const Transform3 & tfrm ); - - // Set the upper-left 3x3 submatrix - // - inline Transform3 & setUpper3x3( const Matrix3 & mat3 ); - - // Get the upper-left 3x3 submatrix of a 3x4 transformation matrix - // - inline const Matrix3 getUpper3x3( ) const; - - // Set translation component - // - inline Transform3 & setTranslation( const Vector3 & translateVec ); - - // Get the translation component of a 3x4 transformation matrix - // - inline const Vector3 getTranslation( ) const; - - // Set column 0 of a 3x4 transformation matrix - // - inline Transform3 & setCol0( const Vector3 & col0 ); - - // Set column 1 of a 3x4 transformation matrix - // - inline Transform3 & setCol1( const Vector3 & col1 ); - - // Set column 2 of a 3x4 transformation matrix - // - inline Transform3 & setCol2( const Vector3 & col2 ); - - // Set column 3 of a 3x4 transformation matrix - // - inline Transform3 & setCol3( const Vector3 & col3 ); - - // Get column 0 of a 3x4 transformation matrix - // - inline const Vector3 getCol0( ) const; - - // Get column 1 of a 3x4 transformation matrix - // - inline const Vector3 getCol1( ) const; - - // Get column 2 of a 3x4 transformation matrix - // - inline const Vector3 getCol2( ) const; - - // Get column 3 of a 3x4 transformation matrix - // - inline const Vector3 getCol3( ) const; - - // Set the column of a 3x4 transformation matrix referred to by the specified index - // - inline Transform3 & setCol( int col, const Vector3 & vec ); - - // Set the row of a 3x4 transformation matrix referred to by the specified index - // - inline Transform3 & setRow( int row, const Vector4 & vec ); - - // Get the column of a 3x4 transformation matrix referred to by the specified index - // - inline const Vector3 getCol( int col ) const; - - // Get the row of a 3x4 transformation matrix referred to by the specified index - // - inline const Vector4 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - inline Vector3 & operator []( int col ); - - // Subscripting operator to get a column - // - inline const Vector3 operator []( int col ) const; - - // Set the element of a 3x4 transformation matrix referred to by column and row indices - // - inline Transform3 & setElem( int col, int row, float val ); - - // Get the element of a 3x4 transformation matrix referred to by column and row indices - // - inline float getElem( int col, int row ) const; - - // Multiply a 3x4 transformation matrix by a 3-D vector - // - inline const Vector3 operator *( const Vector3 & vec ) const; - - // Multiply a 3x4 transformation matrix by a 3-D point - // - inline const Point3 operator *( const Point3 & pnt ) const; - - // Multiply two 3x4 transformation matrices - // - inline const Transform3 operator *( const Transform3 & tfrm ) const; - - // Perform compound assignment and multiplication by a 3x4 transformation matrix - // - inline Transform3 & operator *=( const Transform3 & tfrm ); - - // Construct an identity 3x4 transformation matrix - // - static inline const Transform3 identity( ); - - // Construct a 3x4 transformation matrix to rotate around the x axis - // - static inline const Transform3 rotationX( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the y axis - // - static inline const Transform3 rotationY( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the z axis - // - static inline const Transform3 rotationZ( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the x, y, and z axes - // - static inline const Transform3 rotationZYX( const Vector3 & radiansXYZ ); - - // Construct a 3x4 transformation matrix to rotate around a unit-length 3-D vector - // - static inline const Transform3 rotation( float radians, const Vector3 & unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static inline const Transform3 rotation( const Quat & unitQuat ); - - // Construct a 3x4 transformation matrix to perform scaling - // - static inline const Transform3 scale( const Vector3 & scaleVec ); - - // Construct a 3x4 transformation matrix to perform translation - // - static inline const Transform3 translation( const Vector3 & translateVec ); - -}; -// Append (post-multiply) a scale transformation to a 3x4 transformation matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Transform3 appendScale( const Transform3 & tfrm, const Vector3 & scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 3x4 transformation matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Transform3 prependScale( const Vector3 & scaleVec, const Transform3 & tfrm ); - -// Multiply two 3x4 transformation matrices per element -// -inline const Transform3 mulPerElem( const Transform3 & tfrm0, const Transform3 & tfrm1 ); - -// Compute the absolute value of a 3x4 transformation matrix per element -// -inline const Transform3 absPerElem( const Transform3 & tfrm ); - -// Inverse of a 3x4 transformation matrix -// NOTE: -// Result is unpredictable when the determinant of the left 3x3 submatrix is equal to or near 0. -// -inline const Transform3 inverse( const Transform3 & tfrm ); - -// Compute the inverse of a 3x4 transformation matrix, expected to have an orthogonal upper-left 3x3 submatrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 3x4 transformation matrix meets the given restrictions. -// -inline const Transform3 orthoInverse( const Transform3 & tfrm ); - -// Conditionally select between two 3x4 transformation matrices -// -inline const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, bool select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3x4 transformation matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Transform3 & tfrm ); - -// Print a 3x4 transformation matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Transform3 & tfrm, const char * name ); - -#endif - -} // namespace Aos -} // namespace Vectormath - -#include "vec_aos.h" -#include "quat_aos.h" -#include "mat_aos.h" - -#endif - diff --git a/Engine/lib/bullet/src/vectormath/scalar/boolInVec.h b/Engine/lib/bullet/src/vectormath/scalar/boolInVec.h deleted file mode 100644 index c5eeeebd7..000000000 --- a/Engine/lib/bullet/src/vectormath/scalar/boolInVec.h +++ /dev/null @@ -1,225 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _BOOLINVEC_H -#define _BOOLINVEC_H - -#include -namespace Vectormath { - -class floatInVec; - -//-------------------------------------------------------------------------------------------------- -// boolInVec class -// - -class boolInVec -{ -private: - unsigned int mData; - -public: - // Default constructor; does no initialization - // - inline boolInVec( ) { }; - - // Construct from a value converted from float - // - inline boolInVec(floatInVec vec); - - // Explicit cast from bool - // - explicit inline boolInVec(bool scalar); - - // Explicit cast to bool - // - inline bool getAsBool() const; - -#ifndef _VECTORMATH_NO_SCALAR_CAST - // Implicit cast to bool - // - inline operator bool() const; -#endif - - // Boolean negation operator - // - inline const boolInVec operator ! () const; - - // Assignment operator - // - inline boolInVec& operator = (boolInVec vec); - - // Boolean and assignment operator - // - inline boolInVec& operator &= (boolInVec vec); - - // Boolean exclusive or assignment operator - // - inline boolInVec& operator ^= (boolInVec vec); - - // Boolean or assignment operator - // - inline boolInVec& operator |= (boolInVec vec); - -}; - -// Equal operator -// -inline const boolInVec operator == (boolInVec vec0, boolInVec vec1); - -// Not equal operator -// -inline const boolInVec operator != (boolInVec vec0, boolInVec vec1); - -// And operator -// -inline const boolInVec operator & (boolInVec vec0, boolInVec vec1); - -// Exclusive or operator -// -inline const boolInVec operator ^ (boolInVec vec0, boolInVec vec1); - -// Or operator -// -inline const boolInVec operator | (boolInVec vec0, boolInVec vec1); - -// Conditionally select between two values -// -inline const boolInVec select(boolInVec vec0, boolInVec vec1, boolInVec select_vec1); - - -} // namespace Vectormath - - -//-------------------------------------------------------------------------------------------------- -// boolInVec implementation -// - -#include "floatInVec.h" - -namespace Vectormath { - -inline -boolInVec::boolInVec(floatInVec vec) -{ - *this = (vec != floatInVec(0.0f)); -} - -inline -boolInVec::boolInVec(bool scalar) -{ - mData = -(int)scalar; -} - -inline -bool -boolInVec::getAsBool() const -{ - return (mData > 0); -} - -#ifndef _VECTORMATH_NO_SCALAR_CAST -inline -boolInVec::operator bool() const -{ - return getAsBool(); -} -#endif - -inline -const boolInVec -boolInVec::operator ! () const -{ - return boolInVec(!mData); -} - -inline -boolInVec& -boolInVec::operator = (boolInVec vec) -{ - mData = vec.mData; - return *this; -} - -inline -boolInVec& -boolInVec::operator &= (boolInVec vec) -{ - *this = *this & vec; - return *this; -} - -inline -boolInVec& -boolInVec::operator ^= (boolInVec vec) -{ - *this = *this ^ vec; - return *this; -} - -inline -boolInVec& -boolInVec::operator |= (boolInVec vec) -{ - *this = *this | vec; - return *this; -} - -inline -const boolInVec -operator == (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() == vec1.getAsBool()); -} - -inline -const boolInVec -operator != (boolInVec vec0, boolInVec vec1) -{ - return !(vec0 == vec1); -} - -inline -const boolInVec -operator & (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() & vec1.getAsBool()); -} - -inline -const boolInVec -operator | (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() | vec1.getAsBool()); -} - -inline -const boolInVec -operator ^ (boolInVec vec0, boolInVec vec1) -{ - return boolInVec(vec0.getAsBool() ^ vec1.getAsBool()); -} - -inline -const boolInVec -select(boolInVec vec0, boolInVec vec1, boolInVec select_vec1) -{ - return (select_vec1.getAsBool() == 0) ? vec0 : vec1; -} - -} // namespace Vectormath - -#endif // boolInVec_h diff --git a/Engine/lib/bullet/src/vectormath/scalar/floatInVec.h b/Engine/lib/bullet/src/vectormath/scalar/floatInVec.h deleted file mode 100644 index 12d89e43d..000000000 --- a/Engine/lib/bullet/src/vectormath/scalar/floatInVec.h +++ /dev/null @@ -1,343 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ -#ifndef _FLOATINVEC_H -#define _FLOATINVEC_H - -#include -namespace Vectormath { - -class boolInVec; - -//-------------------------------------------------------------------------------------------------- -// floatInVec class -// - -// A class representing a scalar float value contained in a vector register -// This class does not support fastmath -class floatInVec -{ -private: - float mData; - -public: - // Default constructor; does no initialization - // - inline floatInVec( ) { }; - - // Construct from a value converted from bool - // - inline floatInVec(boolInVec vec); - - // Explicit cast from float - // - explicit inline floatInVec(float scalar); - - // Explicit cast to float - // - inline float getAsFloat() const; - -#ifndef _VECTORMATH_NO_SCALAR_CAST - // Implicit cast to float - // - inline operator float() const; -#endif - - // Post increment (add 1.0f) - // - inline const floatInVec operator ++ (int); - - // Post decrement (subtract 1.0f) - // - inline const floatInVec operator -- (int); - - // Pre increment (add 1.0f) - // - inline floatInVec& operator ++ (); - - // Pre decrement (subtract 1.0f) - // - inline floatInVec& operator -- (); - - // Negation operator - // - inline const floatInVec operator - () const; - - // Assignment operator - // - inline floatInVec& operator = (floatInVec vec); - - // Multiplication assignment operator - // - inline floatInVec& operator *= (floatInVec vec); - - // Division assignment operator - // - inline floatInVec& operator /= (floatInVec vec); - - // Addition assignment operator - // - inline floatInVec& operator += (floatInVec vec); - - // Subtraction assignment operator - // - inline floatInVec& operator -= (floatInVec vec); - -}; - -// Multiplication operator -// -inline const floatInVec operator * (floatInVec vec0, floatInVec vec1); - -// Division operator -// -inline const floatInVec operator / (floatInVec vec0, floatInVec vec1); - -// Addition operator -// -inline const floatInVec operator + (floatInVec vec0, floatInVec vec1); - -// Subtraction operator -// -inline const floatInVec operator - (floatInVec vec0, floatInVec vec1); - -// Less than operator -// -inline const boolInVec operator < (floatInVec vec0, floatInVec vec1); - -// Less than or equal operator -// -inline const boolInVec operator <= (floatInVec vec0, floatInVec vec1); - -// Greater than operator -// -inline const boolInVec operator > (floatInVec vec0, floatInVec vec1); - -// Greater than or equal operator -// -inline const boolInVec operator >= (floatInVec vec0, floatInVec vec1); - -// Equal operator -// -inline const boolInVec operator == (floatInVec vec0, floatInVec vec1); - -// Not equal operator -// -inline const boolInVec operator != (floatInVec vec0, floatInVec vec1); - -// Conditionally select between two values -// -inline const floatInVec select(floatInVec vec0, floatInVec vec1, boolInVec select_vec1); - - -} // namespace Vectormath - - -//-------------------------------------------------------------------------------------------------- -// floatInVec implementation -// - -#include "boolInVec.h" - -namespace Vectormath { - -inline -floatInVec::floatInVec(boolInVec vec) -{ - mData = float(vec.getAsBool()); -} - -inline -floatInVec::floatInVec(float scalar) -{ - mData = scalar; -} - -inline -float -floatInVec::getAsFloat() const -{ - return mData; -} - -#ifndef _VECTORMATH_NO_SCALAR_CAST -inline -floatInVec::operator float() const -{ - return getAsFloat(); -} -#endif - -inline -const floatInVec -floatInVec::operator ++ (int) -{ - float olddata = mData; - operator ++(); - return floatInVec(olddata); -} - -inline -const floatInVec -floatInVec::operator -- (int) -{ - float olddata = mData; - operator --(); - return floatInVec(olddata); -} - -inline -floatInVec& -floatInVec::operator ++ () -{ - *this += floatInVec(1.0f); - return *this; -} - -inline -floatInVec& -floatInVec::operator -- () -{ - *this -= floatInVec(1.0f); - return *this; -} - -inline -const floatInVec -floatInVec::operator - () const -{ - return floatInVec(-mData); -} - -inline -floatInVec& -floatInVec::operator = (floatInVec vec) -{ - mData = vec.mData; - return *this; -} - -inline -floatInVec& -floatInVec::operator *= (floatInVec vec) -{ - *this = *this * vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator /= (floatInVec vec) -{ - *this = *this / vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator += (floatInVec vec) -{ - *this = *this + vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator -= (floatInVec vec) -{ - *this = *this - vec; - return *this; -} - -inline -const floatInVec -operator * (floatInVec vec0, floatInVec vec1) -{ - return floatInVec(vec0.getAsFloat() * vec1.getAsFloat()); -} - -inline -const floatInVec -operator / (floatInVec num, floatInVec den) -{ - return floatInVec(num.getAsFloat() / den.getAsFloat()); -} - -inline -const floatInVec -operator + (floatInVec vec0, floatInVec vec1) -{ - return floatInVec(vec0.getAsFloat() + vec1.getAsFloat()); -} - -inline -const floatInVec -operator - (floatInVec vec0, floatInVec vec1) -{ - return floatInVec(vec0.getAsFloat() - vec1.getAsFloat()); -} - -inline -const boolInVec -operator < (floatInVec vec0, floatInVec vec1) -{ - return boolInVec(vec0.getAsFloat() < vec1.getAsFloat()); -} - -inline -const boolInVec -operator <= (floatInVec vec0, floatInVec vec1) -{ - return !(vec0 > vec1); -} - -inline -const boolInVec -operator > (floatInVec vec0, floatInVec vec1) -{ - return boolInVec(vec0.getAsFloat() > vec1.getAsFloat()); -} - -inline -const boolInVec -operator >= (floatInVec vec0, floatInVec vec1) -{ - return !(vec0 < vec1); -} - -inline -const boolInVec -operator == (floatInVec vec0, floatInVec vec1) -{ - return boolInVec(vec0.getAsFloat() == vec1.getAsFloat()); -} - -inline -const boolInVec -operator != (floatInVec vec0, floatInVec vec1) -{ - return !(vec0 == vec1); -} - -inline -const floatInVec -select(floatInVec vec0, floatInVec vec1, boolInVec select_vec1) -{ - return (select_vec1.getAsBool() == 0) ? vec0 : vec1; -} - -} // namespace Vectormath - -#endif // floatInVec_h diff --git a/Engine/lib/bullet/src/vectormath/scalar/mat_aos.h b/Engine/lib/bullet/src/vectormath/scalar/mat_aos.h deleted file mode 100644 index e103243d1..000000000 --- a/Engine/lib/bullet/src/vectormath/scalar/mat_aos.h +++ /dev/null @@ -1,1630 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_MAT_AOS_CPP_H -#define _VECTORMATH_MAT_AOS_CPP_H - -namespace Vectormath { -namespace Aos { - -//----------------------------------------------------------------------------- -// Constants - -#define _VECTORMATH_PI_OVER_2 1.570796327f - -//----------------------------------------------------------------------------- -// Definitions - -inline Matrix3::Matrix3( const Matrix3 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; -} - -inline Matrix3::Matrix3( float scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); -} - -inline Matrix3::Matrix3( const Quat & unitQuat ) -{ - float qx, qy, qz, qw, qx2, qy2, qz2, qxqx2, qyqy2, qzqz2, qxqy2, qyqz2, qzqw2, qxqz2, qyqw2, qxqw2; - qx = unitQuat.getX(); - qy = unitQuat.getY(); - qz = unitQuat.getZ(); - qw = unitQuat.getW(); - qx2 = ( qx + qx ); - qy2 = ( qy + qy ); - qz2 = ( qz + qz ); - qxqx2 = ( qx * qx2 ); - qxqy2 = ( qx * qy2 ); - qxqz2 = ( qx * qz2 ); - qxqw2 = ( qw * qx2 ); - qyqy2 = ( qy * qy2 ); - qyqz2 = ( qy * qz2 ); - qyqw2 = ( qw * qy2 ); - qzqz2 = ( qz * qz2 ); - qzqw2 = ( qw * qz2 ); - mCol0 = Vector3( ( ( 1.0f - qyqy2 ) - qzqz2 ), ( qxqy2 + qzqw2 ), ( qxqz2 - qyqw2 ) ); - mCol1 = Vector3( ( qxqy2 - qzqw2 ), ( ( 1.0f - qxqx2 ) - qzqz2 ), ( qyqz2 + qxqw2 ) ); - mCol2 = Vector3( ( qxqz2 + qyqw2 ), ( qyqz2 - qxqw2 ), ( ( 1.0f - qxqx2 ) - qyqy2 ) ); -} - -inline Matrix3::Matrix3( const Vector3 & _col0, const Vector3 & _col1, const Vector3 & _col2 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; -} - -inline Matrix3 & Matrix3::setCol0( const Vector3 & _col0 ) -{ - mCol0 = _col0; - return *this; -} - -inline Matrix3 & Matrix3::setCol1( const Vector3 & _col1 ) -{ - mCol1 = _col1; - return *this; -} - -inline Matrix3 & Matrix3::setCol2( const Vector3 & _col2 ) -{ - mCol2 = _col2; - return *this; -} - -inline Matrix3 & Matrix3::setCol( int col, const Vector3 & vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -inline Matrix3 & Matrix3::setRow( int row, const Vector3 & vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - return *this; -} - -inline Matrix3 & Matrix3::setElem( int col, int row, float val ) -{ - Vector3 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -inline float Matrix3::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -inline const Vector3 Matrix3::getCol0( ) const -{ - return mCol0; -} - -inline const Vector3 Matrix3::getCol1( ) const -{ - return mCol1; -} - -inline const Vector3 Matrix3::getCol2( ) const -{ - return mCol2; -} - -inline const Vector3 Matrix3::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -inline const Vector3 Matrix3::getRow( int row ) const -{ - return Vector3( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ) ); -} - -inline Vector3 & Matrix3::operator []( int col ) -{ - return *(&mCol0 + col); -} - -inline const Vector3 Matrix3::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -inline Matrix3 & Matrix3::operator =( const Matrix3 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - return *this; -} - -inline const Matrix3 transpose( const Matrix3 & mat ) -{ - return Matrix3( - Vector3( mat.getCol0().getX(), mat.getCol1().getX(), mat.getCol2().getX() ), - Vector3( mat.getCol0().getY(), mat.getCol1().getY(), mat.getCol2().getY() ), - Vector3( mat.getCol0().getZ(), mat.getCol1().getZ(), mat.getCol2().getZ() ) - ); -} - -inline const Matrix3 inverse( const Matrix3 & mat ) -{ - Vector3 tmp0, tmp1, tmp2; - float detinv; - tmp0 = cross( mat.getCol1(), mat.getCol2() ); - tmp1 = cross( mat.getCol2(), mat.getCol0() ); - tmp2 = cross( mat.getCol0(), mat.getCol1() ); - detinv = ( 1.0f / dot( mat.getCol2(), tmp2 ) ); - return Matrix3( - Vector3( ( tmp0.getX() * detinv ), ( tmp1.getX() * detinv ), ( tmp2.getX() * detinv ) ), - Vector3( ( tmp0.getY() * detinv ), ( tmp1.getY() * detinv ), ( tmp2.getY() * detinv ) ), - Vector3( ( tmp0.getZ() * detinv ), ( tmp1.getZ() * detinv ), ( tmp2.getZ() * detinv ) ) - ); -} - -inline float determinant( const Matrix3 & mat ) -{ - return dot( mat.getCol2(), cross( mat.getCol0(), mat.getCol1() ) ); -} - -inline const Matrix3 Matrix3::operator +( const Matrix3 & mat ) const -{ - return Matrix3( - ( mCol0 + mat.mCol0 ), - ( mCol1 + mat.mCol1 ), - ( mCol2 + mat.mCol2 ) - ); -} - -inline const Matrix3 Matrix3::operator -( const Matrix3 & mat ) const -{ - return Matrix3( - ( mCol0 - mat.mCol0 ), - ( mCol1 - mat.mCol1 ), - ( mCol2 - mat.mCol2 ) - ); -} - -inline Matrix3 & Matrix3::operator +=( const Matrix3 & mat ) -{ - *this = *this + mat; - return *this; -} - -inline Matrix3 & Matrix3::operator -=( const Matrix3 & mat ) -{ - *this = *this - mat; - return *this; -} - -inline const Matrix3 Matrix3::operator -( ) const -{ - return Matrix3( - ( -mCol0 ), - ( -mCol1 ), - ( -mCol2 ) - ); -} - -inline const Matrix3 absPerElem( const Matrix3 & mat ) -{ - return Matrix3( - absPerElem( mat.getCol0() ), - absPerElem( mat.getCol1() ), - absPerElem( mat.getCol2() ) - ); -} - -inline const Matrix3 Matrix3::operator *( float scalar ) const -{ - return Matrix3( - ( mCol0 * scalar ), - ( mCol1 * scalar ), - ( mCol2 * scalar ) - ); -} - -inline Matrix3 & Matrix3::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Matrix3 operator *( float scalar, const Matrix3 & mat ) -{ - return mat * scalar; -} - -inline const Vector3 Matrix3::operator *( const Vector3 & vec ) const -{ - return Vector3( - ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ), - ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ), - ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ) - ); -} - -inline const Matrix3 Matrix3::operator *( const Matrix3 & mat ) const -{ - return Matrix3( - ( *this * mat.mCol0 ), - ( *this * mat.mCol1 ), - ( *this * mat.mCol2 ) - ); -} - -inline Matrix3 & Matrix3::operator *=( const Matrix3 & mat ) -{ - *this = *this * mat; - return *this; -} - -inline const Matrix3 mulPerElem( const Matrix3 & mat0, const Matrix3 & mat1 ) -{ - return Matrix3( - mulPerElem( mat0.getCol0(), mat1.getCol0() ), - mulPerElem( mat0.getCol1(), mat1.getCol1() ), - mulPerElem( mat0.getCol2(), mat1.getCol2() ) - ); -} - -inline const Matrix3 Matrix3::identity( ) -{ - return Matrix3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ) - ); -} - -inline const Matrix3 Matrix3::rotationX( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix3( - Vector3::xAxis( ), - Vector3( 0.0f, c, s ), - Vector3( 0.0f, -s, c ) - ); -} - -inline const Matrix3 Matrix3::rotationY( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix3( - Vector3( c, 0.0f, -s ), - Vector3::yAxis( ), - Vector3( s, 0.0f, c ) - ); -} - -inline const Matrix3 Matrix3::rotationZ( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix3( - Vector3( c, s, 0.0f ), - Vector3( -s, c, 0.0f ), - Vector3::zAxis( ) - ); -} - -inline const Matrix3 Matrix3::rotationZYX( const Vector3 & radiansXYZ ) -{ - float sX, cX, sY, cY, sZ, cZ, tmp0, tmp1; - sX = sinf( radiansXYZ.getX() ); - cX = cosf( radiansXYZ.getX() ); - sY = sinf( radiansXYZ.getY() ); - cY = cosf( radiansXYZ.getY() ); - sZ = sinf( radiansXYZ.getZ() ); - cZ = cosf( radiansXYZ.getZ() ); - tmp0 = ( cZ * sY ); - tmp1 = ( sZ * sY ); - return Matrix3( - Vector3( ( cZ * cY ), ( sZ * cY ), -sY ), - Vector3( ( ( tmp0 * sX ) - ( sZ * cX ) ), ( ( tmp1 * sX ) + ( cZ * cX ) ), ( cY * sX ) ), - Vector3( ( ( tmp0 * cX ) + ( sZ * sX ) ), ( ( tmp1 * cX ) - ( cZ * sX ) ), ( cY * cX ) ) - ); -} - -inline const Matrix3 Matrix3::rotation( float radians, const Vector3 & unitVec ) -{ - float x, y, z, s, c, oneMinusC, xy, yz, zx; - s = sinf( radians ); - c = cosf( radians ); - x = unitVec.getX(); - y = unitVec.getY(); - z = unitVec.getZ(); - xy = ( x * y ); - yz = ( y * z ); - zx = ( z * x ); - oneMinusC = ( 1.0f - c ); - return Matrix3( - Vector3( ( ( ( x * x ) * oneMinusC ) + c ), ( ( xy * oneMinusC ) + ( z * s ) ), ( ( zx * oneMinusC ) - ( y * s ) ) ), - Vector3( ( ( xy * oneMinusC ) - ( z * s ) ), ( ( ( y * y ) * oneMinusC ) + c ), ( ( yz * oneMinusC ) + ( x * s ) ) ), - Vector3( ( ( zx * oneMinusC ) + ( y * s ) ), ( ( yz * oneMinusC ) - ( x * s ) ), ( ( ( z * z ) * oneMinusC ) + c ) ) - ); -} - -inline const Matrix3 Matrix3::rotation( const Quat & unitQuat ) -{ - return Matrix3( unitQuat ); -} - -inline const Matrix3 Matrix3::scale( const Vector3 & scaleVec ) -{ - return Matrix3( - Vector3( scaleVec.getX(), 0.0f, 0.0f ), - Vector3( 0.0f, scaleVec.getY(), 0.0f ), - Vector3( 0.0f, 0.0f, scaleVec.getZ() ) - ); -} - -inline const Matrix3 appendScale( const Matrix3 & mat, const Vector3 & scaleVec ) -{ - return Matrix3( - ( mat.getCol0() * scaleVec.getX( ) ), - ( mat.getCol1() * scaleVec.getY( ) ), - ( mat.getCol2() * scaleVec.getZ( ) ) - ); -} - -inline const Matrix3 prependScale( const Vector3 & scaleVec, const Matrix3 & mat ) -{ - return Matrix3( - mulPerElem( mat.getCol0(), scaleVec ), - mulPerElem( mat.getCol1(), scaleVec ), - mulPerElem( mat.getCol2(), scaleVec ) - ); -} - -inline const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, bool select1 ) -{ - return Matrix3( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Matrix3 & mat ) -{ - print( mat.getRow( 0 ) ); - print( mat.getRow( 1 ) ); - print( mat.getRow( 2 ) ); -} - -inline void print( const Matrix3 & mat, const char * name ) -{ - printf("%s:\n", name); - print( mat ); -} - -#endif - -inline Matrix4::Matrix4( const Matrix4 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - mCol3 = mat.mCol3; -} - -inline Matrix4::Matrix4( float scalar ) -{ - mCol0 = Vector4( scalar ); - mCol1 = Vector4( scalar ); - mCol2 = Vector4( scalar ); - mCol3 = Vector4( scalar ); -} - -inline Matrix4::Matrix4( const Transform3 & mat ) -{ - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( mat.getCol3(), 1.0f ); -} - -inline Matrix4::Matrix4( const Vector4 & _col0, const Vector4 & _col1, const Vector4 & _col2, const Vector4 & _col3 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; - mCol3 = _col3; -} - -inline Matrix4::Matrix4( const Matrix3 & mat, const Vector3 & translateVec ) -{ - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( translateVec, 1.0f ); -} - -inline Matrix4::Matrix4( const Quat & unitQuat, const Vector3 & translateVec ) -{ - Matrix3 mat; - mat = Matrix3( unitQuat ); - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( translateVec, 1.0f ); -} - -inline Matrix4 & Matrix4::setCol0( const Vector4 & _col0 ) -{ - mCol0 = _col0; - return *this; -} - -inline Matrix4 & Matrix4::setCol1( const Vector4 & _col1 ) -{ - mCol1 = _col1; - return *this; -} - -inline Matrix4 & Matrix4::setCol2( const Vector4 & _col2 ) -{ - mCol2 = _col2; - return *this; -} - -inline Matrix4 & Matrix4::setCol3( const Vector4 & _col3 ) -{ - mCol3 = _col3; - return *this; -} - -inline Matrix4 & Matrix4::setCol( int col, const Vector4 & vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -inline Matrix4 & Matrix4::setRow( int row, const Vector4 & vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - mCol3.setElem( row, vec.getElem( 3 ) ); - return *this; -} - -inline Matrix4 & Matrix4::setElem( int col, int row, float val ) -{ - Vector4 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -inline float Matrix4::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -inline const Vector4 Matrix4::getCol0( ) const -{ - return mCol0; -} - -inline const Vector4 Matrix4::getCol1( ) const -{ - return mCol1; -} - -inline const Vector4 Matrix4::getCol2( ) const -{ - return mCol2; -} - -inline const Vector4 Matrix4::getCol3( ) const -{ - return mCol3; -} - -inline const Vector4 Matrix4::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -inline const Vector4 Matrix4::getRow( int row ) const -{ - return Vector4( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ), mCol3.getElem( row ) ); -} - -inline Vector4 & Matrix4::operator []( int col ) -{ - return *(&mCol0 + col); -} - -inline const Vector4 Matrix4::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -inline Matrix4 & Matrix4::operator =( const Matrix4 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - mCol3 = mat.mCol3; - return *this; -} - -inline const Matrix4 transpose( const Matrix4 & mat ) -{ - return Matrix4( - Vector4( mat.getCol0().getX(), mat.getCol1().getX(), mat.getCol2().getX(), mat.getCol3().getX() ), - Vector4( mat.getCol0().getY(), mat.getCol1().getY(), mat.getCol2().getY(), mat.getCol3().getY() ), - Vector4( mat.getCol0().getZ(), mat.getCol1().getZ(), mat.getCol2().getZ(), mat.getCol3().getZ() ), - Vector4( mat.getCol0().getW(), mat.getCol1().getW(), mat.getCol2().getW(), mat.getCol3().getW() ) - ); -} - -inline const Matrix4 inverse( const Matrix4 & mat ) -{ - Vector4 res0, res1, res2, res3; - float mA, mB, mC, mD, mE, mF, mG, mH, mI, mJ, mK, mL, mM, mN, mO, mP, tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, detInv; - mA = mat.getCol0().getX(); - mB = mat.getCol0().getY(); - mC = mat.getCol0().getZ(); - mD = mat.getCol0().getW(); - mE = mat.getCol1().getX(); - mF = mat.getCol1().getY(); - mG = mat.getCol1().getZ(); - mH = mat.getCol1().getW(); - mI = mat.getCol2().getX(); - mJ = mat.getCol2().getY(); - mK = mat.getCol2().getZ(); - mL = mat.getCol2().getW(); - mM = mat.getCol3().getX(); - mN = mat.getCol3().getY(); - mO = mat.getCol3().getZ(); - mP = mat.getCol3().getW(); - tmp0 = ( ( mK * mD ) - ( mC * mL ) ); - tmp1 = ( ( mO * mH ) - ( mG * mP ) ); - tmp2 = ( ( mB * mK ) - ( mJ * mC ) ); - tmp3 = ( ( mF * mO ) - ( mN * mG ) ); - tmp4 = ( ( mJ * mD ) - ( mB * mL ) ); - tmp5 = ( ( mN * mH ) - ( mF * mP ) ); - res0.setX( ( ( ( mJ * tmp1 ) - ( mL * tmp3 ) ) - ( mK * tmp5 ) ) ); - res0.setY( ( ( ( mN * tmp0 ) - ( mP * tmp2 ) ) - ( mO * tmp4 ) ) ); - res0.setZ( ( ( ( mD * tmp3 ) + ( mC * tmp5 ) ) - ( mB * tmp1 ) ) ); - res0.setW( ( ( ( mH * tmp2 ) + ( mG * tmp4 ) ) - ( mF * tmp0 ) ) ); - detInv = ( 1.0f / ( ( ( ( mA * res0.getX() ) + ( mE * res0.getY() ) ) + ( mI * res0.getZ() ) ) + ( mM * res0.getW() ) ) ); - res1.setX( ( mI * tmp1 ) ); - res1.setY( ( mM * tmp0 ) ); - res1.setZ( ( mA * tmp1 ) ); - res1.setW( ( mE * tmp0 ) ); - res3.setX( ( mI * tmp3 ) ); - res3.setY( ( mM * tmp2 ) ); - res3.setZ( ( mA * tmp3 ) ); - res3.setW( ( mE * tmp2 ) ); - res2.setX( ( mI * tmp5 ) ); - res2.setY( ( mM * tmp4 ) ); - res2.setZ( ( mA * tmp5 ) ); - res2.setW( ( mE * tmp4 ) ); - tmp0 = ( ( mI * mB ) - ( mA * mJ ) ); - tmp1 = ( ( mM * mF ) - ( mE * mN ) ); - tmp2 = ( ( mI * mD ) - ( mA * mL ) ); - tmp3 = ( ( mM * mH ) - ( mE * mP ) ); - tmp4 = ( ( mI * mC ) - ( mA * mK ) ); - tmp5 = ( ( mM * mG ) - ( mE * mO ) ); - res2.setX( ( ( ( mL * tmp1 ) - ( mJ * tmp3 ) ) + res2.getX() ) ); - res2.setY( ( ( ( mP * tmp0 ) - ( mN * tmp2 ) ) + res2.getY() ) ); - res2.setZ( ( ( ( mB * tmp3 ) - ( mD * tmp1 ) ) - res2.getZ() ) ); - res2.setW( ( ( ( mF * tmp2 ) - ( mH * tmp0 ) ) - res2.getW() ) ); - res3.setX( ( ( ( mJ * tmp5 ) - ( mK * tmp1 ) ) + res3.getX() ) ); - res3.setY( ( ( ( mN * tmp4 ) - ( mO * tmp0 ) ) + res3.getY() ) ); - res3.setZ( ( ( ( mC * tmp1 ) - ( mB * tmp5 ) ) - res3.getZ() ) ); - res3.setW( ( ( ( mG * tmp0 ) - ( mF * tmp4 ) ) - res3.getW() ) ); - res1.setX( ( ( ( mK * tmp3 ) - ( mL * tmp5 ) ) - res1.getX() ) ); - res1.setY( ( ( ( mO * tmp2 ) - ( mP * tmp4 ) ) - res1.getY() ) ); - res1.setZ( ( ( ( mD * tmp5 ) - ( mC * tmp3 ) ) + res1.getZ() ) ); - res1.setW( ( ( ( mH * tmp4 ) - ( mG * tmp2 ) ) + res1.getW() ) ); - return Matrix4( - ( res0 * detInv ), - ( res1 * detInv ), - ( res2 * detInv ), - ( res3 * detInv ) - ); -} - -inline const Matrix4 affineInverse( const Matrix4 & mat ) -{ - Transform3 affineMat; - affineMat.setCol0( mat.getCol0().getXYZ( ) ); - affineMat.setCol1( mat.getCol1().getXYZ( ) ); - affineMat.setCol2( mat.getCol2().getXYZ( ) ); - affineMat.setCol3( mat.getCol3().getXYZ( ) ); - return Matrix4( inverse( affineMat ) ); -} - -inline const Matrix4 orthoInverse( const Matrix4 & mat ) -{ - Transform3 affineMat; - affineMat.setCol0( mat.getCol0().getXYZ( ) ); - affineMat.setCol1( mat.getCol1().getXYZ( ) ); - affineMat.setCol2( mat.getCol2().getXYZ( ) ); - affineMat.setCol3( mat.getCol3().getXYZ( ) ); - return Matrix4( orthoInverse( affineMat ) ); -} - -inline float determinant( const Matrix4 & mat ) -{ - float dx, dy, dz, dw, mA, mB, mC, mD, mE, mF, mG, mH, mI, mJ, mK, mL, mM, mN, mO, mP, tmp0, tmp1, tmp2, tmp3, tmp4, tmp5; - mA = mat.getCol0().getX(); - mB = mat.getCol0().getY(); - mC = mat.getCol0().getZ(); - mD = mat.getCol0().getW(); - mE = mat.getCol1().getX(); - mF = mat.getCol1().getY(); - mG = mat.getCol1().getZ(); - mH = mat.getCol1().getW(); - mI = mat.getCol2().getX(); - mJ = mat.getCol2().getY(); - mK = mat.getCol2().getZ(); - mL = mat.getCol2().getW(); - mM = mat.getCol3().getX(); - mN = mat.getCol3().getY(); - mO = mat.getCol3().getZ(); - mP = mat.getCol3().getW(); - tmp0 = ( ( mK * mD ) - ( mC * mL ) ); - tmp1 = ( ( mO * mH ) - ( mG * mP ) ); - tmp2 = ( ( mB * mK ) - ( mJ * mC ) ); - tmp3 = ( ( mF * mO ) - ( mN * mG ) ); - tmp4 = ( ( mJ * mD ) - ( mB * mL ) ); - tmp5 = ( ( mN * mH ) - ( mF * mP ) ); - dx = ( ( ( mJ * tmp1 ) - ( mL * tmp3 ) ) - ( mK * tmp5 ) ); - dy = ( ( ( mN * tmp0 ) - ( mP * tmp2 ) ) - ( mO * tmp4 ) ); - dz = ( ( ( mD * tmp3 ) + ( mC * tmp5 ) ) - ( mB * tmp1 ) ); - dw = ( ( ( mH * tmp2 ) + ( mG * tmp4 ) ) - ( mF * tmp0 ) ); - return ( ( ( ( mA * dx ) + ( mE * dy ) ) + ( mI * dz ) ) + ( mM * dw ) ); -} - -inline const Matrix4 Matrix4::operator +( const Matrix4 & mat ) const -{ - return Matrix4( - ( mCol0 + mat.mCol0 ), - ( mCol1 + mat.mCol1 ), - ( mCol2 + mat.mCol2 ), - ( mCol3 + mat.mCol3 ) - ); -} - -inline const Matrix4 Matrix4::operator -( const Matrix4 & mat ) const -{ - return Matrix4( - ( mCol0 - mat.mCol0 ), - ( mCol1 - mat.mCol1 ), - ( mCol2 - mat.mCol2 ), - ( mCol3 - mat.mCol3 ) - ); -} - -inline Matrix4 & Matrix4::operator +=( const Matrix4 & mat ) -{ - *this = *this + mat; - return *this; -} - -inline Matrix4 & Matrix4::operator -=( const Matrix4 & mat ) -{ - *this = *this - mat; - return *this; -} - -inline const Matrix4 Matrix4::operator -( ) const -{ - return Matrix4( - ( -mCol0 ), - ( -mCol1 ), - ( -mCol2 ), - ( -mCol3 ) - ); -} - -inline const Matrix4 absPerElem( const Matrix4 & mat ) -{ - return Matrix4( - absPerElem( mat.getCol0() ), - absPerElem( mat.getCol1() ), - absPerElem( mat.getCol2() ), - absPerElem( mat.getCol3() ) - ); -} - -inline const Matrix4 Matrix4::operator *( float scalar ) const -{ - return Matrix4( - ( mCol0 * scalar ), - ( mCol1 * scalar ), - ( mCol2 * scalar ), - ( mCol3 * scalar ) - ); -} - -inline Matrix4 & Matrix4::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Matrix4 operator *( float scalar, const Matrix4 & mat ) -{ - return mat * scalar; -} - -inline const Vector4 Matrix4::operator *( const Vector4 & vec ) const -{ - return Vector4( - ( ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ) + ( mCol3.getX() * vec.getW() ) ), - ( ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ) + ( mCol3.getY() * vec.getW() ) ), - ( ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ) + ( mCol3.getZ() * vec.getW() ) ), - ( ( ( ( mCol0.getW() * vec.getX() ) + ( mCol1.getW() * vec.getY() ) ) + ( mCol2.getW() * vec.getZ() ) ) + ( mCol3.getW() * vec.getW() ) ) - ); -} - -inline const Vector4 Matrix4::operator *( const Vector3 & vec ) const -{ - return Vector4( - ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ), - ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ), - ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ), - ( ( ( mCol0.getW() * vec.getX() ) + ( mCol1.getW() * vec.getY() ) ) + ( mCol2.getW() * vec.getZ() ) ) - ); -} - -inline const Vector4 Matrix4::operator *( const Point3 & pnt ) const -{ - return Vector4( - ( ( ( ( mCol0.getX() * pnt.getX() ) + ( mCol1.getX() * pnt.getY() ) ) + ( mCol2.getX() * pnt.getZ() ) ) + mCol3.getX() ), - ( ( ( ( mCol0.getY() * pnt.getX() ) + ( mCol1.getY() * pnt.getY() ) ) + ( mCol2.getY() * pnt.getZ() ) ) + mCol3.getY() ), - ( ( ( ( mCol0.getZ() * pnt.getX() ) + ( mCol1.getZ() * pnt.getY() ) ) + ( mCol2.getZ() * pnt.getZ() ) ) + mCol3.getZ() ), - ( ( ( ( mCol0.getW() * pnt.getX() ) + ( mCol1.getW() * pnt.getY() ) ) + ( mCol2.getW() * pnt.getZ() ) ) + mCol3.getW() ) - ); -} - -inline const Matrix4 Matrix4::operator *( const Matrix4 & mat ) const -{ - return Matrix4( - ( *this * mat.mCol0 ), - ( *this * mat.mCol1 ), - ( *this * mat.mCol2 ), - ( *this * mat.mCol3 ) - ); -} - -inline Matrix4 & Matrix4::operator *=( const Matrix4 & mat ) -{ - *this = *this * mat; - return *this; -} - -inline const Matrix4 Matrix4::operator *( const Transform3 & tfrm ) const -{ - return Matrix4( - ( *this * tfrm.getCol0() ), - ( *this * tfrm.getCol1() ), - ( *this * tfrm.getCol2() ), - ( *this * Point3( tfrm.getCol3() ) ) - ); -} - -inline Matrix4 & Matrix4::operator *=( const Transform3 & tfrm ) -{ - *this = *this * tfrm; - return *this; -} - -inline const Matrix4 mulPerElem( const Matrix4 & mat0, const Matrix4 & mat1 ) -{ - return Matrix4( - mulPerElem( mat0.getCol0(), mat1.getCol0() ), - mulPerElem( mat0.getCol1(), mat1.getCol1() ), - mulPerElem( mat0.getCol2(), mat1.getCol2() ), - mulPerElem( mat0.getCol3(), mat1.getCol3() ) - ); -} - -inline const Matrix4 Matrix4::identity( ) -{ - return Matrix4( - Vector4::xAxis( ), - Vector4::yAxis( ), - Vector4::zAxis( ), - Vector4::wAxis( ) - ); -} - -inline Matrix4 & Matrix4::setUpper3x3( const Matrix3 & mat3 ) -{ - mCol0.setXYZ( mat3.getCol0() ); - mCol1.setXYZ( mat3.getCol1() ); - mCol2.setXYZ( mat3.getCol2() ); - return *this; -} - -inline const Matrix3 Matrix4::getUpper3x3( ) const -{ - return Matrix3( - mCol0.getXYZ( ), - mCol1.getXYZ( ), - mCol2.getXYZ( ) - ); -} - -inline Matrix4 & Matrix4::setTranslation( const Vector3 & translateVec ) -{ - mCol3.setXYZ( translateVec ); - return *this; -} - -inline const Vector3 Matrix4::getTranslation( ) const -{ - return mCol3.getXYZ( ); -} - -inline const Matrix4 Matrix4::rotationX( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix4( - Vector4::xAxis( ), - Vector4( 0.0f, c, s, 0.0f ), - Vector4( 0.0f, -s, c, 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotationY( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix4( - Vector4( c, 0.0f, -s, 0.0f ), - Vector4::yAxis( ), - Vector4( s, 0.0f, c, 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotationZ( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Matrix4( - Vector4( c, s, 0.0f, 0.0f ), - Vector4( -s, c, 0.0f, 0.0f ), - Vector4::zAxis( ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotationZYX( const Vector3 & radiansXYZ ) -{ - float sX, cX, sY, cY, sZ, cZ, tmp0, tmp1; - sX = sinf( radiansXYZ.getX() ); - cX = cosf( radiansXYZ.getX() ); - sY = sinf( radiansXYZ.getY() ); - cY = cosf( radiansXYZ.getY() ); - sZ = sinf( radiansXYZ.getZ() ); - cZ = cosf( radiansXYZ.getZ() ); - tmp0 = ( cZ * sY ); - tmp1 = ( sZ * sY ); - return Matrix4( - Vector4( ( cZ * cY ), ( sZ * cY ), -sY, 0.0f ), - Vector4( ( ( tmp0 * sX ) - ( sZ * cX ) ), ( ( tmp1 * sX ) + ( cZ * cX ) ), ( cY * sX ), 0.0f ), - Vector4( ( ( tmp0 * cX ) + ( sZ * sX ) ), ( ( tmp1 * cX ) - ( cZ * sX ) ), ( cY * cX ), 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotation( float radians, const Vector3 & unitVec ) -{ - float x, y, z, s, c, oneMinusC, xy, yz, zx; - s = sinf( radians ); - c = cosf( radians ); - x = unitVec.getX(); - y = unitVec.getY(); - z = unitVec.getZ(); - xy = ( x * y ); - yz = ( y * z ); - zx = ( z * x ); - oneMinusC = ( 1.0f - c ); - return Matrix4( - Vector4( ( ( ( x * x ) * oneMinusC ) + c ), ( ( xy * oneMinusC ) + ( z * s ) ), ( ( zx * oneMinusC ) - ( y * s ) ), 0.0f ), - Vector4( ( ( xy * oneMinusC ) - ( z * s ) ), ( ( ( y * y ) * oneMinusC ) + c ), ( ( yz * oneMinusC ) + ( x * s ) ), 0.0f ), - Vector4( ( ( zx * oneMinusC ) + ( y * s ) ), ( ( yz * oneMinusC ) - ( x * s ) ), ( ( ( z * z ) * oneMinusC ) + c ), 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 Matrix4::rotation( const Quat & unitQuat ) -{ - return Matrix4( Transform3::rotation( unitQuat ) ); -} - -inline const Matrix4 Matrix4::scale( const Vector3 & scaleVec ) -{ - return Matrix4( - Vector4( scaleVec.getX(), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, scaleVec.getY(), 0.0f, 0.0f ), - Vector4( 0.0f, 0.0f, scaleVec.getZ(), 0.0f ), - Vector4::wAxis( ) - ); -} - -inline const Matrix4 appendScale( const Matrix4 & mat, const Vector3 & scaleVec ) -{ - return Matrix4( - ( mat.getCol0() * scaleVec.getX( ) ), - ( mat.getCol1() * scaleVec.getY( ) ), - ( mat.getCol2() * scaleVec.getZ( ) ), - mat.getCol3() - ); -} - -inline const Matrix4 prependScale( const Vector3 & scaleVec, const Matrix4 & mat ) -{ - Vector4 scale4; - scale4 = Vector4( scaleVec, 1.0f ); - return Matrix4( - mulPerElem( mat.getCol0(), scale4 ), - mulPerElem( mat.getCol1(), scale4 ), - mulPerElem( mat.getCol2(), scale4 ), - mulPerElem( mat.getCol3(), scale4 ) - ); -} - -inline const Matrix4 Matrix4::translation( const Vector3 & translateVec ) -{ - return Matrix4( - Vector4::xAxis( ), - Vector4::yAxis( ), - Vector4::zAxis( ), - Vector4( translateVec, 1.0f ) - ); -} - -inline const Matrix4 Matrix4::lookAt( const Point3 & eyePos, const Point3 & lookAtPos, const Vector3 & upVec ) -{ - Matrix4 m4EyeFrame; - Vector3 v3X, v3Y, v3Z; - v3Y = normalize( upVec ); - v3Z = normalize( ( eyePos - lookAtPos ) ); - v3X = normalize( cross( v3Y, v3Z ) ); - v3Y = cross( v3Z, v3X ); - m4EyeFrame = Matrix4( Vector4( v3X ), Vector4( v3Y ), Vector4( v3Z ), Vector4( eyePos ) ); - return orthoInverse( m4EyeFrame ); -} - -inline const Matrix4 Matrix4::perspective( float fovyRadians, float aspect, float zNear, float zFar ) -{ - float f, rangeInv; - f = tanf( ( (float)( _VECTORMATH_PI_OVER_2 ) - ( 0.5f * fovyRadians ) ) ); - rangeInv = ( 1.0f / ( zNear - zFar ) ); - return Matrix4( - Vector4( ( f / aspect ), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, f, 0.0f, 0.0f ), - Vector4( 0.0f, 0.0f, ( ( zNear + zFar ) * rangeInv ), -1.0f ), - Vector4( 0.0f, 0.0f, ( ( ( zNear * zFar ) * rangeInv ) * 2.0f ), 0.0f ) - ); -} - -inline const Matrix4 Matrix4::frustum( float left, float right, float bottom, float top, float zNear, float zFar ) -{ - float sum_rl, sum_tb, sum_nf, inv_rl, inv_tb, inv_nf, n2; - sum_rl = ( right + left ); - sum_tb = ( top + bottom ); - sum_nf = ( zNear + zFar ); - inv_rl = ( 1.0f / ( right - left ) ); - inv_tb = ( 1.0f / ( top - bottom ) ); - inv_nf = ( 1.0f / ( zNear - zFar ) ); - n2 = ( zNear + zNear ); - return Matrix4( - Vector4( ( n2 * inv_rl ), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, ( n2 * inv_tb ), 0.0f, 0.0f ), - Vector4( ( sum_rl * inv_rl ), ( sum_tb * inv_tb ), ( sum_nf * inv_nf ), -1.0f ), - Vector4( 0.0f, 0.0f, ( ( n2 * inv_nf ) * zFar ), 0.0f ) - ); -} - -inline const Matrix4 Matrix4::orthographic( float left, float right, float bottom, float top, float zNear, float zFar ) -{ - float sum_rl, sum_tb, sum_nf, inv_rl, inv_tb, inv_nf; - sum_rl = ( right + left ); - sum_tb = ( top + bottom ); - sum_nf = ( zNear + zFar ); - inv_rl = ( 1.0f / ( right - left ) ); - inv_tb = ( 1.0f / ( top - bottom ) ); - inv_nf = ( 1.0f / ( zNear - zFar ) ); - return Matrix4( - Vector4( ( inv_rl + inv_rl ), 0.0f, 0.0f, 0.0f ), - Vector4( 0.0f, ( inv_tb + inv_tb ), 0.0f, 0.0f ), - Vector4( 0.0f, 0.0f, ( inv_nf + inv_nf ), 0.0f ), - Vector4( ( -sum_rl * inv_rl ), ( -sum_tb * inv_tb ), ( sum_nf * inv_nf ), 1.0f ) - ); -} - -inline const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, bool select1 ) -{ - return Matrix4( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ), - select( mat0.getCol3(), mat1.getCol3(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Matrix4 & mat ) -{ - print( mat.getRow( 0 ) ); - print( mat.getRow( 1 ) ); - print( mat.getRow( 2 ) ); - print( mat.getRow( 3 ) ); -} - -inline void print( const Matrix4 & mat, const char * name ) -{ - printf("%s:\n", name); - print( mat ); -} - -#endif - -inline Transform3::Transform3( const Transform3 & tfrm ) -{ - mCol0 = tfrm.mCol0; - mCol1 = tfrm.mCol1; - mCol2 = tfrm.mCol2; - mCol3 = tfrm.mCol3; -} - -inline Transform3::Transform3( float scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); - mCol3 = Vector3( scalar ); -} - -inline Transform3::Transform3( const Vector3 & _col0, const Vector3 & _col1, const Vector3 & _col2, const Vector3 & _col3 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; - mCol3 = _col3; -} - -inline Transform3::Transform3( const Matrix3 & tfrm, const Vector3 & translateVec ) -{ - this->setUpper3x3( tfrm ); - this->setTranslation( translateVec ); -} - -inline Transform3::Transform3( const Quat & unitQuat, const Vector3 & translateVec ) -{ - this->setUpper3x3( Matrix3( unitQuat ) ); - this->setTranslation( translateVec ); -} - -inline Transform3 & Transform3::setCol0( const Vector3 & _col0 ) -{ - mCol0 = _col0; - return *this; -} - -inline Transform3 & Transform3::setCol1( const Vector3 & _col1 ) -{ - mCol1 = _col1; - return *this; -} - -inline Transform3 & Transform3::setCol2( const Vector3 & _col2 ) -{ - mCol2 = _col2; - return *this; -} - -inline Transform3 & Transform3::setCol3( const Vector3 & _col3 ) -{ - mCol3 = _col3; - return *this; -} - -inline Transform3 & Transform3::setCol( int col, const Vector3 & vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -inline Transform3 & Transform3::setRow( int row, const Vector4 & vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - mCol3.setElem( row, vec.getElem( 3 ) ); - return *this; -} - -inline Transform3 & Transform3::setElem( int col, int row, float val ) -{ - Vector3 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -inline float Transform3::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -inline const Vector3 Transform3::getCol0( ) const -{ - return mCol0; -} - -inline const Vector3 Transform3::getCol1( ) const -{ - return mCol1; -} - -inline const Vector3 Transform3::getCol2( ) const -{ - return mCol2; -} - -inline const Vector3 Transform3::getCol3( ) const -{ - return mCol3; -} - -inline const Vector3 Transform3::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -inline const Vector4 Transform3::getRow( int row ) const -{ - return Vector4( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ), mCol3.getElem( row ) ); -} - -inline Vector3 & Transform3::operator []( int col ) -{ - return *(&mCol0 + col); -} - -inline const Vector3 Transform3::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -inline Transform3 & Transform3::operator =( const Transform3 & tfrm ) -{ - mCol0 = tfrm.mCol0; - mCol1 = tfrm.mCol1; - mCol2 = tfrm.mCol2; - mCol3 = tfrm.mCol3; - return *this; -} - -inline const Transform3 inverse( const Transform3 & tfrm ) -{ - Vector3 tmp0, tmp1, tmp2, inv0, inv1, inv2; - float detinv; - tmp0 = cross( tfrm.getCol1(), tfrm.getCol2() ); - tmp1 = cross( tfrm.getCol2(), tfrm.getCol0() ); - tmp2 = cross( tfrm.getCol0(), tfrm.getCol1() ); - detinv = ( 1.0f / dot( tfrm.getCol2(), tmp2 ) ); - inv0 = Vector3( ( tmp0.getX() * detinv ), ( tmp1.getX() * detinv ), ( tmp2.getX() * detinv ) ); - inv1 = Vector3( ( tmp0.getY() * detinv ), ( tmp1.getY() * detinv ), ( tmp2.getY() * detinv ) ); - inv2 = Vector3( ( tmp0.getZ() * detinv ), ( tmp1.getZ() * detinv ), ( tmp2.getZ() * detinv ) ); - return Transform3( - inv0, - inv1, - inv2, - Vector3( ( -( ( inv0 * tfrm.getCol3().getX() ) + ( ( inv1 * tfrm.getCol3().getY() ) + ( inv2 * tfrm.getCol3().getZ() ) ) ) ) ) - ); -} - -inline const Transform3 orthoInverse( const Transform3 & tfrm ) -{ - Vector3 inv0, inv1, inv2; - inv0 = Vector3( tfrm.getCol0().getX(), tfrm.getCol1().getX(), tfrm.getCol2().getX() ); - inv1 = Vector3( tfrm.getCol0().getY(), tfrm.getCol1().getY(), tfrm.getCol2().getY() ); - inv2 = Vector3( tfrm.getCol0().getZ(), tfrm.getCol1().getZ(), tfrm.getCol2().getZ() ); - return Transform3( - inv0, - inv1, - inv2, - Vector3( ( -( ( inv0 * tfrm.getCol3().getX() ) + ( ( inv1 * tfrm.getCol3().getY() ) + ( inv2 * tfrm.getCol3().getZ() ) ) ) ) ) - ); -} - -inline const Transform3 absPerElem( const Transform3 & tfrm ) -{ - return Transform3( - absPerElem( tfrm.getCol0() ), - absPerElem( tfrm.getCol1() ), - absPerElem( tfrm.getCol2() ), - absPerElem( tfrm.getCol3() ) - ); -} - -inline const Vector3 Transform3::operator *( const Vector3 & vec ) const -{ - return Vector3( - ( ( ( mCol0.getX() * vec.getX() ) + ( mCol1.getX() * vec.getY() ) ) + ( mCol2.getX() * vec.getZ() ) ), - ( ( ( mCol0.getY() * vec.getX() ) + ( mCol1.getY() * vec.getY() ) ) + ( mCol2.getY() * vec.getZ() ) ), - ( ( ( mCol0.getZ() * vec.getX() ) + ( mCol1.getZ() * vec.getY() ) ) + ( mCol2.getZ() * vec.getZ() ) ) - ); -} - -inline const Point3 Transform3::operator *( const Point3 & pnt ) const -{ - return Point3( - ( ( ( ( mCol0.getX() * pnt.getX() ) + ( mCol1.getX() * pnt.getY() ) ) + ( mCol2.getX() * pnt.getZ() ) ) + mCol3.getX() ), - ( ( ( ( mCol0.getY() * pnt.getX() ) + ( mCol1.getY() * pnt.getY() ) ) + ( mCol2.getY() * pnt.getZ() ) ) + mCol3.getY() ), - ( ( ( ( mCol0.getZ() * pnt.getX() ) + ( mCol1.getZ() * pnt.getY() ) ) + ( mCol2.getZ() * pnt.getZ() ) ) + mCol3.getZ() ) - ); -} - -inline const Transform3 Transform3::operator *( const Transform3 & tfrm ) const -{ - return Transform3( - ( *this * tfrm.mCol0 ), - ( *this * tfrm.mCol1 ), - ( *this * tfrm.mCol2 ), - Vector3( ( *this * Point3( tfrm.mCol3 ) ) ) - ); -} - -inline Transform3 & Transform3::operator *=( const Transform3 & tfrm ) -{ - *this = *this * tfrm; - return *this; -} - -inline const Transform3 mulPerElem( const Transform3 & tfrm0, const Transform3 & tfrm1 ) -{ - return Transform3( - mulPerElem( tfrm0.getCol0(), tfrm1.getCol0() ), - mulPerElem( tfrm0.getCol1(), tfrm1.getCol1() ), - mulPerElem( tfrm0.getCol2(), tfrm1.getCol2() ), - mulPerElem( tfrm0.getCol3(), tfrm1.getCol3() ) - ); -} - -inline const Transform3 Transform3::identity( ) -{ - return Transform3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ), - Vector3( 0.0f ) - ); -} - -inline Transform3 & Transform3::setUpper3x3( const Matrix3 & tfrm ) -{ - mCol0 = tfrm.getCol0(); - mCol1 = tfrm.getCol1(); - mCol2 = tfrm.getCol2(); - return *this; -} - -inline const Matrix3 Transform3::getUpper3x3( ) const -{ - return Matrix3( mCol0, mCol1, mCol2 ); -} - -inline Transform3 & Transform3::setTranslation( const Vector3 & translateVec ) -{ - mCol3 = translateVec; - return *this; -} - -inline const Vector3 Transform3::getTranslation( ) const -{ - return mCol3; -} - -inline const Transform3 Transform3::rotationX( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Transform3( - Vector3::xAxis( ), - Vector3( 0.0f, c, s ), - Vector3( 0.0f, -s, c ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotationY( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Transform3( - Vector3( c, 0.0f, -s ), - Vector3::yAxis( ), - Vector3( s, 0.0f, c ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotationZ( float radians ) -{ - float s, c; - s = sinf( radians ); - c = cosf( radians ); - return Transform3( - Vector3( c, s, 0.0f ), - Vector3( -s, c, 0.0f ), - Vector3::zAxis( ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotationZYX( const Vector3 & radiansXYZ ) -{ - float sX, cX, sY, cY, sZ, cZ, tmp0, tmp1; - sX = sinf( radiansXYZ.getX() ); - cX = cosf( radiansXYZ.getX() ); - sY = sinf( radiansXYZ.getY() ); - cY = cosf( radiansXYZ.getY() ); - sZ = sinf( radiansXYZ.getZ() ); - cZ = cosf( radiansXYZ.getZ() ); - tmp0 = ( cZ * sY ); - tmp1 = ( sZ * sY ); - return Transform3( - Vector3( ( cZ * cY ), ( sZ * cY ), -sY ), - Vector3( ( ( tmp0 * sX ) - ( sZ * cX ) ), ( ( tmp1 * sX ) + ( cZ * cX ) ), ( cY * sX ) ), - Vector3( ( ( tmp0 * cX ) + ( sZ * sX ) ), ( ( tmp1 * cX ) - ( cZ * sX ) ), ( cY * cX ) ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 Transform3::rotation( float radians, const Vector3 & unitVec ) -{ - return Transform3( Matrix3::rotation( radians, unitVec ), Vector3( 0.0f ) ); -} - -inline const Transform3 Transform3::rotation( const Quat & unitQuat ) -{ - return Transform3( Matrix3( unitQuat ), Vector3( 0.0f ) ); -} - -inline const Transform3 Transform3::scale( const Vector3 & scaleVec ) -{ - return Transform3( - Vector3( scaleVec.getX(), 0.0f, 0.0f ), - Vector3( 0.0f, scaleVec.getY(), 0.0f ), - Vector3( 0.0f, 0.0f, scaleVec.getZ() ), - Vector3( 0.0f ) - ); -} - -inline const Transform3 appendScale( const Transform3 & tfrm, const Vector3 & scaleVec ) -{ - return Transform3( - ( tfrm.getCol0() * scaleVec.getX( ) ), - ( tfrm.getCol1() * scaleVec.getY( ) ), - ( tfrm.getCol2() * scaleVec.getZ( ) ), - tfrm.getCol3() - ); -} - -inline const Transform3 prependScale( const Vector3 & scaleVec, const Transform3 & tfrm ) -{ - return Transform3( - mulPerElem( tfrm.getCol0(), scaleVec ), - mulPerElem( tfrm.getCol1(), scaleVec ), - mulPerElem( tfrm.getCol2(), scaleVec ), - mulPerElem( tfrm.getCol3(), scaleVec ) - ); -} - -inline const Transform3 Transform3::translation( const Vector3 & translateVec ) -{ - return Transform3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ), - translateVec - ); -} - -inline const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, bool select1 ) -{ - return Transform3( - select( tfrm0.getCol0(), tfrm1.getCol0(), select1 ), - select( tfrm0.getCol1(), tfrm1.getCol1(), select1 ), - select( tfrm0.getCol2(), tfrm1.getCol2(), select1 ), - select( tfrm0.getCol3(), tfrm1.getCol3(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Transform3 & tfrm ) -{ - print( tfrm.getRow( 0 ) ); - print( tfrm.getRow( 1 ) ); - print( tfrm.getRow( 2 ) ); -} - -inline void print( const Transform3 & tfrm, const char * name ) -{ - printf("%s:\n", name); - print( tfrm ); -} - -#endif - -inline Quat::Quat( const Matrix3 & tfrm ) -{ - float trace, radicand, scale, xx, yx, zx, xy, yy, zy, xz, yz, zz, tmpx, tmpy, tmpz, tmpw, qx, qy, qz, qw; - int negTrace, ZgtX, ZgtY, YgtX; - int largestXorY, largestYorZ, largestZorX; - - xx = tfrm.getCol0().getX(); - yx = tfrm.getCol0().getY(); - zx = tfrm.getCol0().getZ(); - xy = tfrm.getCol1().getX(); - yy = tfrm.getCol1().getY(); - zy = tfrm.getCol1().getZ(); - xz = tfrm.getCol2().getX(); - yz = tfrm.getCol2().getY(); - zz = tfrm.getCol2().getZ(); - - trace = ( ( xx + yy ) + zz ); - - negTrace = ( trace < 0.0f ); - ZgtX = zz > xx; - ZgtY = zz > yy; - YgtX = yy > xx; - largestXorY = ( !ZgtX || !ZgtY ) && negTrace; - largestYorZ = ( YgtX || ZgtX ) && negTrace; - largestZorX = ( ZgtY || !YgtX ) && negTrace; - - if ( largestXorY ) - { - zz = -zz; - xy = -xy; - } - if ( largestYorZ ) - { - xx = -xx; - yz = -yz; - } - if ( largestZorX ) - { - yy = -yy; - zx = -zx; - } - - radicand = ( ( ( xx + yy ) + zz ) + 1.0f ); - scale = ( 0.5f * ( 1.0f / sqrtf( radicand ) ) ); - - tmpx = ( ( zy - yz ) * scale ); - tmpy = ( ( xz - zx ) * scale ); - tmpz = ( ( yx - xy ) * scale ); - tmpw = ( radicand * scale ); - qx = tmpx; - qy = tmpy; - qz = tmpz; - qw = tmpw; - - if ( largestXorY ) - { - qx = tmpw; - qy = tmpz; - qz = tmpy; - qw = tmpx; - } - if ( largestYorZ ) - { - tmpx = qx; - tmpz = qz; - qx = qy; - qy = tmpx; - qz = qw; - qw = tmpz; - } - - mX = qx; - mY = qy; - mZ = qz; - mW = qw; -} - -inline const Matrix3 outer( const Vector3 & tfrm0, const Vector3 & tfrm1 ) -{ - return Matrix3( - ( tfrm0 * tfrm1.getX( ) ), - ( tfrm0 * tfrm1.getY( ) ), - ( tfrm0 * tfrm1.getZ( ) ) - ); -} - -inline const Matrix4 outer( const Vector4 & tfrm0, const Vector4 & tfrm1 ) -{ - return Matrix4( - ( tfrm0 * tfrm1.getX( ) ), - ( tfrm0 * tfrm1.getY( ) ), - ( tfrm0 * tfrm1.getZ( ) ), - ( tfrm0 * tfrm1.getW( ) ) - ); -} - -inline const Vector3 rowMul( const Vector3 & vec, const Matrix3 & mat ) -{ - return Vector3( - ( ( ( vec.getX() * mat.getCol0().getX() ) + ( vec.getY() * mat.getCol0().getY() ) ) + ( vec.getZ() * mat.getCol0().getZ() ) ), - ( ( ( vec.getX() * mat.getCol1().getX() ) + ( vec.getY() * mat.getCol1().getY() ) ) + ( vec.getZ() * mat.getCol1().getZ() ) ), - ( ( ( vec.getX() * mat.getCol2().getX() ) + ( vec.getY() * mat.getCol2().getY() ) ) + ( vec.getZ() * mat.getCol2().getZ() ) ) - ); -} - -inline const Matrix3 crossMatrix( const Vector3 & vec ) -{ - return Matrix3( - Vector3( 0.0f, vec.getZ(), -vec.getY() ), - Vector3( -vec.getZ(), 0.0f, vec.getX() ), - Vector3( vec.getY(), -vec.getX(), 0.0f ) - ); -} - -inline const Matrix3 crossMatrixMul( const Vector3 & vec, const Matrix3 & mat ) -{ - return Matrix3( cross( vec, mat.getCol0() ), cross( vec, mat.getCol1() ), cross( vec, mat.getCol2() ) ); -} - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/scalar/quat_aos.h b/Engine/lib/bullet/src/vectormath/scalar/quat_aos.h deleted file mode 100644 index 764e01708..000000000 --- a/Engine/lib/bullet/src/vectormath/scalar/quat_aos.h +++ /dev/null @@ -1,433 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_QUAT_AOS_CPP_H -#define _VECTORMATH_QUAT_AOS_CPP_H - -//----------------------------------------------------------------------------- -// Definitions - -#ifndef _VECTORMATH_INTERNAL_FUNCTIONS -#define _VECTORMATH_INTERNAL_FUNCTIONS - -#endif - -namespace Vectormath { -namespace Aos { - -inline Quat::Quat( const Quat & quat ) -{ - mX = quat.mX; - mY = quat.mY; - mZ = quat.mZ; - mW = quat.mW; -} - -inline Quat::Quat( float _x, float _y, float _z, float _w ) -{ - mX = _x; - mY = _y; - mZ = _z; - mW = _w; -} - -inline Quat::Quat( const Vector3 & xyz, float _w ) -{ - this->setXYZ( xyz ); - this->setW( _w ); -} - -inline Quat::Quat( const Vector4 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); - mW = vec.getW(); -} - -inline Quat::Quat( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; - mW = scalar; -} - -inline const Quat Quat::identity( ) -{ - return Quat( 0.0f, 0.0f, 0.0f, 1.0f ); -} - -inline const Quat lerp( float t, const Quat & quat0, const Quat & quat1 ) -{ - return ( quat0 + ( ( quat1 - quat0 ) * t ) ); -} - -inline const Quat slerp( float t, const Quat & unitQuat0, const Quat & unitQuat1 ) -{ - Quat start; - float recipSinAngle, scale0, scale1, cosAngle, angle; - cosAngle = dot( unitQuat0, unitQuat1 ); - if ( cosAngle < 0.0f ) { - cosAngle = -cosAngle; - start = ( -unitQuat0 ); - } else { - start = unitQuat0; - } - if ( cosAngle < _VECTORMATH_SLERP_TOL ) { - angle = acosf( cosAngle ); - recipSinAngle = ( 1.0f / sinf( angle ) ); - scale0 = ( sinf( ( ( 1.0f - t ) * angle ) ) * recipSinAngle ); - scale1 = ( sinf( ( t * angle ) ) * recipSinAngle ); - } else { - scale0 = ( 1.0f - t ); - scale1 = t; - } - return ( ( start * scale0 ) + ( unitQuat1 * scale1 ) ); -} - -inline const Quat squad( float t, const Quat & unitQuat0, const Quat & unitQuat1, const Quat & unitQuat2, const Quat & unitQuat3 ) -{ - Quat tmp0, tmp1; - tmp0 = slerp( t, unitQuat0, unitQuat3 ); - tmp1 = slerp( t, unitQuat1, unitQuat2 ); - return slerp( ( ( 2.0f * t ) * ( 1.0f - t ) ), tmp0, tmp1 ); -} - -inline void loadXYZW( Quat & quat, const float * fptr ) -{ - quat = Quat( fptr[0], fptr[1], fptr[2], fptr[3] ); -} - -inline void storeXYZW( const Quat & quat, float * fptr ) -{ - fptr[0] = quat.getX(); - fptr[1] = quat.getY(); - fptr[2] = quat.getZ(); - fptr[3] = quat.getW(); -} - -inline Quat & Quat::operator =( const Quat & quat ) -{ - mX = quat.mX; - mY = quat.mY; - mZ = quat.mZ; - mW = quat.mW; - return *this; -} - -inline Quat & Quat::setXYZ( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); - return *this; -} - -inline const Vector3 Quat::getXYZ( ) const -{ - return Vector3( mX, mY, mZ ); -} - -inline Quat & Quat::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Quat::getX( ) const -{ - return mX; -} - -inline Quat & Quat::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Quat::getY( ) const -{ - return mY; -} - -inline Quat & Quat::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Quat::getZ( ) const -{ - return mZ; -} - -inline Quat & Quat::setW( float _w ) -{ - mW = _w; - return *this; -} - -inline float Quat::getW( ) const -{ - return mW; -} - -inline Quat & Quat::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Quat::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Quat::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Quat::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Quat Quat::operator +( const Quat & quat ) const -{ - return Quat( - ( mX + quat.mX ), - ( mY + quat.mY ), - ( mZ + quat.mZ ), - ( mW + quat.mW ) - ); -} - -inline const Quat Quat::operator -( const Quat & quat ) const -{ - return Quat( - ( mX - quat.mX ), - ( mY - quat.mY ), - ( mZ - quat.mZ ), - ( mW - quat.mW ) - ); -} - -inline const Quat Quat::operator *( float scalar ) const -{ - return Quat( - ( mX * scalar ), - ( mY * scalar ), - ( mZ * scalar ), - ( mW * scalar ) - ); -} - -inline Quat & Quat::operator +=( const Quat & quat ) -{ - *this = *this + quat; - return *this; -} - -inline Quat & Quat::operator -=( const Quat & quat ) -{ - *this = *this - quat; - return *this; -} - -inline Quat & Quat::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Quat Quat::operator /( float scalar ) const -{ - return Quat( - ( mX / scalar ), - ( mY / scalar ), - ( mZ / scalar ), - ( mW / scalar ) - ); -} - -inline Quat & Quat::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -inline const Quat Quat::operator -( ) const -{ - return Quat( - -mX, - -mY, - -mZ, - -mW - ); -} - -inline const Quat operator *( float scalar, const Quat & quat ) -{ - return quat * scalar; -} - -inline float dot( const Quat & quat0, const Quat & quat1 ) -{ - float result; - result = ( quat0.getX() * quat1.getX() ); - result = ( result + ( quat0.getY() * quat1.getY() ) ); - result = ( result + ( quat0.getZ() * quat1.getZ() ) ); - result = ( result + ( quat0.getW() * quat1.getW() ) ); - return result; -} - -inline float norm( const Quat & quat ) -{ - float result; - result = ( quat.getX() * quat.getX() ); - result = ( result + ( quat.getY() * quat.getY() ) ); - result = ( result + ( quat.getZ() * quat.getZ() ) ); - result = ( result + ( quat.getW() * quat.getW() ) ); - return result; -} - -inline float length( const Quat & quat ) -{ - return ::sqrtf( norm( quat ) ); -} - -inline const Quat normalize( const Quat & quat ) -{ - float lenSqr, lenInv; - lenSqr = norm( quat ); - lenInv = ( 1.0f / sqrtf( lenSqr ) ); - return Quat( - ( quat.getX() * lenInv ), - ( quat.getY() * lenInv ), - ( quat.getZ() * lenInv ), - ( quat.getW() * lenInv ) - ); -} - -inline const Quat Quat::rotation( const Vector3 & unitVec0, const Vector3 & unitVec1 ) -{ - float cosHalfAngleX2, recipCosHalfAngleX2; - cosHalfAngleX2 = sqrtf( ( 2.0f * ( 1.0f + dot( unitVec0, unitVec1 ) ) ) ); - recipCosHalfAngleX2 = ( 1.0f / cosHalfAngleX2 ); - return Quat( ( cross( unitVec0, unitVec1 ) * recipCosHalfAngleX2 ), ( cosHalfAngleX2 * 0.5f ) ); -} - -inline const Quat Quat::rotation( float radians, const Vector3 & unitVec ) -{ - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( ( unitVec * s ), c ); -} - -inline const Quat Quat::rotationX( float radians ) -{ - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( s, 0.0f, 0.0f, c ); -} - -inline const Quat Quat::rotationY( float radians ) -{ - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( 0.0f, s, 0.0f, c ); -} - -inline const Quat Quat::rotationZ( float radians ) -{ - float s, c, angle; - angle = ( radians * 0.5f ); - s = sinf( angle ); - c = cosf( angle ); - return Quat( 0.0f, 0.0f, s, c ); -} - -inline const Quat Quat::operator *( const Quat & quat ) const -{ - return Quat( - ( ( ( ( mW * quat.mX ) + ( mX * quat.mW ) ) + ( mY * quat.mZ ) ) - ( mZ * quat.mY ) ), - ( ( ( ( mW * quat.mY ) + ( mY * quat.mW ) ) + ( mZ * quat.mX ) ) - ( mX * quat.mZ ) ), - ( ( ( ( mW * quat.mZ ) + ( mZ * quat.mW ) ) + ( mX * quat.mY ) ) - ( mY * quat.mX ) ), - ( ( ( ( mW * quat.mW ) - ( mX * quat.mX ) ) - ( mY * quat.mY ) ) - ( mZ * quat.mZ ) ) - ); -} - -inline Quat & Quat::operator *=( const Quat & quat ) -{ - *this = *this * quat; - return *this; -} - -inline const Vector3 rotate( const Quat & quat, const Vector3 & vec ) -{ - float tmpX, tmpY, tmpZ, tmpW; - tmpX = ( ( ( quat.getW() * vec.getX() ) + ( quat.getY() * vec.getZ() ) ) - ( quat.getZ() * vec.getY() ) ); - tmpY = ( ( ( quat.getW() * vec.getY() ) + ( quat.getZ() * vec.getX() ) ) - ( quat.getX() * vec.getZ() ) ); - tmpZ = ( ( ( quat.getW() * vec.getZ() ) + ( quat.getX() * vec.getY() ) ) - ( quat.getY() * vec.getX() ) ); - tmpW = ( ( ( quat.getX() * vec.getX() ) + ( quat.getY() * vec.getY() ) ) + ( quat.getZ() * vec.getZ() ) ); - return Vector3( - ( ( ( ( tmpW * quat.getX() ) + ( tmpX * quat.getW() ) ) - ( tmpY * quat.getZ() ) ) + ( tmpZ * quat.getY() ) ), - ( ( ( ( tmpW * quat.getY() ) + ( tmpY * quat.getW() ) ) - ( tmpZ * quat.getX() ) ) + ( tmpX * quat.getZ() ) ), - ( ( ( ( tmpW * quat.getZ() ) + ( tmpZ * quat.getW() ) ) - ( tmpX * quat.getY() ) ) + ( tmpY * quat.getX() ) ) - ); -} - -inline const Quat conj( const Quat & quat ) -{ - return Quat( -quat.getX(), -quat.getY(), -quat.getZ(), quat.getW() ); -} - -inline const Quat select( const Quat & quat0, const Quat & quat1, bool select1 ) -{ - return Quat( - ( select1 )? quat1.getX() : quat0.getX(), - ( select1 )? quat1.getY() : quat0.getY(), - ( select1 )? quat1.getZ() : quat0.getZ(), - ( select1 )? quat1.getW() : quat0.getW() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Quat & quat ) -{ - printf( "( %f %f %f %f )\n", quat.getX(), quat.getY(), quat.getZ(), quat.getW() ); -} - -inline void print( const Quat & quat, const char * name ) -{ - printf( "%s: ( %f %f %f %f )\n", name, quat.getX(), quat.getY(), quat.getZ(), quat.getW() ); -} - -#endif - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/scalar/vec_aos.h b/Engine/lib/bullet/src/vectormath/scalar/vec_aos.h deleted file mode 100644 index 46d4d6b3e..000000000 --- a/Engine/lib/bullet/src/vectormath/scalar/vec_aos.h +++ /dev/null @@ -1,1426 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_VEC_AOS_CPP_H -#define _VECTORMATH_VEC_AOS_CPP_H - -//----------------------------------------------------------------------------- -// Constants - -#define _VECTORMATH_SLERP_TOL 0.999f - -//----------------------------------------------------------------------------- -// Definitions - -#ifndef _VECTORMATH_INTERNAL_FUNCTIONS -#define _VECTORMATH_INTERNAL_FUNCTIONS - -#endif - -namespace Vectormath { -namespace Aos { - -inline Vector3::Vector3( const Vector3 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; -} - -inline Vector3::Vector3( float _x, float _y, float _z ) -{ - mX = _x; - mY = _y; - mZ = _z; -} - -inline Vector3::Vector3( const Point3 & pnt ) -{ - mX = pnt.getX(); - mY = pnt.getY(); - mZ = pnt.getZ(); -} - -inline Vector3::Vector3( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; -} - -inline const Vector3 Vector3::xAxis( ) -{ - return Vector3( 1.0f, 0.0f, 0.0f ); -} - -inline const Vector3 Vector3::yAxis( ) -{ - return Vector3( 0.0f, 1.0f, 0.0f ); -} - -inline const Vector3 Vector3::zAxis( ) -{ - return Vector3( 0.0f, 0.0f, 1.0f ); -} - -inline const Vector3 lerp( float t, const Vector3 & vec0, const Vector3 & vec1 ) -{ - return ( vec0 + ( ( vec1 - vec0 ) * t ) ); -} - -inline const Vector3 slerp( float t, const Vector3 & unitVec0, const Vector3 & unitVec1 ) -{ - float recipSinAngle, scale0, scale1, cosAngle, angle; - cosAngle = dot( unitVec0, unitVec1 ); - if ( cosAngle < _VECTORMATH_SLERP_TOL ) { - angle = acosf( cosAngle ); - recipSinAngle = ( 1.0f / sinf( angle ) ); - scale0 = ( sinf( ( ( 1.0f - t ) * angle ) ) * recipSinAngle ); - scale1 = ( sinf( ( t * angle ) ) * recipSinAngle ); - } else { - scale0 = ( 1.0f - t ); - scale1 = t; - } - return ( ( unitVec0 * scale0 ) + ( unitVec1 * scale1 ) ); -} - -inline void loadXYZ( Vector3 & vec, const float * fptr ) -{ - vec = Vector3( fptr[0], fptr[1], fptr[2] ); -} - -inline void storeXYZ( const Vector3 & vec, float * fptr ) -{ - fptr[0] = vec.getX(); - fptr[1] = vec.getY(); - fptr[2] = vec.getZ(); -} - -inline void loadHalfFloats( Vector3 & vec, const unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - unsigned short fp16 = hfptr[i]; - unsigned int sign = fp16 >> 15; - unsigned int exponent = (fp16 >> 10) & ((1 << 5) - 1); - unsigned int mantissa = fp16 & ((1 << 10) - 1); - - if (exponent == 0) { - // zero - mantissa = 0; - - } else if (exponent == 31) { - // infinity or nan -> infinity - exponent = 255; - mantissa = 0; - - } else { - exponent += 127 - 15; - mantissa <<= 13; - } - - Data32 d; - d.u32 = (sign << 31) | (exponent << 23) | mantissa; - vec[i] = d.f32; - } -} - -inline void storeHalfFloats( const Vector3 & vec, unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - Data32 d; - d.f32 = vec[i]; - - unsigned int sign = d.u32 >> 31; - unsigned int exponent = (d.u32 >> 23) & ((1 << 8) - 1); - unsigned int mantissa = d.u32 & ((1 << 23) - 1);; - - if (exponent == 0) { - // zero or denorm -> zero - mantissa = 0; - - } else if (exponent == 255 && mantissa != 0) { - // nan -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent >= 127 - 15 + 31) { - // overflow or infinity -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent <= 127 - 15) { - // underflow -> zero - exponent = 0; - mantissa = 0; - - } else { - exponent -= 127 - 15; - mantissa >>= 13; - } - - hfptr[i] = (unsigned short)((sign << 15) | (exponent << 10) | mantissa); - } -} - -inline Vector3 & Vector3::operator =( const Vector3 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; - return *this; -} - -inline Vector3 & Vector3::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Vector3::getX( ) const -{ - return mX; -} - -inline Vector3 & Vector3::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Vector3::getY( ) const -{ - return mY; -} - -inline Vector3 & Vector3::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Vector3::getZ( ) const -{ - return mZ; -} - -inline Vector3 & Vector3::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Vector3::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Vector3::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Vector3::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Vector3 Vector3::operator +( const Vector3 & vec ) const -{ - return Vector3( - ( mX + vec.mX ), - ( mY + vec.mY ), - ( mZ + vec.mZ ) - ); -} - -inline const Vector3 Vector3::operator -( const Vector3 & vec ) const -{ - return Vector3( - ( mX - vec.mX ), - ( mY - vec.mY ), - ( mZ - vec.mZ ) - ); -} - -inline const Point3 Vector3::operator +( const Point3 & pnt ) const -{ - return Point3( - ( mX + pnt.getX() ), - ( mY + pnt.getY() ), - ( mZ + pnt.getZ() ) - ); -} - -inline const Vector3 Vector3::operator *( float scalar ) const -{ - return Vector3( - ( mX * scalar ), - ( mY * scalar ), - ( mZ * scalar ) - ); -} - -inline Vector3 & Vector3::operator +=( const Vector3 & vec ) -{ - *this = *this + vec; - return *this; -} - -inline Vector3 & Vector3::operator -=( const Vector3 & vec ) -{ - *this = *this - vec; - return *this; -} - -inline Vector3 & Vector3::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Vector3 Vector3::operator /( float scalar ) const -{ - return Vector3( - ( mX / scalar ), - ( mY / scalar ), - ( mZ / scalar ) - ); -} - -inline Vector3 & Vector3::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -inline const Vector3 Vector3::operator -( ) const -{ - return Vector3( - -mX, - -mY, - -mZ - ); -} - -inline const Vector3 operator *( float scalar, const Vector3 & vec ) -{ - return vec * scalar; -} - -inline const Vector3 mulPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( vec0.getX() * vec1.getX() ), - ( vec0.getY() * vec1.getY() ), - ( vec0.getZ() * vec1.getZ() ) - ); -} - -inline const Vector3 divPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( vec0.getX() / vec1.getX() ), - ( vec0.getY() / vec1.getY() ), - ( vec0.getZ() / vec1.getZ() ) - ); -} - -inline const Vector3 recipPerElem( const Vector3 & vec ) -{ - return Vector3( - ( 1.0f / vec.getX() ), - ( 1.0f / vec.getY() ), - ( 1.0f / vec.getZ() ) - ); -} - -inline const Vector3 sqrtPerElem( const Vector3 & vec ) -{ - return Vector3( - sqrtf( vec.getX() ), - sqrtf( vec.getY() ), - sqrtf( vec.getZ() ) - ); -} - -inline const Vector3 rsqrtPerElem( const Vector3 & vec ) -{ - return Vector3( - ( 1.0f / sqrtf( vec.getX() ) ), - ( 1.0f / sqrtf( vec.getY() ) ), - ( 1.0f / sqrtf( vec.getZ() ) ) - ); -} - -inline const Vector3 absPerElem( const Vector3 & vec ) -{ - return Vector3( - fabsf( vec.getX() ), - fabsf( vec.getY() ), - fabsf( vec.getZ() ) - ); -} - -inline const Vector3 copySignPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( vec1.getX() < 0.0f )? -fabsf( vec0.getX() ) : fabsf( vec0.getX() ), - ( vec1.getY() < 0.0f )? -fabsf( vec0.getY() ) : fabsf( vec0.getY() ), - ( vec1.getZ() < 0.0f )? -fabsf( vec0.getZ() ) : fabsf( vec0.getZ() ) - ); -} - -inline const Vector3 maxPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - (vec0.getX() > vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() > vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() > vec1.getZ())? vec0.getZ() : vec1.getZ() - ); -} - -inline float maxElem( const Vector3 & vec ) -{ - float result; - result = (vec.getX() > vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() > result)? vec.getZ() : result; - return result; -} - -inline const Vector3 minPerElem( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - (vec0.getX() < vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() < vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() < vec1.getZ())? vec0.getZ() : vec1.getZ() - ); -} - -inline float minElem( const Vector3 & vec ) -{ - float result; - result = (vec.getX() < vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() < result)? vec.getZ() : result; - return result; -} - -inline float sum( const Vector3 & vec ) -{ - float result; - result = ( vec.getX() + vec.getY() ); - result = ( result + vec.getZ() ); - return result; -} - -inline float dot( const Vector3 & vec0, const Vector3 & vec1 ) -{ - float result; - result = ( vec0.getX() * vec1.getX() ); - result = ( result + ( vec0.getY() * vec1.getY() ) ); - result = ( result + ( vec0.getZ() * vec1.getZ() ) ); - return result; -} - -inline float lengthSqr( const Vector3 & vec ) -{ - float result; - result = ( vec.getX() * vec.getX() ); - result = ( result + ( vec.getY() * vec.getY() ) ); - result = ( result + ( vec.getZ() * vec.getZ() ) ); - return result; -} - -inline float length( const Vector3 & vec ) -{ - return ::sqrtf( lengthSqr( vec ) ); -} - -inline const Vector3 normalize( const Vector3 & vec ) -{ - float lenSqr, lenInv; - lenSqr = lengthSqr( vec ); - lenInv = ( 1.0f / sqrtf( lenSqr ) ); - return Vector3( - ( vec.getX() * lenInv ), - ( vec.getY() * lenInv ), - ( vec.getZ() * lenInv ) - ); -} - -inline const Vector3 cross( const Vector3 & vec0, const Vector3 & vec1 ) -{ - return Vector3( - ( ( vec0.getY() * vec1.getZ() ) - ( vec0.getZ() * vec1.getY() ) ), - ( ( vec0.getZ() * vec1.getX() ) - ( vec0.getX() * vec1.getZ() ) ), - ( ( vec0.getX() * vec1.getY() ) - ( vec0.getY() * vec1.getX() ) ) - ); -} - -inline const Vector3 select( const Vector3 & vec0, const Vector3 & vec1, bool select1 ) -{ - return Vector3( - ( select1 )? vec1.getX() : vec0.getX(), - ( select1 )? vec1.getY() : vec0.getY(), - ( select1 )? vec1.getZ() : vec0.getZ() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Vector3 & vec ) -{ - printf( "( %f %f %f )\n", vec.getX(), vec.getY(), vec.getZ() ); -} - -inline void print( const Vector3 & vec, const char * name ) -{ - printf( "%s: ( %f %f %f )\n", name, vec.getX(), vec.getY(), vec.getZ() ); -} - -#endif - -inline Vector4::Vector4( const Vector4 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; - mW = vec.mW; -} - -inline Vector4::Vector4( float _x, float _y, float _z, float _w ) -{ - mX = _x; - mY = _y; - mZ = _z; - mW = _w; -} - -inline Vector4::Vector4( const Vector3 & xyz, float _w ) -{ - this->setXYZ( xyz ); - this->setW( _w ); -} - -inline Vector4::Vector4( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); - mW = 0.0f; -} - -inline Vector4::Vector4( const Point3 & pnt ) -{ - mX = pnt.getX(); - mY = pnt.getY(); - mZ = pnt.getZ(); - mW = 1.0f; -} - -inline Vector4::Vector4( const Quat & quat ) -{ - mX = quat.getX(); - mY = quat.getY(); - mZ = quat.getZ(); - mW = quat.getW(); -} - -inline Vector4::Vector4( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; - mW = scalar; -} - -inline const Vector4 Vector4::xAxis( ) -{ - return Vector4( 1.0f, 0.0f, 0.0f, 0.0f ); -} - -inline const Vector4 Vector4::yAxis( ) -{ - return Vector4( 0.0f, 1.0f, 0.0f, 0.0f ); -} - -inline const Vector4 Vector4::zAxis( ) -{ - return Vector4( 0.0f, 0.0f, 1.0f, 0.0f ); -} - -inline const Vector4 Vector4::wAxis( ) -{ - return Vector4( 0.0f, 0.0f, 0.0f, 1.0f ); -} - -inline const Vector4 lerp( float t, const Vector4 & vec0, const Vector4 & vec1 ) -{ - return ( vec0 + ( ( vec1 - vec0 ) * t ) ); -} - -inline const Vector4 slerp( float t, const Vector4 & unitVec0, const Vector4 & unitVec1 ) -{ - float recipSinAngle, scale0, scale1, cosAngle, angle; - cosAngle = dot( unitVec0, unitVec1 ); - if ( cosAngle < _VECTORMATH_SLERP_TOL ) { - angle = acosf( cosAngle ); - recipSinAngle = ( 1.0f / sinf( angle ) ); - scale0 = ( sinf( ( ( 1.0f - t ) * angle ) ) * recipSinAngle ); - scale1 = ( sinf( ( t * angle ) ) * recipSinAngle ); - } else { - scale0 = ( 1.0f - t ); - scale1 = t; - } - return ( ( unitVec0 * scale0 ) + ( unitVec1 * scale1 ) ); -} - -inline void loadXYZW( Vector4 & vec, const float * fptr ) -{ - vec = Vector4( fptr[0], fptr[1], fptr[2], fptr[3] ); -} - -inline void storeXYZW( const Vector4 & vec, float * fptr ) -{ - fptr[0] = vec.getX(); - fptr[1] = vec.getY(); - fptr[2] = vec.getZ(); - fptr[3] = vec.getW(); -} - -inline void loadHalfFloats( Vector4 & vec, const unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 4; i++) { - unsigned short fp16 = hfptr[i]; - unsigned int sign = fp16 >> 15; - unsigned int exponent = (fp16 >> 10) & ((1 << 5) - 1); - unsigned int mantissa = fp16 & ((1 << 10) - 1); - - if (exponent == 0) { - // zero - mantissa = 0; - - } else if (exponent == 31) { - // infinity or nan -> infinity - exponent = 255; - mantissa = 0; - - } else { - exponent += 127 - 15; - mantissa <<= 13; - } - - Data32 d; - d.u32 = (sign << 31) | (exponent << 23) | mantissa; - vec[i] = d.f32; - } -} - -inline void storeHalfFloats( const Vector4 & vec, unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 4; i++) { - Data32 d; - d.f32 = vec[i]; - - unsigned int sign = d.u32 >> 31; - unsigned int exponent = (d.u32 >> 23) & ((1 << 8) - 1); - unsigned int mantissa = d.u32 & ((1 << 23) - 1);; - - if (exponent == 0) { - // zero or denorm -> zero - mantissa = 0; - - } else if (exponent == 255 && mantissa != 0) { - // nan -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent >= 127 - 15 + 31) { - // overflow or infinity -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent <= 127 - 15) { - // underflow -> zero - exponent = 0; - mantissa = 0; - - } else { - exponent -= 127 - 15; - mantissa >>= 13; - } - - hfptr[i] = (unsigned short)((sign << 15) | (exponent << 10) | mantissa); - } -} - -inline Vector4 & Vector4::operator =( const Vector4 & vec ) -{ - mX = vec.mX; - mY = vec.mY; - mZ = vec.mZ; - mW = vec.mW; - return *this; -} - -inline Vector4 & Vector4::setXYZ( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); - return *this; -} - -inline const Vector3 Vector4::getXYZ( ) const -{ - return Vector3( mX, mY, mZ ); -} - -inline Vector4 & Vector4::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Vector4::getX( ) const -{ - return mX; -} - -inline Vector4 & Vector4::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Vector4::getY( ) const -{ - return mY; -} - -inline Vector4 & Vector4::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Vector4::getZ( ) const -{ - return mZ; -} - -inline Vector4 & Vector4::setW( float _w ) -{ - mW = _w; - return *this; -} - -inline float Vector4::getW( ) const -{ - return mW; -} - -inline Vector4 & Vector4::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Vector4::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Vector4::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Vector4::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Vector4 Vector4::operator +( const Vector4 & vec ) const -{ - return Vector4( - ( mX + vec.mX ), - ( mY + vec.mY ), - ( mZ + vec.mZ ), - ( mW + vec.mW ) - ); -} - -inline const Vector4 Vector4::operator -( const Vector4 & vec ) const -{ - return Vector4( - ( mX - vec.mX ), - ( mY - vec.mY ), - ( mZ - vec.mZ ), - ( mW - vec.mW ) - ); -} - -inline const Vector4 Vector4::operator *( float scalar ) const -{ - return Vector4( - ( mX * scalar ), - ( mY * scalar ), - ( mZ * scalar ), - ( mW * scalar ) - ); -} - -inline Vector4 & Vector4::operator +=( const Vector4 & vec ) -{ - *this = *this + vec; - return *this; -} - -inline Vector4 & Vector4::operator -=( const Vector4 & vec ) -{ - *this = *this - vec; - return *this; -} - -inline Vector4 & Vector4::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -inline const Vector4 Vector4::operator /( float scalar ) const -{ - return Vector4( - ( mX / scalar ), - ( mY / scalar ), - ( mZ / scalar ), - ( mW / scalar ) - ); -} - -inline Vector4 & Vector4::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -inline const Vector4 Vector4::operator -( ) const -{ - return Vector4( - -mX, - -mY, - -mZ, - -mW - ); -} - -inline const Vector4 operator *( float scalar, const Vector4 & vec ) -{ - return vec * scalar; -} - -inline const Vector4 mulPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - ( vec0.getX() * vec1.getX() ), - ( vec0.getY() * vec1.getY() ), - ( vec0.getZ() * vec1.getZ() ), - ( vec0.getW() * vec1.getW() ) - ); -} - -inline const Vector4 divPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - ( vec0.getX() / vec1.getX() ), - ( vec0.getY() / vec1.getY() ), - ( vec0.getZ() / vec1.getZ() ), - ( vec0.getW() / vec1.getW() ) - ); -} - -inline const Vector4 recipPerElem( const Vector4 & vec ) -{ - return Vector4( - ( 1.0f / vec.getX() ), - ( 1.0f / vec.getY() ), - ( 1.0f / vec.getZ() ), - ( 1.0f / vec.getW() ) - ); -} - -inline const Vector4 sqrtPerElem( const Vector4 & vec ) -{ - return Vector4( - sqrtf( vec.getX() ), - sqrtf( vec.getY() ), - sqrtf( vec.getZ() ), - sqrtf( vec.getW() ) - ); -} - -inline const Vector4 rsqrtPerElem( const Vector4 & vec ) -{ - return Vector4( - ( 1.0f / sqrtf( vec.getX() ) ), - ( 1.0f / sqrtf( vec.getY() ) ), - ( 1.0f / sqrtf( vec.getZ() ) ), - ( 1.0f / sqrtf( vec.getW() ) ) - ); -} - -inline const Vector4 absPerElem( const Vector4 & vec ) -{ - return Vector4( - fabsf( vec.getX() ), - fabsf( vec.getY() ), - fabsf( vec.getZ() ), - fabsf( vec.getW() ) - ); -} - -inline const Vector4 copySignPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - ( vec1.getX() < 0.0f )? -fabsf( vec0.getX() ) : fabsf( vec0.getX() ), - ( vec1.getY() < 0.0f )? -fabsf( vec0.getY() ) : fabsf( vec0.getY() ), - ( vec1.getZ() < 0.0f )? -fabsf( vec0.getZ() ) : fabsf( vec0.getZ() ), - ( vec1.getW() < 0.0f )? -fabsf( vec0.getW() ) : fabsf( vec0.getW() ) - ); -} - -inline const Vector4 maxPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - (vec0.getX() > vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() > vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() > vec1.getZ())? vec0.getZ() : vec1.getZ(), - (vec0.getW() > vec1.getW())? vec0.getW() : vec1.getW() - ); -} - -inline float maxElem( const Vector4 & vec ) -{ - float result; - result = (vec.getX() > vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() > result)? vec.getZ() : result; - result = (vec.getW() > result)? vec.getW() : result; - return result; -} - -inline const Vector4 minPerElem( const Vector4 & vec0, const Vector4 & vec1 ) -{ - return Vector4( - (vec0.getX() < vec1.getX())? vec0.getX() : vec1.getX(), - (vec0.getY() < vec1.getY())? vec0.getY() : vec1.getY(), - (vec0.getZ() < vec1.getZ())? vec0.getZ() : vec1.getZ(), - (vec0.getW() < vec1.getW())? vec0.getW() : vec1.getW() - ); -} - -inline float minElem( const Vector4 & vec ) -{ - float result; - result = (vec.getX() < vec.getY())? vec.getX() : vec.getY(); - result = (vec.getZ() < result)? vec.getZ() : result; - result = (vec.getW() < result)? vec.getW() : result; - return result; -} - -inline float sum( const Vector4 & vec ) -{ - float result; - result = ( vec.getX() + vec.getY() ); - result = ( result + vec.getZ() ); - result = ( result + vec.getW() ); - return result; -} - -inline float dot( const Vector4 & vec0, const Vector4 & vec1 ) -{ - float result; - result = ( vec0.getX() * vec1.getX() ); - result = ( result + ( vec0.getY() * vec1.getY() ) ); - result = ( result + ( vec0.getZ() * vec1.getZ() ) ); - result = ( result + ( vec0.getW() * vec1.getW() ) ); - return result; -} - -inline float lengthSqr( const Vector4 & vec ) -{ - float result; - result = ( vec.getX() * vec.getX() ); - result = ( result + ( vec.getY() * vec.getY() ) ); - result = ( result + ( vec.getZ() * vec.getZ() ) ); - result = ( result + ( vec.getW() * vec.getW() ) ); - return result; -} - -inline float length( const Vector4 & vec ) -{ - return ::sqrtf( lengthSqr( vec ) ); -} - -inline const Vector4 normalize( const Vector4 & vec ) -{ - float lenSqr, lenInv; - lenSqr = lengthSqr( vec ); - lenInv = ( 1.0f / sqrtf( lenSqr ) ); - return Vector4( - ( vec.getX() * lenInv ), - ( vec.getY() * lenInv ), - ( vec.getZ() * lenInv ), - ( vec.getW() * lenInv ) - ); -} - -inline const Vector4 select( const Vector4 & vec0, const Vector4 & vec1, bool select1 ) -{ - return Vector4( - ( select1 )? vec1.getX() : vec0.getX(), - ( select1 )? vec1.getY() : vec0.getY(), - ( select1 )? vec1.getZ() : vec0.getZ(), - ( select1 )? vec1.getW() : vec0.getW() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Vector4 & vec ) -{ - printf( "( %f %f %f %f )\n", vec.getX(), vec.getY(), vec.getZ(), vec.getW() ); -} - -inline void print( const Vector4 & vec, const char * name ) -{ - printf( "%s: ( %f %f %f %f )\n", name, vec.getX(), vec.getY(), vec.getZ(), vec.getW() ); -} - -#endif - -inline Point3::Point3( const Point3 & pnt ) -{ - mX = pnt.mX; - mY = pnt.mY; - mZ = pnt.mZ; -} - -inline Point3::Point3( float _x, float _y, float _z ) -{ - mX = _x; - mY = _y; - mZ = _z; -} - -inline Point3::Point3( const Vector3 & vec ) -{ - mX = vec.getX(); - mY = vec.getY(); - mZ = vec.getZ(); -} - -inline Point3::Point3( float scalar ) -{ - mX = scalar; - mY = scalar; - mZ = scalar; -} - -inline const Point3 lerp( float t, const Point3 & pnt0, const Point3 & pnt1 ) -{ - return ( pnt0 + ( ( pnt1 - pnt0 ) * t ) ); -} - -inline void loadXYZ( Point3 & pnt, const float * fptr ) -{ - pnt = Point3( fptr[0], fptr[1], fptr[2] ); -} - -inline void storeXYZ( const Point3 & pnt, float * fptr ) -{ - fptr[0] = pnt.getX(); - fptr[1] = pnt.getY(); - fptr[2] = pnt.getZ(); -} - -inline void loadHalfFloats( Point3 & vec, const unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - unsigned short fp16 = hfptr[i]; - unsigned int sign = fp16 >> 15; - unsigned int exponent = (fp16 >> 10) & ((1 << 5) - 1); - unsigned int mantissa = fp16 & ((1 << 10) - 1); - - if (exponent == 0) { - // zero - mantissa = 0; - - } else if (exponent == 31) { - // infinity or nan -> infinity - exponent = 255; - mantissa = 0; - - } else { - exponent += 127 - 15; - mantissa <<= 13; - } - - Data32 d; - d.u32 = (sign << 31) | (exponent << 23) | mantissa; - vec[i] = d.f32; - } -} - -inline void storeHalfFloats( const Point3 & vec, unsigned short * hfptr ) -{ - union Data32 { - unsigned int u32; - float f32; - }; - - for (int i = 0; i < 3; i++) { - Data32 d; - d.f32 = vec[i]; - - unsigned int sign = d.u32 >> 31; - unsigned int exponent = (d.u32 >> 23) & ((1 << 8) - 1); - unsigned int mantissa = d.u32 & ((1 << 23) - 1);; - - if (exponent == 0) { - // zero or denorm -> zero - mantissa = 0; - - } else if (exponent == 255 && mantissa != 0) { - // nan -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent >= 127 - 15 + 31) { - // overflow or infinity -> infinity - exponent = 31; - mantissa = 0; - - } else if (exponent <= 127 - 15) { - // underflow -> zero - exponent = 0; - mantissa = 0; - - } else { - exponent -= 127 - 15; - mantissa >>= 13; - } - - hfptr[i] = (unsigned short)((sign << 15) | (exponent << 10) | mantissa); - } -} - -inline Point3 & Point3::operator =( const Point3 & pnt ) -{ - mX = pnt.mX; - mY = pnt.mY; - mZ = pnt.mZ; - return *this; -} - -inline Point3 & Point3::setX( float _x ) -{ - mX = _x; - return *this; -} - -inline float Point3::getX( ) const -{ - return mX; -} - -inline Point3 & Point3::setY( float _y ) -{ - mY = _y; - return *this; -} - -inline float Point3::getY( ) const -{ - return mY; -} - -inline Point3 & Point3::setZ( float _z ) -{ - mZ = _z; - return *this; -} - -inline float Point3::getZ( ) const -{ - return mZ; -} - -inline Point3 & Point3::setElem( int idx, float value ) -{ - *(&mX + idx) = value; - return *this; -} - -inline float Point3::getElem( int idx ) const -{ - return *(&mX + idx); -} - -inline float & Point3::operator []( int idx ) -{ - return *(&mX + idx); -} - -inline float Point3::operator []( int idx ) const -{ - return *(&mX + idx); -} - -inline const Vector3 Point3::operator -( const Point3 & pnt ) const -{ - return Vector3( - ( mX - pnt.mX ), - ( mY - pnt.mY ), - ( mZ - pnt.mZ ) - ); -} - -inline const Point3 Point3::operator +( const Vector3 & vec ) const -{ - return Point3( - ( mX + vec.getX() ), - ( mY + vec.getY() ), - ( mZ + vec.getZ() ) - ); -} - -inline const Point3 Point3::operator -( const Vector3 & vec ) const -{ - return Point3( - ( mX - vec.getX() ), - ( mY - vec.getY() ), - ( mZ - vec.getZ() ) - ); -} - -inline Point3 & Point3::operator +=( const Vector3 & vec ) -{ - *this = *this + vec; - return *this; -} - -inline Point3 & Point3::operator -=( const Vector3 & vec ) -{ - *this = *this - vec; - return *this; -} - -inline const Point3 mulPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - ( pnt0.getX() * pnt1.getX() ), - ( pnt0.getY() * pnt1.getY() ), - ( pnt0.getZ() * pnt1.getZ() ) - ); -} - -inline const Point3 divPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - ( pnt0.getX() / pnt1.getX() ), - ( pnt0.getY() / pnt1.getY() ), - ( pnt0.getZ() / pnt1.getZ() ) - ); -} - -inline const Point3 recipPerElem( const Point3 & pnt ) -{ - return Point3( - ( 1.0f / pnt.getX() ), - ( 1.0f / pnt.getY() ), - ( 1.0f / pnt.getZ() ) - ); -} - -inline const Point3 sqrtPerElem( const Point3 & pnt ) -{ - return Point3( - sqrtf( pnt.getX() ), - sqrtf( pnt.getY() ), - sqrtf( pnt.getZ() ) - ); -} - -inline const Point3 rsqrtPerElem( const Point3 & pnt ) -{ - return Point3( - ( 1.0f / sqrtf( pnt.getX() ) ), - ( 1.0f / sqrtf( pnt.getY() ) ), - ( 1.0f / sqrtf( pnt.getZ() ) ) - ); -} - -inline const Point3 absPerElem( const Point3 & pnt ) -{ - return Point3( - fabsf( pnt.getX() ), - fabsf( pnt.getY() ), - fabsf( pnt.getZ() ) - ); -} - -inline const Point3 copySignPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - ( pnt1.getX() < 0.0f )? -fabsf( pnt0.getX() ) : fabsf( pnt0.getX() ), - ( pnt1.getY() < 0.0f )? -fabsf( pnt0.getY() ) : fabsf( pnt0.getY() ), - ( pnt1.getZ() < 0.0f )? -fabsf( pnt0.getZ() ) : fabsf( pnt0.getZ() ) - ); -} - -inline const Point3 maxPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - (pnt0.getX() > pnt1.getX())? pnt0.getX() : pnt1.getX(), - (pnt0.getY() > pnt1.getY())? pnt0.getY() : pnt1.getY(), - (pnt0.getZ() > pnt1.getZ())? pnt0.getZ() : pnt1.getZ() - ); -} - -inline float maxElem( const Point3 & pnt ) -{ - float result; - result = (pnt.getX() > pnt.getY())? pnt.getX() : pnt.getY(); - result = (pnt.getZ() > result)? pnt.getZ() : result; - return result; -} - -inline const Point3 minPerElem( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return Point3( - (pnt0.getX() < pnt1.getX())? pnt0.getX() : pnt1.getX(), - (pnt0.getY() < pnt1.getY())? pnt0.getY() : pnt1.getY(), - (pnt0.getZ() < pnt1.getZ())? pnt0.getZ() : pnt1.getZ() - ); -} - -inline float minElem( const Point3 & pnt ) -{ - float result; - result = (pnt.getX() < pnt.getY())? pnt.getX() : pnt.getY(); - result = (pnt.getZ() < result)? pnt.getZ() : result; - return result; -} - -inline float sum( const Point3 & pnt ) -{ - float result; - result = ( pnt.getX() + pnt.getY() ); - result = ( result + pnt.getZ() ); - return result; -} - -inline const Point3 scale( const Point3 & pnt, float scaleVal ) -{ - return mulPerElem( pnt, Point3( scaleVal ) ); -} - -inline const Point3 scale( const Point3 & pnt, const Vector3 & scaleVec ) -{ - return mulPerElem( pnt, Point3( scaleVec ) ); -} - -inline float projection( const Point3 & pnt, const Vector3 & unitVec ) -{ - float result; - result = ( pnt.getX() * unitVec.getX() ); - result = ( result + ( pnt.getY() * unitVec.getY() ) ); - result = ( result + ( pnt.getZ() * unitVec.getZ() ) ); - return result; -} - -inline float distSqrFromOrigin( const Point3 & pnt ) -{ - return lengthSqr( Vector3( pnt ) ); -} - -inline float distFromOrigin( const Point3 & pnt ) -{ - return length( Vector3( pnt ) ); -} - -inline float distSqr( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return lengthSqr( ( pnt1 - pnt0 ) ); -} - -inline float dist( const Point3 & pnt0, const Point3 & pnt1 ) -{ - return length( ( pnt1 - pnt0 ) ); -} - -inline const Point3 select( const Point3 & pnt0, const Point3 & pnt1, bool select1 ) -{ - return Point3( - ( select1 )? pnt1.getX() : pnt0.getX(), - ( select1 )? pnt1.getY() : pnt0.getY(), - ( select1 )? pnt1.getZ() : pnt0.getZ() - ); -} - -#ifdef _VECTORMATH_DEBUG - -inline void print( const Point3 & pnt ) -{ - printf( "( %f %f %f )\n", pnt.getX(), pnt.getY(), pnt.getZ() ); -} - -inline void print( const Point3 & pnt, const char * name ) -{ - printf( "%s: ( %f %f %f )\n", name, pnt.getX(), pnt.getY(), pnt.getZ() ); -} - -#endif - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/scalar/vectormath_aos.h b/Engine/lib/bullet/src/vectormath/scalar/vectormath_aos.h deleted file mode 100644 index d00456dfe..000000000 --- a/Engine/lib/bullet/src/vectormath/scalar/vectormath_aos.h +++ /dev/null @@ -1,1872 +0,0 @@ -/* - Copyright (C) 2009 Sony Computer Entertainment Inc. - All rights reserved. - -This software is provided 'as-is', without any express or implied warranty. -In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it freely, -subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -*/ - -#ifndef _VECTORMATH_AOS_CPP_H -#define _VECTORMATH_AOS_CPP_H - -#include - -#ifdef _VECTORMATH_DEBUG -#include -#endif - -namespace Vectormath { - -namespace Aos { - -//----------------------------------------------------------------------------- -// Forward Declarations -// - -class Vector3; -class Vector4; -class Point3; -class Quat; -class Matrix3; -class Matrix4; -class Transform3; - -// A 3-D vector in array-of-structures format -// -class Vector3 -{ - float mX; - float mY; - float mZ; -#ifndef __GNUC__ - float d; -#endif - -public: - // Default constructor; does no initialization - // - inline Vector3( ) { }; - - // Copy a 3-D vector - // - inline Vector3( const Vector3 & vec ); - - // Construct a 3-D vector from x, y, and z elements - // - inline Vector3( float x, float y, float z ); - - // Copy elements from a 3-D point into a 3-D vector - // - explicit inline Vector3( const Point3 & pnt ); - - // Set all elements of a 3-D vector to the same scalar value - // - explicit inline Vector3( float scalar ); - - // Assign one 3-D vector to another - // - inline Vector3 & operator =( const Vector3 & vec ); - - // Set the x element of a 3-D vector - // - inline Vector3 & setX( float x ); - - // Set the y element of a 3-D vector - // - inline Vector3 & setY( float y ); - - // Set the z element of a 3-D vector - // - inline Vector3 & setZ( float z ); - - // Get the x element of a 3-D vector - // - inline float getX( ) const; - - // Get the y element of a 3-D vector - // - inline float getY( ) const; - - // Get the z element of a 3-D vector - // - inline float getZ( ) const; - - // Set an x, y, or z element of a 3-D vector by index - // - inline Vector3 & setElem( int idx, float value ); - - // Get an x, y, or z element of a 3-D vector by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Add two 3-D vectors - // - inline const Vector3 operator +( const Vector3 & vec ) const; - - // Subtract a 3-D vector from another 3-D vector - // - inline const Vector3 operator -( const Vector3 & vec ) const; - - // Add a 3-D vector to a 3-D point - // - inline const Point3 operator +( const Point3 & pnt ) const; - - // Multiply a 3-D vector by a scalar - // - inline const Vector3 operator *( float scalar ) const; - - // Divide a 3-D vector by a scalar - // - inline const Vector3 operator /( float scalar ) const; - - // Perform compound assignment and addition with a 3-D vector - // - inline Vector3 & operator +=( const Vector3 & vec ); - - // Perform compound assignment and subtraction by a 3-D vector - // - inline Vector3 & operator -=( const Vector3 & vec ); - - // Perform compound assignment and multiplication by a scalar - // - inline Vector3 & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - inline Vector3 & operator /=( float scalar ); - - // Negate all elements of a 3-D vector - // - inline const Vector3 operator -( ) const; - - // Construct x axis - // - static inline const Vector3 xAxis( ); - - // Construct y axis - // - static inline const Vector3 yAxis( ); - - // Construct z axis - // - static inline const Vector3 zAxis( ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply a 3-D vector by a scalar -// -inline const Vector3 operator *( float scalar, const Vector3 & vec ); - -// Multiply two 3-D vectors per element -// -inline const Vector3 mulPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Divide two 3-D vectors per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -inline const Vector3 divPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Compute the reciprocal of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -inline const Vector3 recipPerElem( const Vector3 & vec ); - -// Compute the square root of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function sqrtf4. -// -inline const Vector3 sqrtPerElem( const Vector3 & vec ); - -// Compute the reciprocal square root of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function rsqrtf4. -// -inline const Vector3 rsqrtPerElem( const Vector3 & vec ); - -// Compute the absolute value of a 3-D vector per element -// -inline const Vector3 absPerElem( const Vector3 & vec ); - -// Copy sign from one 3-D vector to another, per element -// -inline const Vector3 copySignPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Maximum of two 3-D vectors per element -// -inline const Vector3 maxPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Minimum of two 3-D vectors per element -// -inline const Vector3 minPerElem( const Vector3 & vec0, const Vector3 & vec1 ); - -// Maximum element of a 3-D vector -// -inline float maxElem( const Vector3 & vec ); - -// Minimum element of a 3-D vector -// -inline float minElem( const Vector3 & vec ); - -// Compute the sum of all elements of a 3-D vector -// -inline float sum( const Vector3 & vec ); - -// Compute the dot product of two 3-D vectors -// -inline float dot( const Vector3 & vec0, const Vector3 & vec1 ); - -// Compute the square of the length of a 3-D vector -// -inline float lengthSqr( const Vector3 & vec ); - -// Compute the length of a 3-D vector -// -inline float length( const Vector3 & vec ); - -// Normalize a 3-D vector -// NOTE: -// The result is unpredictable when all elements of vec are at or near zero. -// -inline const Vector3 normalize( const Vector3 & vec ); - -// Compute cross product of two 3-D vectors -// -inline const Vector3 cross( const Vector3 & vec0, const Vector3 & vec1 ); - -// Outer product of two 3-D vectors -// -inline const Matrix3 outer( const Vector3 & vec0, const Vector3 & vec1 ); - -// Pre-multiply a row vector by a 3x3 matrix -// -inline const Vector3 rowMul( const Vector3 & vec, const Matrix3 & mat ); - -// Cross-product matrix of a 3-D vector -// -inline const Matrix3 crossMatrix( const Vector3 & vec ); - -// Create cross-product matrix and multiply -// NOTE: -// Faster than separately creating a cross-product matrix and multiplying. -// -inline const Matrix3 crossMatrixMul( const Vector3 & vec, const Matrix3 & mat ); - -// Linear interpolation between two 3-D vectors -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Vector3 lerp( float t, const Vector3 & vec0, const Vector3 & vec1 ); - -// Spherical linear interpolation between two 3-D vectors -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -inline const Vector3 slerp( float t, const Vector3 & unitVec0, const Vector3 & unitVec1 ); - -// Conditionally select between two 3-D vectors -// -inline const Vector3 select( const Vector3 & vec0, const Vector3 & vec1, bool select1 ); - -// Load x, y, and z elements from the first three words of a float array. -// -// -inline void loadXYZ( Vector3 & vec, const float * fptr ); - -// Store x, y, and z elements of a 3-D vector in the first three words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZ( const Vector3 & vec, float * fptr ); - -// Load three-half-floats as a 3-D vector -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. -// -inline void loadHalfFloats( Vector3 & vec, const unsigned short * hfptr ); - -// Store a 3-D vector as half-floats. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// -inline void storeHalfFloats( const Vector3 & vec, unsigned short * hfptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3-D vector -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector3 & vec ); - -// Print a 3-D vector and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector3 & vec, const char * name ); - -#endif - -// A 4-D vector in array-of-structures format -// -class Vector4 -{ - float mX; - float mY; - float mZ; - float mW; - -public: - // Default constructor; does no initialization - // - inline Vector4( ) { }; - - // Copy a 4-D vector - // - inline Vector4( const Vector4 & vec ); - - // Construct a 4-D vector from x, y, z, and w elements - // - inline Vector4( float x, float y, float z, float w ); - - // Construct a 4-D vector from a 3-D vector and a scalar - // - inline Vector4( const Vector3 & xyz, float w ); - - // Copy x, y, and z from a 3-D vector into a 4-D vector, and set w to 0 - // - explicit inline Vector4( const Vector3 & vec ); - - // Copy x, y, and z from a 3-D point into a 4-D vector, and set w to 1 - // - explicit inline Vector4( const Point3 & pnt ); - - // Copy elements from a quaternion into a 4-D vector - // - explicit inline Vector4( const Quat & quat ); - - // Set all elements of a 4-D vector to the same scalar value - // - explicit inline Vector4( float scalar ); - - // Assign one 4-D vector to another - // - inline Vector4 & operator =( const Vector4 & vec ); - - // Set the x, y, and z elements of a 4-D vector - // NOTE: - // This function does not change the w element. - // - inline Vector4 & setXYZ( const Vector3 & vec ); - - // Get the x, y, and z elements of a 4-D vector - // - inline const Vector3 getXYZ( ) const; - - // Set the x element of a 4-D vector - // - inline Vector4 & setX( float x ); - - // Set the y element of a 4-D vector - // - inline Vector4 & setY( float y ); - - // Set the z element of a 4-D vector - // - inline Vector4 & setZ( float z ); - - // Set the w element of a 4-D vector - // - inline Vector4 & setW( float w ); - - // Get the x element of a 4-D vector - // - inline float getX( ) const; - - // Get the y element of a 4-D vector - // - inline float getY( ) const; - - // Get the z element of a 4-D vector - // - inline float getZ( ) const; - - // Get the w element of a 4-D vector - // - inline float getW( ) const; - - // Set an x, y, z, or w element of a 4-D vector by index - // - inline Vector4 & setElem( int idx, float value ); - - // Get an x, y, z, or w element of a 4-D vector by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Add two 4-D vectors - // - inline const Vector4 operator +( const Vector4 & vec ) const; - - // Subtract a 4-D vector from another 4-D vector - // - inline const Vector4 operator -( const Vector4 & vec ) const; - - // Multiply a 4-D vector by a scalar - // - inline const Vector4 operator *( float scalar ) const; - - // Divide a 4-D vector by a scalar - // - inline const Vector4 operator /( float scalar ) const; - - // Perform compound assignment and addition with a 4-D vector - // - inline Vector4 & operator +=( const Vector4 & vec ); - - // Perform compound assignment and subtraction by a 4-D vector - // - inline Vector4 & operator -=( const Vector4 & vec ); - - // Perform compound assignment and multiplication by a scalar - // - inline Vector4 & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - inline Vector4 & operator /=( float scalar ); - - // Negate all elements of a 4-D vector - // - inline const Vector4 operator -( ) const; - - // Construct x axis - // - static inline const Vector4 xAxis( ); - - // Construct y axis - // - static inline const Vector4 yAxis( ); - - // Construct z axis - // - static inline const Vector4 zAxis( ); - - // Construct w axis - // - static inline const Vector4 wAxis( ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply a 4-D vector by a scalar -// -inline const Vector4 operator *( float scalar, const Vector4 & vec ); - -// Multiply two 4-D vectors per element -// -inline const Vector4 mulPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Divide two 4-D vectors per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -inline const Vector4 divPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Compute the reciprocal of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -inline const Vector4 recipPerElem( const Vector4 & vec ); - -// Compute the square root of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function sqrtf4. -// -inline const Vector4 sqrtPerElem( const Vector4 & vec ); - -// Compute the reciprocal square root of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function rsqrtf4. -// -inline const Vector4 rsqrtPerElem( const Vector4 & vec ); - -// Compute the absolute value of a 4-D vector per element -// -inline const Vector4 absPerElem( const Vector4 & vec ); - -// Copy sign from one 4-D vector to another, per element -// -inline const Vector4 copySignPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Maximum of two 4-D vectors per element -// -inline const Vector4 maxPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Minimum of two 4-D vectors per element -// -inline const Vector4 minPerElem( const Vector4 & vec0, const Vector4 & vec1 ); - -// Maximum element of a 4-D vector -// -inline float maxElem( const Vector4 & vec ); - -// Minimum element of a 4-D vector -// -inline float minElem( const Vector4 & vec ); - -// Compute the sum of all elements of a 4-D vector -// -inline float sum( const Vector4 & vec ); - -// Compute the dot product of two 4-D vectors -// -inline float dot( const Vector4 & vec0, const Vector4 & vec1 ); - -// Compute the square of the length of a 4-D vector -// -inline float lengthSqr( const Vector4 & vec ); - -// Compute the length of a 4-D vector -// -inline float length( const Vector4 & vec ); - -// Normalize a 4-D vector -// NOTE: -// The result is unpredictable when all elements of vec are at or near zero. -// -inline const Vector4 normalize( const Vector4 & vec ); - -// Outer product of two 4-D vectors -// -inline const Matrix4 outer( const Vector4 & vec0, const Vector4 & vec1 ); - -// Linear interpolation between two 4-D vectors -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Vector4 lerp( float t, const Vector4 & vec0, const Vector4 & vec1 ); - -// Spherical linear interpolation between two 4-D vectors -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -inline const Vector4 slerp( float t, const Vector4 & unitVec0, const Vector4 & unitVec1 ); - -// Conditionally select between two 4-D vectors -// -inline const Vector4 select( const Vector4 & vec0, const Vector4 & vec1, bool select1 ); - -// Load x, y, z, and w elements from the first four words of a float array. -// -// -inline void loadXYZW( Vector4 & vec, const float * fptr ); - -// Store x, y, z, and w elements of a 4-D vector in the first four words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZW( const Vector4 & vec, float * fptr ); - -// Load four-half-floats as a 4-D vector -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. -// -inline void loadHalfFloats( Vector4 & vec, const unsigned short * hfptr ); - -// Store a 4-D vector as half-floats. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// -inline void storeHalfFloats( const Vector4 & vec, unsigned short * hfptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 4-D vector -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector4 & vec ); - -// Print a 4-D vector and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Vector4 & vec, const char * name ); - -#endif - -// A 3-D point in array-of-structures format -// -class Point3 -{ - float mX; - float mY; - float mZ; -#ifndef __GNUC__ - float d; -#endif - -public: - // Default constructor; does no initialization - // - inline Point3( ) { }; - - // Copy a 3-D point - // - inline Point3( const Point3 & pnt ); - - // Construct a 3-D point from x, y, and z elements - // - inline Point3( float x, float y, float z ); - - // Copy elements from a 3-D vector into a 3-D point - // - explicit inline Point3( const Vector3 & vec ); - - // Set all elements of a 3-D point to the same scalar value - // - explicit inline Point3( float scalar ); - - // Assign one 3-D point to another - // - inline Point3 & operator =( const Point3 & pnt ); - - // Set the x element of a 3-D point - // - inline Point3 & setX( float x ); - - // Set the y element of a 3-D point - // - inline Point3 & setY( float y ); - - // Set the z element of a 3-D point - // - inline Point3 & setZ( float z ); - - // Get the x element of a 3-D point - // - inline float getX( ) const; - - // Get the y element of a 3-D point - // - inline float getY( ) const; - - // Get the z element of a 3-D point - // - inline float getZ( ) const; - - // Set an x, y, or z element of a 3-D point by index - // - inline Point3 & setElem( int idx, float value ); - - // Get an x, y, or z element of a 3-D point by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Subtract a 3-D point from another 3-D point - // - inline const Vector3 operator -( const Point3 & pnt ) const; - - // Add a 3-D point to a 3-D vector - // - inline const Point3 operator +( const Vector3 & vec ) const; - - // Subtract a 3-D vector from a 3-D point - // - inline const Point3 operator -( const Vector3 & vec ) const; - - // Perform compound assignment and addition with a 3-D vector - // - inline Point3 & operator +=( const Vector3 & vec ); - - // Perform compound assignment and subtraction by a 3-D vector - // - inline Point3 & operator -=( const Vector3 & vec ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply two 3-D points per element -// -inline const Point3 mulPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Divide two 3-D points per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -inline const Point3 divPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Compute the reciprocal of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -inline const Point3 recipPerElem( const Point3 & pnt ); - -// Compute the square root of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function sqrtf4. -// -inline const Point3 sqrtPerElem( const Point3 & pnt ); - -// Compute the reciprocal square root of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function rsqrtf4. -// -inline const Point3 rsqrtPerElem( const Point3 & pnt ); - -// Compute the absolute value of a 3-D point per element -// -inline const Point3 absPerElem( const Point3 & pnt ); - -// Copy sign from one 3-D point to another, per element -// -inline const Point3 copySignPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Maximum of two 3-D points per element -// -inline const Point3 maxPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Minimum of two 3-D points per element -// -inline const Point3 minPerElem( const Point3 & pnt0, const Point3 & pnt1 ); - -// Maximum element of a 3-D point -// -inline float maxElem( const Point3 & pnt ); - -// Minimum element of a 3-D point -// -inline float minElem( const Point3 & pnt ); - -// Compute the sum of all elements of a 3-D point -// -inline float sum( const Point3 & pnt ); - -// Apply uniform scale to a 3-D point -// -inline const Point3 scale( const Point3 & pnt, float scaleVal ); - -// Apply non-uniform scale to a 3-D point -// -inline const Point3 scale( const Point3 & pnt, const Vector3 & scaleVec ); - -// Scalar projection of a 3-D point on a unit-length 3-D vector -// -inline float projection( const Point3 & pnt, const Vector3 & unitVec ); - -// Compute the square of the distance of a 3-D point from the coordinate-system origin -// -inline float distSqrFromOrigin( const Point3 & pnt ); - -// Compute the distance of a 3-D point from the coordinate-system origin -// -inline float distFromOrigin( const Point3 & pnt ); - -// Compute the square of the distance between two 3-D points -// -inline float distSqr( const Point3 & pnt0, const Point3 & pnt1 ); - -// Compute the distance between two 3-D points -// -inline float dist( const Point3 & pnt0, const Point3 & pnt1 ); - -// Linear interpolation between two 3-D points -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Point3 lerp( float t, const Point3 & pnt0, const Point3 & pnt1 ); - -// Conditionally select between two 3-D points -// -inline const Point3 select( const Point3 & pnt0, const Point3 & pnt1, bool select1 ); - -// Load x, y, and z elements from the first three words of a float array. -// -// -inline void loadXYZ( Point3 & pnt, const float * fptr ); - -// Store x, y, and z elements of a 3-D point in the first three words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZ( const Point3 & pnt, float * fptr ); - -// Load three-half-floats as a 3-D point -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. -// -inline void loadHalfFloats( Point3 & pnt, const unsigned short * hfptr ); - -// Store a 3-D point as half-floats. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// NOTE: -// This transformation does not support either denormalized numbers or NaNs. Memory area of previous 16 bytes and next 32 bytes from hfptr might be accessed. -// -inline void storeHalfFloats( const Point3 & pnt, unsigned short * hfptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3-D point -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Point3 & pnt ); - -// Print a 3-D point and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Point3 & pnt, const char * name ); - -#endif - -// A quaternion in array-of-structures format -// -class Quat -{ - float mX; - float mY; - float mZ; - float mW; - -public: - // Default constructor; does no initialization - // - inline Quat( ) { }; - - // Copy a quaternion - // - inline Quat( const Quat & quat ); - - // Construct a quaternion from x, y, z, and w elements - // - inline Quat( float x, float y, float z, float w ); - - // Construct a quaternion from a 3-D vector and a scalar - // - inline Quat( const Vector3 & xyz, float w ); - - // Copy elements from a 4-D vector into a quaternion - // - explicit inline Quat( const Vector4 & vec ); - - // Convert a rotation matrix to a unit-length quaternion - // - explicit inline Quat( const Matrix3 & rotMat ); - - // Set all elements of a quaternion to the same scalar value - // - explicit inline Quat( float scalar ); - - // Assign one quaternion to another - // - inline Quat & operator =( const Quat & quat ); - - // Set the x, y, and z elements of a quaternion - // NOTE: - // This function does not change the w element. - // - inline Quat & setXYZ( const Vector3 & vec ); - - // Get the x, y, and z elements of a quaternion - // - inline const Vector3 getXYZ( ) const; - - // Set the x element of a quaternion - // - inline Quat & setX( float x ); - - // Set the y element of a quaternion - // - inline Quat & setY( float y ); - - // Set the z element of a quaternion - // - inline Quat & setZ( float z ); - - // Set the w element of a quaternion - // - inline Quat & setW( float w ); - - // Get the x element of a quaternion - // - inline float getX( ) const; - - // Get the y element of a quaternion - // - inline float getY( ) const; - - // Get the z element of a quaternion - // - inline float getZ( ) const; - - // Get the w element of a quaternion - // - inline float getW( ) const; - - // Set an x, y, z, or w element of a quaternion by index - // - inline Quat & setElem( int idx, float value ); - - // Get an x, y, z, or w element of a quaternion by index - // - inline float getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - inline float & operator []( int idx ); - - // Subscripting operator to get an element - // - inline float operator []( int idx ) const; - - // Add two quaternions - // - inline const Quat operator +( const Quat & quat ) const; - - // Subtract a quaternion from another quaternion - // - inline const Quat operator -( const Quat & quat ) const; - - // Multiply two quaternions - // - inline const Quat operator *( const Quat & quat ) const; - - // Multiply a quaternion by a scalar - // - inline const Quat operator *( float scalar ) const; - - // Divide a quaternion by a scalar - // - inline const Quat operator /( float scalar ) const; - - // Perform compound assignment and addition with a quaternion - // - inline Quat & operator +=( const Quat & quat ); - - // Perform compound assignment and subtraction by a quaternion - // - inline Quat & operator -=( const Quat & quat ); - - // Perform compound assignment and multiplication by a quaternion - // - inline Quat & operator *=( const Quat & quat ); - - // Perform compound assignment and multiplication by a scalar - // - inline Quat & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - inline Quat & operator /=( float scalar ); - - // Negate all elements of a quaternion - // - inline const Quat operator -( ) const; - - // Construct an identity quaternion - // - static inline const Quat identity( ); - - // Construct a quaternion to rotate between two unit-length 3-D vectors - // NOTE: - // The result is unpredictable if unitVec0 and unitVec1 point in opposite directions. - // - static inline const Quat rotation( const Vector3 & unitVec0, const Vector3 & unitVec1 ); - - // Construct a quaternion to rotate around a unit-length 3-D vector - // - static inline const Quat rotation( float radians, const Vector3 & unitVec ); - - // Construct a quaternion to rotate around the x axis - // - static inline const Quat rotationX( float radians ); - - // Construct a quaternion to rotate around the y axis - // - static inline const Quat rotationY( float radians ); - - // Construct a quaternion to rotate around the z axis - // - static inline const Quat rotationZ( float radians ); - -} -#ifdef __GNUC__ -__attribute__ ((aligned(16))) -#endif -; - -// Multiply a quaternion by a scalar -// -inline const Quat operator *( float scalar, const Quat & quat ); - -// Compute the conjugate of a quaternion -// -inline const Quat conj( const Quat & quat ); - -// Use a unit-length quaternion to rotate a 3-D vector -// -inline const Vector3 rotate( const Quat & unitQuat, const Vector3 & vec ); - -// Compute the dot product of two quaternions -// -inline float dot( const Quat & quat0, const Quat & quat1 ); - -// Compute the norm of a quaternion -// -inline float norm( const Quat & quat ); - -// Compute the length of a quaternion -// -inline float length( const Quat & quat ); - -// Normalize a quaternion -// NOTE: -// The result is unpredictable when all elements of quat are at or near zero. -// -inline const Quat normalize( const Quat & quat ); - -// Linear interpolation between two quaternions -// NOTE: -// Does not clamp t between 0 and 1. -// -inline const Quat lerp( float t, const Quat & quat0, const Quat & quat1 ); - -// Spherical linear interpolation between two quaternions -// NOTE: -// Interpolates along the shortest path between orientations. -// Does not clamp t between 0 and 1. -// -inline const Quat slerp( float t, const Quat & unitQuat0, const Quat & unitQuat1 ); - -// Spherical quadrangle interpolation -// -inline const Quat squad( float t, const Quat & unitQuat0, const Quat & unitQuat1, const Quat & unitQuat2, const Quat & unitQuat3 ); - -// Conditionally select between two quaternions -// -inline const Quat select( const Quat & quat0, const Quat & quat1, bool select1 ); - -// Load x, y, z, and w elements from the first four words of a float array. -// -// -inline void loadXYZW( Quat & quat, const float * fptr ); - -// Store x, y, z, and w elements of a quaternion in the first four words of a float array. -// Memory area of previous 16 bytes and next 32 bytes from fptr might be accessed -// -inline void storeXYZW( const Quat & quat, float * fptr ); - -#ifdef _VECTORMATH_DEBUG - -// Print a quaternion -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Quat & quat ); - -// Print a quaternion and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Quat & quat, const char * name ); - -#endif - -// A 3x3 matrix in array-of-structures format -// -class Matrix3 -{ - Vector3 mCol0; - Vector3 mCol1; - Vector3 mCol2; - -public: - // Default constructor; does no initialization - // - inline Matrix3( ) { }; - - // Copy a 3x3 matrix - // - inline Matrix3( const Matrix3 & mat ); - - // Construct a 3x3 matrix containing the specified columns - // - inline Matrix3( const Vector3 & col0, const Vector3 & col1, const Vector3 & col2 ); - - // Construct a 3x3 rotation matrix from a unit-length quaternion - // - explicit inline Matrix3( const Quat & unitQuat ); - - // Set all elements of a 3x3 matrix to the same scalar value - // - explicit inline Matrix3( float scalar ); - - // Assign one 3x3 matrix to another - // - inline Matrix3 & operator =( const Matrix3 & mat ); - - // Set column 0 of a 3x3 matrix - // - inline Matrix3 & setCol0( const Vector3 & col0 ); - - // Set column 1 of a 3x3 matrix - // - inline Matrix3 & setCol1( const Vector3 & col1 ); - - // Set column 2 of a 3x3 matrix - // - inline Matrix3 & setCol2( const Vector3 & col2 ); - - // Get column 0 of a 3x3 matrix - // - inline const Vector3 getCol0( ) const; - - // Get column 1 of a 3x3 matrix - // - inline const Vector3 getCol1( ) const; - - // Get column 2 of a 3x3 matrix - // - inline const Vector3 getCol2( ) const; - - // Set the column of a 3x3 matrix referred to by the specified index - // - inline Matrix3 & setCol( int col, const Vector3 & vec ); - - // Set the row of a 3x3 matrix referred to by the specified index - // - inline Matrix3 & setRow( int row, const Vector3 & vec ); - - // Get the column of a 3x3 matrix referred to by the specified index - // - inline const Vector3 getCol( int col ) const; - - // Get the row of a 3x3 matrix referred to by the specified index - // - inline const Vector3 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - inline Vector3 & operator []( int col ); - - // Subscripting operator to get a column - // - inline const Vector3 operator []( int col ) const; - - // Set the element of a 3x3 matrix referred to by column and row indices - // - inline Matrix3 & setElem( int col, int row, float val ); - - // Get the element of a 3x3 matrix referred to by column and row indices - // - inline float getElem( int col, int row ) const; - - // Add two 3x3 matrices - // - inline const Matrix3 operator +( const Matrix3 & mat ) const; - - // Subtract a 3x3 matrix from another 3x3 matrix - // - inline const Matrix3 operator -( const Matrix3 & mat ) const; - - // Negate all elements of a 3x3 matrix - // - inline const Matrix3 operator -( ) const; - - // Multiply a 3x3 matrix by a scalar - // - inline const Matrix3 operator *( float scalar ) const; - - // Multiply a 3x3 matrix by a 3-D vector - // - inline const Vector3 operator *( const Vector3 & vec ) const; - - // Multiply two 3x3 matrices - // - inline const Matrix3 operator *( const Matrix3 & mat ) const; - - // Perform compound assignment and addition with a 3x3 matrix - // - inline Matrix3 & operator +=( const Matrix3 & mat ); - - // Perform compound assignment and subtraction by a 3x3 matrix - // - inline Matrix3 & operator -=( const Matrix3 & mat ); - - // Perform compound assignment and multiplication by a scalar - // - inline Matrix3 & operator *=( float scalar ); - - // Perform compound assignment and multiplication by a 3x3 matrix - // - inline Matrix3 & operator *=( const Matrix3 & mat ); - - // Construct an identity 3x3 matrix - // - static inline const Matrix3 identity( ); - - // Construct a 3x3 matrix to rotate around the x axis - // - static inline const Matrix3 rotationX( float radians ); - - // Construct a 3x3 matrix to rotate around the y axis - // - static inline const Matrix3 rotationY( float radians ); - - // Construct a 3x3 matrix to rotate around the z axis - // - static inline const Matrix3 rotationZ( float radians ); - - // Construct a 3x3 matrix to rotate around the x, y, and z axes - // - static inline const Matrix3 rotationZYX( const Vector3 & radiansXYZ ); - - // Construct a 3x3 matrix to rotate around a unit-length 3-D vector - // - static inline const Matrix3 rotation( float radians, const Vector3 & unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static inline const Matrix3 rotation( const Quat & unitQuat ); - - // Construct a 3x3 matrix to perform scaling - // - static inline const Matrix3 scale( const Vector3 & scaleVec ); - -}; -// Multiply a 3x3 matrix by a scalar -// -inline const Matrix3 operator *( float scalar, const Matrix3 & mat ); - -// Append (post-multiply) a scale transformation to a 3x3 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix3 appendScale( const Matrix3 & mat, const Vector3 & scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 3x3 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix3 prependScale( const Vector3 & scaleVec, const Matrix3 & mat ); - -// Multiply two 3x3 matrices per element -// -inline const Matrix3 mulPerElem( const Matrix3 & mat0, const Matrix3 & mat1 ); - -// Compute the absolute value of a 3x3 matrix per element -// -inline const Matrix3 absPerElem( const Matrix3 & mat ); - -// Transpose of a 3x3 matrix -// -inline const Matrix3 transpose( const Matrix3 & mat ); - -// Compute the inverse of a 3x3 matrix -// NOTE: -// Result is unpredictable when the determinant of mat is equal to or near 0. -// -inline const Matrix3 inverse( const Matrix3 & mat ); - -// Determinant of a 3x3 matrix -// -inline float determinant( const Matrix3 & mat ); - -// Conditionally select between two 3x3 matrices -// -inline const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, bool select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3x3 matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix3 & mat ); - -// Print a 3x3 matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix3 & mat, const char * name ); - -#endif - -// A 4x4 matrix in array-of-structures format -// -class Matrix4 -{ - Vector4 mCol0; - Vector4 mCol1; - Vector4 mCol2; - Vector4 mCol3; - -public: - // Default constructor; does no initialization - // - inline Matrix4( ) { }; - - // Copy a 4x4 matrix - // - inline Matrix4( const Matrix4 & mat ); - - // Construct a 4x4 matrix containing the specified columns - // - inline Matrix4( const Vector4 & col0, const Vector4 & col1, const Vector4 & col2, const Vector4 & col3 ); - - // Construct a 4x4 matrix from a 3x4 transformation matrix - // - explicit inline Matrix4( const Transform3 & mat ); - - // Construct a 4x4 matrix from a 3x3 matrix and a 3-D vector - // - inline Matrix4( const Matrix3 & mat, const Vector3 & translateVec ); - - // Construct a 4x4 matrix from a unit-length quaternion and a 3-D vector - // - inline Matrix4( const Quat & unitQuat, const Vector3 & translateVec ); - - // Set all elements of a 4x4 matrix to the same scalar value - // - explicit inline Matrix4( float scalar ); - - // Assign one 4x4 matrix to another - // - inline Matrix4 & operator =( const Matrix4 & mat ); - - // Set the upper-left 3x3 submatrix - // NOTE: - // This function does not change the bottom row elements. - // - inline Matrix4 & setUpper3x3( const Matrix3 & mat3 ); - - // Get the upper-left 3x3 submatrix of a 4x4 matrix - // - inline const Matrix3 getUpper3x3( ) const; - - // Set translation component - // NOTE: - // This function does not change the bottom row elements. - // - inline Matrix4 & setTranslation( const Vector3 & translateVec ); - - // Get the translation component of a 4x4 matrix - // - inline const Vector3 getTranslation( ) const; - - // Set column 0 of a 4x4 matrix - // - inline Matrix4 & setCol0( const Vector4 & col0 ); - - // Set column 1 of a 4x4 matrix - // - inline Matrix4 & setCol1( const Vector4 & col1 ); - - // Set column 2 of a 4x4 matrix - // - inline Matrix4 & setCol2( const Vector4 & col2 ); - - // Set column 3 of a 4x4 matrix - // - inline Matrix4 & setCol3( const Vector4 & col3 ); - - // Get column 0 of a 4x4 matrix - // - inline const Vector4 getCol0( ) const; - - // Get column 1 of a 4x4 matrix - // - inline const Vector4 getCol1( ) const; - - // Get column 2 of a 4x4 matrix - // - inline const Vector4 getCol2( ) const; - - // Get column 3 of a 4x4 matrix - // - inline const Vector4 getCol3( ) const; - - // Set the column of a 4x4 matrix referred to by the specified index - // - inline Matrix4 & setCol( int col, const Vector4 & vec ); - - // Set the row of a 4x4 matrix referred to by the specified index - // - inline Matrix4 & setRow( int row, const Vector4 & vec ); - - // Get the column of a 4x4 matrix referred to by the specified index - // - inline const Vector4 getCol( int col ) const; - - // Get the row of a 4x4 matrix referred to by the specified index - // - inline const Vector4 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - inline Vector4 & operator []( int col ); - - // Subscripting operator to get a column - // - inline const Vector4 operator []( int col ) const; - - // Set the element of a 4x4 matrix referred to by column and row indices - // - inline Matrix4 & setElem( int col, int row, float val ); - - // Get the element of a 4x4 matrix referred to by column and row indices - // - inline float getElem( int col, int row ) const; - - // Add two 4x4 matrices - // - inline const Matrix4 operator +( const Matrix4 & mat ) const; - - // Subtract a 4x4 matrix from another 4x4 matrix - // - inline const Matrix4 operator -( const Matrix4 & mat ) const; - - // Negate all elements of a 4x4 matrix - // - inline const Matrix4 operator -( ) const; - - // Multiply a 4x4 matrix by a scalar - // - inline const Matrix4 operator *( float scalar ) const; - - // Multiply a 4x4 matrix by a 4-D vector - // - inline const Vector4 operator *( const Vector4 & vec ) const; - - // Multiply a 4x4 matrix by a 3-D vector - // - inline const Vector4 operator *( const Vector3 & vec ) const; - - // Multiply a 4x4 matrix by a 3-D point - // - inline const Vector4 operator *( const Point3 & pnt ) const; - - // Multiply two 4x4 matrices - // - inline const Matrix4 operator *( const Matrix4 & mat ) const; - - // Multiply a 4x4 matrix by a 3x4 transformation matrix - // - inline const Matrix4 operator *( const Transform3 & tfrm ) const; - - // Perform compound assignment and addition with a 4x4 matrix - // - inline Matrix4 & operator +=( const Matrix4 & mat ); - - // Perform compound assignment and subtraction by a 4x4 matrix - // - inline Matrix4 & operator -=( const Matrix4 & mat ); - - // Perform compound assignment and multiplication by a scalar - // - inline Matrix4 & operator *=( float scalar ); - - // Perform compound assignment and multiplication by a 4x4 matrix - // - inline Matrix4 & operator *=( const Matrix4 & mat ); - - // Perform compound assignment and multiplication by a 3x4 transformation matrix - // - inline Matrix4 & operator *=( const Transform3 & tfrm ); - - // Construct an identity 4x4 matrix - // - static inline const Matrix4 identity( ); - - // Construct a 4x4 matrix to rotate around the x axis - // - static inline const Matrix4 rotationX( float radians ); - - // Construct a 4x4 matrix to rotate around the y axis - // - static inline const Matrix4 rotationY( float radians ); - - // Construct a 4x4 matrix to rotate around the z axis - // - static inline const Matrix4 rotationZ( float radians ); - - // Construct a 4x4 matrix to rotate around the x, y, and z axes - // - static inline const Matrix4 rotationZYX( const Vector3 & radiansXYZ ); - - // Construct a 4x4 matrix to rotate around a unit-length 3-D vector - // - static inline const Matrix4 rotation( float radians, const Vector3 & unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static inline const Matrix4 rotation( const Quat & unitQuat ); - - // Construct a 4x4 matrix to perform scaling - // - static inline const Matrix4 scale( const Vector3 & scaleVec ); - - // Construct a 4x4 matrix to perform translation - // - static inline const Matrix4 translation( const Vector3 & translateVec ); - - // Construct viewing matrix based on eye position, position looked at, and up direction - // - static inline const Matrix4 lookAt( const Point3 & eyePos, const Point3 & lookAtPos, const Vector3 & upVec ); - - // Construct a perspective projection matrix - // - static inline const Matrix4 perspective( float fovyRadians, float aspect, float zNear, float zFar ); - - // Construct a perspective projection matrix based on frustum - // - static inline const Matrix4 frustum( float left, float right, float bottom, float top, float zNear, float zFar ); - - // Construct an orthographic projection matrix - // - static inline const Matrix4 orthographic( float left, float right, float bottom, float top, float zNear, float zFar ); - -}; -// Multiply a 4x4 matrix by a scalar -// -inline const Matrix4 operator *( float scalar, const Matrix4 & mat ); - -// Append (post-multiply) a scale transformation to a 4x4 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix4 appendScale( const Matrix4 & mat, const Vector3 & scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 4x4 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Matrix4 prependScale( const Vector3 & scaleVec, const Matrix4 & mat ); - -// Multiply two 4x4 matrices per element -// -inline const Matrix4 mulPerElem( const Matrix4 & mat0, const Matrix4 & mat1 ); - -// Compute the absolute value of a 4x4 matrix per element -// -inline const Matrix4 absPerElem( const Matrix4 & mat ); - -// Transpose of a 4x4 matrix -// -inline const Matrix4 transpose( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix -// NOTE: -// Result is unpredictable when the determinant of mat is equal to or near 0. -// -inline const Matrix4 inverse( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix, which is expected to be an affine matrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 4x4 matrix meets the given restrictions. The result is unpredictable when the determinant of mat is equal to or near 0. -// -inline const Matrix4 affineInverse( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix, which is expected to be an affine matrix with an orthogonal upper-left 3x3 submatrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 4x4 matrix meets the given restrictions. -// -inline const Matrix4 orthoInverse( const Matrix4 & mat ); - -// Determinant of a 4x4 matrix -// -inline float determinant( const Matrix4 & mat ); - -// Conditionally select between two 4x4 matrices -// -inline const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, bool select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 4x4 matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix4 & mat ); - -// Print a 4x4 matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Matrix4 & mat, const char * name ); - -#endif - -// A 3x4 transformation matrix in array-of-structures format -// -class Transform3 -{ - Vector3 mCol0; - Vector3 mCol1; - Vector3 mCol2; - Vector3 mCol3; - -public: - // Default constructor; does no initialization - // - inline Transform3( ) { }; - - // Copy a 3x4 transformation matrix - // - inline Transform3( const Transform3 & tfrm ); - - // Construct a 3x4 transformation matrix containing the specified columns - // - inline Transform3( const Vector3 & col0, const Vector3 & col1, const Vector3 & col2, const Vector3 & col3 ); - - // Construct a 3x4 transformation matrix from a 3x3 matrix and a 3-D vector - // - inline Transform3( const Matrix3 & tfrm, const Vector3 & translateVec ); - - // Construct a 3x4 transformation matrix from a unit-length quaternion and a 3-D vector - // - inline Transform3( const Quat & unitQuat, const Vector3 & translateVec ); - - // Set all elements of a 3x4 transformation matrix to the same scalar value - // - explicit inline Transform3( float scalar ); - - // Assign one 3x4 transformation matrix to another - // - inline Transform3 & operator =( const Transform3 & tfrm ); - - // Set the upper-left 3x3 submatrix - // - inline Transform3 & setUpper3x3( const Matrix3 & mat3 ); - - // Get the upper-left 3x3 submatrix of a 3x4 transformation matrix - // - inline const Matrix3 getUpper3x3( ) const; - - // Set translation component - // - inline Transform3 & setTranslation( const Vector3 & translateVec ); - - // Get the translation component of a 3x4 transformation matrix - // - inline const Vector3 getTranslation( ) const; - - // Set column 0 of a 3x4 transformation matrix - // - inline Transform3 & setCol0( const Vector3 & col0 ); - - // Set column 1 of a 3x4 transformation matrix - // - inline Transform3 & setCol1( const Vector3 & col1 ); - - // Set column 2 of a 3x4 transformation matrix - // - inline Transform3 & setCol2( const Vector3 & col2 ); - - // Set column 3 of a 3x4 transformation matrix - // - inline Transform3 & setCol3( const Vector3 & col3 ); - - // Get column 0 of a 3x4 transformation matrix - // - inline const Vector3 getCol0( ) const; - - // Get column 1 of a 3x4 transformation matrix - // - inline const Vector3 getCol1( ) const; - - // Get column 2 of a 3x4 transformation matrix - // - inline const Vector3 getCol2( ) const; - - // Get column 3 of a 3x4 transformation matrix - // - inline const Vector3 getCol3( ) const; - - // Set the column of a 3x4 transformation matrix referred to by the specified index - // - inline Transform3 & setCol( int col, const Vector3 & vec ); - - // Set the row of a 3x4 transformation matrix referred to by the specified index - // - inline Transform3 & setRow( int row, const Vector4 & vec ); - - // Get the column of a 3x4 transformation matrix referred to by the specified index - // - inline const Vector3 getCol( int col ) const; - - // Get the row of a 3x4 transformation matrix referred to by the specified index - // - inline const Vector4 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - inline Vector3 & operator []( int col ); - - // Subscripting operator to get a column - // - inline const Vector3 operator []( int col ) const; - - // Set the element of a 3x4 transformation matrix referred to by column and row indices - // - inline Transform3 & setElem( int col, int row, float val ); - - // Get the element of a 3x4 transformation matrix referred to by column and row indices - // - inline float getElem( int col, int row ) const; - - // Multiply a 3x4 transformation matrix by a 3-D vector - // - inline const Vector3 operator *( const Vector3 & vec ) const; - - // Multiply a 3x4 transformation matrix by a 3-D point - // - inline const Point3 operator *( const Point3 & pnt ) const; - - // Multiply two 3x4 transformation matrices - // - inline const Transform3 operator *( const Transform3 & tfrm ) const; - - // Perform compound assignment and multiplication by a 3x4 transformation matrix - // - inline Transform3 & operator *=( const Transform3 & tfrm ); - - // Construct an identity 3x4 transformation matrix - // - static inline const Transform3 identity( ); - - // Construct a 3x4 transformation matrix to rotate around the x axis - // - static inline const Transform3 rotationX( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the y axis - // - static inline const Transform3 rotationY( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the z axis - // - static inline const Transform3 rotationZ( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the x, y, and z axes - // - static inline const Transform3 rotationZYX( const Vector3 & radiansXYZ ); - - // Construct a 3x4 transformation matrix to rotate around a unit-length 3-D vector - // - static inline const Transform3 rotation( float radians, const Vector3 & unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static inline const Transform3 rotation( const Quat & unitQuat ); - - // Construct a 3x4 transformation matrix to perform scaling - // - static inline const Transform3 scale( const Vector3 & scaleVec ); - - // Construct a 3x4 transformation matrix to perform translation - // - static inline const Transform3 translation( const Vector3 & translateVec ); - -}; -// Append (post-multiply) a scale transformation to a 3x4 transformation matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Transform3 appendScale( const Transform3 & tfrm, const Vector3 & scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 3x4 transformation matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -inline const Transform3 prependScale( const Vector3 & scaleVec, const Transform3 & tfrm ); - -// Multiply two 3x4 transformation matrices per element -// -inline const Transform3 mulPerElem( const Transform3 & tfrm0, const Transform3 & tfrm1 ); - -// Compute the absolute value of a 3x4 transformation matrix per element -// -inline const Transform3 absPerElem( const Transform3 & tfrm ); - -// Inverse of a 3x4 transformation matrix -// NOTE: -// Result is unpredictable when the determinant of the left 3x3 submatrix is equal to or near 0. -// -inline const Transform3 inverse( const Transform3 & tfrm ); - -// Compute the inverse of a 3x4 transformation matrix, expected to have an orthogonal upper-left 3x3 submatrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 3x4 transformation matrix meets the given restrictions. -// -inline const Transform3 orthoInverse( const Transform3 & tfrm ); - -// Conditionally select between two 3x4 transformation matrices -// -inline const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, bool select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3x4 transformation matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Transform3 & tfrm ); - -// Print a 3x4 transformation matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -inline void print( const Transform3 & tfrm, const char * name ); - -#endif - -} // namespace Aos -} // namespace Vectormath - -#include "vec_aos.h" -#include "quat_aos.h" -#include "mat_aos.h" - -#endif diff --git a/Engine/lib/bullet/src/vectormath/sse/boolInVec.h b/Engine/lib/bullet/src/vectormath/sse/boolInVec.h deleted file mode 100644 index d21d25cbb..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/boolInVec.h +++ /dev/null @@ -1,247 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _BOOLINVEC_H -#define _BOOLINVEC_H - -#include - -namespace Vectormath { - -class floatInVec; - -//-------------------------------------------------------------------------------------------------- -// boolInVec class -// - -class boolInVec -{ - private: - __m128 mData; - - inline boolInVec(__m128 vec); - public: - inline boolInVec() {} - - // matches standard type conversions - // - inline boolInVec(const floatInVec &vec); - - // explicit cast from bool - // - explicit inline boolInVec(bool scalar); - -#ifdef _VECTORMATH_NO_SCALAR_CAST - // explicit cast to bool - // - inline bool getAsBool() const; -#else - // implicit cast to bool - // - inline operator bool() const; -#endif - - // get vector data - // bool value is splatted across all word slots of vector as 0 (false) or -1 (true) - // - inline __m128 get128() const; - - // operators - // - inline const boolInVec operator ! () const; - inline boolInVec& operator = (const boolInVec &vec); - inline boolInVec& operator &= (const boolInVec &vec); - inline boolInVec& operator ^= (const boolInVec &vec); - inline boolInVec& operator |= (const boolInVec &vec); - - // friend functions - // - friend inline const boolInVec operator == (const boolInVec &vec0, const boolInVec &vec1); - friend inline const boolInVec operator != (const boolInVec &vec0, const boolInVec &vec1); - friend inline const boolInVec operator < (const floatInVec &vec0, const floatInVec &vec1); - friend inline const boolInVec operator <= (const floatInVec &vec0, const floatInVec &vec1); - friend inline const boolInVec operator > (const floatInVec &vec0, const floatInVec &vec1); - friend inline const boolInVec operator >= (const floatInVec &vec0, const floatInVec &vec1); - friend inline const boolInVec operator == (const floatInVec &vec0, const floatInVec &vec1); - friend inline const boolInVec operator != (const floatInVec &vec0, const floatInVec &vec1); - friend inline const boolInVec operator & (const boolInVec &vec0, const boolInVec &vec1); - friend inline const boolInVec operator ^ (const boolInVec &vec0, const boolInVec &vec1); - friend inline const boolInVec operator | (const boolInVec &vec0, const boolInVec &vec1); - friend inline const boolInVec select(const boolInVec &vec0, const boolInVec &vec1, const boolInVec &select_vec1); -}; - -//-------------------------------------------------------------------------------------------------- -// boolInVec functions -// - -// operators -// -inline const boolInVec operator == (const boolInVec &vec0, const boolInVec &vec1); -inline const boolInVec operator != (const boolInVec &vec0, const boolInVec &vec1); -inline const boolInVec operator & (const boolInVec &vec0, const boolInVec &vec1); -inline const boolInVec operator ^ (const boolInVec &vec0, const boolInVec &vec1); -inline const boolInVec operator | (const boolInVec &vec0, const boolInVec &vec1); - -// select between vec0 and vec1 using boolInVec. -// false selects vec0, true selects vec1 -// -inline const boolInVec select(const boolInVec &vec0, const boolInVec &vec1, const boolInVec &select_vec1); - -} // namespace Vectormath - -//-------------------------------------------------------------------------------------------------- -// boolInVec implementation -// - -#include "floatInVec.h" - -namespace Vectormath { - -inline -boolInVec::boolInVec(__m128 vec) -{ - mData = vec; -} - -inline -boolInVec::boolInVec(const floatInVec &vec) -{ - *this = (vec != floatInVec(0.0f)); -} - -inline -boolInVec::boolInVec(bool scalar) -{ - unsigned int mask = -(int)scalar; - mData = _mm_set1_ps(*(float *)&mask); // TODO: Union -} - -#ifdef _VECTORMATH_NO_SCALAR_CAST -inline -bool -boolInVec::getAsBool() const -#else -inline -boolInVec::operator bool() const -#endif -{ - return *(bool *)&mData; -} - -inline -__m128 -boolInVec::get128() const -{ - return mData; -} - -inline -const boolInVec -boolInVec::operator ! () const -{ - return boolInVec(_mm_andnot_ps(mData, _mm_cmpneq_ps(_mm_setzero_ps(),_mm_setzero_ps()))); -} - -inline -boolInVec& -boolInVec::operator = (const boolInVec &vec) -{ - mData = vec.mData; - return *this; -} - -inline -boolInVec& -boolInVec::operator &= (const boolInVec &vec) -{ - *this = *this & vec; - return *this; -} - -inline -boolInVec& -boolInVec::operator ^= (const boolInVec &vec) -{ - *this = *this ^ vec; - return *this; -} - -inline -boolInVec& -boolInVec::operator |= (const boolInVec &vec) -{ - *this = *this | vec; - return *this; -} - -inline -const boolInVec -operator == (const boolInVec &vec0, const boolInVec &vec1) -{ - return boolInVec(_mm_cmpeq_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator != (const boolInVec &vec0, const boolInVec &vec1) -{ - return boolInVec(_mm_cmpneq_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator & (const boolInVec &vec0, const boolInVec &vec1) -{ - return boolInVec(_mm_and_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator | (const boolInVec &vec0, const boolInVec &vec1) -{ - return boolInVec(_mm_or_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator ^ (const boolInVec &vec0, const boolInVec &vec1) -{ - return boolInVec(_mm_xor_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -select(const boolInVec &vec0, const boolInVec &vec1, const boolInVec &select_vec1) -{ - return boolInVec(vec_sel(vec0.get128(), vec1.get128(), select_vec1.get128())); -} - -} // namespace Vectormath - -#endif // boolInVec_h diff --git a/Engine/lib/bullet/src/vectormath/sse/floatInVec.h b/Engine/lib/bullet/src/vectormath/sse/floatInVec.h deleted file mode 100644 index e8ac5959e..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/floatInVec.h +++ /dev/null @@ -1,340 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _FLOATINVEC_H -#define _FLOATINVEC_H - -#include -#include - -namespace Vectormath { - -class boolInVec; - -//-------------------------------------------------------------------------------------------------- -// floatInVec class -// - -class floatInVec -{ - private: - __m128 mData; - - public: - inline floatInVec(__m128 vec); - - inline floatInVec() {} - - // matches standard type conversions - // - inline floatInVec(const boolInVec &vec); - - // construct from a slot of __m128 - // - inline floatInVec(__m128 vec, int slot); - - // explicit cast from float - // - explicit inline floatInVec(float scalar); - -#ifdef _VECTORMATH_NO_SCALAR_CAST - // explicit cast to float - // - inline float getAsFloat() const; -#else - // implicit cast to float - // - inline operator float() const; -#endif - - // get vector data - // float value is splatted across all word slots of vector - // - inline __m128 get128() const; - - // operators - // - inline const floatInVec operator ++ (int); - inline const floatInVec operator -- (int); - inline floatInVec& operator ++ (); - inline floatInVec& operator -- (); - inline const floatInVec operator - () const; - inline floatInVec& operator = (const floatInVec &vec); - inline floatInVec& operator *= (const floatInVec &vec); - inline floatInVec& operator /= (const floatInVec &vec); - inline floatInVec& operator += (const floatInVec &vec); - inline floatInVec& operator -= (const floatInVec &vec); - - // friend functions - // - friend inline const floatInVec operator * (const floatInVec &vec0, const floatInVec &vec1); - friend inline const floatInVec operator / (const floatInVec &vec0, const floatInVec &vec1); - friend inline const floatInVec operator + (const floatInVec &vec0, const floatInVec &vec1); - friend inline const floatInVec operator - (const floatInVec &vec0, const floatInVec &vec1); - friend inline const floatInVec select(const floatInVec &vec0, const floatInVec &vec1, boolInVec select_vec1); -}; - -//-------------------------------------------------------------------------------------------------- -// floatInVec functions -// - -// operators -// -inline const floatInVec operator * (const floatInVec &vec0, const floatInVec &vec1); -inline const floatInVec operator / (const floatInVec &vec0, const floatInVec &vec1); -inline const floatInVec operator + (const floatInVec &vec0, const floatInVec &vec1); -inline const floatInVec operator - (const floatInVec &vec0, const floatInVec &vec1); -inline const boolInVec operator < (const floatInVec &vec0, const floatInVec &vec1); -inline const boolInVec operator <= (const floatInVec &vec0, const floatInVec &vec1); -inline const boolInVec operator > (const floatInVec &vec0, const floatInVec &vec1); -inline const boolInVec operator >= (const floatInVec &vec0, const floatInVec &vec1); -inline const boolInVec operator == (const floatInVec &vec0, const floatInVec &vec1); -inline const boolInVec operator != (const floatInVec &vec0, const floatInVec &vec1); - -// select between vec0 and vec1 using boolInVec. -// false selects vec0, true selects vec1 -// -inline const floatInVec select(const floatInVec &vec0, const floatInVec &vec1, const boolInVec &select_vec1); - -} // namespace Vectormath - -//-------------------------------------------------------------------------------------------------- -// floatInVec implementation -// - -#include "boolInVec.h" - -namespace Vectormath { - -inline -floatInVec::floatInVec(__m128 vec) -{ - mData = vec; -} - -inline -floatInVec::floatInVec(const boolInVec &vec) -{ - mData = vec_sel(_mm_setzero_ps(), _mm_set1_ps(1.0f), vec.get128()); -} - -inline -floatInVec::floatInVec(__m128 vec, int slot) -{ - SSEFloat v; - v.m128 = vec; - mData = _mm_set1_ps(v.f[slot]); -} - -inline -floatInVec::floatInVec(float scalar) -{ - mData = _mm_set1_ps(scalar); -} - -#ifdef _VECTORMATH_NO_SCALAR_CAST -inline -float -floatInVec::getAsFloat() const -#else -inline -floatInVec::operator float() const -#endif -{ - return *((float *)&mData); -} - -inline -__m128 -floatInVec::get128() const -{ - return mData; -} - -inline -const floatInVec -floatInVec::operator ++ (int) -{ - __m128 olddata = mData; - operator ++(); - return floatInVec(olddata); -} - -inline -const floatInVec -floatInVec::operator -- (int) -{ - __m128 olddata = mData; - operator --(); - return floatInVec(olddata); -} - -inline -floatInVec& -floatInVec::operator ++ () -{ - *this += floatInVec(_mm_set1_ps(1.0f)); - return *this; -} - -inline -floatInVec& -floatInVec::operator -- () -{ - *this -= floatInVec(_mm_set1_ps(1.0f)); - return *this; -} - -inline -const floatInVec -floatInVec::operator - () const -{ - return floatInVec(_mm_sub_ps(_mm_setzero_ps(), mData)); -} - -inline -floatInVec& -floatInVec::operator = (const floatInVec &vec) -{ - mData = vec.mData; - return *this; -} - -inline -floatInVec& -floatInVec::operator *= (const floatInVec &vec) -{ - *this = *this * vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator /= (const floatInVec &vec) -{ - *this = *this / vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator += (const floatInVec &vec) -{ - *this = *this + vec; - return *this; -} - -inline -floatInVec& -floatInVec::operator -= (const floatInVec &vec) -{ - *this = *this - vec; - return *this; -} - -inline -const floatInVec -operator * (const floatInVec &vec0, const floatInVec &vec1) -{ - return floatInVec(_mm_mul_ps(vec0.get128(), vec1.get128())); -} - -inline -const floatInVec -operator / (const floatInVec &num, const floatInVec &den) -{ - return floatInVec(_mm_div_ps(num.get128(), den.get128())); -} - -inline -const floatInVec -operator + (const floatInVec &vec0, const floatInVec &vec1) -{ - return floatInVec(_mm_add_ps(vec0.get128(), vec1.get128())); -} - -inline -const floatInVec -operator - (const floatInVec &vec0, const floatInVec &vec1) -{ - return floatInVec(_mm_sub_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator < (const floatInVec &vec0, const floatInVec &vec1) -{ - return boolInVec(_mm_cmpgt_ps(vec1.get128(), vec0.get128())); -} - -inline -const boolInVec -operator <= (const floatInVec &vec0, const floatInVec &vec1) -{ - return boolInVec(_mm_cmpge_ps(vec1.get128(), vec0.get128())); -} - -inline -const boolInVec -operator > (const floatInVec &vec0, const floatInVec &vec1) -{ - return boolInVec(_mm_cmpgt_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator >= (const floatInVec &vec0, const floatInVec &vec1) -{ - return boolInVec(_mm_cmpge_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator == (const floatInVec &vec0, const floatInVec &vec1) -{ - return boolInVec(_mm_cmpeq_ps(vec0.get128(), vec1.get128())); -} - -inline -const boolInVec -operator != (const floatInVec &vec0, const floatInVec &vec1) -{ - return boolInVec(_mm_cmpneq_ps(vec0.get128(), vec1.get128())); -} - -inline -const floatInVec -select(const floatInVec &vec0, const floatInVec &vec1, const boolInVec &select_vec1) -{ - return floatInVec(vec_sel(vec0.get128(), vec1.get128(), select_vec1.get128())); -} - -} // namespace Vectormath - -#endif // floatInVec_h diff --git a/Engine/lib/bullet/src/vectormath/sse/mat_aos.h b/Engine/lib/bullet/src/vectormath/sse/mat_aos.h deleted file mode 100644 index a2c66cc5f..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/mat_aos.h +++ /dev/null @@ -1,2190 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - - -#ifndef _VECTORMATH_MAT_AOS_CPP_H -#define _VECTORMATH_MAT_AOS_CPP_H - -namespace Vectormath { -namespace Aos { - -//----------------------------------------------------------------------------- -// Constants -// for shuffles, words are labeled [x,y,z,w] [a,b,c,d] - -#define _VECTORMATH_PERM_ZBWX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Z, _VECTORMATH_PERM_B, _VECTORMATH_PERM_W, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_XCYX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_C, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_XYAB ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_A, _VECTORMATH_PERM_B }) -#define _VECTORMATH_PERM_ZWCD ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Z, _VECTORMATH_PERM_W, _VECTORMATH_PERM_C, _VECTORMATH_PERM_D }) -#define _VECTORMATH_PERM_XZBX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_B, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_CXXX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_C, _VECTORMATH_PERM_X, _VECTORMATH_PERM_X, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_YAXX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_A, _VECTORMATH_PERM_X, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_XAZC ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_A, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_C }) -#define _VECTORMATH_PERM_YXWZ ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_X, _VECTORMATH_PERM_W, _VECTORMATH_PERM_Z }) -#define _VECTORMATH_PERM_YBWD ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_B, _VECTORMATH_PERM_W, _VECTORMATH_PERM_D }) -#define _VECTORMATH_PERM_XYCX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_C, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_YCXY ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_C, _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y }) -#define _VECTORMATH_PERM_CXYC ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_C, _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_C }) -#define _VECTORMATH_PERM_ZAYX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Z, _VECTORMATH_PERM_A, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_BZXX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_B, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_X, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PERM_XZYA ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_A }) -#define _VECTORMATH_PERM_ZXXB ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Z, _VECTORMATH_PERM_X, _VECTORMATH_PERM_X, _VECTORMATH_PERM_B }) -#define _VECTORMATH_PERM_YXXC ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_X, _VECTORMATH_PERM_X, _VECTORMATH_PERM_C }) -#define _VECTORMATH_PERM_BBYX ((vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_B, _VECTORMATH_PERM_B, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_X }) -#define _VECTORMATH_PI_OVER_2 1.570796327f - -//----------------------------------------------------------------------------- -// Definitions - -VECTORMATH_FORCE_INLINE Matrix3::Matrix3( const Matrix3 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; -} - -VECTORMATH_FORCE_INLINE Matrix3::Matrix3( float scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); -} - -VECTORMATH_FORCE_INLINE Matrix3::Matrix3( const floatInVec &scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); -} - -VECTORMATH_FORCE_INLINE Matrix3::Matrix3( const Quat &unitQuat ) -{ - __m128 xyzw_2, wwww, yzxw, zxyw, yzxw_2, zxyw_2; - __m128 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5; - VM_ATTRIBUTE_ALIGN16 unsigned int sx[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int sz[4] = {0, 0, 0xffffffff, 0}; - __m128 select_x = _mm_load_ps((float *)sx); - __m128 select_z = _mm_load_ps((float *)sz); - - xyzw_2 = _mm_add_ps( unitQuat.get128(), unitQuat.get128() ); - wwww = _mm_shuffle_ps( unitQuat.get128(), unitQuat.get128(), _MM_SHUFFLE(3,3,3,3) ); - yzxw = _mm_shuffle_ps( unitQuat.get128(), unitQuat.get128(), _MM_SHUFFLE(3,0,2,1) ); - zxyw = _mm_shuffle_ps( unitQuat.get128(), unitQuat.get128(), _MM_SHUFFLE(3,1,0,2) ); - yzxw_2 = _mm_shuffle_ps( xyzw_2, xyzw_2, _MM_SHUFFLE(3,0,2,1) ); - zxyw_2 = _mm_shuffle_ps( xyzw_2, xyzw_2, _MM_SHUFFLE(3,1,0,2) ); - - tmp0 = _mm_mul_ps( yzxw_2, wwww ); // tmp0 = 2yw, 2zw, 2xw, 2w2 - tmp1 = _mm_sub_ps( _mm_set1_ps(1.0f), _mm_mul_ps(yzxw, yzxw_2) ); // tmp1 = 1 - 2y2, 1 - 2z2, 1 - 2x2, 1 - 2w2 - tmp2 = _mm_mul_ps( yzxw, xyzw_2 ); // tmp2 = 2xy, 2yz, 2xz, 2w2 - tmp0 = _mm_add_ps( _mm_mul_ps(zxyw, xyzw_2), tmp0 ); // tmp0 = 2yw + 2zx, 2zw + 2xy, 2xw + 2yz, 2w2 + 2w2 - tmp1 = _mm_sub_ps( tmp1, _mm_mul_ps(zxyw, zxyw_2) ); // tmp1 = 1 - 2y2 - 2z2, 1 - 2z2 - 2x2, 1 - 2x2 - 2y2, 1 - 2w2 - 2w2 - tmp2 = _mm_sub_ps( tmp2, _mm_mul_ps(zxyw_2, wwww) ); // tmp2 = 2xy - 2zw, 2yz - 2xw, 2xz - 2yw, 2w2 -2w2 - - tmp3 = vec_sel( tmp0, tmp1, select_x ); - tmp4 = vec_sel( tmp1, tmp2, select_x ); - tmp5 = vec_sel( tmp2, tmp0, select_x ); - mCol0 = Vector3( vec_sel( tmp3, tmp2, select_z ) ); - mCol1 = Vector3( vec_sel( tmp4, tmp0, select_z ) ); - mCol2 = Vector3( vec_sel( tmp5, tmp1, select_z ) ); -} - -VECTORMATH_FORCE_INLINE Matrix3::Matrix3( const Vector3 &_col0, const Vector3 &_col1, const Vector3 &_col2 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setCol0( const Vector3 &_col0 ) -{ - mCol0 = _col0; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setCol1( const Vector3 &_col1 ) -{ - mCol1 = _col1; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setCol2( const Vector3 &_col2 ) -{ - mCol2 = _col2; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setCol( int col, const Vector3 &vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setRow( int row, const Vector3 &vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setElem( int col, int row, float val ) -{ - (*this)[col].setElem(row, val); - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::setElem( int col, int row, const floatInVec &val ) -{ - Vector3 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Matrix3::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::getCol0( ) const -{ - return mCol0; -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::getCol1( ) const -{ - return mCol1; -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::getCol2( ) const -{ - return mCol2; -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::getRow( int row ) const -{ - return Vector3( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ) ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Matrix3::operator []( int col ) -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::operator =( const Matrix3 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix3 transpose( const Matrix3 & mat ) -{ - __m128 tmp0, tmp1, res0, res1, res2; - tmp0 = vec_mergeh( mat.getCol0().get128(), mat.getCol2().get128() ); - tmp1 = vec_mergel( mat.getCol0().get128(), mat.getCol2().get128() ); - res0 = vec_mergeh( tmp0, mat.getCol1().get128() ); - //res1 = vec_perm( tmp0, mat.getCol1().get128(), _VECTORMATH_PERM_ZBWX ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - res1 = _mm_shuffle_ps( tmp0, tmp0, _MM_SHUFFLE(0,3,2,2)); - res1 = vec_sel(res1, mat.getCol1().get128(), select_y); - //res2 = vec_perm( tmp1, mat.getCol1().get128(), _VECTORMATH_PERM_XCYX ); - res2 = _mm_shuffle_ps( tmp1, tmp1, _MM_SHUFFLE(0,1,1,0)); - res2 = vec_sel(res2, vec_splat(mat.getCol1().get128(), 2), select_y); - return Matrix3( - Vector3( res0 ), - Vector3( res1 ), - Vector3( res2 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 inverse( const Matrix3 & mat ) -{ - __m128 tmp0, tmp1, tmp2, tmp3, tmp4, dot, invdet, inv0, inv1, inv2; - tmp2 = _vmathVfCross( mat.getCol0().get128(), mat.getCol1().get128() ); - tmp0 = _vmathVfCross( mat.getCol1().get128(), mat.getCol2().get128() ); - tmp1 = _vmathVfCross( mat.getCol2().get128(), mat.getCol0().get128() ); - dot = _vmathVfDot3( tmp2, mat.getCol2().get128() ); - dot = vec_splat( dot, 0 ); - invdet = recipf4( dot ); - tmp3 = vec_mergeh( tmp0, tmp2 ); - tmp4 = vec_mergel( tmp0, tmp2 ); - inv0 = vec_mergeh( tmp3, tmp1 ); - //inv1 = vec_perm( tmp3, tmp1, _VECTORMATH_PERM_ZBWX ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - inv1 = _mm_shuffle_ps( tmp3, tmp3, _MM_SHUFFLE(0,3,2,2)); - inv1 = vec_sel(inv1, tmp1, select_y); - //inv2 = vec_perm( tmp4, tmp1, _VECTORMATH_PERM_XCYX ); - inv2 = _mm_shuffle_ps( tmp4, tmp4, _MM_SHUFFLE(0,1,1,0)); - inv2 = vec_sel(inv2, vec_splat(tmp1, 2), select_y); - inv0 = vec_mul( inv0, invdet ); - inv1 = vec_mul( inv1, invdet ); - inv2 = vec_mul( inv2, invdet ); - return Matrix3( - Vector3( inv0 ), - Vector3( inv1 ), - Vector3( inv2 ) - ); -} - -VECTORMATH_FORCE_INLINE const floatInVec determinant( const Matrix3 & mat ) -{ - return dot( mat.getCol2(), cross( mat.getCol0(), mat.getCol1() ) ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::operator +( const Matrix3 & mat ) const -{ - return Matrix3( - ( mCol0 + mat.mCol0 ), - ( mCol1 + mat.mCol1 ), - ( mCol2 + mat.mCol2 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::operator -( const Matrix3 & mat ) const -{ - return Matrix3( - ( mCol0 - mat.mCol0 ), - ( mCol1 - mat.mCol1 ), - ( mCol2 - mat.mCol2 ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::operator +=( const Matrix3 & mat ) -{ - *this = *this + mat; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::operator -=( const Matrix3 & mat ) -{ - *this = *this - mat; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::operator -( ) const -{ - return Matrix3( - ( -mCol0 ), - ( -mCol1 ), - ( -mCol2 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 absPerElem( const Matrix3 & mat ) -{ - return Matrix3( - absPerElem( mat.getCol0() ), - absPerElem( mat.getCol1() ), - absPerElem( mat.getCol2() ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::operator *( float scalar ) const -{ - return *this * floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::operator *( const floatInVec &scalar ) const -{ - return Matrix3( - ( mCol0 * scalar ), - ( mCol1 * scalar ), - ( mCol2 * scalar ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::operator *=( float scalar ) -{ - return *this *= floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::operator *=( const floatInVec &scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix3 operator *( float scalar, const Matrix3 & mat ) -{ - return floatInVec(scalar) * mat; -} - -VECTORMATH_FORCE_INLINE const Matrix3 operator *( const floatInVec &scalar, const Matrix3 & mat ) -{ - return mat * scalar; -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix3::operator *( const Vector3 &vec ) const -{ - __m128 res; - __m128 xxxx, yyyy, zzzz; - xxxx = vec_splat( vec.get128(), 0 ); - yyyy = vec_splat( vec.get128(), 1 ); - zzzz = vec_splat( vec.get128(), 2 ); - res = vec_mul( mCol0.get128(), xxxx ); - res = vec_madd( mCol1.get128(), yyyy, res ); - res = vec_madd( mCol2.get128(), zzzz, res ); - return Vector3( res ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::operator *( const Matrix3 & mat ) const -{ - return Matrix3( - ( *this * mat.mCol0 ), - ( *this * mat.mCol1 ), - ( *this * mat.mCol2 ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix3 & Matrix3::operator *=( const Matrix3 & mat ) -{ - *this = *this * mat; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix3 mulPerElem( const Matrix3 & mat0, const Matrix3 & mat1 ) -{ - return Matrix3( - mulPerElem( mat0.getCol0(), mat1.getCol0() ), - mulPerElem( mat0.getCol1(), mat1.getCol1() ), - mulPerElem( mat0.getCol2(), mat1.getCol2() ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::identity( ) -{ - return Matrix3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationX( float radians ) -{ - return rotationX( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationX( const floatInVec &radians ) -{ - __m128 s, c, res1, res2; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res1 = vec_sel( zero, c, select_y ); - res1 = vec_sel( res1, s, select_z ); - res2 = vec_sel( zero, negatef4(s), select_y ); - res2 = vec_sel( res2, c, select_z ); - return Matrix3( - Vector3::xAxis( ), - Vector3( res1 ), - Vector3( res2 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationY( float radians ) -{ - return rotationY( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationY( const floatInVec &radians ) -{ - __m128 s, c, res0, res2; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res0 = vec_sel( zero, c, select_x ); - res0 = vec_sel( res0, negatef4(s), select_z ); - res2 = vec_sel( zero, s, select_x ); - res2 = vec_sel( res2, c, select_z ); - return Matrix3( - Vector3( res0 ), - Vector3::yAxis( ), - Vector3( res2 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationZ( float radians ) -{ - return rotationZ( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationZ( const floatInVec &radians ) -{ - __m128 s, c, res0, res1; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res0 = vec_sel( zero, c, select_x ); - res0 = vec_sel( res0, s, select_y ); - res1 = vec_sel( zero, negatef4(s), select_x ); - res1 = vec_sel( res1, c, select_y ); - return Matrix3( - Vector3( res0 ), - Vector3( res1 ), - Vector3::zAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotationZYX( const Vector3 &radiansXYZ ) -{ - __m128 angles, s, negS, c, X0, X1, Y0, Y1, Z0, Z1, tmp; - angles = Vector4( radiansXYZ, 0.0f ).get128(); - sincosf4( angles, &s, &c ); - negS = negatef4( s ); - Z0 = vec_mergel( c, s ); - Z1 = vec_mergel( negS, c ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_xyz[4] = {0xffffffff, 0xffffffff, 0xffffffff, 0}; - Z1 = vec_and( Z1, _mm_load_ps( (float *)select_xyz ) ); - Y0 = _mm_shuffle_ps( c, negS, _MM_SHUFFLE(0,1,1,1) ); - Y1 = _mm_shuffle_ps( s, c, _MM_SHUFFLE(0,1,1,1) ); - X0 = vec_splat( s, 0 ); - X1 = vec_splat( c, 0 ); - tmp = vec_mul( Z0, Y1 ); - return Matrix3( - Vector3( vec_mul( Z0, Y0 ) ), - Vector3( vec_madd( Z1, X1, vec_mul( tmp, X0 ) ) ), - Vector3( vec_nmsub( Z1, X0, vec_mul( tmp, X1 ) ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotation( float radians, const Vector3 &unitVec ) -{ - return rotation( floatInVec(radians), unitVec ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotation( const floatInVec &radians, const Vector3 &unitVec ) -{ - __m128 axis, s, c, oneMinusC, axisS, negAxisS, xxxx, yyyy, zzzz, tmp0, tmp1, tmp2; - axis = unitVec.get128(); - sincosf4( radians.get128(), &s, &c ); - xxxx = vec_splat( axis, 0 ); - yyyy = vec_splat( axis, 1 ); - zzzz = vec_splat( axis, 2 ); - oneMinusC = vec_sub( _mm_set1_ps(1.0f), c ); - axisS = vec_mul( axis, s ); - negAxisS = negatef4( axisS ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - //tmp0 = vec_perm( axisS, negAxisS, _VECTORMATH_PERM_XZBX ); - tmp0 = _mm_shuffle_ps( axisS, axisS, _MM_SHUFFLE(0,0,2,0) ); - tmp0 = vec_sel(tmp0, vec_splat(negAxisS, 1), select_z); - //tmp1 = vec_perm( axisS, negAxisS, _VECTORMATH_PERM_CXXX ); - tmp1 = vec_sel( vec_splat(axisS, 0), vec_splat(negAxisS, 2), select_x ); - //tmp2 = vec_perm( axisS, negAxisS, _VECTORMATH_PERM_YAXX ); - tmp2 = _mm_shuffle_ps( axisS, axisS, _MM_SHUFFLE(0,0,0,1) ); - tmp2 = vec_sel(tmp2, vec_splat(negAxisS, 0), select_y); - tmp0 = vec_sel( tmp0, c, select_x ); - tmp1 = vec_sel( tmp1, c, select_y ); - tmp2 = vec_sel( tmp2, c, select_z ); - return Matrix3( - Vector3( vec_madd( vec_mul( axis, xxxx ), oneMinusC, tmp0 ) ), - Vector3( vec_madd( vec_mul( axis, yyyy ), oneMinusC, tmp1 ) ), - Vector3( vec_madd( vec_mul( axis, zzzz ), oneMinusC, tmp2 ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::rotation( const Quat &unitQuat ) -{ - return Matrix3( unitQuat ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix3::scale( const Vector3 &scaleVec ) -{ - __m128 zero = _mm_setzero_ps(); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - return Matrix3( - Vector3( vec_sel( zero, scaleVec.get128(), select_x ) ), - Vector3( vec_sel( zero, scaleVec.get128(), select_y ) ), - Vector3( vec_sel( zero, scaleVec.get128(), select_z ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 appendScale( const Matrix3 & mat, const Vector3 &scaleVec ) -{ - return Matrix3( - ( mat.getCol0() * scaleVec.getX( ) ), - ( mat.getCol1() * scaleVec.getY( ) ), - ( mat.getCol2() * scaleVec.getZ( ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 prependScale( const Vector3 &scaleVec, const Matrix3 & mat ) -{ - return Matrix3( - mulPerElem( mat.getCol0(), scaleVec ), - mulPerElem( mat.getCol1(), scaleVec ), - mulPerElem( mat.getCol2(), scaleVec ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, bool select1 ) -{ - return Matrix3( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, const boolInVec &select1 ) -{ - return Matrix3( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Matrix3 & mat ) -{ - print( mat.getRow( 0 ) ); - print( mat.getRow( 1 ) ); - print( mat.getRow( 2 ) ); -} - -VECTORMATH_FORCE_INLINE void print( const Matrix3 & mat, const char * name ) -{ - printf("%s:\n", name); - print( mat ); -} - -#endif - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( const Matrix4 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - mCol3 = mat.mCol3; -} - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( float scalar ) -{ - mCol0 = Vector4( scalar ); - mCol1 = Vector4( scalar ); - mCol2 = Vector4( scalar ); - mCol3 = Vector4( scalar ); -} - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( const floatInVec &scalar ) -{ - mCol0 = Vector4( scalar ); - mCol1 = Vector4( scalar ); - mCol2 = Vector4( scalar ); - mCol3 = Vector4( scalar ); -} - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( const Transform3 & mat ) -{ - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( mat.getCol3(), 1.0f ); -} - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( const Vector4 &_col0, const Vector4 &_col1, const Vector4 &_col2, const Vector4 &_col3 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; - mCol3 = _col3; -} - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( const Matrix3 & mat, const Vector3 &translateVec ) -{ - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( translateVec, 1.0f ); -} - -VECTORMATH_FORCE_INLINE Matrix4::Matrix4( const Quat &unitQuat, const Vector3 &translateVec ) -{ - Matrix3 mat; - mat = Matrix3( unitQuat ); - mCol0 = Vector4( mat.getCol0(), 0.0f ); - mCol1 = Vector4( mat.getCol1(), 0.0f ); - mCol2 = Vector4( mat.getCol2(), 0.0f ); - mCol3 = Vector4( translateVec, 1.0f ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setCol0( const Vector4 &_col0 ) -{ - mCol0 = _col0; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setCol1( const Vector4 &_col1 ) -{ - mCol1 = _col1; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setCol2( const Vector4 &_col2 ) -{ - mCol2 = _col2; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setCol3( const Vector4 &_col3 ) -{ - mCol3 = _col3; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setCol( int col, const Vector4 &vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setRow( int row, const Vector4 &vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - mCol3.setElem( row, vec.getElem( 3 ) ); - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setElem( int col, int row, float val ) -{ - (*this)[col].setElem(row, val); - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setElem( int col, int row, const floatInVec &val ) -{ - Vector4 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Matrix4::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::getCol0( ) const -{ - return mCol0; -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::getCol1( ) const -{ - return mCol1; -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::getCol2( ) const -{ - return mCol2; -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::getCol3( ) const -{ - return mCol3; -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::getRow( int row ) const -{ - return Vector4( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ), mCol3.getElem( row ) ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Matrix4::operator []( int col ) -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator =( const Matrix4 & mat ) -{ - mCol0 = mat.mCol0; - mCol1 = mat.mCol1; - mCol2 = mat.mCol2; - mCol3 = mat.mCol3; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix4 transpose( const Matrix4 & mat ) -{ - __m128 tmp0, tmp1, tmp2, tmp3, res0, res1, res2, res3; - tmp0 = vec_mergeh( mat.getCol0().get128(), mat.getCol2().get128() ); - tmp1 = vec_mergeh( mat.getCol1().get128(), mat.getCol3().get128() ); - tmp2 = vec_mergel( mat.getCol0().get128(), mat.getCol2().get128() ); - tmp3 = vec_mergel( mat.getCol1().get128(), mat.getCol3().get128() ); - res0 = vec_mergeh( tmp0, tmp1 ); - res1 = vec_mergel( tmp0, tmp1 ); - res2 = vec_mergeh( tmp2, tmp3 ); - res3 = vec_mergel( tmp2, tmp3 ); - return Matrix4( - Vector4( res0 ), - Vector4( res1 ), - Vector4( res2 ), - Vector4( res3 ) - ); -} - -// TODO: Tidy -static VM_ATTRIBUTE_ALIGN16 const unsigned int _vmathPNPN[4] = {0x00000000, 0x80000000, 0x00000000, 0x80000000}; -static VM_ATTRIBUTE_ALIGN16 const unsigned int _vmathNPNP[4] = {0x80000000, 0x00000000, 0x80000000, 0x00000000}; -static VM_ATTRIBUTE_ALIGN16 const float _vmathZERONE[4] = {1.0f, 0.0f, 0.0f, 1.0f}; - -VECTORMATH_FORCE_INLINE const Matrix4 inverse( const Matrix4 & mat ) -{ - __m128 Va,Vb,Vc; - __m128 r1,r2,r3,tt,tt2; - __m128 sum,Det,RDet; - __m128 trns0,trns1,trns2,trns3; - - __m128 _L1 = mat.getCol0().get128(); - __m128 _L2 = mat.getCol1().get128(); - __m128 _L3 = mat.getCol2().get128(); - __m128 _L4 = mat.getCol3().get128(); - // Calculating the minterms for the first line. - - // _mm_ror_ps is just a macro using _mm_shuffle_ps(). - tt = _L4; tt2 = _mm_ror_ps(_L3,1); - Vc = _mm_mul_ps(tt2,_mm_ror_ps(tt,0)); // V3'dot V4 - Va = _mm_mul_ps(tt2,_mm_ror_ps(tt,2)); // V3'dot V4" - Vb = _mm_mul_ps(tt2,_mm_ror_ps(tt,3)); // V3' dot V4^ - - r1 = _mm_sub_ps(_mm_ror_ps(Va,1),_mm_ror_ps(Vc,2)); // V3" dot V4^ - V3^ dot V4" - r2 = _mm_sub_ps(_mm_ror_ps(Vb,2),_mm_ror_ps(Vb,0)); // V3^ dot V4' - V3' dot V4^ - r3 = _mm_sub_ps(_mm_ror_ps(Va,0),_mm_ror_ps(Vc,1)); // V3' dot V4" - V3" dot V4' - - tt = _L2; - Va = _mm_ror_ps(tt,1); sum = _mm_mul_ps(Va,r1); - Vb = _mm_ror_ps(tt,2); sum = _mm_add_ps(sum,_mm_mul_ps(Vb,r2)); - Vc = _mm_ror_ps(tt,3); sum = _mm_add_ps(sum,_mm_mul_ps(Vc,r3)); - - // Calculating the determinant. - Det = _mm_mul_ps(sum,_L1); - Det = _mm_add_ps(Det,_mm_movehl_ps(Det,Det)); - - const __m128 Sign_PNPN = _mm_load_ps((float *)_vmathPNPN); - const __m128 Sign_NPNP = _mm_load_ps((float *)_vmathNPNP); - - __m128 mtL1 = _mm_xor_ps(sum,Sign_PNPN); - - // Calculating the minterms of the second line (using previous results). - tt = _mm_ror_ps(_L1,1); sum = _mm_mul_ps(tt,r1); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r2)); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r3)); - __m128 mtL2 = _mm_xor_ps(sum,Sign_NPNP); - - // Testing the determinant. - Det = _mm_sub_ss(Det,_mm_shuffle_ps(Det,Det,1)); - - // Calculating the minterms of the third line. - tt = _mm_ror_ps(_L1,1); - Va = _mm_mul_ps(tt,Vb); // V1' dot V2" - Vb = _mm_mul_ps(tt,Vc); // V1' dot V2^ - Vc = _mm_mul_ps(tt,_L2); // V1' dot V2 - - r1 = _mm_sub_ps(_mm_ror_ps(Va,1),_mm_ror_ps(Vc,2)); // V1" dot V2^ - V1^ dot V2" - r2 = _mm_sub_ps(_mm_ror_ps(Vb,2),_mm_ror_ps(Vb,0)); // V1^ dot V2' - V1' dot V2^ - r3 = _mm_sub_ps(_mm_ror_ps(Va,0),_mm_ror_ps(Vc,1)); // V1' dot V2" - V1" dot V2' - - tt = _mm_ror_ps(_L4,1); sum = _mm_mul_ps(tt,r1); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r2)); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r3)); - __m128 mtL3 = _mm_xor_ps(sum,Sign_PNPN); - - // Dividing is FASTER than rcp_nr! (Because rcp_nr causes many register-memory RWs). - RDet = _mm_div_ss(_mm_load_ss((float *)&_vmathZERONE), Det); // TODO: just 1.0f? - RDet = _mm_shuffle_ps(RDet,RDet,0x00); - - // Devide the first 12 minterms with the determinant. - mtL1 = _mm_mul_ps(mtL1, RDet); - mtL2 = _mm_mul_ps(mtL2, RDet); - mtL3 = _mm_mul_ps(mtL3, RDet); - - // Calculate the minterms of the forth line and devide by the determinant. - tt = _mm_ror_ps(_L3,1); sum = _mm_mul_ps(tt,r1); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r2)); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r3)); - __m128 mtL4 = _mm_xor_ps(sum,Sign_NPNP); - mtL4 = _mm_mul_ps(mtL4, RDet); - - // Now we just have to transpose the minterms matrix. - trns0 = _mm_unpacklo_ps(mtL1,mtL2); - trns1 = _mm_unpacklo_ps(mtL3,mtL4); - trns2 = _mm_unpackhi_ps(mtL1,mtL2); - trns3 = _mm_unpackhi_ps(mtL3,mtL4); - _L1 = _mm_movelh_ps(trns0,trns1); - _L2 = _mm_movehl_ps(trns1,trns0); - _L3 = _mm_movelh_ps(trns2,trns3); - _L4 = _mm_movehl_ps(trns3,trns2); - - return Matrix4( - Vector4( _L1 ), - Vector4( _L2 ), - Vector4( _L3 ), - Vector4( _L4 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 affineInverse( const Matrix4 & mat ) -{ - Transform3 affineMat; - affineMat.setCol0( mat.getCol0().getXYZ( ) ); - affineMat.setCol1( mat.getCol1().getXYZ( ) ); - affineMat.setCol2( mat.getCol2().getXYZ( ) ); - affineMat.setCol3( mat.getCol3().getXYZ( ) ); - return Matrix4( inverse( affineMat ) ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 orthoInverse( const Matrix4 & mat ) -{ - Transform3 affineMat; - affineMat.setCol0( mat.getCol0().getXYZ( ) ); - affineMat.setCol1( mat.getCol1().getXYZ( ) ); - affineMat.setCol2( mat.getCol2().getXYZ( ) ); - affineMat.setCol3( mat.getCol3().getXYZ( ) ); - return Matrix4( orthoInverse( affineMat ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec determinant( const Matrix4 & mat ) -{ - __m128 Va,Vb,Vc; - __m128 r1,r2,r3,tt,tt2; - __m128 sum,Det; - - __m128 _L1 = mat.getCol0().get128(); - __m128 _L2 = mat.getCol1().get128(); - __m128 _L3 = mat.getCol2().get128(); - __m128 _L4 = mat.getCol3().get128(); - // Calculating the minterms for the first line. - - // _mm_ror_ps is just a macro using _mm_shuffle_ps(). - tt = _L4; tt2 = _mm_ror_ps(_L3,1); - Vc = _mm_mul_ps(tt2,_mm_ror_ps(tt,0)); // V3' dot V4 - Va = _mm_mul_ps(tt2,_mm_ror_ps(tt,2)); // V3' dot V4" - Vb = _mm_mul_ps(tt2,_mm_ror_ps(tt,3)); // V3' dot V4^ - - r1 = _mm_sub_ps(_mm_ror_ps(Va,1),_mm_ror_ps(Vc,2)); // V3" dot V4^ - V3^ dot V4" - r2 = _mm_sub_ps(_mm_ror_ps(Vb,2),_mm_ror_ps(Vb,0)); // V3^ dot V4' - V3' dot V4^ - r3 = _mm_sub_ps(_mm_ror_ps(Va,0),_mm_ror_ps(Vc,1)); // V3' dot V4" - V3" dot V4' - - tt = _L2; - Va = _mm_ror_ps(tt,1); sum = _mm_mul_ps(Va,r1); - Vb = _mm_ror_ps(tt,2); sum = _mm_add_ps(sum,_mm_mul_ps(Vb,r2)); - Vc = _mm_ror_ps(tt,3); sum = _mm_add_ps(sum,_mm_mul_ps(Vc,r3)); - - // Calculating the determinant. - Det = _mm_mul_ps(sum,_L1); - Det = _mm_add_ps(Det,_mm_movehl_ps(Det,Det)); - - // Calculating the minterms of the second line (using previous results). - tt = _mm_ror_ps(_L1,1); sum = _mm_mul_ps(tt,r1); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r2)); - tt = _mm_ror_ps(tt,1); sum = _mm_add_ps(sum,_mm_mul_ps(tt,r3)); - - // Testing the determinant. - Det = _mm_sub_ss(Det,_mm_shuffle_ps(Det,Det,1)); - return floatInVec(Det, 0); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator +( const Matrix4 & mat ) const -{ - return Matrix4( - ( mCol0 + mat.mCol0 ), - ( mCol1 + mat.mCol1 ), - ( mCol2 + mat.mCol2 ), - ( mCol3 + mat.mCol3 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator -( const Matrix4 & mat ) const -{ - return Matrix4( - ( mCol0 - mat.mCol0 ), - ( mCol1 - mat.mCol1 ), - ( mCol2 - mat.mCol2 ), - ( mCol3 - mat.mCol3 ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator +=( const Matrix4 & mat ) -{ - *this = *this + mat; - return *this; -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator -=( const Matrix4 & mat ) -{ - *this = *this - mat; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator -( ) const -{ - return Matrix4( - ( -mCol0 ), - ( -mCol1 ), - ( -mCol2 ), - ( -mCol3 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 absPerElem( const Matrix4 & mat ) -{ - return Matrix4( - absPerElem( mat.getCol0() ), - absPerElem( mat.getCol1() ), - absPerElem( mat.getCol2() ), - absPerElem( mat.getCol3() ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator *( float scalar ) const -{ - return *this * floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator *( const floatInVec &scalar ) const -{ - return Matrix4( - ( mCol0 * scalar ), - ( mCol1 * scalar ), - ( mCol2 * scalar ), - ( mCol3 * scalar ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator *=( float scalar ) -{ - return *this *= floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator *=( const floatInVec &scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix4 operator *( float scalar, const Matrix4 & mat ) -{ - return floatInVec(scalar) * mat; -} - -VECTORMATH_FORCE_INLINE const Matrix4 operator *( const floatInVec &scalar, const Matrix4 & mat ) -{ - return mat * scalar; -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::operator *( const Vector4 &vec ) const -{ - return Vector4( - _mm_add_ps( - _mm_add_ps(_mm_mul_ps(mCol0.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(0,0,0,0))), _mm_mul_ps(mCol1.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(1,1,1,1)))), - _mm_add_ps(_mm_mul_ps(mCol2.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(2,2,2,2))), _mm_mul_ps(mCol3.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(3,3,3,3))))) - ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::operator *( const Vector3 &vec ) const -{ - return Vector4( - _mm_add_ps( - _mm_add_ps(_mm_mul_ps(mCol0.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(0,0,0,0))), _mm_mul_ps(mCol1.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(1,1,1,1)))), - _mm_mul_ps(mCol2.get128(), _mm_shuffle_ps(vec.get128(), vec.get128(), _MM_SHUFFLE(2,2,2,2)))) - ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Matrix4::operator *( const Point3 &pnt ) const -{ - return Vector4( - _mm_add_ps( - _mm_add_ps(_mm_mul_ps(mCol0.get128(), _mm_shuffle_ps(pnt.get128(), pnt.get128(), _MM_SHUFFLE(0,0,0,0))), _mm_mul_ps(mCol1.get128(), _mm_shuffle_ps(pnt.get128(), pnt.get128(), _MM_SHUFFLE(1,1,1,1)))), - _mm_add_ps(_mm_mul_ps(mCol2.get128(), _mm_shuffle_ps(pnt.get128(), pnt.get128(), _MM_SHUFFLE(2,2,2,2))), mCol3.get128())) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator *( const Matrix4 & mat ) const -{ - return Matrix4( - ( *this * mat.mCol0 ), - ( *this * mat.mCol1 ), - ( *this * mat.mCol2 ), - ( *this * mat.mCol3 ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator *=( const Matrix4 & mat ) -{ - *this = *this * mat; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::operator *( const Transform3 & tfrm ) const -{ - return Matrix4( - ( *this * tfrm.getCol0() ), - ( *this * tfrm.getCol1() ), - ( *this * tfrm.getCol2() ), - ( *this * Point3( tfrm.getCol3() ) ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::operator *=( const Transform3 & tfrm ) -{ - *this = *this * tfrm; - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix4 mulPerElem( const Matrix4 & mat0, const Matrix4 & mat1 ) -{ - return Matrix4( - mulPerElem( mat0.getCol0(), mat1.getCol0() ), - mulPerElem( mat0.getCol1(), mat1.getCol1() ), - mulPerElem( mat0.getCol2(), mat1.getCol2() ), - mulPerElem( mat0.getCol3(), mat1.getCol3() ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::identity( ) -{ - return Matrix4( - Vector4::xAxis( ), - Vector4::yAxis( ), - Vector4::zAxis( ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setUpper3x3( const Matrix3 & mat3 ) -{ - mCol0.setXYZ( mat3.getCol0() ); - mCol1.setXYZ( mat3.getCol1() ); - mCol2.setXYZ( mat3.getCol2() ); - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix3 Matrix4::getUpper3x3( ) const -{ - return Matrix3( - mCol0.getXYZ( ), - mCol1.getXYZ( ), - mCol2.getXYZ( ) - ); -} - -VECTORMATH_FORCE_INLINE Matrix4 & Matrix4::setTranslation( const Vector3 &translateVec ) -{ - mCol3.setXYZ( translateVec ); - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 Matrix4::getTranslation( ) const -{ - return mCol3.getXYZ( ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationX( float radians ) -{ - return rotationX( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationX( const floatInVec &radians ) -{ - __m128 s, c, res1, res2; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res1 = vec_sel( zero, c, select_y ); - res1 = vec_sel( res1, s, select_z ); - res2 = vec_sel( zero, negatef4(s), select_y ); - res2 = vec_sel( res2, c, select_z ); - return Matrix4( - Vector4::xAxis( ), - Vector4( res1 ), - Vector4( res2 ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationY( float radians ) -{ - return rotationY( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationY( const floatInVec &radians ) -{ - __m128 s, c, res0, res2; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res0 = vec_sel( zero, c, select_x ); - res0 = vec_sel( res0, negatef4(s), select_z ); - res2 = vec_sel( zero, s, select_x ); - res2 = vec_sel( res2, c, select_z ); - return Matrix4( - Vector4( res0 ), - Vector4::yAxis( ), - Vector4( res2 ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationZ( float radians ) -{ - return rotationZ( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationZ( const floatInVec &radians ) -{ - __m128 s, c, res0, res1; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res0 = vec_sel( zero, c, select_x ); - res0 = vec_sel( res0, s, select_y ); - res1 = vec_sel( zero, negatef4(s), select_x ); - res1 = vec_sel( res1, c, select_y ); - return Matrix4( - Vector4( res0 ), - Vector4( res1 ), - Vector4::zAxis( ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotationZYX( const Vector3 &radiansXYZ ) -{ - __m128 angles, s, negS, c, X0, X1, Y0, Y1, Z0, Z1, tmp; - angles = Vector4( radiansXYZ, 0.0f ).get128(); - sincosf4( angles, &s, &c ); - negS = negatef4( s ); - Z0 = vec_mergel( c, s ); - Z1 = vec_mergel( negS, c ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_xyz[4] = {0xffffffff, 0xffffffff, 0xffffffff, 0}; - Z1 = vec_and( Z1, _mm_load_ps( (float *)select_xyz ) ); - Y0 = _mm_shuffle_ps( c, negS, _MM_SHUFFLE(0,1,1,1) ); - Y1 = _mm_shuffle_ps( s, c, _MM_SHUFFLE(0,1,1,1) ); - X0 = vec_splat( s, 0 ); - X1 = vec_splat( c, 0 ); - tmp = vec_mul( Z0, Y1 ); - return Matrix4( - Vector4( vec_mul( Z0, Y0 ) ), - Vector4( vec_madd( Z1, X1, vec_mul( tmp, X0 ) ) ), - Vector4( vec_nmsub( Z1, X0, vec_mul( tmp, X1 ) ) ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotation( float radians, const Vector3 &unitVec ) -{ - return rotation( floatInVec(radians), unitVec ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotation( const floatInVec &radians, const Vector3 &unitVec ) -{ - __m128 axis, s, c, oneMinusC, axisS, negAxisS, xxxx, yyyy, zzzz, tmp0, tmp1, tmp2; - axis = unitVec.get128(); - sincosf4( radians.get128(), &s, &c ); - xxxx = vec_splat( axis, 0 ); - yyyy = vec_splat( axis, 1 ); - zzzz = vec_splat( axis, 2 ); - oneMinusC = vec_sub( _mm_set1_ps(1.0f), c ); - axisS = vec_mul( axis, s ); - negAxisS = negatef4( axisS ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - //tmp0 = vec_perm( axisS, negAxisS, _VECTORMATH_PERM_XZBX ); - tmp0 = _mm_shuffle_ps( axisS, axisS, _MM_SHUFFLE(0,0,2,0) ); - tmp0 = vec_sel(tmp0, vec_splat(negAxisS, 1), select_z); - //tmp1 = vec_perm( axisS, negAxisS, _VECTORMATH_PERM_CXXX ); - tmp1 = vec_sel( vec_splat(axisS, 0), vec_splat(negAxisS, 2), select_x ); - //tmp2 = vec_perm( axisS, negAxisS, _VECTORMATH_PERM_YAXX ); - tmp2 = _mm_shuffle_ps( axisS, axisS, _MM_SHUFFLE(0,0,0,1) ); - tmp2 = vec_sel(tmp2, vec_splat(negAxisS, 0), select_y); - tmp0 = vec_sel( tmp0, c, select_x ); - tmp1 = vec_sel( tmp1, c, select_y ); - tmp2 = vec_sel( tmp2, c, select_z ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_xyz[4] = {0xffffffff, 0xffffffff, 0xffffffff, 0}; - axis = vec_and( axis, _mm_load_ps( (float *)select_xyz ) ); - tmp0 = vec_and( tmp0, _mm_load_ps( (float *)select_xyz ) ); - tmp1 = vec_and( tmp1, _mm_load_ps( (float *)select_xyz ) ); - tmp2 = vec_and( tmp2, _mm_load_ps( (float *)select_xyz ) ); - return Matrix4( - Vector4( vec_madd( vec_mul( axis, xxxx ), oneMinusC, tmp0 ) ), - Vector4( vec_madd( vec_mul( axis, yyyy ), oneMinusC, tmp1 ) ), - Vector4( vec_madd( vec_mul( axis, zzzz ), oneMinusC, tmp2 ) ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::rotation( const Quat &unitQuat ) -{ - return Matrix4( Transform3::rotation( unitQuat ) ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::scale( const Vector3 &scaleVec ) -{ - __m128 zero = _mm_setzero_ps(); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - return Matrix4( - Vector4( vec_sel( zero, scaleVec.get128(), select_x ) ), - Vector4( vec_sel( zero, scaleVec.get128(), select_y ) ), - Vector4( vec_sel( zero, scaleVec.get128(), select_z ) ), - Vector4::wAxis( ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 appendScale( const Matrix4 & mat, const Vector3 &scaleVec ) -{ - return Matrix4( - ( mat.getCol0() * scaleVec.getX( ) ), - ( mat.getCol1() * scaleVec.getY( ) ), - ( mat.getCol2() * scaleVec.getZ( ) ), - mat.getCol3() - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 prependScale( const Vector3 &scaleVec, const Matrix4 & mat ) -{ - Vector4 scale4; - scale4 = Vector4( scaleVec, 1.0f ); - return Matrix4( - mulPerElem( mat.getCol0(), scale4 ), - mulPerElem( mat.getCol1(), scale4 ), - mulPerElem( mat.getCol2(), scale4 ), - mulPerElem( mat.getCol3(), scale4 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::translation( const Vector3 &translateVec ) -{ - return Matrix4( - Vector4::xAxis( ), - Vector4::yAxis( ), - Vector4::zAxis( ), - Vector4( translateVec, 1.0f ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::lookAt( const Point3 &eyePos, const Point3 &lookAtPos, const Vector3 &upVec ) -{ - Matrix4 m4EyeFrame; - Vector3 v3X, v3Y, v3Z; - v3Y = normalize( upVec ); - v3Z = normalize( ( eyePos - lookAtPos ) ); - v3X = normalize( cross( v3Y, v3Z ) ); - v3Y = cross( v3Z, v3X ); - m4EyeFrame = Matrix4( Vector4( v3X ), Vector4( v3Y ), Vector4( v3Z ), Vector4( eyePos ) ); - return orthoInverse( m4EyeFrame ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::perspective( float fovyRadians, float aspect, float zNear, float zFar ) -{ - float f, rangeInv; - __m128 zero, col0, col1, col2, col3; - union { __m128 v; float s[4]; } tmp; - f = tanf( _VECTORMATH_PI_OVER_2 - fovyRadians * 0.5f ); - rangeInv = 1.0f / ( zNear - zFar ); - zero = _mm_setzero_ps(); - tmp.v = zero; - tmp.s[0] = f / aspect; - col0 = tmp.v; - tmp.v = zero; - tmp.s[1] = f; - col1 = tmp.v; - tmp.v = zero; - tmp.s[2] = ( zNear + zFar ) * rangeInv; - tmp.s[3] = -1.0f; - col2 = tmp.v; - tmp.v = zero; - tmp.s[2] = zNear * zFar * rangeInv * 2.0f; - col3 = tmp.v; - return Matrix4( - Vector4( col0 ), - Vector4( col1 ), - Vector4( col2 ), - Vector4( col3 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::frustum( float left, float right, float bottom, float top, float zNear, float zFar ) -{ - /* function implementation based on code from STIDC SDK: */ - /* -------------------------------------------------------------- */ - /* PLEASE DO NOT MODIFY THIS SECTION */ - /* This prolog section is automatically generated. */ - /* */ - /* (C)Copyright */ - /* Sony Computer Entertainment, Inc., */ - /* Toshiba Corporation, */ - /* International Business Machines Corporation, */ - /* 2001,2002. */ - /* S/T/I Confidential Information */ - /* -------------------------------------------------------------- */ - __m128 lbf, rtn; - __m128 diff, sum, inv_diff; - __m128 diagonal, column, near2; - __m128 zero = _mm_setzero_ps(); - union { __m128 v; float s[4]; } l, f, r, n, b, t; // TODO: Union? - l.s[0] = left; - f.s[0] = zFar; - r.s[0] = right; - n.s[0] = zNear; - b.s[0] = bottom; - t.s[0] = top; - lbf = vec_mergeh( l.v, f.v ); - rtn = vec_mergeh( r.v, n.v ); - lbf = vec_mergeh( lbf, b.v ); - rtn = vec_mergeh( rtn, t.v ); - diff = vec_sub( rtn, lbf ); - sum = vec_add( rtn, lbf ); - inv_diff = recipf4( diff ); - near2 = vec_splat( n.v, 0 ); - near2 = vec_add( near2, near2 ); - diagonal = vec_mul( near2, inv_diff ); - column = vec_mul( sum, inv_diff ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_w[4] = {0, 0, 0, 0xffffffff}; - return Matrix4( - Vector4( vec_sel( zero, diagonal, select_x ) ), - Vector4( vec_sel( zero, diagonal, select_y ) ), - Vector4( vec_sel( column, _mm_set1_ps(-1.0f), select_w ) ), - Vector4( vec_sel( zero, vec_mul( diagonal, vec_splat( f.v, 0 ) ), select_z ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 Matrix4::orthographic( float left, float right, float bottom, float top, float zNear, float zFar ) -{ - /* function implementation based on code from STIDC SDK: */ - /* -------------------------------------------------------------- */ - /* PLEASE DO NOT MODIFY THIS SECTION */ - /* This prolog section is automatically generated. */ - /* */ - /* (C)Copyright */ - /* Sony Computer Entertainment, Inc., */ - /* Toshiba Corporation, */ - /* International Business Machines Corporation, */ - /* 2001,2002. */ - /* S/T/I Confidential Information */ - /* -------------------------------------------------------------- */ - __m128 lbf, rtn; - __m128 diff, sum, inv_diff, neg_inv_diff; - __m128 diagonal, column; - __m128 zero = _mm_setzero_ps(); - union { __m128 v; float s[4]; } l, f, r, n, b, t; - l.s[0] = left; - f.s[0] = zFar; - r.s[0] = right; - n.s[0] = zNear; - b.s[0] = bottom; - t.s[0] = top; - lbf = vec_mergeh( l.v, f.v ); - rtn = vec_mergeh( r.v, n.v ); - lbf = vec_mergeh( lbf, b.v ); - rtn = vec_mergeh( rtn, t.v ); - diff = vec_sub( rtn, lbf ); - sum = vec_add( rtn, lbf ); - inv_diff = recipf4( diff ); - neg_inv_diff = negatef4( inv_diff ); - diagonal = vec_add( inv_diff, inv_diff ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_w[4] = {0, 0, 0, 0xffffffff}; - column = vec_mul( sum, vec_sel( neg_inv_diff, inv_diff, select_z ) ); // TODO: no madds with zero - return Matrix4( - Vector4( vec_sel( zero, diagonal, select_x ) ), - Vector4( vec_sel( zero, diagonal, select_y ) ), - Vector4( vec_sel( zero, diagonal, select_z ) ), - Vector4( vec_sel( column, _mm_set1_ps(1.0f), select_w ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, bool select1 ) -{ - return Matrix4( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ), - select( mat0.getCol3(), mat1.getCol3(), select1 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, const boolInVec &select1 ) -{ - return Matrix4( - select( mat0.getCol0(), mat1.getCol0(), select1 ), - select( mat0.getCol1(), mat1.getCol1(), select1 ), - select( mat0.getCol2(), mat1.getCol2(), select1 ), - select( mat0.getCol3(), mat1.getCol3(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Matrix4 & mat ) -{ - print( mat.getRow( 0 ) ); - print( mat.getRow( 1 ) ); - print( mat.getRow( 2 ) ); - print( mat.getRow( 3 ) ); -} - -VECTORMATH_FORCE_INLINE void print( const Matrix4 & mat, const char * name ) -{ - printf("%s:\n", name); - print( mat ); -} - -#endif - -VECTORMATH_FORCE_INLINE Transform3::Transform3( const Transform3 & tfrm ) -{ - mCol0 = tfrm.mCol0; - mCol1 = tfrm.mCol1; - mCol2 = tfrm.mCol2; - mCol3 = tfrm.mCol3; -} - -VECTORMATH_FORCE_INLINE Transform3::Transform3( float scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); - mCol3 = Vector3( scalar ); -} - -VECTORMATH_FORCE_INLINE Transform3::Transform3( const floatInVec &scalar ) -{ - mCol0 = Vector3( scalar ); - mCol1 = Vector3( scalar ); - mCol2 = Vector3( scalar ); - mCol3 = Vector3( scalar ); -} - -VECTORMATH_FORCE_INLINE Transform3::Transform3( const Vector3 &_col0, const Vector3 &_col1, const Vector3 &_col2, const Vector3 &_col3 ) -{ - mCol0 = _col0; - mCol1 = _col1; - mCol2 = _col2; - mCol3 = _col3; -} - -VECTORMATH_FORCE_INLINE Transform3::Transform3( const Matrix3 & tfrm, const Vector3 &translateVec ) -{ - this->setUpper3x3( tfrm ); - this->setTranslation( translateVec ); -} - -VECTORMATH_FORCE_INLINE Transform3::Transform3( const Quat &unitQuat, const Vector3 &translateVec ) -{ - this->setUpper3x3( Matrix3( unitQuat ) ); - this->setTranslation( translateVec ); -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setCol0( const Vector3 &_col0 ) -{ - mCol0 = _col0; - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setCol1( const Vector3 &_col1 ) -{ - mCol1 = _col1; - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setCol2( const Vector3 &_col2 ) -{ - mCol2 = _col2; - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setCol3( const Vector3 &_col3 ) -{ - mCol3 = _col3; - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setCol( int col, const Vector3 &vec ) -{ - *(&mCol0 + col) = vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setRow( int row, const Vector4 &vec ) -{ - mCol0.setElem( row, vec.getElem( 0 ) ); - mCol1.setElem( row, vec.getElem( 1 ) ); - mCol2.setElem( row, vec.getElem( 2 ) ); - mCol3.setElem( row, vec.getElem( 3 ) ); - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setElem( int col, int row, float val ) -{ - (*this)[col].setElem(row, val); - return *this; -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setElem( int col, int row, const floatInVec &val ) -{ - Vector3 tmpV3_0; - tmpV3_0 = this->getCol( col ); - tmpV3_0.setElem( row, val ); - this->setCol( col, tmpV3_0 ); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Transform3::getElem( int col, int row ) const -{ - return this->getCol( col ).getElem( row ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::getCol0( ) const -{ - return mCol0; -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::getCol1( ) const -{ - return mCol1; -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::getCol2( ) const -{ - return mCol2; -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::getCol3( ) const -{ - return mCol3; -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::getCol( int col ) const -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE const Vector4 Transform3::getRow( int row ) const -{ - return Vector4( mCol0.getElem( row ), mCol1.getElem( row ), mCol2.getElem( row ), mCol3.getElem( row ) ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Transform3::operator []( int col ) -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::operator []( int col ) const -{ - return *(&mCol0 + col); -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::operator =( const Transform3 & tfrm ) -{ - mCol0 = tfrm.mCol0; - mCol1 = tfrm.mCol1; - mCol2 = tfrm.mCol2; - mCol3 = tfrm.mCol3; - return *this; -} - -VECTORMATH_FORCE_INLINE const Transform3 inverse( const Transform3 & tfrm ) -{ - __m128 inv0, inv1, inv2, inv3; - __m128 tmp0, tmp1, tmp2, tmp3, tmp4, dot, invdet; - __m128 xxxx, yyyy, zzzz; - tmp2 = _vmathVfCross( tfrm.getCol0().get128(), tfrm.getCol1().get128() ); - tmp0 = _vmathVfCross( tfrm.getCol1().get128(), tfrm.getCol2().get128() ); - tmp1 = _vmathVfCross( tfrm.getCol2().get128(), tfrm.getCol0().get128() ); - inv3 = negatef4( tfrm.getCol3().get128() ); - dot = _vmathVfDot3( tmp2, tfrm.getCol2().get128() ); - dot = vec_splat( dot, 0 ); - invdet = recipf4( dot ); - tmp3 = vec_mergeh( tmp0, tmp2 ); - tmp4 = vec_mergel( tmp0, tmp2 ); - inv0 = vec_mergeh( tmp3, tmp1 ); - xxxx = vec_splat( inv3, 0 ); - //inv1 = vec_perm( tmp3, tmp1, _VECTORMATH_PERM_ZBWX ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - inv1 = _mm_shuffle_ps( tmp3, tmp3, _MM_SHUFFLE(0,3,2,2)); - inv1 = vec_sel(inv1, tmp1, select_y); - //inv2 = vec_perm( tmp4, tmp1, _VECTORMATH_PERM_XCYX ); - inv2 = _mm_shuffle_ps( tmp4, tmp4, _MM_SHUFFLE(0,1,1,0)); - inv2 = vec_sel(inv2, vec_splat(tmp1, 2), select_y); - yyyy = vec_splat( inv3, 1 ); - zzzz = vec_splat( inv3, 2 ); - inv3 = vec_mul( inv0, xxxx ); - inv3 = vec_madd( inv1, yyyy, inv3 ); - inv3 = vec_madd( inv2, zzzz, inv3 ); - inv0 = vec_mul( inv0, invdet ); - inv1 = vec_mul( inv1, invdet ); - inv2 = vec_mul( inv2, invdet ); - inv3 = vec_mul( inv3, invdet ); - return Transform3( - Vector3( inv0 ), - Vector3( inv1 ), - Vector3( inv2 ), - Vector3( inv3 ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 orthoInverse( const Transform3 & tfrm ) -{ - __m128 inv0, inv1, inv2, inv3; - __m128 tmp0, tmp1; - __m128 xxxx, yyyy, zzzz; - tmp0 = vec_mergeh( tfrm.getCol0().get128(), tfrm.getCol2().get128() ); - tmp1 = vec_mergel( tfrm.getCol0().get128(), tfrm.getCol2().get128() ); - inv3 = negatef4( tfrm.getCol3().get128() ); - inv0 = vec_mergeh( tmp0, tfrm.getCol1().get128() ); - xxxx = vec_splat( inv3, 0 ); - //inv1 = vec_perm( tmp0, tfrm.getCol1().get128(), _VECTORMATH_PERM_ZBWX ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - inv1 = _mm_shuffle_ps( tmp0, tmp0, _MM_SHUFFLE(0,3,2,2)); - inv1 = vec_sel(inv1, tfrm.getCol1().get128(), select_y); - //inv2 = vec_perm( tmp1, tfrm.getCol1().get128(), _VECTORMATH_PERM_XCYX ); - inv2 = _mm_shuffle_ps( tmp1, tmp1, _MM_SHUFFLE(0,1,1,0)); - inv2 = vec_sel(inv2, vec_splat(tfrm.getCol1().get128(), 2), select_y); - yyyy = vec_splat( inv3, 1 ); - zzzz = vec_splat( inv3, 2 ); - inv3 = vec_mul( inv0, xxxx ); - inv3 = vec_madd( inv1, yyyy, inv3 ); - inv3 = vec_madd( inv2, zzzz, inv3 ); - return Transform3( - Vector3( inv0 ), - Vector3( inv1 ), - Vector3( inv2 ), - Vector3( inv3 ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 absPerElem( const Transform3 & tfrm ) -{ - return Transform3( - absPerElem( tfrm.getCol0() ), - absPerElem( tfrm.getCol1() ), - absPerElem( tfrm.getCol2() ), - absPerElem( tfrm.getCol3() ) - ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::operator *( const Vector3 &vec ) const -{ - __m128 res; - __m128 xxxx, yyyy, zzzz; - xxxx = vec_splat( vec.get128(), 0 ); - yyyy = vec_splat( vec.get128(), 1 ); - zzzz = vec_splat( vec.get128(), 2 ); - res = vec_mul( mCol0.get128(), xxxx ); - res = vec_madd( mCol1.get128(), yyyy, res ); - res = vec_madd( mCol2.get128(), zzzz, res ); - return Vector3( res ); -} - -VECTORMATH_FORCE_INLINE const Point3 Transform3::operator *( const Point3 &pnt ) const -{ - __m128 tmp0, tmp1, res; - __m128 xxxx, yyyy, zzzz; - xxxx = vec_splat( pnt.get128(), 0 ); - yyyy = vec_splat( pnt.get128(), 1 ); - zzzz = vec_splat( pnt.get128(), 2 ); - tmp0 = vec_mul( mCol0.get128(), xxxx ); - tmp1 = vec_mul( mCol1.get128(), yyyy ); - tmp0 = vec_madd( mCol2.get128(), zzzz, tmp0 ); - tmp1 = vec_add( mCol3.get128(), tmp1 ); - res = vec_add( tmp0, tmp1 ); - return Point3( res ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::operator *( const Transform3 & tfrm ) const -{ - return Transform3( - ( *this * tfrm.mCol0 ), - ( *this * tfrm.mCol1 ), - ( *this * tfrm.mCol2 ), - Vector3( ( *this * Point3( tfrm.mCol3 ) ) ) - ); -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::operator *=( const Transform3 & tfrm ) -{ - *this = *this * tfrm; - return *this; -} - -VECTORMATH_FORCE_INLINE const Transform3 mulPerElem( const Transform3 & tfrm0, const Transform3 & tfrm1 ) -{ - return Transform3( - mulPerElem( tfrm0.getCol0(), tfrm1.getCol0() ), - mulPerElem( tfrm0.getCol1(), tfrm1.getCol1() ), - mulPerElem( tfrm0.getCol2(), tfrm1.getCol2() ), - mulPerElem( tfrm0.getCol3(), tfrm1.getCol3() ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::identity( ) -{ - return Transform3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ), - Vector3( 0.0f ) - ); -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setUpper3x3( const Matrix3 & tfrm ) -{ - mCol0 = tfrm.getCol0(); - mCol1 = tfrm.getCol1(); - mCol2 = tfrm.getCol2(); - return *this; -} - -VECTORMATH_FORCE_INLINE const Matrix3 Transform3::getUpper3x3( ) const -{ - return Matrix3( mCol0, mCol1, mCol2 ); -} - -VECTORMATH_FORCE_INLINE Transform3 & Transform3::setTranslation( const Vector3 &translateVec ) -{ - mCol3 = translateVec; - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 Transform3::getTranslation( ) const -{ - return mCol3; -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationX( float radians ) -{ - return rotationX( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationX( const floatInVec &radians ) -{ - __m128 s, c, res1, res2; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res1 = vec_sel( zero, c, select_y ); - res1 = vec_sel( res1, s, select_z ); - res2 = vec_sel( zero, negatef4(s), select_y ); - res2 = vec_sel( res2, c, select_z ); - return Transform3( - Vector3::xAxis( ), - Vector3( res1 ), - Vector3( res2 ), - Vector3( _mm_setzero_ps() ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationY( float radians ) -{ - return rotationY( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationY( const floatInVec &radians ) -{ - __m128 s, c, res0, res2; - __m128 zero; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res0 = vec_sel( zero, c, select_x ); - res0 = vec_sel( res0, negatef4(s), select_z ); - res2 = vec_sel( zero, s, select_x ); - res2 = vec_sel( res2, c, select_z ); - return Transform3( - Vector3( res0 ), - Vector3::yAxis( ), - Vector3( res2 ), - Vector3( 0.0f ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationZ( float radians ) -{ - return rotationZ( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationZ( const floatInVec &radians ) -{ - __m128 s, c, res0, res1; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - __m128 zero = _mm_setzero_ps(); - sincosf4( radians.get128(), &s, &c ); - res0 = vec_sel( zero, c, select_x ); - res0 = vec_sel( res0, s, select_y ); - res1 = vec_sel( zero, negatef4(s), select_x ); - res1 = vec_sel( res1, c, select_y ); - return Transform3( - Vector3( res0 ), - Vector3( res1 ), - Vector3::zAxis( ), - Vector3( 0.0f ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotationZYX( const Vector3 &radiansXYZ ) -{ - __m128 angles, s, negS, c, X0, X1, Y0, Y1, Z0, Z1, tmp; - angles = Vector4( radiansXYZ, 0.0f ).get128(); - sincosf4( angles, &s, &c ); - negS = negatef4( s ); - Z0 = vec_mergel( c, s ); - Z1 = vec_mergel( negS, c ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_xyz[4] = {0xffffffff, 0xffffffff, 0xffffffff, 0}; - Z1 = vec_and( Z1, _mm_load_ps( (float *)select_xyz ) ); - Y0 = _mm_shuffle_ps( c, negS, _MM_SHUFFLE(0,1,1,1) ); - Y1 = _mm_shuffle_ps( s, c, _MM_SHUFFLE(0,1,1,1) ); - X0 = vec_splat( s, 0 ); - X1 = vec_splat( c, 0 ); - tmp = vec_mul( Z0, Y1 ); - return Transform3( - Vector3( vec_mul( Z0, Y0 ) ), - Vector3( vec_madd( Z1, X1, vec_mul( tmp, X0 ) ) ), - Vector3( vec_nmsub( Z1, X0, vec_mul( tmp, X1 ) ) ), - Vector3( 0.0f ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotation( float radians, const Vector3 &unitVec ) -{ - return rotation( floatInVec(radians), unitVec ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotation( const floatInVec &radians, const Vector3 &unitVec ) -{ - return Transform3( Matrix3::rotation( radians, unitVec ), Vector3( 0.0f ) ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::rotation( const Quat &unitQuat ) -{ - return Transform3( Matrix3( unitQuat ), Vector3( 0.0f ) ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::scale( const Vector3 &scaleVec ) -{ - __m128 zero = _mm_setzero_ps(); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - return Transform3( - Vector3( vec_sel( zero, scaleVec.get128(), select_x ) ), - Vector3( vec_sel( zero, scaleVec.get128(), select_y ) ), - Vector3( vec_sel( zero, scaleVec.get128(), select_z ) ), - Vector3( 0.0f ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 appendScale( const Transform3 & tfrm, const Vector3 &scaleVec ) -{ - return Transform3( - ( tfrm.getCol0() * scaleVec.getX( ) ), - ( tfrm.getCol1() * scaleVec.getY( ) ), - ( tfrm.getCol2() * scaleVec.getZ( ) ), - tfrm.getCol3() - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 prependScale( const Vector3 &scaleVec, const Transform3 & tfrm ) -{ - return Transform3( - mulPerElem( tfrm.getCol0(), scaleVec ), - mulPerElem( tfrm.getCol1(), scaleVec ), - mulPerElem( tfrm.getCol2(), scaleVec ), - mulPerElem( tfrm.getCol3(), scaleVec ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 Transform3::translation( const Vector3 &translateVec ) -{ - return Transform3( - Vector3::xAxis( ), - Vector3::yAxis( ), - Vector3::zAxis( ), - translateVec - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, bool select1 ) -{ - return Transform3( - select( tfrm0.getCol0(), tfrm1.getCol0(), select1 ), - select( tfrm0.getCol1(), tfrm1.getCol1(), select1 ), - select( tfrm0.getCol2(), tfrm1.getCol2(), select1 ), - select( tfrm0.getCol3(), tfrm1.getCol3(), select1 ) - ); -} - -VECTORMATH_FORCE_INLINE const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, const boolInVec &select1 ) -{ - return Transform3( - select( tfrm0.getCol0(), tfrm1.getCol0(), select1 ), - select( tfrm0.getCol1(), tfrm1.getCol1(), select1 ), - select( tfrm0.getCol2(), tfrm1.getCol2(), select1 ), - select( tfrm0.getCol3(), tfrm1.getCol3(), select1 ) - ); -} - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Transform3 & tfrm ) -{ - print( tfrm.getRow( 0 ) ); - print( tfrm.getRow( 1 ) ); - print( tfrm.getRow( 2 ) ); -} - -VECTORMATH_FORCE_INLINE void print( const Transform3 & tfrm, const char * name ) -{ - printf("%s:\n", name); - print( tfrm ); -} - -#endif - -VECTORMATH_FORCE_INLINE Quat::Quat( const Matrix3 & tfrm ) -{ - __m128 res; - __m128 col0, col1, col2; - __m128 xx_yy, xx_yy_zz_xx, yy_zz_xx_yy, zz_xx_yy_zz, diagSum, diagDiff; - __m128 zy_xz_yx, yz_zx_xy, sum, diff; - __m128 radicand, invSqrt, scale; - __m128 res0, res1, res2, res3; - __m128 xx, yy, zz; - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_w[4] = {0, 0, 0, 0xffffffff}; - - col0 = tfrm.getCol0().get128(); - col1 = tfrm.getCol1().get128(); - col2 = tfrm.getCol2().get128(); - - /* four cases: */ - /* trace > 0 */ - /* else */ - /* xx largest diagonal element */ - /* yy largest diagonal element */ - /* zz largest diagonal element */ - - /* compute quaternion for each case */ - - xx_yy = vec_sel( col0, col1, select_y ); - //xx_yy_zz_xx = vec_perm( xx_yy, col2, _VECTORMATH_PERM_XYCX ); - //yy_zz_xx_yy = vec_perm( xx_yy, col2, _VECTORMATH_PERM_YCXY ); - //zz_xx_yy_zz = vec_perm( xx_yy, col2, _VECTORMATH_PERM_CXYC ); - xx_yy_zz_xx = _mm_shuffle_ps( xx_yy, xx_yy, _MM_SHUFFLE(0,0,1,0) ); - xx_yy_zz_xx = vec_sel( xx_yy_zz_xx, col2, select_z ); // TODO: Ck - yy_zz_xx_yy = _mm_shuffle_ps( xx_yy_zz_xx, xx_yy_zz_xx, _MM_SHUFFLE(1,0,2,1) ); - zz_xx_yy_zz = _mm_shuffle_ps( xx_yy_zz_xx, xx_yy_zz_xx, _MM_SHUFFLE(2,1,0,2) ); - - diagSum = vec_add( vec_add( xx_yy_zz_xx, yy_zz_xx_yy ), zz_xx_yy_zz ); - diagDiff = vec_sub( vec_sub( xx_yy_zz_xx, yy_zz_xx_yy ), zz_xx_yy_zz ); - radicand = vec_add( vec_sel( diagDiff, diagSum, select_w ), _mm_set1_ps(1.0f) ); - // invSqrt = rsqrtf4( radicand ); - invSqrt = newtonrapson_rsqrt4( radicand ); - - - - zy_xz_yx = vec_sel( col0, col1, select_z ); // zy_xz_yx = 00 01 12 03 - //zy_xz_yx = vec_perm( zy_xz_yx, col2, _VECTORMATH_PERM_ZAYX ); - zy_xz_yx = _mm_shuffle_ps( zy_xz_yx, zy_xz_yx, _MM_SHUFFLE(0,1,2,2) ); // zy_xz_yx = 12 12 01 00 - zy_xz_yx = vec_sel( zy_xz_yx, vec_splat(col2, 0), select_y ); // zy_xz_yx = 12 20 01 00 - yz_zx_xy = vec_sel( col0, col1, select_x ); // yz_zx_xy = 10 01 02 03 - //yz_zx_xy = vec_perm( yz_zx_xy, col2, _VECTORMATH_PERM_BZXX ); - yz_zx_xy = _mm_shuffle_ps( yz_zx_xy, yz_zx_xy, _MM_SHUFFLE(0,0,2,0) ); // yz_zx_xy = 10 02 10 10 - yz_zx_xy = vec_sel( yz_zx_xy, vec_splat(col2, 1), select_x ); // yz_zx_xy = 21 02 10 10 - - sum = vec_add( zy_xz_yx, yz_zx_xy ); - diff = vec_sub( zy_xz_yx, yz_zx_xy ); - - scale = vec_mul( invSqrt, _mm_set1_ps(0.5f) ); - - //res0 = vec_perm( sum, diff, _VECTORMATH_PERM_XZYA ); - res0 = _mm_shuffle_ps( sum, sum, _MM_SHUFFLE(0,1,2,0) ); - res0 = vec_sel( res0, vec_splat(diff, 0), select_w ); // TODO: Ck - //res1 = vec_perm( sum, diff, _VECTORMATH_PERM_ZXXB ); - res1 = _mm_shuffle_ps( sum, sum, _MM_SHUFFLE(0,0,0,2) ); - res1 = vec_sel( res1, vec_splat(diff, 1), select_w ); // TODO: Ck - //res2 = vec_perm( sum, diff, _VECTORMATH_PERM_YXXC ); - res2 = _mm_shuffle_ps( sum, sum, _MM_SHUFFLE(0,0,0,1) ); - res2 = vec_sel( res2, vec_splat(diff, 2), select_w ); // TODO: Ck - res3 = diff; - res0 = vec_sel( res0, radicand, select_x ); - res1 = vec_sel( res1, radicand, select_y ); - res2 = vec_sel( res2, radicand, select_z ); - res3 = vec_sel( res3, radicand, select_w ); - res0 = vec_mul( res0, vec_splat( scale, 0 ) ); - res1 = vec_mul( res1, vec_splat( scale, 1 ) ); - res2 = vec_mul( res2, vec_splat( scale, 2 ) ); - res3 = vec_mul( res3, vec_splat( scale, 3 ) ); - - /* determine case and select answer */ - - xx = vec_splat( col0, 0 ); - yy = vec_splat( col1, 1 ); - zz = vec_splat( col2, 2 ); - res = vec_sel( res0, res1, vec_cmpgt( yy, xx ) ); - res = vec_sel( res, res2, vec_and( vec_cmpgt( zz, xx ), vec_cmpgt( zz, yy ) ) ); - res = vec_sel( res, res3, vec_cmpgt( vec_splat( diagSum, 0 ), _mm_setzero_ps() ) ); - mVec128 = res; -} - -VECTORMATH_FORCE_INLINE const Matrix3 outer( const Vector3 &tfrm0, const Vector3 &tfrm1 ) -{ - return Matrix3( - ( tfrm0 * tfrm1.getX( ) ), - ( tfrm0 * tfrm1.getY( ) ), - ( tfrm0 * tfrm1.getZ( ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix4 outer( const Vector4 &tfrm0, const Vector4 &tfrm1 ) -{ - return Matrix4( - ( tfrm0 * tfrm1.getX( ) ), - ( tfrm0 * tfrm1.getY( ) ), - ( tfrm0 * tfrm1.getZ( ) ), - ( tfrm0 * tfrm1.getW( ) ) - ); -} - -VECTORMATH_FORCE_INLINE const Vector3 rowMul( const Vector3 &vec, const Matrix3 & mat ) -{ - __m128 tmp0, tmp1, mcol0, mcol1, mcol2, res; - __m128 xxxx, yyyy, zzzz; - tmp0 = vec_mergeh( mat.getCol0().get128(), mat.getCol2().get128() ); - tmp1 = vec_mergel( mat.getCol0().get128(), mat.getCol2().get128() ); - xxxx = vec_splat( vec.get128(), 0 ); - mcol0 = vec_mergeh( tmp0, mat.getCol1().get128() ); - //mcol1 = vec_perm( tmp0, mat.getCol1().get128(), _VECTORMATH_PERM_ZBWX ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - mcol1 = _mm_shuffle_ps( tmp0, tmp0, _MM_SHUFFLE(0,3,2,2)); - mcol1 = vec_sel(mcol1, mat.getCol1().get128(), select_y); - //mcol2 = vec_perm( tmp1, mat.getCol1().get128(), _VECTORMATH_PERM_XCYX ); - mcol2 = _mm_shuffle_ps( tmp1, tmp1, _MM_SHUFFLE(0,1,1,0)); - mcol2 = vec_sel(mcol2, vec_splat(mat.getCol1().get128(), 2), select_y); - yyyy = vec_splat( vec.get128(), 1 ); - res = vec_mul( mcol0, xxxx ); - zzzz = vec_splat( vec.get128(), 2 ); - res = vec_madd( mcol1, yyyy, res ); - res = vec_madd( mcol2, zzzz, res ); - return Vector3( res ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 crossMatrix( const Vector3 &vec ) -{ - __m128 neg, res0, res1, res2; - neg = negatef4( vec.get128() ); - VM_ATTRIBUTE_ALIGN16 unsigned int select_x[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_y[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int select_z[4] = {0, 0, 0xffffffff, 0}; - //res0 = vec_perm( vec.get128(), neg, _VECTORMATH_PERM_XZBX ); - res0 = _mm_shuffle_ps( vec.get128(), vec.get128(), _MM_SHUFFLE(0,2,2,0) ); - res0 = vec_sel(res0, vec_splat(neg, 1), select_z); - //res1 = vec_perm( vec.get128(), neg, _VECTORMATH_PERM_CXXX ); - res1 = vec_sel(vec_splat(vec.get128(), 0), vec_splat(neg, 2), select_x); - //res2 = vec_perm( vec.get128(), neg, _VECTORMATH_PERM_YAXX ); - res2 = _mm_shuffle_ps( vec.get128(), vec.get128(), _MM_SHUFFLE(0,0,1,1) ); - res2 = vec_sel(res2, vec_splat(neg, 0), select_y); - VM_ATTRIBUTE_ALIGN16 unsigned int filter_x[4] = {0, 0xffffffff, 0xffffffff, 0xffffffff}; - VM_ATTRIBUTE_ALIGN16 unsigned int filter_y[4] = {0xffffffff, 0, 0xffffffff, 0xffffffff}; - VM_ATTRIBUTE_ALIGN16 unsigned int filter_z[4] = {0xffffffff, 0xffffffff, 0, 0xffffffff}; - res0 = vec_and( res0, _mm_load_ps((float *)filter_x ) ); - res1 = vec_and( res1, _mm_load_ps((float *)filter_y ) ); - res2 = vec_and( res2, _mm_load_ps((float *)filter_z ) ); // TODO: Use selects? - return Matrix3( - Vector3( res0 ), - Vector3( res1 ), - Vector3( res2 ) - ); -} - -VECTORMATH_FORCE_INLINE const Matrix3 crossMatrixMul( const Vector3 &vec, const Matrix3 & mat ) -{ - return Matrix3( cross( vec, mat.getCol0() ), cross( vec, mat.getCol1() ), cross( vec, mat.getCol2() ) ); -} - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/sse/quat_aos.h b/Engine/lib/bullet/src/vectormath/sse/quat_aos.h deleted file mode 100644 index 7eac59fe5..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/quat_aos.h +++ /dev/null @@ -1,579 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - - -#ifndef _VECTORMATH_QUAT_AOS_CPP_H -#define _VECTORMATH_QUAT_AOS_CPP_H - -//----------------------------------------------------------------------------- -// Definitions - -#ifndef _VECTORMATH_INTERNAL_FUNCTIONS -#define _VECTORMATH_INTERNAL_FUNCTIONS - -#endif - -namespace Vectormath { -namespace Aos { - -VECTORMATH_FORCE_INLINE void Quat::set128(vec_float4 vec) -{ - mVec128 = vec; -} - -VECTORMATH_FORCE_INLINE Quat::Quat( const floatInVec &_x, const floatInVec &_y, const floatInVec &_z, const floatInVec &_w ) -{ - mVec128 = _mm_unpacklo_ps( - _mm_unpacklo_ps( _x.get128(), _z.get128() ), - _mm_unpacklo_ps( _y.get128(), _w.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Quat::Quat( const Vector3 &xyz, float _w ) -{ - mVec128 = xyz.get128(); - _vmathVfSetElement(mVec128, _w, 3); -} - - - -VECTORMATH_FORCE_INLINE Quat::Quat(const Quat& quat) -{ - mVec128 = quat.get128(); -} - -VECTORMATH_FORCE_INLINE Quat::Quat( float _x, float _y, float _z, float _w ) -{ - mVec128 = _mm_setr_ps(_x, _y, _z, _w); -} - - - - - -VECTORMATH_FORCE_INLINE Quat::Quat( const Vector3 &xyz, const floatInVec &_w ) -{ - mVec128 = xyz.get128(); - mVec128 = _vmathVfInsert(mVec128, _w.get128(), 3); -} - -VECTORMATH_FORCE_INLINE Quat::Quat( const Vector4 &vec ) -{ - mVec128 = vec.get128(); -} - -VECTORMATH_FORCE_INLINE Quat::Quat( float scalar ) -{ - mVec128 = floatInVec(scalar).get128(); -} - -VECTORMATH_FORCE_INLINE Quat::Quat( const floatInVec &scalar ) -{ - mVec128 = scalar.get128(); -} - -VECTORMATH_FORCE_INLINE Quat::Quat( __m128 vf4 ) -{ - mVec128 = vf4; -} - -VECTORMATH_FORCE_INLINE const Quat Quat::identity( ) -{ - return Quat( _VECTORMATH_UNIT_0001 ); -} - -VECTORMATH_FORCE_INLINE const Quat lerp( float t, const Quat &quat0, const Quat &quat1 ) -{ - return lerp( floatInVec(t), quat0, quat1 ); -} - -VECTORMATH_FORCE_INLINE const Quat lerp( const floatInVec &t, const Quat &quat0, const Quat &quat1 ) -{ - return ( quat0 + ( ( quat1 - quat0 ) * t ) ); -} - -VECTORMATH_FORCE_INLINE const Quat slerp( float t, const Quat &unitQuat0, const Quat &unitQuat1 ) -{ - return slerp( floatInVec(t), unitQuat0, unitQuat1 ); -} - -VECTORMATH_FORCE_INLINE const Quat slerp( const floatInVec &t, const Quat &unitQuat0, const Quat &unitQuat1 ) -{ - Quat start; - vec_float4 scales, scale0, scale1, cosAngle, angle, tttt, oneMinusT, angles, sines; - __m128 selectMask; - cosAngle = _vmathVfDot4( unitQuat0.get128(), unitQuat1.get128() ); - selectMask = (__m128)vec_cmpgt( _mm_setzero_ps(), cosAngle ); - cosAngle = vec_sel( cosAngle, negatef4( cosAngle ), selectMask ); - start = Quat( vec_sel( unitQuat0.get128(), negatef4( unitQuat0.get128() ), selectMask ) ); - selectMask = (__m128)vec_cmpgt( _mm_set1_ps(_VECTORMATH_SLERP_TOL), cosAngle ); - angle = acosf4( cosAngle ); - tttt = t.get128(); - oneMinusT = vec_sub( _mm_set1_ps(1.0f), tttt ); - angles = vec_mergeh( _mm_set1_ps(1.0f), tttt ); - angles = vec_mergeh( angles, oneMinusT ); - angles = vec_madd( angles, angle, _mm_setzero_ps() ); - sines = sinf4( angles ); - scales = _mm_div_ps( sines, vec_splat( sines, 0 ) ); - scale0 = vec_sel( oneMinusT, vec_splat( scales, 1 ), selectMask ); - scale1 = vec_sel( tttt, vec_splat( scales, 2 ), selectMask ); - return Quat( vec_madd( start.get128(), scale0, vec_mul( unitQuat1.get128(), scale1 ) ) ); -} - -VECTORMATH_FORCE_INLINE const Quat squad( float t, const Quat &unitQuat0, const Quat &unitQuat1, const Quat &unitQuat2, const Quat &unitQuat3 ) -{ - return squad( floatInVec(t), unitQuat0, unitQuat1, unitQuat2, unitQuat3 ); -} - -VECTORMATH_FORCE_INLINE const Quat squad( const floatInVec &t, const Quat &unitQuat0, const Quat &unitQuat1, const Quat &unitQuat2, const Quat &unitQuat3 ) -{ - return slerp( ( ( floatInVec(2.0f) * t ) * ( floatInVec(1.0f) - t ) ), slerp( t, unitQuat0, unitQuat3 ), slerp( t, unitQuat1, unitQuat2 ) ); -} - -VECTORMATH_FORCE_INLINE __m128 Quat::get128( ) const -{ - return mVec128; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator =( const Quat &quat ) -{ - mVec128 = quat.mVec128; - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setXYZ( const Vector3 &vec ) -{ - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; - mVec128 = vec_sel( vec.get128(), mVec128, sw ); - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 Quat::getXYZ( ) const -{ - return Vector3( mVec128 ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setX( float _x ) -{ - _vmathVfSetElement(mVec128, _x, 0); - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setX( const floatInVec &_x ) -{ - mVec128 = _vmathVfInsert(mVec128, _x.get128(), 0); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Quat::getX( ) const -{ - return floatInVec( mVec128, 0 ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setY( float _y ) -{ - _vmathVfSetElement(mVec128, _y, 1); - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setY( const floatInVec &_y ) -{ - mVec128 = _vmathVfInsert(mVec128, _y.get128(), 1); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Quat::getY( ) const -{ - return floatInVec( mVec128, 1 ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setZ( float _z ) -{ - _vmathVfSetElement(mVec128, _z, 2); - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setZ( const floatInVec &_z ) -{ - mVec128 = _vmathVfInsert(mVec128, _z.get128(), 2); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Quat::getZ( ) const -{ - return floatInVec( mVec128, 2 ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setW( float _w ) -{ - _vmathVfSetElement(mVec128, _w, 3); - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setW( const floatInVec &_w ) -{ - mVec128 = _vmathVfInsert(mVec128, _w.get128(), 3); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Quat::getW( ) const -{ - return floatInVec( mVec128, 3 ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setElem( int idx, float value ) -{ - _vmathVfSetElement(mVec128, value, idx); - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::setElem( int idx, const floatInVec &value ) -{ - mVec128 = _vmathVfInsert(mVec128, value.get128(), idx); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Quat::getElem( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE VecIdx Quat::operator []( int idx ) -{ - return VecIdx( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const floatInVec Quat::operator []( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator +( const Quat &quat ) const -{ - return Quat( _mm_add_ps( mVec128, quat.mVec128 ) ); -} - - -VECTORMATH_FORCE_INLINE const Quat Quat::operator -( const Quat &quat ) const -{ - return Quat( _mm_sub_ps( mVec128, quat.mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator *( float scalar ) const -{ - return *this * floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator *( const floatInVec &scalar ) const -{ - return Quat( _mm_mul_ps( mVec128, scalar.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator +=( const Quat &quat ) -{ - *this = *this + quat; - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator -=( const Quat &quat ) -{ - *this = *this - quat; - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator *=( const floatInVec &scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator /( float scalar ) const -{ - return *this / floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator /( const floatInVec &scalar ) const -{ - return Quat( _mm_div_ps( mVec128, scalar.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator /=( const floatInVec &scalar ) -{ - *this = *this / scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator -( ) const -{ - return Quat(_mm_sub_ps( _mm_setzero_ps(), mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Quat operator *( float scalar, const Quat &quat ) -{ - return floatInVec(scalar) * quat; -} - -VECTORMATH_FORCE_INLINE const Quat operator *( const floatInVec &scalar, const Quat &quat ) -{ - return quat * scalar; -} - -VECTORMATH_FORCE_INLINE const floatInVec dot( const Quat &quat0, const Quat &quat1 ) -{ - return floatInVec( _vmathVfDot4( quat0.get128(), quat1.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec norm( const Quat &quat ) -{ - return floatInVec( _vmathVfDot4( quat.get128(), quat.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec length( const Quat &quat ) -{ - return floatInVec( _mm_sqrt_ps(_vmathVfDot4( quat.get128(), quat.get128() )), 0 ); -} - -VECTORMATH_FORCE_INLINE const Quat normalize( const Quat &quat ) -{ - vec_float4 dot =_vmathVfDot4( quat.get128(), quat.get128()); - return Quat( _mm_mul_ps( quat.get128(), newtonrapson_rsqrt4( dot ) ) ); -} - - -VECTORMATH_FORCE_INLINE const Quat Quat::rotation( const Vector3 &unitVec0, const Vector3 &unitVec1 ) -{ - Vector3 crossVec; - __m128 cosAngle, cosAngleX2Plus2, recipCosHalfAngleX2, cosHalfAngleX2, res; - cosAngle = _vmathVfDot3( unitVec0.get128(), unitVec1.get128() ); - cosAngleX2Plus2 = vec_madd( cosAngle, _mm_set1_ps(2.0f), _mm_set1_ps(2.0f) ); - recipCosHalfAngleX2 = _mm_rsqrt_ps( cosAngleX2Plus2 ); - cosHalfAngleX2 = vec_mul( recipCosHalfAngleX2, cosAngleX2Plus2 ); - crossVec = cross( unitVec0, unitVec1 ); - res = vec_mul( crossVec.get128(), recipCosHalfAngleX2 ); - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; - res = vec_sel( res, vec_mul( cosHalfAngleX2, _mm_set1_ps(0.5f) ), sw ); - return Quat( res ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotation( float radians, const Vector3 &unitVec ) -{ - return rotation( floatInVec(radians), unitVec ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotation( const floatInVec &radians, const Vector3 &unitVec ) -{ - __m128 s, c, angle, res; - angle = vec_mul( radians.get128(), _mm_set1_ps(0.5f) ); - sincosf4( angle, &s, &c ); - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; - res = vec_sel( vec_mul( unitVec.get128(), s ), c, sw ); - return Quat( res ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotationX( float radians ) -{ - return rotationX( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotationX( const floatInVec &radians ) -{ - __m128 s, c, angle, res; - angle = vec_mul( radians.get128(), _mm_set1_ps(0.5f) ); - sincosf4( angle, &s, &c ); - VM_ATTRIBUTE_ALIGN16 unsigned int xsw[4] = {0xffffffff, 0, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int wsw[4] = {0, 0, 0, 0xffffffff}; - res = vec_sel( _mm_setzero_ps(), s, xsw ); - res = vec_sel( res, c, wsw ); - return Quat( res ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotationY( float radians ) -{ - return rotationY( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotationY( const floatInVec &radians ) -{ - __m128 s, c, angle, res; - angle = vec_mul( radians.get128(), _mm_set1_ps(0.5f) ); - sincosf4( angle, &s, &c ); - VM_ATTRIBUTE_ALIGN16 unsigned int ysw[4] = {0, 0xffffffff, 0, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int wsw[4] = {0, 0, 0, 0xffffffff}; - res = vec_sel( _mm_setzero_ps(), s, ysw ); - res = vec_sel( res, c, wsw ); - return Quat( res ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotationZ( float radians ) -{ - return rotationZ( floatInVec(radians) ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::rotationZ( const floatInVec &radians ) -{ - __m128 s, c, angle, res; - angle = vec_mul( radians.get128(), _mm_set1_ps(0.5f) ); - sincosf4( angle, &s, &c ); - VM_ATTRIBUTE_ALIGN16 unsigned int zsw[4] = {0, 0, 0xffffffff, 0}; - VM_ATTRIBUTE_ALIGN16 unsigned int wsw[4] = {0, 0, 0, 0xffffffff}; - res = vec_sel( _mm_setzero_ps(), s, zsw ); - res = vec_sel( res, c, wsw ); - return Quat( res ); -} - -VECTORMATH_FORCE_INLINE const Quat Quat::operator *( const Quat &quat ) const -{ - __m128 ldata, rdata, qv, tmp0, tmp1, tmp2, tmp3; - __m128 product, l_wxyz, r_wxyz, xy, qw; - ldata = mVec128; - rdata = quat.mVec128; - tmp0 = _mm_shuffle_ps( ldata, ldata, _MM_SHUFFLE(3,0,2,1) ); - tmp1 = _mm_shuffle_ps( rdata, rdata, _MM_SHUFFLE(3,1,0,2) ); - tmp2 = _mm_shuffle_ps( ldata, ldata, _MM_SHUFFLE(3,1,0,2) ); - tmp3 = _mm_shuffle_ps( rdata, rdata, _MM_SHUFFLE(3,0,2,1) ); - qv = vec_mul( vec_splat( ldata, 3 ), rdata ); - qv = vec_madd( vec_splat( rdata, 3 ), ldata, qv ); - qv = vec_madd( tmp0, tmp1, qv ); - qv = vec_nmsub( tmp2, tmp3, qv ); - product = vec_mul( ldata, rdata ); - l_wxyz = vec_sld( ldata, ldata, 12 ); - r_wxyz = vec_sld( rdata, rdata, 12 ); - qw = vec_nmsub( l_wxyz, r_wxyz, product ); - xy = vec_madd( l_wxyz, r_wxyz, product ); - qw = vec_sub( qw, vec_sld( xy, xy, 8 ) ); - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; - return Quat( vec_sel( qv, qw, sw ) ); -} - -VECTORMATH_FORCE_INLINE Quat & Quat::operator *=( const Quat &quat ) -{ - *this = *this * quat; - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 rotate( const Quat &quat, const Vector3 &vec ) -{ __m128 qdata, vdata, product, tmp0, tmp1, tmp2, tmp3, wwww, qv, qw, res; - qdata = quat.get128(); - vdata = vec.get128(); - tmp0 = _mm_shuffle_ps( qdata, qdata, _MM_SHUFFLE(3,0,2,1) ); - tmp1 = _mm_shuffle_ps( vdata, vdata, _MM_SHUFFLE(3,1,0,2) ); - tmp2 = _mm_shuffle_ps( qdata, qdata, _MM_SHUFFLE(3,1,0,2) ); - tmp3 = _mm_shuffle_ps( vdata, vdata, _MM_SHUFFLE(3,0,2,1) ); - wwww = vec_splat( qdata, 3 ); - qv = vec_mul( wwww, vdata ); - qv = vec_madd( tmp0, tmp1, qv ); - qv = vec_nmsub( tmp2, tmp3, qv ); - product = vec_mul( qdata, vdata ); - qw = vec_madd( vec_sld( qdata, qdata, 4 ), vec_sld( vdata, vdata, 4 ), product ); - qw = vec_add( vec_sld( product, product, 8 ), qw ); - tmp1 = _mm_shuffle_ps( qv, qv, _MM_SHUFFLE(3,1,0,2) ); - tmp3 = _mm_shuffle_ps( qv, qv, _MM_SHUFFLE(3,0,2,1) ); - res = vec_mul( vec_splat( qw, 0 ), qdata ); - res = vec_madd( wwww, qv, res ); - res = vec_madd( tmp0, tmp1, res ); - res = vec_nmsub( tmp2, tmp3, res ); - return Vector3( res ); -} - -VECTORMATH_FORCE_INLINE const Quat conj( const Quat &quat ) -{ - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0x80000000,0x80000000,0x80000000,0}; - return Quat( vec_xor( quat.get128(), _mm_load_ps((float *)sw) ) ); -} - -VECTORMATH_FORCE_INLINE const Quat select( const Quat &quat0, const Quat &quat1, bool select1 ) -{ - return select( quat0, quat1, boolInVec(select1) ); -} - -//VECTORMATH_FORCE_INLINE const Quat select( const Quat &quat0, const Quat &quat1, const boolInVec &select1 ) -//{ -// return Quat( vec_sel( quat0.get128(), quat1.get128(), select1.get128() ) ); -//} - -VECTORMATH_FORCE_INLINE void loadXYZW(Quat& quat, const float* fptr) -{ -#ifdef USE_SSE3_LDDQU - quat = Quat( SSEFloat(_mm_lddqu_si128((const __m128i*)((float*)(fptr)))).m128 ); -#else - SSEFloat fl; - fl.f[0] = fptr[0]; - fl.f[1] = fptr[1]; - fl.f[2] = fptr[2]; - fl.f[3] = fptr[3]; - quat = Quat( fl.m128); -#endif - - -} - -VECTORMATH_FORCE_INLINE void storeXYZW(const Quat& quat, float* fptr) -{ - fptr[0] = quat.getX(); - fptr[1] = quat.getY(); - fptr[2] = quat.getZ(); - fptr[3] = quat.getW(); -// _mm_storeu_ps((float*)quat.get128(),fptr); -} - - - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Quat &quat ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = quat.get128(); - printf( "( %f %f %f %f )\n", tmp.s[0], tmp.s[1], tmp.s[2], tmp.s[3] ); -} - -VECTORMATH_FORCE_INLINE void print( const Quat &quat, const char * name ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = quat.get128(); - printf( "%s: ( %f %f %f %f )\n", name, tmp.s[0], tmp.s[1], tmp.s[2], tmp.s[3] ); -} - -#endif - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/sse/vec_aos.h b/Engine/lib/bullet/src/vectormath/sse/vec_aos.h deleted file mode 100644 index 35aeeaf16..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/vec_aos.h +++ /dev/null @@ -1,1455 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _VECTORMATH_VEC_AOS_CPP_H -#define _VECTORMATH_VEC_AOS_CPP_H - -//----------------------------------------------------------------------------- -// Constants -// for permutes words are labeled [x,y,z,w] [a,b,c,d] - -#define _VECTORMATH_PERM_X 0x00010203 -#define _VECTORMATH_PERM_Y 0x04050607 -#define _VECTORMATH_PERM_Z 0x08090a0b -#define _VECTORMATH_PERM_W 0x0c0d0e0f -#define _VECTORMATH_PERM_A 0x10111213 -#define _VECTORMATH_PERM_B 0x14151617 -#define _VECTORMATH_PERM_C 0x18191a1b -#define _VECTORMATH_PERM_D 0x1c1d1e1f -#define _VECTORMATH_PERM_XYZA (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_A } -#define _VECTORMATH_PERM_ZXYW (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Z, _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_W } -#define _VECTORMATH_PERM_YZXW (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_X, _VECTORMATH_PERM_W } -#define _VECTORMATH_PERM_YZAB (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Y, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_A, _VECTORMATH_PERM_B } -#define _VECTORMATH_PERM_ZABC (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_Z, _VECTORMATH_PERM_A, _VECTORMATH_PERM_B, _VECTORMATH_PERM_C } -#define _VECTORMATH_PERM_XYAW (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_Y, _VECTORMATH_PERM_A, _VECTORMATH_PERM_W } -#define _VECTORMATH_PERM_XAZW (vec_uchar16)(vec_uint4){ _VECTORMATH_PERM_X, _VECTORMATH_PERM_A, _VECTORMATH_PERM_Z, _VECTORMATH_PERM_W } -#define _VECTORMATH_MASK_0xF000 (vec_uint4){ 0xffffffff, 0, 0, 0 } -#define _VECTORMATH_MASK_0x0F00 (vec_uint4){ 0, 0xffffffff, 0, 0 } -#define _VECTORMATH_MASK_0x00F0 (vec_uint4){ 0, 0, 0xffffffff, 0 } -#define _VECTORMATH_MASK_0x000F (vec_uint4){ 0, 0, 0, 0xffffffff } -#define _VECTORMATH_UNIT_1000 _mm_setr_ps(1.0f,0.0f,0.0f,0.0f) // (__m128){ 1.0f, 0.0f, 0.0f, 0.0f } -#define _VECTORMATH_UNIT_0100 _mm_setr_ps(0.0f,1.0f,0.0f,0.0f) // (__m128){ 0.0f, 1.0f, 0.0f, 0.0f } -#define _VECTORMATH_UNIT_0010 _mm_setr_ps(0.0f,0.0f,1.0f,0.0f) // (__m128){ 0.0f, 0.0f, 1.0f, 0.0f } -#define _VECTORMATH_UNIT_0001 _mm_setr_ps(0.0f,0.0f,0.0f,1.0f) // (__m128){ 0.0f, 0.0f, 0.0f, 1.0f } -#define _VECTORMATH_SLERP_TOL 0.999f -//_VECTORMATH_SLERP_TOLF - -//----------------------------------------------------------------------------- -// Definitions - -#ifndef _VECTORMATH_INTERNAL_FUNCTIONS -#define _VECTORMATH_INTERNAL_FUNCTIONS - -#define _vmath_shufps(a, b, immx, immy, immz, immw) _mm_shuffle_ps(a, b, _MM_SHUFFLE(immw, immz, immy, immx)) -static VECTORMATH_FORCE_INLINE __m128 _vmathVfDot3( __m128 vec0, __m128 vec1 ) -{ - __m128 result = _mm_mul_ps( vec0, vec1); - return _mm_add_ps( vec_splat( result, 0 ), _mm_add_ps( vec_splat( result, 1 ), vec_splat( result, 2 ) ) ); -} - -static VECTORMATH_FORCE_INLINE __m128 _vmathVfDot4( __m128 vec0, __m128 vec1 ) -{ - __m128 result = _mm_mul_ps(vec0, vec1); - return _mm_add_ps(_mm_shuffle_ps(result, result, _MM_SHUFFLE(0,0,0,0)), - _mm_add_ps(_mm_shuffle_ps(result, result, _MM_SHUFFLE(1,1,1,1)), - _mm_add_ps(_mm_shuffle_ps(result, result, _MM_SHUFFLE(2,2,2,2)), _mm_shuffle_ps(result, result, _MM_SHUFFLE(3,3,3,3))))); -} - -static VECTORMATH_FORCE_INLINE __m128 _vmathVfCross( __m128 vec0, __m128 vec1 ) -{ - __m128 tmp0, tmp1, tmp2, tmp3, result; - tmp0 = _mm_shuffle_ps( vec0, vec0, _MM_SHUFFLE(3,0,2,1) ); - tmp1 = _mm_shuffle_ps( vec1, vec1, _MM_SHUFFLE(3,1,0,2) ); - tmp2 = _mm_shuffle_ps( vec0, vec0, _MM_SHUFFLE(3,1,0,2) ); - tmp3 = _mm_shuffle_ps( vec1, vec1, _MM_SHUFFLE(3,0,2,1) ); - result = vec_mul( tmp0, tmp1 ); - result = vec_nmsub( tmp2, tmp3, result ); - return result; -} -/* -static VECTORMATH_FORCE_INLINE vec_uint4 _vmathVfToHalfFloatsUnpacked(__m128 v) -{ -#if 0 - vec_int4 bexp; - vec_uint4 mant, sign, hfloat; - vec_uint4 notZero, isInf; - const vec_uint4 hfloatInf = (vec_uint4)(0x00007c00u); - const vec_uint4 mergeMant = (vec_uint4)(0x000003ffu); - const vec_uint4 mergeSign = (vec_uint4)(0x00008000u); - - sign = vec_sr((vec_uint4)v, (vec_uint4)16); - mant = vec_sr((vec_uint4)v, (vec_uint4)13); - bexp = vec_and(vec_sr((vec_int4)v, (vec_uint4)23), (vec_int4)0xff); - - notZero = (vec_uint4)vec_cmpgt(bexp, (vec_int4)112); - isInf = (vec_uint4)vec_cmpgt(bexp, (vec_int4)142); - - bexp = _mm_add_ps(bexp, (vec_int4)-112); - bexp = vec_sl(bexp, (vec_uint4)10); - - hfloat = vec_sel((vec_uint4)bexp, mant, mergeMant); - hfloat = vec_sel((vec_uint4)(0), hfloat, notZero); - hfloat = vec_sel(hfloat, hfloatInf, isInf); - hfloat = vec_sel(hfloat, sign, mergeSign); - - return hfloat; -#else - assert(0); - return _mm_setzero_ps(); -#endif -} - -static VECTORMATH_FORCE_INLINE vec_ushort8 _vmath2VfToHalfFloats(__m128 u, __m128 v) -{ -#if 0 - vec_uint4 hfloat_u, hfloat_v; - const vec_uchar16 pack = (vec_uchar16){2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31}; - hfloat_u = _vmathVfToHalfFloatsUnpacked(u); - hfloat_v = _vmathVfToHalfFloatsUnpacked(v); - return (vec_ushort8)vec_perm(hfloat_u, hfloat_v, pack); -#else - assert(0); - return _mm_setzero_si128(); -#endif -} -*/ - -static VECTORMATH_FORCE_INLINE __m128 _vmathVfInsert(__m128 dst, __m128 src, int slot) -{ - SSEFloat s; - s.m128 = src; - SSEFloat d; - d.m128 = dst; - d.f[slot] = s.f[slot]; - return d.m128; -} - -#define _vmathVfSetElement(vec, scalar, slot) ((float *)&(vec))[slot] = scalar - -static VECTORMATH_FORCE_INLINE __m128 _vmathVfSplatScalar(float scalar) -{ - return _mm_set1_ps(scalar); -} - -#endif - -namespace Vectormath { -namespace Aos { - - -#ifdef _VECTORMATH_NO_SCALAR_CAST -VECTORMATH_FORCE_INLINE VecIdx::operator floatInVec() const -{ - return floatInVec(ref, i); -} - -VECTORMATH_FORCE_INLINE float VecIdx::getAsFloat() const -#else -VECTORMATH_FORCE_INLINE VecIdx::operator float() const -#endif -{ - return ((float *)&ref)[i]; -} - -VECTORMATH_FORCE_INLINE float VecIdx::operator =( float scalar ) -{ - _vmathVfSetElement(ref, scalar, i); - return scalar; -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator =( const floatInVec &scalar ) -{ - ref = _vmathVfInsert(ref, scalar.get128(), i); - return scalar; -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator =( const VecIdx& scalar ) -{ - return *this = floatInVec(scalar.ref, scalar.i); -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator *=( float scalar ) -{ - return *this *= floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator *=( const floatInVec &scalar ) -{ - return *this = floatInVec(ref, i) * scalar; -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator /=( float scalar ) -{ - return *this /= floatInVec(scalar); -} - -inline floatInVec VecIdx::operator /=( const floatInVec &scalar ) -{ - return *this = floatInVec(ref, i) / scalar; -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator +=( float scalar ) -{ - return *this += floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator +=( const floatInVec &scalar ) -{ - return *this = floatInVec(ref, i) + scalar; -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator -=( float scalar ) -{ - return *this -= floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE floatInVec VecIdx::operator -=( const floatInVec &scalar ) -{ - return *this = floatInVec(ref, i) - scalar; -} - -VECTORMATH_FORCE_INLINE Vector3::Vector3(const Vector3& vec) -{ - set128(vec.get128()); -} - -VECTORMATH_FORCE_INLINE void Vector3::set128(vec_float4 vec) -{ - mVec128 = vec; -} - - -VECTORMATH_FORCE_INLINE Vector3::Vector3( float _x, float _y, float _z ) -{ - mVec128 = _mm_setr_ps(_x, _y, _z, 0.0f); -} - -VECTORMATH_FORCE_INLINE Vector3::Vector3( const floatInVec &_x, const floatInVec &_y, const floatInVec &_z ) -{ - __m128 xz = _mm_unpacklo_ps( _x.get128(), _z.get128() ); - mVec128 = _mm_unpacklo_ps( xz, _y.get128() ); -} - -VECTORMATH_FORCE_INLINE Vector3::Vector3( const Point3 &pnt ) -{ - mVec128 = pnt.get128(); -} - -VECTORMATH_FORCE_INLINE Vector3::Vector3( float scalar ) -{ - mVec128 = floatInVec(scalar).get128(); -} - -VECTORMATH_FORCE_INLINE Vector3::Vector3( const floatInVec &scalar ) -{ - mVec128 = scalar.get128(); -} - -VECTORMATH_FORCE_INLINE Vector3::Vector3( __m128 vf4 ) -{ - mVec128 = vf4; -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::xAxis( ) -{ - return Vector3( _VECTORMATH_UNIT_1000 ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::yAxis( ) -{ - return Vector3( _VECTORMATH_UNIT_0100 ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::zAxis( ) -{ - return Vector3( _VECTORMATH_UNIT_0010 ); -} - -VECTORMATH_FORCE_INLINE const Vector3 lerp( float t, const Vector3 &vec0, const Vector3 &vec1 ) -{ - return lerp( floatInVec(t), vec0, vec1 ); -} - -VECTORMATH_FORCE_INLINE const Vector3 lerp( const floatInVec &t, const Vector3 &vec0, const Vector3 &vec1 ) -{ - return ( vec0 + ( ( vec1 - vec0 ) * t ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 slerp( float t, const Vector3 &unitVec0, const Vector3 &unitVec1 ) -{ - return slerp( floatInVec(t), unitVec0, unitVec1 ); -} - -VECTORMATH_FORCE_INLINE const Vector3 slerp( const floatInVec &t, const Vector3 &unitVec0, const Vector3 &unitVec1 ) -{ - __m128 scales, scale0, scale1, cosAngle, angle, tttt, oneMinusT, angles, sines; - cosAngle = _vmathVfDot3( unitVec0.get128(), unitVec1.get128() ); - __m128 selectMask = _mm_cmpgt_ps( _mm_set1_ps(_VECTORMATH_SLERP_TOL), cosAngle ); - angle = acosf4( cosAngle ); - tttt = t.get128(); - oneMinusT = _mm_sub_ps( _mm_set1_ps(1.0f), tttt ); - angles = _mm_unpacklo_ps( _mm_set1_ps(1.0f), tttt ); // angles = 1, t, 1, t - angles = _mm_unpacklo_ps( angles, oneMinusT ); // angles = 1, 1-t, t, 1-t - angles = _mm_mul_ps( angles, angle ); - sines = sinf4( angles ); - scales = _mm_div_ps( sines, vec_splat( sines, 0 ) ); - scale0 = vec_sel( oneMinusT, vec_splat( scales, 1 ), selectMask ); - scale1 = vec_sel( tttt, vec_splat( scales, 2 ), selectMask ); - return Vector3( vec_madd( unitVec0.get128(), scale0, _mm_mul_ps( unitVec1.get128(), scale1 ) ) ); -} - -VECTORMATH_FORCE_INLINE __m128 Vector3::get128( ) const -{ - return mVec128; -} - -VECTORMATH_FORCE_INLINE void loadXYZ(Point3& vec, const float* fptr) -{ -#ifdef USE_SSE3_LDDQU - vec = Point3( SSEFloat(_mm_lddqu_si128((const __m128i*)((float*)(fptr)))).m128 ); -#else - SSEFloat fl; - fl.f[0] = fptr[0]; - fl.f[1] = fptr[1]; - fl.f[2] = fptr[2]; - fl.f[3] = fptr[3]; - vec = Point3( fl.m128); -#endif //USE_SSE3_LDDQU - -} - - - -VECTORMATH_FORCE_INLINE void loadXYZ(Vector3& vec, const float* fptr) -{ -#ifdef USE_SSE3_LDDQU - vec = Vector3( SSEFloat(_mm_lddqu_si128((const __m128i*)((float*)(fptr)))).m128 ); -#else - SSEFloat fl; - fl.f[0] = fptr[0]; - fl.f[1] = fptr[1]; - fl.f[2] = fptr[2]; - fl.f[3] = fptr[3]; - vec = Vector3( fl.m128); -#endif //USE_SSE3_LDDQU - -} - -VECTORMATH_FORCE_INLINE void storeXYZ( const Vector3 &vec, __m128 * quad ) -{ - __m128 dstVec = *quad; - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; // TODO: Centralize - dstVec = vec_sel(vec.get128(), dstVec, sw); - *quad = dstVec; -} - -VECTORMATH_FORCE_INLINE void storeXYZ(const Point3& vec, float* fptr) -{ - fptr[0] = vec.getX(); - fptr[1] = vec.getY(); - fptr[2] = vec.getZ(); -} - -VECTORMATH_FORCE_INLINE void storeXYZ(const Vector3& vec, float* fptr) -{ - fptr[0] = vec.getX(); - fptr[1] = vec.getY(); - fptr[2] = vec.getZ(); -} - - -VECTORMATH_FORCE_INLINE void loadXYZArray( Vector3 & vec0, Vector3 & vec1, Vector3 & vec2, Vector3 & vec3, const __m128 * threeQuads ) -{ - const float *quads = (float *)threeQuads; - vec0 = Vector3( _mm_load_ps(quads) ); - vec1 = Vector3( _mm_loadu_ps(quads + 3) ); - vec2 = Vector3( _mm_loadu_ps(quads + 6) ); - vec3 = Vector3( _mm_loadu_ps(quads + 9) ); -} - -VECTORMATH_FORCE_INLINE void storeXYZArray( const Vector3 &vec0, const Vector3 &vec1, const Vector3 &vec2, const Vector3 &vec3, __m128 * threeQuads ) -{ - __m128 xxxx = _mm_shuffle_ps( vec1.get128(), vec1.get128(), _MM_SHUFFLE(0, 0, 0, 0) ); - __m128 zzzz = _mm_shuffle_ps( vec2.get128(), vec2.get128(), _MM_SHUFFLE(2, 2, 2, 2) ); - VM_ATTRIBUTE_ALIGN16 unsigned int xsw[4] = {0, 0, 0, 0xffffffff}; - VM_ATTRIBUTE_ALIGN16 unsigned int zsw[4] = {0xffffffff, 0, 0, 0}; - threeQuads[0] = vec_sel( vec0.get128(), xxxx, xsw ); - threeQuads[1] = _mm_shuffle_ps( vec1.get128(), vec2.get128(), _MM_SHUFFLE(1, 0, 2, 1) ); - threeQuads[2] = vec_sel( _mm_shuffle_ps( vec3.get128(), vec3.get128(), _MM_SHUFFLE(2, 1, 0, 3) ), zzzz, zsw ); -} -/* -VECTORMATH_FORCE_INLINE void storeHalfFloats( const Vector3 &vec0, const Vector3 &vec1, const Vector3 &vec2, const Vector3 &vec3, const Vector3 &vec4, const Vector3 &vec5, const Vector3 &vec6, const Vector3 &vec7, vec_ushort8 * threeQuads ) -{ - assert(0); -#if 0 - __m128 xyz0[3]; - __m128 xyz1[3]; - storeXYZArray( vec0, vec1, vec2, vec3, xyz0 ); - storeXYZArray( vec4, vec5, vec6, vec7, xyz1 ); - threeQuads[0] = _vmath2VfToHalfFloats(xyz0[0], xyz0[1]); - threeQuads[1] = _vmath2VfToHalfFloats(xyz0[2], xyz1[0]); - threeQuads[2] = _vmath2VfToHalfFloats(xyz1[1], xyz1[2]); -#endif -} -*/ -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator =( const Vector3 &vec ) -{ - mVec128 = vec.mVec128; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setX( float _x ) -{ - _vmathVfSetElement(mVec128, _x, 0); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setX( const floatInVec &_x ) -{ - mVec128 = _vmathVfInsert(mVec128, _x.get128(), 0); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector3::getX( ) const -{ - return floatInVec( mVec128, 0 ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setY( float _y ) -{ - _vmathVfSetElement(mVec128, _y, 1); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setY( const floatInVec &_y ) -{ - mVec128 = _vmathVfInsert(mVec128, _y.get128(), 1); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector3::getY( ) const -{ - return floatInVec( mVec128, 1 ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setZ( float _z ) -{ - _vmathVfSetElement(mVec128, _z, 2); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setZ( const floatInVec &_z ) -{ - mVec128 = _vmathVfInsert(mVec128, _z.get128(), 2); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector3::getZ( ) const -{ - return floatInVec( mVec128, 2 ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setElem( int idx, float value ) -{ - _vmathVfSetElement(mVec128, value, idx); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::setElem( int idx, const floatInVec &value ) -{ - mVec128 = _vmathVfInsert(mVec128, value.get128(), idx); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector3::getElem( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE VecIdx Vector3::operator []( int idx ) -{ - return VecIdx( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector3::operator []( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator +( const Vector3 &vec ) const -{ - return Vector3( _mm_add_ps( mVec128, vec.mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator -( const Vector3 &vec ) const -{ - return Vector3( _mm_sub_ps( mVec128, vec.mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 Vector3::operator +( const Point3 &pnt ) const -{ - return Point3( _mm_add_ps( mVec128, pnt.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator *( float scalar ) const -{ - return *this * floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator *( const floatInVec &scalar ) const -{ - return Vector3( _mm_mul_ps( mVec128, scalar.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator +=( const Vector3 &vec ) -{ - *this = *this + vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator -=( const Vector3 &vec ) -{ - *this = *this - vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator *=( const floatInVec &scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator /( float scalar ) const -{ - return *this / floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator /( const floatInVec &scalar ) const -{ - return Vector3( _mm_div_ps( mVec128, scalar.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector3 & Vector3::operator /=( const floatInVec &scalar ) -{ - *this = *this / scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector3::operator -( ) const -{ - //return Vector3(_mm_sub_ps( _mm_setzero_ps(), mVec128 ) ); - - VM_ATTRIBUTE_ALIGN16 static const int array[] = {0x80000000, 0x80000000, 0x80000000, 0x80000000}; - __m128 NEG_MASK = SSEFloat(*(const vec_float4*)array).vf; - return Vector3(_mm_xor_ps(get128(),NEG_MASK)); -} - -VECTORMATH_FORCE_INLINE const Vector3 operator *( float scalar, const Vector3 &vec ) -{ - return floatInVec(scalar) * vec; -} - -VECTORMATH_FORCE_INLINE const Vector3 operator *( const floatInVec &scalar, const Vector3 &vec ) -{ - return vec * scalar; -} - -VECTORMATH_FORCE_INLINE const Vector3 mulPerElem( const Vector3 &vec0, const Vector3 &vec1 ) -{ - return Vector3( _mm_mul_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 divPerElem( const Vector3 &vec0, const Vector3 &vec1 ) -{ - return Vector3( _mm_div_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 recipPerElem( const Vector3 &vec ) -{ - return Vector3( _mm_rcp_ps( vec.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 absPerElem( const Vector3 &vec ) -{ - return Vector3( fabsf4( vec.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 copySignPerElem( const Vector3 &vec0, const Vector3 &vec1 ) -{ - __m128 vmask = toM128(0x7fffffff); - return Vector3( _mm_or_ps( - _mm_and_ps ( vmask, vec0.get128() ), // Value - _mm_andnot_ps( vmask, vec1.get128() ) ) ); // Signs -} - -VECTORMATH_FORCE_INLINE const Vector3 maxPerElem( const Vector3 &vec0, const Vector3 &vec1 ) -{ - return Vector3( _mm_max_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec maxElem( const Vector3 &vec ) -{ - return floatInVec( _mm_max_ps( _mm_max_ps( vec_splat( vec.get128(), 0 ), vec_splat( vec.get128(), 1 ) ), vec_splat( vec.get128(), 2 ) ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 minPerElem( const Vector3 &vec0, const Vector3 &vec1 ) -{ - return Vector3( _mm_min_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec minElem( const Vector3 &vec ) -{ - return floatInVec( _mm_min_ps( _mm_min_ps( vec_splat( vec.get128(), 0 ), vec_splat( vec.get128(), 1 ) ), vec_splat( vec.get128(), 2 ) ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec sum( const Vector3 &vec ) -{ - return floatInVec( _mm_add_ps( _mm_add_ps( vec_splat( vec.get128(), 0 ), vec_splat( vec.get128(), 1 ) ), vec_splat( vec.get128(), 2 ) ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec dot( const Vector3 &vec0, const Vector3 &vec1 ) -{ - return floatInVec( _vmathVfDot3( vec0.get128(), vec1.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec lengthSqr( const Vector3 &vec ) -{ - return floatInVec( _vmathVfDot3( vec.get128(), vec.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec length( const Vector3 &vec ) -{ - return floatInVec( _mm_sqrt_ps(_vmathVfDot3( vec.get128(), vec.get128() )), 0 ); -} - - -VECTORMATH_FORCE_INLINE const Vector3 normalizeApprox( const Vector3 &vec ) -{ - return Vector3( _mm_mul_ps( vec.get128(), _mm_rsqrt_ps( _vmathVfDot3( vec.get128(), vec.get128() ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 normalize( const Vector3 &vec ) -{ - return Vector3( _mm_mul_ps( vec.get128(), newtonrapson_rsqrt4( _vmathVfDot3( vec.get128(), vec.get128() ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 cross( const Vector3 &vec0, const Vector3 &vec1 ) -{ - return Vector3( _vmathVfCross( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector3 select( const Vector3 &vec0, const Vector3 &vec1, bool select1 ) -{ - return select( vec0, vec1, boolInVec(select1) ); -} - - -VECTORMATH_FORCE_INLINE const Vector4 select(const Vector4& vec0, const Vector4& vec1, const boolInVec& select1) -{ - return Vector4(vec_sel(vec0.get128(), vec1.get128(), select1.get128())); -} - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Vector3 &vec ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = vec.get128(); - printf( "( %f %f %f )\n", tmp.s[0], tmp.s[1], tmp.s[2] ); -} - -VECTORMATH_FORCE_INLINE void print( const Vector3 &vec, const char * name ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = vec.get128(); - printf( "%s: ( %f %f %f )\n", name, tmp.s[0], tmp.s[1], tmp.s[2] ); -} - -#endif - -VECTORMATH_FORCE_INLINE Vector4::Vector4( float _x, float _y, float _z, float _w ) -{ - mVec128 = _mm_setr_ps(_x, _y, _z, _w); - } - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const floatInVec &_x, const floatInVec &_y, const floatInVec &_z, const floatInVec &_w ) -{ - mVec128 = _mm_unpacklo_ps( - _mm_unpacklo_ps( _x.get128(), _z.get128() ), - _mm_unpacklo_ps( _y.get128(), _w.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const Vector3 &xyz, float _w ) -{ - mVec128 = xyz.get128(); - _vmathVfSetElement(mVec128, _w, 3); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const Vector3 &xyz, const floatInVec &_w ) -{ - mVec128 = xyz.get128(); - mVec128 = _vmathVfInsert(mVec128, _w.get128(), 3); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const Vector3 &vec ) -{ - mVec128 = vec.get128(); - mVec128 = _vmathVfInsert(mVec128, _mm_setzero_ps(), 3); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const Point3 &pnt ) -{ - mVec128 = pnt.get128(); - mVec128 = _vmathVfInsert(mVec128, _mm_set1_ps(1.0f), 3); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const Quat &quat ) -{ - mVec128 = quat.get128(); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( float scalar ) -{ - mVec128 = floatInVec(scalar).get128(); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( const floatInVec &scalar ) -{ - mVec128 = scalar.get128(); -} - -VECTORMATH_FORCE_INLINE Vector4::Vector4( __m128 vf4 ) -{ - mVec128 = vf4; -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::xAxis( ) -{ - return Vector4( _VECTORMATH_UNIT_1000 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::yAxis( ) -{ - return Vector4( _VECTORMATH_UNIT_0100 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::zAxis( ) -{ - return Vector4( _VECTORMATH_UNIT_0010 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::wAxis( ) -{ - return Vector4( _VECTORMATH_UNIT_0001 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 lerp( float t, const Vector4 &vec0, const Vector4 &vec1 ) -{ - return lerp( floatInVec(t), vec0, vec1 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 lerp( const floatInVec &t, const Vector4 &vec0, const Vector4 &vec1 ) -{ - return ( vec0 + ( ( vec1 - vec0 ) * t ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 slerp( float t, const Vector4 &unitVec0, const Vector4 &unitVec1 ) -{ - return slerp( floatInVec(t), unitVec0, unitVec1 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 slerp( const floatInVec &t, const Vector4 &unitVec0, const Vector4 &unitVec1 ) -{ - __m128 scales, scale0, scale1, cosAngle, angle, tttt, oneMinusT, angles, sines; - cosAngle = _vmathVfDot4( unitVec0.get128(), unitVec1.get128() ); - __m128 selectMask = _mm_cmpgt_ps( _mm_set1_ps(_VECTORMATH_SLERP_TOL), cosAngle ); - angle = acosf4( cosAngle ); - tttt = t.get128(); - oneMinusT = _mm_sub_ps( _mm_set1_ps(1.0f), tttt ); - angles = _mm_unpacklo_ps( _mm_set1_ps(1.0f), tttt ); // angles = 1, t, 1, t - angles = _mm_unpacklo_ps( angles, oneMinusT ); // angles = 1, 1-t, t, 1-t - angles = _mm_mul_ps( angles, angle ); - sines = sinf4( angles ); - scales = _mm_div_ps( sines, vec_splat( sines, 0 ) ); - scale0 = vec_sel( oneMinusT, vec_splat( scales, 1 ), selectMask ); - scale1 = vec_sel( tttt, vec_splat( scales, 2 ), selectMask ); - return Vector4( vec_madd( unitVec0.get128(), scale0, _mm_mul_ps( unitVec1.get128(), scale1 ) ) ); -} - -VECTORMATH_FORCE_INLINE __m128 Vector4::get128( ) const -{ - return mVec128; -} -/* -VECTORMATH_FORCE_INLINE void storeHalfFloats( const Vector4 &vec0, const Vector4 &vec1, const Vector4 &vec2, const Vector4 &vec3, vec_ushort8 * twoQuads ) -{ - twoQuads[0] = _vmath2VfToHalfFloats(vec0.get128(), vec1.get128()); - twoQuads[1] = _vmath2VfToHalfFloats(vec2.get128(), vec3.get128()); -} -*/ -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator =( const Vector4 &vec ) -{ - mVec128 = vec.mVec128; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setXYZ( const Vector3 &vec ) -{ - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; - mVec128 = vec_sel( vec.get128(), mVec128, sw ); - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector3 Vector4::getXYZ( ) const -{ - return Vector3( mVec128 ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setX( float _x ) -{ - _vmathVfSetElement(mVec128, _x, 0); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setX( const floatInVec &_x ) -{ - mVec128 = _vmathVfInsert(mVec128, _x.get128(), 0); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector4::getX( ) const -{ - return floatInVec( mVec128, 0 ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setY( float _y ) -{ - _vmathVfSetElement(mVec128, _y, 1); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setY( const floatInVec &_y ) -{ - mVec128 = _vmathVfInsert(mVec128, _y.get128(), 1); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector4::getY( ) const -{ - return floatInVec( mVec128, 1 ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setZ( float _z ) -{ - _vmathVfSetElement(mVec128, _z, 2); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setZ( const floatInVec &_z ) -{ - mVec128 = _vmathVfInsert(mVec128, _z.get128(), 2); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector4::getZ( ) const -{ - return floatInVec( mVec128, 2 ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setW( float _w ) -{ - _vmathVfSetElement(mVec128, _w, 3); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setW( const floatInVec &_w ) -{ - mVec128 = _vmathVfInsert(mVec128, _w.get128(), 3); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector4::getW( ) const -{ - return floatInVec( mVec128, 3 ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setElem( int idx, float value ) -{ - _vmathVfSetElement(mVec128, value, idx); - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::setElem( int idx, const floatInVec &value ) -{ - mVec128 = _vmathVfInsert(mVec128, value.get128(), idx); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector4::getElem( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE VecIdx Vector4::operator []( int idx ) -{ - return VecIdx( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const floatInVec Vector4::operator []( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator +( const Vector4 &vec ) const -{ - return Vector4( _mm_add_ps( mVec128, vec.mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator -( const Vector4 &vec ) const -{ - return Vector4( _mm_sub_ps( mVec128, vec.mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator *( float scalar ) const -{ - return *this * floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator *( const floatInVec &scalar ) const -{ - return Vector4( _mm_mul_ps( mVec128, scalar.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator +=( const Vector4 &vec ) -{ - *this = *this + vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator -=( const Vector4 &vec ) -{ - *this = *this - vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator *=( float scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator *=( const floatInVec &scalar ) -{ - *this = *this * scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator /( float scalar ) const -{ - return *this / floatInVec(scalar); -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator /( const floatInVec &scalar ) const -{ - return Vector4( _mm_div_ps( mVec128, scalar.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator /=( float scalar ) -{ - *this = *this / scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE Vector4 & Vector4::operator /=( const floatInVec &scalar ) -{ - *this = *this / scalar; - return *this; -} - -VECTORMATH_FORCE_INLINE const Vector4 Vector4::operator -( ) const -{ - return Vector4(_mm_sub_ps( _mm_setzero_ps(), mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 operator *( float scalar, const Vector4 &vec ) -{ - return floatInVec(scalar) * vec; -} - -VECTORMATH_FORCE_INLINE const Vector4 operator *( const floatInVec &scalar, const Vector4 &vec ) -{ - return vec * scalar; -} - -VECTORMATH_FORCE_INLINE const Vector4 mulPerElem( const Vector4 &vec0, const Vector4 &vec1 ) -{ - return Vector4( _mm_mul_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 divPerElem( const Vector4 &vec0, const Vector4 &vec1 ) -{ - return Vector4( _mm_div_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 recipPerElem( const Vector4 &vec ) -{ - return Vector4( _mm_rcp_ps( vec.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 absPerElem( const Vector4 &vec ) -{ - return Vector4( fabsf4( vec.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 copySignPerElem( const Vector4 &vec0, const Vector4 &vec1 ) -{ - __m128 vmask = toM128(0x7fffffff); - return Vector4( _mm_or_ps( - _mm_and_ps ( vmask, vec0.get128() ), // Value - _mm_andnot_ps( vmask, vec1.get128() ) ) ); // Signs -} - -VECTORMATH_FORCE_INLINE const Vector4 maxPerElem( const Vector4 &vec0, const Vector4 &vec1 ) -{ - return Vector4( _mm_max_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec maxElem( const Vector4 &vec ) -{ - return floatInVec( _mm_max_ps( - _mm_max_ps( vec_splat( vec.get128(), 0 ), vec_splat( vec.get128(), 1 ) ), - _mm_max_ps( vec_splat( vec.get128(), 2 ), vec_splat( vec.get128(), 3 ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 minPerElem( const Vector4 &vec0, const Vector4 &vec1 ) -{ - return Vector4( _mm_min_ps( vec0.get128(), vec1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec minElem( const Vector4 &vec ) -{ - return floatInVec( _mm_min_ps( - _mm_min_ps( vec_splat( vec.get128(), 0 ), vec_splat( vec.get128(), 1 ) ), - _mm_min_ps( vec_splat( vec.get128(), 2 ), vec_splat( vec.get128(), 3 ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec sum( const Vector4 &vec ) -{ - return floatInVec( _mm_add_ps( - _mm_add_ps( vec_splat( vec.get128(), 0 ), vec_splat( vec.get128(), 1 ) ), - _mm_add_ps( vec_splat( vec.get128(), 2 ), vec_splat( vec.get128(), 3 ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec dot( const Vector4 &vec0, const Vector4 &vec1 ) -{ - return floatInVec( _vmathVfDot4( vec0.get128(), vec1.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec lengthSqr( const Vector4 &vec ) -{ - return floatInVec( _vmathVfDot4( vec.get128(), vec.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec length( const Vector4 &vec ) -{ - return floatInVec( _mm_sqrt_ps(_vmathVfDot4( vec.get128(), vec.get128() )), 0 ); -} - -VECTORMATH_FORCE_INLINE const Vector4 normalizeApprox( const Vector4 &vec ) -{ - return Vector4( _mm_mul_ps( vec.get128(), _mm_rsqrt_ps( _vmathVfDot4( vec.get128(), vec.get128() ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 normalize( const Vector4 &vec ) -{ - return Vector4( _mm_mul_ps( vec.get128(), newtonrapson_rsqrt4( _vmathVfDot4( vec.get128(), vec.get128() ) ) ) ); -} - -VECTORMATH_FORCE_INLINE const Vector4 select( const Vector4 &vec0, const Vector4 &vec1, bool select1 ) -{ - return select( vec0, vec1, boolInVec(select1) ); -} - - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Vector4 &vec ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = vec.get128(); - printf( "( %f %f %f %f )\n", tmp.s[0], tmp.s[1], tmp.s[2], tmp.s[3] ); -} - -VECTORMATH_FORCE_INLINE void print( const Vector4 &vec, const char * name ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = vec.get128(); - printf( "%s: ( %f %f %f %f )\n", name, tmp.s[0], tmp.s[1], tmp.s[2], tmp.s[3] ); -} - -#endif - -VECTORMATH_FORCE_INLINE Point3::Point3( float _x, float _y, float _z ) -{ - mVec128 = _mm_setr_ps(_x, _y, _z, 0.0f); -} - -VECTORMATH_FORCE_INLINE Point3::Point3( const floatInVec &_x, const floatInVec &_y, const floatInVec &_z ) -{ - mVec128 = _mm_unpacklo_ps( _mm_unpacklo_ps( _x.get128(), _z.get128() ), _y.get128() ); -} - -VECTORMATH_FORCE_INLINE Point3::Point3( const Vector3 &vec ) -{ - mVec128 = vec.get128(); -} - -VECTORMATH_FORCE_INLINE Point3::Point3( float scalar ) -{ - mVec128 = floatInVec(scalar).get128(); -} - -VECTORMATH_FORCE_INLINE Point3::Point3( const floatInVec &scalar ) -{ - mVec128 = scalar.get128(); -} - -VECTORMATH_FORCE_INLINE Point3::Point3( __m128 vf4 ) -{ - mVec128 = vf4; -} - -VECTORMATH_FORCE_INLINE const Point3 lerp( float t, const Point3 &pnt0, const Point3 &pnt1 ) -{ - return lerp( floatInVec(t), pnt0, pnt1 ); -} - -VECTORMATH_FORCE_INLINE const Point3 lerp( const floatInVec &t, const Point3 &pnt0, const Point3 &pnt1 ) -{ - return ( pnt0 + ( ( pnt1 - pnt0 ) * t ) ); -} - -VECTORMATH_FORCE_INLINE __m128 Point3::get128( ) const -{ - return mVec128; -} - -VECTORMATH_FORCE_INLINE void storeXYZ( const Point3 &pnt, __m128 * quad ) -{ - __m128 dstVec = *quad; - VM_ATTRIBUTE_ALIGN16 unsigned int sw[4] = {0, 0, 0, 0xffffffff}; // TODO: Centralize - dstVec = vec_sel(pnt.get128(), dstVec, sw); - *quad = dstVec; -} - -VECTORMATH_FORCE_INLINE void loadXYZArray( Point3 & pnt0, Point3 & pnt1, Point3 & pnt2, Point3 & pnt3, const __m128 * threeQuads ) -{ - const float *quads = (float *)threeQuads; - pnt0 = Point3( _mm_load_ps(quads) ); - pnt1 = Point3( _mm_loadu_ps(quads + 3) ); - pnt2 = Point3( _mm_loadu_ps(quads + 6) ); - pnt3 = Point3( _mm_loadu_ps(quads + 9) ); -} - -VECTORMATH_FORCE_INLINE void storeXYZArray( const Point3 &pnt0, const Point3 &pnt1, const Point3 &pnt2, const Point3 &pnt3, __m128 * threeQuads ) -{ - __m128 xxxx = _mm_shuffle_ps( pnt1.get128(), pnt1.get128(), _MM_SHUFFLE(0, 0, 0, 0) ); - __m128 zzzz = _mm_shuffle_ps( pnt2.get128(), pnt2.get128(), _MM_SHUFFLE(2, 2, 2, 2) ); - VM_ATTRIBUTE_ALIGN16 unsigned int xsw[4] = {0, 0, 0, 0xffffffff}; - VM_ATTRIBUTE_ALIGN16 unsigned int zsw[4] = {0xffffffff, 0, 0, 0}; - threeQuads[0] = vec_sel( pnt0.get128(), xxxx, xsw ); - threeQuads[1] = _mm_shuffle_ps( pnt1.get128(), pnt2.get128(), _MM_SHUFFLE(1, 0, 2, 1) ); - threeQuads[2] = vec_sel( _mm_shuffle_ps( pnt3.get128(), pnt3.get128(), _MM_SHUFFLE(2, 1, 0, 3) ), zzzz, zsw ); -} -/* -VECTORMATH_FORCE_INLINE void storeHalfFloats( const Point3 &pnt0, const Point3 &pnt1, const Point3 &pnt2, const Point3 &pnt3, const Point3 &pnt4, const Point3 &pnt5, const Point3 &pnt6, const Point3 &pnt7, vec_ushort8 * threeQuads ) -{ -#if 0 - __m128 xyz0[3]; - __m128 xyz1[3]; - storeXYZArray( pnt0, pnt1, pnt2, pnt3, xyz0 ); - storeXYZArray( pnt4, pnt5, pnt6, pnt7, xyz1 ); - threeQuads[0] = _vmath2VfToHalfFloats(xyz0[0], xyz0[1]); - threeQuads[1] = _vmath2VfToHalfFloats(xyz0[2], xyz1[0]); - threeQuads[2] = _vmath2VfToHalfFloats(xyz1[1], xyz1[2]); -#else - assert(0); -#endif -} -*/ -VECTORMATH_FORCE_INLINE Point3 & Point3::operator =( const Point3 &pnt ) -{ - mVec128 = pnt.mVec128; - return *this; -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setX( float _x ) -{ - _vmathVfSetElement(mVec128, _x, 0); - return *this; -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setX( const floatInVec &_x ) -{ - mVec128 = _vmathVfInsert(mVec128, _x.get128(), 0); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Point3::getX( ) const -{ - return floatInVec( mVec128, 0 ); -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setY( float _y ) -{ - _vmathVfSetElement(mVec128, _y, 1); - return *this; -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setY( const floatInVec &_y ) -{ - mVec128 = _vmathVfInsert(mVec128, _y.get128(), 1); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Point3::getY( ) const -{ - return floatInVec( mVec128, 1 ); -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setZ( float _z ) -{ - _vmathVfSetElement(mVec128, _z, 2); - return *this; -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setZ( const floatInVec &_z ) -{ - mVec128 = _vmathVfInsert(mVec128, _z.get128(), 2); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Point3::getZ( ) const -{ - return floatInVec( mVec128, 2 ); -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setElem( int idx, float value ) -{ - _vmathVfSetElement(mVec128, value, idx); - return *this; -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::setElem( int idx, const floatInVec &value ) -{ - mVec128 = _vmathVfInsert(mVec128, value.get128(), idx); - return *this; -} - -VECTORMATH_FORCE_INLINE const floatInVec Point3::getElem( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE VecIdx Point3::operator []( int idx ) -{ - return VecIdx( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const floatInVec Point3::operator []( int idx ) const -{ - return floatInVec( mVec128, idx ); -} - -VECTORMATH_FORCE_INLINE const Vector3 Point3::operator -( const Point3 &pnt ) const -{ - return Vector3( _mm_sub_ps( mVec128, pnt.mVec128 ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 Point3::operator +( const Vector3 &vec ) const -{ - return Point3( _mm_add_ps( mVec128, vec.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 Point3::operator -( const Vector3 &vec ) const -{ - return Point3( _mm_sub_ps( mVec128, vec.get128() ) ); -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::operator +=( const Vector3 &vec ) -{ - *this = *this + vec; - return *this; -} - -VECTORMATH_FORCE_INLINE Point3 & Point3::operator -=( const Vector3 &vec ) -{ - *this = *this - vec; - return *this; -} - -VECTORMATH_FORCE_INLINE const Point3 mulPerElem( const Point3 &pnt0, const Point3 &pnt1 ) -{ - return Point3( _mm_mul_ps( pnt0.get128(), pnt1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 divPerElem( const Point3 &pnt0, const Point3 &pnt1 ) -{ - return Point3( _mm_div_ps( pnt0.get128(), pnt1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 recipPerElem( const Point3 &pnt ) -{ - return Point3( _mm_rcp_ps( pnt.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 absPerElem( const Point3 &pnt ) -{ - return Point3( fabsf4( pnt.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 copySignPerElem( const Point3 &pnt0, const Point3 &pnt1 ) -{ - __m128 vmask = toM128(0x7fffffff); - return Point3( _mm_or_ps( - _mm_and_ps ( vmask, pnt0.get128() ), // Value - _mm_andnot_ps( vmask, pnt1.get128() ) ) ); // Signs -} - -VECTORMATH_FORCE_INLINE const Point3 maxPerElem( const Point3 &pnt0, const Point3 &pnt1 ) -{ - return Point3( _mm_max_ps( pnt0.get128(), pnt1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec maxElem( const Point3 &pnt ) -{ - return floatInVec( _mm_max_ps( _mm_max_ps( vec_splat( pnt.get128(), 0 ), vec_splat( pnt.get128(), 1 ) ), vec_splat( pnt.get128(), 2 ) ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 minPerElem( const Point3 &pnt0, const Point3 &pnt1 ) -{ - return Point3( _mm_min_ps( pnt0.get128(), pnt1.get128() ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec minElem( const Point3 &pnt ) -{ - return floatInVec( _mm_min_ps( _mm_min_ps( vec_splat( pnt.get128(), 0 ), vec_splat( pnt.get128(), 1 ) ), vec_splat( pnt.get128(), 2 ) ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec sum( const Point3 &pnt ) -{ - return floatInVec( _mm_add_ps( _mm_add_ps( vec_splat( pnt.get128(), 0 ), vec_splat( pnt.get128(), 1 ) ), vec_splat( pnt.get128(), 2 ) ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 scale( const Point3 &pnt, float scaleVal ) -{ - return scale( pnt, floatInVec( scaleVal ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 scale( const Point3 &pnt, const floatInVec &scaleVal ) -{ - return mulPerElem( pnt, Point3( scaleVal ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 scale( const Point3 &pnt, const Vector3 &scaleVec ) -{ - return mulPerElem( pnt, Point3( scaleVec ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec projection( const Point3 &pnt, const Vector3 &unitVec ) -{ - return floatInVec( _vmathVfDot3( pnt.get128(), unitVec.get128() ), 0 ); -} - -VECTORMATH_FORCE_INLINE const floatInVec distSqrFromOrigin( const Point3 &pnt ) -{ - return lengthSqr( Vector3( pnt ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec distFromOrigin( const Point3 &pnt ) -{ - return length( Vector3( pnt ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec distSqr( const Point3 &pnt0, const Point3 &pnt1 ) -{ - return lengthSqr( ( pnt1 - pnt0 ) ); -} - -VECTORMATH_FORCE_INLINE const floatInVec dist( const Point3 &pnt0, const Point3 &pnt1 ) -{ - return length( ( pnt1 - pnt0 ) ); -} - -VECTORMATH_FORCE_INLINE const Point3 select( const Point3 &pnt0, const Point3 &pnt1, bool select1 ) -{ - return select( pnt0, pnt1, boolInVec(select1) ); -} - -VECTORMATH_FORCE_INLINE const Point3 select( const Point3 &pnt0, const Point3 &pnt1, const boolInVec &select1 ) -{ - return Point3( vec_sel( pnt0.get128(), pnt1.get128(), select1.get128() ) ); -} - - - -#ifdef _VECTORMATH_DEBUG - -VECTORMATH_FORCE_INLINE void print( const Point3 &pnt ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = pnt.get128(); - printf( "( %f %f %f )\n", tmp.s[0], tmp.s[1], tmp.s[2] ); -} - -VECTORMATH_FORCE_INLINE void print( const Point3 &pnt, const char * name ) -{ - union { __m128 v; float s[4]; } tmp; - tmp.v = pnt.get128(); - printf( "%s: ( %f %f %f )\n", name, tmp.s[0], tmp.s[1], tmp.s[2] ); -} - -#endif - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/sse/vecidx_aos.h b/Engine/lib/bullet/src/vectormath/sse/vecidx_aos.h deleted file mode 100644 index 8ba4b1d75..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/vecidx_aos.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _VECTORMATH_VECIDX_AOS_H -#define _VECTORMATH_VECIDX_AOS_H - - -#include "floatInVec.h" - -namespace Vectormath { -namespace Aos { - -//----------------------------------------------------------------------------- -// VecIdx -// Used in setting elements of Vector3, Vector4, Point3, or Quat with the -// subscripting operator. -// - -VM_ATTRIBUTE_ALIGNED_CLASS16 (class) VecIdx -{ -private: - __m128 &ref; - int i; -public: - inline VecIdx( __m128& vec, int idx ): ref(vec) { i = idx; } - - // implicitly casts to float unless _VECTORMATH_NO_SCALAR_CAST defined - // in which case, implicitly casts to floatInVec, and one must call - // getAsFloat to convert to float. - // -#ifdef _VECTORMATH_NO_SCALAR_CAST - inline operator floatInVec() const; - inline float getAsFloat() const; -#else - inline operator float() const; -#endif - - inline float operator =( float scalar ); - inline floatInVec operator =( const floatInVec &scalar ); - inline floatInVec operator =( const VecIdx& scalar ); - inline floatInVec operator *=( float scalar ); - inline floatInVec operator *=( const floatInVec &scalar ); - inline floatInVec operator /=( float scalar ); - inline floatInVec operator /=( const floatInVec &scalar ); - inline floatInVec operator +=( float scalar ); - inline floatInVec operator +=( const floatInVec &scalar ); - inline floatInVec operator -=( float scalar ); - inline floatInVec operator -=( const floatInVec &scalar ); -}; - -} // namespace Aos -} // namespace Vectormath - -#endif diff --git a/Engine/lib/bullet/src/vectormath/sse/vectormath_aos.h b/Engine/lib/bullet/src/vectormath/sse/vectormath_aos.h deleted file mode 100644 index be5ae8c6e..000000000 --- a/Engine/lib/bullet/src/vectormath/sse/vectormath_aos.h +++ /dev/null @@ -1,2547 +0,0 @@ -/* - Copyright (C) 2006, 2007 Sony Computer Entertainment Inc. - All rights reserved. - - Redistribution and use in source and binary forms, - with or without modification, are permitted provided that the - following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Sony Computer Entertainment Inc nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - - -#ifndef _VECTORMATH_AOS_CPP_SSE_H -#define _VECTORMATH_AOS_CPP_SSE_H - -#include -#include -#include -#include - -#define Vector3Ref Vector3& -#define QuatRef Quat& -#define Matrix3Ref Matrix3& - -#if (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) - #define USE_SSE3_LDDQU - - #define VM_ATTRIBUTE_ALIGNED_CLASS16(a) __declspec(align(16)) a - #define VM_ATTRIBUTE_ALIGN16 __declspec(align(16)) - #define VECTORMATH_FORCE_INLINE __forceinline -#else - #define VM_ATTRIBUTE_ALIGNED_CLASS16(a) a __attribute__ ((aligned (16))) - #define VM_ATTRIBUTE_ALIGN16 __attribute__ ((aligned (16))) - #define VECTORMATH_FORCE_INLINE inline __attribute__ ((always_inline)) - #ifdef __SSE3__ - #define USE_SSE3_LDDQU - #endif //__SSE3__ -#endif//_WIN32 - - -#ifdef USE_SSE3_LDDQU -#include //_mm_lddqu_si128 -#endif //USE_SSE3_LDDQU - - -// TODO: Tidy -typedef __m128 vec_float4; -typedef __m128 vec_uint4; -typedef __m128 vec_int4; -typedef __m128i vec_uchar16; -typedef __m128i vec_ushort8; - -#define vec_splat(x, e) _mm_shuffle_ps(x, x, _MM_SHUFFLE(e,e,e,e)) - -#define _mm_ror_ps(vec,i) \ - (((i)%4) ? (_mm_shuffle_ps(vec,vec, _MM_SHUFFLE((unsigned char)(i+3)%4,(unsigned char)(i+2)%4,(unsigned char)(i+1)%4,(unsigned char)(i+0)%4))) : (vec)) -#define _mm_rol_ps(vec,i) \ - (((i)%4) ? (_mm_shuffle_ps(vec,vec, _MM_SHUFFLE((unsigned char)(7-i)%4,(unsigned char)(6-i)%4,(unsigned char)(5-i)%4,(unsigned char)(4-i)%4))) : (vec)) - -#define vec_sld(vec,vec2,x) _mm_ror_ps(vec, ((x)/4)) - -#define _mm_abs_ps(vec) _mm_andnot_ps(_MASKSIGN_,vec) -#define _mm_neg_ps(vec) _mm_xor_ps(_MASKSIGN_,vec) - -#define vec_madd(a, b, c) _mm_add_ps(c, _mm_mul_ps(a, b) ) - -union SSEFloat -{ - __m128i vi; - __m128 m128; - __m128 vf; - unsigned int ui[4]; - unsigned short s[8]; - float f[4]; - SSEFloat(__m128 v) : m128(v) {} - SSEFloat(__m128i v) : vi(v) {} - SSEFloat() {}//uninitialized -}; - -static VECTORMATH_FORCE_INLINE __m128 vec_sel(__m128 a, __m128 b, __m128 mask) -{ - return _mm_or_ps(_mm_and_ps(mask, b), _mm_andnot_ps(mask, a)); -} -static VECTORMATH_FORCE_INLINE __m128 vec_sel(__m128 a, __m128 b, const unsigned int *_mask) -{ - return vec_sel(a, b, _mm_load_ps((float *)_mask)); -} -static VECTORMATH_FORCE_INLINE __m128 vec_sel(__m128 a, __m128 b, unsigned int _mask) -{ - return vec_sel(a, b, _mm_set1_ps(*(float *)&_mask)); -} - -static VECTORMATH_FORCE_INLINE __m128 toM128(unsigned int x) -{ - return _mm_set1_ps( *(float *)&x ); -} - -static VECTORMATH_FORCE_INLINE __m128 fabsf4(__m128 x) -{ - return _mm_and_ps( x, toM128( 0x7fffffff ) ); -} -/* -union SSE64 -{ - __m128 m128; - struct - { - __m64 m01; - __m64 m23; - } m64; -}; - -static VECTORMATH_FORCE_INLINE __m128 vec_cts(__m128 x, int a) -{ - assert(a == 0); // Only 2^0 supported - (void)a; - SSE64 sse64; - sse64.m64.m01 = _mm_cvttps_pi32(x); - sse64.m64.m23 = _mm_cvttps_pi32(_mm_ror_ps(x,2)); - _mm_empty(); - return sse64.m128; -} - -static VECTORMATH_FORCE_INLINE __m128 vec_ctf(__m128 x, int a) -{ - assert(a == 0); // Only 2^0 supported - (void)a; - SSE64 sse64; - sse64.m128 = x; - __m128 result =_mm_movelh_ps( - _mm_cvt_pi2ps(_mm_setzero_ps(), sse64.m64.m01), - _mm_cvt_pi2ps(_mm_setzero_ps(), sse64.m64.m23)); - _mm_empty(); - return result; -} -*/ -static VECTORMATH_FORCE_INLINE __m128 vec_cts(__m128 x, int a) -{ - assert(a == 0); // Only 2^0 supported - (void)a; - __m128i result = _mm_cvtps_epi32(x); - return (__m128 &)result; -} - -static VECTORMATH_FORCE_INLINE __m128 vec_ctf(__m128 x, int a) -{ - assert(a == 0); // Only 2^0 supported - (void)a; - return _mm_cvtepi32_ps((__m128i &)x); -} - -#define vec_nmsub(a,b,c) _mm_sub_ps( c, _mm_mul_ps( a, b ) ) -#define vec_sub(a,b) _mm_sub_ps( a, b ) -#define vec_add(a,b) _mm_add_ps( a, b ) -#define vec_mul(a,b) _mm_mul_ps( a, b ) -#define vec_xor(a,b) _mm_xor_ps( a, b ) -#define vec_and(a,b) _mm_and_ps( a, b ) -#define vec_cmpeq(a,b) _mm_cmpeq_ps( a, b ) -#define vec_cmpgt(a,b) _mm_cmpgt_ps( a, b ) - -#define vec_mergeh(a,b) _mm_unpacklo_ps( a, b ) -#define vec_mergel(a,b) _mm_unpackhi_ps( a, b ) - -#define vec_andc(a,b) _mm_andnot_ps( b, a ) - -#define sqrtf4(x) _mm_sqrt_ps( x ) -#define rsqrtf4(x) _mm_rsqrt_ps( x ) -#define recipf4(x) _mm_rcp_ps( x ) -#define negatef4(x) _mm_sub_ps( _mm_setzero_ps(), x ) - -static VECTORMATH_FORCE_INLINE __m128 newtonrapson_rsqrt4( const __m128 v ) -{ -#define _half4 _mm_setr_ps(.5f,.5f,.5f,.5f) -#define _three _mm_setr_ps(3.f,3.f,3.f,3.f) -const __m128 approx = _mm_rsqrt_ps( v ); -const __m128 muls = _mm_mul_ps(_mm_mul_ps(v, approx), approx); -return _mm_mul_ps(_mm_mul_ps(_half4, approx), _mm_sub_ps(_three, muls) ); -} - -static VECTORMATH_FORCE_INLINE __m128 acosf4(__m128 x) -{ - __m128 xabs = fabsf4(x); - __m128 select = _mm_cmplt_ps( x, _mm_setzero_ps() ); - __m128 t1 = sqrtf4(vec_sub(_mm_set1_ps(1.0f), xabs)); - - /* Instruction counts can be reduced if the polynomial was - * computed entirely from nested (dependent) fma's. However, - * to reduce the number of pipeline stalls, the polygon is evaluated - * in two halves (hi amd lo). - */ - __m128 xabs2 = _mm_mul_ps(xabs, xabs); - __m128 xabs4 = _mm_mul_ps(xabs2, xabs2); - __m128 hi = vec_madd(vec_madd(vec_madd(_mm_set1_ps(-0.0012624911f), - xabs, _mm_set1_ps(0.0066700901f)), - xabs, _mm_set1_ps(-0.0170881256f)), - xabs, _mm_set1_ps( 0.0308918810f)); - __m128 lo = vec_madd(vec_madd(vec_madd(_mm_set1_ps(-0.0501743046f), - xabs, _mm_set1_ps(0.0889789874f)), - xabs, _mm_set1_ps(-0.2145988016f)), - xabs, _mm_set1_ps( 1.5707963050f)); - - __m128 result = vec_madd(hi, xabs4, lo); - - // Adjust the result if x is negactive. - return vec_sel( - vec_mul(t1, result), // Positive - vec_nmsub(t1, result, _mm_set1_ps(3.1415926535898f)), // Negative - select); -} - -static VECTORMATH_FORCE_INLINE __m128 sinf4(vec_float4 x) -{ - -// -// Common constants used to evaluate sinf4/cosf4/tanf4 -// -#define _SINCOS_CC0 -0.0013602249f -#define _SINCOS_CC1 0.0416566950f -#define _SINCOS_CC2 -0.4999990225f -#define _SINCOS_SC0 -0.0001950727f -#define _SINCOS_SC1 0.0083320758f -#define _SINCOS_SC2 -0.1666665247f - -#define _SINCOS_KC1 1.57079625129f -#define _SINCOS_KC2 7.54978995489e-8f - - vec_float4 xl,xl2,xl3,res; - - // Range reduction using : xl = angle * TwoOverPi; - // - xl = vec_mul(x, _mm_set1_ps(0.63661977236f)); - - // Find the quadrant the angle falls in - // using: q = (int) (ceil(abs(xl))*sign(xl)) - // - vec_int4 q = vec_cts(xl,0); - - // Compute an offset based on the quadrant that the angle falls in - // - vec_int4 offset = _mm_and_ps(q,toM128(0x3)); - - // Remainder in range [-pi/4..pi/4] - // - vec_float4 qf = vec_ctf(q,0); - xl = vec_nmsub(qf,_mm_set1_ps(_SINCOS_KC2),vec_nmsub(qf,_mm_set1_ps(_SINCOS_KC1),x)); - - // Compute x^2 and x^3 - // - xl2 = vec_mul(xl,xl); - xl3 = vec_mul(xl2,xl); - - // Compute both the sin and cos of the angles - // using a polynomial expression: - // cx = 1.0f + xl2 * ((C0 * xl2 + C1) * xl2 + C2), and - // sx = xl + xl3 * ((S0 * xl2 + S1) * xl2 + S2) - // - - vec_float4 cx = - vec_madd( - vec_madd( - vec_madd(_mm_set1_ps(_SINCOS_CC0),xl2,_mm_set1_ps(_SINCOS_CC1)),xl2,_mm_set1_ps(_SINCOS_CC2)),xl2,_mm_set1_ps(1.0f)); - vec_float4 sx = - vec_madd( - vec_madd( - vec_madd(_mm_set1_ps(_SINCOS_SC0),xl2,_mm_set1_ps(_SINCOS_SC1)),xl2,_mm_set1_ps(_SINCOS_SC2)),xl3,xl); - - // Use the cosine when the offset is odd and the sin - // when the offset is even - // - res = vec_sel(cx,sx,vec_cmpeq(vec_and(offset, - toM128(0x1)), - _mm_setzero_ps())); - - // Flip the sign of the result when (offset mod 4) = 1 or 2 - // - return vec_sel( - vec_xor(toM128(0x80000000U), res), // Negative - res, // Positive - vec_cmpeq(vec_and(offset,toM128(0x2)),_mm_setzero_ps())); -} - -static VECTORMATH_FORCE_INLINE void sincosf4(vec_float4 x, vec_float4* s, vec_float4* c) -{ - vec_float4 xl,xl2,xl3; - vec_int4 offsetSin, offsetCos; - - // Range reduction using : xl = angle * TwoOverPi; - // - xl = vec_mul(x, _mm_set1_ps(0.63661977236f)); - - // Find the quadrant the angle falls in - // using: q = (int) (ceil(abs(xl))*sign(xl)) - // - //vec_int4 q = vec_cts(vec_add(xl,vec_sel(_mm_set1_ps(0.5f),xl,(0x80000000))),0); - vec_int4 q = vec_cts(xl,0); - - // Compute the offset based on the quadrant that the angle falls in. - // Add 1 to the offset for the cosine. - // - offsetSin = vec_and(q,toM128((int)0x3)); - __m128i temp = _mm_add_epi32(_mm_set1_epi32(1),(__m128i &)offsetSin); - offsetCos = (__m128 &)temp; - - // Remainder in range [-pi/4..pi/4] - // - vec_float4 qf = vec_ctf(q,0); - xl = vec_nmsub(qf,_mm_set1_ps(_SINCOS_KC2),vec_nmsub(qf,_mm_set1_ps(_SINCOS_KC1),x)); - - // Compute x^2 and x^3 - // - xl2 = vec_mul(xl,xl); - xl3 = vec_mul(xl2,xl); - - // Compute both the sin and cos of the angles - // using a polynomial expression: - // cx = 1.0f + xl2 * ((C0 * xl2 + C1) * xl2 + C2), and - // sx = xl + xl3 * ((S0 * xl2 + S1) * xl2 + S2) - // - vec_float4 cx = - vec_madd( - vec_madd( - vec_madd(_mm_set1_ps(_SINCOS_CC0),xl2,_mm_set1_ps(_SINCOS_CC1)),xl2,_mm_set1_ps(_SINCOS_CC2)),xl2,_mm_set1_ps(1.0f)); - vec_float4 sx = - vec_madd( - vec_madd( - vec_madd(_mm_set1_ps(_SINCOS_SC0),xl2,_mm_set1_ps(_SINCOS_SC1)),xl2,_mm_set1_ps(_SINCOS_SC2)),xl3,xl); - - // Use the cosine when the offset is odd and the sin - // when the offset is even - // - vec_uint4 sinMask = (vec_uint4)vec_cmpeq(vec_and(offsetSin,toM128(0x1)),_mm_setzero_ps()); - vec_uint4 cosMask = (vec_uint4)vec_cmpeq(vec_and(offsetCos,toM128(0x1)),_mm_setzero_ps()); - *s = vec_sel(cx,sx,sinMask); - *c = vec_sel(cx,sx,cosMask); - - // Flip the sign of the result when (offset mod 4) = 1 or 2 - // - sinMask = vec_cmpeq(vec_and(offsetSin,toM128(0x2)),_mm_setzero_ps()); - cosMask = vec_cmpeq(vec_and(offsetCos,toM128(0x2)),_mm_setzero_ps()); - - *s = vec_sel((vec_float4)vec_xor(toM128(0x80000000),(vec_uint4)*s),*s,sinMask); - *c = vec_sel((vec_float4)vec_xor(toM128(0x80000000),(vec_uint4)*c),*c,cosMask); -} - -#include "vecidx_aos.h" -#include "floatInVec.h" -#include "boolInVec.h" - -#ifdef _VECTORMATH_DEBUG -#include -#endif -namespace Vectormath { - -namespace Aos { - -//----------------------------------------------------------------------------- -// Forward Declarations -// - -class Vector3; -class Vector4; -class Point3; -class Quat; -class Matrix3; -class Matrix4; -class Transform3; - -// A 3-D vector in array-of-structures format -// -class Vector3 -{ - __m128 mVec128; - - VECTORMATH_FORCE_INLINE void set128(vec_float4 vec); - - VECTORMATH_FORCE_INLINE vec_float4& get128Ref(); - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Vector3( ) { }; - - // Default copy constructor - // - VECTORMATH_FORCE_INLINE Vector3(const Vector3& vec); - - // Construct a 3-D vector from x, y, and z elements - // - VECTORMATH_FORCE_INLINE Vector3( float x, float y, float z ); - - // Construct a 3-D vector from x, y, and z elements (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3( const floatInVec &x, const floatInVec &y, const floatInVec &z ); - - // Copy elements from a 3-D point into a 3-D vector - // - explicit VECTORMATH_FORCE_INLINE Vector3( const Point3 &pnt ); - - // Set all elements of a 3-D vector to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Vector3( float scalar ); - - // Set all elements of a 3-D vector to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Vector3( const floatInVec &scalar ); - - // Set vector float data in a 3-D vector - // - explicit VECTORMATH_FORCE_INLINE Vector3( __m128 vf4 ); - - // Get vector float data from a 3-D vector - // - VECTORMATH_FORCE_INLINE __m128 get128( ) const; - - // Assign one 3-D vector to another - // - VECTORMATH_FORCE_INLINE Vector3 & operator =( const Vector3 &vec ); - - // Set the x element of a 3-D vector - // - VECTORMATH_FORCE_INLINE Vector3 & setX( float x ); - - // Set the y element of a 3-D vector - // - VECTORMATH_FORCE_INLINE Vector3 & setY( float y ); - - // Set the z element of a 3-D vector - // - VECTORMATH_FORCE_INLINE Vector3 & setZ( float z ); - - // Set the x element of a 3-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3 & setX( const floatInVec &x ); - - // Set the y element of a 3-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3 & setY( const floatInVec &y ); - - // Set the z element of a 3-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3 & setZ( const floatInVec &z ); - - // Get the x element of a 3-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getX( ) const; - - // Get the y element of a 3-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getY( ) const; - - // Get the z element of a 3-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getZ( ) const; - - // Set an x, y, or z element of a 3-D vector by index - // - VECTORMATH_FORCE_INLINE Vector3 & setElem( int idx, float value ); - - // Set an x, y, or z element of a 3-D vector by index (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3 & setElem( int idx, const floatInVec &value ); - - // Get an x, y, or z element of a 3-D vector by index - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - VECTORMATH_FORCE_INLINE VecIdx operator []( int idx ); - - // Subscripting operator to get an element - // - VECTORMATH_FORCE_INLINE const floatInVec operator []( int idx ) const; - - // Add two 3-D vectors - // - VECTORMATH_FORCE_INLINE const Vector3 operator +( const Vector3 &vec ) const; - - // Subtract a 3-D vector from another 3-D vector - // - VECTORMATH_FORCE_INLINE const Vector3 operator -( const Vector3 &vec ) const; - - // Add a 3-D vector to a 3-D point - // - VECTORMATH_FORCE_INLINE const Point3 operator +( const Point3 &pnt ) const; - - // Multiply a 3-D vector by a scalar - // - VECTORMATH_FORCE_INLINE const Vector3 operator *( float scalar ) const; - - // Divide a 3-D vector by a scalar - // - VECTORMATH_FORCE_INLINE const Vector3 operator /( float scalar ) const; - - // Multiply a 3-D vector by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Vector3 operator *( const floatInVec &scalar ) const; - - // Divide a 3-D vector by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Vector3 operator /( const floatInVec &scalar ) const; - - // Perform compound assignment and addition with a 3-D vector - // - VECTORMATH_FORCE_INLINE Vector3 & operator +=( const Vector3 &vec ); - - // Perform compound assignment and subtraction by a 3-D vector - // - VECTORMATH_FORCE_INLINE Vector3 & operator -=( const Vector3 &vec ); - - // Perform compound assignment and multiplication by a scalar - // - VECTORMATH_FORCE_INLINE Vector3 & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - VECTORMATH_FORCE_INLINE Vector3 & operator /=( float scalar ); - - // Perform compound assignment and multiplication by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3 & operator *=( const floatInVec &scalar ); - - // Perform compound assignment and division by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector3 & operator /=( const floatInVec &scalar ); - - // Negate all elements of a 3-D vector - // - VECTORMATH_FORCE_INLINE const Vector3 operator -( ) const; - - // Construct x axis - // - static VECTORMATH_FORCE_INLINE const Vector3 xAxis( ); - - // Construct y axis - // - static VECTORMATH_FORCE_INLINE const Vector3 yAxis( ); - - // Construct z axis - // - static VECTORMATH_FORCE_INLINE const Vector3 zAxis( ); - -}; - -// Multiply a 3-D vector by a scalar -// -VECTORMATH_FORCE_INLINE const Vector3 operator *( float scalar, const Vector3 &vec ); - -// Multiply a 3-D vector by a scalar (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Vector3 operator *( const floatInVec &scalar, const Vector3 &vec ); - -// Multiply two 3-D vectors per element -// -VECTORMATH_FORCE_INLINE const Vector3 mulPerElem( const Vector3 &vec0, const Vector3 &vec1 ); - -// Divide two 3-D vectors per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -VECTORMATH_FORCE_INLINE const Vector3 divPerElem( const Vector3 &vec0, const Vector3 &vec1 ); - -// Compute the reciprocal of a 3-D vector per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -VECTORMATH_FORCE_INLINE const Vector3 recipPerElem( const Vector3 &vec ); - -// Compute the absolute value of a 3-D vector per element -// -VECTORMATH_FORCE_INLINE const Vector3 absPerElem( const Vector3 &vec ); - -// Copy sign from one 3-D vector to another, per element -// -VECTORMATH_FORCE_INLINE const Vector3 copySignPerElem( const Vector3 &vec0, const Vector3 &vec1 ); - -// Maximum of two 3-D vectors per element -// -VECTORMATH_FORCE_INLINE const Vector3 maxPerElem( const Vector3 &vec0, const Vector3 &vec1 ); - -// Minimum of two 3-D vectors per element -// -VECTORMATH_FORCE_INLINE const Vector3 minPerElem( const Vector3 &vec0, const Vector3 &vec1 ); - -// Maximum element of a 3-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec maxElem( const Vector3 &vec ); - -// Minimum element of a 3-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec minElem( const Vector3 &vec ); - -// Compute the sum of all elements of a 3-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec sum( const Vector3 &vec ); - -// Compute the dot product of two 3-D vectors -// -VECTORMATH_FORCE_INLINE const floatInVec dot( const Vector3 &vec0, const Vector3 &vec1 ); - -// Compute the square of the length of a 3-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec lengthSqr( const Vector3 &vec ); - -// Compute the length of a 3-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec length( const Vector3 &vec ); - -// Normalize a 3-D vector -// NOTE: -// The result is unpredictable when all elements of vec are at or near zero. -// -VECTORMATH_FORCE_INLINE const Vector3 normalize( const Vector3 &vec ); - -// Compute cross product of two 3-D vectors -// -VECTORMATH_FORCE_INLINE const Vector3 cross( const Vector3 &vec0, const Vector3 &vec1 ); - -// Outer product of two 3-D vectors -// -VECTORMATH_FORCE_INLINE const Matrix3 outer( const Vector3 &vec0, const Vector3 &vec1 ); - -// Pre-multiply a row vector by a 3x3 matrix -// NOTE: -// Slower than column post-multiply. -// -VECTORMATH_FORCE_INLINE const Vector3 rowMul( const Vector3 &vec, const Matrix3 & mat ); - -// Cross-product matrix of a 3-D vector -// -VECTORMATH_FORCE_INLINE const Matrix3 crossMatrix( const Vector3 &vec ); - -// Create cross-product matrix and multiply -// NOTE: -// Faster than separately creating a cross-product matrix and multiplying. -// -VECTORMATH_FORCE_INLINE const Matrix3 crossMatrixMul( const Vector3 &vec, const Matrix3 & mat ); - -// Linear interpolation between two 3-D vectors -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector3 lerp( float t, const Vector3 &vec0, const Vector3 &vec1 ); - -// Linear interpolation between two 3-D vectors (scalar data contained in vector data type) -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector3 lerp( const floatInVec &t, const Vector3 &vec0, const Vector3 &vec1 ); - -// Spherical linear interpolation between two 3-D vectors -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector3 slerp( float t, const Vector3 &unitVec0, const Vector3 &unitVec1 ); - -// Spherical linear interpolation between two 3-D vectors (scalar data contained in vector data type) -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector3 slerp( const floatInVec &t, const Vector3 &unitVec0, const Vector3 &unitVec1 ); - -// Conditionally select between two 3-D vectors -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Vector3 select( const Vector3 &vec0, const Vector3 &vec1, bool select1 ); - -// Conditionally select between two 3-D vectors (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Vector3 select( const Vector3 &vec0, const Vector3 &vec1, const boolInVec &select1 ); - -// Store x, y, and z elements of 3-D vector in first three words of a quadword, preserving fourth word -// -VECTORMATH_FORCE_INLINE void storeXYZ( const Vector3 &vec, __m128 * quad ); - -// Load four three-float 3-D vectors, stored in three quadwords -// -VECTORMATH_FORCE_INLINE void loadXYZArray( Vector3 & vec0, Vector3 & vec1, Vector3 & vec2, Vector3 & vec3, const __m128 * threeQuads ); - -// Store four 3-D vectors in three quadwords -// -VECTORMATH_FORCE_INLINE void storeXYZArray( const Vector3 &vec0, const Vector3 &vec1, const Vector3 &vec2, const Vector3 &vec3, __m128 * threeQuads ); - -// Store eight 3-D vectors as half-floats -// -VECTORMATH_FORCE_INLINE void storeHalfFloats( const Vector3 &vec0, const Vector3 &vec1, const Vector3 &vec2, const Vector3 &vec3, const Vector3 &vec4, const Vector3 &vec5, const Vector3 &vec6, const Vector3 &vec7, vec_ushort8 * threeQuads ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3-D vector -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Vector3 &vec ); - -// Print a 3-D vector and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Vector3 &vec, const char * name ); - -#endif - -// A 4-D vector in array-of-structures format -// -class Vector4 -{ - __m128 mVec128; - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Vector4( ) { }; - - // Construct a 4-D vector from x, y, z, and w elements - // - VECTORMATH_FORCE_INLINE Vector4( float x, float y, float z, float w ); - - // Construct a 4-D vector from x, y, z, and w elements (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4( const floatInVec &x, const floatInVec &y, const floatInVec &z, const floatInVec &w ); - - // Construct a 4-D vector from a 3-D vector and a scalar - // - VECTORMATH_FORCE_INLINE Vector4( const Vector3 &xyz, float w ); - - // Construct a 4-D vector from a 3-D vector and a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4( const Vector3 &xyz, const floatInVec &w ); - - // Copy x, y, and z from a 3-D vector into a 4-D vector, and set w to 0 - // - explicit VECTORMATH_FORCE_INLINE Vector4( const Vector3 &vec ); - - // Copy x, y, and z from a 3-D point into a 4-D vector, and set w to 1 - // - explicit VECTORMATH_FORCE_INLINE Vector4( const Point3 &pnt ); - - // Copy elements from a quaternion into a 4-D vector - // - explicit VECTORMATH_FORCE_INLINE Vector4( const Quat &quat ); - - // Set all elements of a 4-D vector to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Vector4( float scalar ); - - // Set all elements of a 4-D vector to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Vector4( const floatInVec &scalar ); - - // Set vector float data in a 4-D vector - // - explicit VECTORMATH_FORCE_INLINE Vector4( __m128 vf4 ); - - // Get vector float data from a 4-D vector - // - VECTORMATH_FORCE_INLINE __m128 get128( ) const; - - // Assign one 4-D vector to another - // - VECTORMATH_FORCE_INLINE Vector4 & operator =( const Vector4 &vec ); - - // Set the x, y, and z elements of a 4-D vector - // NOTE: - // This function does not change the w element. - // - VECTORMATH_FORCE_INLINE Vector4 & setXYZ( const Vector3 &vec ); - - // Get the x, y, and z elements of a 4-D vector - // - VECTORMATH_FORCE_INLINE const Vector3 getXYZ( ) const; - - // Set the x element of a 4-D vector - // - VECTORMATH_FORCE_INLINE Vector4 & setX( float x ); - - // Set the y element of a 4-D vector - // - VECTORMATH_FORCE_INLINE Vector4 & setY( float y ); - - // Set the z element of a 4-D vector - // - VECTORMATH_FORCE_INLINE Vector4 & setZ( float z ); - - // Set the w element of a 4-D vector - // - VECTORMATH_FORCE_INLINE Vector4 & setW( float w ); - - // Set the x element of a 4-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & setX( const floatInVec &x ); - - // Set the y element of a 4-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & setY( const floatInVec &y ); - - // Set the z element of a 4-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & setZ( const floatInVec &z ); - - // Set the w element of a 4-D vector (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & setW( const floatInVec &w ); - - // Get the x element of a 4-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getX( ) const; - - // Get the y element of a 4-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getY( ) const; - - // Get the z element of a 4-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getZ( ) const; - - // Get the w element of a 4-D vector - // - VECTORMATH_FORCE_INLINE const floatInVec getW( ) const; - - // Set an x, y, z, or w element of a 4-D vector by index - // - VECTORMATH_FORCE_INLINE Vector4 & setElem( int idx, float value ); - - // Set an x, y, z, or w element of a 4-D vector by index (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & setElem( int idx, const floatInVec &value ); - - // Get an x, y, z, or w element of a 4-D vector by index - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - VECTORMATH_FORCE_INLINE VecIdx operator []( int idx ); - - // Subscripting operator to get an element - // - VECTORMATH_FORCE_INLINE const floatInVec operator []( int idx ) const; - - // Add two 4-D vectors - // - VECTORMATH_FORCE_INLINE const Vector4 operator +( const Vector4 &vec ) const; - - // Subtract a 4-D vector from another 4-D vector - // - VECTORMATH_FORCE_INLINE const Vector4 operator -( const Vector4 &vec ) const; - - // Multiply a 4-D vector by a scalar - // - VECTORMATH_FORCE_INLINE const Vector4 operator *( float scalar ) const; - - // Divide a 4-D vector by a scalar - // - VECTORMATH_FORCE_INLINE const Vector4 operator /( float scalar ) const; - - // Multiply a 4-D vector by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Vector4 operator *( const floatInVec &scalar ) const; - - // Divide a 4-D vector by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Vector4 operator /( const floatInVec &scalar ) const; - - // Perform compound assignment and addition with a 4-D vector - // - VECTORMATH_FORCE_INLINE Vector4 & operator +=( const Vector4 &vec ); - - // Perform compound assignment and subtraction by a 4-D vector - // - VECTORMATH_FORCE_INLINE Vector4 & operator -=( const Vector4 &vec ); - - // Perform compound assignment and multiplication by a scalar - // - VECTORMATH_FORCE_INLINE Vector4 & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - VECTORMATH_FORCE_INLINE Vector4 & operator /=( float scalar ); - - // Perform compound assignment and multiplication by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & operator *=( const floatInVec &scalar ); - - // Perform compound assignment and division by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Vector4 & operator /=( const floatInVec &scalar ); - - // Negate all elements of a 4-D vector - // - VECTORMATH_FORCE_INLINE const Vector4 operator -( ) const; - - // Construct x axis - // - static VECTORMATH_FORCE_INLINE const Vector4 xAxis( ); - - // Construct y axis - // - static VECTORMATH_FORCE_INLINE const Vector4 yAxis( ); - - // Construct z axis - // - static VECTORMATH_FORCE_INLINE const Vector4 zAxis( ); - - // Construct w axis - // - static VECTORMATH_FORCE_INLINE const Vector4 wAxis( ); - -}; - -// Multiply a 4-D vector by a scalar -// -VECTORMATH_FORCE_INLINE const Vector4 operator *( float scalar, const Vector4 &vec ); - -// Multiply a 4-D vector by a scalar (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Vector4 operator *( const floatInVec &scalar, const Vector4 &vec ); - -// Multiply two 4-D vectors per element -// -VECTORMATH_FORCE_INLINE const Vector4 mulPerElem( const Vector4 &vec0, const Vector4 &vec1 ); - -// Divide two 4-D vectors per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -VECTORMATH_FORCE_INLINE const Vector4 divPerElem( const Vector4 &vec0, const Vector4 &vec1 ); - -// Compute the reciprocal of a 4-D vector per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -VECTORMATH_FORCE_INLINE const Vector4 recipPerElem( const Vector4 &vec ); - -// Compute the absolute value of a 4-D vector per element -// -VECTORMATH_FORCE_INLINE const Vector4 absPerElem( const Vector4 &vec ); - -// Copy sign from one 4-D vector to another, per element -// -VECTORMATH_FORCE_INLINE const Vector4 copySignPerElem( const Vector4 &vec0, const Vector4 &vec1 ); - -// Maximum of two 4-D vectors per element -// -VECTORMATH_FORCE_INLINE const Vector4 maxPerElem( const Vector4 &vec0, const Vector4 &vec1 ); - -// Minimum of two 4-D vectors per element -// -VECTORMATH_FORCE_INLINE const Vector4 minPerElem( const Vector4 &vec0, const Vector4 &vec1 ); - -// Maximum element of a 4-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec maxElem( const Vector4 &vec ); - -// Minimum element of a 4-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec minElem( const Vector4 &vec ); - -// Compute the sum of all elements of a 4-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec sum( const Vector4 &vec ); - -// Compute the dot product of two 4-D vectors -// -VECTORMATH_FORCE_INLINE const floatInVec dot( const Vector4 &vec0, const Vector4 &vec1 ); - -// Compute the square of the length of a 4-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec lengthSqr( const Vector4 &vec ); - -// Compute the length of a 4-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec length( const Vector4 &vec ); - -// Normalize a 4-D vector -// NOTE: -// The result is unpredictable when all elements of vec are at or near zero. -// -VECTORMATH_FORCE_INLINE const Vector4 normalize( const Vector4 &vec ); - -// Outer product of two 4-D vectors -// -VECTORMATH_FORCE_INLINE const Matrix4 outer( const Vector4 &vec0, const Vector4 &vec1 ); - -// Linear interpolation between two 4-D vectors -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector4 lerp( float t, const Vector4 &vec0, const Vector4 &vec1 ); - -// Linear interpolation between two 4-D vectors (scalar data contained in vector data type) -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector4 lerp( const floatInVec &t, const Vector4 &vec0, const Vector4 &vec1 ); - -// Spherical linear interpolation between two 4-D vectors -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector4 slerp( float t, const Vector4 &unitVec0, const Vector4 &unitVec1 ); - -// Spherical linear interpolation between two 4-D vectors (scalar data contained in vector data type) -// NOTE: -// The result is unpredictable if the vectors point in opposite directions. -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Vector4 slerp( const floatInVec &t, const Vector4 &unitVec0, const Vector4 &unitVec1 ); - -// Conditionally select between two 4-D vectors -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Vector4 select( const Vector4 &vec0, const Vector4 &vec1, bool select1 ); - -// Conditionally select between two 4-D vectors (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Vector4 select( const Vector4 &vec0, const Vector4 &vec1, const boolInVec &select1 ); - -// Store four 4-D vectors as half-floats -// -VECTORMATH_FORCE_INLINE void storeHalfFloats( const Vector4 &vec0, const Vector4 &vec1, const Vector4 &vec2, const Vector4 &vec3, vec_ushort8 * twoQuads ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 4-D vector -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Vector4 &vec ); - -// Print a 4-D vector and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Vector4 &vec, const char * name ); - -#endif - -// A 3-D point in array-of-structures format -// -class Point3 -{ - __m128 mVec128; - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Point3( ) { }; - - // Construct a 3-D point from x, y, and z elements - // - VECTORMATH_FORCE_INLINE Point3( float x, float y, float z ); - - // Construct a 3-D point from x, y, and z elements (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Point3( const floatInVec &x, const floatInVec &y, const floatInVec &z ); - - // Copy elements from a 3-D vector into a 3-D point - // - explicit VECTORMATH_FORCE_INLINE Point3( const Vector3 &vec ); - - // Set all elements of a 3-D point to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Point3( float scalar ); - - // Set all elements of a 3-D point to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Point3( const floatInVec &scalar ); - - // Set vector float data in a 3-D point - // - explicit VECTORMATH_FORCE_INLINE Point3( __m128 vf4 ); - - // Get vector float data from a 3-D point - // - VECTORMATH_FORCE_INLINE __m128 get128( ) const; - - // Assign one 3-D point to another - // - VECTORMATH_FORCE_INLINE Point3 & operator =( const Point3 &pnt ); - - // Set the x element of a 3-D point - // - VECTORMATH_FORCE_INLINE Point3 & setX( float x ); - - // Set the y element of a 3-D point - // - VECTORMATH_FORCE_INLINE Point3 & setY( float y ); - - // Set the z element of a 3-D point - // - VECTORMATH_FORCE_INLINE Point3 & setZ( float z ); - - // Set the x element of a 3-D point (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Point3 & setX( const floatInVec &x ); - - // Set the y element of a 3-D point (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Point3 & setY( const floatInVec &y ); - - // Set the z element of a 3-D point (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Point3 & setZ( const floatInVec &z ); - - // Get the x element of a 3-D point - // - VECTORMATH_FORCE_INLINE const floatInVec getX( ) const; - - // Get the y element of a 3-D point - // - VECTORMATH_FORCE_INLINE const floatInVec getY( ) const; - - // Get the z element of a 3-D point - // - VECTORMATH_FORCE_INLINE const floatInVec getZ( ) const; - - // Set an x, y, or z element of a 3-D point by index - // - VECTORMATH_FORCE_INLINE Point3 & setElem( int idx, float value ); - - // Set an x, y, or z element of a 3-D point by index (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Point3 & setElem( int idx, const floatInVec &value ); - - // Get an x, y, or z element of a 3-D point by index - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - VECTORMATH_FORCE_INLINE VecIdx operator []( int idx ); - - // Subscripting operator to get an element - // - VECTORMATH_FORCE_INLINE const floatInVec operator []( int idx ) const; - - // Subtract a 3-D point from another 3-D point - // - VECTORMATH_FORCE_INLINE const Vector3 operator -( const Point3 &pnt ) const; - - // Add a 3-D point to a 3-D vector - // - VECTORMATH_FORCE_INLINE const Point3 operator +( const Vector3 &vec ) const; - - // Subtract a 3-D vector from a 3-D point - // - VECTORMATH_FORCE_INLINE const Point3 operator -( const Vector3 &vec ) const; - - // Perform compound assignment and addition with a 3-D vector - // - VECTORMATH_FORCE_INLINE Point3 & operator +=( const Vector3 &vec ); - - // Perform compound assignment and subtraction by a 3-D vector - // - VECTORMATH_FORCE_INLINE Point3 & operator -=( const Vector3 &vec ); - -}; - -// Multiply two 3-D points per element -// -VECTORMATH_FORCE_INLINE const Point3 mulPerElem( const Point3 &pnt0, const Point3 &pnt1 ); - -// Divide two 3-D points per element -// NOTE: -// Floating-point behavior matches standard library function divf4. -// -VECTORMATH_FORCE_INLINE const Point3 divPerElem( const Point3 &pnt0, const Point3 &pnt1 ); - -// Compute the reciprocal of a 3-D point per element -// NOTE: -// Floating-point behavior matches standard library function recipf4. -// -VECTORMATH_FORCE_INLINE const Point3 recipPerElem( const Point3 &pnt ); - -// Compute the absolute value of a 3-D point per element -// -VECTORMATH_FORCE_INLINE const Point3 absPerElem( const Point3 &pnt ); - -// Copy sign from one 3-D point to another, per element -// -VECTORMATH_FORCE_INLINE const Point3 copySignPerElem( const Point3 &pnt0, const Point3 &pnt1 ); - -// Maximum of two 3-D points per element -// -VECTORMATH_FORCE_INLINE const Point3 maxPerElem( const Point3 &pnt0, const Point3 &pnt1 ); - -// Minimum of two 3-D points per element -// -VECTORMATH_FORCE_INLINE const Point3 minPerElem( const Point3 &pnt0, const Point3 &pnt1 ); - -// Maximum element of a 3-D point -// -VECTORMATH_FORCE_INLINE const floatInVec maxElem( const Point3 &pnt ); - -// Minimum element of a 3-D point -// -VECTORMATH_FORCE_INLINE const floatInVec minElem( const Point3 &pnt ); - -// Compute the sum of all elements of a 3-D point -// -VECTORMATH_FORCE_INLINE const floatInVec sum( const Point3 &pnt ); - -// Apply uniform scale to a 3-D point -// -VECTORMATH_FORCE_INLINE const Point3 scale( const Point3 &pnt, float scaleVal ); - -// Apply uniform scale to a 3-D point (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Point3 scale( const Point3 &pnt, const floatInVec &scaleVal ); - -// Apply non-uniform scale to a 3-D point -// -VECTORMATH_FORCE_INLINE const Point3 scale( const Point3 &pnt, const Vector3 &scaleVec ); - -// Scalar projection of a 3-D point on a unit-length 3-D vector -// -VECTORMATH_FORCE_INLINE const floatInVec projection( const Point3 &pnt, const Vector3 &unitVec ); - -// Compute the square of the distance of a 3-D point from the coordinate-system origin -// -VECTORMATH_FORCE_INLINE const floatInVec distSqrFromOrigin( const Point3 &pnt ); - -// Compute the distance of a 3-D point from the coordinate-system origin -// -VECTORMATH_FORCE_INLINE const floatInVec distFromOrigin( const Point3 &pnt ); - -// Compute the square of the distance between two 3-D points -// -VECTORMATH_FORCE_INLINE const floatInVec distSqr( const Point3 &pnt0, const Point3 &pnt1 ); - -// Compute the distance between two 3-D points -// -VECTORMATH_FORCE_INLINE const floatInVec dist( const Point3 &pnt0, const Point3 &pnt1 ); - -// Linear interpolation between two 3-D points -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Point3 lerp( float t, const Point3 &pnt0, const Point3 &pnt1 ); - -// Linear interpolation between two 3-D points (scalar data contained in vector data type) -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Point3 lerp( const floatInVec &t, const Point3 &pnt0, const Point3 &pnt1 ); - -// Conditionally select between two 3-D points -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Point3 select( const Point3 &pnt0, const Point3 &pnt1, bool select1 ); - -// Conditionally select between two 3-D points (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Point3 select( const Point3 &pnt0, const Point3 &pnt1, const boolInVec &select1 ); - -// Store x, y, and z elements of 3-D point in first three words of a quadword, preserving fourth word -// -VECTORMATH_FORCE_INLINE void storeXYZ( const Point3 &pnt, __m128 * quad ); - -// Load four three-float 3-D points, stored in three quadwords -// -VECTORMATH_FORCE_INLINE void loadXYZArray( Point3 & pnt0, Point3 & pnt1, Point3 & pnt2, Point3 & pnt3, const __m128 * threeQuads ); - -// Store four 3-D points in three quadwords -// -VECTORMATH_FORCE_INLINE void storeXYZArray( const Point3 &pnt0, const Point3 &pnt1, const Point3 &pnt2, const Point3 &pnt3, __m128 * threeQuads ); - -// Store eight 3-D points as half-floats -// -VECTORMATH_FORCE_INLINE void storeHalfFloats( const Point3 &pnt0, const Point3 &pnt1, const Point3 &pnt2, const Point3 &pnt3, const Point3 &pnt4, const Point3 &pnt5, const Point3 &pnt6, const Point3 &pnt7, vec_ushort8 * threeQuads ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3-D point -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Point3 &pnt ); - -// Print a 3-D point and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Point3 &pnt, const char * name ); - -#endif - -// A quaternion in array-of-structures format -// -class Quat -{ - __m128 mVec128; - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Quat( ) { }; - - VECTORMATH_FORCE_INLINE Quat(const Quat& quat); - - // Construct a quaternion from x, y, z, and w elements - // - VECTORMATH_FORCE_INLINE Quat( float x, float y, float z, float w ); - - // Construct a quaternion from x, y, z, and w elements (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat( const floatInVec &x, const floatInVec &y, const floatInVec &z, const floatInVec &w ); - - // Construct a quaternion from a 3-D vector and a scalar - // - VECTORMATH_FORCE_INLINE Quat( const Vector3 &xyz, float w ); - - // Construct a quaternion from a 3-D vector and a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat( const Vector3 &xyz, const floatInVec &w ); - - // Copy elements from a 4-D vector into a quaternion - // - explicit VECTORMATH_FORCE_INLINE Quat( const Vector4 &vec ); - - // Convert a rotation matrix to a unit-length quaternion - // - explicit VECTORMATH_FORCE_INLINE Quat( const Matrix3 & rotMat ); - - // Set all elements of a quaternion to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Quat( float scalar ); - - // Set all elements of a quaternion to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Quat( const floatInVec &scalar ); - - // Set vector float data in a quaternion - // - explicit VECTORMATH_FORCE_INLINE Quat( __m128 vf4 ); - - // Get vector float data from a quaternion - // - VECTORMATH_FORCE_INLINE __m128 get128( ) const; - - // Set a quaterion from vector float data - // - VECTORMATH_FORCE_INLINE void set128(vec_float4 vec); - - // Assign one quaternion to another - // - VECTORMATH_FORCE_INLINE Quat & operator =( const Quat &quat ); - - // Set the x, y, and z elements of a quaternion - // NOTE: - // This function does not change the w element. - // - VECTORMATH_FORCE_INLINE Quat & setXYZ( const Vector3 &vec ); - - // Get the x, y, and z elements of a quaternion - // - VECTORMATH_FORCE_INLINE const Vector3 getXYZ( ) const; - - // Set the x element of a quaternion - // - VECTORMATH_FORCE_INLINE Quat & setX( float x ); - - // Set the y element of a quaternion - // - VECTORMATH_FORCE_INLINE Quat & setY( float y ); - - // Set the z element of a quaternion - // - VECTORMATH_FORCE_INLINE Quat & setZ( float z ); - - // Set the w element of a quaternion - // - VECTORMATH_FORCE_INLINE Quat & setW( float w ); - - // Set the x element of a quaternion (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & setX( const floatInVec &x ); - - // Set the y element of a quaternion (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & setY( const floatInVec &y ); - - // Set the z element of a quaternion (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & setZ( const floatInVec &z ); - - // Set the w element of a quaternion (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & setW( const floatInVec &w ); - - // Get the x element of a quaternion - // - VECTORMATH_FORCE_INLINE const floatInVec getX( ) const; - - // Get the y element of a quaternion - // - VECTORMATH_FORCE_INLINE const floatInVec getY( ) const; - - // Get the z element of a quaternion - // - VECTORMATH_FORCE_INLINE const floatInVec getZ( ) const; - - // Get the w element of a quaternion - // - VECTORMATH_FORCE_INLINE const floatInVec getW( ) const; - - // Set an x, y, z, or w element of a quaternion by index - // - VECTORMATH_FORCE_INLINE Quat & setElem( int idx, float value ); - - // Set an x, y, z, or w element of a quaternion by index (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & setElem( int idx, const floatInVec &value ); - - // Get an x, y, z, or w element of a quaternion by index - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int idx ) const; - - // Subscripting operator to set or get an element - // - VECTORMATH_FORCE_INLINE VecIdx operator []( int idx ); - - // Subscripting operator to get an element - // - VECTORMATH_FORCE_INLINE const floatInVec operator []( int idx ) const; - - // Add two quaternions - // - VECTORMATH_FORCE_INLINE const Quat operator +( const Quat &quat ) const; - - // Subtract a quaternion from another quaternion - // - VECTORMATH_FORCE_INLINE const Quat operator -( const Quat &quat ) const; - - // Multiply two quaternions - // - VECTORMATH_FORCE_INLINE const Quat operator *( const Quat &quat ) const; - - // Multiply a quaternion by a scalar - // - VECTORMATH_FORCE_INLINE const Quat operator *( float scalar ) const; - - // Divide a quaternion by a scalar - // - VECTORMATH_FORCE_INLINE const Quat operator /( float scalar ) const; - - // Multiply a quaternion by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Quat operator *( const floatInVec &scalar ) const; - - // Divide a quaternion by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Quat operator /( const floatInVec &scalar ) const; - - // Perform compound assignment and addition with a quaternion - // - VECTORMATH_FORCE_INLINE Quat & operator +=( const Quat &quat ); - - // Perform compound assignment and subtraction by a quaternion - // - VECTORMATH_FORCE_INLINE Quat & operator -=( const Quat &quat ); - - // Perform compound assignment and multiplication by a quaternion - // - VECTORMATH_FORCE_INLINE Quat & operator *=( const Quat &quat ); - - // Perform compound assignment and multiplication by a scalar - // - VECTORMATH_FORCE_INLINE Quat & operator *=( float scalar ); - - // Perform compound assignment and division by a scalar - // - VECTORMATH_FORCE_INLINE Quat & operator /=( float scalar ); - - // Perform compound assignment and multiplication by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & operator *=( const floatInVec &scalar ); - - // Perform compound assignment and division by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Quat & operator /=( const floatInVec &scalar ); - - // Negate all elements of a quaternion - // - VECTORMATH_FORCE_INLINE const Quat operator -( ) const; - - // Construct an identity quaternion - // - static VECTORMATH_FORCE_INLINE const Quat identity( ); - - // Construct a quaternion to rotate between two unit-length 3-D vectors - // NOTE: - // The result is unpredictable if unitVec0 and unitVec1 point in opposite directions. - // - static VECTORMATH_FORCE_INLINE const Quat rotation( const Vector3 &unitVec0, const Vector3 &unitVec1 ); - - // Construct a quaternion to rotate around a unit-length 3-D vector - // - static VECTORMATH_FORCE_INLINE const Quat rotation( float radians, const Vector3 &unitVec ); - - // Construct a quaternion to rotate around a unit-length 3-D vector (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Quat rotation( const floatInVec &radians, const Vector3 &unitVec ); - - // Construct a quaternion to rotate around the x axis - // - static VECTORMATH_FORCE_INLINE const Quat rotationX( float radians ); - - // Construct a quaternion to rotate around the y axis - // - static VECTORMATH_FORCE_INLINE const Quat rotationY( float radians ); - - // Construct a quaternion to rotate around the z axis - // - static VECTORMATH_FORCE_INLINE const Quat rotationZ( float radians ); - - // Construct a quaternion to rotate around the x axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Quat rotationX( const floatInVec &radians ); - - // Construct a quaternion to rotate around the y axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Quat rotationY( const floatInVec &radians ); - - // Construct a quaternion to rotate around the z axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Quat rotationZ( const floatInVec &radians ); - -}; - -// Multiply a quaternion by a scalar -// -VECTORMATH_FORCE_INLINE const Quat operator *( float scalar, const Quat &quat ); - -// Multiply a quaternion by a scalar (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Quat operator *( const floatInVec &scalar, const Quat &quat ); - -// Compute the conjugate of a quaternion -// -VECTORMATH_FORCE_INLINE const Quat conj( const Quat &quat ); - -// Use a unit-length quaternion to rotate a 3-D vector -// -VECTORMATH_FORCE_INLINE const Vector3 rotate( const Quat &unitQuat, const Vector3 &vec ); - -// Compute the dot product of two quaternions -// -VECTORMATH_FORCE_INLINE const floatInVec dot( const Quat &quat0, const Quat &quat1 ); - -// Compute the norm of a quaternion -// -VECTORMATH_FORCE_INLINE const floatInVec norm( const Quat &quat ); - -// Compute the length of a quaternion -// -VECTORMATH_FORCE_INLINE const floatInVec length( const Quat &quat ); - -// Normalize a quaternion -// NOTE: -// The result is unpredictable when all elements of quat are at or near zero. -// -VECTORMATH_FORCE_INLINE const Quat normalize( const Quat &quat ); - -// Linear interpolation between two quaternions -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Quat lerp( float t, const Quat &quat0, const Quat &quat1 ); - -// Linear interpolation between two quaternions (scalar data contained in vector data type) -// NOTE: -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Quat lerp( const floatInVec &t, const Quat &quat0, const Quat &quat1 ); - -// Spherical linear interpolation between two quaternions -// NOTE: -// Interpolates along the shortest path between orientations. -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Quat slerp( float t, const Quat &unitQuat0, const Quat &unitQuat1 ); - -// Spherical linear interpolation between two quaternions (scalar data contained in vector data type) -// NOTE: -// Interpolates along the shortest path between orientations. -// Does not clamp t between 0 and 1. -// -VECTORMATH_FORCE_INLINE const Quat slerp( const floatInVec &t, const Quat &unitQuat0, const Quat &unitQuat1 ); - -// Spherical quadrangle interpolation -// -VECTORMATH_FORCE_INLINE const Quat squad( float t, const Quat &unitQuat0, const Quat &unitQuat1, const Quat &unitQuat2, const Quat &unitQuat3 ); - -// Spherical quadrangle interpolation (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Quat squad( const floatInVec &t, const Quat &unitQuat0, const Quat &unitQuat1, const Quat &unitQuat2, const Quat &unitQuat3 ); - -// Conditionally select between two quaternions -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Quat select( const Quat &quat0, const Quat &quat1, bool select1 ); - -// Conditionally select between two quaternions (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Quat select( const Quat &quat0, const Quat &quat1, const boolInVec &select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a quaternion -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Quat &quat ); - -// Print a quaternion and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Quat &quat, const char * name ); - -#endif - -// A 3x3 matrix in array-of-structures format -// -class Matrix3 -{ - Vector3 mCol0; - Vector3 mCol1; - Vector3 mCol2; - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Matrix3( ) { }; - - // Copy a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3( const Matrix3 & mat ); - - // Construct a 3x3 matrix containing the specified columns - // - VECTORMATH_FORCE_INLINE Matrix3( const Vector3 &col0, const Vector3 &col1, const Vector3 &col2 ); - - // Construct a 3x3 rotation matrix from a unit-length quaternion - // - explicit VECTORMATH_FORCE_INLINE Matrix3( const Quat &unitQuat ); - - // Set all elements of a 3x3 matrix to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Matrix3( float scalar ); - - // Set all elements of a 3x3 matrix to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Matrix3( const floatInVec &scalar ); - - // Assign one 3x3 matrix to another - // - VECTORMATH_FORCE_INLINE Matrix3 & operator =( const Matrix3 & mat ); - - // Set column 0 of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3 & setCol0( const Vector3 &col0 ); - - // Set column 1 of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3 & setCol1( const Vector3 &col1 ); - - // Set column 2 of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3 & setCol2( const Vector3 &col2 ); - - // Get column 0 of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol0( ) const; - - // Get column 1 of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol1( ) const; - - // Get column 2 of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol2( ) const; - - // Set the column of a 3x3 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE Matrix3 & setCol( int col, const Vector3 &vec ); - - // Set the row of a 3x3 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE Matrix3 & setRow( int row, const Vector3 &vec ); - - // Get the column of a 3x3 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE const Vector3 getCol( int col ) const; - - // Get the row of a 3x3 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE const Vector3 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - VECTORMATH_FORCE_INLINE Vector3 & operator []( int col ); - - // Subscripting operator to get a column - // - VECTORMATH_FORCE_INLINE const Vector3 operator []( int col ) const; - - // Set the element of a 3x3 matrix referred to by column and row indices - // - VECTORMATH_FORCE_INLINE Matrix3 & setElem( int col, int row, float val ); - - // Set the element of a 3x3 matrix referred to by column and row indices (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Matrix3 & setElem( int col, int row, const floatInVec &val ); - - // Get the element of a 3x3 matrix referred to by column and row indices - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int col, int row ) const; - - // Add two 3x3 matrices - // - VECTORMATH_FORCE_INLINE const Matrix3 operator +( const Matrix3 & mat ) const; - - // Subtract a 3x3 matrix from another 3x3 matrix - // - VECTORMATH_FORCE_INLINE const Matrix3 operator -( const Matrix3 & mat ) const; - - // Negate all elements of a 3x3 matrix - // - VECTORMATH_FORCE_INLINE const Matrix3 operator -( ) const; - - // Multiply a 3x3 matrix by a scalar - // - VECTORMATH_FORCE_INLINE const Matrix3 operator *( float scalar ) const; - - // Multiply a 3x3 matrix by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Matrix3 operator *( const floatInVec &scalar ) const; - - // Multiply a 3x3 matrix by a 3-D vector - // - VECTORMATH_FORCE_INLINE const Vector3 operator *( const Vector3 &vec ) const; - - // Multiply two 3x3 matrices - // - VECTORMATH_FORCE_INLINE const Matrix3 operator *( const Matrix3 & mat ) const; - - // Perform compound assignment and addition with a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3 & operator +=( const Matrix3 & mat ); - - // Perform compound assignment and subtraction by a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3 & operator -=( const Matrix3 & mat ); - - // Perform compound assignment and multiplication by a scalar - // - VECTORMATH_FORCE_INLINE Matrix3 & operator *=( float scalar ); - - // Perform compound assignment and multiplication by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Matrix3 & operator *=( const floatInVec &scalar ); - - // Perform compound assignment and multiplication by a 3x3 matrix - // - VECTORMATH_FORCE_INLINE Matrix3 & operator *=( const Matrix3 & mat ); - - // Construct an identity 3x3 matrix - // - static VECTORMATH_FORCE_INLINE const Matrix3 identity( ); - - // Construct a 3x3 matrix to rotate around the x axis - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationX( float radians ); - - // Construct a 3x3 matrix to rotate around the y axis - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationY( float radians ); - - // Construct a 3x3 matrix to rotate around the z axis - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationZ( float radians ); - - // Construct a 3x3 matrix to rotate around the x axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationX( const floatInVec &radians ); - - // Construct a 3x3 matrix to rotate around the y axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationY( const floatInVec &radians ); - - // Construct a 3x3 matrix to rotate around the z axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationZ( const floatInVec &radians ); - - // Construct a 3x3 matrix to rotate around the x, y, and z axes - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotationZYX( const Vector3 &radiansXYZ ); - - // Construct a 3x3 matrix to rotate around a unit-length 3-D vector - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotation( float radians, const Vector3 &unitVec ); - - // Construct a 3x3 matrix to rotate around a unit-length 3-D vector (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotation( const floatInVec &radians, const Vector3 &unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static VECTORMATH_FORCE_INLINE const Matrix3 rotation( const Quat &unitQuat ); - - // Construct a 3x3 matrix to perform scaling - // - static VECTORMATH_FORCE_INLINE const Matrix3 scale( const Vector3 &scaleVec ); - -}; -// Multiply a 3x3 matrix by a scalar -// -VECTORMATH_FORCE_INLINE const Matrix3 operator *( float scalar, const Matrix3 & mat ); - -// Multiply a 3x3 matrix by a scalar (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Matrix3 operator *( const floatInVec &scalar, const Matrix3 & mat ); - -// Append (post-multiply) a scale transformation to a 3x3 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -VECTORMATH_FORCE_INLINE const Matrix3 appendScale( const Matrix3 & mat, const Vector3 &scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 3x3 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -VECTORMATH_FORCE_INLINE const Matrix3 prependScale( const Vector3 &scaleVec, const Matrix3 & mat ); - -// Multiply two 3x3 matrices per element -// -VECTORMATH_FORCE_INLINE const Matrix3 mulPerElem( const Matrix3 & mat0, const Matrix3 & mat1 ); - -// Compute the absolute value of a 3x3 matrix per element -// -VECTORMATH_FORCE_INLINE const Matrix3 absPerElem( const Matrix3 & mat ); - -// Transpose of a 3x3 matrix -// -VECTORMATH_FORCE_INLINE const Matrix3 transpose( const Matrix3 & mat ); - -// Compute the inverse of a 3x3 matrix -// NOTE: -// Result is unpredictable when the determinant of mat is equal to or near 0. -// -VECTORMATH_FORCE_INLINE const Matrix3 inverse( const Matrix3 & mat ); - -// Determinant of a 3x3 matrix -// -VECTORMATH_FORCE_INLINE const floatInVec determinant( const Matrix3 & mat ); - -// Conditionally select between two 3x3 matrices -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, bool select1 ); - -// Conditionally select between two 3x3 matrices (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Matrix3 select( const Matrix3 & mat0, const Matrix3 & mat1, const boolInVec &select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3x3 matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Matrix3 & mat ); - -// Print a 3x3 matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Matrix3 & mat, const char * name ); - -#endif - -// A 4x4 matrix in array-of-structures format -// -class Matrix4 -{ - Vector4 mCol0; - Vector4 mCol1; - Vector4 mCol2; - Vector4 mCol3; - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Matrix4( ) { }; - - // Copy a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4( const Matrix4 & mat ); - - // Construct a 4x4 matrix containing the specified columns - // - VECTORMATH_FORCE_INLINE Matrix4( const Vector4 &col0, const Vector4 &col1, const Vector4 &col2, const Vector4 &col3 ); - - // Construct a 4x4 matrix from a 3x4 transformation matrix - // - explicit VECTORMATH_FORCE_INLINE Matrix4( const Transform3 & mat ); - - // Construct a 4x4 matrix from a 3x3 matrix and a 3-D vector - // - VECTORMATH_FORCE_INLINE Matrix4( const Matrix3 & mat, const Vector3 &translateVec ); - - // Construct a 4x4 matrix from a unit-length quaternion and a 3-D vector - // - VECTORMATH_FORCE_INLINE Matrix4( const Quat &unitQuat, const Vector3 &translateVec ); - - // Set all elements of a 4x4 matrix to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Matrix4( float scalar ); - - // Set all elements of a 4x4 matrix to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Matrix4( const floatInVec &scalar ); - - // Assign one 4x4 matrix to another - // - VECTORMATH_FORCE_INLINE Matrix4 & operator =( const Matrix4 & mat ); - - // Set the upper-left 3x3 submatrix - // NOTE: - // This function does not change the bottom row elements. - // - VECTORMATH_FORCE_INLINE Matrix4 & setUpper3x3( const Matrix3 & mat3 ); - - // Get the upper-left 3x3 submatrix of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Matrix3 getUpper3x3( ) const; - - // Set translation component - // NOTE: - // This function does not change the bottom row elements. - // - VECTORMATH_FORCE_INLINE Matrix4 & setTranslation( const Vector3 &translateVec ); - - // Get the translation component of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getTranslation( ) const; - - // Set column 0 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & setCol0( const Vector4 &col0 ); - - // Set column 1 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & setCol1( const Vector4 &col1 ); - - // Set column 2 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & setCol2( const Vector4 &col2 ); - - // Set column 3 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & setCol3( const Vector4 &col3 ); - - // Get column 0 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Vector4 getCol0( ) const; - - // Get column 1 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Vector4 getCol1( ) const; - - // Get column 2 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Vector4 getCol2( ) const; - - // Get column 3 of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Vector4 getCol3( ) const; - - // Set the column of a 4x4 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE Matrix4 & setCol( int col, const Vector4 &vec ); - - // Set the row of a 4x4 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE Matrix4 & setRow( int row, const Vector4 &vec ); - - // Get the column of a 4x4 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE const Vector4 getCol( int col ) const; - - // Get the row of a 4x4 matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE const Vector4 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - VECTORMATH_FORCE_INLINE Vector4 & operator []( int col ); - - // Subscripting operator to get a column - // - VECTORMATH_FORCE_INLINE const Vector4 operator []( int col ) const; - - // Set the element of a 4x4 matrix referred to by column and row indices - // - VECTORMATH_FORCE_INLINE Matrix4 & setElem( int col, int row, float val ); - - // Set the element of a 4x4 matrix referred to by column and row indices (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Matrix4 & setElem( int col, int row, const floatInVec &val ); - - // Get the element of a 4x4 matrix referred to by column and row indices - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int col, int row ) const; - - // Add two 4x4 matrices - // - VECTORMATH_FORCE_INLINE const Matrix4 operator +( const Matrix4 & mat ) const; - - // Subtract a 4x4 matrix from another 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Matrix4 operator -( const Matrix4 & mat ) const; - - // Negate all elements of a 4x4 matrix - // - VECTORMATH_FORCE_INLINE const Matrix4 operator -( ) const; - - // Multiply a 4x4 matrix by a scalar - // - VECTORMATH_FORCE_INLINE const Matrix4 operator *( float scalar ) const; - - // Multiply a 4x4 matrix by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE const Matrix4 operator *( const floatInVec &scalar ) const; - - // Multiply a 4x4 matrix by a 4-D vector - // - VECTORMATH_FORCE_INLINE const Vector4 operator *( const Vector4 &vec ) const; - - // Multiply a 4x4 matrix by a 3-D vector - // - VECTORMATH_FORCE_INLINE const Vector4 operator *( const Vector3 &vec ) const; - - // Multiply a 4x4 matrix by a 3-D point - // - VECTORMATH_FORCE_INLINE const Vector4 operator *( const Point3 &pnt ) const; - - // Multiply two 4x4 matrices - // - VECTORMATH_FORCE_INLINE const Matrix4 operator *( const Matrix4 & mat ) const; - - // Multiply a 4x4 matrix by a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Matrix4 operator *( const Transform3 & tfrm ) const; - - // Perform compound assignment and addition with a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & operator +=( const Matrix4 & mat ); - - // Perform compound assignment and subtraction by a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & operator -=( const Matrix4 & mat ); - - // Perform compound assignment and multiplication by a scalar - // - VECTORMATH_FORCE_INLINE Matrix4 & operator *=( float scalar ); - - // Perform compound assignment and multiplication by a scalar (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Matrix4 & operator *=( const floatInVec &scalar ); - - // Perform compound assignment and multiplication by a 4x4 matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & operator *=( const Matrix4 & mat ); - - // Perform compound assignment and multiplication by a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Matrix4 & operator *=( const Transform3 & tfrm ); - - // Construct an identity 4x4 matrix - // - static VECTORMATH_FORCE_INLINE const Matrix4 identity( ); - - // Construct a 4x4 matrix to rotate around the x axis - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationX( float radians ); - - // Construct a 4x4 matrix to rotate around the y axis - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationY( float radians ); - - // Construct a 4x4 matrix to rotate around the z axis - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationZ( float radians ); - - // Construct a 4x4 matrix to rotate around the x axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationX( const floatInVec &radians ); - - // Construct a 4x4 matrix to rotate around the y axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationY( const floatInVec &radians ); - - // Construct a 4x4 matrix to rotate around the z axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationZ( const floatInVec &radians ); - - // Construct a 4x4 matrix to rotate around the x, y, and z axes - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotationZYX( const Vector3 &radiansXYZ ); - - // Construct a 4x4 matrix to rotate around a unit-length 3-D vector - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotation( float radians, const Vector3 &unitVec ); - - // Construct a 4x4 matrix to rotate around a unit-length 3-D vector (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotation( const floatInVec &radians, const Vector3 &unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static VECTORMATH_FORCE_INLINE const Matrix4 rotation( const Quat &unitQuat ); - - // Construct a 4x4 matrix to perform scaling - // - static VECTORMATH_FORCE_INLINE const Matrix4 scale( const Vector3 &scaleVec ); - - // Construct a 4x4 matrix to perform translation - // - static VECTORMATH_FORCE_INLINE const Matrix4 translation( const Vector3 &translateVec ); - - // Construct viewing matrix based on eye, position looked at, and up direction - // - static VECTORMATH_FORCE_INLINE const Matrix4 lookAt( const Point3 &eyePos, const Point3 &lookAtPos, const Vector3 &upVec ); - - // Construct a perspective projection matrix - // - static VECTORMATH_FORCE_INLINE const Matrix4 perspective( float fovyRadians, float aspect, float zNear, float zFar ); - - // Construct a perspective projection matrix based on frustum - // - static VECTORMATH_FORCE_INLINE const Matrix4 frustum( float left, float right, float bottom, float top, float zNear, float zFar ); - - // Construct an orthographic projection matrix - // - static VECTORMATH_FORCE_INLINE const Matrix4 orthographic( float left, float right, float bottom, float top, float zNear, float zFar ); - -}; -// Multiply a 4x4 matrix by a scalar -// -VECTORMATH_FORCE_INLINE const Matrix4 operator *( float scalar, const Matrix4 & mat ); - -// Multiply a 4x4 matrix by a scalar (scalar data contained in vector data type) -// -VECTORMATH_FORCE_INLINE const Matrix4 operator *( const floatInVec &scalar, const Matrix4 & mat ); - -// Append (post-multiply) a scale transformation to a 4x4 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -VECTORMATH_FORCE_INLINE const Matrix4 appendScale( const Matrix4 & mat, const Vector3 &scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 4x4 matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -VECTORMATH_FORCE_INLINE const Matrix4 prependScale( const Vector3 &scaleVec, const Matrix4 & mat ); - -// Multiply two 4x4 matrices per element -// -VECTORMATH_FORCE_INLINE const Matrix4 mulPerElem( const Matrix4 & mat0, const Matrix4 & mat1 ); - -// Compute the absolute value of a 4x4 matrix per element -// -VECTORMATH_FORCE_INLINE const Matrix4 absPerElem( const Matrix4 & mat ); - -// Transpose of a 4x4 matrix -// -VECTORMATH_FORCE_INLINE const Matrix4 transpose( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix -// NOTE: -// Result is unpredictable when the determinant of mat is equal to or near 0. -// -VECTORMATH_FORCE_INLINE const Matrix4 inverse( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix, which is expected to be an affine matrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 4x4 matrix meets the given restrictions. The result is unpredictable when the determinant of mat is equal to or near 0. -// -VECTORMATH_FORCE_INLINE const Matrix4 affineInverse( const Matrix4 & mat ); - -// Compute the inverse of a 4x4 matrix, which is expected to be an affine matrix with an orthogonal upper-left 3x3 submatrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 4x4 matrix meets the given restrictions. -// -VECTORMATH_FORCE_INLINE const Matrix4 orthoInverse( const Matrix4 & mat ); - -// Determinant of a 4x4 matrix -// -VECTORMATH_FORCE_INLINE const floatInVec determinant( const Matrix4 & mat ); - -// Conditionally select between two 4x4 matrices -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, bool select1 ); - -// Conditionally select between two 4x4 matrices (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Matrix4 select( const Matrix4 & mat0, const Matrix4 & mat1, const boolInVec &select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 4x4 matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Matrix4 & mat ); - -// Print a 4x4 matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Matrix4 & mat, const char * name ); - -#endif - -// A 3x4 transformation matrix in array-of-structures format -// -class Transform3 -{ - Vector3 mCol0; - Vector3 mCol1; - Vector3 mCol2; - Vector3 mCol3; - -public: - // Default constructor; does no initialization - // - VECTORMATH_FORCE_INLINE Transform3( ) { }; - - // Copy a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Transform3( const Transform3 & tfrm ); - - // Construct a 3x4 transformation matrix containing the specified columns - // - VECTORMATH_FORCE_INLINE Transform3( const Vector3 &col0, const Vector3 &col1, const Vector3 &col2, const Vector3 &col3 ); - - // Construct a 3x4 transformation matrix from a 3x3 matrix and a 3-D vector - // - VECTORMATH_FORCE_INLINE Transform3( const Matrix3 & tfrm, const Vector3 &translateVec ); - - // Construct a 3x4 transformation matrix from a unit-length quaternion and a 3-D vector - // - VECTORMATH_FORCE_INLINE Transform3( const Quat &unitQuat, const Vector3 &translateVec ); - - // Set all elements of a 3x4 transformation matrix to the same scalar value - // - explicit VECTORMATH_FORCE_INLINE Transform3( float scalar ); - - // Set all elements of a 3x4 transformation matrix to the same scalar value (scalar data contained in vector data type) - // - explicit VECTORMATH_FORCE_INLINE Transform3( const floatInVec &scalar ); - - // Assign one 3x4 transformation matrix to another - // - VECTORMATH_FORCE_INLINE Transform3 & operator =( const Transform3 & tfrm ); - - // Set the upper-left 3x3 submatrix - // - VECTORMATH_FORCE_INLINE Transform3 & setUpper3x3( const Matrix3 & mat3 ); - - // Get the upper-left 3x3 submatrix of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Matrix3 getUpper3x3( ) const; - - // Set translation component - // - VECTORMATH_FORCE_INLINE Transform3 & setTranslation( const Vector3 &translateVec ); - - // Get the translation component of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getTranslation( ) const; - - // Set column 0 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Transform3 & setCol0( const Vector3 &col0 ); - - // Set column 1 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Transform3 & setCol1( const Vector3 &col1 ); - - // Set column 2 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Transform3 & setCol2( const Vector3 &col2 ); - - // Set column 3 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Transform3 & setCol3( const Vector3 &col3 ); - - // Get column 0 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol0( ) const; - - // Get column 1 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol1( ) const; - - // Get column 2 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol2( ) const; - - // Get column 3 of a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE const Vector3 getCol3( ) const; - - // Set the column of a 3x4 transformation matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE Transform3 & setCol( int col, const Vector3 &vec ); - - // Set the row of a 3x4 transformation matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE Transform3 & setRow( int row, const Vector4 &vec ); - - // Get the column of a 3x4 transformation matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE const Vector3 getCol( int col ) const; - - // Get the row of a 3x4 transformation matrix referred to by the specified index - // - VECTORMATH_FORCE_INLINE const Vector4 getRow( int row ) const; - - // Subscripting operator to set or get a column - // - VECTORMATH_FORCE_INLINE Vector3 & operator []( int col ); - - // Subscripting operator to get a column - // - VECTORMATH_FORCE_INLINE const Vector3 operator []( int col ) const; - - // Set the element of a 3x4 transformation matrix referred to by column and row indices - // - VECTORMATH_FORCE_INLINE Transform3 & setElem( int col, int row, float val ); - - // Set the element of a 3x4 transformation matrix referred to by column and row indices (scalar data contained in vector data type) - // - VECTORMATH_FORCE_INLINE Transform3 & setElem( int col, int row, const floatInVec &val ); - - // Get the element of a 3x4 transformation matrix referred to by column and row indices - // - VECTORMATH_FORCE_INLINE const floatInVec getElem( int col, int row ) const; - - // Multiply a 3x4 transformation matrix by a 3-D vector - // - VECTORMATH_FORCE_INLINE const Vector3 operator *( const Vector3 &vec ) const; - - // Multiply a 3x4 transformation matrix by a 3-D point - // - VECTORMATH_FORCE_INLINE const Point3 operator *( const Point3 &pnt ) const; - - // Multiply two 3x4 transformation matrices - // - VECTORMATH_FORCE_INLINE const Transform3 operator *( const Transform3 & tfrm ) const; - - // Perform compound assignment and multiplication by a 3x4 transformation matrix - // - VECTORMATH_FORCE_INLINE Transform3 & operator *=( const Transform3 & tfrm ); - - // Construct an identity 3x4 transformation matrix - // - static VECTORMATH_FORCE_INLINE const Transform3 identity( ); - - // Construct a 3x4 transformation matrix to rotate around the x axis - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationX( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the y axis - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationY( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the z axis - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationZ( float radians ); - - // Construct a 3x4 transformation matrix to rotate around the x axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationX( const floatInVec &radians ); - - // Construct a 3x4 transformation matrix to rotate around the y axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationY( const floatInVec &radians ); - - // Construct a 3x4 transformation matrix to rotate around the z axis (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationZ( const floatInVec &radians ); - - // Construct a 3x4 transformation matrix to rotate around the x, y, and z axes - // - static VECTORMATH_FORCE_INLINE const Transform3 rotationZYX( const Vector3 &radiansXYZ ); - - // Construct a 3x4 transformation matrix to rotate around a unit-length 3-D vector - // - static VECTORMATH_FORCE_INLINE const Transform3 rotation( float radians, const Vector3 &unitVec ); - - // Construct a 3x4 transformation matrix to rotate around a unit-length 3-D vector (scalar data contained in vector data type) - // - static VECTORMATH_FORCE_INLINE const Transform3 rotation( const floatInVec &radians, const Vector3 &unitVec ); - - // Construct a rotation matrix from a unit-length quaternion - // - static VECTORMATH_FORCE_INLINE const Transform3 rotation( const Quat &unitQuat ); - - // Construct a 3x4 transformation matrix to perform scaling - // - static VECTORMATH_FORCE_INLINE const Transform3 scale( const Vector3 &scaleVec ); - - // Construct a 3x4 transformation matrix to perform translation - // - static VECTORMATH_FORCE_INLINE const Transform3 translation( const Vector3 &translateVec ); - -}; -// Append (post-multiply) a scale transformation to a 3x4 transformation matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -VECTORMATH_FORCE_INLINE const Transform3 appendScale( const Transform3 & tfrm, const Vector3 &scaleVec ); - -// Prepend (pre-multiply) a scale transformation to a 3x4 transformation matrix -// NOTE: -// Faster than creating and multiplying a scale transformation matrix. -// -VECTORMATH_FORCE_INLINE const Transform3 prependScale( const Vector3 &scaleVec, const Transform3 & tfrm ); - -// Multiply two 3x4 transformation matrices per element -// -VECTORMATH_FORCE_INLINE const Transform3 mulPerElem( const Transform3 & tfrm0, const Transform3 & tfrm1 ); - -// Compute the absolute value of a 3x4 transformation matrix per element -// -VECTORMATH_FORCE_INLINE const Transform3 absPerElem( const Transform3 & tfrm ); - -// Inverse of a 3x4 transformation matrix -// NOTE: -// Result is unpredictable when the determinant of the left 3x3 submatrix is equal to or near 0. -// -VECTORMATH_FORCE_INLINE const Transform3 inverse( const Transform3 & tfrm ); - -// Compute the inverse of a 3x4 transformation matrix, expected to have an orthogonal upper-left 3x3 submatrix -// NOTE: -// This can be used to achieve better performance than a general inverse when the specified 3x4 transformation matrix meets the given restrictions. -// -VECTORMATH_FORCE_INLINE const Transform3 orthoInverse( const Transform3 & tfrm ); - -// Conditionally select between two 3x4 transformation matrices -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// However, the transfer of select1 to a VMX register may use more processing time than a branch. -// Use the boolInVec version for better performance. -// -VECTORMATH_FORCE_INLINE const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, bool select1 ); - -// Conditionally select between two 3x4 transformation matrices (scalar data contained in vector data type) -// NOTE: -// This function uses a conditional select instruction to avoid a branch. -// -VECTORMATH_FORCE_INLINE const Transform3 select( const Transform3 & tfrm0, const Transform3 & tfrm1, const boolInVec &select1 ); - -#ifdef _VECTORMATH_DEBUG - -// Print a 3x4 transformation matrix -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Transform3 & tfrm ); - -// Print a 3x4 transformation matrix and an associated string identifier -// NOTE: -// Function is only defined when _VECTORMATH_DEBUG is defined. -// -VECTORMATH_FORCE_INLINE void print( const Transform3 & tfrm, const char * name ); - -#endif - -} // namespace Aos -} // namespace Vectormath - -#include "vec_aos.h" -#include "quat_aos.h" -#include "mat_aos.h" - -#endif diff --git a/Engine/lib/bullet/src/vectormath/vmInclude.h b/Engine/lib/bullet/src/vectormath/vmInclude.h deleted file mode 100644 index 656514e42..000000000 --- a/Engine/lib/bullet/src/vectormath/vmInclude.h +++ /dev/null @@ -1,31 +0,0 @@ - -#ifndef __VM_INCLUDE_H -#define __VM_INCLUDE_H - -#include "LinearMath/btScalar.h" - -#if defined (USE_SYSTEM_VECTORMATH) || defined (__CELLOS_LV2__) - #include -#else //(USE_SYSTEM_VECTORMATH) - #if defined (BT_USE_SSE) - #include "sse/vectormath_aos.h" - #else //all other platforms - #if defined (BT_USE_NEON) - #include "neon/vectormath_aos.h" - #else - #include "scalar/vectormath_aos.h" - #endif - #endif //(BT_USE_SSE) && defined (_WIN32) -#endif //(USE_SYSTEM_VECTORMATH) - - - -typedef Vectormath::Aos::Vector3 vmVector3; -typedef Vectormath::Aos::Quat vmQuat; -typedef Vectormath::Aos::Matrix3 vmMatrix3; -typedef Vectormath::Aos::Transform3 vmTransform3; -typedef Vectormath::Aos::Point3 vmPoint3; - -#endif //__VM_INCLUDE_H - - diff --git a/Engine/lib/libvorbis/CHANGES b/Engine/lib/libvorbis/CHANGES index 385e4984f..d566f3f37 100644 --- a/Engine/lib/libvorbis/CHANGES +++ b/Engine/lib/libvorbis/CHANGES @@ -1,3 +1,18 @@ +libvorbis 1.3.5 (unreleased) -- "Xiph.Org libVorbis I 20150105 (⛄⛄⛄⛄)" + +* Tolerate single-entry codebooks. +* Fix decoder crash with invalid input. +* Fix encoder crash with non-positive sample rates. +# Fix issues in vorbisfile's seek bisection code. +* Spec errata. +* Reject multiple headers of the same type. +* Various build fixes and code cleanup. + +libvorbis 1.3.4 (2014-01-22) -- "Xiph.Org libVorbis I 20140122 (Turpakäräjiin)" + +* Reduce codebook footprint in library code. +* Various build and documentation fixes. + libvorbis 1.3.3 (2012-02-03) -- "Xiph.Org libVorbis I 20120203 (Omnipresent)" * vorbis: additional proofing against invalid/malicious diff --git a/Engine/lib/libvorbis/lib/block.c b/Engine/lib/libvorbis/lib/block.c index eee9abfca..345c04276 100644 --- a/Engine/lib/libvorbis/lib/block.c +++ b/Engine/lib/libvorbis/lib/block.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: PCM data vector blocking, windowing and dis/reassembly - last mod: $Id: block.c 17561 2010-10-23 10:34:24Z xiphmont $ + last mod: $Id: block.c 19457 2015-03-03 00:15:29Z giles $ Handle windowing, overlap-add, etc of the PCM vectors. This is made more amusing by Vorbis' current two allowed block sizes. @@ -31,16 +31,6 @@ #include "registry.h" #include "misc.h" -static int ilog2(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - /* pcm accumulator examples (not exhaustive): <-------------- lW ----------------> @@ -184,14 +174,19 @@ static int _vds_shared_init(vorbis_dsp_state *v,vorbis_info *vi,int encp){ private_state *b=NULL; int hs; - if(ci==NULL) return 1; + if(ci==NULL|| + ci->modes<=0|| + ci->blocksizes[0]<64|| + ci->blocksizes[1]blocksizes[0]){ + return 1; + } hs=ci->halfrate_flag; memset(v,0,sizeof(*v)); b=v->backend_state=_ogg_calloc(1,sizeof(*b)); v->vi=vi; - b->modebits=ilog2(ci->modes); + b->modebits=ov_ilog(ci->modes-1); b->transform[0]=_ogg_calloc(VI_TRANSFORMB,sizeof(*b->transform[0])); b->transform[1]=_ogg_calloc(VI_TRANSFORMB,sizeof(*b->transform[1])); @@ -204,8 +199,14 @@ static int _vds_shared_init(vorbis_dsp_state *v,vorbis_info *vi,int encp){ mdct_init(b->transform[1][0],ci->blocksizes[1]>>hs); /* Vorbis I uses only window type 0 */ - b->window[0]=ilog2(ci->blocksizes[0])-6; - b->window[1]=ilog2(ci->blocksizes[1])-6; + /* note that the correct computation below is technically: + b->window[0]=ov_ilog(ci->blocksizes[0]-1)-6; + b->window[1]=ov_ilog(ci->blocksizes[1]-1)-6; + but since blocksizes are always powers of two, + the below is equivalent. + */ + b->window[0]=ov_ilog(ci->blocksizes[0])-7; + b->window[1]=ov_ilog(ci->blocksizes[1])-7; if(encp){ /* encode/decode differ here */ @@ -771,14 +772,14 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ if(v->lW){ if(v->W){ /* large/large */ - float *w=_vorbis_window_get(b->window[1]-hs); + const float *w=_vorbis_window_get(b->window[1]-hs); float *pcm=v->pcm[j]+prevCenter; float *p=vb->pcm[j]; for(i=0;iwindow[0]-hs); + const float *w=_vorbis_window_get(b->window[0]-hs); float *pcm=v->pcm[j]+prevCenter+n1/2-n0/2; float *p=vb->pcm[j]; for(i=0;iW){ /* small/large */ - float *w=_vorbis_window_get(b->window[0]-hs); + const float *w=_vorbis_window_get(b->window[0]-hs); float *pcm=v->pcm[j]+prevCenter; float *p=vb->pcm[j]+n1/2-n0/2; for(i=0;iwindow[0]-hs); + const float *w=_vorbis_window_get(b->window[0]-hs); float *pcm=v->pcm[j]+prevCenter; float *p=vb->pcm[j]; for(i=0;ivi; codec_setup_info *ci=vi->codec_setup; int hs=ci->halfrate_flag; diff --git a/Engine/lib/libvorbis/lib/books/coupled/res_books_51.h b/Engine/lib/libvorbis/lib/books/coupled/res_books_51.h index 917a95583..93910ff48 100644 --- a/Engine/lib/libvorbis/lib/books/coupled/res_books_51.h +++ b/Engine/lib/libvorbis/lib/books/coupled/res_books_51.h @@ -1,3 +1,20 @@ +/******************************************************************** + * * + * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * + * * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010 * + * by the Xiph.Org Foundation http://www.xiph.org/ * + * * + ******************************************************************** + * + * function: static codebooks for 5.1 surround + * last modified: $Id: res_books_51.h 19057 2014-01-22 12:32:31Z xiphmont $ + * + ********************************************************************/ + static const long _vq_quantlist__44p0_l0_0[] = { 6, 5, @@ -14,7 +31,7 @@ static const long _vq_quantlist__44p0_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p0_l0_0[] = { +static const char _vq_lengthlist__44p0_l0_0[] = { 1, 3, 4, 7, 7, 8, 8, 9, 9, 9,10,10,10, 5, 6, 5, 8, 7, 9, 8, 9, 9,10, 9,11,10, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, 8, 9, 8,10, 9,10, 9,10, 9, @@ -30,7 +47,7 @@ static const long _vq_lengthlist__44p0_l0_0[] = { static const static_codebook _44p0_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p0_l0_0, + (char *)_vq_lengthlist__44p0_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p0_l0_0, 0 @@ -44,14 +61,14 @@ static const long _vq_quantlist__44p0_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p0_l0_1[] = { +static const char _vq_lengthlist__44p0_l0_1[] = { 1, 4, 4, 6, 6, 5, 5, 5, 7, 5, 5, 5, 5, 6, 7, 7, 6, 7, 7, 7, 6, 7, 7, 7, 7, }; static const static_codebook _44p0_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p0_l0_1, + (char *)_vq_lengthlist__44p0_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p0_l0_1, 0 @@ -63,31 +80,31 @@ static const long _vq_quantlist__44p0_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p0_l1_0[] = { +static const char _vq_lengthlist__44p0_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p0_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p0_l1_0, + (char *)_vq_lengthlist__44p0_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p0_l1_0, 0 }; -static const long _huff_lengthlist__44p0_lfe[] = { +static const char _huff_lengthlist__44p0_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p0_lfe = { 2, 4, - (long *)_huff_lengthlist__44p0_lfe, + (char *)_huff_lengthlist__44p0_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p0_long[] = { +static const char _huff_lengthlist__44p0_long[] = { 2, 3, 6, 7,10,14,16, 3, 2, 5, 7,11,14,17, 6, 5, 5, 7,10,12,14, 7, 7, 6, 6, 7, 9,13,10,11, 9, 6, 6, 9,11,15,15,13,10, 9,10,12,18,18,16,14,12,13, @@ -96,7 +113,7 @@ static const long _huff_lengthlist__44p0_long[] = { static const static_codebook _huff_book__44p0_long = { 2, 49, - (long *)_huff_lengthlist__44p0_long, + (char *)_huff_lengthlist__44p0_long, 0, 0, 0, 0, 0, NULL, 0 @@ -108,7 +125,7 @@ static const long _vq_quantlist__44p0_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p1_0[] = { +static const char _vq_lengthlist__44p0_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -129,7 +146,7 @@ static const long _vq_lengthlist__44p0_p1_0[] = { static const static_codebook _44p0_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p1_0, + (char *)_vq_lengthlist__44p0_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p0_p1_0, 0 @@ -141,7 +158,7 @@ static const long _vq_quantlist__44p0_p2_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p2_0[] = { +static const char _vq_lengthlist__44p0_p2_0[] = { 1, 5, 5, 0, 7, 7, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 6, 6, 0,11, 11, 0,12,12, 0,12,12, 0,15,15, 0,11,11, 0,12,12, @@ -162,7 +179,7 @@ static const long _vq_lengthlist__44p0_p2_0[] = { static const static_codebook _44p0_p2_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p2_0, + (char *)_vq_lengthlist__44p0_p2_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p0_p2_0, 0 @@ -174,7 +191,7 @@ static const long _vq_quantlist__44p0_p2_1[] = { 2, }; -static const long _vq_lengthlist__44p0_p2_1[] = { +static const char _vq_lengthlist__44p0_p2_1[] = { 1, 3, 3, 0, 9, 9, 0, 9, 9, 0,10,10, 0, 9, 9, 0, 10,10, 0,10,10, 0, 9, 9, 0,10,10, 0, 7, 7, 0, 7, 7, 0, 6, 6, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 9, @@ -195,7 +212,7 @@ static const long _vq_lengthlist__44p0_p2_1[] = { static const static_codebook _44p0_p2_1 = { 5, 243, - (long *)_vq_lengthlist__44p0_p2_1, + (char *)_vq_lengthlist__44p0_p2_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p0_p2_1, 0 @@ -207,7 +224,7 @@ static const long _vq_quantlist__44p0_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p3_0[] = { +static const char _vq_lengthlist__44p0_p3_0[] = { 1, 6, 6, 7, 8, 8, 7, 8, 8, 7, 9, 9,10,12,11, 9, 8, 8, 7, 9, 9,11,12,12, 9, 9, 9, 6, 7, 7,10,11, 11,10,11,11,10,11,11,13,13,14,12,12,12,11,11,11, @@ -228,7 +245,7 @@ static const long _vq_lengthlist__44p0_p3_0[] = { static const static_codebook _44p0_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p3_0, + (char *)_vq_lengthlist__44p0_p3_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p0_p3_0, 0 @@ -242,7 +259,7 @@ static const long _vq_quantlist__44p0_p3_1[] = { 4, }; -static const long _vq_lengthlist__44p0_p3_1[] = { +static const char _vq_lengthlist__44p0_p3_1[] = { 2, 4, 4, 8, 8,10,12,12,11,11, 9,11,11,12,13,11, 12,12,11,11,11,12,12,12,12,10,13,12,13,13,11,12, 12,13,13,11,12,12,13,13,11,12,13,13,13,11,13,13, @@ -443,7 +460,7 @@ static const long _vq_lengthlist__44p0_p3_1[] = { static const static_codebook _44p0_p3_1 = { 5, 3125, - (long *)_vq_lengthlist__44p0_p3_1, + (char *)_vq_lengthlist__44p0_p3_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p0_p3_1, 0 @@ -457,7 +474,7 @@ static const long _vq_quantlist__44p0_p4_0[] = { 4, }; -static const long _vq_lengthlist__44p0_p4_0[] = { +static const char _vq_lengthlist__44p0_p4_0[] = { 2, 6, 6,14,14, 6, 8, 8,14,14, 7, 7, 7,14,14, 0, 13,13,15,16, 0,13,13,15,15, 7, 8, 8,15,15, 9,10, 10,16,16, 9, 8, 8,14,15, 0,13,13,17,17, 0,13,13, @@ -658,7 +675,7 @@ static const long _vq_lengthlist__44p0_p4_0[] = { static const static_codebook _44p0_p4_0 = { 5, 3125, - (long *)_vq_lengthlist__44p0_p4_0, + (char *)_vq_lengthlist__44p0_p4_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p0_p4_0, 0 @@ -674,13 +691,13 @@ static const long _vq_quantlist__44p0_p4_1[] = { 6, }; -static const long _vq_lengthlist__44p0_p4_1[] = { +static const char _vq_lengthlist__44p0_p4_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p0_p4_1 = { 1, 7, - (long *)_vq_lengthlist__44p0_p4_1, + (char *)_vq_lengthlist__44p0_p4_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p0_p4_1, 0 @@ -692,7 +709,7 @@ static const long _vq_quantlist__44p0_p5_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p5_0[] = { +static const char _vq_lengthlist__44p0_p5_0[] = { 1, 6, 6, 6, 8, 8, 7, 8, 8, 7, 9, 8,10,11,11, 9, 8, 8, 7, 8, 8,11,11,11, 9, 8, 8, 6, 7, 7,10,10, 10,10,10,10,10,10,10,14,13,13,12,11,11,10,10,10, @@ -713,7 +730,7 @@ static const long _vq_lengthlist__44p0_p5_0[] = { static const static_codebook _44p0_p5_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p5_0, + (char *)_vq_lengthlist__44p0_p5_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p0_p5_0, 0 @@ -725,7 +742,7 @@ static const long _vq_quantlist__44p0_p5_1[] = { 2, }; -static const long _vq_lengthlist__44p0_p5_1[] = { +static const char _vq_lengthlist__44p0_p5_1[] = { 2, 7, 7, 7, 8, 8, 7, 7, 7, 7, 8, 8, 8, 8, 9, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 7, 7, 6, 6, 6, 9, 7, 7, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -746,7 +763,7 @@ static const long _vq_lengthlist__44p0_p5_1[] = { static const static_codebook _44p0_p5_1 = { 5, 243, - (long *)_vq_lengthlist__44p0_p5_1, + (char *)_vq_lengthlist__44p0_p5_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p0_p5_1, 0 @@ -758,7 +775,7 @@ static const long _vq_quantlist__44p0_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p6_0[] = { +static const char _vq_lengthlist__44p0_p6_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -779,7 +796,7 @@ static const long _vq_lengthlist__44p0_p6_0[] = { static const static_codebook _44p0_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p6_0, + (char *)_vq_lengthlist__44p0_p6_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p0_p6_0, 0 @@ -813,14 +830,14 @@ static const long _vq_quantlist__44p0_p6_1[] = { 24, }; -static const long _vq_lengthlist__44p0_p6_1[] = { +static const char _vq_lengthlist__44p0_p6_1[] = { 1, 3, 2, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, 11,12,12,12,14,14,14,15,15, }; static const static_codebook _44p0_p6_1 = { 1, 25, - (long *)_vq_lengthlist__44p0_p6_1, + (char *)_vq_lengthlist__44p0_p6_1, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p0_p6_1, 0 @@ -854,20 +871,20 @@ static const long _vq_quantlist__44p0_p6_2[] = { 24, }; -static const long _vq_lengthlist__44p0_p6_2[] = { +static const char _vq_lengthlist__44p0_p6_2[] = { 3, 4, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p0_p6_2 = { 1, 25, - (long *)_vq_lengthlist__44p0_p6_2, + (char *)_vq_lengthlist__44p0_p6_2, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p0_p6_2, 0 }; -static const long _huff_lengthlist__44p0_short[] = { +static const char _huff_lengthlist__44p0_short[] = { 3, 3, 7, 8,10,13,16, 3, 2, 5, 7, 9,13,16, 6, 4, 4, 6,10,14,15, 7, 5, 5, 7,10,13,14, 9, 8, 9, 9, 9,11,13,12,11,12, 9, 7, 8,11,14,12,10, 6, 5, 7, @@ -876,7 +893,7 @@ static const long _huff_lengthlist__44p0_short[] = { static const static_codebook _huff_book__44p0_short = { 2, 49, - (long *)_huff_lengthlist__44p0_short, + (char *)_huff_lengthlist__44p0_short, 0, 0, 0, 0, 0, NULL, 0 @@ -898,7 +915,7 @@ static const long _vq_quantlist__44p1_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p1_l0_0[] = { +static const char _vq_lengthlist__44p1_l0_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 4, 6, 5, 8, 6, 9, 8,10, 9,10,10,11,10, 5, 5, 6, 6, 8, 8, 9, 9,10,10,10,10,11, 7, 8, 8, 9, 8,10, 9,10, 9, @@ -914,7 +931,7 @@ static const long _vq_lengthlist__44p1_l0_0[] = { static const static_codebook _44p1_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p1_l0_0, + (char *)_vq_lengthlist__44p1_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p1_l0_0, 0 @@ -928,14 +945,14 @@ static const long _vq_quantlist__44p1_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p1_l0_1[] = { +static const char _vq_lengthlist__44p1_l0_1[] = { 1, 4, 4, 6, 6, 5, 5, 5, 6, 6, 5, 6, 5, 6, 6, 6, 6, 7, 7, 7, 6, 7, 6, 7, 7, }; static const static_codebook _44p1_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p1_l0_1, + (char *)_vq_lengthlist__44p1_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p1_l0_1, 0 @@ -947,31 +964,31 @@ static const long _vq_quantlist__44p1_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p1_l1_0[] = { +static const char _vq_lengthlist__44p1_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p1_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p1_l1_0, + (char *)_vq_lengthlist__44p1_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p1_l1_0, 0 }; -static const long _huff_lengthlist__44p1_lfe[] = { +static const char _huff_lengthlist__44p1_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p1_lfe = { 2, 4, - (long *)_huff_lengthlist__44p1_lfe, + (char *)_huff_lengthlist__44p1_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p1_long[] = { +static const char _huff_lengthlist__44p1_long[] = { 3, 3, 7, 7, 9,13,16, 3, 2, 4, 6,10,13,17, 7, 4, 4, 6, 9,12,14, 7, 6, 6, 5, 7, 9,12,10,10, 9, 6, 6, 9,12,14,14,13, 9, 8,10,11,18,18,15,13,11,10, @@ -980,7 +997,7 @@ static const long _huff_lengthlist__44p1_long[] = { static const static_codebook _huff_book__44p1_long = { 2, 49, - (long *)_huff_lengthlist__44p1_long, + (char *)_huff_lengthlist__44p1_long, 0, 0, 0, 0, 0, NULL, 0 @@ -992,7 +1009,7 @@ static const long _vq_quantlist__44p1_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p1_0[] = { +static const char _vq_lengthlist__44p1_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1013,7 +1030,7 @@ static const long _vq_lengthlist__44p1_p1_0[] = { static const static_codebook _44p1_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p1_0, + (char *)_vq_lengthlist__44p1_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p1_p1_0, 0 @@ -1025,7 +1042,7 @@ static const long _vq_quantlist__44p1_p2_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p2_0[] = { +static const char _vq_lengthlist__44p1_p2_0[] = { 1, 4, 4, 0, 7, 7, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 6, 6, 0,11, 11, 0,11,11, 0,12,12, 0,14,14, 0,11,11, 0,12,12, @@ -1046,7 +1063,7 @@ static const long _vq_lengthlist__44p1_p2_0[] = { static const static_codebook _44p1_p2_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p2_0, + (char *)_vq_lengthlist__44p1_p2_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p1_p2_0, 0 @@ -1058,7 +1075,7 @@ static const long _vq_quantlist__44p1_p2_1[] = { 2, }; -static const long _vq_lengthlist__44p1_p2_1[] = { +static const char _vq_lengthlist__44p1_p2_1[] = { 1, 3, 3, 0, 8, 8, 0, 8, 8, 0,10,10, 0, 9, 9, 0, 10,10, 0,10,10, 0, 9, 9, 0,10,10, 0, 7, 7, 0, 7, 7, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 9, 9, @@ -1079,7 +1096,7 @@ static const long _vq_lengthlist__44p1_p2_1[] = { static const static_codebook _44p1_p2_1 = { 5, 243, - (long *)_vq_lengthlist__44p1_p2_1, + (char *)_vq_lengthlist__44p1_p2_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p1_p2_1, 0 @@ -1091,7 +1108,7 @@ static const long _vq_quantlist__44p1_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p3_0[] = { +static const char _vq_lengthlist__44p1_p3_0[] = { 1, 6, 6, 6, 7, 7, 7, 8, 8, 7, 8, 8,10,11,11, 9, 8, 8, 7, 9, 9,11,12,12, 9, 8, 8, 6, 7, 7, 9,11, 11,10,11,11,10,11,11,13,13,13,11,12,12,10,11,11, @@ -1112,7 +1129,7 @@ static const long _vq_lengthlist__44p1_p3_0[] = { static const static_codebook _44p1_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p3_0, + (char *)_vq_lengthlist__44p1_p3_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p1_p3_0, 0 @@ -1126,7 +1143,7 @@ static const long _vq_quantlist__44p1_p3_1[] = { 4, }; -static const long _vq_lengthlist__44p1_p3_1[] = { +static const char _vq_lengthlist__44p1_p3_1[] = { 2, 3, 4, 7, 7,10,12,12,12,12,10,11,11,13,13,11, 12,12,11,11,12,12,12,12,12,11,13,13,13,13,12,12, 12,13,14,12,13,13,13,13,12,13,13,13,13,12,13,13, @@ -1327,7 +1344,7 @@ static const long _vq_lengthlist__44p1_p3_1[] = { static const static_codebook _44p1_p3_1 = { 5, 3125, - (long *)_vq_lengthlist__44p1_p3_1, + (char *)_vq_lengthlist__44p1_p3_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p1_p3_1, 0 @@ -1341,7 +1358,7 @@ static const long _vq_quantlist__44p1_p4_0[] = { 4, }; -static const long _vq_lengthlist__44p1_p4_0[] = { +static const char _vq_lengthlist__44p1_p4_0[] = { 2, 6, 6,14,14, 6, 7, 7,14,14, 7, 7, 7,14,14, 0, 13,13,16,16, 0,13,13,15,14, 7, 8, 8,15,15, 9,10, 10,16,16, 9, 8, 8,15,15, 0,13,13,17,16, 0,13,13, @@ -1542,7 +1559,7 @@ static const long _vq_lengthlist__44p1_p4_0[] = { static const static_codebook _44p1_p4_0 = { 5, 3125, - (long *)_vq_lengthlist__44p1_p4_0, + (char *)_vq_lengthlist__44p1_p4_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p1_p4_0, 0 @@ -1558,13 +1575,13 @@ static const long _vq_quantlist__44p1_p4_1[] = { 6, }; -static const long _vq_lengthlist__44p1_p4_1[] = { +static const char _vq_lengthlist__44p1_p4_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p1_p4_1 = { 1, 7, - (long *)_vq_lengthlist__44p1_p4_1, + (char *)_vq_lengthlist__44p1_p4_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p1_p4_1, 0 @@ -1576,7 +1593,7 @@ static const long _vq_quantlist__44p1_p5_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p5_0[] = { +static const char _vq_lengthlist__44p1_p5_0[] = { 1, 6, 6, 7, 8, 8, 7, 8, 8, 7, 9, 8,10,11,11, 9, 8, 8, 7, 8, 8,11,11,11, 9, 8, 8, 6, 7, 7,10,10, 10,10,10,10,10,10,10,14,13,13,12,11,11,10,10,10, @@ -1597,7 +1614,7 @@ static const long _vq_lengthlist__44p1_p5_0[] = { static const static_codebook _44p1_p5_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p5_0, + (char *)_vq_lengthlist__44p1_p5_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p1_p5_0, 0 @@ -1609,7 +1626,7 @@ static const long _vq_quantlist__44p1_p5_1[] = { 2, }; -static const long _vq_lengthlist__44p1_p5_1[] = { +static const char _vq_lengthlist__44p1_p5_1[] = { 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 8, 8, 8, 7, 7, 8, 8, 8, 9, 8, 8, 9, 7, 7, 6, 6, 6, 9, 8, 7, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -1630,7 +1647,7 @@ static const long _vq_lengthlist__44p1_p5_1[] = { static const static_codebook _44p1_p5_1 = { 5, 243, - (long *)_vq_lengthlist__44p1_p5_1, + (char *)_vq_lengthlist__44p1_p5_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p1_p5_1, 0 @@ -1642,7 +1659,7 @@ static const long _vq_quantlist__44p1_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p6_0[] = { +static const char _vq_lengthlist__44p1_p6_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -1663,7 +1680,7 @@ static const long _vq_lengthlist__44p1_p6_0[] = { static const static_codebook _44p1_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p6_0, + (char *)_vq_lengthlist__44p1_p6_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p1_p6_0, 0 @@ -1697,14 +1714,14 @@ static const long _vq_quantlist__44p1_p6_1[] = { 24, }; -static const long _vq_lengthlist__44p1_p6_1[] = { +static const char _vq_lengthlist__44p1_p6_1[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,13,14,16,16,16,16, }; static const static_codebook _44p1_p6_1 = { 1, 25, - (long *)_vq_lengthlist__44p1_p6_1, + (char *)_vq_lengthlist__44p1_p6_1, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p1_p6_1, 0 @@ -1738,20 +1755,20 @@ static const long _vq_quantlist__44p1_p6_2[] = { 24, }; -static const long _vq_lengthlist__44p1_p6_2[] = { +static const char _vq_lengthlist__44p1_p6_2[] = { 3, 4, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p1_p6_2 = { 1, 25, - (long *)_vq_lengthlist__44p1_p6_2, + (char *)_vq_lengthlist__44p1_p6_2, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p1_p6_2, 0 }; -static const long _huff_lengthlist__44p1_short[] = { +static const char _huff_lengthlist__44p1_short[] = { 4, 5, 7, 8,10,13,14, 4, 2, 4, 6, 8,11,12, 7, 4, 3, 5, 8,12,14, 8, 5, 4, 4, 8,12,12, 9, 7, 7, 7, 9,10,11,13,11,11, 9, 7, 8,10,13,11,10, 6, 5, 7, @@ -1760,7 +1777,7 @@ static const long _huff_lengthlist__44p1_short[] = { static const static_codebook _huff_book__44p1_short = { 2, 49, - (long *)_huff_lengthlist__44p1_short, + (char *)_huff_lengthlist__44p1_short, 0, 0, 0, 0, 0, NULL, 0 @@ -1782,7 +1799,7 @@ static const long _vq_quantlist__44p2_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p2_l0_0[] = { +static const char _vq_lengthlist__44p2_l0_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 4, 6, 5, 8, 7, 9, 8,10, 9,11,10,11,11, 4, 5, 6, 7, 8, 8, 9, 9,10,10,10,10,11, 8, 9, 8,10, 8,10, 9,11,10, @@ -1798,7 +1815,7 @@ static const long _vq_lengthlist__44p2_l0_0[] = { static const static_codebook _44p2_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p2_l0_0, + (char *)_vq_lengthlist__44p2_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p2_l0_0, 0 @@ -1812,14 +1829,14 @@ static const long _vq_quantlist__44p2_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p2_l0_1[] = { +static const char _vq_lengthlist__44p2_l0_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 5, 6, 6, 6, 5, 6, 5, 6, 6, }; static const static_codebook _44p2_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p2_l0_1, + (char *)_vq_lengthlist__44p2_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_l0_1, 0 @@ -1831,31 +1848,31 @@ static const long _vq_quantlist__44p2_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p2_l1_0[] = { +static const char _vq_lengthlist__44p2_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p2_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p2_l1_0, + (char *)_vq_lengthlist__44p2_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p2_l1_0, 0 }; -static const long _huff_lengthlist__44p2_lfe[] = { +static const char _huff_lengthlist__44p2_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p2_lfe = { 2, 4, - (long *)_huff_lengthlist__44p2_lfe, + (char *)_huff_lengthlist__44p2_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p2_long[] = { +static const char _huff_lengthlist__44p2_long[] = { 3, 4, 9, 8, 8,10,13,16, 4, 2, 9, 5, 7,10,14,18, 9, 7, 6, 5, 7, 9,12,16, 7, 5, 5, 3, 5, 8,11,13, 8, 7, 7, 5, 5, 7, 9,11,10,10, 9, 8, 6, 6, 8,10, @@ -1864,7 +1881,7 @@ static const long _huff_lengthlist__44p2_long[] = { static const static_codebook _huff_book__44p2_long = { 2, 64, - (long *)_huff_lengthlist__44p2_long, + (char *)_huff_lengthlist__44p2_long, 0, 0, 0, 0, 0, NULL, 0 @@ -1876,7 +1893,7 @@ static const long _vq_quantlist__44p2_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p1_0[] = { +static const char _vq_lengthlist__44p2_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1897,7 +1914,7 @@ static const long _vq_lengthlist__44p2_p1_0[] = { static const static_codebook _44p2_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p1_0, + (char *)_vq_lengthlist__44p2_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p2_p1_0, 0 @@ -1911,7 +1928,7 @@ static const long _vq_quantlist__44p2_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p2_p2_0[] = { +static const char _vq_lengthlist__44p2_p2_0[] = { 1, 4, 4, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 10,10, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,11,11, 0, 0, 0, 0, 0, @@ -2112,7 +2129,7 @@ static const long _vq_lengthlist__44p2_p2_0[] = { static const static_codebook _44p2_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p2_p2_0, + (char *)_vq_lengthlist__44p2_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_p2_0, 0 @@ -2124,7 +2141,7 @@ static const long _vq_quantlist__44p2_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p3_0[] = { +static const char _vq_lengthlist__44p2_p3_0[] = { 1, 5, 5, 6, 7, 7, 0, 8, 8, 6, 9, 9, 8,11,11, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 5, 7, 7, 7,10, 10, 0,12,12, 8,11,11, 9,12,12, 0,11,12, 0,12,12, @@ -2145,7 +2162,7 @@ static const long _vq_lengthlist__44p2_p3_0[] = { static const static_codebook _44p2_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p3_0, + (char *)_vq_lengthlist__44p2_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p2_p3_0, 0 @@ -2157,7 +2174,7 @@ static const long _vq_quantlist__44p2_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p2_p3_1[] = { +static const char _vq_lengthlist__44p2_p3_1[] = { 2, 3, 3, 0, 8, 8, 0, 8, 8, 0, 9, 9, 0, 9, 9, 0, 9, 9, 0, 9, 9, 0, 9, 9, 0, 8, 8, 0, 6, 6, 0, 7, 7, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, @@ -2178,7 +2195,7 @@ static const long _vq_lengthlist__44p2_p3_1[] = { static const static_codebook _44p2_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p2_p3_1, + (char *)_vq_lengthlist__44p2_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p2_p3_1, 0 @@ -2190,7 +2207,7 @@ static const long _vq_quantlist__44p2_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p4_0[] = { +static const char _vq_lengthlist__44p2_p4_0[] = { 1, 6, 6, 6, 7, 7, 7, 8, 8, 7, 8, 8,10,11,11, 9, 8, 8, 7, 8, 8,11,11,11, 9, 8, 8, 6, 7, 7, 9,11, 11, 9,11,11,10,11,11,12,13,13,11,12,12,10,11,11, @@ -2211,7 +2228,7 @@ static const long _vq_lengthlist__44p2_p4_0[] = { static const static_codebook _44p2_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p4_0, + (char *)_vq_lengthlist__44p2_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p2_p4_0, 0 @@ -2225,7 +2242,7 @@ static const long _vq_quantlist__44p2_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p2_p4_1[] = { +static const char _vq_lengthlist__44p2_p4_1[] = { 3, 4, 4, 8, 8,11, 9, 9,12,12,11,10,10,12,12,12, 10,10,11,11,12,12,12,12,12,12,11,11,13,13,12,12, 12,13,13,12,10,10,12,12,12,11,11,13,13,12,13,13, @@ -2426,7 +2443,7 @@ static const long _vq_lengthlist__44p2_p4_1[] = { static const static_codebook _44p2_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p2_p4_1, + (char *)_vq_lengthlist__44p2_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_p4_1, 0 @@ -2440,7 +2457,7 @@ static const long _vq_quantlist__44p2_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p2_p5_0[] = { +static const char _vq_lengthlist__44p2_p5_0[] = { 2, 6, 6,14,14, 6, 7, 7,14,14, 7, 7, 7,15,15, 0, 13,13,16,16, 0,13,13,15,15, 7, 8, 8,15,15, 9,10, 10,17,16, 9, 8, 8,15,15, 0,13,13,18,17, 0,13,13, @@ -2641,7 +2658,7 @@ static const long _vq_lengthlist__44p2_p5_0[] = { static const static_codebook _44p2_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p2_p5_0, + (char *)_vq_lengthlist__44p2_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p2_p5_0, 0 @@ -2657,13 +2674,13 @@ static const long _vq_quantlist__44p2_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p2_p5_1[] = { +static const char _vq_lengthlist__44p2_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p2_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p2_p5_1, + (char *)_vq_lengthlist__44p2_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_p5_1, 0 @@ -2675,7 +2692,7 @@ static const long _vq_quantlist__44p2_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p6_0[] = { +static const char _vq_lengthlist__44p2_p6_0[] = { 1, 7, 7, 7, 8, 8, 7, 8, 8, 7, 9, 9,10,11,11, 9, 8, 8, 7, 8, 9,11,11,11, 9, 8, 8, 6, 7, 7,10,10, 10,10,10,10,10,10,10,14,14,14,12,11,11,10,11,11, @@ -2696,7 +2713,7 @@ static const long _vq_lengthlist__44p2_p6_0[] = { static const static_codebook _44p2_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p6_0, + (char *)_vq_lengthlist__44p2_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p2_p6_0, 0 @@ -2708,7 +2725,7 @@ static const long _vq_quantlist__44p2_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p2_p6_1[] = { +static const char _vq_lengthlist__44p2_p6_1[] = { 2, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 6, 7, 7, 9, 8, 8, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -2729,7 +2746,7 @@ static const long _vq_lengthlist__44p2_p6_1[] = { static const static_codebook _44p2_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p2_p6_1, + (char *)_vq_lengthlist__44p2_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p2_p6_1, 0 @@ -2741,7 +2758,7 @@ static const long _vq_quantlist__44p2_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p7_0[] = { +static const char _vq_lengthlist__44p2_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2762,7 +2779,7 @@ static const long _vq_lengthlist__44p2_p7_0[] = { static const static_codebook _44p2_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p7_0, + (char *)_vq_lengthlist__44p2_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p2_p7_0, 0 @@ -2774,7 +2791,7 @@ static const long _vq_quantlist__44p2_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p2_p7_1[] = { +static const char _vq_lengthlist__44p2_p7_1[] = { 1, 9, 9, 6, 9, 9, 5, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2795,7 +2812,7 @@ static const long _vq_lengthlist__44p2_p7_1[] = { static const static_codebook _44p2_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p2_p7_1, + (char *)_vq_lengthlist__44p2_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p2_p7_1, 0 @@ -2829,14 +2846,14 @@ static const long _vq_quantlist__44p2_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p2_p7_2[] = { +static const char _vq_lengthlist__44p2_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p2_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p2_p7_2, + (char *)_vq_lengthlist__44p2_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p2_p7_2, 0 @@ -2870,20 +2887,20 @@ static const long _vq_quantlist__44p2_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p2_p7_3[] = { +static const char _vq_lengthlist__44p2_p7_3[] = { 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p2_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p2_p7_3, + (char *)_vq_lengthlist__44p2_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p2_p7_3, 0 }; -static const long _huff_lengthlist__44p2_short[] = { +static const char _huff_lengthlist__44p2_short[] = { 4, 4,12, 9, 8,12,15,17, 4, 2,11, 6, 5, 9,13,15, 11, 7, 8, 7, 7,10,14,13, 8, 5, 7, 5, 5, 8,12,12, 8, 4, 7, 4, 3, 6,11,12,11, 8, 9, 7, 6, 8,11,12, @@ -2892,7 +2909,7 @@ static const long _huff_lengthlist__44p2_short[] = { static const static_codebook _huff_book__44p2_short = { 2, 64, - (long *)_huff_lengthlist__44p2_short, + (char *)_huff_lengthlist__44p2_short, 0, 0, 0, 0, 0, NULL, 0 @@ -2914,7 +2931,7 @@ static const long _vq_quantlist__44p3_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p3_l0_0[] = { +static const char _vq_lengthlist__44p3_l0_0[] = { 1, 4, 4, 8, 8, 8, 8, 9, 9,10,10,10,10, 4, 6, 5, 8, 7, 9, 9, 9, 9,10, 9,11, 9, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9,10, 9,10, 8, 9, 8, 9, 8,10, 9,11, 9, @@ -2930,7 +2947,7 @@ static const long _vq_lengthlist__44p3_l0_0[] = { static const static_codebook _44p3_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p3_l0_0, + (char *)_vq_lengthlist__44p3_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p3_l0_0, 0 @@ -2944,14 +2961,14 @@ static const long _vq_quantlist__44p3_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p3_l0_1[] = { +static const char _vq_lengthlist__44p3_l0_1[] = { 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, }; static const static_codebook _44p3_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p3_l0_1, + (char *)_vq_lengthlist__44p3_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_l0_1, 0 @@ -2963,31 +2980,31 @@ static const long _vq_quantlist__44p3_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p3_l1_0[] = { +static const char _vq_lengthlist__44p3_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p3_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p3_l1_0, + (char *)_vq_lengthlist__44p3_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p3_l1_0, 0 }; -static const long _huff_lengthlist__44p3_lfe[] = { +static const char _huff_lengthlist__44p3_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p3_lfe = { 2, 4, - (long *)_huff_lengthlist__44p3_lfe, + (char *)_huff_lengthlist__44p3_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p3_long[] = { +static const char _huff_lengthlist__44p3_long[] = { 3, 4,13, 9, 9,12,15,17, 4, 2,18, 5, 7,10,14,18, 11, 8, 6, 5, 6, 8,11,14, 8, 5, 5, 3, 5, 8,11,13, 9, 6, 7, 5, 5, 7, 9,10,11,10, 9, 8, 6, 6, 8,10, @@ -2996,7 +3013,7 @@ static const long _huff_lengthlist__44p3_long[] = { static const static_codebook _huff_book__44p3_long = { 2, 64, - (long *)_huff_lengthlist__44p3_long, + (char *)_huff_lengthlist__44p3_long, 0, 0, 0, 0, 0, NULL, 0 @@ -3008,7 +3025,7 @@ static const long _vq_quantlist__44p3_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p1_0[] = { +static const char _vq_lengthlist__44p3_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3029,7 +3046,7 @@ static const long _vq_lengthlist__44p3_p1_0[] = { static const static_codebook _44p3_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p1_0, + (char *)_vq_lengthlist__44p3_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p3_p1_0, 0 @@ -3043,7 +3060,7 @@ static const long _vq_quantlist__44p3_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p3_p2_0[] = { +static const char _vq_lengthlist__44p3_p2_0[] = { 3, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 11,11, 0, 0, 0, 0, 0, 0, 0, 0,10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,10,11, 0, 0, 0, 0, 0, @@ -3244,7 +3261,7 @@ static const long _vq_lengthlist__44p3_p2_0[] = { static const static_codebook _44p3_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p3_p2_0, + (char *)_vq_lengthlist__44p3_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_p2_0, 0 @@ -3256,7 +3273,7 @@ static const long _vq_quantlist__44p3_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p3_0[] = { +static const char _vq_lengthlist__44p3_p3_0[] = { 1, 5, 5, 5, 8, 8, 0, 8, 8, 6, 9, 9, 8,10,10, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 4, 7, 7, 6,10, 10, 0,12,12, 7,11,11, 9,12,12, 0,12,12, 0,13,13, @@ -3277,7 +3294,7 @@ static const long _vq_lengthlist__44p3_p3_0[] = { static const static_codebook _44p3_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p3_0, + (char *)_vq_lengthlist__44p3_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p3_p3_0, 0 @@ -3289,7 +3306,7 @@ static const long _vq_quantlist__44p3_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p3_p3_1[] = { +static const char _vq_lengthlist__44p3_p3_1[] = { 3, 4, 4, 0, 8, 8, 0, 8, 8, 0, 9, 9, 0,10,10, 0, 8, 8, 0, 9, 9, 0,10,10, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, @@ -3310,7 +3327,7 @@ static const long _vq_lengthlist__44p3_p3_1[] = { static const static_codebook _44p3_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p3_p3_1, + (char *)_vq_lengthlist__44p3_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p3_p3_1, 0 @@ -3322,7 +3339,7 @@ static const long _vq_quantlist__44p3_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p4_0[] = { +static const char _vq_lengthlist__44p3_p4_0[] = { 1, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8,10,11,11, 9, 8, 8, 8, 8, 8,11,11,11,10, 8, 8, 5, 7, 7, 9,11, 11,10,11,11,10,11,11,12,13,14,11,12,12,10,11,11, @@ -3343,7 +3360,7 @@ static const long _vq_lengthlist__44p3_p4_0[] = { static const static_codebook _44p3_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p4_0, + (char *)_vq_lengthlist__44p3_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p3_p4_0, 0 @@ -3357,7 +3374,7 @@ static const long _vq_quantlist__44p3_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p3_p4_1[] = { +static const char _vq_lengthlist__44p3_p4_1[] = { 3, 4, 5, 8, 8,12,10,10,12,12,12,10,10,12,12,13, 11,11,12,12,13,12,12,12,12,13,10,10,13,13,13,13, 13,13,13,13,10,10,13,13,13,11,11,13,13,14,13,13, @@ -3558,7 +3575,7 @@ static const long _vq_lengthlist__44p3_p4_1[] = { static const static_codebook _44p3_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p3_p4_1, + (char *)_vq_lengthlist__44p3_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_p4_1, 0 @@ -3572,7 +3589,7 @@ static const long _vq_quantlist__44p3_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p3_p5_0[] = { +static const char _vq_lengthlist__44p3_p5_0[] = { 2, 6, 6,14,14, 6, 7, 7,14,14, 7, 7, 7,15,15, 0, 12,12,15,15, 0,13,13,15,15, 7, 8, 8,15,15,10,10, 10,16,16, 9, 8, 8,15,15, 0,13,13,18,17, 0,13,13, @@ -3773,7 +3790,7 @@ static const long _vq_lengthlist__44p3_p5_0[] = { static const static_codebook _44p3_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p3_p5_0, + (char *)_vq_lengthlist__44p3_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p3_p5_0, 0 @@ -3789,13 +3806,13 @@ static const long _vq_quantlist__44p3_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p3_p5_1[] = { +static const char _vq_lengthlist__44p3_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p3_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p3_p5_1, + (char *)_vq_lengthlist__44p3_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_p5_1, 0 @@ -3807,7 +3824,7 @@ static const long _vq_quantlist__44p3_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p6_0[] = { +static const char _vq_lengthlist__44p3_p6_0[] = { 1, 6, 6, 7, 7, 7, 7, 8, 8, 7, 9, 9,11,11,11, 9, 8, 8, 8, 9, 9,12,11,11, 9, 8, 8, 6, 7, 7,10,11, 10,10,10,10,11,11,10,14,13,14,12,11,11,11,11,11, @@ -3828,7 +3845,7 @@ static const long _vq_lengthlist__44p3_p6_0[] = { static const static_codebook _44p3_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p6_0, + (char *)_vq_lengthlist__44p3_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p3_p6_0, 0 @@ -3840,7 +3857,7 @@ static const long _vq_quantlist__44p3_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p3_p6_1[] = { +static const char _vq_lengthlist__44p3_p6_1[] = { 2, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 7, 7, 8, 8, 8, 9, 9, 9, 9, 7, 8, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8,10, 9, 9,10, 8, 8,10, 8, 8, @@ -3861,7 +3878,7 @@ static const long _vq_lengthlist__44p3_p6_1[] = { static const static_codebook _44p3_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p3_p6_1, + (char *)_vq_lengthlist__44p3_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p3_p6_1, 0 @@ -3873,7 +3890,7 @@ static const long _vq_quantlist__44p3_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p7_0[] = { +static const char _vq_lengthlist__44p3_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -3894,7 +3911,7 @@ static const long _vq_lengthlist__44p3_p7_0[] = { static const static_codebook _44p3_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p7_0, + (char *)_vq_lengthlist__44p3_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p3_p7_0, 0 @@ -3906,7 +3923,7 @@ static const long _vq_quantlist__44p3_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p3_p7_1[] = { +static const char _vq_lengthlist__44p3_p7_1[] = { 1, 9, 9, 6, 9, 9, 5, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -3927,7 +3944,7 @@ static const long _vq_lengthlist__44p3_p7_1[] = { static const static_codebook _44p3_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p3_p7_1, + (char *)_vq_lengthlist__44p3_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p3_p7_1, 0 @@ -3961,14 +3978,14 @@ static const long _vq_quantlist__44p3_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p3_p7_2[] = { +static const char _vq_lengthlist__44p3_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p3_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p3_p7_2, + (char *)_vq_lengthlist__44p3_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p3_p7_2, 0 @@ -4002,20 +4019,20 @@ static const long _vq_quantlist__44p3_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p3_p7_3[] = { +static const char _vq_lengthlist__44p3_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p3_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p3_p7_3, + (char *)_vq_lengthlist__44p3_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p3_p7_3, 0 }; -static const long _huff_lengthlist__44p3_short[] = { +static const char _huff_lengthlist__44p3_short[] = { 4, 5,16, 9, 9,12,17,18, 4, 2,18, 6, 5, 9,13,15, 10, 7, 7, 6, 7, 9,13,13, 8, 5, 6, 5, 5, 7,11,12, 8, 4, 7, 4, 3, 6,10,12,11, 8, 9, 7, 6, 8,11,12, @@ -4024,7 +4041,7 @@ static const long _huff_lengthlist__44p3_short[] = { static const static_codebook _huff_book__44p3_short = { 2, 64, - (long *)_huff_lengthlist__44p3_short, + (char *)_huff_lengthlist__44p3_short, 0, 0, 0, 0, 0, NULL, 0 @@ -4046,7 +4063,7 @@ static const long _vq_quantlist__44p4_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p4_l0_0[] = { +static const char _vq_lengthlist__44p4_l0_0[] = { 1, 4, 4, 8, 8, 9, 8, 9, 9,10,10,10,10, 4, 6, 5, 8, 7, 9, 9, 9, 9,10, 9,10,10, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9,10, 9,10, 8, 9, 8, 9, 8,10, 9,11, 9, @@ -4062,7 +4079,7 @@ static const long _vq_lengthlist__44p4_l0_0[] = { static const static_codebook _44p4_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p4_l0_0, + (char *)_vq_lengthlist__44p4_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p4_l0_0, 0 @@ -4076,14 +4093,14 @@ static const long _vq_quantlist__44p4_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p4_l0_1[] = { +static const char _vq_lengthlist__44p4_l0_1[] = { 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, }; static const static_codebook _44p4_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p4_l0_1, + (char *)_vq_lengthlist__44p4_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_l0_1, 0 @@ -4095,31 +4112,31 @@ static const long _vq_quantlist__44p4_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p4_l1_0[] = { +static const char _vq_lengthlist__44p4_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p4_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p4_l1_0, + (char *)_vq_lengthlist__44p4_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p4_l1_0, 0 }; -static const long _huff_lengthlist__44p4_lfe[] = { +static const char _huff_lengthlist__44p4_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p4_lfe = { 2, 4, - (long *)_huff_lengthlist__44p4_lfe, + (char *)_huff_lengthlist__44p4_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p4_long[] = { +static const char _huff_lengthlist__44p4_long[] = { 3, 5,13, 9, 9,12,16,18, 4, 2,20, 6, 7,10,15,20, 10, 7, 5, 5, 6, 8,10,13, 8, 5, 5, 3, 5, 7,10,11, 9, 7, 6, 5, 5, 7, 9, 9,11,10, 8, 7, 6, 6, 8, 8, @@ -4128,7 +4145,7 @@ static const long _huff_lengthlist__44p4_long[] = { static const static_codebook _huff_book__44p4_long = { 2, 64, - (long *)_huff_lengthlist__44p4_long, + (char *)_huff_lengthlist__44p4_long, 0, 0, 0, 0, 0, NULL, 0 @@ -4140,7 +4157,7 @@ static const long _vq_quantlist__44p4_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p1_0[] = { +static const char _vq_lengthlist__44p4_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4161,7 +4178,7 @@ static const long _vq_lengthlist__44p4_p1_0[] = { static const static_codebook _44p4_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p1_0, + (char *)_vq_lengthlist__44p4_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p4_p1_0, 0 @@ -4175,7 +4192,7 @@ static const long _vq_quantlist__44p4_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p4_p2_0[] = { +static const char _vq_lengthlist__44p4_p2_0[] = { 3, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 12,12, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,11,11, 0, 0, 0, 0, 0, @@ -4376,7 +4393,7 @@ static const long _vq_lengthlist__44p4_p2_0[] = { static const static_codebook _44p4_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p4_p2_0, + (char *)_vq_lengthlist__44p4_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_p2_0, 0 @@ -4388,7 +4405,7 @@ static const long _vq_quantlist__44p4_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p3_0[] = { +static const char _vq_lengthlist__44p4_p3_0[] = { 1, 6, 6, 5, 7, 8, 0, 8, 8, 6, 9, 9, 7,10,10, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 4, 7, 7, 6,10, 10, 0,12,12, 7,11,11, 8,12,12, 0,12,12, 0,13,12, @@ -4409,7 +4426,7 @@ static const long _vq_lengthlist__44p4_p3_0[] = { static const static_codebook _44p4_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p3_0, + (char *)_vq_lengthlist__44p4_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p4_p3_0, 0 @@ -4421,7 +4438,7 @@ static const long _vq_quantlist__44p4_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p4_p3_1[] = { +static const char _vq_lengthlist__44p4_p3_1[] = { 3, 5, 5, 0, 8, 8, 0, 8, 8, 0, 9, 9, 0,10,10, 0, 8, 8, 0, 8, 8, 0,10,10, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, @@ -4442,7 +4459,7 @@ static const long _vq_lengthlist__44p4_p3_1[] = { static const static_codebook _44p4_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p4_p3_1, + (char *)_vq_lengthlist__44p4_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p4_p3_1, 0 @@ -4454,7 +4471,7 @@ static const long _vq_quantlist__44p4_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p4_0[] = { +static const char _vq_lengthlist__44p4_p4_0[] = { 1, 6, 6, 6, 7, 7, 7, 8, 8, 7, 8, 8,10,11,11, 9, 8, 8, 8, 8, 8,11,11,12, 9, 8, 8, 5, 7, 7, 9,11, 11,10,11,11,10,11,11,12,14,14,11,12,12,10,12,12, @@ -4475,7 +4492,7 @@ static const long _vq_lengthlist__44p4_p4_0[] = { static const static_codebook _44p4_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p4_0, + (char *)_vq_lengthlist__44p4_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p4_p4_0, 0 @@ -4489,7 +4506,7 @@ static const long _vq_quantlist__44p4_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p4_p4_1[] = { +static const char _vq_lengthlist__44p4_p4_1[] = { 4, 5, 5, 9, 9,12, 9, 9,12,12,12,10,10,13,13,13, 11,11,12,12,13,13,13,12,12,13,10,10,13,13,13,13, 13,13,13,13,10,10,13,12,13,11,11,13,13,13,14,14, @@ -4690,7 +4707,7 @@ static const long _vq_lengthlist__44p4_p4_1[] = { static const static_codebook _44p4_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p4_p4_1, + (char *)_vq_lengthlist__44p4_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_p4_1, 0 @@ -4704,7 +4721,7 @@ static const long _vq_quantlist__44p4_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p4_p5_0[] = { +static const char _vq_lengthlist__44p4_p5_0[] = { 1, 7, 6,15,15, 7, 8, 8,15,15, 8, 8, 8,15,15, 0, 13,13,16,16, 0,14,14,16,16, 7, 9, 9,16,16,10,11, 11,17,17,10, 8, 8,15,16, 0,14,14,18,18, 0,14,14, @@ -4905,7 +4922,7 @@ static const long _vq_lengthlist__44p4_p5_0[] = { static const static_codebook _44p4_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p4_p5_0, + (char *)_vq_lengthlist__44p4_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p4_p5_0, 0 @@ -4921,13 +4938,13 @@ static const long _vq_quantlist__44p4_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p4_p5_1[] = { +static const char _vq_lengthlist__44p4_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p4_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p4_p5_1, + (char *)_vq_lengthlist__44p4_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_p5_1, 0 @@ -4939,7 +4956,7 @@ static const long _vq_quantlist__44p4_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p6_0[] = { +static const char _vq_lengthlist__44p4_p6_0[] = { 1, 7, 7, 7, 8, 8, 7, 8, 8, 7, 9, 9,11,11,11, 9, 8, 8, 8, 9, 9,12,11,12, 9, 8, 8, 6, 7, 7,10,11, 11,10,10,10,11,11,11,14,14,14,12,11,12,11,11,11, @@ -4960,7 +4977,7 @@ static const long _vq_lengthlist__44p4_p6_0[] = { static const static_codebook _44p4_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p6_0, + (char *)_vq_lengthlist__44p4_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p4_p6_0, 0 @@ -4972,7 +4989,7 @@ static const long _vq_quantlist__44p4_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p4_p6_1[] = { +static const char _vq_lengthlist__44p4_p6_1[] = { 2, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 9, 9, 8, 8,10, 8, 8, @@ -4993,7 +5010,7 @@ static const long _vq_lengthlist__44p4_p6_1[] = { static const static_codebook _44p4_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p4_p6_1, + (char *)_vq_lengthlist__44p4_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p4_p6_1, 0 @@ -5005,7 +5022,7 @@ static const long _vq_quantlist__44p4_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p7_0[] = { +static const char _vq_lengthlist__44p4_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -5026,7 +5043,7 @@ static const long _vq_lengthlist__44p4_p7_0[] = { static const static_codebook _44p4_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p7_0, + (char *)_vq_lengthlist__44p4_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p4_p7_0, 0 @@ -5038,7 +5055,7 @@ static const long _vq_quantlist__44p4_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p4_p7_1[] = { +static const char _vq_lengthlist__44p4_p7_1[] = { 1, 9, 9, 7, 9, 9, 8, 8, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -5059,7 +5076,7 @@ static const long _vq_lengthlist__44p4_p7_1[] = { static const static_codebook _44p4_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p4_p7_1, + (char *)_vq_lengthlist__44p4_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p4_p7_1, 0 @@ -5093,14 +5110,14 @@ static const long _vq_quantlist__44p4_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p4_p7_2[] = { +static const char _vq_lengthlist__44p4_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p4_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p4_p7_2, + (char *)_vq_lengthlist__44p4_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p4_p7_2, 0 @@ -5134,20 +5151,20 @@ static const long _vq_quantlist__44p4_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p4_p7_3[] = { +static const char _vq_lengthlist__44p4_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p4_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p4_p7_3, + (char *)_vq_lengthlist__44p4_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p4_p7_3, 0 }; -static const long _huff_lengthlist__44p4_short[] = { +static const char _huff_lengthlist__44p4_short[] = { 3, 5,16, 9, 9,13,18,21, 4, 2,21, 6, 6,10,15,21, 16,19, 6, 5, 7,10,13,16, 8, 6, 5, 4, 4, 8,13,16, 8, 5, 6, 4, 4, 7,12,15,13,10, 9, 7, 7, 9,13,16, @@ -5156,7 +5173,7 @@ static const long _huff_lengthlist__44p4_short[] = { static const static_codebook _huff_book__44p4_short = { 2, 64, - (long *)_huff_lengthlist__44p4_short, + (char *)_huff_lengthlist__44p4_short, 0, 0, 0, 0, 0, NULL, 0 @@ -5178,7 +5195,7 @@ static const long _vq_quantlist__44p5_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p5_l0_0[] = { +static const char _vq_lengthlist__44p5_l0_0[] = { 1, 4, 4, 8, 8,10,10,10,10, 9, 8,11,11, 4, 6, 5, 8, 6,10,10,10,10,10, 9,10, 9, 4, 5, 6, 6, 9,10, 10,10,10, 9,10, 9,10, 8, 9, 8, 9, 8, 9, 9,10, 9, @@ -5194,7 +5211,7 @@ static const long _vq_lengthlist__44p5_l0_0[] = { static const static_codebook _44p5_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p5_l0_0, + (char *)_vq_lengthlist__44p5_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p5_l0_0, 0 @@ -5208,14 +5225,14 @@ static const long _vq_quantlist__44p5_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p5_l0_1[] = { +static const char _vq_lengthlist__44p5_l0_1[] = { 4, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p5_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p5_l0_1, + (char *)_vq_lengthlist__44p5_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_l0_1, 0 @@ -5227,31 +5244,31 @@ static const long _vq_quantlist__44p5_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p5_l1_0[] = { +static const char _vq_lengthlist__44p5_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p5_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p5_l1_0, + (char *)_vq_lengthlist__44p5_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p5_l1_0, 0 }; -static const long _huff_lengthlist__44p5_lfe[] = { +static const char _huff_lengthlist__44p5_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p5_lfe = { 2, 4, - (long *)_huff_lengthlist__44p5_lfe, + (char *)_huff_lengthlist__44p5_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p5_long[] = { +static const char _huff_lengthlist__44p5_long[] = { 3, 7,12,14,14,16,18,19, 6, 2, 4, 6, 8, 9,12,14, 12, 3, 3, 5, 7, 8,11,13,13, 6, 4, 5, 7, 8,10,11, 14, 8, 7, 7, 7, 7, 9,10,15, 9, 8, 7, 7, 6, 8, 9, @@ -5260,7 +5277,7 @@ static const long _huff_lengthlist__44p5_long[] = { static const static_codebook _huff_book__44p5_long = { 2, 64, - (long *)_huff_lengthlist__44p5_long, + (char *)_huff_lengthlist__44p5_long, 0, 0, 0, 0, 0, NULL, 0 @@ -5272,7 +5289,7 @@ static const long _vq_quantlist__44p5_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p1_0[] = { +static const char _vq_lengthlist__44p5_p1_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10, 9,10,12,10,11,11, 8,10,10, @@ -5293,7 +5310,7 @@ static const long _vq_lengthlist__44p5_p1_0[] = { static const static_codebook _44p5_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p1_0, + (char *)_vq_lengthlist__44p5_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p5_p1_0, 0 @@ -5307,7 +5324,7 @@ static const long _vq_quantlist__44p5_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p5_p2_0[] = { +static const char _vq_lengthlist__44p5_p2_0[] = { 4, 6, 6, 9, 9, 6, 7, 8,10,10, 6, 8, 7,10,10, 8, 10,10,12,13, 8,10,10,13,12, 6, 7, 8,10,10, 7, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,14,10,11,11, @@ -5508,7 +5525,7 @@ static const long _vq_lengthlist__44p5_p2_0[] = { static const static_codebook _44p5_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p5_p2_0, + (char *)_vq_lengthlist__44p5_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_p2_0, 0 @@ -5520,7 +5537,7 @@ static const long _vq_quantlist__44p5_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p3_0[] = { +static const char _vq_lengthlist__44p5_p3_0[] = { 1, 5, 6, 5, 7, 8, 5, 8, 7, 5, 7, 8, 7, 8,10, 8, 10,10, 5, 8, 7, 8,10,10, 7,10, 8, 6, 8, 9, 8,10, 11, 9,10,10, 9,10,11,10,11,12,11,12,12, 9,11,10, @@ -5541,7 +5558,7 @@ static const long _vq_lengthlist__44p5_p3_0[] = { static const static_codebook _44p5_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p3_0, + (char *)_vq_lengthlist__44p5_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p5_p3_0, 0 @@ -5553,7 +5570,7 @@ static const long _vq_quantlist__44p5_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p5_p3_1[] = { +static const char _vq_lengthlist__44p5_p3_1[] = { 5, 6, 6, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 7, 8, 7, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 8, 8, 8, @@ -5574,7 +5591,7 @@ static const long _vq_lengthlist__44p5_p3_1[] = { static const static_codebook _44p5_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p5_p3_1, + (char *)_vq_lengthlist__44p5_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p5_p3_1, 0 @@ -5586,7 +5603,7 @@ static const long _vq_quantlist__44p5_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p4_0[] = { +static const char _vq_lengthlist__44p5_p4_0[] = { 1, 5, 5, 5, 7, 9, 5, 9, 7, 5, 7, 8, 7, 7,10, 9, 10,10, 5, 8, 7, 9,10,10, 7,10, 7, 6, 8, 9, 9,10, 12, 9,11,11, 9,10,11,11,11,13,12,13,13, 9,11,11, @@ -5607,7 +5624,7 @@ static const long _vq_lengthlist__44p5_p4_0[] = { static const static_codebook _44p5_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p4_0, + (char *)_vq_lengthlist__44p5_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p5_p4_0, 0 @@ -5621,7 +5638,7 @@ static const long _vq_quantlist__44p5_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p5_p4_1[] = { +static const char _vq_lengthlist__44p5_p4_1[] = { 5, 7, 7,10,10, 7, 8, 9,10,11, 7, 9, 8,11,10, 9, 10,10,11,11, 9,10,10,11,11, 7, 9, 9,10,10, 8, 9, 10,10,11, 9,10,10,11,11,10,10,11,11,11,10,11,11, @@ -5822,7 +5839,7 @@ static const long _vq_lengthlist__44p5_p4_1[] = { static const static_codebook _44p5_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p5_p4_1, + (char *)_vq_lengthlist__44p5_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_p4_1, 0 @@ -5836,7 +5853,7 @@ static const long _vq_quantlist__44p5_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p5_p5_0[] = { +static const char _vq_lengthlist__44p5_p5_0[] = { 1, 6, 6,10,10, 6, 7, 9,11,13, 5, 9, 7,13,11, 8, 11,12,13,15, 8,12,11,15,13, 6, 7, 8,11,11, 7, 8, 10,11,13, 9,10,10,13,13,11,11,13,12,16,12,13,13, @@ -6037,7 +6054,7 @@ static const long _vq_lengthlist__44p5_p5_0[] = { static const static_codebook _44p5_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p5_p5_0, + (char *)_vq_lengthlist__44p5_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p5_p5_0, 0 @@ -6053,13 +6070,13 @@ static const long _vq_quantlist__44p5_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p5_p5_1[] = { +static const char _vq_lengthlist__44p5_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p5_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p5_p5_1, + (char *)_vq_lengthlist__44p5_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_p5_1, 0 @@ -6071,7 +6088,7 @@ static const long _vq_quantlist__44p5_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p6_0[] = { +static const char _vq_lengthlist__44p5_p6_0[] = { 1, 5, 5, 5, 7, 9, 5, 9, 7, 5, 7, 8, 7, 7,10, 9, 9,10, 5, 8, 7, 9,10, 9, 7,10, 7, 6, 9, 9, 9,10, 12,10,12,11, 9,10,11,11,10,13,12,12,13,10,11,11, @@ -6092,7 +6109,7 @@ static const long _vq_lengthlist__44p5_p6_0[] = { static const static_codebook _44p5_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p6_0, + (char *)_vq_lengthlist__44p5_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p5_p6_0, 0 @@ -6104,7 +6121,7 @@ static const long _vq_quantlist__44p5_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p5_p6_1[] = { +static const char _vq_lengthlist__44p5_p6_1[] = { 2, 6, 6, 5, 7, 8, 5, 8, 7, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9, 9, 9, 9,10,10,10,10, 8, 9, 9, @@ -6125,7 +6142,7 @@ static const long _vq_lengthlist__44p5_p6_1[] = { static const static_codebook _44p5_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p5_p6_1, + (char *)_vq_lengthlist__44p5_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p5_p6_1, 0 @@ -6137,7 +6154,7 @@ static const long _vq_quantlist__44p5_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p7_0[] = { +static const char _vq_lengthlist__44p5_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6158,7 +6175,7 @@ static const long _vq_lengthlist__44p5_p7_0[] = { static const static_codebook _44p5_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p7_0, + (char *)_vq_lengthlist__44p5_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p5_p7_0, 0 @@ -6170,7 +6187,7 @@ static const long _vq_quantlist__44p5_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p5_p7_1[] = { +static const char _vq_lengthlist__44p5_p7_1[] = { 1, 7, 7, 6, 9, 9, 7, 9, 9, 6, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6191,7 +6208,7 @@ static const long _vq_lengthlist__44p5_p7_1[] = { static const static_codebook _44p5_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p5_p7_1, + (char *)_vq_lengthlist__44p5_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p5_p7_1, 0 @@ -6225,14 +6242,14 @@ static const long _vq_quantlist__44p5_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p5_p7_2[] = { +static const char _vq_lengthlist__44p5_p7_2[] = { 1, 2, 3, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, 11,12,12,13,13,14,14,14,14, }; static const static_codebook _44p5_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p5_p7_2, + (char *)_vq_lengthlist__44p5_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p5_p7_2, 0 @@ -6266,20 +6283,20 @@ static const long _vq_quantlist__44p5_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p5_p7_3[] = { +static const char _vq_lengthlist__44p5_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p5_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p5_p7_3, + (char *)_vq_lengthlist__44p5_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p5_p7_3, 0 }; -static const long _huff_lengthlist__44p5_short[] = { +static const char _huff_lengthlist__44p5_short[] = { 4, 7,12,14,15,18,20,20, 5, 3, 4, 6, 9,11,15,19, 9, 4, 3, 4, 7, 9,13,18,11, 6, 3, 3, 5, 8,13,19, 14, 9, 6, 5, 7,10,16,20,16,11, 9, 8,10,10,14,16, @@ -6288,7 +6305,7 @@ static const long _huff_lengthlist__44p5_short[] = { static const static_codebook _huff_book__44p5_short = { 2, 64, - (long *)_huff_lengthlist__44p5_short, + (char *)_huff_lengthlist__44p5_short, 0, 0, 0, 0, 0, NULL, 0 @@ -6310,7 +6327,7 @@ static const long _vq_quantlist__44p6_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p6_l0_0[] = { +static const char _vq_lengthlist__44p6_l0_0[] = { 1, 4, 4, 7, 7,10,10,12,12,12,12,13,12, 5, 5, 5, 8, 6,11, 9,12,12,13,12,12,12, 4, 5, 5, 6, 8, 9, 11,12,12,13,12,12,12, 7, 7, 8, 9, 9,11, 8,12, 9, @@ -6326,7 +6343,7 @@ static const long _vq_lengthlist__44p6_l0_0[] = { static const static_codebook _44p6_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p6_l0_0, + (char *)_vq_lengthlist__44p6_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p6_l0_0, 0 @@ -6340,14 +6357,14 @@ static const long _vq_quantlist__44p6_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p6_l0_1[] = { +static const char _vq_lengthlist__44p6_l0_1[] = { 4, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 4, }; static const static_codebook _44p6_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p6_l0_1, + (char *)_vq_lengthlist__44p6_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_l0_1, 0 @@ -6359,31 +6376,31 @@ static const long _vq_quantlist__44p6_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p6_l1_0[] = { +static const char _vq_lengthlist__44p6_l1_0[] = { 1, 3, 2, 5, 5, 6, 6, 6, 6, }; static const static_codebook _44p6_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p6_l1_0, + (char *)_vq_lengthlist__44p6_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p6_l1_0, 0 }; -static const long _huff_lengthlist__44p6_lfe[] = { +static const char _huff_lengthlist__44p6_lfe[] = { 2, 3, 1, 3, }; static const static_codebook _huff_book__44p6_lfe = { 2, 4, - (long *)_huff_lengthlist__44p6_lfe, + (char *)_huff_lengthlist__44p6_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p6_long[] = { +static const char _huff_lengthlist__44p6_long[] = { 2, 7,13,15,16,17,19,20, 6, 3, 4, 7, 9,10,12,15, 13, 4, 3, 4, 7, 8,11,13,14, 7, 4, 4, 6, 7,10,11, 16, 9, 7, 6, 7, 8, 9,10,16, 9, 8, 7, 7, 6, 8, 8, @@ -6392,7 +6409,7 @@ static const long _huff_lengthlist__44p6_long[] = { static const static_codebook _huff_book__44p6_long = { 2, 64, - (long *)_huff_lengthlist__44p6_long, + (char *)_huff_lengthlist__44p6_long, 0, 0, 0, 0, 0, NULL, 0 @@ -6404,7 +6421,7 @@ static const long _vq_quantlist__44p6_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p1_0[] = { +static const char _vq_lengthlist__44p6_p1_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9,10,12,10,11,11, 8, 9,10, @@ -6425,7 +6442,7 @@ static const long _vq_lengthlist__44p6_p1_0[] = { static const static_codebook _44p6_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p1_0, + (char *)_vq_lengthlist__44p6_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p6_p1_0, 0 @@ -6439,7 +6456,7 @@ static const long _vq_quantlist__44p6_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p6_p2_0[] = { +static const char _vq_lengthlist__44p6_p2_0[] = { 4, 6, 6, 9, 9, 6, 7, 8,10,10, 6, 8, 7,10,10, 8, 10,10,12,13, 8,10,10,13,12, 6, 8, 8,10,10, 7, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,13,10,11,11, @@ -6640,7 +6657,7 @@ static const long _vq_lengthlist__44p6_p2_0[] = { static const static_codebook _44p6_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p6_p2_0, + (char *)_vq_lengthlist__44p6_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_p2_0, 0 @@ -6652,7 +6669,7 @@ static const long _vq_quantlist__44p6_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p3_0[] = { +static const char _vq_lengthlist__44p6_p3_0[] = { 1, 5, 5, 5, 7, 8, 5, 8, 7, 5, 7, 8, 8, 8,10, 8, 10,10, 5, 8, 7, 8,10,10, 8,10, 8, 6, 8, 9, 8,10, 12, 9,11,11, 9,10,11,11,11,13,12,13,13, 9,11,11, @@ -6673,7 +6690,7 @@ static const long _vq_lengthlist__44p6_p3_0[] = { static const static_codebook _44p6_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p3_0, + (char *)_vq_lengthlist__44p6_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p6_p3_0, 0 @@ -6685,7 +6702,7 @@ static const long _vq_quantlist__44p6_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p6_p3_1[] = { +static const char _vq_lengthlist__44p6_p3_1[] = { 5, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 8, 8, 7, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 8, 7, 7, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 8, 8, 8, @@ -6706,7 +6723,7 @@ static const long _vq_lengthlist__44p6_p3_1[] = { static const static_codebook _44p6_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p6_p3_1, + (char *)_vq_lengthlist__44p6_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p6_p3_1, 0 @@ -6718,7 +6735,7 @@ static const long _vq_quantlist__44p6_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p4_0[] = { +static const char _vq_lengthlist__44p6_p4_0[] = { 2, 5, 5, 5, 7, 8, 5, 8, 7, 5, 7, 7, 7, 7, 9, 7, 9, 9, 5, 7, 7, 8, 9, 9, 7, 9, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9, 9,11,10,11,11, 8, 9, 9, @@ -6739,7 +6756,7 @@ static const long _vq_lengthlist__44p6_p4_0[] = { static const static_codebook _44p6_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p4_0, + (char *)_vq_lengthlist__44p6_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p6_p4_0, 0 @@ -6753,7 +6770,7 @@ static const long _vq_quantlist__44p6_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p6_p4_1[] = { +static const char _vq_lengthlist__44p6_p4_1[] = { 6, 8, 8,10,10, 8, 9, 9,10,11, 8,10, 9,11,10, 9, 10,10,11,11, 9,10,10,11,11, 8, 9, 9,10,10, 9, 9, 10,11,11,10,10,10,11,11,10,11,11,11,11,10,11,11, @@ -6954,7 +6971,7 @@ static const long _vq_lengthlist__44p6_p4_1[] = { static const static_codebook _44p6_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p6_p4_1, + (char *)_vq_lengthlist__44p6_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_p4_1, 0 @@ -6968,7 +6985,7 @@ static const long _vq_quantlist__44p6_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p6_p5_0[] = { +static const char _vq_lengthlist__44p6_p5_0[] = { 2, 6, 6,10,10, 5, 7, 8,11,12, 5, 8, 7,12,11, 9, 11,11,13,15, 9,11,11,15,13, 6, 7, 8,11,11, 7, 7, 9,11,13, 8, 9, 9,13,12,11,11,12,12,15,11,12,12, @@ -7169,7 +7186,7 @@ static const long _vq_lengthlist__44p6_p5_0[] = { static const static_codebook _44p6_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p6_p5_0, + (char *)_vq_lengthlist__44p6_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p6_p5_0, 0 @@ -7185,13 +7202,13 @@ static const long _vq_quantlist__44p6_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p6_p5_1[] = { +static const char _vq_lengthlist__44p6_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p6_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p6_p5_1, + (char *)_vq_lengthlist__44p6_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_p5_1, 0 @@ -7203,7 +7220,7 @@ static const long _vq_quantlist__44p6_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p6_0[] = { +static const char _vq_lengthlist__44p6_p6_0[] = { 1, 5, 5, 5, 7, 9, 5, 9, 7, 5, 7, 8, 7, 7,10, 9, 10,10, 5, 8, 7, 9,10,10, 7,10, 7, 6, 9, 9, 9,10, 12, 9,11,11, 9,10,11,11,11,13,12,13,13, 9,11,11, @@ -7224,7 +7241,7 @@ static const long _vq_lengthlist__44p6_p6_0[] = { static const static_codebook _44p6_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p6_0, + (char *)_vq_lengthlist__44p6_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p6_p6_0, 0 @@ -7236,7 +7253,7 @@ static const long _vq_quantlist__44p6_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p6_p6_1[] = { +static const char _vq_lengthlist__44p6_p6_1[] = { 2, 6, 6, 6, 7, 8, 6, 8, 7, 6, 7, 7, 7, 7, 8, 7, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 7, 6, 8, 8, 8, 9, 9, 8, 9, 9, 8, 9, 9, 9, 9,10, 9,10,10, 8, 9, 9, @@ -7257,7 +7274,7 @@ static const long _vq_lengthlist__44p6_p6_1[] = { static const static_codebook _44p6_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p6_p6_1, + (char *)_vq_lengthlist__44p6_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p6_p6_1, 0 @@ -7269,7 +7286,7 @@ static const long _vq_quantlist__44p6_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p7_0[] = { +static const char _vq_lengthlist__44p6_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -7290,7 +7307,7 @@ static const long _vq_lengthlist__44p6_p7_0[] = { static const static_codebook _44p6_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p7_0, + (char *)_vq_lengthlist__44p6_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p6_p7_0, 0 @@ -7302,7 +7319,7 @@ static const long _vq_quantlist__44p6_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p6_p7_1[] = { +static const char _vq_lengthlist__44p6_p7_1[] = { 1, 4, 5, 5,10,10, 5,10,10, 5,10,10,10,10,10,10, 10,10, 5,10,10,10,10,10,10,10,10, 7,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -7323,7 +7340,7 @@ static const long _vq_lengthlist__44p6_p7_1[] = { static const static_codebook _44p6_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p6_p7_1, + (char *)_vq_lengthlist__44p6_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p6_p7_1, 0 @@ -7357,14 +7374,14 @@ static const long _vq_quantlist__44p6_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p6_p7_2[] = { +static const char _vq_lengthlist__44p6_p7_2[] = { 1, 2, 3, 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p6_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p6_p7_2, + (char *)_vq_lengthlist__44p6_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p6_p7_2, 0 @@ -7398,20 +7415,20 @@ static const long _vq_quantlist__44p6_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p6_p7_3[] = { +static const char _vq_lengthlist__44p6_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p6_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p6_p7_3, + (char *)_vq_lengthlist__44p6_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p6_p7_3, 0 }; -static const long _huff_lengthlist__44p6_short[] = { +static const char _huff_lengthlist__44p6_short[] = { 2, 8,13,15,16,18,21,22, 5, 4, 6, 8,10,12,17,21, 9, 5, 5, 6, 8,11,15,19,11, 6, 5, 5, 6, 7,12,14, 14, 8, 7, 5, 4, 4, 9,11,16,11, 9, 7, 4, 3, 7,10, @@ -7420,7 +7437,7 @@ static const long _huff_lengthlist__44p6_short[] = { static const static_codebook _huff_book__44p6_short = { 2, 64, - (long *)_huff_lengthlist__44p6_short, + (char *)_huff_lengthlist__44p6_short, 0, 0, 0, 0, 0, NULL, 0 @@ -7442,7 +7459,7 @@ static const long _vq_quantlist__44p7_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p7_l0_0[] = { +static const char _vq_lengthlist__44p7_l0_0[] = { 2, 4, 4, 7, 7, 8, 8,10,10,11,11,12,12, 4, 5, 5, 7, 7, 9, 9,11, 9,12,11,12,12, 4, 5, 5, 7, 7, 9, 9, 9,10,10,11,12,12, 7, 7, 7, 7, 8, 9, 8,11, 5, @@ -7458,7 +7475,7 @@ static const long _vq_lengthlist__44p7_l0_0[] = { static const static_codebook _44p7_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p7_l0_0, + (char *)_vq_lengthlist__44p7_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p7_l0_0, 0 @@ -7472,14 +7489,14 @@ static const long _vq_quantlist__44p7_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p7_l0_1[] = { +static const char _vq_lengthlist__44p7_l0_1[] = { 4, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p7_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p7_l0_1, + (char *)_vq_lengthlist__44p7_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_l0_1, 0 @@ -7493,32 +7510,32 @@ static const long _vq_quantlist__44p7_l1_0[] = { 108, }; -static const long _vq_lengthlist__44p7_l1_0[] = { +static const char _vq_lengthlist__44p7_l1_0[] = { 1, 2, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; static const static_codebook _44p7_l1_0 = { 2, 25, - (long *)_vq_lengthlist__44p7_l1_0, + (char *)_vq_lengthlist__44p7_l1_0, 1, -514516992, 1620639744, 7, 0, (long *)_vq_quantlist__44p7_l1_0, 0 }; -static const long _huff_lengthlist__44p7_lfe[] = { +static const char _huff_lengthlist__44p7_lfe[] = { 2, 3, 1, 3, }; static const static_codebook _huff_book__44p7_lfe = { 2, 4, - (long *)_huff_lengthlist__44p7_lfe, + (char *)_huff_lengthlist__44p7_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p7_long[] = { +static const char _huff_lengthlist__44p7_long[] = { 2, 7,14,16,17,17,18,20, 6, 3, 5, 8,10,11,13,15, 13, 5, 3, 5, 8, 9,11,12,15, 7, 4, 3, 5, 7, 9,11, 16,10, 7, 5, 6, 7, 9,10,17,11, 8, 7, 7, 6, 8, 8, @@ -7527,7 +7544,7 @@ static const long _huff_lengthlist__44p7_long[] = { static const static_codebook _huff_book__44p7_long = { 2, 64, - (long *)_huff_lengthlist__44p7_long, + (char *)_huff_lengthlist__44p7_long, 0, 0, 0, 0, 0, NULL, 0 @@ -7539,7 +7556,7 @@ static const long _vq_quantlist__44p7_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p1_0[] = { +static const char _vq_lengthlist__44p7_p1_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 6, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10,10,10,12,10,11,11, 8,10,10, @@ -7560,7 +7577,7 @@ static const long _vq_lengthlist__44p7_p1_0[] = { static const static_codebook _44p7_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p1_0, + (char *)_vq_lengthlist__44p7_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p7_p1_0, 0 @@ -7574,7 +7591,7 @@ static const long _vq_quantlist__44p7_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p7_p2_0[] = { +static const char _vq_lengthlist__44p7_p2_0[] = { 4, 6, 6, 9, 9, 6, 8, 8,10,10, 6, 8, 8,10,10, 8, 10,10,12,13, 8,10,10,13,12, 6, 8, 8,10,10, 8, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,13,10,11,11, @@ -7775,7 +7792,7 @@ static const long _vq_lengthlist__44p7_p2_0[] = { static const static_codebook _44p7_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p7_p2_0, + (char *)_vq_lengthlist__44p7_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_p2_0, 0 @@ -7787,7 +7804,7 @@ static const long _vq_quantlist__44p7_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p3_0[] = { +static const char _vq_lengthlist__44p7_p3_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 7, 5, 7, 8, 7, 8,10, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7,10, 8, 5, 7, 8, 8, 9, 10, 8,10,10, 8, 9,10,10,10,12,10,12,12, 8,10,10, @@ -7808,7 +7825,7 @@ static const long _vq_lengthlist__44p7_p3_0[] = { static const static_codebook _44p7_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p3_0, + (char *)_vq_lengthlist__44p7_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p7_p3_0, 0 @@ -7820,7 +7837,7 @@ static const long _vq_quantlist__44p7_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p7_p3_1[] = { +static const char _vq_lengthlist__44p7_p3_1[] = { 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 7, 8, 8, 7, 8, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 8, 8, @@ -7841,7 +7858,7 @@ static const long _vq_lengthlist__44p7_p3_1[] = { static const static_codebook _44p7_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p7_p3_1, + (char *)_vq_lengthlist__44p7_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p7_p3_1, 0 @@ -7853,7 +7870,7 @@ static const long _vq_quantlist__44p7_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p4_0[] = { +static const char _vq_lengthlist__44p7_p4_0[] = { 1, 5, 5, 5, 7, 8, 5, 8, 7, 5, 7, 8, 7, 8,10, 8, 10,10, 5, 8, 7, 8,10,10, 7,10, 8, 6, 8, 9, 9,10, 12, 9,11,11, 9,10,11,11,11,13,11,13,13, 9,11,11, @@ -7874,7 +7891,7 @@ static const long _vq_lengthlist__44p7_p4_0[] = { static const static_codebook _44p7_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p4_0, + (char *)_vq_lengthlist__44p7_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p7_p4_0, 0 @@ -7888,7 +7905,7 @@ static const long _vq_quantlist__44p7_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p7_p4_1[] = { +static const char _vq_lengthlist__44p7_p4_1[] = { 7, 8, 8,10,10, 8, 9, 9,10,11, 8, 9, 9,10,10, 9, 10,10,11,11, 9,10,10,11,11, 8, 9, 9,10,10, 9, 9, 10,11,11, 9,10,10,11,11,10,10,11,11,11,10,11,11, @@ -8089,7 +8106,7 @@ static const long _vq_lengthlist__44p7_p4_1[] = { static const static_codebook _44p7_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p7_p4_1, + (char *)_vq_lengthlist__44p7_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_p4_1, 0 @@ -8103,7 +8120,7 @@ static const long _vq_quantlist__44p7_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p7_p5_0[] = { +static const char _vq_lengthlist__44p7_p5_0[] = { 2, 6, 6, 9, 9, 5, 7, 8,10,11, 5, 8, 7,11,10, 8, 10,11,12,13, 8,11,10,13,12, 6, 7, 8,10,11, 7, 8, 10,10,12, 8, 9, 9,12,11,10,10,12,11,14,10,11,12, @@ -8304,7 +8321,7 @@ static const long _vq_lengthlist__44p7_p5_0[] = { static const static_codebook _44p7_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p7_p5_0, + (char *)_vq_lengthlist__44p7_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p7_p5_0, 0 @@ -8320,13 +8337,13 @@ static const long _vq_quantlist__44p7_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p7_p5_1[] = { +static const char _vq_lengthlist__44p7_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p7_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p7_p5_1, + (char *)_vq_lengthlist__44p7_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_p5_1, 0 @@ -8338,7 +8355,7 @@ static const long _vq_quantlist__44p7_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p6_0[] = { +static const char _vq_lengthlist__44p7_p6_0[] = { 2, 5, 6, 5, 7, 8, 5, 8, 7, 5, 7, 7, 7, 7, 9, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7, 9, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9, 9,11,10,10,11, 8,10, 9, @@ -8359,7 +8376,7 @@ static const long _vq_lengthlist__44p7_p6_0[] = { static const static_codebook _44p7_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p6_0, + (char *)_vq_lengthlist__44p7_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p7_p6_0, 0 @@ -8371,7 +8388,7 @@ static const long _vq_quantlist__44p7_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p7_p6_1[] = { +static const char _vq_lengthlist__44p7_p6_1[] = { 4, 7, 7, 6, 7, 8, 6, 8, 7, 7, 7, 8, 7, 7, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 8, 8, 8, @@ -8392,7 +8409,7 @@ static const long _vq_lengthlist__44p7_p6_1[] = { static const static_codebook _44p7_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p7_p6_1, + (char *)_vq_lengthlist__44p7_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p7_p6_1, 0 @@ -8404,7 +8421,7 @@ static const long _vq_quantlist__44p7_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p7_0[] = { +static const char _vq_lengthlist__44p7_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -8425,7 +8442,7 @@ static const long _vq_lengthlist__44p7_p7_0[] = { static const static_codebook _44p7_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p7_0, + (char *)_vq_lengthlist__44p7_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p7_p7_0, 0 @@ -8437,7 +8454,7 @@ static const long _vq_quantlist__44p7_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p7_p7_1[] = { +static const char _vq_lengthlist__44p7_p7_1[] = { 1, 5, 5, 4,10,10, 5,10,10, 5,10,10,10,10,10,10, 10,10, 5,10,10,10,10,10, 9,10,10, 6,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -8458,7 +8475,7 @@ static const long _vq_lengthlist__44p7_p7_1[] = { static const static_codebook _44p7_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p7_p7_1, + (char *)_vq_lengthlist__44p7_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p7_p7_1, 0 @@ -8492,14 +8509,14 @@ static const long _vq_quantlist__44p7_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p7_p7_2[] = { +static const char _vq_lengthlist__44p7_p7_2[] = { 1, 3, 2, 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p7_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p7_p7_2, + (char *)_vq_lengthlist__44p7_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p7_p7_2, 0 @@ -8533,20 +8550,20 @@ static const long _vq_quantlist__44p7_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p7_p7_3[] = { +static const char _vq_lengthlist__44p7_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p7_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p7_p7_3, + (char *)_vq_lengthlist__44p7_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p7_p7_3, 0 }; -static const long _huff_lengthlist__44p7_short[] = { +static const char _huff_lengthlist__44p7_short[] = { 3, 9,14,16,17,19,22,22, 5, 4, 6, 9,11,13,17,20, 9, 5, 5, 6, 9,11,15,19,11, 7, 5, 5, 7, 9,13,17, 14, 9, 7, 6, 6, 7,11,14,16,11, 9, 7, 6, 4, 4, 8, @@ -8555,7 +8572,7 @@ static const long _huff_lengthlist__44p7_short[] = { static const static_codebook _huff_book__44p7_short = { 2, 64, - (long *)_huff_lengthlist__44p7_short, + (char *)_huff_lengthlist__44p7_short, 0, 0, 0, 0, 0, NULL, 0 @@ -8577,7 +8594,7 @@ static const long _vq_quantlist__44p8_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p8_l0_0[] = { +static const char _vq_lengthlist__44p8_l0_0[] = { 2, 4, 4, 7, 7, 8, 8,10,10,11,11,12,12, 4, 5, 5, 7, 7, 9, 9,10, 9,12,10,12,12, 4, 5, 5, 7, 7, 9, 9, 9,10,10,12,12,12, 7, 7, 7, 7, 8, 9, 8,11, 5, @@ -8593,7 +8610,7 @@ static const long _vq_lengthlist__44p8_l0_0[] = { static const static_codebook _44p8_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p8_l0_0, + (char *)_vq_lengthlist__44p8_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p8_l0_0, 0 @@ -8607,14 +8624,14 @@ static const long _vq_quantlist__44p8_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p8_l0_1[] = { +static const char _vq_lengthlist__44p8_l0_1[] = { 4, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p8_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p8_l0_1, + (char *)_vq_lengthlist__44p8_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_l0_1, 0 @@ -8628,32 +8645,32 @@ static const long _vq_quantlist__44p8_l1_0[] = { 108, }; -static const long _vq_lengthlist__44p8_l1_0[] = { +static const char _vq_lengthlist__44p8_l1_0[] = { 1, 2, 3, 6, 7, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; static const static_codebook _44p8_l1_0 = { 2, 25, - (long *)_vq_lengthlist__44p8_l1_0, + (char *)_vq_lengthlist__44p8_l1_0, 1, -514516992, 1620639744, 7, 0, (long *)_vq_quantlist__44p8_l1_0, 0 }; -static const long _huff_lengthlist__44p8_lfe[] = { +static const char _huff_lengthlist__44p8_lfe[] = { 2, 3, 1, 3, }; static const static_codebook _huff_book__44p8_lfe = { 2, 4, - (long *)_huff_lengthlist__44p8_lfe, + (char *)_huff_lengthlist__44p8_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p8_long[] = { +static const char _huff_lengthlist__44p8_long[] = { 2, 7,14,16,17,18,20,21, 7, 4, 6, 8,11,12,14,16, 13, 5, 4, 4, 8, 9,11,13,15, 8, 4, 3, 5, 7, 9,10, 17,11, 8, 4, 4, 6, 9, 9,17,11, 9, 7, 6, 5, 7, 8, @@ -8662,7 +8679,7 @@ static const long _huff_lengthlist__44p8_long[] = { static const static_codebook _huff_book__44p8_long = { 2, 64, - (long *)_huff_lengthlist__44p8_long, + (char *)_huff_lengthlist__44p8_long, 0, 0, 0, 0, 0, NULL, 0 @@ -8674,7 +8691,7 @@ static const long _vq_quantlist__44p8_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p1_0[] = { +static const char _vq_lengthlist__44p8_p1_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 6, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10,10,10,12,10,11,12, 8,10,10, @@ -8695,7 +8712,7 @@ static const long _vq_lengthlist__44p8_p1_0[] = { static const static_codebook _44p8_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p1_0, + (char *)_vq_lengthlist__44p8_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p8_p1_0, 0 @@ -8709,7 +8726,7 @@ static const long _vq_quantlist__44p8_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p8_p2_0[] = { +static const char _vq_lengthlist__44p8_p2_0[] = { 4, 6, 6, 9, 9, 6, 8, 8,10,10, 6, 8, 8,10,10, 8, 9,10,12,12, 8,10, 9,12,12, 6, 8, 8,10,10, 8, 8, 9,10,11, 8, 9, 9,11,11, 9,10,11,12,13,10,11,11, @@ -8910,7 +8927,7 @@ static const long _vq_lengthlist__44p8_p2_0[] = { static const static_codebook _44p8_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p2_0, + (char *)_vq_lengthlist__44p8_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_p2_0, 0 @@ -8922,7 +8939,7 @@ static const long _vq_quantlist__44p8_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p3_0[] = { +static const char _vq_lengthlist__44p8_p3_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 7, 9, 10, 8, 9, 9, 8, 9,10, 9,10,12,10,11,11, 8,10, 9, @@ -8943,7 +8960,7 @@ static const long _vq_lengthlist__44p8_p3_0[] = { static const static_codebook _44p8_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p3_0, + (char *)_vq_lengthlist__44p8_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p8_p3_0, 0 @@ -8955,7 +8972,7 @@ static const long _vq_quantlist__44p8_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p8_p3_1[] = { +static const char _vq_lengthlist__44p8_p3_1[] = { 6, 7, 7, 7, 7, 8, 7, 8, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -8976,7 +8993,7 @@ static const long _vq_lengthlist__44p8_p3_1[] = { static const static_codebook _44p8_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p8_p3_1, + (char *)_vq_lengthlist__44p8_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p8_p3_1, 0 @@ -8988,7 +9005,7 @@ static const long _vq_quantlist__44p8_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p4_0[] = { +static const char _vq_lengthlist__44p8_p4_0[] = { 2, 5, 5, 4, 7, 8, 4, 8, 7, 5, 7, 8, 7, 7,10, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7,10, 7, 5, 7, 8, 8, 9, 11, 8,10,10, 8, 9,10,10,10,12,11,12,12, 8,10,10, @@ -9009,7 +9026,7 @@ static const long _vq_lengthlist__44p8_p4_0[] = { static const static_codebook _44p8_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p4_0, + (char *)_vq_lengthlist__44p8_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p8_p4_0, 0 @@ -9023,7 +9040,7 @@ static const long _vq_quantlist__44p8_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p8_p4_1[] = { +static const char _vq_lengthlist__44p8_p4_1[] = { 7, 9, 9,10,10, 9,10,10,10,11, 9,10,10,11,10, 9, 10,10,11,11, 9,10,10,11,11, 9,10,10,11,11,10,10, 10,11,11,10,10,10,11,11,10,11,11,11,11,10,11,11, @@ -9224,7 +9241,7 @@ static const long _vq_lengthlist__44p8_p4_1[] = { static const static_codebook _44p8_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p4_1, + (char *)_vq_lengthlist__44p8_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_p4_1, 0 @@ -9238,7 +9255,7 @@ static const long _vq_quantlist__44p8_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p8_p5_0[] = { +static const char _vq_lengthlist__44p8_p5_0[] = { 2, 6, 6, 9, 9, 5, 7, 8,10,11, 5, 8, 7,11,10, 8, 10,11,12,13, 8,11,10,13,12, 6, 7, 8,10,11, 7, 8, 10,10,12, 8, 9, 9,12,12,10,10,12,12,14,10,12,12, @@ -9439,7 +9456,7 @@ static const long _vq_lengthlist__44p8_p5_0[] = { static const static_codebook _44p8_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p5_0, + (char *)_vq_lengthlist__44p8_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p8_p5_0, 0 @@ -9455,13 +9472,13 @@ static const long _vq_quantlist__44p8_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p8_p5_1[] = { +static const char _vq_lengthlist__44p8_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p8_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p8_p5_1, + (char *)_vq_lengthlist__44p8_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_p5_1, 0 @@ -9473,7 +9490,7 @@ static const long _vq_quantlist__44p8_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p6_0[] = { +static const char _vq_lengthlist__44p8_p6_0[] = { 2, 6, 6, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 7, 9, 7, 9, 9, 6, 7, 7, 8, 9, 9, 7, 9, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9, 9,10,10,10,10, 8, 9, 9, @@ -9494,7 +9511,7 @@ static const long _vq_lengthlist__44p8_p6_0[] = { static const static_codebook _44p8_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p6_0, + (char *)_vq_lengthlist__44p8_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p8_p6_0, 0 @@ -9506,7 +9523,7 @@ static const long _vq_quantlist__44p8_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p8_p6_1[] = { +static const char _vq_lengthlist__44p8_p6_1[] = { 4, 7, 7, 7, 7, 8, 7, 8, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 8, 8, @@ -9527,7 +9544,7 @@ static const long _vq_lengthlist__44p8_p6_1[] = { static const static_codebook _44p8_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p8_p6_1, + (char *)_vq_lengthlist__44p8_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p8_p6_1, 0 @@ -9539,7 +9556,7 @@ static const long _vq_quantlist__44p8_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p7_0[] = { +static const char _vq_lengthlist__44p8_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -9560,7 +9577,7 @@ static const long _vq_lengthlist__44p8_p7_0[] = { static const static_codebook _44p8_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p7_0, + (char *)_vq_lengthlist__44p8_p7_0, 1, -512202240, 1635281408, 2, 0, (long *)_vq_quantlist__44p8_p7_0, 0 @@ -9574,7 +9591,7 @@ static const long _vq_quantlist__44p8_p7_1[] = { 4, }; -static const long _vq_lengthlist__44p8_p7_1[] = { +static const char _vq_lengthlist__44p8_p7_1[] = { 1, 7, 7,12,12, 5,11,12,12,12, 5,12,11,12,12,12, 12,12,12,12,12,13,13,13,13, 7,11,11,13,13,13,12, 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, @@ -9775,7 +9792,7 @@ static const long _vq_lengthlist__44p8_p7_1[] = { static const static_codebook _44p8_p7_1 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p7_1, + (char *)_vq_lengthlist__44p8_p7_1, 1, -514619392, 1630767104, 3, 0, (long *)_vq_quantlist__44p8_p7_1, 0 @@ -9809,14 +9826,14 @@ static const long _vq_quantlist__44p8_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p8_p7_2[] = { +static const char _vq_lengthlist__44p8_p7_2[] = { 1, 3, 2, 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p8_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p8_p7_2, + (char *)_vq_lengthlist__44p8_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p8_p7_2, 0 @@ -9850,20 +9867,20 @@ static const long _vq_quantlist__44p8_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p8_p7_3[] = { +static const char _vq_lengthlist__44p8_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p8_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p8_p7_3, + (char *)_vq_lengthlist__44p8_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p8_p7_3, 0 }; -static const long _huff_lengthlist__44p8_short[] = { +static const char _huff_lengthlist__44p8_short[] = { 3, 9,15,17,20,21,22,23, 5, 5, 7, 9,11,13,17,20, 9, 5, 5, 6, 8,10,15,18,11, 7, 5, 4, 6, 9,13,17, 14, 9, 7, 5, 6, 7,10,14,17,10, 8, 6, 6, 4, 5, 8, @@ -9872,7 +9889,7 @@ static const long _huff_lengthlist__44p8_short[] = { static const static_codebook _huff_book__44p8_short = { 2, 64, - (long *)_huff_lengthlist__44p8_short, + (char *)_huff_lengthlist__44p8_short, 0, 0, 0, 0, 0, NULL, 0 @@ -9894,7 +9911,7 @@ static const long _vq_quantlist__44p9_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p9_l0_0[] = { +static const char _vq_lengthlist__44p9_l0_0[] = { 2, 5, 5, 7, 6, 8, 8, 9, 9,10,10,11,11, 4, 5, 5, 6, 7, 8, 8, 9, 9,10,10,11,10, 4, 5, 5, 7, 6, 8, 8, 9, 9,10,10,10,10, 6, 6, 7, 6, 7, 8, 8, 9, 9, @@ -9910,7 +9927,7 @@ static const long _vq_lengthlist__44p9_l0_0[] = { static const static_codebook _44p9_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p9_l0_0, + (char *)_vq_lengthlist__44p9_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p9_l0_0, 0 @@ -9924,14 +9941,14 @@ static const long _vq_quantlist__44p9_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p9_l0_1[] = { +static const char _vq_lengthlist__44p9_l0_1[] = { 4, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p9_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p9_l0_1, + (char *)_vq_lengthlist__44p9_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_l0_1, 0 @@ -9945,38 +9962,38 @@ static const long _vq_quantlist__44p9_l1_0[] = { 4, }; -static const long _vq_lengthlist__44p9_l1_0[] = { +static const char _vq_lengthlist__44p9_l1_0[] = { 1, 2, 3, 5, 9, 9, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10, }; static const static_codebook _44p9_l1_0 = { 2, 25, - (long *)_vq_lengthlist__44p9_l1_0, + (char *)_vq_lengthlist__44p9_l1_0, 1, -514619392, 1630767104, 3, 0, (long *)_vq_quantlist__44p9_l1_0, 0 }; -static const long _huff_lengthlist__44p9_lfe[] = { +static const char _huff_lengthlist__44p9_lfe[] = { 1, 1, }; static const static_codebook _huff_book__44p9_lfe = { 1, 2, - (long *)_huff_lengthlist__44p9_lfe, + (char *)_huff_lengthlist__44p9_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p9_long[] = { +static const char _huff_lengthlist__44p9_long[] = { 3, 3, 3, 3, 3, 3, 3, 3, }; static const static_codebook _huff_book__44p9_long = { 1, 8, - (long *)_huff_lengthlist__44p9_long, + (char *)_huff_lengthlist__44p9_long, 0, 0, 0, 0, 0, NULL, 0 @@ -9988,7 +10005,7 @@ static const long _vq_quantlist__44p9_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p1_0[] = { +static const char _vq_lengthlist__44p9_p1_0[] = { 1, 5, 5, 4, 8, 8, 4, 8, 8, 5, 7, 8, 8, 9,10, 8, 10,10, 5, 8, 7, 8,10,10, 8,10, 9, 7, 9, 9, 9,11, 11, 9,11,11, 9,11,11,11,12,13,11,13,13, 9,11,11, @@ -10009,7 +10026,7 @@ static const long _vq_lengthlist__44p9_p1_0[] = { static const static_codebook _44p9_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p1_0, + (char *)_vq_lengthlist__44p9_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p9_p1_0, 0 @@ -10023,7 +10040,7 @@ static const long _vq_quantlist__44p9_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p9_p2_0[] = { +static const char _vq_lengthlist__44p9_p2_0[] = { 4, 6, 6, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 6, 8, 8,11,11, 6, 8, 8,11,11, 6, 7, 7, 9, 9, 7, 8, 9,10,11, 7, 9, 9,11,10, 8, 9,10,12,12, 8,10,10, @@ -10224,7 +10241,7 @@ static const long _vq_lengthlist__44p9_p2_0[] = { static const static_codebook _44p9_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p2_0, + (char *)_vq_lengthlist__44p9_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_p2_0, 0 @@ -10236,7 +10253,7 @@ static const long _vq_quantlist__44p9_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p3_0[] = { +static const char _vq_lengthlist__44p9_p3_0[] = { 2, 5, 4, 4, 7, 7, 4, 7, 6, 5, 6, 7, 7, 8, 9, 7, 9, 9, 5, 7, 6, 7, 9, 9, 7, 9, 8, 6, 8, 8, 8,10, 10, 8,10,10, 8, 9,10,10,11,12,10,12,12, 8,10,10, @@ -10257,7 +10274,7 @@ static const long _vq_lengthlist__44p9_p3_0[] = { static const static_codebook _44p9_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p3_0, + (char *)_vq_lengthlist__44p9_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p9_p3_0, 0 @@ -10269,7 +10286,7 @@ static const long _vq_quantlist__44p9_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p9_p3_1[] = { +static const char _vq_lengthlist__44p9_p3_1[] = { 4, 6, 6, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 7, 8, 7, 7, 8, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 8, 9, 9, 8, 8, 8, @@ -10290,7 +10307,7 @@ static const long _vq_lengthlist__44p9_p3_1[] = { static const static_codebook _44p9_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p9_p3_1, + (char *)_vq_lengthlist__44p9_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p9_p3_1, 0 @@ -10302,7 +10319,7 @@ static const long _vq_quantlist__44p9_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p4_0[] = { +static const char _vq_lengthlist__44p9_p4_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 6, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 6, 7, 8, 8, 9, 10, 8,10,10, 8, 9,10,10,11,12,10,11,12, 8,10,10, @@ -10323,7 +10340,7 @@ static const long _vq_lengthlist__44p9_p4_0[] = { static const static_codebook _44p9_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p4_0, + (char *)_vq_lengthlist__44p9_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p9_p4_0, 0 @@ -10337,7 +10354,7 @@ static const long _vq_quantlist__44p9_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p9_p4_1[] = { +static const char _vq_lengthlist__44p9_p4_1[] = { 6, 8, 8,10, 9, 8, 9, 9,10,10, 8, 9, 9,10,10, 8, 10,10,10,10, 8,10,10,10,10, 9, 9, 9,10,10, 9,10, 10,10,11, 9,10,10,11,11,10,10,10,11,11,10,10,10, @@ -10538,7 +10555,7 @@ static const long _vq_lengthlist__44p9_p4_1[] = { static const static_codebook _44p9_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p4_1, + (char *)_vq_lengthlist__44p9_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_p4_1, 0 @@ -10552,7 +10569,7 @@ static const long _vq_quantlist__44p9_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p9_p5_0[] = { +static const char _vq_lengthlist__44p9_p5_0[] = { 4, 6, 6, 9, 9, 6, 7, 8,10,11, 6, 8, 7,10,10, 8, 10,10,12,12, 8,10,10,12,12, 6, 7, 8,10,10, 7, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,13,10,11,11, @@ -10753,7 +10770,7 @@ static const long _vq_lengthlist__44p9_p5_0[] = { static const static_codebook _44p9_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p5_0, + (char *)_vq_lengthlist__44p9_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p9_p5_0, 0 @@ -10769,13 +10786,13 @@ static const long _vq_quantlist__44p9_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p9_p5_1[] = { +static const char _vq_lengthlist__44p9_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p9_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p9_p5_1, + (char *)_vq_lengthlist__44p9_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_p5_1, 0 @@ -10787,7 +10804,7 @@ static const long _vq_quantlist__44p9_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p6_0[] = { +static const char _vq_lengthlist__44p9_p6_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10,10,10,12,10,11,11, 8,10,10, @@ -10808,7 +10825,7 @@ static const long _vq_lengthlist__44p9_p6_0[] = { static const static_codebook _44p9_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p6_0, + (char *)_vq_lengthlist__44p9_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p9_p6_0, 0 @@ -10820,7 +10837,7 @@ static const long _vq_quantlist__44p9_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p9_p6_1[] = { +static const char _vq_lengthlist__44p9_p6_1[] = { 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 7, 8, 8, 7, 8, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 8, 8, @@ -10841,7 +10858,7 @@ static const long _vq_lengthlist__44p9_p6_1[] = { static const static_codebook _44p9_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p9_p6_1, + (char *)_vq_lengthlist__44p9_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p9_p6_1, 0 @@ -10855,7 +10872,7 @@ static const long _vq_quantlist__44p9_p7_0[] = { 4, }; -static const long _vq_lengthlist__44p9_p7_0[] = { +static const char _vq_lengthlist__44p9_p7_0[] = { 1,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -11056,7 +11073,7 @@ static const long _vq_lengthlist__44p9_p7_0[] = { static const static_codebook _44p9_p7_0 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p7_0, + (char *)_vq_lengthlist__44p9_p7_0, 1, -510105088, 1635281408, 3, 0, (long *)_vq_quantlist__44p9_p7_0, 0 @@ -11070,7 +11087,7 @@ static const long _vq_quantlist__44p9_p7_1[] = { 4, }; -static const long _vq_lengthlist__44p9_p7_1[] = { +static const char _vq_lengthlist__44p9_p7_1[] = { 1, 4, 4,16,16, 4, 9,11,15,16, 4,12, 8,16,16,12, 16,16,16,16,13,16,16,16,16, 5, 8,10,16,16, 9, 9, 14,15,16,12,14,14,16,16,16,16,16,16,16,16,16,16, @@ -11271,7 +11288,7 @@ static const long _vq_lengthlist__44p9_p7_1[] = { static const static_codebook _44p9_p7_1 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p7_1, + (char *)_vq_lengthlist__44p9_p7_1, 1, -514619392, 1630767104, 3, 0, (long *)_vq_quantlist__44p9_p7_1, 0 @@ -11305,14 +11322,14 @@ static const long _vq_quantlist__44p9_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p9_p7_2[] = { +static const char _vq_lengthlist__44p9_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9,10,10,10,11,11,11, 12,12,12,13,13,13,13,13,13, }; static const static_codebook _44p9_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p9_p7_2, + (char *)_vq_lengthlist__44p9_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p9_p7_2, 0 @@ -11346,26 +11363,26 @@ static const long _vq_quantlist__44p9_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p9_p7_3[] = { +static const char _vq_lengthlist__44p9_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p9_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p9_p7_3, + (char *)_vq_lengthlist__44p9_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p9_p7_3, 0 }; -static const long _huff_lengthlist__44p9_short[] = { +static const char _huff_lengthlist__44p9_short[] = { 3, 3, 3, 3, 3, 3, 3, 3, }; static const static_codebook _huff_book__44p9_short = { 1, 8, - (long *)_huff_lengthlist__44p9_short, + (char *)_huff_lengthlist__44p9_short, 0, 0, 0, 0, 0, NULL, 0 @@ -11387,7 +11404,7 @@ static const long _vq_quantlist__44pn1_l0_0[] = { 12, }; -static const long _vq_lengthlist__44pn1_l0_0[] = { +static const char _vq_lengthlist__44pn1_l0_0[] = { 1, 3, 3, 8, 8,10,10,10,10,10,10,10,10, 5, 7, 5, 9, 8,10,10,10,10,11,10,11,10, 5, 5, 7, 8, 9,10, 10,11,10,10,11,10,11,10,10,10,11,11,11,11,11,11, @@ -11403,7 +11420,7 @@ static const long _vq_lengthlist__44pn1_l0_0[] = { static const static_codebook _44pn1_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44pn1_l0_0, + (char *)_vq_lengthlist__44pn1_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44pn1_l0_0, 0 @@ -11417,14 +11434,14 @@ static const long _vq_quantlist__44pn1_l0_1[] = { 4, }; -static const long _vq_lengthlist__44pn1_l0_1[] = { +static const char _vq_lengthlist__44pn1_l0_1[] = { 1, 4, 4, 7, 7, 4, 5, 6, 7, 7, 4, 6, 5, 7, 7, 7, 6, 7, 6, 7, 7, 7, 6, 7, 6, }; static const static_codebook _44pn1_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44pn1_l0_1, + (char *)_vq_lengthlist__44pn1_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44pn1_l0_1, 0 @@ -11436,31 +11453,31 @@ static const long _vq_quantlist__44pn1_l1_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_l1_0[] = { +static const char _vq_lengthlist__44pn1_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44pn1_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44pn1_l1_0, + (char *)_vq_lengthlist__44pn1_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44pn1_l1_0, 0 }; -static const long _huff_lengthlist__44pn1_lfe[] = { +static const char _huff_lengthlist__44pn1_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44pn1_lfe = { 2, 4, - (long *)_huff_lengthlist__44pn1_lfe, + (char *)_huff_lengthlist__44pn1_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44pn1_long[] = { +static const char _huff_lengthlist__44pn1_long[] = { 2, 3, 6, 7, 9,13,17, 3, 2, 5, 7, 9,13,17, 6, 5, 5, 6, 9,12,16, 7, 7, 6, 6, 7,10,13,10,10, 9, 7, 6,10,13,13,13,12,10,10,11,15,17,17,17,14,14,15, @@ -11469,7 +11486,7 @@ static const long _huff_lengthlist__44pn1_long[] = { static const static_codebook _huff_book__44pn1_long = { 2, 49, - (long *)_huff_lengthlist__44pn1_long, + (char *)_huff_lengthlist__44pn1_long, 0, 0, 0, 0, 0, NULL, 0 @@ -11481,7 +11498,7 @@ static const long _vq_quantlist__44pn1_p1_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p1_0[] = { +static const char _vq_lengthlist__44pn1_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11502,7 +11519,7 @@ static const long _vq_lengthlist__44pn1_p1_0[] = { static const static_codebook _44pn1_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p1_0, + (char *)_vq_lengthlist__44pn1_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44pn1_p1_0, 0 @@ -11514,7 +11531,7 @@ static const long _vq_quantlist__44pn1_p2_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p2_0[] = { +static const char _vq_lengthlist__44pn1_p2_0[] = { 1, 5, 5, 0, 7, 7, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 9, 9, 0,13,13, 0, 8, 8, 0, 6, 6, 0,11, 11, 0,12,12, 0,12,12, 0,14,14, 0,11,12, 0,12,12, @@ -11535,7 +11552,7 @@ static const long _vq_lengthlist__44pn1_p2_0[] = { static const static_codebook _44pn1_p2_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p2_0, + (char *)_vq_lengthlist__44pn1_p2_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44pn1_p2_0, 0 @@ -11547,7 +11564,7 @@ static const long _vq_quantlist__44pn1_p2_1[] = { 2, }; -static const long _vq_lengthlist__44pn1_p2_1[] = { +static const char _vq_lengthlist__44pn1_p2_1[] = { 1, 3, 3, 0, 9, 9, 0, 9, 9, 0,10,10, 0, 9, 9, 0, 10,10, 0,10,10, 0,10,10, 0,10,10, 0, 7, 7, 0, 7, 7, 0, 6, 6, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 8, @@ -11568,7 +11585,7 @@ static const long _vq_lengthlist__44pn1_p2_1[] = { static const static_codebook _44pn1_p2_1 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p2_1, + (char *)_vq_lengthlist__44pn1_p2_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44pn1_p2_1, 0 @@ -11580,7 +11597,7 @@ static const long _vq_quantlist__44pn1_p3_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p3_0[] = { +static const char _vq_lengthlist__44pn1_p3_0[] = { 1, 6, 6, 6, 8, 8, 6, 8, 8, 7, 9, 9,10,11,11, 8, 8, 8, 7, 9, 9,11,12,12, 9, 9, 9, 6, 7, 7,10,11, 11,10,11,11,10,11,11,13,13,13,12,12,12,10,12,11, @@ -11601,7 +11618,7 @@ static const long _vq_lengthlist__44pn1_p3_0[] = { static const static_codebook _44pn1_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p3_0, + (char *)_vq_lengthlist__44pn1_p3_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44pn1_p3_0, 0 @@ -11615,7 +11632,7 @@ static const long _vq_quantlist__44pn1_p3_1[] = { 4, }; -static const long _vq_lengthlist__44pn1_p3_1[] = { +static const char _vq_lengthlist__44pn1_p3_1[] = { 2, 3, 4, 9, 9,10,12,12,12,11,10,12,12,13,12,11, 13,12,11,11,11,12,12,12,11,11,13,13,13,13,11,12, 12,14,14,12,13,13,13,13,11,13,13,13,13,11,13,13, @@ -11816,7 +11833,7 @@ static const long _vq_lengthlist__44pn1_p3_1[] = { static const static_codebook _44pn1_p3_1 = { 5, 3125, - (long *)_vq_lengthlist__44pn1_p3_1, + (char *)_vq_lengthlist__44pn1_p3_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44pn1_p3_1, 0 @@ -11830,7 +11847,7 @@ static const long _vq_quantlist__44pn1_p4_0[] = { 4, }; -static const long _vq_lengthlist__44pn1_p4_0[] = { +static const char _vq_lengthlist__44pn1_p4_0[] = { 1, 7, 7,14,14, 6, 8, 8,15,16, 7, 8, 8,16,15, 0, 14,14,17,17, 0,14,14,16,16, 7, 9, 9,16,16,10,11, 11,17,18, 9, 8, 8,16,16, 0,14,14,19,19, 0,14,14, @@ -12031,7 +12048,7 @@ static const long _vq_lengthlist__44pn1_p4_0[] = { static const static_codebook _44pn1_p4_0 = { 5, 3125, - (long *)_vq_lengthlist__44pn1_p4_0, + (char *)_vq_lengthlist__44pn1_p4_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44pn1_p4_0, 0 @@ -12047,13 +12064,13 @@ static const long _vq_quantlist__44pn1_p4_1[] = { 6, }; -static const long _vq_lengthlist__44pn1_p4_1[] = { +static const char _vq_lengthlist__44pn1_p4_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44pn1_p4_1 = { 1, 7, - (long *)_vq_lengthlist__44pn1_p4_1, + (char *)_vq_lengthlist__44pn1_p4_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44pn1_p4_1, 0 @@ -12065,7 +12082,7 @@ static const long _vq_quantlist__44pn1_p5_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p5_0[] = { +static const char _vq_lengthlist__44pn1_p5_0[] = { 1, 7, 7, 6, 8, 8, 7, 8, 8, 7, 9, 9,11,11,11, 9, 8, 8, 7, 9, 9,11,12,11, 9, 9, 9, 6, 7, 7,10,11, 11,10,10,10,10,11,11,15,14,14,12,12,12,11,11,11, @@ -12086,7 +12103,7 @@ static const long _vq_lengthlist__44pn1_p5_0[] = { static const static_codebook _44pn1_p5_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p5_0, + (char *)_vq_lengthlist__44pn1_p5_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44pn1_p5_0, 0 @@ -12098,7 +12115,7 @@ static const long _vq_quantlist__44pn1_p5_1[] = { 2, }; -static const long _vq_lengthlist__44pn1_p5_1[] = { +static const char _vq_lengthlist__44pn1_p5_1[] = { 2, 6, 7, 6, 8, 8, 7, 7, 8, 7, 8, 8, 9, 9, 9, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 6, 6, 6, 9, 7, 7, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -12119,7 +12136,7 @@ static const long _vq_lengthlist__44pn1_p5_1[] = { static const static_codebook _44pn1_p5_1 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p5_1, + (char *)_vq_lengthlist__44pn1_p5_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44pn1_p5_1, 0 @@ -12131,7 +12148,7 @@ static const long _vq_quantlist__44pn1_p6_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p6_0[] = { +static const char _vq_lengthlist__44pn1_p6_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -12152,7 +12169,7 @@ static const long _vq_lengthlist__44pn1_p6_0[] = { static const static_codebook _44pn1_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p6_0, + (char *)_vq_lengthlist__44pn1_p6_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44pn1_p6_0, 0 @@ -12186,14 +12203,14 @@ static const long _vq_quantlist__44pn1_p6_1[] = { 24, }; -static const long _vq_lengthlist__44pn1_p6_1[] = { +static const char _vq_lengthlist__44pn1_p6_1[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44pn1_p6_1 = { 1, 25, - (long *)_vq_lengthlist__44pn1_p6_1, + (char *)_vq_lengthlist__44pn1_p6_1, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44pn1_p6_1, 0 @@ -12227,20 +12244,20 @@ static const long _vq_quantlist__44pn1_p6_2[] = { 24, }; -static const long _vq_lengthlist__44pn1_p6_2[] = { +static const char _vq_lengthlist__44pn1_p6_2[] = { 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44pn1_p6_2 = { 1, 25, - (long *)_vq_lengthlist__44pn1_p6_2, + (char *)_vq_lengthlist__44pn1_p6_2, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44pn1_p6_2, 0 }; -static const long _huff_lengthlist__44pn1_short[] = { +static const char _huff_lengthlist__44pn1_short[] = { 4, 3, 7, 9,12,16,16, 3, 2, 5, 7,11,14,15, 7, 4, 5, 6, 9,12,15, 8, 5, 5, 5, 8,10,14, 9, 7, 6, 6, 8,10,12,12,10,10, 7, 6, 8,10,15,12,10, 6, 4, 7, @@ -12249,7 +12266,7 @@ static const long _huff_lengthlist__44pn1_short[] = { static const static_codebook _huff_book__44pn1_short = { 2, 49, - (long *)_huff_lengthlist__44pn1_short, + (char *)_huff_lengthlist__44pn1_short, 0, 0, 0, 0, 0, NULL, 0 diff --git a/Engine/lib/libvorbis/lib/books/coupled/res_books_stereo.h b/Engine/lib/libvorbis/lib/books/coupled/res_books_stereo.h index 5f26215e9..9a9049f6e 100644 --- a/Engine/lib/libvorbis/lib/books/coupled/res_books_stereo.h +++ b/Engine/lib/libvorbis/lib/books/coupled/res_books_stereo.h @@ -11,7 +11,7 @@ ******************************************************************** function: static codebooks autogenerated by huff/huffbuld - last modified: $Id: res_books_stereo.h 17025 2010-03-25 04:56:56Z xiphmont $ + last modified: $Id: res_books_stereo.h 19057 2014-01-22 12:32:31Z xiphmont $ ********************************************************************/ @@ -23,7 +23,7 @@ static const long _vq_quantlist__16c0_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__16c0_s_p1_0[] = { +static const char _vq_lengthlist__16c0_s_p1_0[] = { 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -439,7 +439,7 @@ static const long _vq_lengthlist__16c0_s_p1_0[] = { static const static_codebook _16c0_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__16c0_s_p1_0, + (char *)_vq_lengthlist__16c0_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16c0_s_p1_0, 0 @@ -453,7 +453,7 @@ static const long _vq_quantlist__16c0_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__16c0_s_p3_0[] = { +static const char _vq_lengthlist__16c0_s_p3_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -498,7 +498,7 @@ static const long _vq_lengthlist__16c0_s_p3_0[] = { static const static_codebook _16c0_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__16c0_s_p3_0, + (char *)_vq_lengthlist__16c0_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c0_s_p3_0, 0 @@ -516,7 +516,7 @@ static const long _vq_quantlist__16c0_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__16c0_s_p4_0[] = { +static const char _vq_lengthlist__16c0_s_p4_0[] = { 1, 3, 2, 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -527,7 +527,7 @@ static const long _vq_lengthlist__16c0_s_p4_0[] = { static const static_codebook _16c0_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__16c0_s_p4_0, + (char *)_vq_lengthlist__16c0_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c0_s_p4_0, 0 @@ -545,7 +545,7 @@ static const long _vq_quantlist__16c0_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__16c0_s_p5_0[] = { +static const char _vq_lengthlist__16c0_s_p5_0[] = { 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0, @@ -556,7 +556,7 @@ static const long _vq_lengthlist__16c0_s_p5_0[] = { static const static_codebook _16c0_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__16c0_s_p5_0, + (char *)_vq_lengthlist__16c0_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c0_s_p5_0, 0 @@ -582,7 +582,7 @@ static const long _vq_quantlist__16c0_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__16c0_s_p6_0[] = { +static const char _vq_lengthlist__16c0_s_p6_0[] = { 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11, 11,11, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11, @@ -606,7 +606,7 @@ static const long _vq_lengthlist__16c0_s_p6_0[] = { static const static_codebook _16c0_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__16c0_s_p6_0, + (char *)_vq_lengthlist__16c0_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16c0_s_p6_0, 0 @@ -618,7 +618,7 @@ static const long _vq_quantlist__16c0_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__16c0_s_p7_0[] = { +static const char _vq_lengthlist__16c0_s_p7_0[] = { 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,11,10,10,11, 11,10, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11, 11,11,11,10, 6, 9, 9,11,12,12,11, 9, 9, 6, 9,10, @@ -629,7 +629,7 @@ static const long _vq_lengthlist__16c0_s_p7_0[] = { static const static_codebook _16c0_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__16c0_s_p7_0, + (char *)_vq_lengthlist__16c0_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16c0_s_p7_0, 0 @@ -649,7 +649,7 @@ static const long _vq_quantlist__16c0_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__16c0_s_p7_1[] = { +static const char _vq_lengthlist__16c0_s_p7_1[] = { 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10, 6, 7, 8, 8, 8, 8, 9, 8,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 7, @@ -662,7 +662,7 @@ static const long _vq_lengthlist__16c0_s_p7_1[] = { static const static_codebook _16c0_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16c0_s_p7_1, + (char *)_vq_lengthlist__16c0_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c0_s_p7_1, 0 @@ -684,7 +684,7 @@ static const long _vq_quantlist__16c0_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__16c0_s_p8_0[] = { +static const char _vq_lengthlist__16c0_s_p8_0[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8,10,10, 6, 5, 6, 8, 8, 8, 8, 8, 8, 8, 9,10,10, 7, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8,10,10, 0, 8, 8, 8, 8, 9, 8, 9, 9, @@ -700,7 +700,7 @@ static const long _vq_lengthlist__16c0_s_p8_0[] = { static const static_codebook _16c0_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__16c0_s_p8_0, + (char *)_vq_lengthlist__16c0_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16c0_s_p8_0, 0 @@ -714,14 +714,14 @@ static const long _vq_quantlist__16c0_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__16c0_s_p8_1[] = { +static const char _vq_lengthlist__16c0_s_p8_1[] = { 1, 4, 3, 5, 5, 7, 7, 7, 6, 6, 7, 7, 7, 5, 5, 7, 7, 7, 6, 6, 7, 7, 7, 6, 6, }; static const static_codebook _16c0_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__16c0_s_p8_1, + (char *)_vq_lengthlist__16c0_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c0_s_p8_1, 0 @@ -733,7 +733,7 @@ static const long _vq_quantlist__16c0_s_p9_0[] = { 2, }; -static const long _vq_lengthlist__16c0_s_p9_0[] = { +static const char _vq_lengthlist__16c0_s_p9_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -744,7 +744,7 @@ static const long _vq_lengthlist__16c0_s_p9_0[] = { static const static_codebook _16c0_s_p9_0 = { 4, 81, - (long *)_vq_lengthlist__16c0_s_p9_0, + (char *)_vq_lengthlist__16c0_s_p9_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__16c0_s_p9_0, 0 @@ -768,7 +768,7 @@ static const long _vq_quantlist__16c0_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__16c0_s_p9_1[] = { +static const char _vq_lengthlist__16c0_s_p9_1[] = { 1, 5, 5, 5, 5, 9,11,11,10,10,10,10,10,10,10, 7, 6, 6, 6, 6,10,10,10,10,10,10,10,10,10,10, 7, 6, 6, 6, 6,10, 9,10,10,10,10,10,10,10,10,10, 7, 7, @@ -788,7 +788,7 @@ static const long _vq_lengthlist__16c0_s_p9_1[] = { static const static_codebook _16c0_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__16c0_s_p9_1, + (char *)_vq_lengthlist__16c0_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16c0_s_p9_1, 0 @@ -818,7 +818,7 @@ static const long _vq_quantlist__16c0_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__16c0_s_p9_2[] = { +static const char _vq_lengthlist__16c0_s_p9_2[] = { 1, 5, 5, 7, 8, 8, 7, 9, 9, 9,12,12,11,12,12,10, 10,11,12,12,12,11,12,12, 8, 9, 8, 7, 9,10,10,11, 11,10,11,12,10,12,10,12,12,12,11,12,11, 9, 8, 8, @@ -851,13 +851,13 @@ static const long _vq_lengthlist__16c0_s_p9_2[] = { static const static_codebook _16c0_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__16c0_s_p9_2, + (char *)_vq_lengthlist__16c0_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16c0_s_p9_2, 0 }; -static const long _huff_lengthlist__16c0_s_single[] = { +static const char _huff_lengthlist__16c0_s_single[] = { 3, 4,19, 7, 9, 7, 8,11, 9,12, 4, 1,19, 6, 7, 7, 8,10,11,13,18,18,18,18,18,18,18,18,18,18, 8, 6, 18, 8, 9, 9,11,12,14,18, 9, 6,18, 9, 7, 8, 9,11, @@ -869,13 +869,13 @@ static const long _huff_lengthlist__16c0_s_single[] = { static const static_codebook _huff_book__16c0_s_single = { 2, 100, - (long *)_huff_lengthlist__16c0_s_single, + (char *)_huff_lengthlist__16c0_s_single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16c1_s_long[] = { +static const char _huff_lengthlist__16c1_s_long[] = { 2, 5,20, 7,10, 7, 8,10,11,11, 4, 2,20, 5, 8, 6, 7, 9,10,10,20,20,20,20,19,19,19,19,19,19, 7, 5, 19, 6,10, 7, 9,11,13,17,11, 8,19,10, 7, 7, 8,10, @@ -887,7 +887,7 @@ static const long _huff_lengthlist__16c1_s_long[] = { static const static_codebook _huff_book__16c1_s_long = { 2, 100, - (long *)_huff_lengthlist__16c1_s_long, + (char *)_huff_lengthlist__16c1_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -899,7 +899,7 @@ static const long _vq_quantlist__16c1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__16c1_s_p1_0[] = { +static const char _vq_lengthlist__16c1_s_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1315,7 +1315,7 @@ static const long _vq_lengthlist__16c1_s_p1_0[] = { static const static_codebook _16c1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__16c1_s_p1_0, + (char *)_vq_lengthlist__16c1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16c1_s_p1_0, 0 @@ -1329,7 +1329,7 @@ static const long _vq_quantlist__16c1_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__16c1_s_p3_0[] = { +static const char _vq_lengthlist__16c1_s_p3_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1374,7 +1374,7 @@ static const long _vq_lengthlist__16c1_s_p3_0[] = { static const static_codebook _16c1_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__16c1_s_p3_0, + (char *)_vq_lengthlist__16c1_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c1_s_p3_0, 0 @@ -1392,7 +1392,7 @@ static const long _vq_quantlist__16c1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__16c1_s_p4_0[] = { +static const char _vq_lengthlist__16c1_s_p4_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -1403,7 +1403,7 @@ static const long _vq_lengthlist__16c1_s_p4_0[] = { static const static_codebook _16c1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__16c1_s_p4_0, + (char *)_vq_lengthlist__16c1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c1_s_p4_0, 0 @@ -1421,7 +1421,7 @@ static const long _vq_quantlist__16c1_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__16c1_s_p5_0[] = { +static const char _vq_lengthlist__16c1_s_p5_0[] = { 1, 3, 3, 5, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -1432,7 +1432,7 @@ static const long _vq_lengthlist__16c1_s_p5_0[] = { static const static_codebook _16c1_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__16c1_s_p5_0, + (char *)_vq_lengthlist__16c1_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c1_s_p5_0, 0 @@ -1458,7 +1458,7 @@ static const long _vq_quantlist__16c1_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__16c1_s_p6_0[] = { +static const char _vq_lengthlist__16c1_s_p6_0[] = { 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,12, 12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -1482,7 +1482,7 @@ static const long _vq_lengthlist__16c1_s_p6_0[] = { static const static_codebook _16c1_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__16c1_s_p6_0, + (char *)_vq_lengthlist__16c1_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16c1_s_p6_0, 0 @@ -1494,7 +1494,7 @@ static const long _vq_quantlist__16c1_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__16c1_s_p7_0[] = { +static const char _vq_lengthlist__16c1_s_p7_0[] = { 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9,10,10, 10, 9, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11, 11,11,10,10, 6,10, 9,11,11,11,11,10,10, 6,10,10, @@ -1505,7 +1505,7 @@ static const long _vq_lengthlist__16c1_s_p7_0[] = { static const static_codebook _16c1_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__16c1_s_p7_0, + (char *)_vq_lengthlist__16c1_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16c1_s_p7_0, 0 @@ -1525,7 +1525,7 @@ static const long _vq_quantlist__16c1_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__16c1_s_p7_1[] = { +static const char _vq_lengthlist__16c1_s_p7_1[] = { 2, 3, 3, 5, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -1538,7 +1538,7 @@ static const long _vq_lengthlist__16c1_s_p7_1[] = { static const static_codebook _16c1_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16c1_s_p7_1, + (char *)_vq_lengthlist__16c1_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c1_s_p7_1, 0 @@ -1560,7 +1560,7 @@ static const long _vq_quantlist__16c1_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__16c1_s_p8_0[] = { +static const char _vq_lengthlist__16c1_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5, 7, 8, 8, 9, 8, 8, 9, 9,10,11, 6, 5, 5, 8, 8, 9, 9, 8, 8, 9,10,10,11, 0, 8, 8, 8, 9, 9, 9, 9, 9, @@ -1576,7 +1576,7 @@ static const long _vq_lengthlist__16c1_s_p8_0[] = { static const static_codebook _16c1_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__16c1_s_p8_0, + (char *)_vq_lengthlist__16c1_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16c1_s_p8_0, 0 @@ -1590,14 +1590,14 @@ static const long _vq_quantlist__16c1_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__16c1_s_p8_1[] = { +static const char _vq_lengthlist__16c1_s_p8_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _16c1_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__16c1_s_p8_1, + (char *)_vq_lengthlist__16c1_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c1_s_p8_1, 0 @@ -1619,7 +1619,7 @@ static const long _vq_quantlist__16c1_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__16c1_s_p9_0[] = { +static const char _vq_lengthlist__16c1_s_p9_0[] = { 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -1635,7 +1635,7 @@ static const long _vq_lengthlist__16c1_s_p9_0[] = { static const static_codebook _16c1_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__16c1_s_p9_0, + (char *)_vq_lengthlist__16c1_s_p9_0, 1, -513964032, 1628680192, 4, 0, (long *)_vq_quantlist__16c1_s_p9_0, 0 @@ -1659,7 +1659,7 @@ static const long _vq_quantlist__16c1_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__16c1_s_p9_1[] = { +static const char _vq_lengthlist__16c1_s_p9_1[] = { 1, 4, 4, 4, 4, 8, 8,12,13,14,14,14,14,14,14, 6, 6, 6, 6, 6,10, 9,14,14,14,14,14,14,14,14, 7, 6, 5, 6, 6,10, 9,12,13,13,13,13,13,13,13,13, 7, 7, @@ -1679,7 +1679,7 @@ static const long _vq_lengthlist__16c1_s_p9_1[] = { static const static_codebook _16c1_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__16c1_s_p9_1, + (char *)_vq_lengthlist__16c1_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16c1_s_p9_1, 0 @@ -1709,7 +1709,7 @@ static const long _vq_quantlist__16c1_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__16c1_s_p9_2[] = { +static const char _vq_lengthlist__16c1_s_p9_2[] = { 1, 4, 4, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9,10, 10,10, 9,10,10,11,12,12, 8, 8, 8, 8, 9, 9, 9, 9, 10,10,10,10,10,11,11,10,12,11,11,13,11, 7, 7, 8, @@ -1742,13 +1742,13 @@ static const long _vq_lengthlist__16c1_s_p9_2[] = { static const static_codebook _16c1_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__16c1_s_p9_2, + (char *)_vq_lengthlist__16c1_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16c1_s_p9_2, 0 }; -static const long _huff_lengthlist__16c1_s_short[] = { +static const char _huff_lengthlist__16c1_s_short[] = { 5, 6,17, 8,12, 9,10,10,12,13, 5, 2,17, 4, 9, 5, 7, 8,11,13,16,16,16,16,16,16,16,16,16,16, 6, 4, 16, 5,10, 5, 7,10,14,16,13, 9,16,11, 8, 7, 8, 9, @@ -1760,13 +1760,13 @@ static const long _huff_lengthlist__16c1_s_short[] = { static const static_codebook _huff_book__16c1_s_short = { 2, 100, - (long *)_huff_lengthlist__16c1_s_short, + (char *)_huff_lengthlist__16c1_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16c2_s_long[] = { +static const char _huff_lengthlist__16c2_s_long[] = { 4, 7, 9, 9, 9, 8, 9,10,13,16, 5, 4, 5, 6, 7, 7, 8, 9,12,16, 6, 5, 5, 5, 7, 7, 9,10,12,15, 7, 6, 5, 4, 5, 6, 8, 9,10,13, 8, 7, 7, 5, 5, 5, 7, 9, @@ -1778,7 +1778,7 @@ static const long _huff_lengthlist__16c2_s_long[] = { static const static_codebook _huff_book__16c2_s_long = { 2, 100, - (long *)_huff_lengthlist__16c2_s_long, + (char *)_huff_lengthlist__16c2_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -1790,7 +1790,7 @@ static const long _vq_quantlist__16c2_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__16c2_s_p1_0[] = { +static const char _vq_lengthlist__16c2_s_p1_0[] = { 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1801,7 +1801,7 @@ static const long _vq_lengthlist__16c2_s_p1_0[] = { static const static_codebook _16c2_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__16c2_s_p1_0, + (char *)_vq_lengthlist__16c2_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16c2_s_p1_0, 0 @@ -1815,7 +1815,7 @@ static const long _vq_quantlist__16c2_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__16c2_s_p2_0[] = { +static const char _vq_lengthlist__16c2_s_p2_0[] = { 2, 4, 4, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 4, 4, 4, 8, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, @@ -1860,7 +1860,7 @@ static const long _vq_lengthlist__16c2_s_p2_0[] = { static const static_codebook _16c2_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__16c2_s_p2_0, + (char *)_vq_lengthlist__16c2_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c2_s_p2_0, 0 @@ -1878,7 +1878,7 @@ static const long _vq_quantlist__16c2_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__16c2_s_p3_0[] = { +static const char _vq_lengthlist__16c2_s_p3_0[] = { 1, 3, 3, 5, 5, 7, 7, 8, 8, 0, 0, 0, 6, 6, 8, 8, 9, 9, 0, 0, 0, 6, 6, 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 9,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 0, 0, 0, @@ -1889,7 +1889,7 @@ static const long _vq_lengthlist__16c2_s_p3_0[] = { static const static_codebook _16c2_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__16c2_s_p3_0, + (char *)_vq_lengthlist__16c2_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c2_s_p3_0, 0 @@ -1915,7 +1915,7 @@ static const long _vq_quantlist__16c2_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__16c2_s_p4_0[] = { +static const char _vq_lengthlist__16c2_s_p4_0[] = { 2, 3, 3, 5, 5, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 11,10, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, @@ -1939,7 +1939,7 @@ static const long _vq_lengthlist__16c2_s_p4_0[] = { static const static_codebook _16c2_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__16c2_s_p4_0, + (char *)_vq_lengthlist__16c2_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16c2_s_p4_0, 0 @@ -1951,7 +1951,7 @@ static const long _vq_quantlist__16c2_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__16c2_s_p5_0[] = { +static const char _vq_lengthlist__16c2_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,11,10,10, 10,11, 4, 6, 6,10,10,11,10,11,10, 5,10,10, 9,12, 11,10,12,12, 7,10,10,12,12,12,12,13,13, 7,11,10, @@ -1962,7 +1962,7 @@ static const long _vq_lengthlist__16c2_s_p5_0[] = { static const static_codebook _16c2_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__16c2_s_p5_0, + (char *)_vq_lengthlist__16c2_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16c2_s_p5_0, 0 @@ -1982,7 +1982,7 @@ static const long _vq_quantlist__16c2_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__16c2_s_p5_1[] = { +static const char _vq_lengthlist__16c2_s_p5_1[] = { 2, 3, 3, 6, 6, 6, 6, 7, 7, 7, 7,11,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9,11,11,11, 6, @@ -1995,7 +1995,7 @@ static const long _vq_lengthlist__16c2_s_p5_1[] = { static const static_codebook _16c2_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__16c2_s_p5_1, + (char *)_vq_lengthlist__16c2_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c2_s_p5_1, 0 @@ -2017,7 +2017,7 @@ static const long _vq_quantlist__16c2_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__16c2_s_p6_0[] = { +static const char _vq_lengthlist__16c2_s_p6_0[] = { 1, 4, 4, 6, 6, 8, 7, 8, 8, 9, 9,10,10, 5, 5, 5, 7, 7, 9, 9, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9, 9,10, 9,11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10, @@ -2033,7 +2033,7 @@ static const long _vq_lengthlist__16c2_s_p6_0[] = { static const static_codebook _16c2_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__16c2_s_p6_0, + (char *)_vq_lengthlist__16c2_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16c2_s_p6_0, 0 @@ -2047,14 +2047,14 @@ static const long _vq_quantlist__16c2_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__16c2_s_p6_1[] = { +static const char _vq_lengthlist__16c2_s_p6_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _16c2_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__16c2_s_p6_1, + (char *)_vq_lengthlist__16c2_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c2_s_p6_1, 0 @@ -2076,7 +2076,7 @@ static const long _vq_quantlist__16c2_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__16c2_s_p7_0[] = { +static const char _vq_lengthlist__16c2_s_p7_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 8,10, 9,10,10, 5, 5, 5, 7, 7, 9, 9,10,10,11,10,12,11, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10, @@ -2092,7 +2092,7 @@ static const long _vq_lengthlist__16c2_s_p7_0[] = { static const static_codebook _16c2_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__16c2_s_p7_0, + (char *)_vq_lengthlist__16c2_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__16c2_s_p7_0, 0 @@ -2112,7 +2112,7 @@ static const long _vq_quantlist__16c2_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__16c2_s_p7_1[] = { +static const char _vq_lengthlist__16c2_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, @@ -2125,7 +2125,7 @@ static const long _vq_lengthlist__16c2_s_p7_1[] = { static const static_codebook _16c2_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16c2_s_p7_1, + (char *)_vq_lengthlist__16c2_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c2_s_p7_1, 0 @@ -2149,7 +2149,7 @@ static const long _vq_quantlist__16c2_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__16c2_s_p8_0[] = { +static const char _vq_lengthlist__16c2_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 6, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 8, 7, 9, 9, 8, 8, 9, 9,10,10,11,11,20, 8, 8, @@ -2169,7 +2169,7 @@ static const long _vq_lengthlist__16c2_s_p8_0[] = { static const static_codebook _16c2_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__16c2_s_p8_0, + (char *)_vq_lengthlist__16c2_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16c2_s_p8_0, 0 @@ -2199,7 +2199,7 @@ static const long _vq_quantlist__16c2_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__16c2_s_p8_1[] = { +static const char _vq_lengthlist__16c2_s_p8_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11,10, 7, 7, 8, @@ -2232,7 +2232,7 @@ static const long _vq_lengthlist__16c2_s_p8_1[] = { static const static_codebook _16c2_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__16c2_s_p8_1, + (char *)_vq_lengthlist__16c2_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16c2_s_p8_1, 0 @@ -2258,7 +2258,7 @@ static const long _vq_quantlist__16c2_s_p9_0[] = { 16, }; -static const long _vq_lengthlist__16c2_s_p9_0[] = { +static const char _vq_lengthlist__16c2_s_p9_0[] = { 1, 4, 3,10, 8,10,10,10,10,10,10,10,10,10,10,10, 10, 6,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 10,10, 6,10, 9,10,10,10,10,10,10,10,10,10,10,10, @@ -2282,7 +2282,7 @@ static const long _vq_lengthlist__16c2_s_p9_0[] = { static const static_codebook _16c2_s_p9_0 = { 2, 289, - (long *)_vq_lengthlist__16c2_s_p9_0, + (char *)_vq_lengthlist__16c2_s_p9_0, 1, -509798400, 1631393792, 5, 0, (long *)_vq_quantlist__16c2_s_p9_0, 0 @@ -2310,7 +2310,7 @@ static const long _vq_quantlist__16c2_s_p9_1[] = { 18, }; -static const long _vq_lengthlist__16c2_s_p9_1[] = { +static const char _vq_lengthlist__16c2_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 7, 8, 8,10, 9,11,10,13, 11,14,13, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8,11, 9, 13,11,14,12,14,13, 5, 6, 6, 8, 8, 8, 8, 8, 8, 9, @@ -2338,7 +2338,7 @@ static const long _vq_lengthlist__16c2_s_p9_1[] = { static const static_codebook _16c2_s_p9_1 = { 2, 361, - (long *)_vq_lengthlist__16c2_s_p9_1, + (char *)_vq_lengthlist__16c2_s_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__16c2_s_p9_1, 0 @@ -2396,7 +2396,7 @@ static const long _vq_quantlist__16c2_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__16c2_s_p9_2[] = { +static const char _vq_lengthlist__16c2_s_p9_2[] = { 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -2405,13 +2405,13 @@ static const long _vq_lengthlist__16c2_s_p9_2[] = { static const static_codebook _16c2_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__16c2_s_p9_2, + (char *)_vq_lengthlist__16c2_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__16c2_s_p9_2, 0 }; -static const long _huff_lengthlist__16c2_s_short[] = { +static const char _huff_lengthlist__16c2_s_short[] = { 7,10,12,11,12,13,15,16,18,15,10, 8, 8, 8, 9,10, 12,13,14,17,10, 7, 7, 7, 7, 8,10,12,15,18,10, 7, 7, 5, 5, 6, 8,10,13,15,10, 7, 6, 5, 4, 4, 6, 9, @@ -2423,7 +2423,7 @@ static const long _huff_lengthlist__16c2_s_short[] = { static const static_codebook _huff_book__16c2_s_short = { 2, 100, - (long *)_huff_lengthlist__16c2_s_short, + (char *)_huff_lengthlist__16c2_s_short, 0, 0, 0, 0, 0, NULL, 0 @@ -2435,7 +2435,7 @@ static const long _vq_quantlist__8c0_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__8c0_s_p1_0[] = { +static const char _vq_lengthlist__8c0_s_p1_0[] = { 1, 5, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2851,7 +2851,7 @@ static const long _vq_lengthlist__8c0_s_p1_0[] = { static const static_codebook _8c0_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__8c0_s_p1_0, + (char *)_vq_lengthlist__8c0_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8c0_s_p1_0, 0 @@ -2865,7 +2865,7 @@ static const long _vq_quantlist__8c0_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__8c0_s_p3_0[] = { +static const char _vq_lengthlist__8c0_s_p3_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2910,7 +2910,7 @@ static const long _vq_lengthlist__8c0_s_p3_0[] = { static const static_codebook _8c0_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__8c0_s_p3_0, + (char *)_vq_lengthlist__8c0_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c0_s_p3_0, 0 @@ -2928,7 +2928,7 @@ static const long _vq_quantlist__8c0_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__8c0_s_p4_0[] = { +static const char _vq_lengthlist__8c0_s_p4_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -2939,7 +2939,7 @@ static const long _vq_lengthlist__8c0_s_p4_0[] = { static const static_codebook _8c0_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__8c0_s_p4_0, + (char *)_vq_lengthlist__8c0_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c0_s_p4_0, 0 @@ -2957,7 +2957,7 @@ static const long _vq_quantlist__8c0_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__8c0_s_p5_0[] = { +static const char _vq_lengthlist__8c0_s_p5_0[] = { 1, 3, 3, 5, 5, 7, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, @@ -2968,7 +2968,7 @@ static const long _vq_lengthlist__8c0_s_p5_0[] = { static const static_codebook _8c0_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__8c0_s_p5_0, + (char *)_vq_lengthlist__8c0_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c0_s_p5_0, 0 @@ -2994,7 +2994,7 @@ static const long _vq_quantlist__8c0_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__8c0_s_p6_0[] = { +static const char _vq_lengthlist__8c0_s_p6_0[] = { 1, 3, 3, 6, 6, 8, 8, 9, 9, 8, 8,10, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 11,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -3018,7 +3018,7 @@ static const long _vq_lengthlist__8c0_s_p6_0[] = { static const static_codebook _8c0_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__8c0_s_p6_0, + (char *)_vq_lengthlist__8c0_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__8c0_s_p6_0, 0 @@ -3030,7 +3030,7 @@ static const long _vq_quantlist__8c0_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__8c0_s_p7_0[] = { +static const char _vq_lengthlist__8c0_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,11, 9,10,12, 9,10, 4, 7, 7,10,10,10,11, 9, 9, 6,11,10,11,11, 12,11,11,11, 6,10,10,11,11,12,11,10,10, 6, 9,10, @@ -3041,7 +3041,7 @@ static const long _vq_lengthlist__8c0_s_p7_0[] = { static const static_codebook _8c0_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__8c0_s_p7_0, + (char *)_vq_lengthlist__8c0_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__8c0_s_p7_0, 0 @@ -3061,7 +3061,7 @@ static const long _vq_quantlist__8c0_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__8c0_s_p7_1[] = { +static const char _vq_lengthlist__8c0_s_p7_1[] = { 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9,10,10, 9, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10, 8, @@ -3074,7 +3074,7 @@ static const long _vq_lengthlist__8c0_s_p7_1[] = { static const static_codebook _8c0_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__8c0_s_p7_1, + (char *)_vq_lengthlist__8c0_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8c0_s_p7_1, 0 @@ -3096,7 +3096,7 @@ static const long _vq_quantlist__8c0_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__8c0_s_p8_0[] = { +static const char _vq_lengthlist__8c0_s_p8_0[] = { 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 6, 6, 7, 7, 8, 8, 7, 7, 8, 9,10,10, 7, 6, 6, 7, 7, 8, 7, 7, 7, 9, 9,10,12, 0, 8, 8, 8, 8, 8, 9, 8, 8, @@ -3112,7 +3112,7 @@ static const long _vq_lengthlist__8c0_s_p8_0[] = { static const static_codebook _8c0_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__8c0_s_p8_0, + (char *)_vq_lengthlist__8c0_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__8c0_s_p8_0, 0 @@ -3126,14 +3126,14 @@ static const long _vq_quantlist__8c0_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__8c0_s_p8_1[] = { +static const char _vq_lengthlist__8c0_s_p8_1[] = { 1, 3, 4, 5, 5, 7, 6, 6, 6, 5, 7, 7, 7, 6, 6, 7, 7, 7, 6, 6, 7, 7, 7, 6, 6, }; static const static_codebook _8c0_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__8c0_s_p8_1, + (char *)_vq_lengthlist__8c0_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c0_s_p8_1, 0 @@ -3145,7 +3145,7 @@ static const long _vq_quantlist__8c0_s_p9_0[] = { 2, }; -static const long _vq_lengthlist__8c0_s_p9_0[] = { +static const char _vq_lengthlist__8c0_s_p9_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -3156,7 +3156,7 @@ static const long _vq_lengthlist__8c0_s_p9_0[] = { static const static_codebook _8c0_s_p9_0 = { 4, 81, - (long *)_vq_lengthlist__8c0_s_p9_0, + (char *)_vq_lengthlist__8c0_s_p9_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__8c0_s_p9_0, 0 @@ -3180,7 +3180,7 @@ static const long _vq_quantlist__8c0_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__8c0_s_p9_1[] = { +static const char _vq_lengthlist__8c0_s_p9_1[] = { 1, 4, 4, 5, 5,10, 8,11,11,11,11,11,11,11,11, 6, 6, 6, 7, 6,11,10,11,11,11,11,11,11,11,11, 7, 5, 6, 6, 6, 8, 7,11,11,11,11,11,11,11,11,11, 7, 8, @@ -3200,7 +3200,7 @@ static const long _vq_lengthlist__8c0_s_p9_1[] = { static const static_codebook _8c0_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__8c0_s_p9_1, + (char *)_vq_lengthlist__8c0_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__8c0_s_p9_1, 0 @@ -3230,7 +3230,7 @@ static const long _vq_quantlist__8c0_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__8c0_s_p9_2[] = { +static const char _vq_lengthlist__8c0_s_p9_2[] = { 1, 5, 5, 7, 7, 8, 7, 8, 8,10,10, 9, 9,10,10,10, 11,11,10,12,11,12,12,12, 9, 8, 8, 8, 8, 8, 9,10, 10,10,10,11,11,11,10,11,11,12,12,11,12, 8, 8, 7, @@ -3263,13 +3263,13 @@ static const long _vq_lengthlist__8c0_s_p9_2[] = { static const static_codebook _8c0_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__8c0_s_p9_2, + (char *)_vq_lengthlist__8c0_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__8c0_s_p9_2, 0 }; -static const long _huff_lengthlist__8c0_s_single[] = { +static const char _huff_lengthlist__8c0_s_single[] = { 4, 5,18, 7,10, 6, 7, 8, 9,10, 5, 2,18, 5, 7, 5, 6, 7, 8,11,17,17,17,17,17,17,17,17,17,17, 7, 4, 17, 6, 9, 6, 8,10,12,15,11, 7,17, 9, 6, 6, 7, 9, @@ -3281,7 +3281,7 @@ static const long _huff_lengthlist__8c0_s_single[] = { static const static_codebook _huff_book__8c0_s_single = { 2, 100, - (long *)_huff_lengthlist__8c0_s_single, + (char *)_huff_lengthlist__8c0_s_single, 0, 0, 0, 0, 0, NULL, 0 @@ -3293,7 +3293,7 @@ static const long _vq_quantlist__8c1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__8c1_s_p1_0[] = { +static const char _vq_lengthlist__8c1_s_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3709,7 +3709,7 @@ static const long _vq_lengthlist__8c1_s_p1_0[] = { static const static_codebook _8c1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__8c1_s_p1_0, + (char *)_vq_lengthlist__8c1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8c1_s_p1_0, 0 @@ -3723,7 +3723,7 @@ static const long _vq_quantlist__8c1_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__8c1_s_p3_0[] = { +static const char _vq_lengthlist__8c1_s_p3_0[] = { 2, 4, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3768,7 +3768,7 @@ static const long _vq_lengthlist__8c1_s_p3_0[] = { static const static_codebook _8c1_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__8c1_s_p3_0, + (char *)_vq_lengthlist__8c1_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c1_s_p3_0, 0 @@ -3786,7 +3786,7 @@ static const long _vq_quantlist__8c1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__8c1_s_p4_0[] = { +static const char _vq_lengthlist__8c1_s_p4_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -3797,7 +3797,7 @@ static const long _vq_lengthlist__8c1_s_p4_0[] = { static const static_codebook _8c1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__8c1_s_p4_0, + (char *)_vq_lengthlist__8c1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c1_s_p4_0, 0 @@ -3815,7 +3815,7 @@ static const long _vq_quantlist__8c1_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__8c1_s_p5_0[] = { +static const char _vq_lengthlist__8c1_s_p5_0[] = { 1, 3, 3, 4, 5, 6, 6, 8, 8, 0, 0, 0, 8, 8, 7, 7, 9, 9, 0, 0, 0, 8, 8, 7, 7, 9, 9, 0, 0, 0, 9,10, 8, 8, 9, 9, 0, 0, 0,10,10, 8, 8, 9, 9, 0, 0, 0, @@ -3826,7 +3826,7 @@ static const long _vq_lengthlist__8c1_s_p5_0[] = { static const static_codebook _8c1_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__8c1_s_p5_0, + (char *)_vq_lengthlist__8c1_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c1_s_p5_0, 0 @@ -3852,7 +3852,7 @@ static const long _vq_quantlist__8c1_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__8c1_s_p6_0[] = { +static const char _vq_lengthlist__8c1_s_p6_0[] = { 1, 3, 3, 5, 5, 8, 8, 8, 8, 9, 9,10,10,11,11,11, 11, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11, @@ -3876,7 +3876,7 @@ static const long _vq_lengthlist__8c1_s_p6_0[] = { static const static_codebook _8c1_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__8c1_s_p6_0, + (char *)_vq_lengthlist__8c1_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__8c1_s_p6_0, 0 @@ -3888,7 +3888,7 @@ static const long _vq_quantlist__8c1_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__8c1_s_p7_0[] = { +static const char _vq_lengthlist__8c1_s_p7_0[] = { 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10, 9, 9, 5, 7, 7,10, 9, 9,10, 9, 9, 6,10,10,10,10, 10,11,10,10, 6, 9, 9,10, 9,10,11,10,10, 6, 9, 9, @@ -3899,7 +3899,7 @@ static const long _vq_lengthlist__8c1_s_p7_0[] = { static const static_codebook _8c1_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__8c1_s_p7_0, + (char *)_vq_lengthlist__8c1_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__8c1_s_p7_0, 0 @@ -3919,7 +3919,7 @@ static const long _vq_quantlist__8c1_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__8c1_s_p7_1[] = { +static const char _vq_lengthlist__8c1_s_p7_1[] = { 2, 3, 3, 5, 5, 7, 7, 7, 7, 7, 7,10,10, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -3932,7 +3932,7 @@ static const long _vq_lengthlist__8c1_s_p7_1[] = { static const static_codebook _8c1_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__8c1_s_p7_1, + (char *)_vq_lengthlist__8c1_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8c1_s_p7_1, 0 @@ -3954,7 +3954,7 @@ static const long _vq_quantlist__8c1_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__8c1_s_p8_0[] = { +static const char _vq_lengthlist__8c1_s_p8_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -3970,7 +3970,7 @@ static const long _vq_lengthlist__8c1_s_p8_0[] = { static const static_codebook _8c1_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__8c1_s_p8_0, + (char *)_vq_lengthlist__8c1_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__8c1_s_p8_0, 0 @@ -3984,14 +3984,14 @@ static const long _vq_quantlist__8c1_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__8c1_s_p8_1[] = { +static const char _vq_lengthlist__8c1_s_p8_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _8c1_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__8c1_s_p8_1, + (char *)_vq_lengthlist__8c1_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c1_s_p8_1, 0 @@ -4013,7 +4013,7 @@ static const long _vq_quantlist__8c1_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__8c1_s_p9_0[] = { +static const char _vq_lengthlist__8c1_s_p9_0[] = { 1, 3, 3,10,10,10,10,10,10,10,10,10,10, 5, 6, 6, 10,10,10,10,10,10,10,10,10,10, 6, 7, 8,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -4029,7 +4029,7 @@ static const long _vq_lengthlist__8c1_s_p9_0[] = { static const static_codebook _8c1_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__8c1_s_p9_0, + (char *)_vq_lengthlist__8c1_s_p9_0, 1, -513964032, 1628680192, 4, 0, (long *)_vq_quantlist__8c1_s_p9_0, 0 @@ -4053,7 +4053,7 @@ static const long _vq_quantlist__8c1_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__8c1_s_p9_1[] = { +static const char _vq_lengthlist__8c1_s_p9_1[] = { 1, 4, 4, 5, 5, 7, 7, 9, 9,11,11,12,12,13,13, 6, 5, 5, 6, 6, 9, 9,10,10,12,12,12,13,15,14, 6, 5, 5, 7, 7, 9, 9,10,10,12,12,12,13,14,13,17, 7, 7, @@ -4073,7 +4073,7 @@ static const long _vq_lengthlist__8c1_s_p9_1[] = { static const static_codebook _8c1_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__8c1_s_p9_1, + (char *)_vq_lengthlist__8c1_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__8c1_s_p9_1, 0 @@ -4103,7 +4103,7 @@ static const long _vq_quantlist__8c1_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__8c1_s_p9_2[] = { +static const char _vq_lengthlist__8c1_s_p9_2[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,11,11,12, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11, 7, 7, 7, @@ -4136,13 +4136,13 @@ static const long _vq_lengthlist__8c1_s_p9_2[] = { static const static_codebook _8c1_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__8c1_s_p9_2, + (char *)_vq_lengthlist__8c1_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__8c1_s_p9_2, 0 }; -static const long _huff_lengthlist__8c1_s_single[] = { +static const char _huff_lengthlist__8c1_s_single[] = { 4, 6,18, 8,11, 8, 8, 9, 9,10, 4, 4,18, 5, 9, 5, 6, 7, 8,10,18,18,18,18,17,17,17,17,17,17, 7, 5, 17, 6,11, 6, 7, 8, 9,12,12, 9,17,12, 8, 8, 9,10, @@ -4154,13 +4154,13 @@ static const long _huff_lengthlist__8c1_s_single[] = { static const static_codebook _huff_book__8c1_s_single = { 2, 100, - (long *)_huff_lengthlist__8c1_s_single, + (char *)_huff_lengthlist__8c1_s_single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c2_s_long[] = { +static const char _huff_lengthlist__44c2_s_long[] = { 6, 6,12,10,10,10, 9,10,12,12, 6, 1,10, 5, 6, 6, 7, 9,11,14,12, 9, 8,11, 7, 8, 9,11,13,15,10, 5, 12, 7, 8, 7, 9,12,14,15,10, 6, 7, 8, 5, 6, 7, 9, @@ -4172,7 +4172,7 @@ static const long _huff_lengthlist__44c2_s_long[] = { static const static_codebook _huff_book__44c2_s_long = { 2, 100, - (long *)_huff_lengthlist__44c2_s_long, + (char *)_huff_lengthlist__44c2_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -4184,7 +4184,7 @@ static const long _vq_quantlist__44c2_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c2_s_p1_0[] = { +static const char _vq_lengthlist__44c2_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4600,7 +4600,7 @@ static const long _vq_lengthlist__44c2_s_p1_0[] = { static const static_codebook _44c2_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c2_s_p1_0, + (char *)_vq_lengthlist__44c2_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c2_s_p1_0, 0 @@ -4614,7 +4614,7 @@ static const long _vq_quantlist__44c2_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c2_s_p2_0[] = { +static const char _vq_lengthlist__44c2_s_p2_0[] = { 1, 4, 4, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, @@ -4659,7 +4659,7 @@ static const long _vq_lengthlist__44c2_s_p2_0[] = { static const static_codebook _44c2_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c2_s_p2_0, + (char *)_vq_lengthlist__44c2_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c2_s_p2_0, 0 @@ -4673,7 +4673,7 @@ static const long _vq_quantlist__44c2_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c2_s_p3_0[] = { +static const char _vq_lengthlist__44c2_s_p3_0[] = { 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4718,7 +4718,7 @@ static const long _vq_lengthlist__44c2_s_p3_0[] = { static const static_codebook _44c2_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c2_s_p3_0, + (char *)_vq_lengthlist__44c2_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c2_s_p3_0, 0 @@ -4736,7 +4736,7 @@ static const long _vq_quantlist__44c2_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c2_s_p4_0[] = { +static const char _vq_lengthlist__44c2_s_p4_0[] = { 1, 3, 3, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 7, 7, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, @@ -4747,7 +4747,7 @@ static const long _vq_lengthlist__44c2_s_p4_0[] = { static const static_codebook _44c2_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c2_s_p4_0, + (char *)_vq_lengthlist__44c2_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c2_s_p4_0, 0 @@ -4765,7 +4765,7 @@ static const long _vq_quantlist__44c2_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c2_s_p5_0[] = { +static const char _vq_lengthlist__44c2_s_p5_0[] = { 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 7, 7, 7, 7, 7, 7, 9, 9, 0, 7, 7, 7, 7, 7, 7, 9, 9, 0, 8, 8, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, @@ -4776,7 +4776,7 @@ static const long _vq_lengthlist__44c2_s_p5_0[] = { static const static_codebook _44c2_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c2_s_p5_0, + (char *)_vq_lengthlist__44c2_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c2_s_p5_0, 0 @@ -4802,7 +4802,7 @@ static const long _vq_quantlist__44c2_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c2_s_p6_0[] = { +static const char _vq_lengthlist__44c2_s_p6_0[] = { 1, 4, 3, 6, 6, 8, 8, 9, 9, 9, 9, 9, 9,10,10,11, 11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -4826,7 +4826,7 @@ static const long _vq_lengthlist__44c2_s_p6_0[] = { static const static_codebook _44c2_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c2_s_p6_0, + (char *)_vq_lengthlist__44c2_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c2_s_p6_0, 0 @@ -4838,7 +4838,7 @@ static const long _vq_quantlist__44c2_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c2_s_p7_0[] = { +static const char _vq_lengthlist__44c2_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,10, 9, 9, 7,10,10,11,10, 11,11,10,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -4849,7 +4849,7 @@ static const long _vq_lengthlist__44c2_s_p7_0[] = { static const static_codebook _44c2_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c2_s_p7_0, + (char *)_vq_lengthlist__44c2_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c2_s_p7_0, 0 @@ -4869,7 +4869,7 @@ static const long _vq_quantlist__44c2_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c2_s_p7_1[] = { +static const char _vq_lengthlist__44c2_s_p7_1[] = { 2, 3, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 9, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -4882,7 +4882,7 @@ static const long _vq_lengthlist__44c2_s_p7_1[] = { static const static_codebook _44c2_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c2_s_p7_1, + (char *)_vq_lengthlist__44c2_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c2_s_p7_1, 0 @@ -4904,7 +4904,7 @@ static const long _vq_quantlist__44c2_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c2_s_p8_0[] = { +static const char _vq_lengthlist__44c2_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -4920,7 +4920,7 @@ static const long _vq_lengthlist__44c2_s_p8_0[] = { static const static_codebook _44c2_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c2_s_p8_0, + (char *)_vq_lengthlist__44c2_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c2_s_p8_0, 0 @@ -4934,14 +4934,14 @@ static const long _vq_quantlist__44c2_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c2_s_p8_1[] = { +static const char _vq_lengthlist__44c2_s_p8_1[] = { 2, 4, 4, 5, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c2_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c2_s_p8_1, + (char *)_vq_lengthlist__44c2_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c2_s_p8_1, 0 @@ -4963,7 +4963,7 @@ static const long _vq_quantlist__44c2_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c2_s_p9_0[] = { +static const char _vq_lengthlist__44c2_s_p9_0[] = { 1, 5, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8, 11,11,11,11,11,11,11,11,11,11, 2, 8, 7,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -4979,7 +4979,7 @@ static const long _vq_lengthlist__44c2_s_p9_0[] = { static const static_codebook _44c2_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c2_s_p9_0, + (char *)_vq_lengthlist__44c2_s_p9_0, 1, -514541568, 1627103232, 4, 0, (long *)_vq_quantlist__44c2_s_p9_0, 0 @@ -5001,7 +5001,7 @@ static const long _vq_quantlist__44c2_s_p9_1[] = { 12, }; -static const long _vq_lengthlist__44c2_s_p9_1[] = { +static const char _vq_lengthlist__44c2_s_p9_1[] = { 1, 4, 4, 6, 6, 7, 6, 8, 8,10, 9,10,10, 6, 5, 5, 7, 7, 8, 7,10, 9,11,11,12,13, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,13,13,18, 8, 8, 8, 8, 9, 9,10,10, @@ -5017,7 +5017,7 @@ static const long _vq_lengthlist__44c2_s_p9_1[] = { static const static_codebook _44c2_s_p9_1 = { 2, 169, - (long *)_vq_lengthlist__44c2_s_p9_1, + (char *)_vq_lengthlist__44c2_s_p9_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c2_s_p9_1, 0 @@ -5043,7 +5043,7 @@ static const long _vq_quantlist__44c2_s_p9_2[] = { 16, }; -static const long _vq_lengthlist__44c2_s_p9_2[] = { +static const char _vq_lengthlist__44c2_s_p9_2[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, @@ -5067,13 +5067,13 @@ static const long _vq_lengthlist__44c2_s_p9_2[] = { static const static_codebook _44c2_s_p9_2 = { 2, 289, - (long *)_vq_lengthlist__44c2_s_p9_2, + (char *)_vq_lengthlist__44c2_s_p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c2_s_p9_2, 0 }; -static const long _huff_lengthlist__44c2_s_short[] = { +static const char _huff_lengthlist__44c2_s_short[] = { 11, 9,13,12,12,11,12,12,13,15, 8, 2,11, 4, 8, 5, 7,10,12,15,13, 7,10, 9, 8, 8,10,13,17,17,11, 4, 12, 5, 9, 5, 8,11,14,16,12, 6, 8, 7, 6, 6, 8,11, @@ -5085,13 +5085,13 @@ static const long _huff_lengthlist__44c2_s_short[] = { static const static_codebook _huff_book__44c2_s_short = { 2, 100, - (long *)_huff_lengthlist__44c2_s_short, + (char *)_huff_lengthlist__44c2_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c3_s_long[] = { +static const char _huff_lengthlist__44c3_s_long[] = { 5, 6,11,11,11,11,10,10,12,11, 5, 2,11, 5, 6, 6, 7, 9,11,13,13,10, 7,11, 6, 7, 8, 9,10,12,11, 5, 11, 6, 8, 7, 9,11,14,15,11, 6, 6, 8, 4, 5, 7, 8, @@ -5103,7 +5103,7 @@ static const long _huff_lengthlist__44c3_s_long[] = { static const static_codebook _huff_book__44c3_s_long = { 2, 100, - (long *)_huff_lengthlist__44c3_s_long, + (char *)_huff_lengthlist__44c3_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -5115,7 +5115,7 @@ static const long _vq_quantlist__44c3_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c3_s_p1_0[] = { +static const char _vq_lengthlist__44c3_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5531,7 +5531,7 @@ static const long _vq_lengthlist__44c3_s_p1_0[] = { static const static_codebook _44c3_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c3_s_p1_0, + (char *)_vq_lengthlist__44c3_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c3_s_p1_0, 0 @@ -5545,7 +5545,7 @@ static const long _vq_quantlist__44c3_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c3_s_p2_0[] = { +static const char _vq_lengthlist__44c3_s_p2_0[] = { 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, @@ -5590,7 +5590,7 @@ static const long _vq_lengthlist__44c3_s_p2_0[] = { static const static_codebook _44c3_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c3_s_p2_0, + (char *)_vq_lengthlist__44c3_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c3_s_p2_0, 0 @@ -5604,7 +5604,7 @@ static const long _vq_quantlist__44c3_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c3_s_p3_0[] = { +static const char _vq_lengthlist__44c3_s_p3_0[] = { 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5649,7 +5649,7 @@ static const long _vq_lengthlist__44c3_s_p3_0[] = { static const static_codebook _44c3_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c3_s_p3_0, + (char *)_vq_lengthlist__44c3_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c3_s_p3_0, 0 @@ -5667,7 +5667,7 @@ static const long _vq_quantlist__44c3_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c3_s_p4_0[] = { +static const char _vq_lengthlist__44c3_s_p4_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, @@ -5678,7 +5678,7 @@ static const long _vq_lengthlist__44c3_s_p4_0[] = { static const static_codebook _44c3_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c3_s_p4_0, + (char *)_vq_lengthlist__44c3_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c3_s_p4_0, 0 @@ -5696,7 +5696,7 @@ static const long _vq_quantlist__44c3_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c3_s_p5_0[] = { +static const char _vq_lengthlist__44c3_s_p5_0[] = { 1, 3, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 7, 8, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -5707,7 +5707,7 @@ static const long _vq_lengthlist__44c3_s_p5_0[] = { static const static_codebook _44c3_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c3_s_p5_0, + (char *)_vq_lengthlist__44c3_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c3_s_p5_0, 0 @@ -5733,7 +5733,7 @@ static const long _vq_quantlist__44c3_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c3_s_p6_0[] = { +static const char _vq_lengthlist__44c3_s_p6_0[] = { 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 10, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -5757,7 +5757,7 @@ static const long _vq_lengthlist__44c3_s_p6_0[] = { static const static_codebook _44c3_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c3_s_p6_0, + (char *)_vq_lengthlist__44c3_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c3_s_p6_0, 0 @@ -5769,7 +5769,7 @@ static const long _vq_quantlist__44c3_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c3_s_p7_0[] = { +static const char _vq_lengthlist__44c3_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 10,12,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -5780,7 +5780,7 @@ static const long _vq_lengthlist__44c3_s_p7_0[] = { static const static_codebook _44c3_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c3_s_p7_0, + (char *)_vq_lengthlist__44c3_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c3_s_p7_0, 0 @@ -5800,7 +5800,7 @@ static const long _vq_quantlist__44c3_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c3_s_p7_1[] = { +static const char _vq_lengthlist__44c3_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -5813,7 +5813,7 @@ static const long _vq_lengthlist__44c3_s_p7_1[] = { static const static_codebook _44c3_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c3_s_p7_1, + (char *)_vq_lengthlist__44c3_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c3_s_p7_1, 0 @@ -5835,7 +5835,7 @@ static const long _vq_quantlist__44c3_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c3_s_p8_0[] = { +static const char _vq_lengthlist__44c3_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -5851,7 +5851,7 @@ static const long _vq_lengthlist__44c3_s_p8_0[] = { static const static_codebook _44c3_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c3_s_p8_0, + (char *)_vq_lengthlist__44c3_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c3_s_p8_0, 0 @@ -5865,14 +5865,14 @@ static const long _vq_quantlist__44c3_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c3_s_p8_1[] = { +static const char _vq_lengthlist__44c3_s_p8_1[] = { 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c3_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c3_s_p8_1, + (char *)_vq_lengthlist__44c3_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c3_s_p8_1, 0 @@ -5894,7 +5894,7 @@ static const long _vq_quantlist__44c3_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c3_s_p9_0[] = { +static const char _vq_lengthlist__44c3_s_p9_0[] = { 1, 4, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8, 12,12,12,12,12,12,12,12,12,12, 2, 9, 7,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -5910,7 +5910,7 @@ static const long _vq_lengthlist__44c3_s_p9_0[] = { static const static_codebook _44c3_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c3_s_p9_0, + (char *)_vq_lengthlist__44c3_s_p9_0, 1, -514332672, 1627381760, 4, 0, (long *)_vq_quantlist__44c3_s_p9_0, 0 @@ -5934,7 +5934,7 @@ static const long _vq_quantlist__44c3_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__44c3_s_p9_1[] = { +static const char _vq_lengthlist__44c3_s_p9_1[] = { 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 9,10,10,10,10, 6, 5, 5, 7, 7, 8, 8,10, 8,11,10,12,12,13,13, 6, 5, 5, 7, 7, 8, 8,10, 9,11,11,12,12,13,12,18, 8, 8, @@ -5954,7 +5954,7 @@ static const long _vq_lengthlist__44c3_s_p9_1[] = { static const static_codebook _44c3_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__44c3_s_p9_1, + (char *)_vq_lengthlist__44c3_s_p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44c3_s_p9_1, 0 @@ -5980,7 +5980,7 @@ static const long _vq_quantlist__44c3_s_p9_2[] = { 16, }; -static const long _vq_lengthlist__44c3_s_p9_2[] = { +static const char _vq_lengthlist__44c3_s_p9_2[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, @@ -6004,13 +6004,13 @@ static const long _vq_lengthlist__44c3_s_p9_2[] = { static const static_codebook _44c3_s_p9_2 = { 2, 289, - (long *)_vq_lengthlist__44c3_s_p9_2, + (char *)_vq_lengthlist__44c3_s_p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c3_s_p9_2, 0 }; -static const long _huff_lengthlist__44c3_s_short[] = { +static const char _huff_lengthlist__44c3_s_short[] = { 10, 9,13,11,14,10,12,13,13,14, 7, 2,12, 5,10, 5, 7,10,12,14,12, 6, 9, 8, 7, 7, 9,11,13,16,10, 4, 12, 5,10, 6, 8,12,14,16,12, 6, 8, 7, 6, 5, 7,11, @@ -6022,13 +6022,13 @@ static const long _huff_lengthlist__44c3_s_short[] = { static const static_codebook _huff_book__44c3_s_short = { 2, 100, - (long *)_huff_lengthlist__44c3_s_short, + (char *)_huff_lengthlist__44c3_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c4_s_long[] = { +static const char _huff_lengthlist__44c4_s_long[] = { 4, 7,11,11,11,11,10,11,12,11, 5, 2,11, 5, 6, 6, 7, 9,11,12,11, 9, 6,10, 6, 7, 8, 9,10,11,11, 5, 11, 7, 8, 8, 9,11,13,14,11, 6, 5, 8, 4, 5, 7, 8, @@ -6040,7 +6040,7 @@ static const long _huff_lengthlist__44c4_s_long[] = { static const static_codebook _huff_book__44c4_s_long = { 2, 100, - (long *)_huff_lengthlist__44c4_s_long, + (char *)_huff_lengthlist__44c4_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -6052,7 +6052,7 @@ static const long _vq_quantlist__44c4_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c4_s_p1_0[] = { +static const char _vq_lengthlist__44c4_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6468,7 +6468,7 @@ static const long _vq_lengthlist__44c4_s_p1_0[] = { static const static_codebook _44c4_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c4_s_p1_0, + (char *)_vq_lengthlist__44c4_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c4_s_p1_0, 0 @@ -6482,7 +6482,7 @@ static const long _vq_quantlist__44c4_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c4_s_p2_0[] = { +static const char _vq_lengthlist__44c4_s_p2_0[] = { 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, @@ -6527,7 +6527,7 @@ static const long _vq_lengthlist__44c4_s_p2_0[] = { static const static_codebook _44c4_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c4_s_p2_0, + (char *)_vq_lengthlist__44c4_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c4_s_p2_0, 0 @@ -6541,7 +6541,7 @@ static const long _vq_quantlist__44c4_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c4_s_p3_0[] = { +static const char _vq_lengthlist__44c4_s_p3_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6586,7 +6586,7 @@ static const long _vq_lengthlist__44c4_s_p3_0[] = { static const static_codebook _44c4_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c4_s_p3_0, + (char *)_vq_lengthlist__44c4_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c4_s_p3_0, 0 @@ -6604,7 +6604,7 @@ static const long _vq_quantlist__44c4_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c4_s_p4_0[] = { +static const char _vq_lengthlist__44c4_s_p4_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, @@ -6615,7 +6615,7 @@ static const long _vq_lengthlist__44c4_s_p4_0[] = { static const static_codebook _44c4_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c4_s_p4_0, + (char *)_vq_lengthlist__44c4_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c4_s_p4_0, 0 @@ -6633,7 +6633,7 @@ static const long _vq_quantlist__44c4_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c4_s_p5_0[] = { +static const char _vq_lengthlist__44c4_s_p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 5, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10, 9, 0, 0, 0, @@ -6644,7 +6644,7 @@ static const long _vq_lengthlist__44c4_s_p5_0[] = { static const static_codebook _44c4_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c4_s_p5_0, + (char *)_vq_lengthlist__44c4_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c4_s_p5_0, 0 @@ -6670,7 +6670,7 @@ static const long _vq_quantlist__44c4_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c4_s_p6_0[] = { +static const char _vq_lengthlist__44c4_s_p6_0[] = { 2, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11, 11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, 11,11, 0, 4, 4, 7, 6, 8, 8, 9, 9, 9, 9,10,10,11, @@ -6694,7 +6694,7 @@ static const long _vq_lengthlist__44c4_s_p6_0[] = { static const static_codebook _44c4_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c4_s_p6_0, + (char *)_vq_lengthlist__44c4_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c4_s_p6_0, 0 @@ -6706,7 +6706,7 @@ static const long _vq_quantlist__44c4_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c4_s_p7_0[] = { +static const char _vq_lengthlist__44c4_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -6717,7 +6717,7 @@ static const long _vq_lengthlist__44c4_s_p7_0[] = { static const static_codebook _44c4_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c4_s_p7_0, + (char *)_vq_lengthlist__44c4_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c4_s_p7_0, 0 @@ -6737,7 +6737,7 @@ static const long _vq_quantlist__44c4_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c4_s_p7_1[] = { +static const char _vq_lengthlist__44c4_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -6750,7 +6750,7 @@ static const long _vq_lengthlist__44c4_s_p7_1[] = { static const static_codebook _44c4_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c4_s_p7_1, + (char *)_vq_lengthlist__44c4_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c4_s_p7_1, 0 @@ -6772,7 +6772,7 @@ static const long _vq_quantlist__44c4_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c4_s_p8_0[] = { +static const char _vq_lengthlist__44c4_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -6788,7 +6788,7 @@ static const long _vq_lengthlist__44c4_s_p8_0[] = { static const static_codebook _44c4_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c4_s_p8_0, + (char *)_vq_lengthlist__44c4_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c4_s_p8_0, 0 @@ -6802,14 +6802,14 @@ static const long _vq_quantlist__44c4_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c4_s_p8_1[] = { +static const char _vq_lengthlist__44c4_s_p8_1[] = { 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 5, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c4_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c4_s_p8_1, + (char *)_vq_lengthlist__44c4_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c4_s_p8_1, 0 @@ -6831,7 +6831,7 @@ static const long _vq_quantlist__44c4_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c4_s_p9_0[] = { +static const char _vq_lengthlist__44c4_s_p9_0[] = { 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 4, 7, 7, 12,12,12,12,12,12,12,12,12,12, 3, 8, 8,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -6847,7 +6847,7 @@ static const long _vq_lengthlist__44c4_s_p9_0[] = { static const static_codebook _44c4_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c4_s_p9_0, + (char *)_vq_lengthlist__44c4_s_p9_0, 1, -513964032, 1628680192, 4, 0, (long *)_vq_quantlist__44c4_s_p9_0, 0 @@ -6871,7 +6871,7 @@ static const long _vq_quantlist__44c4_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__44c4_s_p9_1[] = { +static const char _vq_lengthlist__44c4_s_p9_1[] = { 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,10,10, 6, 5, 5, 7, 7, 9, 8,10, 9,11,10,12,12,13,13, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,12,13,19, 8, 8, @@ -6891,7 +6891,7 @@ static const long _vq_lengthlist__44c4_s_p9_1[] = { static const static_codebook _44c4_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__44c4_s_p9_1, + (char *)_vq_lengthlist__44c4_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c4_s_p9_1, 0 @@ -6921,7 +6921,7 @@ static const long _vq_quantlist__44c4_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__44c4_s_p9_2[] = { +static const char _vq_lengthlist__44c4_s_p9_2[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,11, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11, 6, 6, 7, 7, 8, @@ -6954,13 +6954,13 @@ static const long _vq_lengthlist__44c4_s_p9_2[] = { static const static_codebook _44c4_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__44c4_s_p9_2, + (char *)_vq_lengthlist__44c4_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c4_s_p9_2, 0 }; -static const long _huff_lengthlist__44c4_s_short[] = { +static const char _huff_lengthlist__44c4_s_short[] = { 4, 7,14,10,15,10,12,15,16,15, 4, 2,11, 5,10, 6, 8,11,14,14,14,10, 7,11, 6, 8,10,11,13,15, 9, 4, 11, 5, 9, 6, 9,12,14,15,14, 9, 6, 9, 4, 5, 7,10, @@ -6972,13 +6972,13 @@ static const long _huff_lengthlist__44c4_s_short[] = { static const static_codebook _huff_book__44c4_s_short = { 2, 100, - (long *)_huff_lengthlist__44c4_s_short, + (char *)_huff_lengthlist__44c4_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c5_s_long[] = { +static const char _huff_lengthlist__44c5_s_long[] = { 3, 8, 9,13,10,12,12,12,12,12, 6, 4, 6, 8, 6, 8, 10,10,11,12, 8, 5, 4,10, 4, 7, 8, 9,10,11,13, 8, 10, 8, 9, 9,11,12,13,14,10, 6, 4, 9, 3, 5, 6, 8, @@ -6990,7 +6990,7 @@ static const long _huff_lengthlist__44c5_s_long[] = { static const static_codebook _huff_book__44c5_s_long = { 2, 100, - (long *)_huff_lengthlist__44c5_s_long, + (char *)_huff_lengthlist__44c5_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -7002,7 +7002,7 @@ static const long _vq_quantlist__44c5_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c5_s_p1_0[] = { +static const char _vq_lengthlist__44c5_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 4, 7, 7, 0, 0, 0, 0, 0, 0, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7418,7 +7418,7 @@ static const long _vq_lengthlist__44c5_s_p1_0[] = { static const static_codebook _44c5_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c5_s_p1_0, + (char *)_vq_lengthlist__44c5_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c5_s_p1_0, 0 @@ -7432,7 +7432,7 @@ static const long _vq_quantlist__44c5_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c5_s_p2_0[] = { +static const char _vq_lengthlist__44c5_s_p2_0[] = { 2, 4, 4, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8, 8, 0, 0, 0, 8, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, @@ -7477,7 +7477,7 @@ static const long _vq_lengthlist__44c5_s_p2_0[] = { static const static_codebook _44c5_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c5_s_p2_0, + (char *)_vq_lengthlist__44c5_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c5_s_p2_0, 0 @@ -7491,7 +7491,7 @@ static const long _vq_quantlist__44c5_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c5_s_p3_0[] = { +static const char _vq_lengthlist__44c5_s_p3_0[] = { 2, 4, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7536,7 +7536,7 @@ static const long _vq_lengthlist__44c5_s_p3_0[] = { static const static_codebook _44c5_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c5_s_p3_0, + (char *)_vq_lengthlist__44c5_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c5_s_p3_0, 0 @@ -7554,7 +7554,7 @@ static const long _vq_quantlist__44c5_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c5_s_p4_0[] = { +static const char _vq_lengthlist__44c5_s_p4_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, @@ -7565,7 +7565,7 @@ static const long _vq_lengthlist__44c5_s_p4_0[] = { static const static_codebook _44c5_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c5_s_p4_0, + (char *)_vq_lengthlist__44c5_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c5_s_p4_0, 0 @@ -7583,7 +7583,7 @@ static const long _vq_quantlist__44c5_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c5_s_p5_0[] = { +static const char _vq_lengthlist__44c5_s_p5_0[] = { 2, 4, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0, 0, @@ -7594,7 +7594,7 @@ static const long _vq_lengthlist__44c5_s_p5_0[] = { static const static_codebook _44c5_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c5_s_p5_0, + (char *)_vq_lengthlist__44c5_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c5_s_p5_0, 0 @@ -7620,7 +7620,7 @@ static const long _vq_quantlist__44c5_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c5_s_p6_0[] = { +static const char _vq_lengthlist__44c5_s_p6_0[] = { 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10,11, 11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11, @@ -7644,7 +7644,7 @@ static const long _vq_lengthlist__44c5_s_p6_0[] = { static const static_codebook _44c5_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c5_s_p6_0, + (char *)_vq_lengthlist__44c5_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c5_s_p6_0, 0 @@ -7656,7 +7656,7 @@ static const long _vq_quantlist__44c5_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c5_s_p7_0[] = { +static const char _vq_lengthlist__44c5_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -7667,7 +7667,7 @@ static const long _vq_lengthlist__44c5_s_p7_0[] = { static const static_codebook _44c5_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c5_s_p7_0, + (char *)_vq_lengthlist__44c5_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c5_s_p7_0, 0 @@ -7687,7 +7687,7 @@ static const long _vq_quantlist__44c5_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c5_s_p7_1[] = { +static const char _vq_lengthlist__44c5_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -7700,7 +7700,7 @@ static const long _vq_lengthlist__44c5_s_p7_1[] = { static const static_codebook _44c5_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c5_s_p7_1, + (char *)_vq_lengthlist__44c5_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c5_s_p7_1, 0 @@ -7722,7 +7722,7 @@ static const long _vq_quantlist__44c5_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c5_s_p8_0[] = { +static const char _vq_lengthlist__44c5_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 9,10,10,10,10, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -7738,7 +7738,7 @@ static const long _vq_lengthlist__44c5_s_p8_0[] = { static const static_codebook _44c5_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c5_s_p8_0, + (char *)_vq_lengthlist__44c5_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c5_s_p8_0, 0 @@ -7752,14 +7752,14 @@ static const long _vq_quantlist__44c5_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c5_s_p8_1[] = { +static const char _vq_lengthlist__44c5_s_p8_1[] = { 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c5_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c5_s_p8_1, + (char *)_vq_lengthlist__44c5_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c5_s_p8_1, 0 @@ -7783,7 +7783,7 @@ static const long _vq_quantlist__44c5_s_p9_0[] = { 14, }; -static const long _vq_lengthlist__44c5_s_p9_0[] = { +static const char _vq_lengthlist__44c5_s_p9_0[] = { 1, 3, 3,13,13,13,13,13,13,13,13,13,13,13,13, 4, 7, 7,13,13,13,13,13,13,13,13,13,13,13,13, 3, 8, 6,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, @@ -7803,7 +7803,7 @@ static const long _vq_lengthlist__44c5_s_p9_0[] = { static const static_codebook _44c5_s_p9_0 = { 2, 225, - (long *)_vq_lengthlist__44c5_s_p9_0, + (char *)_vq_lengthlist__44c5_s_p9_0, 1, -512522752, 1628852224, 4, 0, (long *)_vq_quantlist__44c5_s_p9_0, 0 @@ -7829,7 +7829,7 @@ static const long _vq_quantlist__44c5_s_p9_1[] = { 16, }; -static const long _vq_lengthlist__44c5_s_p9_1[] = { +static const char _vq_lengthlist__44c5_s_p9_1[] = { 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,11,10,11, 11, 6, 5, 5, 7, 7, 8, 9,10,10,11,10,12,11,12,11, 13,12, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,13, @@ -7853,7 +7853,7 @@ static const long _vq_lengthlist__44c5_s_p9_1[] = { static const static_codebook _44c5_s_p9_1 = { 2, 289, - (long *)_vq_lengthlist__44c5_s_p9_1, + (char *)_vq_lengthlist__44c5_s_p9_1, 1, -520814592, 1620377600, 5, 0, (long *)_vq_quantlist__44c5_s_p9_1, 0 @@ -7883,7 +7883,7 @@ static const long _vq_quantlist__44c5_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__44c5_s_p9_2[] = { +static const char _vq_lengthlist__44c5_s_p9_2[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9,11, 5, 6, 7, 7, 8, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11, 5, 5, 7, 7, 7, @@ -7916,13 +7916,13 @@ static const long _vq_lengthlist__44c5_s_p9_2[] = { static const static_codebook _44c5_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__44c5_s_p9_2, + (char *)_vq_lengthlist__44c5_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c5_s_p9_2, 0 }; -static const long _huff_lengthlist__44c5_s_short[] = { +static const char _huff_lengthlist__44c5_s_short[] = { 5, 8,10,14,11,11,12,16,15,17, 5, 5, 7, 9, 7, 8, 10,13,17,17, 7, 5, 5,10, 5, 7, 8,11,13,15,10, 8, 10, 8, 8, 8,11,15,18,18, 8, 5, 5, 8, 3, 4, 6,10, @@ -7934,13 +7934,13 @@ static const long _huff_lengthlist__44c5_s_short[] = { static const static_codebook _huff_book__44c5_s_short = { 2, 100, - (long *)_huff_lengthlist__44c5_s_short, + (char *)_huff_lengthlist__44c5_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c6_s_long[] = { +static const char _huff_lengthlist__44c6_s_long[] = { 3, 8,11,13,14,14,13,13,16,14, 6, 3, 4, 7, 9, 9, 10,11,14,13,10, 4, 3, 5, 7, 7, 9,10,13,15,12, 7, 4, 4, 6, 6, 8,10,13,15,12, 8, 6, 6, 6, 6, 8,10, @@ -7952,7 +7952,7 @@ static const long _huff_lengthlist__44c6_s_long[] = { static const static_codebook _huff_book__44c6_s_long = { 2, 100, - (long *)_huff_lengthlist__44c6_s_long, + (char *)_huff_lengthlist__44c6_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -7964,7 +7964,7 @@ static const long _vq_quantlist__44c6_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c6_s_p1_0[] = { +static const char _vq_lengthlist__44c6_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0, 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, @@ -7974,7 +7974,7 @@ static const long _vq_lengthlist__44c6_s_p1_0[] = { }; static const static_codebook _44c6_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c6_s_p1_0, + (char *)_vq_lengthlist__44c6_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c6_s_p1_0, 0 @@ -7988,7 +7988,7 @@ static const long _vq_quantlist__44c6_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c6_s_p2_0[] = { +static const char _vq_lengthlist__44c6_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, @@ -8033,7 +8033,7 @@ static const long _vq_lengthlist__44c6_s_p2_0[] = { static const static_codebook _44c6_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c6_s_p2_0, + (char *)_vq_lengthlist__44c6_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c6_s_p2_0, 0 @@ -8051,7 +8051,7 @@ static const long _vq_quantlist__44c6_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c6_s_p3_0[] = { +static const char _vq_lengthlist__44c6_s_p3_0[] = { 2, 3, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9,10, 0, 4, 4, 6, 6, 7, 7,10, 9, 0, 5, 5, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 6, 8, 8,10,10, 0, 0, 0, @@ -8062,7 +8062,7 @@ static const long _vq_lengthlist__44c6_s_p3_0[] = { static const static_codebook _44c6_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c6_s_p3_0, + (char *)_vq_lengthlist__44c6_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c6_s_p3_0, 0 @@ -8088,7 +8088,7 @@ static const long _vq_quantlist__44c6_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c6_s_p4_0[] = { +static const char _vq_lengthlist__44c6_s_p4_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9,10,10, 10, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, @@ -8112,7 +8112,7 @@ static const long _vq_lengthlist__44c6_s_p4_0[] = { static const static_codebook _44c6_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c6_s_p4_0, + (char *)_vq_lengthlist__44c6_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c6_s_p4_0, 0 @@ -8124,7 +8124,7 @@ static const long _vq_quantlist__44c6_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c6_s_p5_0[] = { +static const char _vq_lengthlist__44c6_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6, 9, 9,10,10, 10, 9, 4, 6, 6, 9,10, 9,10, 9,10, 6, 9, 9,10,12, 11,10,11,11, 7,10, 9,11,12,12,12,12,12, 7,10,10, @@ -8135,7 +8135,7 @@ static const long _vq_lengthlist__44c6_s_p5_0[] = { static const static_codebook _44c6_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c6_s_p5_0, + (char *)_vq_lengthlist__44c6_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c6_s_p5_0, 0 @@ -8155,7 +8155,7 @@ static const long _vq_quantlist__44c6_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c6_s_p5_1[] = { +static const char _vq_lengthlist__44c6_s_p5_1[] = { 3, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 6, 6, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6, @@ -8168,7 +8168,7 @@ static const long _vq_lengthlist__44c6_s_p5_1[] = { static const static_codebook _44c6_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c6_s_p5_1, + (char *)_vq_lengthlist__44c6_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c6_s_p5_1, 0 @@ -8190,7 +8190,7 @@ static const long _vq_quantlist__44c6_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p6_0[] = { +static const char _vq_lengthlist__44c6_s_p6_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8,10, 9,10,10, 6, 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9, 9,10, 9,11,10,11,11, 0, 6, 6, 7, 7, 9, 9,10,10, @@ -8206,7 +8206,7 @@ static const long _vq_lengthlist__44c6_s_p6_0[] = { static const static_codebook _44c6_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p6_0, + (char *)_vq_lengthlist__44c6_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c6_s_p6_0, 0 @@ -8220,14 +8220,14 @@ static const long _vq_quantlist__44c6_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c6_s_p6_1[] = { +static const char _vq_lengthlist__44c6_s_p6_1[] = { 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c6_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c6_s_p6_1, + (char *)_vq_lengthlist__44c6_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c6_s_p6_1, 0 @@ -8249,7 +8249,7 @@ static const long _vq_quantlist__44c6_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p7_0[] = { +static const char _vq_lengthlist__44c6_s_p7_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8,10,10,11,10, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,12,11,21, 7, 7, 7, 7, 9, 9,10,10, @@ -8265,7 +8265,7 @@ static const long _vq_lengthlist__44c6_s_p7_0[] = { static const static_codebook _44c6_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p7_0, + (char *)_vq_lengthlist__44c6_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c6_s_p7_0, 0 @@ -8285,7 +8285,7 @@ static const long _vq_quantlist__44c6_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c6_s_p7_1[] = { +static const char _vq_lengthlist__44c6_s_p7_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 6, 6, 7, 7, 7, 7, 8, 7, 7, 8, 9, 9, 9, 7, @@ -8298,7 +8298,7 @@ static const long _vq_lengthlist__44c6_s_p7_1[] = { static const static_codebook _44c6_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c6_s_p7_1, + (char *)_vq_lengthlist__44c6_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c6_s_p7_1, 0 @@ -8322,7 +8322,7 @@ static const long _vq_quantlist__44c6_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c6_s_p8_0[] = { +static const char _vq_lengthlist__44c6_s_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 7, 7, 8, 7, 9, 8,10, 9, 6, 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,11,10,11,10, 6, 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11,18, 8, 8, @@ -8342,7 +8342,7 @@ static const long _vq_lengthlist__44c6_s_p8_0[] = { static const static_codebook _44c6_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c6_s_p8_0, + (char *)_vq_lengthlist__44c6_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c6_s_p8_0, 0 @@ -8372,7 +8372,7 @@ static const long _vq_quantlist__44c6_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c6_s_p8_1[] = { +static const char _vq_lengthlist__44c6_s_p8_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -8405,7 +8405,7 @@ static const long _vq_lengthlist__44c6_s_p8_1[] = { static const static_codebook _44c6_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c6_s_p8_1, + (char *)_vq_lengthlist__44c6_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c6_s_p8_1, 0 @@ -8427,7 +8427,7 @@ static const long _vq_quantlist__44c6_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p9_0[] = { +static const char _vq_lengthlist__44c6_s_p9_0[] = { 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 7, 7, 11,11,11,11,11,11,11,11,11,11, 5, 8, 9,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -8443,7 +8443,7 @@ static const long _vq_lengthlist__44c6_s_p9_0[] = { static const static_codebook _44c6_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p9_0, + (char *)_vq_lengthlist__44c6_s_p9_0, 1, -511845376, 1630791680, 4, 0, (long *)_vq_quantlist__44c6_s_p9_0, 0 @@ -8465,7 +8465,7 @@ static const long _vq_quantlist__44c6_s_p9_1[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p9_1[] = { +static const char _vq_lengthlist__44c6_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8,10,10, 5, 6, 6, 8, 8, 9, 9, 8, 8,10,10,10,10,16, 9, 9, 9, 9, 9, 9, 9, 8, @@ -8481,7 +8481,7 @@ static const long _vq_lengthlist__44c6_s_p9_1[] = { static const static_codebook _44c6_s_p9_1 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p9_1, + (char *)_vq_lengthlist__44c6_s_p9_1, 1, -518889472, 1622704128, 4, 0, (long *)_vq_quantlist__44c6_s_p9_1, 0 @@ -8539,7 +8539,7 @@ static const long _vq_quantlist__44c6_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c6_s_p9_2[] = { +static const char _vq_lengthlist__44c6_s_p9_2[] = { 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -8548,13 +8548,13 @@ static const long _vq_lengthlist__44c6_s_p9_2[] = { static const static_codebook _44c6_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c6_s_p9_2, + (char *)_vq_lengthlist__44c6_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c6_s_p9_2, 0 }; -static const long _huff_lengthlist__44c6_s_short[] = { +static const char _huff_lengthlist__44c6_s_short[] = { 3, 9,11,11,13,14,19,17,17,19, 5, 4, 5, 8,10,10, 13,16,18,19, 7, 4, 4, 5, 8, 9,12,14,17,19, 8, 6, 5, 5, 7, 7,10,13,16,18,10, 8, 7, 6, 5, 5, 8,11, @@ -8566,13 +8566,13 @@ static const long _huff_lengthlist__44c6_s_short[] = { static const static_codebook _huff_book__44c6_s_short = { 2, 100, - (long *)_huff_lengthlist__44c6_s_short, + (char *)_huff_lengthlist__44c6_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c7_s_long[] = { +static const char _huff_lengthlist__44c7_s_long[] = { 3, 8,11,13,15,14,14,13,15,14, 6, 4, 5, 7, 9,10, 11,11,14,13,10, 4, 3, 5, 7, 8, 9,10,13,13,12, 7, 4, 4, 5, 6, 8, 9,12,14,13, 9, 6, 5, 5, 6, 8, 9, @@ -8584,7 +8584,7 @@ static const long _huff_lengthlist__44c7_s_long[] = { static const static_codebook _huff_book__44c7_s_long = { 2, 100, - (long *)_huff_lengthlist__44c7_s_long, + (char *)_huff_lengthlist__44c7_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -8596,7 +8596,7 @@ static const long _vq_quantlist__44c7_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c7_s_p1_0[] = { +static const char _vq_lengthlist__44c7_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0, 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 8, 8, 0, 8, 8, 5, 8, 9, @@ -8607,7 +8607,7 @@ static const long _vq_lengthlist__44c7_s_p1_0[] = { static const static_codebook _44c7_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c7_s_p1_0, + (char *)_vq_lengthlist__44c7_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c7_s_p1_0, 0 @@ -8621,7 +8621,7 @@ static const long _vq_quantlist__44c7_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c7_s_p2_0[] = { +static const char _vq_lengthlist__44c7_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, @@ -8666,7 +8666,7 @@ static const long _vq_lengthlist__44c7_s_p2_0[] = { static const static_codebook _44c7_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c7_s_p2_0, + (char *)_vq_lengthlist__44c7_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c7_s_p2_0, 0 @@ -8684,7 +8684,7 @@ static const long _vq_quantlist__44c7_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c7_s_p3_0[] = { +static const char _vq_lengthlist__44c7_s_p3_0[] = { 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, @@ -8695,7 +8695,7 @@ static const long _vq_lengthlist__44c7_s_p3_0[] = { static const static_codebook _44c7_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c7_s_p3_0, + (char *)_vq_lengthlist__44c7_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c7_s_p3_0, 0 @@ -8721,7 +8721,7 @@ static const long _vq_quantlist__44c7_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c7_s_p4_0[] = { +static const char _vq_lengthlist__44c7_s_p4_0[] = { 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 12,12, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, @@ -8745,7 +8745,7 @@ static const long _vq_lengthlist__44c7_s_p4_0[] = { static const static_codebook _44c7_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c7_s_p4_0, + (char *)_vq_lengthlist__44c7_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c7_s_p4_0, 0 @@ -8757,7 +8757,7 @@ static const long _vq_quantlist__44c7_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c7_s_p5_0[] = { +static const char _vq_lengthlist__44c7_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 7,10,10,10,10, 10, 9, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11, 12,10,11,12, 7,10,10,11,12,12,12,12,12, 7,10,10, @@ -8768,7 +8768,7 @@ static const long _vq_lengthlist__44c7_s_p5_0[] = { static const static_codebook _44c7_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c7_s_p5_0, + (char *)_vq_lengthlist__44c7_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c7_s_p5_0, 0 @@ -8788,7 +8788,7 @@ static const long _vq_quantlist__44c7_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c7_s_p5_1[] = { +static const char _vq_lengthlist__44c7_s_p5_1[] = { 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,11, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,12, 5, 5, 6, 6, 7, 7, 9, 9, 9, 9,12,12,12, 6, @@ -8801,7 +8801,7 @@ static const long _vq_lengthlist__44c7_s_p5_1[] = { static const static_codebook _44c7_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c7_s_p5_1, + (char *)_vq_lengthlist__44c7_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c7_s_p5_1, 0 @@ -8823,7 +8823,7 @@ static const long _vq_quantlist__44c7_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p6_0[] = { +static const char _vq_lengthlist__44c7_s_p6_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 8,10,10, 6, 5, 5, 7, 7, 8, 8, 9, 9, 9,10,11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 8, 9, 9, @@ -8839,7 +8839,7 @@ static const long _vq_lengthlist__44c7_s_p6_0[] = { static const static_codebook _44c7_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p6_0, + (char *)_vq_lengthlist__44c7_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c7_s_p6_0, 0 @@ -8853,14 +8853,14 @@ static const long _vq_quantlist__44c7_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c7_s_p6_1[] = { +static const char _vq_lengthlist__44c7_s_p6_1[] = { 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c7_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c7_s_p6_1, + (char *)_vq_lengthlist__44c7_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c7_s_p6_1, 0 @@ -8882,7 +8882,7 @@ static const long _vq_quantlist__44c7_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p7_0[] = { +static const char _vq_lengthlist__44c7_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8, 8, 9,10,11,11,12,12, 7, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,20, 7, 7, 7, 7, 8, 9,10,10, @@ -8898,7 +8898,7 @@ static const long _vq_lengthlist__44c7_s_p7_0[] = { static const static_codebook _44c7_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p7_0, + (char *)_vq_lengthlist__44c7_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c7_s_p7_0, 0 @@ -8918,7 +8918,7 @@ static const long _vq_quantlist__44c7_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c7_s_p7_1[] = { +static const char _vq_lengthlist__44c7_s_p7_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, @@ -8931,7 +8931,7 @@ static const long _vq_lengthlist__44c7_s_p7_1[] = { static const static_codebook _44c7_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c7_s_p7_1, + (char *)_vq_lengthlist__44c7_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c7_s_p7_1, 0 @@ -8955,7 +8955,7 @@ static const long _vq_quantlist__44c7_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c7_s_p8_0[] = { +static const char _vq_lengthlist__44c7_s_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 9, 9, 8, 8,10, 9,11,10,12,11, 6, 5, 5, 8, 7, 9, 9, 8, 8,10,10,11,11,12,11,19, 8, 8, @@ -8975,7 +8975,7 @@ static const long _vq_lengthlist__44c7_s_p8_0[] = { static const static_codebook _44c7_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c7_s_p8_0, + (char *)_vq_lengthlist__44c7_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c7_s_p8_0, 0 @@ -9005,7 +9005,7 @@ static const long _vq_quantlist__44c7_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c7_s_p8_1[] = { +static const char _vq_lengthlist__44c7_s_p8_1[] = { 3, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -9038,7 +9038,7 @@ static const long _vq_lengthlist__44c7_s_p8_1[] = { static const static_codebook _44c7_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c7_s_p8_1, + (char *)_vq_lengthlist__44c7_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c7_s_p8_1, 0 @@ -9060,7 +9060,7 @@ static const long _vq_quantlist__44c7_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p9_0[] = { +static const char _vq_lengthlist__44c7_s_p9_0[] = { 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 6, 6, 11,11,11,11,11,11,11,11,11,11, 4, 7, 7,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -9076,7 +9076,7 @@ static const long _vq_lengthlist__44c7_s_p9_0[] = { static const static_codebook _44c7_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p9_0, + (char *)_vq_lengthlist__44c7_s_p9_0, 1, -511845376, 1630791680, 4, 0, (long *)_vq_quantlist__44c7_s_p9_0, 0 @@ -9098,7 +9098,7 @@ static const long _vq_quantlist__44c7_s_p9_1[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p9_1[] = { +static const char _vq_lengthlist__44c7_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6, 8, 8, 9, 8, 8, 7, 9, 8,11,10, 5, 6, 6, 8, 8, 9, 8, 8, 8,10, 9,11,11,16, 8, 8, 9, 8, 9, 9, 9, 8, @@ -9114,7 +9114,7 @@ static const long _vq_lengthlist__44c7_s_p9_1[] = { static const static_codebook _44c7_s_p9_1 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p9_1, + (char *)_vq_lengthlist__44c7_s_p9_1, 1, -518889472, 1622704128, 4, 0, (long *)_vq_quantlist__44c7_s_p9_1, 0 @@ -9172,7 +9172,7 @@ static const long _vq_quantlist__44c7_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c7_s_p9_2[] = { +static const char _vq_lengthlist__44c7_s_p9_2[] = { 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -9181,13 +9181,13 @@ static const long _vq_lengthlist__44c7_s_p9_2[] = { static const static_codebook _44c7_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c7_s_p9_2, + (char *)_vq_lengthlist__44c7_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c7_s_p9_2, 0 }; -static const long _huff_lengthlist__44c7_s_short[] = { +static const char _huff_lengthlist__44c7_s_short[] = { 4,11,12,14,15,15,17,17,18,18, 5, 6, 6, 8, 9,10, 13,17,18,19, 7, 5, 4, 6, 8, 9,11,15,19,19, 8, 6, 5, 5, 6, 7,11,14,16,17, 9, 7, 7, 6, 7, 7,10,13, @@ -9199,13 +9199,13 @@ static const long _huff_lengthlist__44c7_s_short[] = { static const static_codebook _huff_book__44c7_s_short = { 2, 100, - (long *)_huff_lengthlist__44c7_s_short, + (char *)_huff_lengthlist__44c7_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c8_s_long[] = { +static const char _huff_lengthlist__44c8_s_long[] = { 3, 8,12,13,14,14,14,13,14,14, 6, 4, 5, 8,10,10, 11,11,14,13, 9, 5, 4, 5, 7, 8, 9,10,13,13,12, 7, 5, 4, 5, 6, 8, 9,12,13,13, 9, 6, 5, 5, 5, 7, 9, @@ -9217,7 +9217,7 @@ static const long _huff_lengthlist__44c8_s_long[] = { static const static_codebook _huff_book__44c8_s_long = { 2, 100, - (long *)_huff_lengthlist__44c8_s_long, + (char *)_huff_lengthlist__44c8_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -9229,7 +9229,7 @@ static const long _vq_quantlist__44c8_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c8_s_p1_0[] = { +static const char _vq_lengthlist__44c8_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 7, 7, 0, 9, 8, 0, 9, 8, 6, 7, 7, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, @@ -9240,7 +9240,7 @@ static const long _vq_lengthlist__44c8_s_p1_0[] = { static const static_codebook _44c8_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c8_s_p1_0, + (char *)_vq_lengthlist__44c8_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c8_s_p1_0, 0 @@ -9254,7 +9254,7 @@ static const long _vq_quantlist__44c8_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c8_s_p2_0[] = { +static const char _vq_lengthlist__44c8_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, 7,10, 9, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, @@ -9299,7 +9299,7 @@ static const long _vq_lengthlist__44c8_s_p2_0[] = { static const static_codebook _44c8_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c8_s_p2_0, + (char *)_vq_lengthlist__44c8_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c8_s_p2_0, 0 @@ -9317,7 +9317,7 @@ static const long _vq_quantlist__44c8_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c8_s_p3_0[] = { +static const char _vq_lengthlist__44c8_s_p3_0[] = { 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, @@ -9328,7 +9328,7 @@ static const long _vq_lengthlist__44c8_s_p3_0[] = { static const static_codebook _44c8_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c8_s_p3_0, + (char *)_vq_lengthlist__44c8_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c8_s_p3_0, 0 @@ -9354,7 +9354,7 @@ static const long _vq_quantlist__44c8_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c8_s_p4_0[] = { +static const char _vq_lengthlist__44c8_s_p4_0[] = { 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8,10,10,11,11, 11,11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, @@ -9378,7 +9378,7 @@ static const long _vq_lengthlist__44c8_s_p4_0[] = { static const static_codebook _44c8_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c8_s_p4_0, + (char *)_vq_lengthlist__44c8_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c8_s_p4_0, 0 @@ -9390,7 +9390,7 @@ static const long _vq_quantlist__44c8_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c8_s_p5_0[] = { +static const char _vq_lengthlist__44c8_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6,10,10,10,10, 10,10, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11, 11,10,11,11, 7,10,10,11,12,12,12,12,12, 7,10,10, @@ -9401,7 +9401,7 @@ static const long _vq_lengthlist__44c8_s_p5_0[] = { static const static_codebook _44c8_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c8_s_p5_0, + (char *)_vq_lengthlist__44c8_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c8_s_p5_0, 0 @@ -9421,7 +9421,7 @@ static const long _vq_quantlist__44c8_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c8_s_p5_1[] = { +static const char _vq_lengthlist__44c8_s_p5_1[] = { 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9,12, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,12,12,12, 6, @@ -9434,7 +9434,7 @@ static const long _vq_lengthlist__44c8_s_p5_1[] = { static const static_codebook _44c8_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c8_s_p5_1, + (char *)_vq_lengthlist__44c8_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c8_s_p5_1, 0 @@ -9456,7 +9456,7 @@ static const long _vq_quantlist__44c8_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c8_s_p6_0[] = { +static const char _vq_lengthlist__44c8_s_p6_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 9,10,10, @@ -9472,7 +9472,7 @@ static const long _vq_lengthlist__44c8_s_p6_0[] = { static const static_codebook _44c8_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c8_s_p6_0, + (char *)_vq_lengthlist__44c8_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c8_s_p6_0, 0 @@ -9486,14 +9486,14 @@ static const long _vq_quantlist__44c8_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c8_s_p6_1[] = { +static const char _vq_lengthlist__44c8_s_p6_1[] = { 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c8_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c8_s_p6_1, + (char *)_vq_lengthlist__44c8_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c8_s_p6_1, 0 @@ -9515,7 +9515,7 @@ static const long _vq_quantlist__44c8_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c8_s_p7_0[] = { +static const char _vq_lengthlist__44c8_s_p7_0[] = { 1, 4, 4, 6, 6, 8, 7, 9, 9,10,10,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12, 7, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,21, 7, 7, 7, 7, 8, 9,10,10, @@ -9531,7 +9531,7 @@ static const long _vq_lengthlist__44c8_s_p7_0[] = { static const static_codebook _44c8_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c8_s_p7_0, + (char *)_vq_lengthlist__44c8_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c8_s_p7_0, 0 @@ -9551,7 +9551,7 @@ static const long _vq_quantlist__44c8_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c8_s_p7_1[] = { +static const char _vq_lengthlist__44c8_s_p7_1[] = { 4, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, @@ -9564,7 +9564,7 @@ static const long _vq_lengthlist__44c8_s_p7_1[] = { static const static_codebook _44c8_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c8_s_p7_1, + (char *)_vq_lengthlist__44c8_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c8_s_p7_1, 0 @@ -9588,7 +9588,7 @@ static const long _vq_quantlist__44c8_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c8_s_p8_0[] = { +static const char _vq_lengthlist__44c8_s_p8_0[] = { 1, 4, 4, 7, 6, 8, 8, 8, 7, 9, 8,10,10,11,10, 6, 5, 5, 7, 7, 9, 9, 8, 8,10,10,11,11,12,11, 6, 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,20, 8, 8, @@ -9608,7 +9608,7 @@ static const long _vq_lengthlist__44c8_s_p8_0[] = { static const static_codebook _44c8_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c8_s_p8_0, + (char *)_vq_lengthlist__44c8_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c8_s_p8_0, 0 @@ -9638,7 +9638,7 @@ static const long _vq_quantlist__44c8_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c8_s_p8_1[] = { +static const char _vq_lengthlist__44c8_s_p8_1[] = { 4, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -9671,7 +9671,7 @@ static const long _vq_lengthlist__44c8_s_p8_1[] = { static const static_codebook _44c8_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c8_s_p8_1, + (char *)_vq_lengthlist__44c8_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c8_s_p8_1, 0 @@ -9697,7 +9697,7 @@ static const long _vq_quantlist__44c8_s_p9_0[] = { 16, }; -static const long _vq_lengthlist__44c8_s_p9_0[] = { +static const char _vq_lengthlist__44c8_s_p9_0[] = { 1, 4, 3,11,11,11,11,11,11,11,11,11,11,11,11,11, 11, 4, 7, 7,11,11,11,11,11,11,11,11,11,11,11,11, 11,11, 4, 8,11,11,11,11,11,11,11,11,11,11,11,11, @@ -9721,7 +9721,7 @@ static const long _vq_lengthlist__44c8_s_p9_0[] = { static const static_codebook _44c8_s_p9_0 = { 2, 289, - (long *)_vq_lengthlist__44c8_s_p9_0, + (char *)_vq_lengthlist__44c8_s_p9_0, 1, -509798400, 1631393792, 5, 0, (long *)_vq_quantlist__44c8_s_p9_0, 0 @@ -9749,7 +9749,7 @@ static const long _vq_quantlist__44c8_s_p9_1[] = { 18, }; -static const long _vq_lengthlist__44c8_s_p9_1[] = { +static const char _vq_lengthlist__44c8_s_p9_1[] = { 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,10, 10,11,11, 6, 6, 6, 8, 8, 9, 8, 8, 7,10, 8,11,10, 12,11,12,12,13,13, 5, 5, 6, 8, 8, 9, 9, 8, 8,10, @@ -9777,7 +9777,7 @@ static const long _vq_lengthlist__44c8_s_p9_1[] = { static const static_codebook _44c8_s_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44c8_s_p9_1, + (char *)_vq_lengthlist__44c8_s_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44c8_s_p9_1, 0 @@ -9835,7 +9835,7 @@ static const long _vq_quantlist__44c8_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c8_s_p9_2[] = { +static const char _vq_lengthlist__44c8_s_p9_2[] = { 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -9844,13 +9844,13 @@ static const long _vq_lengthlist__44c8_s_p9_2[] = { static const static_codebook _44c8_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c8_s_p9_2, + (char *)_vq_lengthlist__44c8_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c8_s_p9_2, 0 }; -static const long _huff_lengthlist__44c8_s_short[] = { +static const char _huff_lengthlist__44c8_s_short[] = { 4,11,13,14,15,15,18,17,19,17, 5, 6, 8, 9,10,10, 12,15,19,19, 6, 6, 6, 6, 8, 8,11,14,18,19, 8, 6, 5, 4, 6, 7,10,13,16,17, 9, 7, 6, 5, 6, 7, 9,12, @@ -9862,13 +9862,13 @@ static const long _huff_lengthlist__44c8_s_short[] = { static const static_codebook _huff_book__44c8_s_short = { 2, 100, - (long *)_huff_lengthlist__44c8_s_short, + (char *)_huff_lengthlist__44c8_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c9_s_long[] = { +static const char _huff_lengthlist__44c9_s_long[] = { 3, 8,12,14,15,15,15,13,15,15, 6, 5, 8,10,12,12, 13,12,14,13,10, 6, 5, 6, 8, 9,11,11,13,13,13, 8, 5, 4, 5, 6, 8,10,11,13,14,10, 7, 5, 4, 5, 7, 9, @@ -9880,7 +9880,7 @@ static const long _huff_lengthlist__44c9_s_long[] = { static const static_codebook _huff_book__44c9_s_long = { 2, 100, - (long *)_huff_lengthlist__44c9_s_long, + (char *)_huff_lengthlist__44c9_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -9892,7 +9892,7 @@ static const long _vq_quantlist__44c9_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c9_s_p1_0[] = { +static const char _vq_lengthlist__44c9_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 8, 8, 0, 9, 8, 0, 9, 8, 6, 8, 8, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 7, 7, 0, 8, 8, 5, 8, 8, @@ -9903,7 +9903,7 @@ static const long _vq_lengthlist__44c9_s_p1_0[] = { static const static_codebook _44c9_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c9_s_p1_0, + (char *)_vq_lengthlist__44c9_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c9_s_p1_0, 0 @@ -9917,7 +9917,7 @@ static const long _vq_quantlist__44c9_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c9_s_p2_0[] = { +static const char _vq_lengthlist__44c9_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 7, 7, 9, 8, 0, 8, 8, 9, 9, 0, 8, 7, 9, 9, 0, 9,10,10,10, 0, 0, 0, @@ -9962,7 +9962,7 @@ static const long _vq_lengthlist__44c9_s_p2_0[] = { static const static_codebook _44c9_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c9_s_p2_0, + (char *)_vq_lengthlist__44c9_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c9_s_p2_0, 0 @@ -9980,7 +9980,7 @@ static const long _vq_quantlist__44c9_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c9_s_p3_0[] = { +static const char _vq_lengthlist__44c9_s_p3_0[] = { 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 6, 7, 8, 8, 0, 4, 4, 5, 5, 7, 7, 8, 8, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, @@ -9991,7 +9991,7 @@ static const long _vq_lengthlist__44c9_s_p3_0[] = { static const static_codebook _44c9_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c9_s_p3_0, + (char *)_vq_lengthlist__44c9_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c9_s_p3_0, 0 @@ -10017,7 +10017,7 @@ static const long _vq_quantlist__44c9_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c9_s_p4_0[] = { +static const char _vq_lengthlist__44c9_s_p4_0[] = { 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,10, 10, 0, 5, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 11,11, 0, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, @@ -10041,7 +10041,7 @@ static const long _vq_lengthlist__44c9_s_p4_0[] = { static const static_codebook _44c9_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c9_s_p4_0, + (char *)_vq_lengthlist__44c9_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c9_s_p4_0, 0 @@ -10053,7 +10053,7 @@ static const long _vq_quantlist__44c9_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c9_s_p5_0[] = { +static const char _vq_lengthlist__44c9_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6, 9,10,10,10, 10, 9, 4, 6, 7, 9,10,10,10, 9,10, 5, 9, 9, 9,11, 11,10,11,11, 7,10, 9,11,12,11,12,12,12, 7, 9,10, @@ -10064,7 +10064,7 @@ static const long _vq_lengthlist__44c9_s_p5_0[] = { static const static_codebook _44c9_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c9_s_p5_0, + (char *)_vq_lengthlist__44c9_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c9_s_p5_0, 0 @@ -10084,7 +10084,7 @@ static const long _vq_quantlist__44c9_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c9_s_p5_1[] = { +static const char _vq_lengthlist__44c9_s_p5_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7,11, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, @@ -10097,7 +10097,7 @@ static const long _vq_lengthlist__44c9_s_p5_1[] = { static const static_codebook _44c9_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c9_s_p5_1, + (char *)_vq_lengthlist__44c9_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c9_s_p5_1, 0 @@ -10119,7 +10119,7 @@ static const long _vq_quantlist__44c9_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c9_s_p6_0[] = { +static const char _vq_lengthlist__44c9_s_p6_0[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 5, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10, 6, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10, 0, 6, 6, 7, 7, 8, 8, 9, 9, @@ -10135,7 +10135,7 @@ static const long _vq_lengthlist__44c9_s_p6_0[] = { static const static_codebook _44c9_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c9_s_p6_0, + (char *)_vq_lengthlist__44c9_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c9_s_p6_0, 0 @@ -10149,14 +10149,14 @@ static const long _vq_quantlist__44c9_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c9_s_p6_1[] = { +static const char _vq_lengthlist__44c9_s_p6_1[] = { 4, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44c9_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c9_s_p6_1, + (char *)_vq_lengthlist__44c9_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c9_s_p6_1, 0 @@ -10178,7 +10178,7 @@ static const long _vq_quantlist__44c9_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c9_s_p7_0[] = { +static const char _vq_lengthlist__44c9_s_p7_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8,10,10,11,11, 6, 4, 4, 6, 6, 8, 8, 9, 9,10,10,12,12, 6, 4, 5, 6, 6, 8, 8, 9, 9,10,10,12,12,20, 6, 6, 6, 6, 8, 8, 9,10, @@ -10194,7 +10194,7 @@ static const long _vq_lengthlist__44c9_s_p7_0[] = { static const static_codebook _44c9_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c9_s_p7_0, + (char *)_vq_lengthlist__44c9_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c9_s_p7_0, 0 @@ -10214,7 +10214,7 @@ static const long _vq_quantlist__44c9_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c9_s_p7_1[] = { +static const char _vq_lengthlist__44c9_s_p7_1[] = { 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 6, @@ -10227,7 +10227,7 @@ static const long _vq_lengthlist__44c9_s_p7_1[] = { static const static_codebook _44c9_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c9_s_p7_1, + (char *)_vq_lengthlist__44c9_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c9_s_p7_1, 0 @@ -10251,7 +10251,7 @@ static const long _vq_quantlist__44c9_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c9_s_p8_0[] = { +static const char _vq_lengthlist__44c9_s_p8_0[] = { 1, 4, 4, 7, 6, 8, 8, 8, 8, 9, 9,10,10,11,10, 6, 5, 5, 7, 7, 9, 9, 8, 9,10,10,11,11,12,12, 6, 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,21, 7, 8, @@ -10271,7 +10271,7 @@ static const long _vq_lengthlist__44c9_s_p8_0[] = { static const static_codebook _44c9_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c9_s_p8_0, + (char *)_vq_lengthlist__44c9_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c9_s_p8_0, 0 @@ -10301,7 +10301,7 @@ static const long _vq_quantlist__44c9_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c9_s_p8_1[] = { +static const char _vq_lengthlist__44c9_s_p8_1[] = { 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -10334,7 +10334,7 @@ static const long _vq_lengthlist__44c9_s_p8_1[] = { static const static_codebook _44c9_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c9_s_p8_1, + (char *)_vq_lengthlist__44c9_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c9_s_p8_1, 0 @@ -10362,7 +10362,7 @@ static const long _vq_quantlist__44c9_s_p9_0[] = { 18, }; -static const long _vq_lengthlist__44c9_s_p9_0[] = { +static const char _vq_lengthlist__44c9_s_p9_0[] = { 1, 4, 3,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12, 4, 5, 6,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12, 4, 6, 6,12,12,12,12,12,12,12, @@ -10390,7 +10390,7 @@ static const long _vq_lengthlist__44c9_s_p9_0[] = { static const static_codebook _44c9_s_p9_0 = { 2, 361, - (long *)_vq_lengthlist__44c9_s_p9_0, + (char *)_vq_lengthlist__44c9_s_p9_0, 1, -508535424, 1631393792, 5, 0, (long *)_vq_quantlist__44c9_s_p9_0, 0 @@ -10418,7 +10418,7 @@ static const long _vq_quantlist__44c9_s_p9_1[] = { 18, }; -static const long _vq_lengthlist__44c9_s_p9_1[] = { +static const char _vq_lengthlist__44c9_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 8, 7, 9, 8, 9, 9,10,10,11, 11,11,11, 6, 5, 5, 8, 8, 9, 9, 9, 8,10, 9,11,10, 12,12,13,12,13,13, 5, 5, 5, 8, 8, 9, 9, 9, 9,10, @@ -10446,7 +10446,7 @@ static const long _vq_lengthlist__44c9_s_p9_1[] = { static const static_codebook _44c9_s_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44c9_s_p9_1, + (char *)_vq_lengthlist__44c9_s_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44c9_s_p9_1, 0 @@ -10504,7 +10504,7 @@ static const long _vq_quantlist__44c9_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c9_s_p9_2[] = { +static const char _vq_lengthlist__44c9_s_p9_2[] = { 2, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -10513,13 +10513,13 @@ static const long _vq_lengthlist__44c9_s_p9_2[] = { static const static_codebook _44c9_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c9_s_p9_2, + (char *)_vq_lengthlist__44c9_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c9_s_p9_2, 0 }; -static const long _huff_lengthlist__44c9_s_short[] = { +static const char _huff_lengthlist__44c9_s_short[] = { 5,13,18,16,17,17,19,18,19,19, 5, 7,10,11,12,12, 13,16,17,18, 6, 6, 7, 7, 9, 9,10,14,17,19, 8, 7, 6, 5, 6, 7, 9,12,19,17, 8, 7, 7, 6, 5, 6, 8,11, @@ -10531,13 +10531,13 @@ static const long _huff_lengthlist__44c9_s_short[] = { static const static_codebook _huff_book__44c9_s_short = { 2, 100, - (long *)_huff_lengthlist__44c9_s_short, + (char *)_huff_lengthlist__44c9_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c0_s_long[] = { +static const char _huff_lengthlist__44c0_s_long[] = { 5, 4, 8, 9, 8, 9,10,12,15, 4, 1, 5, 5, 6, 8,11, 12,12, 8, 5, 8, 9, 9,11,13,12,12, 9, 5, 8, 5, 7, 9,12,13,13, 8, 6, 8, 7, 7, 9,11,11,11, 9, 7, 9, @@ -10548,7 +10548,7 @@ static const long _huff_lengthlist__44c0_s_long[] = { static const static_codebook _huff_book__44c0_s_long = { 2, 81, - (long *)_huff_lengthlist__44c0_s_long, + (char *)_huff_lengthlist__44c0_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -10560,7 +10560,7 @@ static const long _vq_quantlist__44c0_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c0_s_p1_0[] = { +static const char _vq_lengthlist__44c0_s_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -10976,7 +10976,7 @@ static const long _vq_lengthlist__44c0_s_p1_0[] = { static const static_codebook _44c0_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c0_s_p1_0, + (char *)_vq_lengthlist__44c0_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c0_s_p1_0, 0 @@ -10990,7 +10990,7 @@ static const long _vq_quantlist__44c0_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c0_s_p2_0[] = { +static const char _vq_lengthlist__44c0_s_p2_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11035,7 +11035,7 @@ static const long _vq_lengthlist__44c0_s_p2_0[] = { static const static_codebook _44c0_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c0_s_p2_0, + (char *)_vq_lengthlist__44c0_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_s_p2_0, 0 @@ -11053,7 +11053,7 @@ static const long _vq_quantlist__44c0_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c0_s_p3_0[] = { +static const char _vq_lengthlist__44c0_s_p3_0[] = { 1, 3, 2, 8, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -11064,7 +11064,7 @@ static const long _vq_lengthlist__44c0_s_p3_0[] = { static const static_codebook _44c0_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_s_p3_0, + (char *)_vq_lengthlist__44c0_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_s_p3_0, 0 @@ -11082,7 +11082,7 @@ static const long _vq_quantlist__44c0_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c0_s_p4_0[] = { +static const char _vq_lengthlist__44c0_s_p4_0[] = { 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 8, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, @@ -11093,7 +11093,7 @@ static const long _vq_lengthlist__44c0_s_p4_0[] = { static const static_codebook _44c0_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_s_p4_0, + (char *)_vq_lengthlist__44c0_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_s_p4_0, 0 @@ -11119,7 +11119,7 @@ static const long _vq_quantlist__44c0_s_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c0_s_p5_0[] = { +static const char _vq_lengthlist__44c0_s_p5_0[] = { 1, 4, 3, 6, 6, 8, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9, 9,10,10,10, 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -11143,7 +11143,7 @@ static const long _vq_lengthlist__44c0_s_p5_0[] = { static const static_codebook _44c0_s_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c0_s_p5_0, + (char *)_vq_lengthlist__44c0_s_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_s_p5_0, 0 @@ -11155,7 +11155,7 @@ static const long _vq_quantlist__44c0_s_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c0_s_p6_0[] = { +static const char _vq_lengthlist__44c0_s_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10, 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 11,12,10,11, 6, 9, 9,11,10,11,11,10,10, 6, 9, 9, @@ -11166,7 +11166,7 @@ static const long _vq_lengthlist__44c0_s_p6_0[] = { static const static_codebook _44c0_s_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c0_s_p6_0, + (char *)_vq_lengthlist__44c0_s_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c0_s_p6_0, 0 @@ -11186,7 +11186,7 @@ static const long _vq_quantlist__44c0_s_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c0_s_p6_1[] = { +static const char _vq_lengthlist__44c0_s_p6_1[] = { 2, 3, 3, 6, 6, 7, 7, 7, 7, 7, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -11199,7 +11199,7 @@ static const long _vq_lengthlist__44c0_s_p6_1[] = { static const static_codebook _44c0_s_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c0_s_p6_1, + (char *)_vq_lengthlist__44c0_s_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_s_p6_1, 0 @@ -11221,7 +11221,7 @@ static const long _vq_quantlist__44c0_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c0_s_p7_0[] = { +static const char _vq_lengthlist__44c0_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -11237,7 +11237,7 @@ static const long _vq_lengthlist__44c0_s_p7_0[] = { static const static_codebook _44c0_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c0_s_p7_0, + (char *)_vq_lengthlist__44c0_s_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c0_s_p7_0, 0 @@ -11251,14 +11251,14 @@ static const long _vq_quantlist__44c0_s_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c0_s_p7_1[] = { +static const char _vq_lengthlist__44c0_s_p7_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c0_s_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c0_s_p7_1, + (char *)_vq_lengthlist__44c0_s_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_s_p7_1, 0 @@ -11272,7 +11272,7 @@ static const long _vq_quantlist__44c0_s_p8_0[] = { 4, }; -static const long _vq_lengthlist__44c0_s_p8_0[] = { +static const char _vq_lengthlist__44c0_s_p8_0[] = { 1, 5, 5,10,10, 6, 9, 8,10,10, 6,10, 9,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -11317,7 +11317,7 @@ static const long _vq_lengthlist__44c0_s_p8_0[] = { static const static_codebook _44c0_s_p8_0 = { 4, 625, - (long *)_vq_lengthlist__44c0_s_p8_0, + (char *)_vq_lengthlist__44c0_s_p8_0, 1, -518283264, 1627103232, 3, 0, (long *)_vq_quantlist__44c0_s_p8_0, 0 @@ -11339,7 +11339,7 @@ static const long _vq_quantlist__44c0_s_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c0_s_p8_1[] = { +static const char _vq_lengthlist__44c0_s_p8_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 9,11,12,13,12, 6, 5, 5, 7, 7, 8, 8,10, 9,12,12,12,12, 6, 5, 5, 7, 7, 8, 8,10, 9,12,11,11,13,16, 7, 7, 8, 8, 9, 9,10,10, @@ -11355,7 +11355,7 @@ static const long _vq_lengthlist__44c0_s_p8_1[] = { static const static_codebook _44c0_s_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c0_s_p8_1, + (char *)_vq_lengthlist__44c0_s_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c0_s_p8_1, 0 @@ -11381,7 +11381,7 @@ static const long _vq_quantlist__44c0_s_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c0_s_p8_2[] = { +static const char _vq_lengthlist__44c0_s_p8_2[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, @@ -11405,13 +11405,13 @@ static const long _vq_lengthlist__44c0_s_p8_2[] = { static const static_codebook _44c0_s_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c0_s_p8_2, + (char *)_vq_lengthlist__44c0_s_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_s_p8_2, 0 }; -static const long _huff_lengthlist__44c0_s_short[] = { +static const char _huff_lengthlist__44c0_s_short[] = { 9, 8,12,11,12,13,14,14,16, 6, 1, 5, 6, 6, 9,12, 14,17, 9, 4, 5, 9, 7, 9,13,15,16, 8, 5, 8, 6, 8, 10,13,17,17, 9, 6, 7, 7, 8, 9,13,15,17,11, 8, 9, @@ -11422,13 +11422,13 @@ static const long _huff_lengthlist__44c0_s_short[] = { static const static_codebook _huff_book__44c0_s_short = { 2, 81, - (long *)_huff_lengthlist__44c0_s_short, + (char *)_huff_lengthlist__44c0_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c0_sm_long[] = { +static const char _huff_lengthlist__44c0_sm_long[] = { 5, 4, 9,10, 9,10,11,12,13, 4, 1, 5, 7, 7, 9,11, 12,14, 8, 5, 7, 9, 8,10,13,13,13,10, 7, 9, 4, 6, 7,10,12,14, 9, 6, 7, 6, 6, 7,10,12,12, 9, 8, 9, @@ -11439,7 +11439,7 @@ static const long _huff_lengthlist__44c0_sm_long[] = { static const static_codebook _huff_book__44c0_sm_long = { 2, 81, - (long *)_huff_lengthlist__44c0_sm_long, + (char *)_huff_lengthlist__44c0_sm_long, 0, 0, 0, 0, 0, NULL, 0 @@ -11451,7 +11451,7 @@ static const long _vq_quantlist__44c0_sm_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c0_sm_p1_0[] = { +static const char _vq_lengthlist__44c0_sm_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11867,7 +11867,7 @@ static const long _vq_lengthlist__44c0_sm_p1_0[] = { static const static_codebook _44c0_sm_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c0_sm_p1_0, + (char *)_vq_lengthlist__44c0_sm_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c0_sm_p1_0, 0 @@ -11881,7 +11881,7 @@ static const long _vq_quantlist__44c0_sm_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c0_sm_p2_0[] = { +static const char _vq_lengthlist__44c0_sm_p2_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11926,7 +11926,7 @@ static const long _vq_lengthlist__44c0_sm_p2_0[] = { static const static_codebook _44c0_sm_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c0_sm_p2_0, + (char *)_vq_lengthlist__44c0_sm_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_sm_p2_0, 0 @@ -11944,7 +11944,7 @@ static const long _vq_quantlist__44c0_sm_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c0_sm_p3_0[] = { +static const char _vq_lengthlist__44c0_sm_p3_0[] = { 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 4, 7, 7, 0, 0, 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, @@ -11955,7 +11955,7 @@ static const long _vq_lengthlist__44c0_sm_p3_0[] = { static const static_codebook _44c0_sm_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_sm_p3_0, + (char *)_vq_lengthlist__44c0_sm_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_sm_p3_0, 0 @@ -11973,7 +11973,7 @@ static const long _vq_quantlist__44c0_sm_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c0_sm_p4_0[] = { +static const char _vq_lengthlist__44c0_sm_p4_0[] = { 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -11984,7 +11984,7 @@ static const long _vq_lengthlist__44c0_sm_p4_0[] = { static const static_codebook _44c0_sm_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_sm_p4_0, + (char *)_vq_lengthlist__44c0_sm_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_sm_p4_0, 0 @@ -12010,7 +12010,7 @@ static const long _vq_quantlist__44c0_sm_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c0_sm_p5_0[] = { +static const char _vq_lengthlist__44c0_sm_p5_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11, 11,11, 0, 5, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -12034,7 +12034,7 @@ static const long _vq_lengthlist__44c0_sm_p5_0[] = { static const static_codebook _44c0_sm_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c0_sm_p5_0, + (char *)_vq_lengthlist__44c0_sm_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_sm_p5_0, 0 @@ -12046,7 +12046,7 @@ static const long _vq_quantlist__44c0_sm_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c0_sm_p6_0[] = { +static const char _vq_lengthlist__44c0_sm_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, 11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9, @@ -12057,7 +12057,7 @@ static const long _vq_lengthlist__44c0_sm_p6_0[] = { static const static_codebook _44c0_sm_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c0_sm_p6_0, + (char *)_vq_lengthlist__44c0_sm_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c0_sm_p6_0, 0 @@ -12077,7 +12077,7 @@ static const long _vq_quantlist__44c0_sm_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c0_sm_p6_1[] = { +static const char _vq_lengthlist__44c0_sm_p6_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 9, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -12090,7 +12090,7 @@ static const long _vq_lengthlist__44c0_sm_p6_1[] = { static const static_codebook _44c0_sm_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c0_sm_p6_1, + (char *)_vq_lengthlist__44c0_sm_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_sm_p6_1, 0 @@ -12112,7 +12112,7 @@ static const long _vq_quantlist__44c0_sm_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c0_sm_p7_0[] = { +static const char _vq_lengthlist__44c0_sm_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -12128,7 +12128,7 @@ static const long _vq_lengthlist__44c0_sm_p7_0[] = { static const static_codebook _44c0_sm_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c0_sm_p7_0, + (char *)_vq_lengthlist__44c0_sm_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c0_sm_p7_0, 0 @@ -12142,14 +12142,14 @@ static const long _vq_quantlist__44c0_sm_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c0_sm_p7_1[] = { +static const char _vq_lengthlist__44c0_sm_p7_1[] = { 2, 4, 4, 4, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c0_sm_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c0_sm_p7_1, + (char *)_vq_lengthlist__44c0_sm_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_sm_p7_1, 0 @@ -12167,7 +12167,7 @@ static const long _vq_quantlist__44c0_sm_p8_0[] = { 8, }; -static const long _vq_lengthlist__44c0_sm_p8_0[] = { +static const char _vq_lengthlist__44c0_sm_p8_0[] = { 1, 3, 3,11,11,11,11,11,11, 3, 7, 6,11,11,11,11, 11,11, 4, 8, 7,11,11,11,11,11,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -12178,7 +12178,7 @@ static const long _vq_lengthlist__44c0_sm_p8_0[] = { static const static_codebook _44c0_sm_p8_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_sm_p8_0, + (char *)_vq_lengthlist__44c0_sm_p8_0, 1, -516186112, 1627103232, 4, 0, (long *)_vq_quantlist__44c0_sm_p8_0, 0 @@ -12200,7 +12200,7 @@ static const long _vq_quantlist__44c0_sm_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c0_sm_p8_1[] = { +static const char _vq_lengthlist__44c0_sm_p8_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,12,11,12,12,17, 7, 7, 8, 8, 9, 9,10,10, @@ -12216,7 +12216,7 @@ static const long _vq_lengthlist__44c0_sm_p8_1[] = { static const static_codebook _44c0_sm_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c0_sm_p8_1, + (char *)_vq_lengthlist__44c0_sm_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c0_sm_p8_1, 0 @@ -12242,7 +12242,7 @@ static const long _vq_quantlist__44c0_sm_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c0_sm_p8_2[] = { +static const char _vq_lengthlist__44c0_sm_p8_2[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, @@ -12266,13 +12266,13 @@ static const long _vq_lengthlist__44c0_sm_p8_2[] = { static const static_codebook _44c0_sm_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c0_sm_p8_2, + (char *)_vq_lengthlist__44c0_sm_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_sm_p8_2, 0 }; -static const long _huff_lengthlist__44c0_sm_short[] = { +static const char _huff_lengthlist__44c0_sm_short[] = { 6, 6,12,13,13,14,16,17,17, 4, 2, 5, 8, 7, 9,12, 15,15, 9, 4, 5, 9, 7, 9,12,16,18,11, 6, 7, 4, 6, 8,11,14,18,10, 5, 6, 5, 5, 7,10,14,17,10, 5, 7, @@ -12283,13 +12283,13 @@ static const long _huff_lengthlist__44c0_sm_short[] = { static const static_codebook _huff_book__44c0_sm_short = { 2, 81, - (long *)_huff_lengthlist__44c0_sm_short, + (char *)_huff_lengthlist__44c0_sm_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c1_s_long[] = { +static const char _huff_lengthlist__44c1_s_long[] = { 5, 5, 9,10, 9, 9,10,11,12, 5, 1, 5, 6, 6, 7,10, 12,14, 9, 5, 6, 8, 8,10,12,14,14,10, 5, 8, 5, 6, 8,11,13,14, 9, 5, 7, 6, 6, 8,10,12,11, 9, 7, 9, @@ -12300,7 +12300,7 @@ static const long _huff_lengthlist__44c1_s_long[] = { static const static_codebook _huff_book__44c1_s_long = { 2, 81, - (long *)_huff_lengthlist__44c1_s_long, + (char *)_huff_lengthlist__44c1_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -12312,7 +12312,7 @@ static const long _vq_quantlist__44c1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c1_s_p1_0[] = { +static const char _vq_lengthlist__44c1_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -12728,7 +12728,7 @@ static const long _vq_lengthlist__44c1_s_p1_0[] = { static const static_codebook _44c1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c1_s_p1_0, + (char *)_vq_lengthlist__44c1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c1_s_p1_0, 0 @@ -12742,7 +12742,7 @@ static const long _vq_quantlist__44c1_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c1_s_p2_0[] = { +static const char _vq_lengthlist__44c1_s_p2_0[] = { 2, 3, 4, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -12787,7 +12787,7 @@ static const long _vq_lengthlist__44c1_s_p2_0[] = { static const static_codebook _44c1_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c1_s_p2_0, + (char *)_vq_lengthlist__44c1_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_s_p2_0, 0 @@ -12805,7 +12805,7 @@ static const long _vq_quantlist__44c1_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c1_s_p3_0[] = { +static const char _vq_lengthlist__44c1_s_p3_0[] = { 1, 3, 2, 7, 7, 0, 0, 0, 0, 0,13,13, 6, 6, 0, 0, 0, 0, 0,12, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -12816,7 +12816,7 @@ static const long _vq_lengthlist__44c1_s_p3_0[] = { static const static_codebook _44c1_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_s_p3_0, + (char *)_vq_lengthlist__44c1_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_s_p3_0, 0 @@ -12834,7 +12834,7 @@ static const long _vq_quantlist__44c1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c1_s_p4_0[] = { +static const char _vq_lengthlist__44c1_s_p4_0[] = { 1, 3, 3, 6, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, @@ -12845,7 +12845,7 @@ static const long _vq_lengthlist__44c1_s_p4_0[] = { static const static_codebook _44c1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_s_p4_0, + (char *)_vq_lengthlist__44c1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_s_p4_0, 0 @@ -12871,7 +12871,7 @@ static const long _vq_quantlist__44c1_s_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c1_s_p5_0[] = { +static const char _vq_lengthlist__44c1_s_p5_0[] = { 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -12895,7 +12895,7 @@ static const long _vq_lengthlist__44c1_s_p5_0[] = { static const static_codebook _44c1_s_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c1_s_p5_0, + (char *)_vq_lengthlist__44c1_s_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_s_p5_0, 0 @@ -12907,7 +12907,7 @@ static const long _vq_quantlist__44c1_s_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c1_s_p6_0[] = { +static const char _vq_lengthlist__44c1_s_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 6,10,10,11,11, 11,11,10,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -12918,7 +12918,7 @@ static const long _vq_lengthlist__44c1_s_p6_0[] = { static const static_codebook _44c1_s_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c1_s_p6_0, + (char *)_vq_lengthlist__44c1_s_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c1_s_p6_0, 0 @@ -12938,7 +12938,7 @@ static const long _vq_quantlist__44c1_s_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c1_s_p6_1[] = { +static const char _vq_lengthlist__44c1_s_p6_1[] = { 2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -12951,7 +12951,7 @@ static const long _vq_lengthlist__44c1_s_p6_1[] = { static const static_codebook _44c1_s_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c1_s_p6_1, + (char *)_vq_lengthlist__44c1_s_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_s_p6_1, 0 @@ -12973,7 +12973,7 @@ static const long _vq_quantlist__44c1_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c1_s_p7_0[] = { +static const char _vq_lengthlist__44c1_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 9, 7, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -12989,7 +12989,7 @@ static const long _vq_lengthlist__44c1_s_p7_0[] = { static const static_codebook _44c1_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_s_p7_0, + (char *)_vq_lengthlist__44c1_s_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c1_s_p7_0, 0 @@ -13003,14 +13003,14 @@ static const long _vq_quantlist__44c1_s_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c1_s_p7_1[] = { +static const char _vq_lengthlist__44c1_s_p7_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c1_s_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c1_s_p7_1, + (char *)_vq_lengthlist__44c1_s_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_s_p7_1, 0 @@ -13032,7 +13032,7 @@ static const long _vq_quantlist__44c1_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c1_s_p8_0[] = { +static const char _vq_lengthlist__44c1_s_p8_0[] = { 1, 4, 3,10,10,10,10,10,10,10,10,10,10, 4, 8, 6, 10,10,10,10,10,10,10,10,10,10, 4, 8, 7,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -13048,7 +13048,7 @@ static const long _vq_lengthlist__44c1_s_p8_0[] = { static const static_codebook _44c1_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_s_p8_0, + (char *)_vq_lengthlist__44c1_s_p8_0, 1, -514541568, 1627103232, 4, 0, (long *)_vq_quantlist__44c1_s_p8_0, 0 @@ -13070,7 +13070,7 @@ static const long _vq_quantlist__44c1_s_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c1_s_p8_1[] = { +static const char _vq_lengthlist__44c1_s_p8_1[] = { 1, 4, 4, 6, 5, 7, 7, 9, 9,10,10,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,15, 7, 7, 8, 8, 9, 9,11,11, @@ -13086,7 +13086,7 @@ static const long _vq_lengthlist__44c1_s_p8_1[] = { static const static_codebook _44c1_s_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c1_s_p8_1, + (char *)_vq_lengthlist__44c1_s_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c1_s_p8_1, 0 @@ -13112,7 +13112,7 @@ static const long _vq_quantlist__44c1_s_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c1_s_p8_2[] = { +static const char _vq_lengthlist__44c1_s_p8_2[] = { 2, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, @@ -13136,13 +13136,13 @@ static const long _vq_lengthlist__44c1_s_p8_2[] = { static const static_codebook _44c1_s_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c1_s_p8_2, + (char *)_vq_lengthlist__44c1_s_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_s_p8_2, 0 }; -static const long _huff_lengthlist__44c1_s_short[] = { +static const char _huff_lengthlist__44c1_s_short[] = { 6, 8,13,12,13,14,15,16,16, 4, 2, 4, 7, 6, 8,11, 13,15,10, 4, 4, 8, 6, 8,11,14,17,11, 5, 6, 5, 6, 8,12,14,17,11, 5, 5, 6, 5, 7,10,13,16,12, 6, 7, @@ -13153,13 +13153,13 @@ static const long _huff_lengthlist__44c1_s_short[] = { static const static_codebook _huff_book__44c1_s_short = { 2, 81, - (long *)_huff_lengthlist__44c1_s_short, + (char *)_huff_lengthlist__44c1_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c1_sm_long[] = { +static const char _huff_lengthlist__44c1_sm_long[] = { 5, 4, 8,10, 9, 9,10,11,12, 4, 2, 5, 6, 6, 8,10, 11,13, 8, 4, 6, 8, 7, 9,12,12,14,10, 6, 8, 4, 5, 6, 9,11,12, 9, 5, 6, 5, 5, 6, 9,11,11, 9, 7, 9, @@ -13170,7 +13170,7 @@ static const long _huff_lengthlist__44c1_sm_long[] = { static const static_codebook _huff_book__44c1_sm_long = { 2, 81, - (long *)_huff_lengthlist__44c1_sm_long, + (char *)_huff_lengthlist__44c1_sm_long, 0, 0, 0, 0, 0, NULL, 0 @@ -13182,7 +13182,7 @@ static const long _vq_quantlist__44c1_sm_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c1_sm_p1_0[] = { +static const char _vq_lengthlist__44c1_sm_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -13598,7 +13598,7 @@ static const long _vq_lengthlist__44c1_sm_p1_0[] = { static const static_codebook _44c1_sm_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c1_sm_p1_0, + (char *)_vq_lengthlist__44c1_sm_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c1_sm_p1_0, 0 @@ -13612,7 +13612,7 @@ static const long _vq_quantlist__44c1_sm_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c1_sm_p2_0[] = { +static const char _vq_lengthlist__44c1_sm_p2_0[] = { 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -13657,7 +13657,7 @@ static const long _vq_lengthlist__44c1_sm_p2_0[] = { static const static_codebook _44c1_sm_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c1_sm_p2_0, + (char *)_vq_lengthlist__44c1_sm_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_sm_p2_0, 0 @@ -13675,7 +13675,7 @@ static const long _vq_quantlist__44c1_sm_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c1_sm_p3_0[] = { +static const char _vq_lengthlist__44c1_sm_p3_0[] = { 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -13686,7 +13686,7 @@ static const long _vq_lengthlist__44c1_sm_p3_0[] = { static const static_codebook _44c1_sm_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_sm_p3_0, + (char *)_vq_lengthlist__44c1_sm_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_sm_p3_0, 0 @@ -13704,7 +13704,7 @@ static const long _vq_quantlist__44c1_sm_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c1_sm_p4_0[] = { +static const char _vq_lengthlist__44c1_sm_p4_0[] = { 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 8, 8, 9, 9, 0, 6, 6, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -13715,7 +13715,7 @@ static const long _vq_lengthlist__44c1_sm_p4_0[] = { static const static_codebook _44c1_sm_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_sm_p4_0, + (char *)_vq_lengthlist__44c1_sm_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_sm_p4_0, 0 @@ -13741,7 +13741,7 @@ static const long _vq_quantlist__44c1_sm_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c1_sm_p5_0[] = { +static const char _vq_lengthlist__44c1_sm_p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, @@ -13765,7 +13765,7 @@ static const long _vq_lengthlist__44c1_sm_p5_0[] = { static const static_codebook _44c1_sm_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c1_sm_p5_0, + (char *)_vq_lengthlist__44c1_sm_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_sm_p5_0, 0 @@ -13777,7 +13777,7 @@ static const long _vq_quantlist__44c1_sm_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c1_sm_p6_0[] = { +static const char _vq_lengthlist__44c1_sm_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, 11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9, @@ -13788,7 +13788,7 @@ static const long _vq_lengthlist__44c1_sm_p6_0[] = { static const static_codebook _44c1_sm_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c1_sm_p6_0, + (char *)_vq_lengthlist__44c1_sm_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c1_sm_p6_0, 0 @@ -13808,7 +13808,7 @@ static const long _vq_quantlist__44c1_sm_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c1_sm_p6_1[] = { +static const char _vq_lengthlist__44c1_sm_p6_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -13821,7 +13821,7 @@ static const long _vq_lengthlist__44c1_sm_p6_1[] = { static const static_codebook _44c1_sm_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c1_sm_p6_1, + (char *)_vq_lengthlist__44c1_sm_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_sm_p6_1, 0 @@ -13843,7 +13843,7 @@ static const long _vq_quantlist__44c1_sm_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c1_sm_p7_0[] = { +static const char _vq_lengthlist__44c1_sm_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -13859,7 +13859,7 @@ static const long _vq_lengthlist__44c1_sm_p7_0[] = { static const static_codebook _44c1_sm_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_sm_p7_0, + (char *)_vq_lengthlist__44c1_sm_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c1_sm_p7_0, 0 @@ -13873,14 +13873,14 @@ static const long _vq_quantlist__44c1_sm_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c1_sm_p7_1[] = { +static const char _vq_lengthlist__44c1_sm_p7_1[] = { 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c1_sm_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c1_sm_p7_1, + (char *)_vq_lengthlist__44c1_sm_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_sm_p7_1, 0 @@ -13902,7 +13902,7 @@ static const long _vq_quantlist__44c1_sm_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c1_sm_p8_0[] = { +static const char _vq_lengthlist__44c1_sm_p8_0[] = { 1, 3, 3,13,13,13,13,13,13,13,13,13,13, 3, 6, 6, 13,13,13,13,13,13,13,13,13,13, 4, 8, 7,13,13,13, 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, @@ -13918,7 +13918,7 @@ static const long _vq_lengthlist__44c1_sm_p8_0[] = { static const static_codebook _44c1_sm_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_sm_p8_0, + (char *)_vq_lengthlist__44c1_sm_p8_0, 1, -514541568, 1627103232, 4, 0, (long *)_vq_quantlist__44c1_sm_p8_0, 0 @@ -13940,7 +13940,7 @@ static const long _vq_quantlist__44c1_sm_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c1_sm_p8_1[] = { +static const char _vq_lengthlist__44c1_sm_p8_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5, 7, 7, 8, 7,10,10,11,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,16, 7, 7, 8, 8, 9, 9,11,11, @@ -13956,7 +13956,7 @@ static const long _vq_lengthlist__44c1_sm_p8_1[] = { static const static_codebook _44c1_sm_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c1_sm_p8_1, + (char *)_vq_lengthlist__44c1_sm_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c1_sm_p8_1, 0 @@ -13982,7 +13982,7 @@ static const long _vq_quantlist__44c1_sm_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c1_sm_p8_2[] = { +static const char _vq_lengthlist__44c1_sm_p8_2[] = { 2, 5, 5, 6, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, @@ -14006,13 +14006,13 @@ static const long _vq_lengthlist__44c1_sm_p8_2[] = { static const static_codebook _44c1_sm_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c1_sm_p8_2, + (char *)_vq_lengthlist__44c1_sm_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_sm_p8_2, 0 }; -static const long _huff_lengthlist__44c1_sm_short[] = { +static const char _huff_lengthlist__44c1_sm_short[] = { 4, 7,13,14,14,15,16,18,18, 4, 2, 5, 8, 7, 9,12, 15,15,10, 4, 5,10, 6, 8,11,15,17,12, 5, 7, 5, 6, 8,11,14,17,11, 5, 6, 6, 5, 6, 9,13,17,12, 6, 7, @@ -14023,13 +14023,13 @@ static const long _huff_lengthlist__44c1_sm_short[] = { static const static_codebook _huff_book__44c1_sm_short = { 2, 81, - (long *)_huff_lengthlist__44c1_sm_short, + (char *)_huff_lengthlist__44c1_sm_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44cn1_s_long[] = { +static const char _huff_lengthlist__44cn1_s_long[] = { 4, 4, 7, 8, 7, 8,10,12,17, 3, 1, 6, 6, 7, 8,10, 12,15, 7, 6, 9, 9, 9,11,12,14,17, 8, 6, 9, 6, 7, 9,11,13,17, 7, 6, 9, 7, 7, 8, 9,12,15, 8, 8,10, @@ -14040,7 +14040,7 @@ static const long _huff_lengthlist__44cn1_s_long[] = { static const static_codebook _huff_book__44cn1_s_long = { 2, 81, - (long *)_huff_lengthlist__44cn1_s_long, + (char *)_huff_lengthlist__44cn1_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -14052,7 +14052,7 @@ static const long _vq_quantlist__44cn1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_s_p1_0[] = { +static const char _vq_lengthlist__44cn1_s_p1_0[] = { 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -14468,7 +14468,7 @@ static const long _vq_lengthlist__44cn1_s_p1_0[] = { static const static_codebook _44cn1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44cn1_s_p1_0, + (char *)_vq_lengthlist__44cn1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44cn1_s_p1_0, 0 @@ -14482,7 +14482,7 @@ static const long _vq_quantlist__44cn1_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44cn1_s_p2_0[] = { +static const char _vq_lengthlist__44cn1_s_p2_0[] = { 1, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -14527,7 +14527,7 @@ static const long _vq_lengthlist__44cn1_s_p2_0[] = { static const static_codebook _44cn1_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44cn1_s_p2_0, + (char *)_vq_lengthlist__44cn1_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_s_p2_0, 0 @@ -14545,7 +14545,7 @@ static const long _vq_quantlist__44cn1_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_s_p3_0[] = { +static const char _vq_lengthlist__44cn1_s_p3_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -14556,7 +14556,7 @@ static const long _vq_lengthlist__44cn1_s_p3_0[] = { static const static_codebook _44cn1_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_s_p3_0, + (char *)_vq_lengthlist__44cn1_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_s_p3_0, 0 @@ -14574,7 +14574,7 @@ static const long _vq_quantlist__44cn1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_s_p4_0[] = { +static const char _vq_lengthlist__44cn1_s_p4_0[] = { 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, @@ -14585,7 +14585,7 @@ static const long _vq_lengthlist__44cn1_s_p4_0[] = { static const static_codebook _44cn1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_s_p4_0, + (char *)_vq_lengthlist__44cn1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_s_p4_0, 0 @@ -14611,7 +14611,7 @@ static const long _vq_quantlist__44cn1_s_p5_0[] = { 16, }; -static const long _vq_lengthlist__44cn1_s_p5_0[] = { +static const char _vq_lengthlist__44cn1_s_p5_0[] = { 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10, 10, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -14635,7 +14635,7 @@ static const long _vq_lengthlist__44cn1_s_p5_0[] = { static const static_codebook _44cn1_s_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44cn1_s_p5_0, + (char *)_vq_lengthlist__44cn1_s_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_s_p5_0, 0 @@ -14647,7 +14647,7 @@ static const long _vq_quantlist__44cn1_s_p6_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_s_p6_0[] = { +static const char _vq_lengthlist__44cn1_s_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 6, 6,10, 9, 9,11, 9, 9, 4, 6, 6,10, 9, 9,10, 9, 9, 7,10,10,11,11, 11,12,11,11, 7, 9, 9,11,11,10,11,10,10, 7, 9, 9, @@ -14658,7 +14658,7 @@ static const long _vq_lengthlist__44cn1_s_p6_0[] = { static const static_codebook _44cn1_s_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44cn1_s_p6_0, + (char *)_vq_lengthlist__44cn1_s_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44cn1_s_p6_0, 0 @@ -14678,7 +14678,7 @@ static const long _vq_quantlist__44cn1_s_p6_1[] = { 10, }; -static const long _vq_lengthlist__44cn1_s_p6_1[] = { +static const char _vq_lengthlist__44cn1_s_p6_1[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 6, 8, 8, 8, 8, 8, 8,10,10,10, 7, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -14691,7 +14691,7 @@ static const long _vq_lengthlist__44cn1_s_p6_1[] = { static const static_codebook _44cn1_s_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44cn1_s_p6_1, + (char *)_vq_lengthlist__44cn1_s_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_s_p6_1, 0 @@ -14713,7 +14713,7 @@ static const long _vq_quantlist__44cn1_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44cn1_s_p7_0[] = { +static const char _vq_lengthlist__44cn1_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,11,11, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -14729,7 +14729,7 @@ static const long _vq_lengthlist__44cn1_s_p7_0[] = { static const static_codebook _44cn1_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44cn1_s_p7_0, + (char *)_vq_lengthlist__44cn1_s_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44cn1_s_p7_0, 0 @@ -14743,14 +14743,14 @@ static const long _vq_quantlist__44cn1_s_p7_1[] = { 4, }; -static const long _vq_lengthlist__44cn1_s_p7_1[] = { +static const char _vq_lengthlist__44cn1_s_p7_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44cn1_s_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44cn1_s_p7_1, + (char *)_vq_lengthlist__44cn1_s_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_s_p7_1, 0 @@ -14764,7 +14764,7 @@ static const long _vq_quantlist__44cn1_s_p8_0[] = { 4, }; -static const long _vq_lengthlist__44cn1_s_p8_0[] = { +static const char _vq_lengthlist__44cn1_s_p8_0[] = { 1, 7, 7,11,11, 8,11,11,11,11, 4,11, 3,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,10,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -14809,7 +14809,7 @@ static const long _vq_lengthlist__44cn1_s_p8_0[] = { static const static_codebook _44cn1_s_p8_0 = { 4, 625, - (long *)_vq_lengthlist__44cn1_s_p8_0, + (char *)_vq_lengthlist__44cn1_s_p8_0, 1, -518283264, 1627103232, 3, 0, (long *)_vq_quantlist__44cn1_s_p8_0, 0 @@ -14831,7 +14831,7 @@ static const long _vq_quantlist__44cn1_s_p8_1[] = { 12, }; -static const long _vq_lengthlist__44cn1_s_p8_1[] = { +static const char _vq_lengthlist__44cn1_s_p8_1[] = { 1, 4, 4, 6, 6, 8, 8, 9,10,10,11,11,11, 6, 5, 5, 7, 7, 8, 8, 9,10, 9,11,11,12, 5, 5, 5, 7, 7, 8, 9,10,10,12,12,14,13,15, 7, 7, 8, 8, 9,10,11,11, @@ -14847,7 +14847,7 @@ static const long _vq_lengthlist__44cn1_s_p8_1[] = { static const static_codebook _44cn1_s_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44cn1_s_p8_1, + (char *)_vq_lengthlist__44cn1_s_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44cn1_s_p8_1, 0 @@ -14873,7 +14873,7 @@ static const long _vq_quantlist__44cn1_s_p8_2[] = { 16, }; -static const long _vq_lengthlist__44cn1_s_p8_2[] = { +static const char _vq_lengthlist__44cn1_s_p8_2[] = { 3, 4, 3, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,11,11, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, @@ -14897,13 +14897,13 @@ static const long _vq_lengthlist__44cn1_s_p8_2[] = { static const static_codebook _44cn1_s_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44cn1_s_p8_2, + (char *)_vq_lengthlist__44cn1_s_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_s_p8_2, 0 }; -static const long _huff_lengthlist__44cn1_s_short[] = { +static const char _huff_lengthlist__44cn1_s_short[] = { 10, 9,12,15,12,13,16,14,16, 7, 1, 5,14, 7,10,13, 16,16, 9, 4, 6,16, 8,11,16,16,16,14, 4, 7,16, 9, 12,14,16,16,10, 5, 7,14, 9,12,14,15,15,13, 8, 9, @@ -14914,13 +14914,13 @@ static const long _huff_lengthlist__44cn1_s_short[] = { static const static_codebook _huff_book__44cn1_s_short = { 2, 81, - (long *)_huff_lengthlist__44cn1_s_short, + (char *)_huff_lengthlist__44cn1_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44cn1_sm_long[] = { +static const char _huff_lengthlist__44cn1_sm_long[] = { 3, 3, 8, 8, 8, 8,10,12,14, 3, 2, 6, 7, 7, 8,10, 12,16, 7, 6, 7, 9, 8,10,12,14,16, 8, 6, 8, 4, 5, 7, 9,11,13, 7, 6, 8, 5, 6, 7, 9,11,14, 8, 8,10, @@ -14931,7 +14931,7 @@ static const long _huff_lengthlist__44cn1_sm_long[] = { static const static_codebook _huff_book__44cn1_sm_long = { 2, 81, - (long *)_huff_lengthlist__44cn1_sm_long, + (char *)_huff_lengthlist__44cn1_sm_long, 0, 0, 0, 0, 0, NULL, 0 @@ -14943,7 +14943,7 @@ static const long _vq_quantlist__44cn1_sm_p1_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_sm_p1_0[] = { +static const char _vq_lengthlist__44cn1_sm_p1_0[] = { 1, 4, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -15359,7 +15359,7 @@ static const long _vq_lengthlist__44cn1_sm_p1_0[] = { static const static_codebook _44cn1_sm_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44cn1_sm_p1_0, + (char *)_vq_lengthlist__44cn1_sm_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44cn1_sm_p1_0, 0 @@ -15373,7 +15373,7 @@ static const long _vq_quantlist__44cn1_sm_p2_0[] = { 4, }; -static const long _vq_lengthlist__44cn1_sm_p2_0[] = { +static const char _vq_lengthlist__44cn1_sm_p2_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -15418,7 +15418,7 @@ static const long _vq_lengthlist__44cn1_sm_p2_0[] = { static const static_codebook _44cn1_sm_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44cn1_sm_p2_0, + (char *)_vq_lengthlist__44cn1_sm_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_sm_p2_0, 0 @@ -15436,7 +15436,7 @@ static const long _vq_quantlist__44cn1_sm_p3_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_sm_p3_0[] = { +static const char _vq_lengthlist__44cn1_sm_p3_0[] = { 1, 3, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, @@ -15447,7 +15447,7 @@ static const long _vq_lengthlist__44cn1_sm_p3_0[] = { static const static_codebook _44cn1_sm_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_sm_p3_0, + (char *)_vq_lengthlist__44cn1_sm_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_sm_p3_0, 0 @@ -15465,7 +15465,7 @@ static const long _vq_quantlist__44cn1_sm_p4_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_sm_p4_0[] = { +static const char _vq_lengthlist__44cn1_sm_p4_0[] = { 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -15476,7 +15476,7 @@ static const long _vq_lengthlist__44cn1_sm_p4_0[] = { static const static_codebook _44cn1_sm_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_sm_p4_0, + (char *)_vq_lengthlist__44cn1_sm_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_sm_p4_0, 0 @@ -15502,7 +15502,7 @@ static const long _vq_quantlist__44cn1_sm_p5_0[] = { 16, }; -static const long _vq_lengthlist__44cn1_sm_p5_0[] = { +static const char _vq_lengthlist__44cn1_sm_p5_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11, 11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 6, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -15526,7 +15526,7 @@ static const long _vq_lengthlist__44cn1_sm_p5_0[] = { static const static_codebook _44cn1_sm_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44cn1_sm_p5_0, + (char *)_vq_lengthlist__44cn1_sm_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_sm_p5_0, 0 @@ -15538,7 +15538,7 @@ static const long _vq_quantlist__44cn1_sm_p6_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_sm_p6_0[] = { +static const char _vq_lengthlist__44cn1_sm_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 6,10, 9, 9,11, 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, 11,11,11,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -15549,7 +15549,7 @@ static const long _vq_lengthlist__44cn1_sm_p6_0[] = { static const static_codebook _44cn1_sm_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44cn1_sm_p6_0, + (char *)_vq_lengthlist__44cn1_sm_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44cn1_sm_p6_0, 0 @@ -15569,7 +15569,7 @@ static const long _vq_quantlist__44cn1_sm_p6_1[] = { 10, }; -static const long _vq_lengthlist__44cn1_sm_p6_1[] = { +static const char _vq_lengthlist__44cn1_sm_p6_1[] = { 2, 4, 4, 5, 5, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -15582,7 +15582,7 @@ static const long _vq_lengthlist__44cn1_sm_p6_1[] = { static const static_codebook _44cn1_sm_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44cn1_sm_p6_1, + (char *)_vq_lengthlist__44cn1_sm_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_sm_p6_1, 0 @@ -15604,7 +15604,7 @@ static const long _vq_quantlist__44cn1_sm_p7_0[] = { 12, }; -static const long _vq_lengthlist__44cn1_sm_p7_0[] = { +static const char _vq_lengthlist__44cn1_sm_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8,10, 9,11,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -15620,7 +15620,7 @@ static const long _vq_lengthlist__44cn1_sm_p7_0[] = { static const static_codebook _44cn1_sm_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44cn1_sm_p7_0, + (char *)_vq_lengthlist__44cn1_sm_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44cn1_sm_p7_0, 0 @@ -15634,14 +15634,14 @@ static const long _vq_quantlist__44cn1_sm_p7_1[] = { 4, }; -static const long _vq_lengthlist__44cn1_sm_p7_1[] = { +static const char _vq_lengthlist__44cn1_sm_p7_1[] = { 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44cn1_sm_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44cn1_sm_p7_1, + (char *)_vq_lengthlist__44cn1_sm_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_sm_p7_1, 0 @@ -15659,7 +15659,7 @@ static const long _vq_quantlist__44cn1_sm_p8_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_sm_p8_0[] = { +static const char _vq_lengthlist__44cn1_sm_p8_0[] = { 1, 4, 4,12,11,13,13,14,14, 4, 7, 7,11,13,14,14, 14,14, 3, 8, 3,14,14,14,14,14,14,14,10,12,14,14, 14,14,14,14,14,14, 5,14, 8,14,14,14,14,14,12,14, @@ -15670,7 +15670,7 @@ static const long _vq_lengthlist__44cn1_sm_p8_0[] = { static const static_codebook _44cn1_sm_p8_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_sm_p8_0, + (char *)_vq_lengthlist__44cn1_sm_p8_0, 1, -516186112, 1627103232, 4, 0, (long *)_vq_quantlist__44cn1_sm_p8_0, 0 @@ -15692,7 +15692,7 @@ static const long _vq_quantlist__44cn1_sm_p8_1[] = { 12, }; -static const long _vq_lengthlist__44cn1_sm_p8_1[] = { +static const char _vq_lengthlist__44cn1_sm_p8_1[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,11,11, 6, 5, 5, 7, 7, 8, 8,10,10,10,11,11,11, 6, 5, 5, 7, 7, 8, 8,10,10,11,12,12,12,14, 7, 7, 7, 8, 9, 9,11,11, @@ -15708,7 +15708,7 @@ static const long _vq_lengthlist__44cn1_sm_p8_1[] = { static const static_codebook _44cn1_sm_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44cn1_sm_p8_1, + (char *)_vq_lengthlist__44cn1_sm_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44cn1_sm_p8_1, 0 @@ -15734,7 +15734,7 @@ static const long _vq_quantlist__44cn1_sm_p8_2[] = { 16, }; -static const long _vq_lengthlist__44cn1_sm_p8_2[] = { +static const char _vq_lengthlist__44cn1_sm_p8_2[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, @@ -15758,13 +15758,13 @@ static const long _vq_lengthlist__44cn1_sm_p8_2[] = { static const static_codebook _44cn1_sm_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44cn1_sm_p8_2, + (char *)_vq_lengthlist__44cn1_sm_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_sm_p8_2, 0 }; -static const long _huff_lengthlist__44cn1_sm_short[] = { +static const char _huff_lengthlist__44cn1_sm_short[] = { 5, 6,12,14,12,14,16,17,18, 4, 2, 5,11, 7,10,12, 14,15, 9, 4, 5,11, 7,10,13,15,18,15, 6, 7, 5, 6, 8,11,13,16,11, 5, 6, 5, 5, 6, 9,13,15,12, 5, 7, @@ -15775,7 +15775,7 @@ static const long _huff_lengthlist__44cn1_sm_short[] = { static const static_codebook _huff_book__44cn1_sm_short = { 2, 81, - (long *)_huff_lengthlist__44cn1_sm_short, + (char *)_huff_lengthlist__44cn1_sm_short, 0, 0, 0, 0, 0, NULL, 0 diff --git a/Engine/lib/libvorbis/lib/books/floor/floor_books.h b/Engine/lib/libvorbis/lib/books/floor/floor_books.h index 14320cf69..e925313f7 100644 --- a/Engine/lib/libvorbis/lib/books/floor/floor_books.h +++ b/Engine/lib/libvorbis/lib/books/floor/floor_books.h @@ -11,38 +11,38 @@ ******************************************************************** function: static codebooks autogenerated by huff/huffbuld - last modified: $Id: floor_books.h 16939 2010-03-01 08:38:14Z xiphmont $ + last modified: $Id: floor_books.h 19057 2014-01-22 12:32:31Z xiphmont $ ********************************************************************/ #include "codebook.h" -static const long _huff_lengthlist_line_256x7_0sub1[] = { +static const char _huff_lengthlist_line_256x7_0sub1[] = { 0, 2, 3, 3, 3, 3, 4, 3, 4, }; static const static_codebook _huff_book_line_256x7_0sub1 = { 1, 9, - (long *)_huff_lengthlist_line_256x7_0sub1, + (char *)_huff_lengthlist_line_256x7_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_0sub2[] = { +static const char _huff_lengthlist_line_256x7_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 5, 3, 6, 3, 6, 4, 6, 4, 7, 5, 7, }; static const static_codebook _huff_book_line_256x7_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x7_0sub2, + (char *)_huff_lengthlist_line_256x7_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_0sub3[] = { +static const char _huff_lengthlist_line_256x7_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 2, 5, 3, 5, 3, 6, 3, 6, 4, 7, 6, 7, 8, 7, 9, 8, 9, 9, 9,10, 9, @@ -51,38 +51,38 @@ static const long _huff_lengthlist_line_256x7_0sub3[] = { static const static_codebook _huff_book_line_256x7_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x7_0sub3, + (char *)_huff_lengthlist_line_256x7_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_1sub1[] = { +static const char _huff_lengthlist_line_256x7_1sub1[] = { 0, 3, 3, 3, 3, 2, 4, 3, 4, }; static const static_codebook _huff_book_line_256x7_1sub1 = { 1, 9, - (long *)_huff_lengthlist_line_256x7_1sub1, + (char *)_huff_lengthlist_line_256x7_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_1sub2[] = { +static const char _huff_lengthlist_line_256x7_1sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 4, 4, 5, 4, 6, 5, 6, 7, 6, 8, 8, }; static const static_codebook _huff_book_line_256x7_1sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x7_1sub2, + (char *)_huff_lengthlist_line_256x7_1sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_1sub3[] = { +static const char _huff_lengthlist_line_256x7_1sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 3, 6, 3, 7, 3, 8, 5, 8, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -91,13 +91,13 @@ static const long _huff_lengthlist_line_256x7_1sub3[] = { static const static_codebook _huff_book_line_256x7_1sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x7_1sub3, + (char *)_huff_lengthlist_line_256x7_1sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_class0[] = { +static const char _huff_lengthlist_line_256x7_class0[] = { 7, 5, 5, 9, 9, 6, 6, 9,12, 8, 7, 8,11, 8, 9,15, 6, 3, 3, 7, 7, 4, 3, 6, 9, 6, 5, 6, 8, 6, 8,15, 8, 5, 5, 9, 8, 5, 4, 6,10, 7, 5, 5,11, 8, 7,15, @@ -106,13 +106,13 @@ static const long _huff_lengthlist_line_256x7_class0[] = { static const static_codebook _huff_book_line_256x7_class0 = { 1, 64, - (long *)_huff_lengthlist_line_256x7_class0, + (char *)_huff_lengthlist_line_256x7_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_class1[] = { +static const char _huff_lengthlist_line_256x7_class1[] = { 5, 6, 8,15, 6, 9,10,15,10,11,12,15,15,15,15,15, 4, 6, 7,15, 6, 7, 8,15, 9, 8, 9,15,15,15,15,15, 6, 8, 9,15, 7, 7, 8,15,10, 9,10,15,15,15,15,15, @@ -133,13 +133,13 @@ static const long _huff_lengthlist_line_256x7_class1[] = { static const static_codebook _huff_book_line_256x7_class1 = { 1, 256, - (long *)_huff_lengthlist_line_256x7_class1, + (char *)_huff_lengthlist_line_256x7_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_0sub0[] = { +static const char _huff_lengthlist_line_512x17_0sub0[] = { 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 6, 6, 6, 5, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 9, 7, 9, 7, @@ -152,26 +152,26 @@ static const long _huff_lengthlist_line_512x17_0sub0[] = { static const static_codebook _huff_book_line_512x17_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_0sub0, + (char *)_huff_lengthlist_line_512x17_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_1sub0[] = { +static const char _huff_lengthlist_line_512x17_1sub0[] = { 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, }; static const static_codebook _huff_book_line_512x17_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_512x17_1sub0, + (char *)_huff_lengthlist_line_512x17_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_1sub1[] = { +static const char _huff_lengthlist_line_512x17_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 5, 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, @@ -184,26 +184,26 @@ static const long _huff_lengthlist_line_512x17_1sub1[] = { static const static_codebook _huff_book_line_512x17_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_1sub1, + (char *)_huff_lengthlist_line_512x17_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_2sub1[] = { +static const char _huff_lengthlist_line_512x17_2sub1[] = { 0, 4, 5, 4, 4, 4, 5, 4, 4, 4, 5, 4, 5, 4, 5, 3, 5, 3, }; static const static_codebook _huff_book_line_512x17_2sub1 = { 1, 18, - (long *)_huff_lengthlist_line_512x17_2sub1, + (char *)_huff_lengthlist_line_512x17_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_2sub2[] = { +static const char _huff_lengthlist_line_512x17_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 6, 4, 6, 5, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 7, 8, 7, 9, 7, @@ -212,13 +212,13 @@ static const long _huff_lengthlist_line_512x17_2sub2[] = { static const static_codebook _huff_book_line_512x17_2sub2 = { 1, 50, - (long *)_huff_lengthlist_line_512x17_2sub2, + (char *)_huff_lengthlist_line_512x17_2sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_2sub3[] = { +static const char _huff_lengthlist_line_512x17_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -231,26 +231,26 @@ static const long _huff_lengthlist_line_512x17_2sub3[] = { static const static_codebook _huff_book_line_512x17_2sub3 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_2sub3, + (char *)_huff_lengthlist_line_512x17_2sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_3sub1[] = { +static const char _huff_lengthlist_line_512x17_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, }; static const static_codebook _huff_book_line_512x17_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_512x17_3sub1, + (char *)_huff_lengthlist_line_512x17_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_3sub2[] = { +static const char _huff_lengthlist_line_512x17_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 5, 4, 6, 4, 6, 5, 7, 6, 7, 6, 8, 6, 8, 7, 9, 8,10, 8,12, 9,13,10,15,10,15, @@ -259,13 +259,13 @@ static const long _huff_lengthlist_line_512x17_3sub2[] = { static const static_codebook _huff_book_line_512x17_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_512x17_3sub2, + (char *)_huff_lengthlist_line_512x17_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_3sub3[] = { +static const char _huff_lengthlist_line_512x17_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -278,25 +278,25 @@ static const long _huff_lengthlist_line_512x17_3sub3[] = { static const static_codebook _huff_book_line_512x17_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_3sub3, + (char *)_huff_lengthlist_line_512x17_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_class1[] = { +static const char _huff_lengthlist_line_512x17_class1[] = { 1, 2, 3, 6, 5, 4, 7, 7, }; static const static_codebook _huff_book_line_512x17_class1 = { 1, 8, - (long *)_huff_lengthlist_line_512x17_class1, + (char *)_huff_lengthlist_line_512x17_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_class2[] = { +static const char _huff_lengthlist_line_512x17_class2[] = { 3, 3, 3,14, 5, 4, 4,11, 8, 6, 6,10,17,12,11,17, 6, 5, 5,15, 5, 3, 4,11, 8, 5, 5, 8,16, 9,10,14, 10, 8, 9,17, 8, 6, 6,13,10, 7, 7,10,16,11,13,14, @@ -305,13 +305,13 @@ static const long _huff_lengthlist_line_512x17_class2[] = { static const static_codebook _huff_book_line_512x17_class2 = { 1, 64, - (long *)_huff_lengthlist_line_512x17_class2, + (char *)_huff_lengthlist_line_512x17_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_class3[] = { +static const char _huff_lengthlist_line_512x17_class3[] = { 2, 4, 6,17, 4, 5, 7,17, 8, 7,10,17,17,17,17,17, 3, 4, 6,15, 3, 3, 6,15, 7, 6, 9,17,17,17,17,17, 6, 8,10,17, 6, 6, 8,16, 9, 8,10,17,17,15,16,17, @@ -320,13 +320,13 @@ static const long _huff_lengthlist_line_512x17_class3[] = { static const static_codebook _huff_book_line_512x17_class3 = { 1, 64, - (long *)_huff_lengthlist_line_512x17_class3, + (char *)_huff_lengthlist_line_512x17_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_class0[] = { +static const char _huff_lengthlist_line_128x4_class0[] = { 7, 7, 7,11, 6, 6, 7,11, 7, 6, 6,10,12,10,10,13, 7, 7, 8,11, 7, 7, 7,11, 7, 6, 7,10,11,10,10,13, 10,10, 9,12, 9, 9, 9,11, 8, 8, 8,11,13,11,10,14, @@ -347,50 +347,50 @@ static const long _huff_lengthlist_line_128x4_class0[] = { static const static_codebook _huff_book_line_128x4_class0 = { 1, 256, - (long *)_huff_lengthlist_line_128x4_class0, + (char *)_huff_lengthlist_line_128x4_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub0[] = { +static const char _huff_lengthlist_line_128x4_0sub0[] = { 2, 2, 2, 2, }; static const static_codebook _huff_book_line_128x4_0sub0 = { 1, 4, - (long *)_huff_lengthlist_line_128x4_0sub0, + (char *)_huff_lengthlist_line_128x4_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub1[] = { +static const char _huff_lengthlist_line_128x4_0sub1[] = { 0, 0, 0, 0, 3, 2, 3, 2, 3, 3, }; static const static_codebook _huff_book_line_128x4_0sub1 = { 1, 10, - (long *)_huff_lengthlist_line_128x4_0sub1, + (char *)_huff_lengthlist_line_128x4_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub2[] = { +static const char _huff_lengthlist_line_128x4_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 6, 5, 6, }; static const static_codebook _huff_book_line_128x4_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_128x4_0sub2, + (char *)_huff_lengthlist_line_128x4_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub3[] = { +static const char _huff_lengthlist_line_128x4_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3, 5, 4, 6, 5, 6, 5, 7, 6, 6, 7, 7, 9, 9,11,11,16, @@ -399,13 +399,13 @@ static const long _huff_lengthlist_line_128x4_0sub3[] = { static const static_codebook _huff_book_line_128x4_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_128x4_0sub3, + (char *)_huff_lengthlist_line_128x4_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_class0[] = { +static const char _huff_lengthlist_line_256x4_class0[] = { 6, 7, 7,12, 6, 6, 7,12, 7, 6, 6,10,15,12,11,13, 7, 7, 8,13, 7, 7, 8,12, 7, 7, 7,11,12,12,11,13, 10, 9, 9,11, 9, 9, 9,10,10, 8, 8,12,14,12,12,14, @@ -426,50 +426,50 @@ static const long _huff_lengthlist_line_256x4_class0[] = { static const static_codebook _huff_book_line_256x4_class0 = { 1, 256, - (long *)_huff_lengthlist_line_256x4_class0, + (char *)_huff_lengthlist_line_256x4_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub0[] = { +static const char _huff_lengthlist_line_256x4_0sub0[] = { 2, 2, 2, 2, }; static const static_codebook _huff_book_line_256x4_0sub0 = { 1, 4, - (long *)_huff_lengthlist_line_256x4_0sub0, + (char *)_huff_lengthlist_line_256x4_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub1[] = { +static const char _huff_lengthlist_line_256x4_0sub1[] = { 0, 0, 0, 0, 2, 2, 3, 3, 3, 3, }; static const static_codebook _huff_book_line_256x4_0sub1 = { 1, 10, - (long *)_huff_lengthlist_line_256x4_0sub1, + (char *)_huff_lengthlist_line_256x4_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub2[] = { +static const char _huff_lengthlist_line_256x4_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 3, 5, 3, 5, 4, 5, 4, 6, 4, 6, }; static const static_codebook _huff_book_line_256x4_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x4_0sub2, + (char *)_huff_lengthlist_line_256x4_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub3[] = { +static const char _huff_lengthlist_line_256x4_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3, 6, 4, 7, 4, 7, 5, 7, 6, 7, 6, 7, 8,10,13,13,13, @@ -478,13 +478,13 @@ static const long _huff_lengthlist_line_256x4_0sub3[] = { static const static_codebook _huff_book_line_256x4_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x4_0sub3, + (char *)_huff_lengthlist_line_256x4_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_class0[] = { +static const char _huff_lengthlist_line_128x7_class0[] = { 10, 7, 8,13, 9, 6, 7,11,10, 8, 8,12,17,17,17,17, 7, 5, 5, 9, 6, 4, 4, 8, 8, 5, 5, 8,16,14,13,16, 7, 5, 5, 7, 6, 3, 3, 5, 8, 5, 4, 7,14,12,12,15, @@ -493,13 +493,13 @@ static const long _huff_lengthlist_line_128x7_class0[] = { static const static_codebook _huff_book_line_128x7_class0 = { 1, 64, - (long *)_huff_lengthlist_line_128x7_class0, + (char *)_huff_lengthlist_line_128x7_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_class1[] = { +static const char _huff_lengthlist_line_128x7_class1[] = { 8,13,17,17, 8,11,17,17,11,13,17,17,17,17,17,17, 6,10,16,17, 6,10,15,17, 8,10,16,17,17,17,17,17, 9,13,15,17, 8,11,17,17,10,12,17,17,17,17,17,17, @@ -520,38 +520,38 @@ static const long _huff_lengthlist_line_128x7_class1[] = { static const static_codebook _huff_book_line_128x7_class1 = { 1, 256, - (long *)_huff_lengthlist_line_128x7_class1, + (char *)_huff_lengthlist_line_128x7_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_0sub1[] = { +static const char _huff_lengthlist_line_128x7_0sub1[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, }; static const static_codebook _huff_book_line_128x7_0sub1 = { 1, 9, - (long *)_huff_lengthlist_line_128x7_0sub1, + (char *)_huff_lengthlist_line_128x7_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_0sub2[] = { +static const char _huff_lengthlist_line_128x7_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, }; static const static_codebook _huff_book_line_128x7_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_128x7_0sub2, + (char *)_huff_lengthlist_line_128x7_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_0sub3[] = { +static const char _huff_lengthlist_line_128x7_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 3, 5, 3, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, @@ -560,38 +560,38 @@ static const long _huff_lengthlist_line_128x7_0sub3[] = { static const static_codebook _huff_book_line_128x7_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_128x7_0sub3, + (char *)_huff_lengthlist_line_128x7_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_1sub1[] = { +static const char _huff_lengthlist_line_128x7_1sub1[] = { 0, 3, 3, 2, 3, 3, 4, 3, 4, }; static const static_codebook _huff_book_line_128x7_1sub1 = { 1, 9, - (long *)_huff_lengthlist_line_128x7_1sub1, + (char *)_huff_lengthlist_line_128x7_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_1sub2[] = { +static const char _huff_lengthlist_line_128x7_1sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 6, 3, 6, 3, 6, 3, 7, 3, 8, 4, 9, 4, 9, }; static const static_codebook _huff_book_line_128x7_1sub2 = { 1, 25, - (long *)_huff_lengthlist_line_128x7_1sub2, + (char *)_huff_lengthlist_line_128x7_1sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_1sub3[] = { +static const char _huff_lengthlist_line_128x7_1sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 7, 2, 7, 3, 8, 4, 9, 5, 9, 8,10,11,11,12,14,14,14,14,14,14,14,14, @@ -600,25 +600,25 @@ static const long _huff_lengthlist_line_128x7_1sub3[] = { static const static_codebook _huff_book_line_128x7_1sub3 = { 1, 64, - (long *)_huff_lengthlist_line_128x7_1sub3, + (char *)_huff_lengthlist_line_128x7_1sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_class1[] = { +static const char _huff_lengthlist_line_128x11_class1[] = { 1, 6, 3, 7, 2, 4, 5, 7, }; static const static_codebook _huff_book_line_128x11_class1 = { 1, 8, - (long *)_huff_lengthlist_line_128x11_class1, + (char *)_huff_lengthlist_line_128x11_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_class2[] = { +static const char _huff_lengthlist_line_128x11_class2[] = { 1, 6,12,16, 4,12,15,16, 9,15,16,16,16,16,16,16, 2, 5,11,16, 5,11,13,16, 9,13,16,16,16,16,16,16, 4, 8,12,16, 5, 9,12,16, 9,13,15,16,16,16,16,16, @@ -627,13 +627,13 @@ static const long _huff_lengthlist_line_128x11_class2[] = { static const static_codebook _huff_book_line_128x11_class2 = { 1, 64, - (long *)_huff_lengthlist_line_128x11_class2, + (char *)_huff_lengthlist_line_128x11_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_class3[] = { +static const char _huff_lengthlist_line_128x11_class3[] = { 7, 6, 9,17, 7, 6, 8,17,12, 9,11,16,16,16,16,16, 5, 4, 7,16, 5, 3, 6,14, 9, 6, 8,15,16,16,16,16, 5, 4, 6,13, 3, 2, 4,11, 7, 4, 6,13,16,11,10,14, @@ -642,13 +642,13 @@ static const long _huff_lengthlist_line_128x11_class3[] = { static const static_codebook _huff_book_line_128x11_class3 = { 1, 64, - (long *)_huff_lengthlist_line_128x11_class3, + (char *)_huff_lengthlist_line_128x11_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_0sub0[] = { +static const char _huff_lengthlist_line_128x11_0sub0[] = { 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, 8, 7, @@ -661,26 +661,26 @@ static const long _huff_lengthlist_line_128x11_0sub0[] = { static const static_codebook _huff_book_line_128x11_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_0sub0, + (char *)_huff_lengthlist_line_128x11_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_1sub0[] = { +static const char _huff_lengthlist_line_128x11_1sub0[] = { 2, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, }; static const static_codebook _huff_book_line_128x11_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_128x11_1sub0, + (char *)_huff_lengthlist_line_128x11_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_1sub1[] = { +static const char _huff_lengthlist_line_128x11_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 5, 3, 6, 4, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4, @@ -693,26 +693,26 @@ static const long _huff_lengthlist_line_128x11_1sub1[] = { static const static_codebook _huff_book_line_128x11_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_1sub1, + (char *)_huff_lengthlist_line_128x11_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_2sub1[] = { +static const char _huff_lengthlist_line_128x11_2sub1[] = { 0, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 5, 5, }; static const static_codebook _huff_book_line_128x11_2sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x11_2sub1, + (char *)_huff_lengthlist_line_128x11_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_2sub2[] = { +static const char _huff_lengthlist_line_128x11_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 9, 7, 9, 7,10, 7, 9, 8,11, @@ -721,13 +721,13 @@ static const long _huff_lengthlist_line_128x11_2sub2[] = { static const static_codebook _huff_book_line_128x11_2sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x11_2sub2, + (char *)_huff_lengthlist_line_128x11_2sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_2sub3[] = { +static const char _huff_lengthlist_line_128x11_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -740,26 +740,26 @@ static const long _huff_lengthlist_line_128x11_2sub3[] = { static const static_codebook _huff_book_line_128x11_2sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_2sub3, + (char *)_huff_lengthlist_line_128x11_2sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_3sub1[] = { +static const char _huff_lengthlist_line_128x11_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, }; static const static_codebook _huff_book_line_128x11_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x11_3sub1, + (char *)_huff_lengthlist_line_128x11_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_3sub2[] = { +static const char _huff_lengthlist_line_128x11_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 5, 4, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4, 8, 4, 9, 4, 9, 4,10, 4,10, 5,10, 5,11, 5,12, 6, @@ -768,13 +768,13 @@ static const long _huff_lengthlist_line_128x11_3sub2[] = { static const static_codebook _huff_book_line_128x11_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x11_3sub2, + (char *)_huff_lengthlist_line_128x11_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_3sub3[] = { +static const char _huff_lengthlist_line_128x11_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -787,25 +787,25 @@ static const long _huff_lengthlist_line_128x11_3sub3[] = { static const static_codebook _huff_book_line_128x11_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_3sub3, + (char *)_huff_lengthlist_line_128x11_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_class1[] = { +static const char _huff_lengthlist_line_128x17_class1[] = { 1, 3, 4, 7, 2, 5, 6, 7, }; static const static_codebook _huff_book_line_128x17_class1 = { 1, 8, - (long *)_huff_lengthlist_line_128x17_class1, + (char *)_huff_lengthlist_line_128x17_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_class2[] = { +static const char _huff_lengthlist_line_128x17_class2[] = { 1, 4,10,19, 3, 8,13,19, 7,12,19,19,19,19,19,19, 2, 6,11,19, 8,13,19,19, 9,11,19,19,19,19,19,19, 6, 7,13,19, 9,13,19,19,10,13,18,18,18,18,18,18, @@ -814,13 +814,13 @@ static const long _huff_lengthlist_line_128x17_class2[] = { static const static_codebook _huff_book_line_128x17_class2 = { 1, 64, - (long *)_huff_lengthlist_line_128x17_class2, + (char *)_huff_lengthlist_line_128x17_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_class3[] = { +static const char _huff_lengthlist_line_128x17_class3[] = { 3, 6,10,17, 4, 8,11,20, 8,10,11,20,20,20,20,20, 2, 4, 8,18, 4, 6, 8,17, 7, 8,10,20,20,17,20,20, 3, 5, 8,17, 3, 4, 6,17, 8, 8,10,17,17,12,16,20, @@ -829,13 +829,13 @@ static const long _huff_lengthlist_line_128x17_class3[] = { static const static_codebook _huff_book_line_128x17_class3 = { 1, 64, - (long *)_huff_lengthlist_line_128x17_class3, + (char *)_huff_lengthlist_line_128x17_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_0sub0[] = { +static const char _huff_lengthlist_line_128x17_0sub0[] = { 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, 8, 5, 8, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, 9, 6, @@ -848,26 +848,26 @@ static const long _huff_lengthlist_line_128x17_0sub0[] = { static const static_codebook _huff_book_line_128x17_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_0sub0, + (char *)_huff_lengthlist_line_128x17_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_1sub0[] = { +static const char _huff_lengthlist_line_128x17_1sub0[] = { 2, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, }; static const static_codebook _huff_book_line_128x17_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_128x17_1sub0, + (char *)_huff_lengthlist_line_128x17_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_1sub1[] = { +static const char _huff_lengthlist_line_128x17_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 5, 3, 5, 3, 6, 3, 6, 4, 6, 4, 7, 4, 7, 5, @@ -880,26 +880,26 @@ static const long _huff_lengthlist_line_128x17_1sub1[] = { static const static_codebook _huff_book_line_128x17_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_1sub1, + (char *)_huff_lengthlist_line_128x17_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_2sub1[] = { +static const char _huff_lengthlist_line_128x17_2sub1[] = { 0, 4, 5, 4, 6, 4, 8, 3, 9, 3, 9, 2, 9, 3, 8, 4, 9, 4, }; static const static_codebook _huff_book_line_128x17_2sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x17_2sub1, + (char *)_huff_lengthlist_line_128x17_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_2sub2[] = { +static const char _huff_lengthlist_line_128x17_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 1, 5, 3, 5, 3, 5, 4, 7, 5,10, 7,10, 7, 12,10,14,10,14, 9,14,11,14,14,14,13,13,13,13,13, @@ -908,13 +908,13 @@ static const long _huff_lengthlist_line_128x17_2sub2[] = { static const static_codebook _huff_book_line_128x17_2sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x17_2sub2, + (char *)_huff_lengthlist_line_128x17_2sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_2sub3[] = { +static const char _huff_lengthlist_line_128x17_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -927,26 +927,26 @@ static const long _huff_lengthlist_line_128x17_2sub3[] = { static const static_codebook _huff_book_line_128x17_2sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_2sub3, + (char *)_huff_lengthlist_line_128x17_2sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_3sub1[] = { +static const char _huff_lengthlist_line_128x17_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 4, 5, 3, 5, 3, 5, 4, 6, 4, 6, 4, }; static const static_codebook _huff_book_line_128x17_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x17_3sub1, + (char *)_huff_lengthlist_line_128x17_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_3sub2[] = { +static const char _huff_lengthlist_line_128x17_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 6, 3, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4, 8, 4, 8, 4, 8, 4, 9, 4, 9, 5,10, 5,10, 7,10, 8, @@ -955,13 +955,13 @@ static const long _huff_lengthlist_line_128x17_3sub2[] = { static const static_codebook _huff_book_line_128x17_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x17_3sub2, + (char *)_huff_lengthlist_line_128x17_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_3sub3[] = { +static const char _huff_lengthlist_line_128x17_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -974,37 +974,37 @@ static const long _huff_lengthlist_line_128x17_3sub3[] = { static const static_codebook _huff_book_line_128x17_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_3sub3, + (char *)_huff_lengthlist_line_128x17_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class1[] = { +static const char _huff_lengthlist_line_1024x27_class1[] = { 2,10, 8,14, 7,12,11,14, 1, 5, 3, 7, 4, 9, 7,13, }; static const static_codebook _huff_book_line_1024x27_class1 = { 1, 16, - (long *)_huff_lengthlist_line_1024x27_class1, + (char *)_huff_lengthlist_line_1024x27_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class2[] = { +static const char _huff_lengthlist_line_1024x27_class2[] = { 1, 4, 2, 6, 3, 7, 5, 7, }; static const static_codebook _huff_book_line_1024x27_class2 = { 1, 8, - (long *)_huff_lengthlist_line_1024x27_class2, + (char *)_huff_lengthlist_line_1024x27_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class3[] = { +static const char _huff_lengthlist_line_1024x27_class3[] = { 1, 5, 7,21, 5, 8, 9,21,10, 9,12,20,20,16,20,20, 4, 8, 9,20, 6, 8, 9,20,11,11,13,20,20,15,17,20, 9,11,14,20, 8,10,15,20,11,13,15,20,20,20,20,20, @@ -1025,13 +1025,13 @@ static const long _huff_lengthlist_line_1024x27_class3[] = { static const static_codebook _huff_book_line_1024x27_class3 = { 1, 256, - (long *)_huff_lengthlist_line_1024x27_class3, + (char *)_huff_lengthlist_line_1024x27_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class4[] = { +static const char _huff_lengthlist_line_1024x27_class4[] = { 2, 3, 7,13, 4, 4, 7,15, 8, 6, 9,17,21,16,15,21, 2, 5, 7,11, 5, 5, 7,14, 9, 7,10,16,17,15,16,21, 4, 7,10,17, 7, 7, 9,15,11, 9,11,16,21,18,15,21, @@ -1040,13 +1040,13 @@ static const long _huff_lengthlist_line_1024x27_class4[] = { static const static_codebook _huff_book_line_1024x27_class4 = { 1, 64, - (long *)_huff_lengthlist_line_1024x27_class4, + (char *)_huff_lengthlist_line_1024x27_class4, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_0sub0[] = { +static const char _huff_lengthlist_line_1024x27_0sub0[] = { 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6,10, 6,10, 6,11, 6, @@ -1059,26 +1059,26 @@ static const long _huff_lengthlist_line_1024x27_0sub0[] = { static const static_codebook _huff_book_line_1024x27_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_0sub0, + (char *)_huff_lengthlist_line_1024x27_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_1sub0[] = { +static const char _huff_lengthlist_line_1024x27_1sub0[] = { 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, }; static const static_codebook _huff_book_line_1024x27_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_1024x27_1sub0, + (char *)_huff_lengthlist_line_1024x27_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_1sub1[] = { +static const char _huff_lengthlist_line_1024x27_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 5, 8, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, @@ -1091,26 +1091,26 @@ static const long _huff_lengthlist_line_1024x27_1sub1[] = { static const static_codebook _huff_book_line_1024x27_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_1sub1, + (char *)_huff_lengthlist_line_1024x27_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_2sub0[] = { +static const char _huff_lengthlist_line_1024x27_2sub0[] = { 1, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8,10, 9,10, 9, }; static const static_codebook _huff_book_line_1024x27_2sub0 = { 1, 32, - (long *)_huff_lengthlist_line_1024x27_2sub0, + (char *)_huff_lengthlist_line_1024x27_2sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_2sub1[] = { +static const char _huff_lengthlist_line_1024x27_2sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, 6, 5, @@ -1123,26 +1123,26 @@ static const long _huff_lengthlist_line_1024x27_2sub1[] = { static const static_codebook _huff_book_line_1024x27_2sub1 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_2sub1, + (char *)_huff_lengthlist_line_1024x27_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_3sub1[] = { +static const char _huff_lengthlist_line_1024x27_3sub1[] = { 0, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 4, 5, 5, 5, }; static const static_codebook _huff_book_line_1024x27_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_1024x27_3sub1, + (char *)_huff_lengthlist_line_1024x27_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_3sub2[] = { +static const char _huff_lengthlist_line_1024x27_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 5, 7, 5, 8, 6, 8, 6, 9, 7,10, 7,10, 8,10, 8,11, @@ -1151,13 +1151,13 @@ static const long _huff_lengthlist_line_1024x27_3sub2[] = { static const static_codebook _huff_book_line_1024x27_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_1024x27_3sub2, + (char *)_huff_lengthlist_line_1024x27_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_3sub3[] = { +static const char _huff_lengthlist_line_1024x27_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1170,26 +1170,26 @@ static const long _huff_lengthlist_line_1024x27_3sub3[] = { static const static_codebook _huff_book_line_1024x27_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_3sub3, + (char *)_huff_lengthlist_line_1024x27_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_4sub1[] = { +static const char _huff_lengthlist_line_1024x27_4sub1[] = { 0, 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 5, 4, }; static const static_codebook _huff_book_line_1024x27_4sub1 = { 1, 18, - (long *)_huff_lengthlist_line_1024x27_4sub1, + (char *)_huff_lengthlist_line_1024x27_4sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_4sub2[] = { +static const char _huff_lengthlist_line_1024x27_4sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 4, 2, 5, 3, 5, 4, 6, 6, 6, 7, 7, 8, 7, 8, 7, 8, 7, 9, 8, 9, 8, 9, 8,10, 8,11, 9,12, @@ -1198,13 +1198,13 @@ static const long _huff_lengthlist_line_1024x27_4sub2[] = { static const static_codebook _huff_book_line_1024x27_4sub2 = { 1, 50, - (long *)_huff_lengthlist_line_1024x27_4sub2, + (char *)_huff_lengthlist_line_1024x27_4sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_4sub3[] = { +static const char _huff_lengthlist_line_1024x27_4sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1217,37 +1217,37 @@ static const long _huff_lengthlist_line_1024x27_4sub3[] = { static const static_codebook _huff_book_line_1024x27_4sub3 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_4sub3, + (char *)_huff_lengthlist_line_1024x27_4sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class1[] = { +static const char _huff_lengthlist_line_2048x27_class1[] = { 2, 6, 8, 9, 7,11,13,13, 1, 3, 5, 5, 6, 6,12,10, }; static const static_codebook _huff_book_line_2048x27_class1 = { 1, 16, - (long *)_huff_lengthlist_line_2048x27_class1, + (char *)_huff_lengthlist_line_2048x27_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class2[] = { +static const char _huff_lengthlist_line_2048x27_class2[] = { 1, 2, 3, 6, 4, 7, 5, 7, }; static const static_codebook _huff_book_line_2048x27_class2 = { 1, 8, - (long *)_huff_lengthlist_line_2048x27_class2, + (char *)_huff_lengthlist_line_2048x27_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class3[] = { +static const char _huff_lengthlist_line_2048x27_class3[] = { 3, 3, 6,16, 5, 5, 7,16, 9, 8,11,16,16,16,16,16, 5, 5, 8,16, 5, 5, 7,16, 8, 7, 9,16,16,16,16,16, 9, 9,12,16, 6, 8,11,16, 9,10,11,16,16,16,16,16, @@ -1268,13 +1268,13 @@ static const long _huff_lengthlist_line_2048x27_class3[] = { static const static_codebook _huff_book_line_2048x27_class3 = { 1, 256, - (long *)_huff_lengthlist_line_2048x27_class3, + (char *)_huff_lengthlist_line_2048x27_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class4[] = { +static const char _huff_lengthlist_line_2048x27_class4[] = { 2, 4, 7,13, 4, 5, 7,15, 8, 7,10,16,16,14,16,16, 2, 4, 7,16, 3, 4, 7,14, 8, 8,10,16,16,16,15,16, 6, 8,11,16, 7, 7, 9,16,11, 9,13,16,16,16,15,16, @@ -1283,13 +1283,13 @@ static const long _huff_lengthlist_line_2048x27_class4[] = { static const static_codebook _huff_book_line_2048x27_class4 = { 1, 64, - (long *)_huff_lengthlist_line_2048x27_class4, + (char *)_huff_lengthlist_line_2048x27_class4, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_0sub0[] = { +static const char _huff_lengthlist_line_2048x27_0sub0[] = { 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, 8, 5, 9, 5, 9, 6,10, 6,10, 6,11, 6,11, 6,11, 6,11, 6,11, 6, @@ -1302,26 +1302,26 @@ static const long _huff_lengthlist_line_2048x27_0sub0[] = { static const static_codebook _huff_book_line_2048x27_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_0sub0, + (char *)_huff_lengthlist_line_2048x27_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_1sub0[] = { +static const char _huff_lengthlist_line_2048x27_1sub0[] = { 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, }; static const static_codebook _huff_book_line_2048x27_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_2048x27_1sub0, + (char *)_huff_lengthlist_line_2048x27_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_1sub1[] = { +static const char _huff_lengthlist_line_2048x27_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 5, 7, 5, 7, 4, 7, 4, 8, 4, 8, 4, 8, 4, 8, 3, @@ -1334,26 +1334,26 @@ static const long _huff_lengthlist_line_2048x27_1sub1[] = { static const static_codebook _huff_book_line_2048x27_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_1sub1, + (char *)_huff_lengthlist_line_2048x27_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_2sub0[] = { +static const char _huff_lengthlist_line_2048x27_2sub0[] = { 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, }; static const static_codebook _huff_book_line_2048x27_2sub0 = { 1, 32, - (long *)_huff_lengthlist_line_2048x27_2sub0, + (char *)_huff_lengthlist_line_2048x27_2sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_2sub1[] = { +static const char _huff_lengthlist_line_2048x27_2sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 6, 6, 6, 7, @@ -1366,26 +1366,26 @@ static const long _huff_lengthlist_line_2048x27_2sub1[] = { static const static_codebook _huff_book_line_2048x27_2sub1 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_2sub1, + (char *)_huff_lengthlist_line_2048x27_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_3sub1[] = { +static const char _huff_lengthlist_line_2048x27_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, }; static const static_codebook _huff_book_line_2048x27_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_2048x27_3sub1, + (char *)_huff_lengthlist_line_2048x27_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_3sub2[] = { +static const char _huff_lengthlist_line_2048x27_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, 9, 9,11, 9,12, @@ -1394,13 +1394,13 @@ static const long _huff_lengthlist_line_2048x27_3sub2[] = { static const static_codebook _huff_book_line_2048x27_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_2048x27_3sub2, + (char *)_huff_lengthlist_line_2048x27_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_3sub3[] = { +static const char _huff_lengthlist_line_2048x27_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1413,26 +1413,26 @@ static const long _huff_lengthlist_line_2048x27_3sub3[] = { static const static_codebook _huff_book_line_2048x27_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_3sub3, + (char *)_huff_lengthlist_line_2048x27_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_4sub1[] = { +static const char _huff_lengthlist_line_2048x27_4sub1[] = { 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 4, 5, }; static const static_codebook _huff_book_line_2048x27_4sub1 = { 1, 18, - (long *)_huff_lengthlist_line_2048x27_4sub1, + (char *)_huff_lengthlist_line_2048x27_4sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_4sub2[] = { +static const char _huff_lengthlist_line_2048x27_4sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 3, 4, 4, 4, 5, 5, 6, 5, 6, 5, 7, 6, 6, 6, 7, 7, 7, 8, 9, 9, 9,12,10,11,10,10,12, @@ -1441,13 +1441,13 @@ static const long _huff_lengthlist_line_2048x27_4sub2[] = { static const static_codebook _huff_book_line_2048x27_4sub2 = { 1, 50, - (long *)_huff_lengthlist_line_2048x27_4sub2, + (char *)_huff_lengthlist_line_2048x27_4sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_4sub3[] = { +static const char _huff_lengthlist_line_2048x27_4sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1460,13 +1460,13 @@ static const long _huff_lengthlist_line_2048x27_4sub3[] = { static const static_codebook _huff_book_line_2048x27_4sub3 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_4sub3, + (char *)_huff_lengthlist_line_2048x27_4sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_class0[] = { +static const char _huff_lengthlist_line_256x4low_class0[] = { 4, 5, 6,11, 5, 5, 6,10, 7, 7, 6, 6,14,13, 9, 9, 6, 6, 6,10, 6, 6, 6, 9, 8, 7, 7, 9,14,12, 8,11, 8, 7, 7,11, 8, 8, 7,11, 9, 9, 7, 9,13,11, 9,13, @@ -1487,50 +1487,50 @@ static const long _huff_lengthlist_line_256x4low_class0[] = { static const static_codebook _huff_book_line_256x4low_class0 = { 1, 256, - (long *)_huff_lengthlist_line_256x4low_class0, + (char *)_huff_lengthlist_line_256x4low_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub0[] = { +static const char _huff_lengthlist_line_256x4low_0sub0[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book_line_256x4low_0sub0 = { 1, 4, - (long *)_huff_lengthlist_line_256x4low_0sub0, + (char *)_huff_lengthlist_line_256x4low_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub1[] = { +static const char _huff_lengthlist_line_256x4low_0sub1[] = { 0, 0, 0, 0, 2, 3, 2, 3, 3, 3, }; static const static_codebook _huff_book_line_256x4low_0sub1 = { 1, 10, - (long *)_huff_lengthlist_line_256x4low_0sub1, + (char *)_huff_lengthlist_line_256x4low_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub2[] = { +static const char _huff_lengthlist_line_256x4low_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, }; static const static_codebook _huff_book_line_256x4low_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x4low_0sub2, + (char *)_huff_lengthlist_line_256x4low_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub3[] = { +static const char _huff_lengthlist_line_256x4low_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 2, 4, 3, 5, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 6, 9, @@ -1539,7 +1539,7 @@ static const long _huff_lengthlist_line_256x4low_0sub3[] = { static const static_codebook _huff_book_line_256x4low_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x4low_0sub3, + (char *)_huff_lengthlist_line_256x4low_0sub3, 0, 0, 0, 0, 0, NULL, 0 diff --git a/Engine/lib/libvorbis/lib/books/uncoupled/res_books_uncoupled.h b/Engine/lib/libvorbis/lib/books/uncoupled/res_books_uncoupled.h index d2473635b..736353b67 100644 --- a/Engine/lib/libvorbis/lib/books/uncoupled/res_books_uncoupled.h +++ b/Engine/lib/libvorbis/lib/books/uncoupled/res_books_uncoupled.h @@ -11,7 +11,7 @@ ******************************************************************** function: static codebooks autogenerated by huff/huffbuld - last modified: $Id: res_books_uncoupled.h 17022 2010-03-25 03:45:42Z xiphmont $ + last modified: $Id: res_books_uncoupled.h 19057 2014-01-22 12:32:31Z xiphmont $ ********************************************************************/ @@ -23,7 +23,7 @@ static const long _vq_quantlist__16u0__p1_0[] = { 2, }; -static const long _vq_lengthlist__16u0__p1_0[] = { +static const char _vq_lengthlist__16u0__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 8, 5, 8, 8, 8,10,10, 8, 10,11, 5, 8, 8, 8,10,10, 8,10,10, 4, 9, 9, 9,12, 11, 8,11,11, 8,12,11,10,12,14,10,13,13, 7,11,11, @@ -34,7 +34,7 @@ static const long _vq_lengthlist__16u0__p1_0[] = { static const static_codebook _16u0__p1_0 = { 4, 81, - (long *)_vq_lengthlist__16u0__p1_0, + (char *)_vq_lengthlist__16u0__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u0__p1_0, 0 @@ -46,7 +46,7 @@ static const long _vq_quantlist__16u0__p2_0[] = { 2, }; -static const long _vq_lengthlist__16u0__p2_0[] = { +static const char _vq_lengthlist__16u0__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 9, 7, 8, 9, 5, 7, 7, 7, 9, 8, 7, 9, 7, 4, 7, 7, 7, 9, 9, 7, 8, 8, 6, 9, 8, 7, 8,11, 9,11,10, 6, 8, 9, @@ -57,7 +57,7 @@ static const long _vq_lengthlist__16u0__p2_0[] = { static const static_codebook _16u0__p2_0 = { 4, 81, - (long *)_vq_lengthlist__16u0__p2_0, + (char *)_vq_lengthlist__16u0__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u0__p2_0, 0 @@ -71,7 +71,7 @@ static const long _vq_quantlist__16u0__p3_0[] = { 4, }; -static const long _vq_lengthlist__16u0__p3_0[] = { +static const char _vq_lengthlist__16u0__p3_0[] = { 1, 5, 5, 7, 7, 6, 7, 7, 8, 8, 6, 7, 8, 8, 8, 8, 9, 9,11,11, 8, 9, 9,11,11, 6, 9, 8,10,10, 8,10, 10,11,11, 8,10,10,11,11,10,11,10,13,12, 9,11,10, @@ -116,7 +116,7 @@ static const long _vq_lengthlist__16u0__p3_0[] = { static const static_codebook _16u0__p3_0 = { 4, 625, - (long *)_vq_lengthlist__16u0__p3_0, + (char *)_vq_lengthlist__16u0__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u0__p3_0, 0 @@ -130,7 +130,7 @@ static const long _vq_quantlist__16u0__p4_0[] = { 4, }; -static const long _vq_lengthlist__16u0__p4_0[] = { +static const char _vq_lengthlist__16u0__p4_0[] = { 3, 5, 5, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 9, 10, 9,11,11, 9, 9, 9,11,11, 6, 7, 7,10,10, 7, 7, 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10, @@ -175,7 +175,7 @@ static const long _vq_lengthlist__16u0__p4_0[] = { static const static_codebook _16u0__p4_0 = { 4, 625, - (long *)_vq_lengthlist__16u0__p4_0, + (char *)_vq_lengthlist__16u0__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u0__p4_0, 0 @@ -193,7 +193,7 @@ static const long _vq_quantlist__16u0__p5_0[] = { 8, }; -static const long _vq_lengthlist__16u0__p5_0[] = { +static const char _vq_lengthlist__16u0__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 7, 8, 8, @@ -204,7 +204,7 @@ static const long _vq_lengthlist__16u0__p5_0[] = { static const static_codebook _16u0__p5_0 = { 2, 81, - (long *)_vq_lengthlist__16u0__p5_0, + (char *)_vq_lengthlist__16u0__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u0__p5_0, 0 @@ -226,7 +226,7 @@ static const long _vq_quantlist__16u0__p6_0[] = { 12, }; -static const long _vq_lengthlist__16u0__p6_0[] = { +static const char _vq_lengthlist__16u0__p6_0[] = { 1, 4, 4, 7, 7,10,10,12,12,13,13,18,17, 3, 6, 6, 9, 9,11,11,13,13,14,14,18,17, 3, 6, 6, 9, 9,11, 11,13,13,14,14,17,18, 7, 9, 9,11,11,13,13,14,14, @@ -242,7 +242,7 @@ static const long _vq_lengthlist__16u0__p6_0[] = { static const static_codebook _16u0__p6_0 = { 2, 169, - (long *)_vq_lengthlist__16u0__p6_0, + (char *)_vq_lengthlist__16u0__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16u0__p6_0, 0 @@ -256,14 +256,14 @@ static const long _vq_quantlist__16u0__p6_1[] = { 4, }; -static const long _vq_lengthlist__16u0__p6_1[] = { +static const char _vq_lengthlist__16u0__p6_1[] = { 1, 4, 5, 6, 6, 4, 6, 6, 6, 6, 4, 6, 6, 6, 6, 6, 6, 6, 7, 7, 6, 6, 6, 7, 7, }; static const static_codebook _16u0__p6_1 = { 2, 25, - (long *)_vq_lengthlist__16u0__p6_1, + (char *)_vq_lengthlist__16u0__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u0__p6_1, 0 @@ -275,7 +275,7 @@ static const long _vq_quantlist__16u0__p7_0[] = { 2, }; -static const long _vq_lengthlist__16u0__p7_0[] = { +static const char _vq_lengthlist__16u0__p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -286,7 +286,7 @@ static const long _vq_lengthlist__16u0__p7_0[] = { static const static_codebook _16u0__p7_0 = { 4, 81, - (long *)_vq_lengthlist__16u0__p7_0, + (char *)_vq_lengthlist__16u0__p7_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__16u0__p7_0, 0 @@ -310,7 +310,7 @@ static const long _vq_quantlist__16u0__p7_1[] = { 14, }; -static const long _vq_lengthlist__16u0__p7_1[] = { +static const char _vq_lengthlist__16u0__p7_1[] = { 1, 5, 5, 6, 5, 9,10,11,11,10,10,10,10,10,10, 5, 8, 8, 8,10,10,10,10,10,10,10,10,10,10,10, 5, 8, 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 5,10, 8, @@ -330,7 +330,7 @@ static const long _vq_lengthlist__16u0__p7_1[] = { static const static_codebook _16u0__p7_1 = { 2, 225, - (long *)_vq_lengthlist__16u0__p7_1, + (char *)_vq_lengthlist__16u0__p7_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16u0__p7_1, 0 @@ -360,7 +360,7 @@ static const long _vq_quantlist__16u0__p7_2[] = { 20, }; -static const long _vq_lengthlist__16u0__p7_2[] = { +static const char _vq_lengthlist__16u0__p7_2[] = { 1, 6, 6, 7, 8, 7, 7,10, 9,10, 9,11,10, 9,11,10, 9, 9, 9, 9,10, 6, 8, 7, 9, 9, 8, 8,10,10, 9,11, 11,12,12,10, 9,11, 9,12,10, 9, 6, 9, 8, 9,12, 8, @@ -393,13 +393,13 @@ static const long _vq_lengthlist__16u0__p7_2[] = { static const static_codebook _16u0__p7_2 = { 2, 441, - (long *)_vq_lengthlist__16u0__p7_2, + (char *)_vq_lengthlist__16u0__p7_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16u0__p7_2, 0 }; -static const long _huff_lengthlist__16u0__single[] = { +static const char _huff_lengthlist__16u0__single[] = { 3, 5, 8, 7,14, 8, 9,19, 5, 2, 5, 5, 9, 6, 9,19, 8, 4, 5, 7, 8, 9,13,19, 7, 4, 6, 5, 9, 6, 9,19, 12, 8, 7, 9,10,11,13,19, 8, 5, 8, 6, 9, 6, 7,19, @@ -408,13 +408,13 @@ static const long _huff_lengthlist__16u0__single[] = { static const static_codebook _huff_book__16u0__single = { 2, 64, - (long *)_huff_lengthlist__16u0__single, + (char *)_huff_lengthlist__16u0__single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16u1__long[] = { +static const char _huff_lengthlist__16u1__long[] = { 3, 6,10, 8,12, 8,14, 8,14,19, 5, 3, 5, 5, 7, 6, 11, 7,16,19, 7, 5, 6, 7, 7, 9,11,12,19,19, 6, 4, 7, 5, 7, 6,10, 7,18,18, 8, 6, 7, 7, 7, 7, 8, 9, @@ -426,7 +426,7 @@ static const long _huff_lengthlist__16u1__long[] = { static const static_codebook _huff_book__16u1__long = { 2, 100, - (long *)_huff_lengthlist__16u1__long, + (char *)_huff_lengthlist__16u1__long, 0, 0, 0, 0, 0, NULL, 0 @@ -438,7 +438,7 @@ static const long _vq_quantlist__16u1__p1_0[] = { 2, }; -static const long _vq_lengthlist__16u1__p1_0[] = { +static const char _vq_lengthlist__16u1__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7,10,10, 7, 9,10, 5, 7, 8, 7,10, 9, 7,10,10, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10,10,11,12,10,12,13, 7,10,10, @@ -449,7 +449,7 @@ static const long _vq_lengthlist__16u1__p1_0[] = { static const static_codebook _16u1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__16u1__p1_0, + (char *)_vq_lengthlist__16u1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u1__p1_0, 0 @@ -461,7 +461,7 @@ static const long _vq_quantlist__16u1__p2_0[] = { 2, }; -static const long _vq_lengthlist__16u1__p2_0[] = { +static const char _vq_lengthlist__16u1__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 7, 7,10, 8, 9, 9, 6, 8, 8, @@ -472,7 +472,7 @@ static const long _vq_lengthlist__16u1__p2_0[] = { static const static_codebook _16u1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__16u1__p2_0, + (char *)_vq_lengthlist__16u1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u1__p2_0, 0 @@ -486,7 +486,7 @@ static const long _vq_quantlist__16u1__p3_0[] = { 4, }; -static const long _vq_lengthlist__16u1__p3_0[] = { +static const char _vq_lengthlist__16u1__p3_0[] = { 1, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9, 10, 9,11,11, 9, 9,10,11,11, 6, 8, 8,10,10, 8, 9, 10,11,11, 8, 9,10,11,11,10,11,11,12,13,10,11,11, @@ -531,7 +531,7 @@ static const long _vq_lengthlist__16u1__p3_0[] = { static const static_codebook _16u1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__16u1__p3_0, + (char *)_vq_lengthlist__16u1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u1__p3_0, 0 @@ -545,7 +545,7 @@ static const long _vq_quantlist__16u1__p4_0[] = { 4, }; -static const long _vq_lengthlist__16u1__p4_0[] = { +static const char _vq_lengthlist__16u1__p4_0[] = { 4, 5, 5, 8, 8, 6, 6, 7, 9, 9, 6, 6, 6, 9, 9, 9, 10, 9,11,11, 9, 9,10,11,11, 6, 7, 7,10, 9, 7, 7, 8, 9,10, 7, 7, 8,10,10,10,10,10,10,12, 9, 9,10, @@ -590,7 +590,7 @@ static const long _vq_lengthlist__16u1__p4_0[] = { static const static_codebook _16u1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__16u1__p4_0, + (char *)_vq_lengthlist__16u1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u1__p4_0, 0 @@ -608,7 +608,7 @@ static const long _vq_quantlist__16u1__p5_0[] = { 8, }; -static const long _vq_lengthlist__16u1__p5_0[] = { +static const char _vq_lengthlist__16u1__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, @@ -619,7 +619,7 @@ static const long _vq_lengthlist__16u1__p5_0[] = { static const static_codebook _16u1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__16u1__p5_0, + (char *)_vq_lengthlist__16u1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p5_0, 0 @@ -637,7 +637,7 @@ static const long _vq_quantlist__16u1__p6_0[] = { 8, }; -static const long _vq_lengthlist__16u1__p6_0[] = { +static const char _vq_lengthlist__16u1__p6_0[] = { 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 8, 8, 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7, 8, 8,10, 9, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7, @@ -648,7 +648,7 @@ static const long _vq_lengthlist__16u1__p6_0[] = { static const static_codebook _16u1__p6_0 = { 2, 81, - (long *)_vq_lengthlist__16u1__p6_0, + (char *)_vq_lengthlist__16u1__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p6_0, 0 @@ -660,7 +660,7 @@ static const long _vq_quantlist__16u1__p7_0[] = { 2, }; -static const long _vq_lengthlist__16u1__p7_0[] = { +static const char _vq_lengthlist__16u1__p7_0[] = { 1, 4, 4, 4, 8, 8, 4, 8, 8, 5,11, 9, 8,12,11, 8, 12,11, 5,10,11, 8,11,12, 8,11,12, 4,11,11,11,14, 13,10,13,13, 8,14,13,12,14,16,12,16,15, 8,14,14, @@ -671,7 +671,7 @@ static const long _vq_lengthlist__16u1__p7_0[] = { static const static_codebook _16u1__p7_0 = { 4, 81, - (long *)_vq_lengthlist__16u1__p7_0, + (char *)_vq_lengthlist__16u1__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16u1__p7_0, 0 @@ -691,7 +691,7 @@ static const long _vq_quantlist__16u1__p7_1[] = { 10, }; -static const long _vq_lengthlist__16u1__p7_1[] = { +static const char _vq_lengthlist__16u1__p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 5, 7, 7, 8, 8, 8, 8, 8, 8, 4, 5, 6, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, @@ -704,7 +704,7 @@ static const long _vq_lengthlist__16u1__p7_1[] = { static const static_codebook _16u1__p7_1 = { 2, 121, - (long *)_vq_lengthlist__16u1__p7_1, + (char *)_vq_lengthlist__16u1__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p7_1, 0 @@ -724,7 +724,7 @@ static const long _vq_quantlist__16u1__p8_0[] = { 10, }; -static const long _vq_lengthlist__16u1__p8_0[] = { +static const char _vq_lengthlist__16u1__p8_0[] = { 1, 4, 4, 5, 5, 8, 8,10,10,12,12, 4, 7, 7, 8, 8, 9, 9,12,11,14,13, 4, 7, 7, 7, 8, 9,10,11,11,13, 12, 5, 8, 8, 9, 9,11,11,12,13,15,14, 5, 7, 8, 9, @@ -737,7 +737,7 @@ static const long _vq_lengthlist__16u1__p8_0[] = { static const static_codebook _16u1__p8_0 = { 2, 121, - (long *)_vq_lengthlist__16u1__p8_0, + (char *)_vq_lengthlist__16u1__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__16u1__p8_0, 0 @@ -757,7 +757,7 @@ static const long _vq_quantlist__16u1__p8_1[] = { 10, }; -static const long _vq_lengthlist__16u1__p8_1[] = { +static const char _vq_lengthlist__16u1__p8_1[] = { 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7, @@ -770,7 +770,7 @@ static const long _vq_lengthlist__16u1__p8_1[] = { static const static_codebook _16u1__p8_1 = { 2, 121, - (long *)_vq_lengthlist__16u1__p8_1, + (char *)_vq_lengthlist__16u1__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p8_1, 0 @@ -794,7 +794,7 @@ static const long _vq_quantlist__16u1__p9_0[] = { 14, }; -static const long _vq_lengthlist__16u1__p9_0[] = { +static const char _vq_lengthlist__16u1__p9_0[] = { 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -814,7 +814,7 @@ static const long _vq_lengthlist__16u1__p9_0[] = { static const static_codebook _16u1__p9_0 = { 2, 225, - (long *)_vq_lengthlist__16u1__p9_0, + (char *)_vq_lengthlist__16u1__p9_0, 1, -514071552, 1627381760, 4, 0, (long *)_vq_quantlist__16u1__p9_0, 0 @@ -838,7 +838,7 @@ static const long _vq_quantlist__16u1__p9_1[] = { 14, }; -static const long _vq_lengthlist__16u1__p9_1[] = { +static const char _vq_lengthlist__16u1__p9_1[] = { 1, 6, 5, 9, 9,10,10, 6, 7, 9, 9,10,10,10,10, 5, 10, 8,10, 8,10,10, 8, 8,10, 9,10,10,10,10, 5, 8, 9,10,10,10,10, 8,10,10,10,10,10,10,10, 9,10,10, @@ -858,7 +858,7 @@ static const long _vq_lengthlist__16u1__p9_1[] = { static const static_codebook _16u1__p9_1 = { 2, 225, - (long *)_vq_lengthlist__16u1__p9_1, + (char *)_vq_lengthlist__16u1__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__16u1__p9_1, 0 @@ -884,7 +884,7 @@ static const long _vq_quantlist__16u1__p9_2[] = { 16, }; -static const long _vq_lengthlist__16u1__p9_2[] = { +static const char _vq_lengthlist__16u1__p9_2[] = { 1, 6, 6, 7, 8, 8,11,10, 9, 9,11, 9,10, 9,11,11, 9, 6, 7, 6,11, 8,11, 9,10,10,11, 9,11,10,10,10, 11, 9, 5, 7, 7, 8, 8,10,11, 8, 8,11, 9, 9,10,11, @@ -908,13 +908,13 @@ static const long _vq_lengthlist__16u1__p9_2[] = { static const static_codebook _16u1__p9_2 = { 2, 289, - (long *)_vq_lengthlist__16u1__p9_2, + (char *)_vq_lengthlist__16u1__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16u1__p9_2, 0 }; -static const long _huff_lengthlist__16u1__short[] = { +static const char _huff_lengthlist__16u1__short[] = { 5, 7,10, 9,11,10,15,11,13,16, 6, 4, 6, 6, 7, 7, 10, 9,12,16,10, 6, 5, 6, 6, 7,10,11,16,16, 9, 6, 7, 6, 7, 7,10, 8,14,16,11, 6, 5, 4, 5, 6, 8, 9, @@ -926,13 +926,13 @@ static const long _huff_lengthlist__16u1__short[] = { static const static_codebook _huff_book__16u1__short = { 2, 100, - (long *)_huff_lengthlist__16u1__short, + (char *)_huff_lengthlist__16u1__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16u2__long[] = { +static const char _huff_lengthlist__16u2__long[] = { 5, 8,10,10,10,11,11,12,14,18, 7, 5, 5, 6, 8, 9, 10,12,14,17, 9, 5, 4, 5, 6, 8,10,11,13,19, 9, 5, 4, 4, 5, 6, 9,10,12,17, 8, 6, 5, 4, 4, 5, 7,10, @@ -944,7 +944,7 @@ static const long _huff_lengthlist__16u2__long[] = { static const static_codebook _huff_book__16u2__long = { 2, 100, - (long *)_huff_lengthlist__16u2__long, + (char *)_huff_lengthlist__16u2__long, 0, 0, 0, 0, 0, NULL, 0 @@ -956,7 +956,7 @@ static const long _vq_quantlist__16u2_p1_0[] = { 2, }; -static const long _vq_lengthlist__16u2_p1_0[] = { +static const char _vq_lengthlist__16u2_p1_0[] = { 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,10,10, 7, 9, 9, @@ -967,7 +967,7 @@ static const long _vq_lengthlist__16u2_p1_0[] = { static const static_codebook _16u2_p1_0 = { 4, 81, - (long *)_vq_lengthlist__16u2_p1_0, + (char *)_vq_lengthlist__16u2_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u2_p1_0, 0 @@ -981,7 +981,7 @@ static const long _vq_quantlist__16u2_p2_0[] = { 4, }; -static const long _vq_lengthlist__16u2_p2_0[] = { +static const char _vq_lengthlist__16u2_p2_0[] = { 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9, 10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10, @@ -1026,7 +1026,7 @@ static const long _vq_lengthlist__16u2_p2_0[] = { static const static_codebook _16u2_p2_0 = { 4, 625, - (long *)_vq_lengthlist__16u2_p2_0, + (char *)_vq_lengthlist__16u2_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u2_p2_0, 0 @@ -1044,7 +1044,7 @@ static const long _vq_quantlist__16u2_p3_0[] = { 8, }; -static const long _vq_lengthlist__16u2_p3_0[] = { +static const char _vq_lengthlist__16u2_p3_0[] = { 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7, 9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7, 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, @@ -1055,7 +1055,7 @@ static const long _vq_lengthlist__16u2_p3_0[] = { static const static_codebook _16u2_p3_0 = { 2, 81, - (long *)_vq_lengthlist__16u2_p3_0, + (char *)_vq_lengthlist__16u2_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u2_p3_0, 0 @@ -1081,7 +1081,7 @@ static const long _vq_quantlist__16u2_p4_0[] = { 16, }; -static const long _vq_lengthlist__16u2_p4_0[] = { +static const char _vq_lengthlist__16u2_p4_0[] = { 2, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11, 11, 5, 5, 5, 7, 6, 8, 7, 9, 9, 9, 9,10,10,11,11, 12,12, 5, 5, 5, 6, 6, 7, 8, 8, 9, 9, 9,10,10,11, @@ -1105,7 +1105,7 @@ static const long _vq_lengthlist__16u2_p4_0[] = { static const static_codebook _16u2_p4_0 = { 2, 289, - (long *)_vq_lengthlist__16u2_p4_0, + (char *)_vq_lengthlist__16u2_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16u2_p4_0, 0 @@ -1117,7 +1117,7 @@ static const long _vq_quantlist__16u2_p5_0[] = { 2, }; -static const long _vq_lengthlist__16u2_p5_0[] = { +static const char _vq_lengthlist__16u2_p5_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9, 9, 7, 9,10, 5, 8, 8, 7,10, 9, 7,10, 9, 5, 8, 8, 8,11, 10, 8,10,10, 7,10,10, 9, 9,12,10,12,12, 7,10,10, @@ -1128,7 +1128,7 @@ static const long _vq_lengthlist__16u2_p5_0[] = { static const static_codebook _16u2_p5_0 = { 4, 81, - (long *)_vq_lengthlist__16u2_p5_0, + (char *)_vq_lengthlist__16u2_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16u2_p5_0, 0 @@ -1148,7 +1148,7 @@ static const long _vq_quantlist__16u2_p5_1[] = { 10, }; -static const long _vq_lengthlist__16u2_p5_1[] = { +static const char _vq_lengthlist__16u2_p5_1[] = { 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, @@ -1161,7 +1161,7 @@ static const long _vq_lengthlist__16u2_p5_1[] = { static const static_codebook _16u2_p5_1 = { 2, 121, - (long *)_vq_lengthlist__16u2_p5_1, + (char *)_vq_lengthlist__16u2_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u2_p5_1, 0 @@ -1183,7 +1183,7 @@ static const long _vq_quantlist__16u2_p6_0[] = { 12, }; -static const long _vq_lengthlist__16u2_p6_0[] = { +static const char _vq_lengthlist__16u2_p6_0[] = { 1, 5, 4, 7, 7, 8, 8, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9, 9, 9,10,10,11,11, 7, 8, 8, 9, 9, 9, 9,10,10, @@ -1199,7 +1199,7 @@ static const long _vq_lengthlist__16u2_p6_0[] = { static const static_codebook _16u2_p6_0 = { 2, 169, - (long *)_vq_lengthlist__16u2_p6_0, + (char *)_vq_lengthlist__16u2_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16u2_p6_0, 0 @@ -1213,14 +1213,14 @@ static const long _vq_quantlist__16u2_p6_1[] = { 4, }; -static const long _vq_lengthlist__16u2_p6_1[] = { +static const char _vq_lengthlist__16u2_p6_1[] = { 2, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _16u2_p6_1 = { 2, 25, - (long *)_vq_lengthlist__16u2_p6_1, + (char *)_vq_lengthlist__16u2_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u2_p6_1, 0 @@ -1242,7 +1242,7 @@ static const long _vq_quantlist__16u2_p7_0[] = { 12, }; -static const long _vq_lengthlist__16u2_p7_0[] = { +static const char _vq_lengthlist__16u2_p7_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, 7, 8, 8,10, 9,10,10,10,10, @@ -1258,7 +1258,7 @@ static const long _vq_lengthlist__16u2_p7_0[] = { static const static_codebook _16u2_p7_0 = { 2, 169, - (long *)_vq_lengthlist__16u2_p7_0, + (char *)_vq_lengthlist__16u2_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__16u2_p7_0, 0 @@ -1278,7 +1278,7 @@ static const long _vq_quantlist__16u2_p7_1[] = { 10, }; -static const long _vq_lengthlist__16u2_p7_1[] = { +static const char _vq_lengthlist__16u2_p7_1[] = { 2, 5, 5, 7, 7, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, @@ -1291,7 +1291,7 @@ static const long _vq_lengthlist__16u2_p7_1[] = { static const static_codebook _16u2_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16u2_p7_1, + (char *)_vq_lengthlist__16u2_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u2_p7_1, 0 @@ -1315,7 +1315,7 @@ static const long _vq_quantlist__16u2_p8_0[] = { 14, }; -static const long _vq_lengthlist__16u2_p8_0[] = { +static const char _vq_lengthlist__16u2_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 7, 7, 9, 8,10, 9,11,11, 4, 7, 6, 9, 8, 9, 9, 9, 9,10, 9,11, 9,12, 9, 4, 6, 7, 8, 8, 9, 9, 9, 9,10,10,10,11,11,12, 7, 9, 8, @@ -1335,7 +1335,7 @@ static const long _vq_lengthlist__16u2_p8_0[] = { static const static_codebook _16u2_p8_0 = { 2, 225, - (long *)_vq_lengthlist__16u2_p8_0, + (char *)_vq_lengthlist__16u2_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16u2_p8_0, 0 @@ -1365,7 +1365,7 @@ static const long _vq_quantlist__16u2_p8_1[] = { 20, }; -static const long _vq_lengthlist__16u2_p8_1[] = { +static const char _vq_lengthlist__16u2_p8_1[] = { 3, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10, 5, 6, 6, 7, 7, 8, @@ -1398,7 +1398,7 @@ static const long _vq_lengthlist__16u2_p8_1[] = { static const static_codebook _16u2_p8_1 = { 2, 441, - (long *)_vq_lengthlist__16u2_p8_1, + (char *)_vq_lengthlist__16u2_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16u2_p8_1, 0 @@ -1422,7 +1422,7 @@ static const long _vq_quantlist__16u2_p9_0[] = { 14, }; -static const long _vq_lengthlist__16u2_p9_0[] = { +static const char _vq_lengthlist__16u2_p9_0[] = { 1, 5, 3, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -1442,7 +1442,7 @@ static const long _vq_lengthlist__16u2_p9_0[] = { static const static_codebook _16u2_p9_0 = { 2, 225, - (long *)_vq_lengthlist__16u2_p9_0, + (char *)_vq_lengthlist__16u2_p9_0, 1, -510036736, 1631393792, 4, 0, (long *)_vq_quantlist__16u2_p9_0, 0 @@ -1470,7 +1470,7 @@ static const long _vq_quantlist__16u2_p9_1[] = { 18, }; -static const long _vq_lengthlist__16u2_p9_1[] = { +static const char _vq_lengthlist__16u2_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 9, 7,10, 8,12,12,13, 13,14,14, 4, 7, 7, 9, 9, 9, 8, 9, 8,10, 9,11, 9, 14, 9,14,10,13,11, 4, 7, 7, 9, 9, 9, 9, 8, 9,10, @@ -1498,7 +1498,7 @@ static const long _vq_lengthlist__16u2_p9_1[] = { static const static_codebook _16u2_p9_1 = { 2, 361, - (long *)_vq_lengthlist__16u2_p9_1, + (char *)_vq_lengthlist__16u2_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__16u2_p9_1, 0 @@ -1556,7 +1556,7 @@ static const long _vq_quantlist__16u2_p9_2[] = { 48, }; -static const long _vq_lengthlist__16u2_p9_2[] = { +static const char _vq_lengthlist__16u2_p9_2[] = { 2, 3, 4, 4, 4, 5, 5, 6, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 7, 8, 8, 8, 8, 8, @@ -1565,13 +1565,13 @@ static const long _vq_lengthlist__16u2_p9_2[] = { static const static_codebook _16u2_p9_2 = { 1, 49, - (long *)_vq_lengthlist__16u2_p9_2, + (char *)_vq_lengthlist__16u2_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__16u2_p9_2, 0 }; -static const long _huff_lengthlist__16u2__short[] = { +static const char _huff_lengthlist__16u2__short[] = { 8,11,13,13,15,16,19,19,19,19,11, 8, 8, 9, 9,11, 13,15,19,20,14, 8, 7, 7, 8, 9,12,13,15,20,15, 9, 6, 5, 5, 7,10,12,14,18,14, 9, 7, 5, 3, 4, 7,10, @@ -1583,7 +1583,7 @@ static const long _huff_lengthlist__16u2__short[] = { static const static_codebook _huff_book__16u2__short = { 2, 100, - (long *)_huff_lengthlist__16u2__short, + (char *)_huff_lengthlist__16u2__short, 0, 0, 0, 0, 0, NULL, 0 @@ -1595,7 +1595,7 @@ static const long _vq_quantlist__8u0__p1_0[] = { 2, }; -static const long _vq_lengthlist__8u0__p1_0[] = { +static const char _vq_lengthlist__8u0__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 10,10, 5, 8, 8, 7,10,10, 8,10,10, 4, 9, 8, 8,11, 11, 8,11,11, 7,11,11,10,11,13,10,13,13, 7,11,11, @@ -1606,7 +1606,7 @@ static const long _vq_lengthlist__8u0__p1_0[] = { static const static_codebook _8u0__p1_0 = { 4, 81, - (long *)_vq_lengthlist__8u0__p1_0, + (char *)_vq_lengthlist__8u0__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u0__p1_0, 0 @@ -1618,7 +1618,7 @@ static const long _vq_quantlist__8u0__p2_0[] = { 2, }; -static const long _vq_lengthlist__8u0__p2_0[] = { +static const char _vq_lengthlist__8u0__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 6, 7, 8, 6, 7, 8, 5, 7, 7, 6, 8, 8, 7, 9, 7, 5, 7, 7, 7, 9, 9, 7, 8, 8, 6, 9, 8, 7, 7,10, 8,10,10, 6, 8, 8, @@ -1629,7 +1629,7 @@ static const long _vq_lengthlist__8u0__p2_0[] = { static const static_codebook _8u0__p2_0 = { 4, 81, - (long *)_vq_lengthlist__8u0__p2_0, + (char *)_vq_lengthlist__8u0__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u0__p2_0, 0 @@ -1643,7 +1643,7 @@ static const long _vq_quantlist__8u0__p3_0[] = { 4, }; -static const long _vq_lengthlist__8u0__p3_0[] = { +static const char _vq_lengthlist__8u0__p3_0[] = { 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, 10, 9,11,11, 8, 9, 9,11,11, 6, 8, 8,10,10, 8,10, 10,11,11, 8,10,10,11,11,10,11,11,12,12,10,11,11, @@ -1688,7 +1688,7 @@ static const long _vq_lengthlist__8u0__p3_0[] = { static const static_codebook _8u0__p3_0 = { 4, 625, - (long *)_vq_lengthlist__8u0__p3_0, + (char *)_vq_lengthlist__8u0__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u0__p3_0, 0 @@ -1702,7 +1702,7 @@ static const long _vq_quantlist__8u0__p4_0[] = { 4, }; -static const long _vq_lengthlist__8u0__p4_0[] = { +static const char _vq_lengthlist__8u0__p4_0[] = { 3, 5, 5, 8, 8, 5, 6, 7, 9, 9, 6, 7, 6, 9, 9, 9, 9, 9,10,11, 9, 9, 9,11,10, 6, 7, 7,10,10, 7, 7, 8,10,10, 7, 8, 8,10,10,10,10,10,10,11, 9,10,10, @@ -1747,7 +1747,7 @@ static const long _vq_lengthlist__8u0__p4_0[] = { static const static_codebook _8u0__p4_0 = { 4, 625, - (long *)_vq_lengthlist__8u0__p4_0, + (char *)_vq_lengthlist__8u0__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u0__p4_0, 0 @@ -1765,7 +1765,7 @@ static const long _vq_quantlist__8u0__p5_0[] = { 8, }; -static const long _vq_lengthlist__8u0__p5_0[] = { +static const char _vq_lengthlist__8u0__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 7, 8, 8, 10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 6, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, @@ -1776,7 +1776,7 @@ static const long _vq_lengthlist__8u0__p5_0[] = { static const static_codebook _8u0__p5_0 = { 2, 81, - (long *)_vq_lengthlist__8u0__p5_0, + (char *)_vq_lengthlist__8u0__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8u0__p5_0, 0 @@ -1798,7 +1798,7 @@ static const long _vq_quantlist__8u0__p6_0[] = { 12, }; -static const long _vq_lengthlist__8u0__p6_0[] = { +static const char _vq_lengthlist__8u0__p6_0[] = { 1, 4, 4, 7, 7, 9, 9,11,11,12,12,16,16, 3, 6, 6, 9, 9,11,11,12,12,13,14,18,16, 3, 6, 7, 9, 9,11, 11,13,12,14,14,17,16, 7, 9, 9,11,11,12,12,14,14, @@ -1814,7 +1814,7 @@ static const long _vq_lengthlist__8u0__p6_0[] = { static const static_codebook _8u0__p6_0 = { 2, 169, - (long *)_vq_lengthlist__8u0__p6_0, + (char *)_vq_lengthlist__8u0__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__8u0__p6_0, 0 @@ -1828,14 +1828,14 @@ static const long _vq_quantlist__8u0__p6_1[] = { 4, }; -static const long _vq_lengthlist__8u0__p6_1[] = { +static const char _vq_lengthlist__8u0__p6_1[] = { 1, 4, 4, 6, 6, 4, 6, 5, 7, 7, 4, 5, 6, 7, 7, 6, 7, 7, 7, 7, 6, 7, 7, 7, 7, }; static const static_codebook _8u0__p6_1 = { 2, 25, - (long *)_vq_lengthlist__8u0__p6_1, + (char *)_vq_lengthlist__8u0__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u0__p6_1, 0 @@ -1847,7 +1847,7 @@ static const long _vq_quantlist__8u0__p7_0[] = { 2, }; -static const long _vq_lengthlist__8u0__p7_0[] = { +static const char _vq_lengthlist__8u0__p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -1858,7 +1858,7 @@ static const long _vq_lengthlist__8u0__p7_0[] = { static const static_codebook _8u0__p7_0 = { 4, 81, - (long *)_vq_lengthlist__8u0__p7_0, + (char *)_vq_lengthlist__8u0__p7_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__8u0__p7_0, 0 @@ -1882,7 +1882,7 @@ static const long _vq_quantlist__8u0__p7_1[] = { 14, }; -static const long _vq_lengthlist__8u0__p7_1[] = { +static const char _vq_lengthlist__8u0__p7_1[] = { 1, 5, 5, 5, 5,10,10,11,11,11,11,11,11,11,11, 5, 7, 6, 8, 8, 9,10,11,11,11,11,11,11,11,11, 6, 6, 7, 9, 7,11,10,11,11,11,11,11,11,11,11, 5, 6, 6, @@ -1902,7 +1902,7 @@ static const long _vq_lengthlist__8u0__p7_1[] = { static const static_codebook _8u0__p7_1 = { 2, 225, - (long *)_vq_lengthlist__8u0__p7_1, + (char *)_vq_lengthlist__8u0__p7_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__8u0__p7_1, 0 @@ -1932,7 +1932,7 @@ static const long _vq_quantlist__8u0__p7_2[] = { 20, }; -static const long _vq_lengthlist__8u0__p7_2[] = { +static const char _vq_lengthlist__8u0__p7_2[] = { 1, 6, 5, 7, 7, 9, 9, 9, 9,10,12,12,10,11,11,10, 11,11,11,10,11, 6, 8, 8, 9, 9,10,10, 9,10,11,11, 10,11,11,11,11,10,11,11,11,11, 6, 7, 8, 9, 9, 9, @@ -1965,13 +1965,13 @@ static const long _vq_lengthlist__8u0__p7_2[] = { static const static_codebook _8u0__p7_2 = { 2, 441, - (long *)_vq_lengthlist__8u0__p7_2, + (char *)_vq_lengthlist__8u0__p7_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__8u0__p7_2, 0 }; -static const long _huff_lengthlist__8u0__single[] = { +static const char _huff_lengthlist__8u0__single[] = { 4, 7,11, 9,12, 8, 7,10, 6, 4, 5, 5, 7, 5, 6,16, 9, 5, 5, 6, 7, 7, 9,16, 7, 4, 6, 5, 7, 5, 7,17, 10, 7, 7, 8, 7, 7, 8,18, 7, 5, 6, 4, 5, 4, 5,15, @@ -1980,7 +1980,7 @@ static const long _huff_lengthlist__8u0__single[] = { static const static_codebook _huff_book__8u0__single = { 2, 64, - (long *)_huff_lengthlist__8u0__single, + (char *)_huff_lengthlist__8u0__single, 0, 0, 0, 0, 0, NULL, 0 @@ -1992,7 +1992,7 @@ static const long _vq_quantlist__8u1__p1_0[] = { 2, }; -static const long _vq_lengthlist__8u1__p1_0[] = { +static const char _vq_lengthlist__8u1__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9,10, 7, 9, 9, 5, 8, 8, 7,10, 9, 7, 9, 9, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10, 9,10,12,10,12,12, 7,10,10, @@ -2003,7 +2003,7 @@ static const long _vq_lengthlist__8u1__p1_0[] = { static const static_codebook _8u1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__8u1__p1_0, + (char *)_vq_lengthlist__8u1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u1__p1_0, 0 @@ -2015,7 +2015,7 @@ static const long _vq_quantlist__8u1__p2_0[] = { 2, }; -static const long _vq_lengthlist__8u1__p2_0[] = { +static const char _vq_lengthlist__8u1__p2_0[] = { 3, 4, 5, 5, 6, 6, 5, 6, 6, 5, 7, 6, 6, 7, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 7, 8, 8, 6, 7, 7, 6, 8, 7, 7, 7, 9, 8, 9, 9, 6, 7, 8, @@ -2026,7 +2026,7 @@ static const long _vq_lengthlist__8u1__p2_0[] = { static const static_codebook _8u1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__8u1__p2_0, + (char *)_vq_lengthlist__8u1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u1__p2_0, 0 @@ -2040,7 +2040,7 @@ static const long _vq_quantlist__8u1__p3_0[] = { 4, }; -static const long _vq_lengthlist__8u1__p3_0[] = { +static const char _vq_lengthlist__8u1__p3_0[] = { 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, 10, 9,11,11, 9, 9, 9,11,11, 6, 8, 8,10,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,12,12,10,11,11, @@ -2085,7 +2085,7 @@ static const long _vq_lengthlist__8u1__p3_0[] = { static const static_codebook _8u1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__8u1__p3_0, + (char *)_vq_lengthlist__8u1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u1__p3_0, 0 @@ -2099,7 +2099,7 @@ static const long _vq_quantlist__8u1__p4_0[] = { 4, }; -static const long _vq_lengthlist__8u1__p4_0[] = { +static const char _vq_lengthlist__8u1__p4_0[] = { 4, 5, 5, 9, 9, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 7, 8, 9,10, 7, 7, 8, 9,10, 9, 9,10,10,11, 9, 9,10, @@ -2144,7 +2144,7 @@ static const long _vq_lengthlist__8u1__p4_0[] = { static const static_codebook _8u1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__8u1__p4_0, + (char *)_vq_lengthlist__8u1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u1__p4_0, 0 @@ -2162,7 +2162,7 @@ static const long _vq_quantlist__8u1__p5_0[] = { 8, }; -static const long _vq_lengthlist__8u1__p5_0[] = { +static const char _vq_lengthlist__8u1__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 5, 8, 7, 8, 8, 10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8, @@ -2173,7 +2173,7 @@ static const long _vq_lengthlist__8u1__p5_0[] = { static const static_codebook _8u1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__8u1__p5_0, + (char *)_vq_lengthlist__8u1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p5_0, 0 @@ -2191,7 +2191,7 @@ static const long _vq_quantlist__8u1__p6_0[] = { 8, }; -static const long _vq_lengthlist__8u1__p6_0[] = { +static const char _vq_lengthlist__8u1__p6_0[] = { 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7, 8, 8, 9, 9, 6, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7, @@ -2202,7 +2202,7 @@ static const long _vq_lengthlist__8u1__p6_0[] = { static const static_codebook _8u1__p6_0 = { 2, 81, - (long *)_vq_lengthlist__8u1__p6_0, + (char *)_vq_lengthlist__8u1__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p6_0, 0 @@ -2214,7 +2214,7 @@ static const long _vq_quantlist__8u1__p7_0[] = { 2, }; -static const long _vq_lengthlist__8u1__p7_0[] = { +static const char _vq_lengthlist__8u1__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,10,10, 8, 10,10, 5, 9, 9, 7,10,10, 8,10,10, 4,10,10, 9,12, 12, 9,11,11, 7,12,11,10,11,13,10,13,13, 7,12,12, @@ -2225,7 +2225,7 @@ static const long _vq_lengthlist__8u1__p7_0[] = { static const static_codebook _8u1__p7_0 = { 4, 81, - (long *)_vq_lengthlist__8u1__p7_0, + (char *)_vq_lengthlist__8u1__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__8u1__p7_0, 0 @@ -2245,7 +2245,7 @@ static const long _vq_quantlist__8u1__p7_1[] = { 10, }; -static const long _vq_lengthlist__8u1__p7_1[] = { +static const char _vq_lengthlist__8u1__p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, @@ -2258,7 +2258,7 @@ static const long _vq_lengthlist__8u1__p7_1[] = { static const static_codebook _8u1__p7_1 = { 2, 121, - (long *)_vq_lengthlist__8u1__p7_1, + (char *)_vq_lengthlist__8u1__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p7_1, 0 @@ -2278,7 +2278,7 @@ static const long _vq_quantlist__8u1__p8_0[] = { 10, }; -static const long _vq_lengthlist__8u1__p8_0[] = { +static const char _vq_lengthlist__8u1__p8_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,11,11,13,12, 4, 6, 6, 7, 7, 9, 9,11,11,12, 12, 6, 7, 7, 9, 9,11,11,12,12,13,13, 6, 7, 7, 9, @@ -2291,7 +2291,7 @@ static const long _vq_lengthlist__8u1__p8_0[] = { static const static_codebook _8u1__p8_0 = { 2, 121, - (long *)_vq_lengthlist__8u1__p8_0, + (char *)_vq_lengthlist__8u1__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__8u1__p8_0, 0 @@ -2311,7 +2311,7 @@ static const long _vq_quantlist__8u1__p8_1[] = { 10, }; -static const long _vq_lengthlist__8u1__p8_1[] = { +static const char _vq_lengthlist__8u1__p8_1[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, @@ -2324,7 +2324,7 @@ static const long _vq_lengthlist__8u1__p8_1[] = { static const static_codebook _8u1__p8_1 = { 2, 121, - (long *)_vq_lengthlist__8u1__p8_1, + (char *)_vq_lengthlist__8u1__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p8_1, 0 @@ -2348,7 +2348,7 @@ static const long _vq_quantlist__8u1__p9_0[] = { 14, }; -static const long _vq_lengthlist__8u1__p9_0[] = { +static const char _vq_lengthlist__8u1__p9_0[] = { 1, 4, 4,11,11,11,11,11,11,11,11,11,11,11,11, 3, 11, 8,11,11,11,11,11,11,11,11,11,11,11,11, 3, 9, 9,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -2368,7 +2368,7 @@ static const long _vq_lengthlist__8u1__p9_0[] = { static const static_codebook _8u1__p9_0 = { 2, 225, - (long *)_vq_lengthlist__8u1__p9_0, + (char *)_vq_lengthlist__8u1__p9_0, 1, -514071552, 1627381760, 4, 0, (long *)_vq_quantlist__8u1__p9_0, 0 @@ -2392,7 +2392,7 @@ static const long _vq_quantlist__8u1__p9_1[] = { 14, }; -static const long _vq_lengthlist__8u1__p9_1[] = { +static const char _vq_lengthlist__8u1__p9_1[] = { 1, 4, 4, 7, 7, 9, 9, 7, 7, 8, 8,10,10,11,11, 4, 7, 7, 9, 9,10,10, 8, 8,10,10,10,11,10,11, 4, 7, 7, 9, 9,10,10, 8, 8,10, 9,11,11,11,11, 7, 9, 9, @@ -2412,7 +2412,7 @@ static const long _vq_lengthlist__8u1__p9_1[] = { static const static_codebook _8u1__p9_1 = { 2, 225, - (long *)_vq_lengthlist__8u1__p9_1, + (char *)_vq_lengthlist__8u1__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__8u1__p9_1, 0 @@ -2438,7 +2438,7 @@ static const long _vq_quantlist__8u1__p9_2[] = { 16, }; -static const long _vq_lengthlist__8u1__p9_2[] = { +static const char _vq_lengthlist__8u1__p9_2[] = { 2, 5, 4, 6, 6, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, @@ -2462,13 +2462,13 @@ static const long _vq_lengthlist__8u1__p9_2[] = { static const static_codebook _8u1__p9_2 = { 2, 289, - (long *)_vq_lengthlist__8u1__p9_2, + (char *)_vq_lengthlist__8u1__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__8u1__p9_2, 0 }; -static const long _huff_lengthlist__8u1__single[] = { +static const char _huff_lengthlist__8u1__single[] = { 4, 7,13, 9,15, 9,16, 8,10,13, 7, 5, 8, 6, 9, 7, 10, 7,10,11,11, 6, 7, 8, 8, 9, 9, 9,12,16, 8, 5, 8, 6, 8, 6, 9, 7,10,12,11, 7, 7, 7, 6, 7, 7, 7, @@ -2480,13 +2480,13 @@ static const long _huff_lengthlist__8u1__single[] = { static const static_codebook _huff_book__8u1__single = { 2, 100, - (long *)_huff_lengthlist__8u1__single, + (char *)_huff_lengthlist__8u1__single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u0__long[] = { +static const char _huff_lengthlist__44u0__long[] = { 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16, 13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18, 15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17, @@ -2495,7 +2495,7 @@ static const long _huff_lengthlist__44u0__long[] = { static const static_codebook _huff_book__44u0__long = { 2, 64, - (long *)_huff_lengthlist__44u0__long, + (char *)_huff_lengthlist__44u0__long, 0, 0, 0, 0, 0, NULL, 0 @@ -2507,7 +2507,7 @@ static const long _vq_quantlist__44u0__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u0__p1_0[] = { +static const char _vq_lengthlist__44u0__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, 10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11, @@ -2518,7 +2518,7 @@ static const long _vq_lengthlist__44u0__p1_0[] = { static const static_codebook _44u0__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u0__p1_0, + (char *)_vq_lengthlist__44u0__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u0__p1_0, 0 @@ -2530,7 +2530,7 @@ static const long _vq_quantlist__44u0__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u0__p2_0[] = { +static const char _vq_lengthlist__44u0__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -2541,7 +2541,7 @@ static const long _vq_lengthlist__44u0__p2_0[] = { static const static_codebook _44u0__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u0__p2_0, + (char *)_vq_lengthlist__44u0__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u0__p2_0, 0 @@ -2555,7 +2555,7 @@ static const long _vq_quantlist__44u0__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u0__p3_0[] = { +static const char _vq_lengthlist__44u0__p3_0[] = { 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11, @@ -2600,7 +2600,7 @@ static const long _vq_lengthlist__44u0__p3_0[] = { static const static_codebook _44u0__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u0__p3_0, + (char *)_vq_lengthlist__44u0__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u0__p3_0, 0 @@ -2614,7 +2614,7 @@ static const long _vq_quantlist__44u0__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u0__p4_0[] = { +static const char _vq_lengthlist__44u0__p4_0[] = { 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7, 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10, @@ -2659,7 +2659,7 @@ static const long _vq_lengthlist__44u0__p4_0[] = { static const static_codebook _44u0__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u0__p4_0, + (char *)_vq_lengthlist__44u0__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u0__p4_0, 0 @@ -2677,7 +2677,7 @@ static const long _vq_quantlist__44u0__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u0__p5_0[] = { +static const char _vq_lengthlist__44u0__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 8, 8, @@ -2688,7 +2688,7 @@ static const long _vq_lengthlist__44u0__p5_0[] = { static const static_codebook _44u0__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u0__p5_0, + (char *)_vq_lengthlist__44u0__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u0__p5_0, 0 @@ -2710,7 +2710,7 @@ static const long _vq_quantlist__44u0__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u0__p6_0[] = { +static const char _vq_lengthlist__44u0__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5, 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -2726,7 +2726,7 @@ static const long _vq_lengthlist__44u0__p6_0[] = { static const static_codebook _44u0__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u0__p6_0, + (char *)_vq_lengthlist__44u0__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u0__p6_0, 0 @@ -2740,14 +2740,14 @@ static const long _vq_quantlist__44u0__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u0__p6_1[] = { +static const char _vq_lengthlist__44u0__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 5, 6, 6, 6, 6, }; static const static_codebook _44u0__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u0__p6_1, + (char *)_vq_lengthlist__44u0__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u0__p6_1, 0 @@ -2761,7 +2761,7 @@ static const long _vq_quantlist__44u0__p7_0[] = { 4, }; -static const long _vq_lengthlist__44u0__p7_0[] = { +static const char _vq_lengthlist__44u0__p7_0[] = { 1, 4, 4,11,11, 9,11,11,11,11,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -2806,7 +2806,7 @@ static const long _vq_lengthlist__44u0__p7_0[] = { static const static_codebook _44u0__p7_0 = { 4, 625, - (long *)_vq_lengthlist__44u0__p7_0, + (char *)_vq_lengthlist__44u0__p7_0, 1, -518709248, 1626677248, 3, 0, (long *)_vq_quantlist__44u0__p7_0, 0 @@ -2828,7 +2828,7 @@ static const long _vq_quantlist__44u0__p7_1[] = { 12, }; -static const long _vq_lengthlist__44u0__p7_1[] = { +static const char _vq_lengthlist__44u0__p7_1[] = { 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7, 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7, 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10, @@ -2844,7 +2844,7 @@ static const long _vq_lengthlist__44u0__p7_1[] = { static const static_codebook _44u0__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44u0__p7_1, + (char *)_vq_lengthlist__44u0__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44u0__p7_1, 0 @@ -2866,7 +2866,7 @@ static const long _vq_quantlist__44u0__p7_2[] = { 12, }; -static const long _vq_lengthlist__44u0__p7_2[] = { +static const char _vq_lengthlist__44u0__p7_2[] = { 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8, @@ -2882,13 +2882,13 @@ static const long _vq_lengthlist__44u0__p7_2[] = { static const static_codebook _44u0__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44u0__p7_2, + (char *)_vq_lengthlist__44u0__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44u0__p7_2, 0 }; -static const long _huff_lengthlist__44u0__short[] = { +static const char _huff_lengthlist__44u0__short[] = { 12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16, 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16, 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16, @@ -2897,13 +2897,13 @@ static const long _huff_lengthlist__44u0__short[] = { static const static_codebook _huff_book__44u0__short = { 2, 64, - (long *)_huff_lengthlist__44u0__short, + (char *)_huff_lengthlist__44u0__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u1__long[] = { +static const char _huff_lengthlist__44u1__long[] = { 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16, 13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18, 15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17, @@ -2912,7 +2912,7 @@ static const long _huff_lengthlist__44u1__long[] = { static const static_codebook _huff_book__44u1__long = { 2, 64, - (long *)_huff_lengthlist__44u1__long, + (char *)_huff_lengthlist__44u1__long, 0, 0, 0, 0, 0, NULL, 0 @@ -2924,7 +2924,7 @@ static const long _vq_quantlist__44u1__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u1__p1_0[] = { +static const char _vq_lengthlist__44u1__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, 10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11, @@ -2935,7 +2935,7 @@ static const long _vq_lengthlist__44u1__p1_0[] = { static const static_codebook _44u1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u1__p1_0, + (char *)_vq_lengthlist__44u1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u1__p1_0, 0 @@ -2947,7 +2947,7 @@ static const long _vq_quantlist__44u1__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u1__p2_0[] = { +static const char _vq_lengthlist__44u1__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -2958,7 +2958,7 @@ static const long _vq_lengthlist__44u1__p2_0[] = { static const static_codebook _44u1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u1__p2_0, + (char *)_vq_lengthlist__44u1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u1__p2_0, 0 @@ -2972,7 +2972,7 @@ static const long _vq_quantlist__44u1__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u1__p3_0[] = { +static const char _vq_lengthlist__44u1__p3_0[] = { 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11, @@ -3017,7 +3017,7 @@ static const long _vq_lengthlist__44u1__p3_0[] = { static const static_codebook _44u1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u1__p3_0, + (char *)_vq_lengthlist__44u1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u1__p3_0, 0 @@ -3031,7 +3031,7 @@ static const long _vq_quantlist__44u1__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u1__p4_0[] = { +static const char _vq_lengthlist__44u1__p4_0[] = { 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7, 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10, @@ -3076,7 +3076,7 @@ static const long _vq_lengthlist__44u1__p4_0[] = { static const static_codebook _44u1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u1__p4_0, + (char *)_vq_lengthlist__44u1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u1__p4_0, 0 @@ -3094,7 +3094,7 @@ static const long _vq_quantlist__44u1__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u1__p5_0[] = { +static const char _vq_lengthlist__44u1__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 8, 8, @@ -3105,7 +3105,7 @@ static const long _vq_lengthlist__44u1__p5_0[] = { static const static_codebook _44u1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u1__p5_0, + (char *)_vq_lengthlist__44u1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u1__p5_0, 0 @@ -3127,7 +3127,7 @@ static const long _vq_quantlist__44u1__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u1__p6_0[] = { +static const char _vq_lengthlist__44u1__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5, 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -3143,7 +3143,7 @@ static const long _vq_lengthlist__44u1__p6_0[] = { static const static_codebook _44u1__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u1__p6_0, + (char *)_vq_lengthlist__44u1__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u1__p6_0, 0 @@ -3157,14 +3157,14 @@ static const long _vq_quantlist__44u1__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u1__p6_1[] = { +static const char _vq_lengthlist__44u1__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 5, 6, 6, 6, 6, }; static const static_codebook _44u1__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u1__p6_1, + (char *)_vq_lengthlist__44u1__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u1__p6_1, 0 @@ -3180,7 +3180,7 @@ static const long _vq_quantlist__44u1__p7_0[] = { 6, }; -static const long _vq_lengthlist__44u1__p7_0[] = { +static const char _vq_lengthlist__44u1__p7_0[] = { 1, 3, 2, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -3189,7 +3189,7 @@ static const long _vq_lengthlist__44u1__p7_0[] = { static const static_codebook _44u1__p7_0 = { 2, 49, - (long *)_vq_lengthlist__44u1__p7_0, + (char *)_vq_lengthlist__44u1__p7_0, 1, -518017024, 1626677248, 3, 0, (long *)_vq_quantlist__44u1__p7_0, 0 @@ -3211,7 +3211,7 @@ static const long _vq_quantlist__44u1__p7_1[] = { 12, }; -static const long _vq_lengthlist__44u1__p7_1[] = { +static const char _vq_lengthlist__44u1__p7_1[] = { 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7, 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7, 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10, @@ -3227,7 +3227,7 @@ static const long _vq_lengthlist__44u1__p7_1[] = { static const static_codebook _44u1__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44u1__p7_1, + (char *)_vq_lengthlist__44u1__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44u1__p7_1, 0 @@ -3249,7 +3249,7 @@ static const long _vq_quantlist__44u1__p7_2[] = { 12, }; -static const long _vq_lengthlist__44u1__p7_2[] = { +static const char _vq_lengthlist__44u1__p7_2[] = { 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8, @@ -3265,13 +3265,13 @@ static const long _vq_lengthlist__44u1__p7_2[] = { static const static_codebook _44u1__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44u1__p7_2, + (char *)_vq_lengthlist__44u1__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44u1__p7_2, 0 }; -static const long _huff_lengthlist__44u1__short[] = { +static const char _huff_lengthlist__44u1__short[] = { 12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16, 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16, 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16, @@ -3280,13 +3280,13 @@ static const long _huff_lengthlist__44u1__short[] = { static const static_codebook _huff_book__44u1__short = { 2, 64, - (long *)_huff_lengthlist__44u1__short, + (char *)_huff_lengthlist__44u1__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u2__long[] = { +static const char _huff_lengthlist__44u2__long[] = { 5, 9,14,12,15,13,10,13, 7, 4, 5, 6, 8, 7, 8,12, 13, 4, 3, 5, 5, 6, 9,15,12, 6, 5, 6, 6, 6, 7,14, 14, 7, 4, 6, 4, 6, 8,15,12, 6, 6, 5, 5, 5, 6,14, @@ -3295,7 +3295,7 @@ static const long _huff_lengthlist__44u2__long[] = { static const static_codebook _huff_book__44u2__long = { 2, 64, - (long *)_huff_lengthlist__44u2__long, + (char *)_huff_lengthlist__44u2__long, 0, 0, 0, 0, 0, NULL, 0 @@ -3307,7 +3307,7 @@ static const long _vq_quantlist__44u2__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u2__p1_0[] = { +static const char _vq_lengthlist__44u2__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,11,11,11,13,14,11,13,13, 7,11,11, @@ -3318,7 +3318,7 @@ static const long _vq_lengthlist__44u2__p1_0[] = { static const static_codebook _44u2__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u2__p1_0, + (char *)_vq_lengthlist__44u2__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u2__p1_0, 0 @@ -3330,7 +3330,7 @@ static const long _vq_quantlist__44u2__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u2__p2_0[] = { +static const char _vq_lengthlist__44u2__p2_0[] = { 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -3341,7 +3341,7 @@ static const long _vq_lengthlist__44u2__p2_0[] = { static const static_codebook _44u2__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u2__p2_0, + (char *)_vq_lengthlist__44u2__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u2__p2_0, 0 @@ -3355,7 +3355,7 @@ static const long _vq_quantlist__44u2__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u2__p3_0[] = { +static const char _vq_lengthlist__44u2__p3_0[] = { 2, 4, 4, 7, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, 9, 9,12,11, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11, @@ -3400,7 +3400,7 @@ static const long _vq_lengthlist__44u2__p3_0[] = { static const static_codebook _44u2__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u2__p3_0, + (char *)_vq_lengthlist__44u2__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u2__p3_0, 0 @@ -3414,7 +3414,7 @@ static const long _vq_quantlist__44u2__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u2__p4_0[] = { +static const char _vq_lengthlist__44u2__p4_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10, @@ -3459,7 +3459,7 @@ static const long _vq_lengthlist__44u2__p4_0[] = { static const static_codebook _44u2__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u2__p4_0, + (char *)_vq_lengthlist__44u2__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u2__p4_0, 0 @@ -3477,7 +3477,7 @@ static const long _vq_quantlist__44u2__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u2__p5_0[] = { +static const char _vq_lengthlist__44u2__p5_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 8, 8, 8, 10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8, @@ -3488,7 +3488,7 @@ static const long _vq_lengthlist__44u2__p5_0[] = { static const static_codebook _44u2__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u2__p5_0, + (char *)_vq_lengthlist__44u2__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u2__p5_0, 0 @@ -3510,7 +3510,7 @@ static const long _vq_quantlist__44u2__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u2__p6_0[] = { +static const char _vq_lengthlist__44u2__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11,14,13, 4, 6, 5, 8, 8, 9, 9,11,10,12,11,15,14, 4, 5, 6, 8, 8, 9, 9,11,11,11,11,14,14, 6, 8, 8,10, 9,11,11,11,11, @@ -3526,7 +3526,7 @@ static const long _vq_lengthlist__44u2__p6_0[] = { static const static_codebook _44u2__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u2__p6_0, + (char *)_vq_lengthlist__44u2__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u2__p6_0, 0 @@ -3540,14 +3540,14 @@ static const long _vq_quantlist__44u2__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u2__p6_1[] = { +static const char _vq_lengthlist__44u2__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 6, 5, 6, 6, 5, 5, 6, 6, 6, }; static const static_codebook _44u2__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u2__p6_1, + (char *)_vq_lengthlist__44u2__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u2__p6_1, 0 @@ -3565,7 +3565,7 @@ static const long _vq_quantlist__44u2__p7_0[] = { 8, }; -static const long _vq_lengthlist__44u2__p7_0[] = { +static const char _vq_lengthlist__44u2__p7_0[] = { 1, 3, 2,12,12,12,12,12,12, 4,12,12,12,12,12,12, 12,12, 5,12,12,12,12,12,12,12,12,12,12,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -3576,7 +3576,7 @@ static const long _vq_lengthlist__44u2__p7_0[] = { static const static_codebook _44u2__p7_0 = { 2, 81, - (long *)_vq_lengthlist__44u2__p7_0, + (char *)_vq_lengthlist__44u2__p7_0, 1, -516612096, 1626677248, 4, 0, (long *)_vq_quantlist__44u2__p7_0, 0 @@ -3598,7 +3598,7 @@ static const long _vq_quantlist__44u2__p7_1[] = { 12, }; -static const long _vq_lengthlist__44u2__p7_1[] = { +static const char _vq_lengthlist__44u2__p7_1[] = { 1, 4, 4, 7, 6, 7, 6, 8, 7, 9, 7, 9, 8, 4, 7, 6, 8, 8, 9, 8,10, 9,10,10,11,11, 4, 7, 7, 8, 8, 8, 8, 9,10,11,11,11,11, 6, 8, 8,10,10,10,10,11,11, @@ -3614,7 +3614,7 @@ static const long _vq_lengthlist__44u2__p7_1[] = { static const static_codebook _44u2__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44u2__p7_1, + (char *)_vq_lengthlist__44u2__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44u2__p7_1, 0 @@ -3636,7 +3636,7 @@ static const long _vq_quantlist__44u2__p7_2[] = { 12, }; -static const long _vq_lengthlist__44u2__p7_2[] = { +static const char _vq_lengthlist__44u2__p7_2[] = { 2, 5, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 8, 8, 8, 8, 8, @@ -3652,13 +3652,13 @@ static const long _vq_lengthlist__44u2__p7_2[] = { static const static_codebook _44u2__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44u2__p7_2, + (char *)_vq_lengthlist__44u2__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44u2__p7_2, 0 }; -static const long _huff_lengthlist__44u2__short[] = { +static const char _huff_lengthlist__44u2__short[] = { 13,15,17,17,15,15,12,17,11, 9, 7,10,10, 9,12,17, 10, 6, 3, 6, 5, 7,10,17,15,10, 6, 9, 8, 9,11,17, 15, 8, 4, 7, 3, 5, 9,16,16,10, 5, 8, 4, 5, 8,16, @@ -3667,13 +3667,13 @@ static const long _huff_lengthlist__44u2__short[] = { static const static_codebook _huff_book__44u2__short = { 2, 64, - (long *)_huff_lengthlist__44u2__short, + (char *)_huff_lengthlist__44u2__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u3__long[] = { +static const char _huff_lengthlist__44u3__long[] = { 6, 9,13,12,14,11,10,13, 8, 4, 5, 7, 8, 7, 8,12, 11, 4, 3, 5, 5, 7, 9,14,11, 6, 5, 6, 6, 6, 7,13, 13, 7, 5, 6, 4, 5, 7,14,11, 7, 6, 6, 5, 5, 6,13, @@ -3682,7 +3682,7 @@ static const long _huff_lengthlist__44u3__long[] = { static const static_codebook _huff_book__44u3__long = { 2, 64, - (long *)_huff_lengthlist__44u3__long, + (char *)_huff_lengthlist__44u3__long, 0, 0, 0, 0, 0, NULL, 0 @@ -3694,7 +3694,7 @@ static const long _vq_quantlist__44u3__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u3__p1_0[] = { +static const char _vq_lengthlist__44u3__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,11,11,11,13,14,11,14,14, 8,11,11, @@ -3705,7 +3705,7 @@ static const long _vq_lengthlist__44u3__p1_0[] = { static const static_codebook _44u3__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u3__p1_0, + (char *)_vq_lengthlist__44u3__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u3__p1_0, 0 @@ -3717,7 +3717,7 @@ static const long _vq_quantlist__44u3__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u3__p2_0[] = { +static const char _vq_lengthlist__44u3__p2_0[] = { 2, 5, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 7, 8, 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -3728,7 +3728,7 @@ static const long _vq_lengthlist__44u3__p2_0[] = { static const static_codebook _44u3__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u3__p2_0, + (char *)_vq_lengthlist__44u3__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u3__p2_0, 0 @@ -3742,7 +3742,7 @@ static const long _vq_quantlist__44u3__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u3__p3_0[] = { +static const char _vq_lengthlist__44u3__p3_0[] = { 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, 9, 9,12,12, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11, @@ -3787,7 +3787,7 @@ static const long _vq_lengthlist__44u3__p3_0[] = { static const static_codebook _44u3__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u3__p3_0, + (char *)_vq_lengthlist__44u3__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u3__p3_0, 0 @@ -3801,7 +3801,7 @@ static const long _vq_quantlist__44u3__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u3__p4_0[] = { +static const char _vq_lengthlist__44u3__p4_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10, @@ -3846,7 +3846,7 @@ static const long _vq_lengthlist__44u3__p4_0[] = { static const static_codebook _44u3__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u3__p4_0, + (char *)_vq_lengthlist__44u3__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u3__p4_0, 0 @@ -3864,7 +3864,7 @@ static const long _vq_quantlist__44u3__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u3__p5_0[] = { +static const char _vq_lengthlist__44u3__p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8, 10,10, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8, 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,10, 7, 8, 8, @@ -3875,7 +3875,7 @@ static const long _vq_lengthlist__44u3__p5_0[] = { static const static_codebook _44u3__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u3__p5_0, + (char *)_vq_lengthlist__44u3__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u3__p5_0, 0 @@ -3897,7 +3897,7 @@ static const long _vq_quantlist__44u3__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u3__p6_0[] = { +static const char _vq_lengthlist__44u3__p6_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,13,14, 4, 6, 5, 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -3913,7 +3913,7 @@ static const long _vq_lengthlist__44u3__p6_0[] = { static const static_codebook _44u3__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u3__p6_0, + (char *)_vq_lengthlist__44u3__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u3__p6_0, 0 @@ -3927,14 +3927,14 @@ static const long _vq_quantlist__44u3__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u3__p6_1[] = { +static const char _vq_lengthlist__44u3__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 6, 5, 6, 6, 5, 5, 6, 6, 6, }; static const static_codebook _44u3__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u3__p6_1, + (char *)_vq_lengthlist__44u3__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u3__p6_1, 0 @@ -3952,7 +3952,7 @@ static const long _vq_quantlist__44u3__p7_0[] = { 8, }; -static const long _vq_lengthlist__44u3__p7_0[] = { +static const char _vq_lengthlist__44u3__p7_0[] = { 1, 3, 3,10,10,10,10,10,10, 4,10,10,10,10,10,10, 10,10, 4,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -3963,7 +3963,7 @@ static const long _vq_lengthlist__44u3__p7_0[] = { static const static_codebook _44u3__p7_0 = { 2, 81, - (long *)_vq_lengthlist__44u3__p7_0, + (char *)_vq_lengthlist__44u3__p7_0, 1, -515907584, 1627381760, 4, 0, (long *)_vq_quantlist__44u3__p7_0, 0 @@ -3987,7 +3987,7 @@ static const long _vq_quantlist__44u3__p7_1[] = { 14, }; -static const long _vq_lengthlist__44u3__p7_1[] = { +static const char _vq_lengthlist__44u3__p7_1[] = { 1, 4, 4, 6, 6, 7, 6, 8, 7, 9, 8,10, 9,11,11, 4, 7, 7, 8, 7, 9, 9,10,10,11,11,11,11,12,12, 4, 7, 7, 7, 7, 9, 9,10,10,11,11,12,12,12,11, 6, 8, 8, @@ -4007,7 +4007,7 @@ static const long _vq_lengthlist__44u3__p7_1[] = { static const static_codebook _44u3__p7_1 = { 2, 225, - (long *)_vq_lengthlist__44u3__p7_1, + (char *)_vq_lengthlist__44u3__p7_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u3__p7_1, 0 @@ -4033,7 +4033,7 @@ static const long _vq_quantlist__44u3__p7_2[] = { 16, }; -static const long _vq_lengthlist__44u3__p7_2[] = { +static const char _vq_lengthlist__44u3__p7_2[] = { 2, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 10,10, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, @@ -4057,13 +4057,13 @@ static const long _vq_lengthlist__44u3__p7_2[] = { static const static_codebook _44u3__p7_2 = { 2, 289, - (long *)_vq_lengthlist__44u3__p7_2, + (char *)_vq_lengthlist__44u3__p7_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u3__p7_2, 0 }; -static const long _huff_lengthlist__44u3__short[] = { +static const char _huff_lengthlist__44u3__short[] = { 14,14,14,15,13,15,12,16,10, 8, 7, 9, 9, 8,12,16, 10, 5, 4, 6, 5, 6, 9,16,14, 8, 6, 8, 7, 8,10,16, 14, 7, 4, 6, 3, 5, 8,16,15, 9, 5, 7, 4, 4, 7,16, @@ -4072,13 +4072,13 @@ static const long _huff_lengthlist__44u3__short[] = { static const static_codebook _huff_book__44u3__short = { 2, 64, - (long *)_huff_lengthlist__44u3__short, + (char *)_huff_lengthlist__44u3__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u4__long[] = { +static const char _huff_lengthlist__44u4__long[] = { 3, 8,12,12,13,12,11,13, 5, 4, 6, 7, 8, 8, 9,13, 9, 5, 4, 5, 5, 7, 9,13, 9, 6, 5, 6, 6, 7, 8,12, 12, 7, 5, 6, 4, 5, 8,13,11, 7, 6, 6, 5, 5, 6,12, @@ -4087,7 +4087,7 @@ static const long _huff_lengthlist__44u4__long[] = { static const static_codebook _huff_book__44u4__long = { 2, 64, - (long *)_huff_lengthlist__44u4__long, + (char *)_huff_lengthlist__44u4__long, 0, 0, 0, 0, 0, NULL, 0 @@ -4099,7 +4099,7 @@ static const long _vq_quantlist__44u4__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u4__p1_0[] = { +static const char _vq_lengthlist__44u4__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,11,11,11,13,14,11,15,14, 8,11,11, @@ -4110,7 +4110,7 @@ static const long _vq_lengthlist__44u4__p1_0[] = { static const static_codebook _44u4__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u4__p1_0, + (char *)_vq_lengthlist__44u4__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u4__p1_0, 0 @@ -4122,7 +4122,7 @@ static const long _vq_quantlist__44u4__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u4__p2_0[] = { +static const char _vq_lengthlist__44u4__p2_0[] = { 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -4133,7 +4133,7 @@ static const long _vq_lengthlist__44u4__p2_0[] = { static const static_codebook _44u4__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u4__p2_0, + (char *)_vq_lengthlist__44u4__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u4__p2_0, 0 @@ -4147,7 +4147,7 @@ static const long _vq_quantlist__44u4__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u4__p3_0[] = { +static const char _vq_lengthlist__44u4__p3_0[] = { 2, 4, 4, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, 10, 9,12,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,12,11,14,14, 9,10,11, @@ -4192,7 +4192,7 @@ static const long _vq_lengthlist__44u4__p3_0[] = { static const static_codebook _44u4__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u4__p3_0, + (char *)_vq_lengthlist__44u4__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u4__p3_0, 0 @@ -4206,7 +4206,7 @@ static const long _vq_quantlist__44u4__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u4__p4_0[] = { +static const char _vq_lengthlist__44u4__p4_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10, @@ -4251,7 +4251,7 @@ static const long _vq_lengthlist__44u4__p4_0[] = { static const static_codebook _44u4__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u4__p4_0, + (char *)_vq_lengthlist__44u4__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u4__p4_0, 0 @@ -4269,7 +4269,7 @@ static const long _vq_quantlist__44u4__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u4__p5_0[] = { +static const char _vq_lengthlist__44u4__p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8, 10, 9, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8, 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,11, 7, 8, 8, @@ -4280,7 +4280,7 @@ static const long _vq_lengthlist__44u4__p5_0[] = { static const static_codebook _44u4__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u4__p5_0, + (char *)_vq_lengthlist__44u4__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u4__p5_0, 0 @@ -4302,7 +4302,7 @@ static const long _vq_quantlist__44u4__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u4__p6_0[] = { +static const char _vq_lengthlist__44u4__p6_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,11,10,13,13, 4, 6, 5, 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -4318,7 +4318,7 @@ static const long _vq_lengthlist__44u4__p6_0[] = { static const static_codebook _44u4__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u4__p6_0, + (char *)_vq_lengthlist__44u4__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u4__p6_0, 0 @@ -4332,14 +4332,14 @@ static const long _vq_quantlist__44u4__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u4__p6_1[] = { +static const char _vq_lengthlist__44u4__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 6, 5, 6, 6, 5, 5, 6, 6, 6, }; static const static_codebook _44u4__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u4__p6_1, + (char *)_vq_lengthlist__44u4__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u4__p6_1, 0 @@ -4361,7 +4361,7 @@ static const long _vq_quantlist__44u4__p7_0[] = { 12, }; -static const long _vq_lengthlist__44u4__p7_0[] = { +static const char _vq_lengthlist__44u4__p7_0[] = { 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 3,12,11, 12,12,12,12,12,12,12,12,12,12, 4,11,10,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -4377,7 +4377,7 @@ static const long _vq_lengthlist__44u4__p7_0[] = { static const static_codebook _44u4__p7_0 = { 2, 169, - (long *)_vq_lengthlist__44u4__p7_0, + (char *)_vq_lengthlist__44u4__p7_0, 1, -514332672, 1627381760, 4, 0, (long *)_vq_quantlist__44u4__p7_0, 0 @@ -4401,7 +4401,7 @@ static const long _vq_quantlist__44u4__p7_1[] = { 14, }; -static const long _vq_lengthlist__44u4__p7_1[] = { +static const char _vq_lengthlist__44u4__p7_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 8,10, 8,10, 9,11,11, 4, 7, 6, 8, 7, 9, 9,10,10,11,10,11,10,12,10, 4, 6, 7, 8, 8, 9, 9,10,10,11,11,11,11,12,12, 6, 8, 8, @@ -4421,7 +4421,7 @@ static const long _vq_lengthlist__44u4__p7_1[] = { static const static_codebook _44u4__p7_1 = { 2, 225, - (long *)_vq_lengthlist__44u4__p7_1, + (char *)_vq_lengthlist__44u4__p7_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u4__p7_1, 0 @@ -4447,7 +4447,7 @@ static const long _vq_quantlist__44u4__p7_2[] = { 16, }; -static const long _vq_lengthlist__44u4__p7_2[] = { +static const char _vq_lengthlist__44u4__p7_2[] = { 2, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, @@ -4471,13 +4471,13 @@ static const long _vq_lengthlist__44u4__p7_2[] = { static const static_codebook _44u4__p7_2 = { 2, 289, - (long *)_vq_lengthlist__44u4__p7_2, + (char *)_vq_lengthlist__44u4__p7_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u4__p7_2, 0 }; -static const long _huff_lengthlist__44u4__short[] = { +static const char _huff_lengthlist__44u4__short[] = { 14,17,15,17,16,14,13,16,10, 7, 7,10,13,10,15,16, 9, 4, 4, 6, 5, 7, 9,16,12, 8, 7, 8, 8, 8,11,16, 14, 7, 4, 6, 3, 5, 8,15,13, 8, 5, 7, 4, 5, 7,16, @@ -4486,13 +4486,13 @@ static const long _huff_lengthlist__44u4__short[] = { static const static_codebook _huff_book__44u4__short = { 2, 64, - (long *)_huff_lengthlist__44u4__short, + (char *)_huff_lengthlist__44u4__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u5__long[] = { +static const char _huff_lengthlist__44u5__long[] = { 3, 8,13,12,14,12,16,11,13,14, 5, 4, 5, 6, 7, 8, 10, 9,12,15,10, 5, 5, 5, 6, 8, 9, 9,13,15,10, 5, 5, 6, 6, 7, 8, 8,11,13,12, 7, 5, 6, 4, 6, 7, 7, @@ -4504,7 +4504,7 @@ static const long _huff_lengthlist__44u5__long[] = { static const static_codebook _huff_book__44u5__long = { 2, 100, - (long *)_huff_lengthlist__44u5__long, + (char *)_huff_lengthlist__44u5__long, 0, 0, 0, 0, 0, NULL, 0 @@ -4516,7 +4516,7 @@ static const long _vq_quantlist__44u5__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u5__p1_0[] = { +static const char _vq_lengthlist__44u5__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10, 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, @@ -4527,7 +4527,7 @@ static const long _vq_lengthlist__44u5__p1_0[] = { static const static_codebook _44u5__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u5__p1_0, + (char *)_vq_lengthlist__44u5__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u5__p1_0, 0 @@ -4539,7 +4539,7 @@ static const long _vq_quantlist__44u5__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u5__p2_0[] = { +static const char _vq_lengthlist__44u5__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7, @@ -4550,7 +4550,7 @@ static const long _vq_lengthlist__44u5__p2_0[] = { static const static_codebook _44u5__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u5__p2_0, + (char *)_vq_lengthlist__44u5__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u5__p2_0, 0 @@ -4564,7 +4564,7 @@ static const long _vq_quantlist__44u5__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u5__p3_0[] = { +static const char _vq_lengthlist__44u5__p3_0[] = { 2, 4, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 10, 9,13,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11, @@ -4609,7 +4609,7 @@ static const long _vq_lengthlist__44u5__p3_0[] = { static const static_codebook _44u5__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u5__p3_0, + (char *)_vq_lengthlist__44u5__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u5__p3_0, 0 @@ -4623,7 +4623,7 @@ static const long _vq_quantlist__44u5__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u5__p4_0[] = { +static const char _vq_lengthlist__44u5__p4_0[] = { 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 6, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10, @@ -4668,7 +4668,7 @@ static const long _vq_lengthlist__44u5__p4_0[] = { static const static_codebook _44u5__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u5__p4_0, + (char *)_vq_lengthlist__44u5__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u5__p4_0, 0 @@ -4686,7 +4686,7 @@ static const long _vq_quantlist__44u5__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u5__p5_0[] = { +static const char _vq_lengthlist__44u5__p5_0[] = { 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8, 11,10, 3, 5, 5, 7, 8, 8, 8,10,11, 6, 8, 7,10, 9, 10,10,11,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8, @@ -4697,7 +4697,7 @@ static const long _vq_lengthlist__44u5__p5_0[] = { static const static_codebook _44u5__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u5__p5_0, + (char *)_vq_lengthlist__44u5__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p5_0, 0 @@ -4715,7 +4715,7 @@ static const long _vq_quantlist__44u5__p6_0[] = { 8, }; -static const long _vq_lengthlist__44u5__p6_0[] = { +static const char _vq_lengthlist__44u5__p6_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7, @@ -4726,7 +4726,7 @@ static const long _vq_lengthlist__44u5__p6_0[] = { static const static_codebook _44u5__p6_0 = { 2, 81, - (long *)_vq_lengthlist__44u5__p6_0, + (char *)_vq_lengthlist__44u5__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p6_0, 0 @@ -4738,7 +4738,7 @@ static const long _vq_quantlist__44u5__p7_0[] = { 2, }; -static const long _vq_lengthlist__44u5__p7_0[] = { +static const char _vq_lengthlist__44u5__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,11,10, 7, 11,10, 5, 9, 9, 7,10,10, 8,10,11, 4, 9, 9, 9,12, 12, 9,12,12, 8,12,12,11,12,12,10,12,13, 7,12,12, @@ -4749,7 +4749,7 @@ static const long _vq_lengthlist__44u5__p7_0[] = { static const static_codebook _44u5__p7_0 = { 4, 81, - (long *)_vq_lengthlist__44u5__p7_0, + (char *)_vq_lengthlist__44u5__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u5__p7_0, 0 @@ -4769,7 +4769,7 @@ static const long _vq_quantlist__44u5__p7_1[] = { 10, }; -static const long _vq_lengthlist__44u5__p7_1[] = { +static const char _vq_lengthlist__44u5__p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7, 8, 8, 9, 8, 8, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 8, 9, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 6, 7, 7, 8, @@ -4782,7 +4782,7 @@ static const long _vq_lengthlist__44u5__p7_1[] = { static const static_codebook _44u5__p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u5__p7_1, + (char *)_vq_lengthlist__44u5__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p7_1, 0 @@ -4802,7 +4802,7 @@ static const long _vq_quantlist__44u5__p8_0[] = { 10, }; -static const long _vq_lengthlist__44u5__p8_0[] = { +static const char _vq_lengthlist__44u5__p8_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11, 11, 6, 8, 7, 9, 9,10,10,11,11,13,12, 6, 8, 8, 9, @@ -4815,7 +4815,7 @@ static const long _vq_lengthlist__44u5__p8_0[] = { static const static_codebook _44u5__p8_0 = { 2, 121, - (long *)_vq_lengthlist__44u5__p8_0, + (char *)_vq_lengthlist__44u5__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__44u5__p8_0, 0 @@ -4835,7 +4835,7 @@ static const long _vq_quantlist__44u5__p8_1[] = { 10, }; -static const long _vq_lengthlist__44u5__p8_1[] = { +static const char _vq_lengthlist__44u5__p8_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, @@ -4848,7 +4848,7 @@ static const long _vq_lengthlist__44u5__p8_1[] = { static const static_codebook _44u5__p8_1 = { 2, 121, - (long *)_vq_lengthlist__44u5__p8_1, + (char *)_vq_lengthlist__44u5__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p8_1, 0 @@ -4870,7 +4870,7 @@ static const long _vq_quantlist__44u5__p9_0[] = { 12, }; -static const long _vq_lengthlist__44u5__p9_0[] = { +static const char _vq_lengthlist__44u5__p9_0[] = { 1, 3, 2,12,10,13,13,13,13,13,13,13,13, 4, 9, 9, 13,13,13,13,13,13,13,13,13,13, 5,10, 9,13,13,13, 13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,13, @@ -4886,7 +4886,7 @@ static const long _vq_lengthlist__44u5__p9_0[] = { static const static_codebook _44u5__p9_0 = { 2, 169, - (long *)_vq_lengthlist__44u5__p9_0, + (char *)_vq_lengthlist__44u5__p9_0, 1, -514332672, 1627381760, 4, 0, (long *)_vq_quantlist__44u5__p9_0, 0 @@ -4910,7 +4910,7 @@ static const long _vq_quantlist__44u5__p9_1[] = { 14, }; -static const long _vq_lengthlist__44u5__p9_1[] = { +static const char _vq_lengthlist__44u5__p9_1[] = { 1, 4, 4, 7, 7, 8, 8, 8, 7, 8, 7, 9, 8, 9, 9, 4, 7, 6, 9, 8,10,10, 9, 8, 9, 9, 9, 9, 9, 8, 5, 6, 6, 8, 9,10,10, 9, 9, 9,10,10,10,10,11, 7, 8, 8, @@ -4930,7 +4930,7 @@ static const long _vq_lengthlist__44u5__p9_1[] = { static const static_codebook _44u5__p9_1 = { 2, 225, - (long *)_vq_lengthlist__44u5__p9_1, + (char *)_vq_lengthlist__44u5__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u5__p9_1, 0 @@ -4956,7 +4956,7 @@ static const long _vq_quantlist__44u5__p9_2[] = { 16, }; -static const long _vq_lengthlist__44u5__p9_2[] = { +static const char _vq_lengthlist__44u5__p9_2[] = { 2, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, @@ -4980,13 +4980,13 @@ static const long _vq_lengthlist__44u5__p9_2[] = { static const static_codebook _44u5__p9_2 = { 2, 289, - (long *)_vq_lengthlist__44u5__p9_2, + (char *)_vq_lengthlist__44u5__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u5__p9_2, 0 }; -static const long _huff_lengthlist__44u5__short[] = { +static const char _huff_lengthlist__44u5__short[] = { 4,10,17,13,17,13,17,17,17,17, 3, 6, 8, 9,11, 9, 15,12,16,17, 6, 5, 5, 7, 7, 8,10,11,17,17, 7, 8, 7, 9, 9,10,13,13,17,17, 8, 6, 5, 7, 4, 7, 5, 8, @@ -4998,13 +4998,13 @@ static const long _huff_lengthlist__44u5__short[] = { static const static_codebook _huff_book__44u5__short = { 2, 100, - (long *)_huff_lengthlist__44u5__short, + (char *)_huff_lengthlist__44u5__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u6__long[] = { +static const char _huff_lengthlist__44u6__long[] = { 3, 9,14,13,14,13,16,12,13,14, 5, 4, 6, 6, 8, 9, 11,10,12,15,10, 5, 5, 6, 6, 8,10,10,13,16,10, 6, 6, 6, 6, 8, 9, 9,12,14,13, 7, 6, 6, 4, 6, 6, 7, @@ -5016,7 +5016,7 @@ static const long _huff_lengthlist__44u6__long[] = { static const static_codebook _huff_book__44u6__long = { 2, 100, - (long *)_huff_lengthlist__44u6__long, + (char *)_huff_lengthlist__44u6__long, 0, 0, 0, 0, 0, NULL, 0 @@ -5028,7 +5028,7 @@ static const long _vq_quantlist__44u6__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u6__p1_0[] = { +static const char _vq_lengthlist__44u6__p1_0[] = { 1, 4, 4, 4, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10, 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, @@ -5039,7 +5039,7 @@ static const long _vq_lengthlist__44u6__p1_0[] = { static const static_codebook _44u6__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u6__p1_0, + (char *)_vq_lengthlist__44u6__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u6__p1_0, 0 @@ -5051,7 +5051,7 @@ static const long _vq_quantlist__44u6__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u6__p2_0[] = { +static const char _vq_lengthlist__44u6__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 7, @@ -5062,7 +5062,7 @@ static const long _vq_lengthlist__44u6__p2_0[] = { static const static_codebook _44u6__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u6__p2_0, + (char *)_vq_lengthlist__44u6__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u6__p2_0, 0 @@ -5076,7 +5076,7 @@ static const long _vq_quantlist__44u6__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u6__p3_0[] = { +static const char _vq_lengthlist__44u6__p3_0[] = { 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9, 9,11,11, 7, 8, 9,11,11,10,11,11,14,14, 9,10,11, @@ -5121,7 +5121,7 @@ static const long _vq_lengthlist__44u6__p3_0[] = { static const static_codebook _44u6__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u6__p3_0, + (char *)_vq_lengthlist__44u6__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u6__p3_0, 0 @@ -5135,7 +5135,7 @@ static const long _vq_quantlist__44u6__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u6__p4_0[] = { +static const char _vq_lengthlist__44u6__p4_0[] = { 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8, 9,10, 9,10,10,11,11, 9, 9,10, @@ -5180,7 +5180,7 @@ static const long _vq_lengthlist__44u6__p4_0[] = { static const static_codebook _44u6__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u6__p4_0, + (char *)_vq_lengthlist__44u6__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u6__p4_0, 0 @@ -5198,7 +5198,7 @@ static const long _vq_quantlist__44u6__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u6__p5_0[] = { +static const char _vq_lengthlist__44u6__p5_0[] = { 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8, 11,11, 3, 5, 5, 7, 8, 8, 8,11,11, 6, 8, 7, 9, 9, 10, 9,12,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8, @@ -5209,7 +5209,7 @@ static const long _vq_lengthlist__44u6__p5_0[] = { static const static_codebook _44u6__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u6__p5_0, + (char *)_vq_lengthlist__44u6__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p5_0, 0 @@ -5227,7 +5227,7 @@ static const long _vq_quantlist__44u6__p6_0[] = { 8, }; -static const long _vq_lengthlist__44u6__p6_0[] = { +static const char _vq_lengthlist__44u6__p6_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, @@ -5238,7 +5238,7 @@ static const long _vq_lengthlist__44u6__p6_0[] = { static const static_codebook _44u6__p6_0 = { 2, 81, - (long *)_vq_lengthlist__44u6__p6_0, + (char *)_vq_lengthlist__44u6__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p6_0, 0 @@ -5250,7 +5250,7 @@ static const long _vq_quantlist__44u6__p7_0[] = { 2, }; -static const long _vq_lengthlist__44u6__p7_0[] = { +static const char _vq_lengthlist__44u6__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10,10, 8, 10,10, 5, 8, 9, 7,10,10, 7,10, 9, 4, 8, 8, 9,11, 11, 8,11,11, 7,11,11,10,10,13,10,13,13, 7,11,11, @@ -5261,7 +5261,7 @@ static const long _vq_lengthlist__44u6__p7_0[] = { static const static_codebook _44u6__p7_0 = { 4, 81, - (long *)_vq_lengthlist__44u6__p7_0, + (char *)_vq_lengthlist__44u6__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u6__p7_0, 0 @@ -5281,7 +5281,7 @@ static const long _vq_quantlist__44u6__p7_1[] = { 10, }; -static const long _vq_lengthlist__44u6__p7_1[] = { +static const char _vq_lengthlist__44u6__p7_1[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 6, 8, 8, 8, 8, 8, 8, 4, 5, 5, 6, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, @@ -5294,7 +5294,7 @@ static const long _vq_lengthlist__44u6__p7_1[] = { static const static_codebook _44u6__p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u6__p7_1, + (char *)_vq_lengthlist__44u6__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p7_1, 0 @@ -5314,7 +5314,7 @@ static const long _vq_quantlist__44u6__p8_0[] = { 10, }; -static const long _vq_lengthlist__44u6__p8_0[] = { +static const char _vq_lengthlist__44u6__p8_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11, 11, 6, 8, 8, 9, 9,10,10,11,11,12,12, 6, 8, 8, 9, @@ -5327,7 +5327,7 @@ static const long _vq_lengthlist__44u6__p8_0[] = { static const static_codebook _44u6__p8_0 = { 2, 121, - (long *)_vq_lengthlist__44u6__p8_0, + (char *)_vq_lengthlist__44u6__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__44u6__p8_0, 0 @@ -5347,7 +5347,7 @@ static const long _vq_quantlist__44u6__p8_1[] = { 10, }; -static const long _vq_lengthlist__44u6__p8_1[] = { +static const char _vq_lengthlist__44u6__p8_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 7, 7, 7, 8, 7, 8, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 6, 7, 7, @@ -5360,7 +5360,7 @@ static const long _vq_lengthlist__44u6__p8_1[] = { static const static_codebook _44u6__p8_1 = { 2, 121, - (long *)_vq_lengthlist__44u6__p8_1, + (char *)_vq_lengthlist__44u6__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p8_1, 0 @@ -5384,7 +5384,7 @@ static const long _vq_quantlist__44u6__p9_0[] = { 14, }; -static const long _vq_lengthlist__44u6__p9_0[] = { +static const char _vq_lengthlist__44u6__p9_0[] = { 1, 3, 2, 9, 8,15,15,15,15,15,15,15,15,15,15, 4, 8, 9,13,14,14,14,14,14,14,14,14,14,14,14, 5, 8, 9,14,14,14,14,14,14,14,14,14,14,14,14,11,14,14, @@ -5404,7 +5404,7 @@ static const long _vq_lengthlist__44u6__p9_0[] = { static const static_codebook _44u6__p9_0 = { 2, 225, - (long *)_vq_lengthlist__44u6__p9_0, + (char *)_vq_lengthlist__44u6__p9_0, 1, -514071552, 1627381760, 4, 0, (long *)_vq_quantlist__44u6__p9_0, 0 @@ -5428,7 +5428,7 @@ static const long _vq_quantlist__44u6__p9_1[] = { 14, }; -static const long _vq_lengthlist__44u6__p9_1[] = { +static const char _vq_lengthlist__44u6__p9_1[] = { 1, 4, 4, 7, 7, 8, 9, 8, 8, 9, 8, 9, 8, 9, 9, 4, 7, 6, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 7, 6, 9, 9,10,10, 9, 9,10,10,10,10,11,11, 7, 9, 8, @@ -5448,7 +5448,7 @@ static const long _vq_lengthlist__44u6__p9_1[] = { static const static_codebook _44u6__p9_1 = { 2, 225, - (long *)_vq_lengthlist__44u6__p9_1, + (char *)_vq_lengthlist__44u6__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u6__p9_1, 0 @@ -5474,7 +5474,7 @@ static const long _vq_quantlist__44u6__p9_2[] = { 16, }; -static const long _vq_lengthlist__44u6__p9_2[] = { +static const char _vq_lengthlist__44u6__p9_2[] = { 3, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, @@ -5498,13 +5498,13 @@ static const long _vq_lengthlist__44u6__p9_2[] = { static const static_codebook _44u6__p9_2 = { 2, 289, - (long *)_vq_lengthlist__44u6__p9_2, + (char *)_vq_lengthlist__44u6__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u6__p9_2, 0 }; -static const long _huff_lengthlist__44u6__short[] = { +static const char _huff_lengthlist__44u6__short[] = { 4,11,16,13,17,13,17,16,17,17, 4, 7, 9, 9,13,10, 16,12,16,17, 7, 6, 5, 7, 8, 9,12,12,16,17, 6, 9, 7, 9,10,10,15,15,17,17, 6, 7, 5, 7, 5, 7, 7,10, @@ -5516,13 +5516,13 @@ static const long _huff_lengthlist__44u6__short[] = { static const static_codebook _huff_book__44u6__short = { 2, 100, - (long *)_huff_lengthlist__44u6__short, + (char *)_huff_lengthlist__44u6__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u7__long[] = { +static const char _huff_lengthlist__44u7__long[] = { 3, 9,14,13,15,14,16,13,13,14, 5, 5, 7, 7, 8, 9, 11,10,12,15,10, 6, 5, 6, 6, 9,10,10,13,16,10, 6, 6, 6, 6, 8, 9, 9,12,15,14, 7, 6, 6, 5, 6, 6, 8, @@ -5534,7 +5534,7 @@ static const long _huff_lengthlist__44u7__long[] = { static const static_codebook _huff_book__44u7__long = { 2, 100, - (long *)_huff_lengthlist__44u7__long, + (char *)_huff_lengthlist__44u7__long, 0, 0, 0, 0, 0, NULL, 0 @@ -5546,7 +5546,7 @@ static const long _vq_quantlist__44u7__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u7__p1_0[] = { +static const char _vq_lengthlist__44u7__p1_0[] = { 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 10,10, 5, 8, 8, 7,10,10, 8,10,10, 5, 8, 8, 8,11, 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, @@ -5557,7 +5557,7 @@ static const long _vq_lengthlist__44u7__p1_0[] = { static const static_codebook _44u7__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u7__p1_0, + (char *)_vq_lengthlist__44u7__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u7__p1_0, 0 @@ -5569,7 +5569,7 @@ static const long _vq_quantlist__44u7__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u7__p2_0[] = { +static const char _vq_lengthlist__44u7__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7, @@ -5580,7 +5580,7 @@ static const long _vq_lengthlist__44u7__p2_0[] = { static const static_codebook _44u7__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u7__p2_0, + (char *)_vq_lengthlist__44u7__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u7__p2_0, 0 @@ -5594,7 +5594,7 @@ static const long _vq_quantlist__44u7__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u7__p3_0[] = { +static const char _vq_lengthlist__44u7__p3_0[] = { 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9, 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11, @@ -5639,7 +5639,7 @@ static const long _vq_lengthlist__44u7__p3_0[] = { static const static_codebook _44u7__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u7__p3_0, + (char *)_vq_lengthlist__44u7__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u7__p3_0, 0 @@ -5653,7 +5653,7 @@ static const long _vq_quantlist__44u7__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u7__p4_0[] = { +static const char _vq_lengthlist__44u7__p4_0[] = { 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,10,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 6, 7, 8, 9,10, 9,10,10,12,12, 9, 9,10, @@ -5698,7 +5698,7 @@ static const long _vq_lengthlist__44u7__p4_0[] = { static const static_codebook _44u7__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u7__p4_0, + (char *)_vq_lengthlist__44u7__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u7__p4_0, 0 @@ -5716,7 +5716,7 @@ static const long _vq_quantlist__44u7__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u7__p5_0[] = { +static const char _vq_lengthlist__44u7__p5_0[] = { 2, 3, 3, 6, 6, 7, 8,10,10, 4, 5, 5, 8, 7, 8, 8, 11,11, 3, 5, 5, 7, 7, 8, 9,11,11, 6, 8, 7, 9, 9, 10,10,12,12, 6, 7, 8, 9,10,10,10,12,12, 8, 8, 8, @@ -5727,7 +5727,7 @@ static const long _vq_lengthlist__44u7__p5_0[] = { static const static_codebook _44u7__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u7__p5_0, + (char *)_vq_lengthlist__44u7__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p5_0, 0 @@ -5745,7 +5745,7 @@ static const long _vq_quantlist__44u7__p6_0[] = { 8, }; -static const long _vq_lengthlist__44u7__p6_0[] = { +static const char _vq_lengthlist__44u7__p6_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 8, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, @@ -5756,7 +5756,7 @@ static const long _vq_lengthlist__44u7__p6_0[] = { static const static_codebook _44u7__p6_0 = { 2, 81, - (long *)_vq_lengthlist__44u7__p6_0, + (char *)_vq_lengthlist__44u7__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p6_0, 0 @@ -5768,7 +5768,7 @@ static const long _vq_quantlist__44u7__p7_0[] = { 2, }; -static const long _vq_lengthlist__44u7__p7_0[] = { +static const char _vq_lengthlist__44u7__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8, 9, 9, 7, 10,10, 5, 8, 9, 7, 9,10, 8, 9, 9, 4, 9, 9, 9,11, 10, 8,10,10, 7,11,10,10,10,12,10,12,12, 7,10,10, @@ -5779,7 +5779,7 @@ static const long _vq_lengthlist__44u7__p7_0[] = { static const static_codebook _44u7__p7_0 = { 4, 81, - (long *)_vq_lengthlist__44u7__p7_0, + (char *)_vq_lengthlist__44u7__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u7__p7_0, 0 @@ -5799,7 +5799,7 @@ static const long _vq_quantlist__44u7__p7_1[] = { 10, }; -static const long _vq_lengthlist__44u7__p7_1[] = { +static const char _vq_lengthlist__44u7__p7_1[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, 8, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8, 8, 6, 7, 6, 7, 7, 8, 8, 9, 9, 9, 9, 6, 6, 7, 7, @@ -5812,7 +5812,7 @@ static const long _vq_lengthlist__44u7__p7_1[] = { static const static_codebook _44u7__p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u7__p7_1, + (char *)_vq_lengthlist__44u7__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p7_1, 0 @@ -5832,7 +5832,7 @@ static const long _vq_quantlist__44u7__p8_0[] = { 10, }; -static const long _vq_lengthlist__44u7__p8_0[] = { +static const char _vq_lengthlist__44u7__p8_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,11,10,12,12, 5, 6, 5, 7, 7, 9, 9,10,11,12, 12, 6, 7, 7, 8, 8,10,10,11,11,13,13, 6, 7, 7, 8, @@ -5845,7 +5845,7 @@ static const long _vq_lengthlist__44u7__p8_0[] = { static const static_codebook _44u7__p8_0 = { 2, 121, - (long *)_vq_lengthlist__44u7__p8_0, + (char *)_vq_lengthlist__44u7__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__44u7__p8_0, 0 @@ -5865,7 +5865,7 @@ static const long _vq_quantlist__44u7__p8_1[] = { 10, }; -static const long _vq_lengthlist__44u7__p8_1[] = { +static const char _vq_lengthlist__44u7__p8_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, @@ -5878,7 +5878,7 @@ static const long _vq_lengthlist__44u7__p8_1[] = { static const static_codebook _44u7__p8_1 = { 2, 121, - (long *)_vq_lengthlist__44u7__p8_1, + (char *)_vq_lengthlist__44u7__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p8_1, 0 @@ -5898,7 +5898,7 @@ static const long _vq_quantlist__44u7__p9_0[] = { 10, }; -static const long _vq_lengthlist__44u7__p9_0[] = { +static const char _vq_lengthlist__44u7__p9_0[] = { 1, 3, 3,10,10,10,10,10,10,10,10, 4,10,10,10,10, 10,10,10,10,10,10, 4,10,10,10,10,10,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -5911,7 +5911,7 @@ static const long _vq_lengthlist__44u7__p9_0[] = { static const static_codebook _44u7__p9_0 = { 2, 121, - (long *)_vq_lengthlist__44u7__p9_0, + (char *)_vq_lengthlist__44u7__p9_0, 1, -512171520, 1630791680, 4, 0, (long *)_vq_quantlist__44u7__p9_0, 0 @@ -5933,7 +5933,7 @@ static const long _vq_quantlist__44u7__p9_1[] = { 12, }; -static const long _vq_lengthlist__44u7__p9_1[] = { +static const char _vq_lengthlist__44u7__p9_1[] = { 1, 4, 4, 6, 5, 8, 6, 9, 8,10, 9,11,10, 4, 6, 6, 8, 8, 9, 9,11,10,11,11,11,11, 4, 6, 6, 8, 8,10, 9,11,11,11,11,11,12, 6, 8, 8,10,10,11,11,12,12, @@ -5949,7 +5949,7 @@ static const long _vq_lengthlist__44u7__p9_1[] = { static const static_codebook _44u7__p9_1 = { 2, 169, - (long *)_vq_lengthlist__44u7__p9_1, + (char *)_vq_lengthlist__44u7__p9_1, 1, -518889472, 1622704128, 4, 0, (long *)_vq_quantlist__44u7__p9_1, 0 @@ -6007,7 +6007,7 @@ static const long _vq_quantlist__44u7__p9_2[] = { 48, }; -static const long _vq_lengthlist__44u7__p9_2[] = { +static const char _vq_lengthlist__44u7__p9_2[] = { 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, @@ -6016,13 +6016,13 @@ static const long _vq_lengthlist__44u7__p9_2[] = { static const static_codebook _44u7__p9_2 = { 1, 49, - (long *)_vq_lengthlist__44u7__p9_2, + (char *)_vq_lengthlist__44u7__p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44u7__p9_2, 0 }; -static const long _huff_lengthlist__44u7__short[] = { +static const char _huff_lengthlist__44u7__short[] = { 5,12,17,16,16,17,17,17,17,17, 4, 7,11,11,12, 9, 17,10,17,17, 7, 7, 8, 9, 7, 9,11,10,15,17, 7, 9, 10,11,10,12,14,12,16,17, 7, 8, 5, 7, 4, 7, 7, 8, @@ -6034,13 +6034,13 @@ static const long _huff_lengthlist__44u7__short[] = { static const static_codebook _huff_book__44u7__short = { 2, 100, - (long *)_huff_lengthlist__44u7__short, + (char *)_huff_lengthlist__44u7__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u8__long[] = { +static const char _huff_lengthlist__44u8__long[] = { 3, 9,13,14,14,15,14,14,15,15, 5, 4, 6, 8,10,12, 12,14,15,15, 9, 5, 4, 5, 8,10,11,13,16,16,10, 7, 4, 3, 5, 7, 9,11,13,13,10, 9, 7, 4, 4, 6, 8,10, @@ -6052,13 +6052,13 @@ static const long _huff_lengthlist__44u8__long[] = { static const static_codebook _huff_book__44u8__long = { 2, 100, - (long *)_huff_lengthlist__44u8__long, + (char *)_huff_lengthlist__44u8__long, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u8__short[] = { +static const char _huff_lengthlist__44u8__short[] = { 6,14,18,18,17,17,17,17,17,17, 4, 7, 9, 9,10,13, 15,17,17,17, 6, 7, 5, 6, 8,11,16,17,16,17, 5, 7, 5, 4, 6,10,14,17,17,17, 6, 6, 6, 5, 7,10,13,16, @@ -6070,7 +6070,7 @@ static const long _huff_lengthlist__44u8__short[] = { static const static_codebook _huff_book__44u8__short = { 2, 100, - (long *)_huff_lengthlist__44u8__short, + (char *)_huff_lengthlist__44u8__short, 0, 0, 0, 0, 0, NULL, 0 @@ -6082,7 +6082,7 @@ static const long _vq_quantlist__44u8_p1_0[] = { 2, }; -static const long _vq_lengthlist__44u8_p1_0[] = { +static const char _vq_lengthlist__44u8_p1_0[] = { 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,10, 7, 9, 9, @@ -6093,7 +6093,7 @@ static const long _vq_lengthlist__44u8_p1_0[] = { static const static_codebook _44u8_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u8_p1_0, + (char *)_vq_lengthlist__44u8_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u8_p1_0, 0 @@ -6107,7 +6107,7 @@ static const long _vq_quantlist__44u8_p2_0[] = { 4, }; -static const long _vq_lengthlist__44u8_p2_0[] = { +static const char _vq_lengthlist__44u8_p2_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,10, @@ -6152,7 +6152,7 @@ static const long _vq_lengthlist__44u8_p2_0[] = { static const static_codebook _44u8_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44u8_p2_0, + (char *)_vq_lengthlist__44u8_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u8_p2_0, 0 @@ -6170,7 +6170,7 @@ static const long _vq_quantlist__44u8_p3_0[] = { 8, }; -static const long _vq_lengthlist__44u8_p3_0[] = { +static const char _vq_lengthlist__44u8_p3_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7, @@ -6181,7 +6181,7 @@ static const long _vq_lengthlist__44u8_p3_0[] = { static const static_codebook _44u8_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44u8_p3_0, + (char *)_vq_lengthlist__44u8_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u8_p3_0, 0 @@ -6207,7 +6207,7 @@ static const long _vq_quantlist__44u8_p4_0[] = { 16, }; -static const long _vq_lengthlist__44u8_p4_0[] = { +static const char _vq_lengthlist__44u8_p4_0[] = { 4, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,11,11, 11, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, @@ -6231,7 +6231,7 @@ static const long _vq_lengthlist__44u8_p4_0[] = { static const static_codebook _44u8_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44u8_p4_0, + (char *)_vq_lengthlist__44u8_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u8_p4_0, 0 @@ -6243,7 +6243,7 @@ static const long _vq_quantlist__44u8_p5_0[] = { 2, }; -static const long _vq_lengthlist__44u8_p5_0[] = { +static const char _vq_lengthlist__44u8_p5_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7, 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10, 9,10,12, 9,12,11, 7,10,10, @@ -6254,7 +6254,7 @@ static const long _vq_lengthlist__44u8_p5_0[] = { static const static_codebook _44u8_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44u8_p5_0, + (char *)_vq_lengthlist__44u8_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u8_p5_0, 0 @@ -6274,7 +6274,7 @@ static const long _vq_quantlist__44u8_p5_1[] = { 10, }; -static const long _vq_lengthlist__44u8_p5_1[] = { +static const char _vq_lengthlist__44u8_p5_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 7, @@ -6287,7 +6287,7 @@ static const long _vq_lengthlist__44u8_p5_1[] = { static const static_codebook _44u8_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44u8_p5_1, + (char *)_vq_lengthlist__44u8_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u8_p5_1, 0 @@ -6309,7 +6309,7 @@ static const long _vq_quantlist__44u8_p6_0[] = { 12, }; -static const long _vq_lengthlist__44u8_p6_0[] = { +static const char _vq_lengthlist__44u8_p6_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 6, 7, 7, 7, 8, 8, 8, 8, 9, @@ -6325,7 +6325,7 @@ static const long _vq_lengthlist__44u8_p6_0[] = { static const static_codebook _44u8_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u8_p6_0, + (char *)_vq_lengthlist__44u8_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u8_p6_0, 0 @@ -6339,14 +6339,14 @@ static const long _vq_quantlist__44u8_p6_1[] = { 4, }; -static const long _vq_lengthlist__44u8_p6_1[] = { +static const char _vq_lengthlist__44u8_p6_1[] = { 3, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44u8_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u8_p6_1, + (char *)_vq_lengthlist__44u8_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u8_p6_1, 0 @@ -6368,7 +6368,7 @@ static const long _vq_quantlist__44u8_p7_0[] = { 12, }; -static const long _vq_lengthlist__44u8_p7_0[] = { +static const char _vq_lengthlist__44u8_p7_0[] = { 1, 4, 5, 6, 6, 7, 7, 8, 8,10,10,11,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,11,10,12,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,11,11,12, 6, 7, 7, 8, 8, 9, 9,10,10, @@ -6384,7 +6384,7 @@ static const long _vq_lengthlist__44u8_p7_0[] = { static const static_codebook _44u8_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44u8_p7_0, + (char *)_vq_lengthlist__44u8_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44u8_p7_0, 0 @@ -6404,7 +6404,7 @@ static const long _vq_quantlist__44u8_p7_1[] = { 10, }; -static const long _vq_lengthlist__44u8_p7_1[] = { +static const char _vq_lengthlist__44u8_p7_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, @@ -6417,7 +6417,7 @@ static const long _vq_lengthlist__44u8_p7_1[] = { static const static_codebook _44u8_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u8_p7_1, + (char *)_vq_lengthlist__44u8_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u8_p7_1, 0 @@ -6441,7 +6441,7 @@ static const long _vq_quantlist__44u8_p8_0[] = { 14, }; -static const long _vq_lengthlist__44u8_p8_0[] = { +static const char _vq_lengthlist__44u8_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8,10, 9,11,10, 4, 6, 6, 8, 8,10, 9, 9, 9,10,10,11,10,12,10, 4, 6, 6, 8, 8,10,10, 9, 9,10,10,11,11,11,12, 7, 8, 8, @@ -6461,7 +6461,7 @@ static const long _vq_lengthlist__44u8_p8_0[] = { static const static_codebook _44u8_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44u8_p8_0, + (char *)_vq_lengthlist__44u8_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44u8_p8_0, 0 @@ -6491,7 +6491,7 @@ static const long _vq_quantlist__44u8_p8_1[] = { 20, }; -static const long _vq_lengthlist__44u8_p8_1[] = { +static const char _vq_lengthlist__44u8_p8_1[] = { 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, @@ -6524,7 +6524,7 @@ static const long _vq_lengthlist__44u8_p8_1[] = { static const static_codebook _44u8_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44u8_p8_1, + (char *)_vq_lengthlist__44u8_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44u8_p8_1, 0 @@ -6542,7 +6542,7 @@ static const long _vq_quantlist__44u8_p9_0[] = { 8, }; -static const long _vq_lengthlist__44u8_p9_0[] = { +static const char _vq_lengthlist__44u8_p9_0[] = { 1, 3, 3, 9, 9, 9, 9, 9, 9, 4, 9, 9, 9, 9, 9, 9, 9, 9, 5, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6553,7 +6553,7 @@ static const long _vq_lengthlist__44u8_p9_0[] = { static const static_codebook _44u8_p9_0 = { 2, 81, - (long *)_vq_lengthlist__44u8_p9_0, + (char *)_vq_lengthlist__44u8_p9_0, 1, -511895552, 1631393792, 4, 0, (long *)_vq_quantlist__44u8_p9_0, 0 @@ -6581,7 +6581,7 @@ static const long _vq_quantlist__44u8_p9_1[] = { 18, }; -static const long _vq_lengthlist__44u8_p9_1[] = { +static const char _vq_lengthlist__44u8_p9_1[] = { 1, 4, 4, 7, 7, 8, 7, 8, 6, 9, 7,10, 8,11,10,11, 11,11,11, 4, 7, 6, 9, 9,10, 9, 9, 9,10,10,11,10, 11,10,11,11,13,11, 4, 7, 7, 9, 9, 9, 9, 9, 9,10, @@ -6609,7 +6609,7 @@ static const long _vq_lengthlist__44u8_p9_1[] = { static const static_codebook _44u8_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44u8_p9_1, + (char *)_vq_lengthlist__44u8_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44u8_p9_1, 0 @@ -6667,7 +6667,7 @@ static const long _vq_quantlist__44u8_p9_2[] = { 48, }; -static const long _vq_lengthlist__44u8_p9_2[] = { +static const char _vq_lengthlist__44u8_p9_2[] = { 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -6676,13 +6676,13 @@ static const long _vq_lengthlist__44u8_p9_2[] = { static const static_codebook _44u8_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44u8_p9_2, + (char *)_vq_lengthlist__44u8_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44u8_p9_2, 0 }; -static const long _huff_lengthlist__44u9__long[] = { +static const char _huff_lengthlist__44u9__long[] = { 3, 9,13,13,14,15,14,14,15,15, 5, 5, 9,10,12,12, 13,14,16,15,10, 6, 6, 6, 8,11,12,13,16,15,11, 7, 5, 3, 5, 8,10,12,15,15,10,10, 7, 4, 3, 5, 8,10, @@ -6694,13 +6694,13 @@ static const long _huff_lengthlist__44u9__long[] = { static const static_codebook _huff_book__44u9__long = { 2, 100, - (long *)_huff_lengthlist__44u9__long, + (char *)_huff_lengthlist__44u9__long, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u9__short[] = { +static const char _huff_lengthlist__44u9__short[] = { 9,16,18,18,17,17,17,17,17,17, 5, 8,11,12,11,12, 17,17,16,16, 6, 6, 8, 8, 9,10,14,15,16,16, 6, 7, 7, 4, 6, 9,13,16,16,16, 6, 6, 7, 4, 5, 8,11,15, @@ -6712,7 +6712,7 @@ static const long _huff_lengthlist__44u9__short[] = { static const static_codebook _huff_book__44u9__short = { 2, 100, - (long *)_huff_lengthlist__44u9__short, + (char *)_huff_lengthlist__44u9__short, 0, 0, 0, 0, 0, NULL, 0 @@ -6724,7 +6724,7 @@ static const long _vq_quantlist__44u9_p1_0[] = { 2, }; -static const long _vq_lengthlist__44u9_p1_0[] = { +static const char _vq_lengthlist__44u9_p1_0[] = { 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 8, 9, 9, 9,10,11, 9,11,11, 7, 9, 9, @@ -6735,7 +6735,7 @@ static const long _vq_lengthlist__44u9_p1_0[] = { static const static_codebook _44u9_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u9_p1_0, + (char *)_vq_lengthlist__44u9_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u9_p1_0, 0 @@ -6749,7 +6749,7 @@ static const long _vq_quantlist__44u9_p2_0[] = { 4, }; -static const long _vq_lengthlist__44u9_p2_0[] = { +static const char _vq_lengthlist__44u9_p2_0[] = { 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, 9, 9,11,10, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8, 9,10, 9,10,10,11,11, 9, 9,10, @@ -6794,7 +6794,7 @@ static const long _vq_lengthlist__44u9_p2_0[] = { static const static_codebook _44u9_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44u9_p2_0, + (char *)_vq_lengthlist__44u9_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u9_p2_0, 0 @@ -6812,7 +6812,7 @@ static const long _vq_quantlist__44u9_p3_0[] = { 8, }; -static const long _vq_lengthlist__44u9_p3_0[] = { +static const char _vq_lengthlist__44u9_p3_0[] = { 3, 4, 4, 5, 5, 7, 7, 8, 8, 4, 5, 5, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7, @@ -6823,7 +6823,7 @@ static const long _vq_lengthlist__44u9_p3_0[] = { static const static_codebook _44u9_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44u9_p3_0, + (char *)_vq_lengthlist__44u9_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u9_p3_0, 0 @@ -6849,7 +6849,7 @@ static const long _vq_quantlist__44u9_p4_0[] = { 16, }; -static const long _vq_lengthlist__44u9_p4_0[] = { +static const char _vq_lengthlist__44u9_p4_0[] = { 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 11,11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, @@ -6873,7 +6873,7 @@ static const long _vq_lengthlist__44u9_p4_0[] = { static const static_codebook _44u9_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44u9_p4_0, + (char *)_vq_lengthlist__44u9_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u9_p4_0, 0 @@ -6885,7 +6885,7 @@ static const long _vq_quantlist__44u9_p5_0[] = { 2, }; -static const long _vq_lengthlist__44u9_p5_0[] = { +static const char _vq_lengthlist__44u9_p5_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7, 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10, 9,10,12, 9,11,11, 7,10,10, @@ -6896,7 +6896,7 @@ static const long _vq_lengthlist__44u9_p5_0[] = { static const static_codebook _44u9_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44u9_p5_0, + (char *)_vq_lengthlist__44u9_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u9_p5_0, 0 @@ -6916,7 +6916,7 @@ static const long _vq_quantlist__44u9_p5_1[] = { 10, }; -static const long _vq_lengthlist__44u9_p5_1[] = { +static const char _vq_lengthlist__44u9_p5_1[] = { 5, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 7, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 6, 6, 6, 7, @@ -6929,7 +6929,7 @@ static const long _vq_lengthlist__44u9_p5_1[] = { static const static_codebook _44u9_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44u9_p5_1, + (char *)_vq_lengthlist__44u9_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u9_p5_1, 0 @@ -6951,7 +6951,7 @@ static const long _vq_quantlist__44u9_p6_0[] = { 12, }; -static const long _vq_lengthlist__44u9_p6_0[] = { +static const char _vq_lengthlist__44u9_p6_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 6, 7, 7, 8, 8, 8, 8, 9, 9, @@ -6967,7 +6967,7 @@ static const long _vq_lengthlist__44u9_p6_0[] = { static const static_codebook _44u9_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u9_p6_0, + (char *)_vq_lengthlist__44u9_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u9_p6_0, 0 @@ -6981,14 +6981,14 @@ static const long _vq_quantlist__44u9_p6_1[] = { 4, }; -static const long _vq_lengthlist__44u9_p6_1[] = { +static const char _vq_lengthlist__44u9_p6_1[] = { 4, 4, 4, 5, 5, 4, 5, 4, 5, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44u9_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u9_p6_1, + (char *)_vq_lengthlist__44u9_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u9_p6_1, 0 @@ -7010,7 +7010,7 @@ static const long _vq_quantlist__44u9_p7_0[] = { 12, }; -static const long _vq_lengthlist__44u9_p7_0[] = { +static const char _vq_lengthlist__44u9_p7_0[] = { 1, 4, 5, 6, 6, 7, 7, 8, 9,10,10,11,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 7, 7, 8, 8, 9, 9,10,10, @@ -7026,7 +7026,7 @@ static const long _vq_lengthlist__44u9_p7_0[] = { static const static_codebook _44u9_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44u9_p7_0, + (char *)_vq_lengthlist__44u9_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44u9_p7_0, 0 @@ -7046,7 +7046,7 @@ static const long _vq_quantlist__44u9_p7_1[] = { 10, }; -static const long _vq_lengthlist__44u9_p7_1[] = { +static const char _vq_lengthlist__44u9_p7_1[] = { 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, @@ -7059,7 +7059,7 @@ static const long _vq_lengthlist__44u9_p7_1[] = { static const static_codebook _44u9_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u9_p7_1, + (char *)_vq_lengthlist__44u9_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u9_p7_1, 0 @@ -7083,7 +7083,7 @@ static const long _vq_quantlist__44u9_p8_0[] = { 14, }; -static const long _vq_lengthlist__44u9_p8_0[] = { +static const char _vq_lengthlist__44u9_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,11,10, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10,12,10, 4, 6, 6, 8, 8, 9,10, 9, 9,10,10,11,11,12,12, 7, 8, 8, @@ -7103,7 +7103,7 @@ static const long _vq_lengthlist__44u9_p8_0[] = { static const static_codebook _44u9_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44u9_p8_0, + (char *)_vq_lengthlist__44u9_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44u9_p8_0, 0 @@ -7133,7 +7133,7 @@ static const long _vq_quantlist__44u9_p8_1[] = { 20, }; -static const long _vq_lengthlist__44u9_p8_1[] = { +static const char _vq_lengthlist__44u9_p8_1[] = { 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, @@ -7166,7 +7166,7 @@ static const long _vq_lengthlist__44u9_p8_1[] = { static const static_codebook _44u9_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44u9_p8_1, + (char *)_vq_lengthlist__44u9_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44u9_p8_1, 0 @@ -7190,7 +7190,7 @@ static const long _vq_quantlist__44u9_p9_0[] = { 14, }; -static const long _vq_lengthlist__44u9_p9_0[] = { +static const char _vq_lengthlist__44u9_p9_0[] = { 1, 3, 3,11,11,11,11,11,11,11,11,11,11,11,11, 4, 10,11,11,11,11,11,11,11,11,11,11,11,11,11, 4,10, 10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -7210,7 +7210,7 @@ static const long _vq_lengthlist__44u9_p9_0[] = { static const static_codebook _44u9_p9_0 = { 2, 225, - (long *)_vq_lengthlist__44u9_p9_0, + (char *)_vq_lengthlist__44u9_p9_0, 1, -510036736, 1631393792, 4, 0, (long *)_vq_quantlist__44u9_p9_0, 0 @@ -7238,7 +7238,7 @@ static const long _vq_quantlist__44u9_p9_1[] = { 18, }; -static const long _vq_lengthlist__44u9_p9_1[] = { +static const char _vq_lengthlist__44u9_p9_1[] = { 1, 4, 4, 7, 7, 8, 7, 8, 7, 9, 8,10, 9,10,10,11, 11,12,12, 4, 7, 6, 9, 9,10, 9, 9, 8,10,10,11,10, 12,10,13,12,13,12, 4, 6, 6, 9, 9, 9, 9, 9, 9,10, @@ -7266,7 +7266,7 @@ static const long _vq_lengthlist__44u9_p9_1[] = { static const static_codebook _44u9_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44u9_p9_1, + (char *)_vq_lengthlist__44u9_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44u9_p9_1, 0 @@ -7324,7 +7324,7 @@ static const long _vq_quantlist__44u9_p9_2[] = { 48, }; -static const long _vq_lengthlist__44u9_p9_2[] = { +static const char _vq_lengthlist__44u9_p9_2[] = { 2, 4, 4, 5, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -7333,13 +7333,13 @@ static const long _vq_lengthlist__44u9_p9_2[] = { static const static_codebook _44u9_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44u9_p9_2, + (char *)_vq_lengthlist__44u9_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44u9_p9_2, 0 }; -static const long _huff_lengthlist__44un1__long[] = { +static const char _huff_lengthlist__44un1__long[] = { 5, 6,12, 9,14, 9, 9,19, 6, 1, 5, 5, 8, 7, 9,19, 12, 4, 4, 7, 7, 9,11,18, 9, 5, 6, 6, 8, 7, 8,17, 14, 8, 7, 8, 8,10,12,18, 9, 6, 8, 6, 8, 6, 8,18, @@ -7348,7 +7348,7 @@ static const long _huff_lengthlist__44un1__long[] = { static const static_codebook _huff_book__44un1__long = { 2, 64, - (long *)_huff_lengthlist__44un1__long, + (char *)_huff_lengthlist__44un1__long, 0, 0, 0, 0, 0, NULL, 0 @@ -7360,7 +7360,7 @@ static const long _vq_quantlist__44un1__p1_0[] = { 2, }; -static const long _vq_lengthlist__44un1__p1_0[] = { +static const char _vq_lengthlist__44un1__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,10, 4, 9, 9, 8,11, 11, 8,11,11, 8,12,11,10,12,14,11,13,13, 7,11,11, @@ -7371,7 +7371,7 @@ static const long _vq_lengthlist__44un1__p1_0[] = { static const static_codebook _44un1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44un1__p1_0, + (char *)_vq_lengthlist__44un1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44un1__p1_0, 0 @@ -7383,7 +7383,7 @@ static const long _vq_quantlist__44un1__p2_0[] = { 2, }; -static const long _vq_lengthlist__44un1__p2_0[] = { +static const char _vq_lengthlist__44un1__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, 7, 9, 5, 7, 7, 6, 8, 7, 7, 9, 8, 4, 7, 7, 7, 9, 8, 7, 8, 8, 7, 9, 8, 8, 8,10, 9,10,10, 6, 8, 8, @@ -7394,7 +7394,7 @@ static const long _vq_lengthlist__44un1__p2_0[] = { static const static_codebook _44un1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44un1__p2_0, + (char *)_vq_lengthlist__44un1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44un1__p2_0, 0 @@ -7408,7 +7408,7 @@ static const long _vq_quantlist__44un1__p3_0[] = { 4, }; -static const long _vq_lengthlist__44un1__p3_0[] = { +static const char _vq_lengthlist__44un1__p3_0[] = { 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, 10, 9,12,12, 9, 9,10,11,12, 6, 8, 8,10,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,13,13,10,11,11, @@ -7453,7 +7453,7 @@ static const long _vq_lengthlist__44un1__p3_0[] = { static const static_codebook _44un1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44un1__p3_0, + (char *)_vq_lengthlist__44un1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44un1__p3_0, 0 @@ -7467,7 +7467,7 @@ static const long _vq_quantlist__44un1__p4_0[] = { 4, }; -static const long _vq_lengthlist__44un1__p4_0[] = { +static const char _vq_lengthlist__44un1__p4_0[] = { 3, 5, 5, 9, 9, 5, 6, 6,10, 9, 5, 6, 6, 9,10,10, 10,10,12,11, 9,10,10,12,12, 5, 7, 7,10,10, 7, 7, 8,10,11, 7, 7, 8,10,11,10,10,11,11,13,10,10,11, @@ -7512,7 +7512,7 @@ static const long _vq_lengthlist__44un1__p4_0[] = { static const static_codebook _44un1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44un1__p4_0, + (char *)_vq_lengthlist__44un1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44un1__p4_0, 0 @@ -7530,7 +7530,7 @@ static const long _vq_quantlist__44un1__p5_0[] = { 8, }; -static const long _vq_lengthlist__44un1__p5_0[] = { +static const char _vq_lengthlist__44un1__p5_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 7, 8, 8, 10, 9, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 7, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 8, 8, 8, @@ -7541,7 +7541,7 @@ static const long _vq_lengthlist__44un1__p5_0[] = { static const static_codebook _44un1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44un1__p5_0, + (char *)_vq_lengthlist__44un1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44un1__p5_0, 0 @@ -7563,7 +7563,7 @@ static const long _vq_quantlist__44un1__p6_0[] = { 12, }; -static const long _vq_lengthlist__44un1__p6_0[] = { +static const char _vq_lengthlist__44un1__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11,15,15, 4, 5, 5, 8, 8, 9, 9,11,11,12,12,16,16, 4, 5, 6, 8, 8, 9, 9,11,11,12,12,14,14, 7, 8, 8, 9, 9,10,10,11,12, @@ -7579,7 +7579,7 @@ static const long _vq_lengthlist__44un1__p6_0[] = { static const static_codebook _44un1__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44un1__p6_0, + (char *)_vq_lengthlist__44un1__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44un1__p6_0, 0 @@ -7593,14 +7593,14 @@ static const long _vq_quantlist__44un1__p6_1[] = { 4, }; -static const long _vq_lengthlist__44un1__p6_1[] = { +static const char _vq_lengthlist__44un1__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 6, 5, 5, 6, 5, 6, 6, 5, 6, 6, 6, 6, }; static const static_codebook _44un1__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44un1__p6_1, + (char *)_vq_lengthlist__44un1__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44un1__p6_1, 0 @@ -7614,7 +7614,7 @@ static const long _vq_quantlist__44un1__p7_0[] = { 4, }; -static const long _vq_lengthlist__44un1__p7_0[] = { +static const char _vq_lengthlist__44un1__p7_0[] = { 1, 5, 3,11,11,11,11,11,11,11, 8,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,10,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -7659,7 +7659,7 @@ static const long _vq_lengthlist__44un1__p7_0[] = { static const static_codebook _44un1__p7_0 = { 4, 625, - (long *)_vq_lengthlist__44un1__p7_0, + (char *)_vq_lengthlist__44un1__p7_0, 1, -518709248, 1626677248, 3, 0, (long *)_vq_quantlist__44un1__p7_0, 0 @@ -7681,7 +7681,7 @@ static const long _vq_quantlist__44un1__p7_1[] = { 12, }; -static const long _vq_lengthlist__44un1__p7_1[] = { +static const char _vq_lengthlist__44un1__p7_1[] = { 1, 4, 4, 6, 6, 6, 6, 9, 8, 9, 8, 8, 8, 5, 7, 7, 7, 7, 8, 8, 8,10, 8,10, 8, 9, 5, 7, 7, 8, 7, 7, 8,10,10,11,10,12,11, 7, 8, 8, 9, 9, 9,10,11,11, @@ -7697,7 +7697,7 @@ static const long _vq_lengthlist__44un1__p7_1[] = { static const static_codebook _44un1__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44un1__p7_1, + (char *)_vq_lengthlist__44un1__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44un1__p7_1, 0 @@ -7719,7 +7719,7 @@ static const long _vq_quantlist__44un1__p7_2[] = { 12, }; -static const long _vq_lengthlist__44un1__p7_2[] = { +static const char _vq_lengthlist__44un1__p7_2[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 8, 4, 5, 5, 6, 6, 8, 8, 9, 8, 9, 9, 9, 9, 4, 5, 5, 7, 6, 8, 8, 8, 8, 9, 8, 9, 8, 6, 7, 7, 7, 8, 8, 8, 9, 9, @@ -7735,13 +7735,13 @@ static const long _vq_lengthlist__44un1__p7_2[] = { static const static_codebook _44un1__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44un1__p7_2, + (char *)_vq_lengthlist__44un1__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44un1__p7_2, 0 }; -static const long _huff_lengthlist__44un1__short[] = { +static const char _huff_lengthlist__44un1__short[] = { 12,12,14,12,14,14,14,14,12, 6, 6, 8, 9, 9,11,14, 12, 4, 2, 6, 6, 7,11,14,13, 6, 5, 7, 8, 9,11,14, 13, 8, 5, 8, 6, 8,12,14,12, 7, 7, 8, 8, 8,10,14, @@ -7750,7 +7750,7 @@ static const long _huff_lengthlist__44un1__short[] = { static const static_codebook _huff_book__44un1__short = { 2, 64, - (long *)_huff_lengthlist__44un1__short, + (char *)_huff_lengthlist__44un1__short, 0, 0, 0, 0, 0, NULL, 0 diff --git a/Engine/lib/libvorbis/lib/codebook.c b/Engine/lib/libvorbis/lib/codebook.c index 3d68781fd..72f8a17a3 100644 --- a/Engine/lib/libvorbis/lib/codebook.c +++ b/Engine/lib/libvorbis/lib/codebook.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: basic codebook pack/unpack/code/decode operations - last mod: $Id: codebook.c 18183 2012-02-03 20:51:27Z xiphmont $ + last mod: $Id: codebook.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -53,16 +53,16 @@ int vorbis_staticbook_pack(const static_codebook *c,oggpack_buffer *opb){ oggpack_write(opb,c->lengthlist[0]-1,5); /* 1 to 32 */ for(i=1;ientries;i++){ - long this=c->lengthlist[i]; - long last=c->lengthlist[i-1]; + char this=c->lengthlist[i]; + char last=c->lengthlist[i-1]; if(this>last){ for(j=last;jentries-count)); + oggpack_write(opb,i-count,ov_ilog(c->entries-count)); count=i; } } } - oggpack_write(opb,i-count,_ilog(c->entries-count)); + oggpack_write(opb,i-count,ov_ilog(c->entries-count)); }else{ /* length random. Again, we don't code the codeword itself, just @@ -159,7 +159,7 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){ s->entries=oggpack_read(opb,24); if(s->entries==-1)goto _eofout; - if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout; + if(ov_ilog(s->dim)+ov_ilog(s->entries)>24)goto _eofout; /* codeword ordering.... length ordered or unordered? */ switch((int)oggpack_read(opb,1)){ @@ -203,7 +203,7 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){ s->lengthlist=_ogg_malloc(sizeof(*s->lengthlist)*s->entries); for(i=0;ientries;){ - long num=oggpack_read(opb,_ilog(s->entries-i)); + long num=oggpack_read(opb,ov_ilog(s->entries-i)); if(num==-1)goto _eofout; if(length>32 || num>s->entries-i || (num>0 && (num-1)>>(length-1)>1)){ @@ -312,6 +312,12 @@ STIN long decode_packed_entry_number(codebook *book, oggpack_buffer *b){ hi=book->used_entries; } + /* Single entry codebooks use a firsttablen of 1 and a + dec_maxlength of 1. If a single-entry codebook gets here (due to + failure to read one bit above), the next look attempt will also + fail and we'll correctly kick out instead of trying to walk the + underformed tree */ + lok = oggpack_look(b, read); while(lok<0 && read>1) diff --git a/Engine/lib/libvorbis/lib/codebook.h b/Engine/lib/libvorbis/lib/codebook.h index 94c30054c..537d6c12d 100644 --- a/Engine/lib/libvorbis/lib/codebook.h +++ b/Engine/lib/libvorbis/lib/codebook.h @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: basic shared codebook operations - last mod: $Id: codebook.h 17030 2010-03-25 06:52:55Z xiphmont $ + last mod: $Id: codebook.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -34,14 +34,14 @@ */ typedef struct static_codebook{ - long dim; /* codebook dimensions (elements per vector) */ - long entries; /* codebook entries */ - long *lengthlist; /* codeword lengths in bits */ + long dim; /* codebook dimensions (elements per vector) */ + long entries; /* codebook entries */ + char *lengthlist; /* codeword lengths in bits */ /* mapping ***************************************************************/ - int maptype; /* 0=none - 1=implicitly populated values from map column - 2=listed arbitrary values */ + int maptype; /* 0=none + 1=implicitly populated values from map column + 2=listed arbitrary values */ /* The below does a linear, single monotonic sequence mapping. */ long q_min; /* packed 32 bit float; quant value 0 maps to minval */ @@ -89,7 +89,6 @@ extern float *_book_logdist(const static_codebook *b,float *vals); extern float _float32_unpack(long val); extern long _float32_pack(float val); extern int _best(codebook *book, float *a, int step); -extern int _ilog(unsigned int v); extern long _book_maptype1_quantvals(const static_codebook *b); extern int vorbis_book_besterror(codebook *book,float *a,int step,int addmul); diff --git a/Engine/lib/libvorbis/lib/floor0.c b/Engine/lib/libvorbis/lib/floor0.c index 8e1985cdb..213cce4ec 100644 --- a/Engine/lib/libvorbis/lib/floor0.c +++ b/Engine/lib/libvorbis/lib/floor0.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: floor backend 0 implementation - last mod: $Id: floor0.c 18184 2012-02-03 20:55:12Z xiphmont $ + last mod: $Id: floor0.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -147,6 +147,9 @@ static vorbis_look_floor *floor0_look(vorbis_dsp_state *vd, vorbis_info_floor *i){ vorbis_info_floor0 *info=(vorbis_info_floor0 *)i; vorbis_look_floor0 *look=_ogg_calloc(1,sizeof(*look)); + + (void)vd; + look->m=info->order; look->ln=info->barkmap; look->vi=info; @@ -165,7 +168,7 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){ if(ampraw>0){ /* also handles the -1 out of data case */ long maxval=(1<ampbits)-1; float amp=(float)ampraw/maxval*info->ampdB; - int booknum=oggpack_read(&vb->opb,_ilog(info->numbooks)); + int booknum=oggpack_read(&vb->opb,ov_ilog(info->numbooks)); if(booknum!=-1 && booknumnumbooks){ /* be paranoid */ codec_setup_info *ci=vb->vd->vi->codec_setup; diff --git a/Engine/lib/libvorbis/lib/floor1.c b/Engine/lib/libvorbis/lib/floor1.c index d5c7ebf27..d8bd4645c 100644 --- a/Engine/lib/libvorbis/lib/floor1.c +++ b/Engine/lib/libvorbis/lib/floor1.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: floor backend 1 implementation - last mod: $Id: floor1.c 18151 2012-01-20 07:35:26Z xiphmont $ + last mod: $Id: floor1.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -72,25 +72,6 @@ static void floor1_free_look(vorbis_look_floor *i){ } } -static int ilog(unsigned int v){ - int ret=0; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - -static int ilog2(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static void floor1_pack (vorbis_info_floor *i,oggpack_buffer *opb){ vorbis_info_floor1 *info=(vorbis_info_floor1 *)i; int j,k; @@ -117,8 +98,10 @@ static void floor1_pack (vorbis_info_floor *i,oggpack_buffer *opb){ /* save out the post list */ oggpack_write(opb,info->mult-1,2); /* only 1,2,3,4 legal now */ - oggpack_write(opb,ilog2(maxposit),4); - rangebits=ilog2(maxposit); + /* maxposit cannot legally be less than 1; this is encode-side, we + can assume our setup is OK */ + oggpack_write(opb,ov_ilog(maxposit-1),4); + rangebits=ov_ilog(maxposit-1); for(j=0,k=0;jpartitions;j++){ count+=info->class_dim[info->partitionclass[j]]; @@ -203,6 +186,8 @@ static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd, vorbis_look_floor1 *look=_ogg_calloc(1,sizeof(*look)); int i,j,n=0; + (void)vd; + look->vi=info; look->n=info->postlist[1]; @@ -852,9 +837,9 @@ int floor1_encode(oggpack_buffer *opb,vorbis_block *vb, /* beginning/end post */ look->frames++; - look->postbits+=ilog(look->quant_q-1)*2; - oggpack_write(opb,out[0],ilog(look->quant_q-1)); - oggpack_write(opb,out[1],ilog(look->quant_q-1)); + look->postbits+=ov_ilog(look->quant_q-1)*2; + oggpack_write(opb,out[0],ov_ilog(look->quant_q-1)); + oggpack_write(opb,out[1],ov_ilog(look->quant_q-1)); /* partition by partition */ @@ -870,7 +855,9 @@ int floor1_encode(oggpack_buffer *opb,vorbis_block *vb, /* generate the partition's first stage cascade value */ if(csubbits){ - int maxval[8]; + int maxval[8]={0,0,0,0,0,0,0,0}; /* gcc's static analysis + issues a warning without + initialization */ for(k=0;kclass_subbook[class][k]; if(booknum<0){ @@ -978,8 +965,8 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){ if(oggpack_read(&vb->opb,1)==1){ int *fit_value=_vorbis_block_alloc(vb,(look->posts)*sizeof(*fit_value)); - fit_value[0]=oggpack_read(&vb->opb,ilog(look->quant_q-1)); - fit_value[1]=oggpack_read(&vb->opb,ilog(look->quant_q-1)); + fit_value[0]=oggpack_read(&vb->opb,ov_ilog(look->quant_q-1)); + fit_value[1]=oggpack_read(&vb->opb,ov_ilog(look->quant_q-1)); /* partition by partition */ for(i=0,j=2;ipartitions;i++){ diff --git a/Engine/lib/libvorbis/lib/info.c b/Engine/lib/libvorbis/lib/info.c index 9e944c341..8a2a001f9 100644 --- a/Engine/lib/libvorbis/lib/info.c +++ b/Engine/lib/libvorbis/lib/info.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: maintain the info structure, info <-> header packets - last mod: $Id: info.c 18186 2012-02-03 22:08:44Z xiphmont $ + last mod: $Id: info.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -31,20 +31,10 @@ #include "misc.h" #include "os.h" -#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.3" -#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20120203 (Omnipresent)" +#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.5" +#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20150105 (⛄⛄⛄⛄)" /* helpers */ -static int ilog2(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){ while(bytes--){ @@ -272,7 +262,6 @@ static int _vorbis_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb){ static int _vorbis_unpack_books(vorbis_info *vi,oggpack_buffer *opb){ codec_setup_info *ci=vi->codec_setup; int i; - if(!ci)return(OV_EFAULT); /* codebooks */ ci->books=oggpack_read(opb,8)+1; @@ -411,6 +400,10 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) /* um... we didn't get the initial header */ return(OV_EBADHEADER); } + if(vc->vendor!=NULL){ + /* previously initialized comment header */ + return(OV_EBADHEADER); + } return(_vorbis_unpack_comment(vc,&opb)); @@ -419,6 +412,14 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) /* um... we didn;t get the initial header or comments yet */ return(OV_EBADHEADER); } + if(vi->codec_setup==NULL){ + /* improperly initialized vorbis_info */ + return(OV_EFAULT); + } + if(((codec_setup_info *)vi->codec_setup)->books>0){ + /* previously initialized setup header */ + return(OV_EBADHEADER); + } return(_vorbis_unpack_books(vi,&opb)); @@ -436,7 +437,11 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){ codec_setup_info *ci=vi->codec_setup; - if(!ci)return(OV_EFAULT); + if(!ci|| + ci->blocksizes[0]<64|| + ci->blocksizes[1]blocksizes[0]){ + return(OV_EFAULT); + } /* preamble */ oggpack_write(opb,0x01,8); @@ -451,8 +456,8 @@ static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){ oggpack_write(opb,vi->bitrate_nominal,32); oggpack_write(opb,vi->bitrate_lower,32); - oggpack_write(opb,ilog2(ci->blocksizes[0]),4); - oggpack_write(opb,ilog2(ci->blocksizes[1]),4); + oggpack_write(opb,ov_ilog(ci->blocksizes[0]-1),4); + oggpack_write(opb,ov_ilog(ci->blocksizes[1]-1),4); oggpack_write(opb,1,1); return(0); @@ -578,7 +583,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, oggpack_buffer opb; private_state *b=v->backend_state; - if(!b){ + if(!b||vi->channels<=0){ ret=OV_EFAULT; goto err_out; } diff --git a/Engine/lib/libvorbis/lib/lookups.pl b/Engine/lib/libvorbis/lib/lookups.pl new file mode 100644 index 000000000..bd92df78b --- /dev/null +++ b/Engine/lib/libvorbis/lib/lookups.pl @@ -0,0 +1,142 @@ +#!/usr/bin/perl +print <<'EOD'; +/******************************************************************** + * * + * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * + * * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * + * by the Xiph.Org Foundation http://www.xiph.org/ * + * * + ******************************************************************** + + function: lookup data; generated by lookups.pl; edit there + last mod: $Id: lookups.pl 13293 2007-07-24 00:09:47Z xiphmont $ + + ********************************************************************/ + +#ifndef _V_LOOKUP_DATA_H_ + +#ifdef FLOAT_LOOKUP +EOD + +$cos_sz=128; +$invsq_sz=32; +$invsq2exp_min=-32; +$invsq2exp_max=32; + +$fromdB_sz=35; +$fromdB_shift=5; +$fromdB2_shift=3; + +$invsq_i_shift=10; +$cos_i_shift=9; +$delta_shift=6; + +print "#define COS_LOOKUP_SZ $cos_sz\n"; +print "static float COS_LOOKUP[COS_LOOKUP_SZ+1]={\n"; + +for($i=0;$i<=$cos_sz;){ + print "\t"; + for($j=0;$j<4 && $i<=$cos_sz;$j++){ + printf "%+.13f,", cos(3.14159265358979323846*($i++)/$cos_sz) ; + } + print "\n"; +} +print "};\n\n"; + +print "#define INVSQ_LOOKUP_SZ $invsq_sz\n"; +print "static float INVSQ_LOOKUP[INVSQ_LOOKUP_SZ+1]={\n"; + +for($i=0;$i<=$invsq_sz;){ + print "\t"; + for($j=0;$j<4 && $i<=$invsq_sz;$j++){ + my$indexmap=$i++/$invsq_sz*.5+.5; + printf "%.12f,", 1./sqrt($indexmap); + } + print "\n"; +} +print "};\n\n"; + +print "#define INVSQ2EXP_LOOKUP_MIN $invsq2exp_min\n"; +print "#define INVSQ2EXP_LOOKUP_MAX $invsq2exp_max\n"; +print "static float INVSQ2EXP_LOOKUP[INVSQ2EXP_LOOKUP_MAX-\\\n". + " INVSQ2EXP_LOOKUP_MIN+1]={\n"; + +for($i=$invsq2exp_min;$i<=$invsq2exp_max;){ + print "\t"; + for($j=0;$j<4 && $i<=$invsq2exp_max;$j++){ + printf "%15.10g,", 2**($i++*-.5); + } + print "\n"; +} +print "};\n\n#endif\n\n"; + + +# 0 to -140 dB +$fromdB2_sz=1<<$fromdB_shift; +$fromdB_gran=1<<($fromdB_shift-$fromdB2_shift); +print "#define FROMdB_LOOKUP_SZ $fromdB_sz\n"; +print "#define FROMdB2_LOOKUP_SZ $fromdB2_sz\n"; +print "#define FROMdB_SHIFT $fromdB_shift\n"; +print "#define FROMdB2_SHIFT $fromdB2_shift\n"; +print "#define FROMdB2_MASK ".((1<<$fromdB_shift)-1)."\n"; + +print "static float FROMdB_LOOKUP[FROMdB_LOOKUP_SZ]={\n"; + +for($i=0;$i<$fromdB_sz;){ + print "\t"; + for($j=0;$j<4 && $i<$fromdB_sz;$j++){ + printf "%15.10g,", 10**(.05*(-$fromdB_gran*$i++)); + } + print "\n"; +} +print "};\n\n"; + +print "static float FROMdB2_LOOKUP[FROMdB2_LOOKUP_SZ]={\n"; + +for($i=0;$i<$fromdB2_sz;){ + print "\t"; + for($j=0;$j<4 && $i<$fromdB_sz;$j++){ + printf "%15.10g,", 10**(.05*(-$fromdB_gran/$fromdB2_sz*(.5+$i++))); + } + print "\n"; +} +print "};\n\n#ifdef INT_LOOKUP\n\n"; + + +$iisz=0x10000>>$invsq_i_shift; +print "#define INVSQ_LOOKUP_I_SHIFT $invsq_i_shift\n"; +print "#define INVSQ_LOOKUP_I_MASK ".(0x0ffff>>(16-$invsq_i_shift))."\n"; +print "static long INVSQ_LOOKUP_I[$iisz+1]={\n"; +for($i=0;$i<=$iisz;){ + print "\t"; + for($j=0;$j<4 && $i<=$iisz;$j++){ + my$indexmap=$i++/$iisz*.5+.5; + printf "%8d,", int(1./sqrt($indexmap)*65536.+.5); + } + print "\n"; +} +print "};\n\n"; + +$cisz=0x10000>>$cos_i_shift; +print "#define COS_LOOKUP_I_SHIFT $cos_i_shift\n"; +print "#define COS_LOOKUP_I_MASK ".(0x0ffff>>(16-$cos_i_shift))."\n"; +print "#define COS_LOOKUP_I_SZ $cisz\n"; +print "static long COS_LOOKUP_I[COS_LOOKUP_I_SZ+1]={\n"; + +for($i=0;$i<=$cisz;){ + print "\t"; + for($j=0;$j<4 && $i<=$cisz;$j++){ + printf "%8d,", int(cos(3.14159265358979323846*($i++)/$cos_sz)*16384.+.5) ; + } + print "\n"; +} +print "};\n\n"; + + +print "#endif\n\n#endif\n"; + + diff --git a/Engine/lib/libvorbis/lib/lsp.c b/Engine/lib/libvorbis/lib/lsp.c index 50031a7a1..6a619f7b0 100644 --- a/Engine/lib/libvorbis/lib/lsp.c +++ b/Engine/lib/libvorbis/lib/lsp.c @@ -11,7 +11,7 @@ ******************************************************************** function: LSP (also called LSF) conversion routines - last mod: $Id: lsp.c 17538 2010-10-15 02:52:29Z tterribe $ + last mod: $Id: lsp.c 19453 2015-03-02 22:35:34Z xiphmont $ The LSP generation code is taken (with minimal modification and a few bugfixes) from "On the Computation of the LSP Frequencies" by @@ -309,7 +309,6 @@ static int comp(const void *a,const void *b){ #define EPSILON 10e-7 static int Laguerre_With_Deflation(float *a,int ord,float *r){ int i,m; - double lastdelta=0.f; double *defl=alloca(sizeof(*defl)*(ord+1)); for(i=0;i<=ord;i++)defl[i]=a[i]; @@ -346,7 +345,6 @@ static int Laguerre_With_Deflation(float *a,int ord,float *r){ if(delta<0.f)delta*=-1; if(fabs(delta/new)<10e-12)break; - lastdelta=delta; } r[m-1]=new; diff --git a/Engine/lib/libvorbis/lib/mapping0.c b/Engine/lib/libvorbis/lib/mapping0.c index 7d279a857..85c7d22d8 100644 --- a/Engine/lib/libvorbis/lib/mapping0.c +++ b/Engine/lib/libvorbis/lib/mapping0.c @@ -11,7 +11,7 @@ ******************************************************************** function: channel mapping 0 implementation - last mod: $Id: mapping0.c 17022 2010-03-25 03:45:42Z xiphmont $ + last mod: $Id: mapping0.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -45,16 +45,6 @@ static void mapping0_free_info(vorbis_info_mapping *i){ } } -static int ilog(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, oggpack_buffer *opb){ int i; @@ -78,8 +68,8 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, oggpack_write(opb,info->coupling_steps-1,8); for(i=0;icoupling_steps;i++){ - oggpack_write(opb,info->coupling_mag[i],ilog(vi->channels)); - oggpack_write(opb,info->coupling_ang[i],ilog(vi->channels)); + oggpack_write(opb,info->coupling_mag[i],ov_ilog(vi->channels-1)); + oggpack_write(opb,info->coupling_ang[i],ov_ilog(vi->channels-1)); } }else oggpack_write(opb,0,1); @@ -104,6 +94,7 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(*info)); codec_setup_info *ci=vi->codec_setup; memset(info,0,sizeof(*info)); + if(vi->channels<=0)goto err_out; b=oggpack_read(opb,1); if(b<0)goto err_out; @@ -119,8 +110,11 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) info->coupling_steps=oggpack_read(opb,8)+1; if(info->coupling_steps<=0)goto err_out; for(i=0;icoupling_steps;i++){ - int testM=info->coupling_mag[i]=oggpack_read(opb,ilog(vi->channels)); - int testA=info->coupling_ang[i]=oggpack_read(opb,ilog(vi->channels)); + /* vi->channels > 0 is enforced in the caller */ + int testM=info->coupling_mag[i]= + oggpack_read(opb,ov_ilog(vi->channels-1)); + int testA=info->coupling_ang[i]= + oggpack_read(opb,ov_ilog(vi->channels-1)); if(testM<0 || testA<0 || diff --git a/Engine/lib/libvorbis/lib/misc.h b/Engine/lib/libvorbis/lib/misc.h index 85fe3074a..73b451989 100644 --- a/Engine/lib/libvorbis/lib/misc.h +++ b/Engine/lib/libvorbis/lib/misc.h @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: miscellaneous prototypes - last mod: $Id: misc.h 16227 2009-07-08 06:58:46Z xiphmont $ + last mod: $Id: misc.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -21,6 +21,7 @@ extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes); extern void _vorbis_block_ripcord(vorbis_block *vb); +extern int ov_ilog(ogg_uint32_t v); #ifdef ANALYSIS extern int analysis_noisy; diff --git a/Engine/lib/libvorbis/lib/modes/residue_44p51.h b/Engine/lib/libvorbis/lib/modes/residue_44p51.h index 103e960d7..a52cc5245 100644 --- a/Engine/lib/libvorbis/lib/modes/residue_44p51.h +++ b/Engine/lib/libvorbis/lib/modes/residue_44p51.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel residue templates for 32/44.1/48kHz uncoupled - last mod: $Id$ + last mod: $Id: residue_44p51.h 19013 2013-11-12 04:04:50Z giles $ ********************************************************************/ diff --git a/Engine/lib/libvorbis/lib/modes/setup_44p51.h b/Engine/lib/libvorbis/lib/modes/setup_44p51.h index e46468a15..67d997960 100644 --- a/Engine/lib/libvorbis/lib/modes/setup_44p51.h +++ b/Engine/lib/libvorbis/lib/modes/setup_44p51.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel settings for 44.1/48kHz 5.1 surround modes - last mod: $Id$ + last mod: $Id: setup_44p51.h 19013 2013-11-12 04:04:50Z giles $ ********************************************************************/ diff --git a/Engine/lib/libvorbis/lib/os.h b/Engine/lib/libvorbis/lib/os.h index 276b4decc..8bc3e5fe9 100644 --- a/Engine/lib/libvorbis/lib/os.h +++ b/Engine/lib/libvorbis/lib/os.h @@ -7,13 +7,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os.h 16227 2009-07-08 06:58:46Z xiphmont $ + last mod: $Id: os.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -119,8 +119,9 @@ static inline int vorbis_ftoi(double f){ /* yes, double! Otherwise, /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the - * 64 bit compiler */ -#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) + * 64 bit compiler and doesn't work on arm. */ +#if defined(_MSC_VER) && !defined(_WIN64) && \ + !defined(_WIN32_WCE) && !defined(_M_ARM) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; @@ -135,9 +136,11 @@ static __inline int vorbis_ftoi(double f){ } static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ + (void)fpu; } static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + (void)fpu; } #endif /* Special MSVC 32 bit implementation */ @@ -156,9 +159,11 @@ static __inline int vorbis_ftoi(double f){ } static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ + (void)fpu; } static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + (void)fpu; } #endif /* Special MSVC x64 implementation */ diff --git a/Engine/lib/libvorbis/lib/res0.c b/Engine/lib/libvorbis/lib/res0.c index fa0ad9756..ec11488c2 100644 --- a/Engine/lib/libvorbis/lib/res0.c +++ b/Engine/lib/libvorbis/lib/res0.c @@ -11,7 +11,7 @@ ******************************************************************** function: residue backend 0, 1 and 2 implementation - last mod: $Id: res0.c 17556 2010-10-21 18:25:19Z tterribe $ + last mod: $Id: res0.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -152,15 +152,6 @@ void res0_free_look(vorbis_look_residue *i){ } } -static int ilog(unsigned int v){ - int ret=0; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static int icount(unsigned int v){ int ret=0; while(v){ @@ -186,7 +177,7 @@ void res0_pack(vorbis_info_residue *vr,oggpack_buffer *opb){ bitmask of one indicates this partition class has bits to write this pass */ for(j=0;jpartitions;j++){ - if(ilog(info->secondstages[j])>3){ + if(ov_ilog(info->secondstages[j])>3){ /* yes, this is a minor hack due to not thinking ahead */ oggpack_write(opb,info->secondstages[j],3); oggpack_write(opb,1,1); @@ -284,7 +275,7 @@ vorbis_look_residue *res0_look(vorbis_dsp_state *vd, look->partbooks=_ogg_calloc(look->parts,sizeof(*look->partbooks)); for(j=0;jparts;j++){ - int stages=ilog(info->secondstages[j]); + int stages=ov_ilog(info->secondstages[j]); if(stages){ if(stages>maxstage)maxstage=stages; look->partbooks[j]=_ogg_calloc(stages,sizeof(*look->partbooks[j])); @@ -390,8 +381,13 @@ static int local_book_besterror(codebook *book,int *a){ return(index); } +#ifdef TRAIN_RES static int _encodepart(oggpack_buffer *opb,int *vec, int n, codebook *book,long *acc){ +#else +static int _encodepart(oggpack_buffer *opb,int *vec, int n, + codebook *book){ +#endif int i,bits=0; int dim=book->dim; int step=n/dim; @@ -534,12 +530,18 @@ static long **_2class(vorbis_block *vb,vorbis_look_residue *vl,int **in, } static int _01forward(oggpack_buffer *opb, - vorbis_block *vb,vorbis_look_residue *vl, + vorbis_look_residue *vl, int **in,int ch, long **partword, +#ifdef TRAIN_RES int (*encode)(oggpack_buffer *,int *,int, codebook *,long *), - int submap){ + int submap +#else + int (*encode)(oggpack_buffer *,int *,int, + codebook *) +#endif +){ long i,j,k,s; vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; vorbis_info_residue0 *info=look->info; @@ -609,9 +611,8 @@ static int _01forward(oggpack_buffer *opb, codebook *statebook=look->partbooks[partword[j][i]][s]; if(statebook){ int ret; - long *accumulator=NULL; - #ifdef TRAIN_RES + long *accumulator=NULL; accumulator=look->training_data[s][partword[j][i]]; { int l; @@ -623,10 +624,12 @@ static int _01forward(oggpack_buffer *opb, look->training_max[s][partword[j][i]]=samples[l]; } } -#endif - ret=encode(opb,in[j]+offset,samples_per_partition, statebook,accumulator); +#else + ret=encode(opb,in[j]+offset,samples_per_partition, + statebook); +#endif look->postbits+=ret; resbits[partword[j][i]]+=ret; @@ -637,19 +640,6 @@ static int _01forward(oggpack_buffer *opb, } } - /*{ - long total=0; - long totalbits=0; - fprintf(stderr,"%d :: ",vb->mode); - for(k=0;k>=1; - } - return(ret); + +int ov_ilog(ogg_uint32_t v){ + int ret; + for(ret=0;v;ret++)v>>=1; + return ret; } /* 32 bit float (not IEEE; nonnormalized mantissa + @@ -70,7 +68,7 @@ float _float32_unpack(long val){ /* given a list of word lengths, generate a list of codewords. Works for length ordered or unordered, always assigns the lowest valued codewords first. Extended to handle unused entries (length 0) */ -ogg_uint32_t *_make_words(long *l,long n,long sparsecount){ +ogg_uint32_t *_make_words(char *l,long n,long sparsecount){ long i,j,count=0; ogg_uint32_t marker[33]; ogg_uint32_t *r=_ogg_malloc((sparsecount?sparsecount:n)*sizeof(*r)); @@ -125,16 +123,15 @@ ogg_uint32_t *_make_words(long *l,long n,long sparsecount){ if(sparsecount==0)count++; } - /* sanity check the huffman tree; an underpopulated tree must be - rejected. The only exception is the one-node pseudo-nil tree, - which appears to be underpopulated because the tree doesn't - really exist; there's only one possible 'codeword' or zero bits, - but the above tree-gen code doesn't mark that. */ - if(sparsecount != 1){ + /* any underpopulated tree must be rejected. */ + /* Single-entry codebooks are a retconned extension to the spec. + They have a single codeword '0' of length 1 that results in an + underpopulated tree. Shield that case from the underformed tree check. */ + if(!(count==1 && marker[2]==2)){ for(i=1;i<33;i++) if(marker[i] & (0xffffffffUL>>(32-i))){ - _ogg_free(r); - return(NULL); + _ogg_free(r); + return(NULL); } } @@ -313,9 +310,10 @@ static int sort32a(const void *a,const void *b){ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ int i,j,n=0,tabn; int *sortindex; + memset(c,0,sizeof(*c)); - /* count actually used entries */ + /* count actually used entries and find max length */ for(i=0;ientries;i++) if(s->lengthlist[i]>0) n++; @@ -325,7 +323,6 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ c->dim=s->dim; if(n>0){ - /* two different remappings go on here. First, we collapse the likely sparse codebook down only to @@ -361,7 +358,6 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ c->codelist[sortindex[i]]=codes[i]; _ogg_free(codes); - c->valuelist=_book_unquantize(s,n,sortindex); c->dec_index=_ogg_malloc(n*sizeof(*c->dec_index)); @@ -370,51 +366,62 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ c->dec_index[sortindex[n++]]=i; c->dec_codelengths=_ogg_malloc(n*sizeof(*c->dec_codelengths)); - for(n=0,i=0;ientries;i++) - if(s->lengthlist[i]>0) - c->dec_codelengths[sortindex[n++]]=s->lengthlist[i]; - - c->dec_firsttablen=_ilog(c->used_entries)-4; /* this is magic */ - if(c->dec_firsttablen<5)c->dec_firsttablen=5; - if(c->dec_firsttablen>8)c->dec_firsttablen=8; - - tabn=1<dec_firsttablen; - c->dec_firsttable=_ogg_calloc(tabn,sizeof(*c->dec_firsttable)); c->dec_maxlength=0; - - for(i=0;idec_maxlengthdec_codelengths[i]) - c->dec_maxlength=c->dec_codelengths[i]; - if(c->dec_codelengths[i]<=c->dec_firsttablen){ - ogg_uint32_t orig=bitreverse(c->codelist[i]); - for(j=0;j<(1<<(c->dec_firsttablen-c->dec_codelengths[i]));j++) - c->dec_firsttable[orig|(j<dec_codelengths[i])]=i+1; + for(n=0,i=0;ientries;i++) + if(s->lengthlist[i]>0){ + c->dec_codelengths[sortindex[n++]]=s->lengthlist[i]; + if(s->lengthlist[i]>c->dec_maxlength) + c->dec_maxlength=s->lengthlist[i]; } - } - /* now fill in 'unused' entries in the firsttable with hi/lo search - hints for the non-direct-hits */ - { - ogg_uint32_t mask=0xfffffffeUL<<(31-c->dec_firsttablen); - long lo=0,hi=0; + if(n==1 && c->dec_maxlength==1){ + /* special case the 'single entry codebook' with a single bit + fastpath table (that always returns entry 0 )in order to use + unmodified decode paths. */ + c->dec_firsttablen=1; + c->dec_firsttable=_ogg_calloc(2,sizeof(*c->dec_firsttable)); + c->dec_firsttable[0]=c->dec_firsttable[1]=1; - for(i=0;idec_firsttablen); - if(c->dec_firsttable[bitreverse(word)]==0){ - while((lo+1)codelist[lo+1]<=word)lo++; - while( hi=(c->codelist[hi]&mask))hi++; + }else{ + c->dec_firsttablen=ov_ilog(c->used_entries)-4; /* this is magic */ + if(c->dec_firsttablen<5)c->dec_firsttablen=5; + if(c->dec_firsttablen>8)c->dec_firsttablen=8; - /* we only actually have 15 bits per hint to play with here. - In order to overflow gracefully (nothing breaks, efficiency - just drops), encode as the difference from the extremes. */ - { - unsigned long loval=lo; - unsigned long hival=n-hi; + tabn=1<dec_firsttablen; + c->dec_firsttable=_ogg_calloc(tabn,sizeof(*c->dec_firsttable)); - if(loval>0x7fff)loval=0x7fff; - if(hival>0x7fff)hival=0x7fff; - c->dec_firsttable[bitreverse(word)]= - 0x80000000UL | (loval<<15) | hival; + for(i=0;idec_codelengths[i]<=c->dec_firsttablen){ + ogg_uint32_t orig=bitreverse(c->codelist[i]); + for(j=0;j<(1<<(c->dec_firsttablen-c->dec_codelengths[i]));j++) + c->dec_firsttable[orig|(j<dec_codelengths[i])]=i+1; + } + } + + /* now fill in 'unused' entries in the firsttable with hi/lo search + hints for the non-direct-hits */ + { + ogg_uint32_t mask=0xfffffffeUL<<(31-c->dec_firsttablen); + long lo=0,hi=0; + + for(i=0;idec_firsttablen); + if(c->dec_firsttable[bitreverse(word)]==0){ + while((lo+1)codelist[lo+1]<=word)lo++; + while( hi=(c->codelist[hi]&mask))hi++; + + /* we only actually have 15 bits per hint to play with here. + In order to overflow gracefully (nothing breaks, efficiency + just drops), encode as the difference from the extremes. */ + { + unsigned long loval=lo; + unsigned long hival=n-hi; + + if(loval>0x7fff)loval=0x7fff; + if(hival>0x7fff)hival=0x7fff; + c->dec_firsttable[bitreverse(word)]= + 0x80000000UL | (loval<<15) | hival; + } } } } diff --git a/Engine/lib/libvorbis/lib/synthesis.c b/Engine/lib/libvorbis/lib/synthesis.c index 1af211d00..932d271a6 100644 --- a/Engine/lib/libvorbis/lib/synthesis.c +++ b/Engine/lib/libvorbis/lib/synthesis.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: single-block PCM synthesis - last mod: $Id: synthesis.c 17474 2010-09-30 03:41:41Z gmaxwell $ + last mod: $Id: synthesis.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -145,6 +145,11 @@ long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ oggpack_buffer opb; int mode; + if(ci==NULL || ci->modes<=0){ + /* codec setup not properly intialized */ + return(OV_EFAULT); + } + oggpack_readinit(&opb,op->packet,op->bytes); /* Check the packet type */ @@ -153,18 +158,9 @@ long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ return(OV_ENOTAUDIO); } - { - int modebits=0; - int v=ci->modes; - while(v>1){ - modebits++; - v>>=1; - } - - /* read our mode and pre/post windowsize */ - mode=oggpack_read(&opb,modebits); - } - if(mode==-1)return(OV_EBADPACKET); + /* read our mode and pre/post windowsize */ + mode=oggpack_read(&opb,ov_ilog(ci->modes-1)); + if(mode==-1 || !ci->mode_param[mode])return(OV_EBADPACKET); return(ci->blocksizes[ci->mode_param[mode]->blockflag]); } diff --git a/Engine/lib/libvorbis/lib/vorbisenc.c b/Engine/lib/libvorbis/lib/vorbisenc.c index f0f7c0855..b5d621e90 100644 --- a/Engine/lib/libvorbis/lib/vorbisenc.c +++ b/Engine/lib/libvorbis/lib/vorbisenc.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: simple programmatic interface for encoder mode setup - last mod: $Id: vorbisenc.c 17028 2010-03-25 05:22:15Z xiphmont $ + last mod: $Id: vorbisenc.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -903,8 +903,12 @@ int vorbis_encode_setup_vbr(vorbis_info *vi, long channels, long rate, float quality){ - codec_setup_info *ci=vi->codec_setup; - highlevel_encode_setup *hi=&ci->hi; + codec_setup_info *ci; + highlevel_encode_setup *hi; + if(rate<=0) return OV_EINVAL; + + ci=vi->codec_setup; + hi=&ci->hi; quality+=.0000001; if(quality>=1.)quality=.9999; @@ -948,9 +952,14 @@ int vorbis_encode_setup_managed(vorbis_info *vi, long nominal_bitrate, long min_bitrate){ - codec_setup_info *ci=vi->codec_setup; - highlevel_encode_setup *hi=&ci->hi; - double tnominal=nominal_bitrate; + codec_setup_info *ci; + highlevel_encode_setup *hi; + double tnominal; + if(rate<=0) return OV_EINVAL; + + ci=vi->codec_setup; + hi=&ci->hi; + tnominal=nominal_bitrate; if(nominal_bitrate<=0.){ if(max_bitrate>0.){ diff --git a/Engine/lib/libvorbis/lib/vorbisfile.c b/Engine/lib/libvorbis/lib/vorbisfile.c index 3afbd9d00..fc0c86ff1 100644 --- a/Engine/lib/libvorbis/lib/vorbisfile.c +++ b/Engine/lib/libvorbis/lib/vorbisfile.c @@ -5,13 +5,13 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $ + last mod: $Id: vorbisfile.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -80,11 +80,14 @@ static long _get_data(OggVorbis_File *vf){ /* save a tiny smidge of verbosity to make the code more readable */ static int _seek_helper(OggVorbis_File *vf,ogg_int64_t offset){ if(vf->datasource){ - if(!(vf->callbacks.seek_func)|| - (vf->callbacks.seek_func)(vf->datasource, offset, SEEK_SET) == -1) - return OV_EREAD; - vf->offset=offset; - ogg_sync_reset(&vf->oy); + /* only seek if the file position isn't already there */ + if(vf->offset != offset){ + if(!(vf->callbacks.seek_func)|| + (vf->callbacks.seek_func)(vf->datasource, offset, SEEK_SET) == -1) + return OV_EREAD; + vf->offset=offset; + ogg_sync_reset(&vf->oy); + } }else{ /* shouldn't happen unless someone writes a broken callback */ return OV_EFAULT; @@ -138,14 +141,12 @@ static ogg_int64_t _get_next_page(OggVorbis_File *vf,ogg_page *og, } } -/* find the latest page beginning before the current stream cursor - position. Much dirtier than the above as Ogg doesn't have any - backward search linkage. no 'readp' as it will certainly have to - read. */ +/* find the latest page beginning before the passed in position. Much + dirtier than the above as Ogg doesn't have any backward search + linkage. no 'readp' as it will certainly have to read. */ /* returns offset or OV_EREAD, OV_FAULT */ -static ogg_int64_t _get_prev_page(OggVorbis_File *vf,ogg_page *og){ - ogg_int64_t begin=vf->offset; - ogg_int64_t end=begin; +static ogg_int64_t _get_prev_page(OggVorbis_File *vf,ogg_int64_t begin,ogg_page *og){ + ogg_int64_t end = begin; ogg_int64_t ret; ogg_int64_t offset=-1; @@ -220,11 +221,10 @@ static int _lookup_page_serialno(ogg_page *og, long *serialno_list, int n){ info of last page of the matching serial number instead of the very last page. If no page of the specified serialno is seen, it will return the info of last page and alter *serialno. */ -static ogg_int64_t _get_prev_page_serial(OggVorbis_File *vf, +static ogg_int64_t _get_prev_page_serial(OggVorbis_File *vf, ogg_int64_t begin, long *serial_list, int serial_n, int *serialno, ogg_int64_t *granpos){ ogg_page og; - ogg_int64_t begin=vf->offset; ogg_int64_t end=begin; ogg_int64_t ret; @@ -438,9 +438,11 @@ static ogg_int64_t _initial_pcmoffset(OggVorbis_File *vf, vorbis_info *vi){ while((result=ogg_stream_packetout(&vf->os,&op))){ if(result>0){ /* ignore holes */ long thisblock=vorbis_packet_blocksize(vi,&op); - if(lastblock!=-1) - accumulated+=(lastblock+thisblock)>>2; - lastblock=thisblock; + if(thisblock>=0){ + if(lastblock!=-1) + accumulated+=(lastblock+thisblock)>>2; + lastblock=thisblock; + } } } @@ -494,10 +496,10 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, down to (or just started with) a single link. Now we need to find the last vorbis page belonging to the first vorbis stream for this link. */ - + searched = end; while(endserial != serialno){ endserial = serialno; - vf->offset=_get_prev_page_serial(vf,currentno_list,currentnos,&endserial,&endgran); + searched=_get_prev_page_serial(vf,searched,currentno_list,currentnos,&endserial,&endgran); } vf->links=m+1; @@ -518,10 +520,15 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, }else{ + /* last page is not in the starting stream's serial number list, + so we have multiple links. Find where the stream that begins + our bisection ends. */ + long *next_serialno_list=NULL; int next_serialnos=0; vorbis_info vi; vorbis_comment vc; + int testserial = serialno+1; /* the below guards against garbage seperating the last and first pages of two links. */ @@ -534,10 +541,8 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, bisect=(searched+endsearched)/2; } - if(bisect != vf->offset){ - ret=_seek_helper(vf,bisect); - if(ret)return(ret); - } + ret=_seek_helper(vf,bisect); + if(ret)return(ret); last=_get_next_page(vf,&og,-1); if(last==OV_EREAD)return(OV_EREAD); @@ -550,28 +555,22 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, } /* Bisection point found */ - /* for the time being, fetch end PCM offset the simple way */ - { - int testserial = serialno+1; - vf->offset = next; - while(testserial != serialno){ - testserial = serialno; - vf->offset=_get_prev_page_serial(vf,currentno_list,currentnos,&testserial,&searchgran); - } + searched = next; + while(testserial != serialno){ + testserial = serialno; + searched = _get_prev_page_serial(vf,searched,currentno_list,currentnos,&testserial,&searchgran); } - if(vf->offset!=next){ - ret=_seek_helper(vf,next); - if(ret)return(ret); - } + ret=_seek_helper(vf,next); + if(ret)return(ret); ret=_fetch_headers(vf,&vi,&vc,&next_serialno_list,&next_serialnos,NULL); if(ret)return(ret); serialno = vf->os.serialno; dataoffset = vf->offset; - /* this will consume a page, however the next bistection always + /* this will consume a page, however the next bisection always starts with a raw seek */ pcmoffset = _initial_pcmoffset(vf,&vi); @@ -638,11 +637,11 @@ static int _open_seekable2(OggVorbis_File *vf){ /* Get the offset of the last page of the physical bitstream, or, if we're lucky the last vorbis page of this link as most OggVorbis files will contain a single logical bitstream */ - end=_get_prev_page_serial(vf,vf->serialnos+2,vf->serialnos[1],&endserial,&endgran); + end=_get_prev_page_serial(vf,vf->end,vf->serialnos+2,vf->serialnos[1],&endserial,&endgran); if(end<0)return(end); /* now determine bitstream structure recursively */ - if(_bisect_forward_serialno(vf,0,dataoffset,vf->offset,endgran,endserial, + if(_bisect_forward_serialno(vf,0,dataoffset,end,endgran,endserial, vf->serialnos+2,vf->serialnos[1],0)<0)return(OV_EREAD); vf->offsets[0]=0; @@ -1055,7 +1054,11 @@ int ov_halfrate_p(OggVorbis_File *vf){ /* Only partially open the vorbis file; test for Vorbisness, and load the headers for the first chain. Do not seek (although test for seekability). Use ov_test_open to finish opening the file, else - ov_clear to close/free it. Same return codes as open. */ + ov_clear to close/free it. Same return codes as open. + + Note that vorbisfile does _not_ take ownership of the file if the + call fails; the calling applicaiton is responsible for closing the file + if this call returns an error. */ int ov_test_callbacks(void *f,OggVorbis_File *vf, const char *initial,long ibytes,ov_callbacks callbacks) @@ -1417,22 +1420,41 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ if(pos>=total)break; } - /* search within the logical bitstream for the page with the highest - pcm_pos preceding (or equal to) pos. There is a danger here; - missing pages or incorrect frame number information in the - bitstream could make our task impossible. Account for that (it - would be an error condition) */ + /* Search within the logical bitstream for the page with the highest + pcm_pos preceding pos. If we're looking for a position on the + first page, bisection will halt without finding our position as + it's before the first explicit granulepos fencepost. That case is + handled separately below. + + There is a danger here; missing pages or incorrect frame number + information in the bitstream could make our task impossible. + Account for that (it would be an error condition) */ + + /* new search algorithm originally by HB (Nicholas Vinen) */ - /* new search algorithm by HB (Nicholas Vinen) */ { ogg_int64_t end=vf->offsets[link+1]; - ogg_int64_t begin=vf->offsets[link]; + ogg_int64_t begin=vf->dataoffsets[link]; ogg_int64_t begintime = vf->pcmlengths[link*2]; ogg_int64_t endtime = vf->pcmlengths[link*2+1]+begintime; ogg_int64_t target=pos-total+begintime; - ogg_int64_t best=begin; + ogg_int64_t best=-1; + int got_page=0; ogg_page og; + + /* if we have only one page, there will be no bisection. Grab the page here */ + if(begin==end){ + result=_seek_helper(vf,begin); + if(result) goto seek_error; + + result=_get_next_page(vf,&og,1); + if(result<0) goto seek_error; + + got_page=1; + } + + /* bisection loop */ while(beginoffset){ - result=_seek_helper(vf,bisect); - if(result) goto seek_error; - } + result=_seek_helper(vf,bisect); + if(result) goto seek_error; + /* read loop within the bisection loop */ while(beginoffset); if(result==OV_EREAD) goto seek_error; if(result<0){ + /* there is no next page! */ if(bisect<=begin+1) - end=begin; /* found it */ + /* No bisection left to perform. We've either found the + best candidate already or failed. Exit loop. */ + end=begin; else{ + /* We tried to load a fraction of the last page; back up a + bit and try to get the whole last page */ if(bisect==0) goto seek_error; bisect-=CHUNKSIZE; + + /* don't repeat/loop on a read we've already performed */ if(bisect<=begin)bisect=begin+1; + + /* seek and cntinue bisection */ result=_seek_helper(vf,bisect); if(result) goto seek_error; } }else{ ogg_int64_t granulepos; + got_page=1; + /* got a page. analyze it */ + /* only consider pages from primary vorbis stream */ if(ogg_page_serialno(&og)!=vf->serialnos[link]) continue; + /* only consider pages with the granulepos set */ granulepos=ogg_page_granulepos(&og); if(granulepos==-1)continue; if(granuleposoffset; /* raw offset of next page */ begintime=granulepos; + /* if we're before our target but within a short distance, + don't bisect; read forward */ if(target-begintime>44100)break; - bisect=begin; /* *not* begin + 1 */ + + bisect=begin; /* *not* begin + 1 as above */ }else{ - if(bisect<=begin+1) - end=begin; /* found it */ - else{ - if(end==vf->offset){ /* we're pretty close - we'd be stuck in */ + + /* This is one of our pages, but the granpos is + post-target; it is not a bisection return + candidate. (The only way we'd use it is if it's the + first page in the stream; we handle that case later + outside the bisection) */ + if(bisect<=begin+1){ + /* No bisection left to perform. We've either found the + best candidate already or failed. Exit loop. */ + end=begin; + }else{ + if(end==vf->offset){ + /* bisection read to the end; use the known page + boundary (result) to update bisection, back up a + little bit, and try again */ end=result; - bisect-=CHUNKSIZE; /* an endless loop otherwise. */ + bisect-=CHUNKSIZE; if(bisect<=begin)bisect=begin+1; result=_seek_helper(vf,bisect); if(result) goto seek_error; }else{ + /* Normal bisection */ end=bisect; endtime=granulepos; break; @@ -1502,9 +1553,46 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ } } - /* found our page. seek to it, update pcm offset. Easier case than - raw_seek, don't keep packets preceding granulepos. */ - { + /* Out of bisection: did it 'fail?' */ + if(best == -1){ + + /* Check the 'looking for data in first page' special case; + bisection would 'fail' because our search target was before the + first PCM granule position fencepost. */ + + if(got_page && + begin == vf->dataoffsets[link] && + ogg_page_serialno(&og)==vf->serialnos[link]){ + + /* Yes, this is the beginning-of-stream case. We already have + our page, right at the beginning of PCM data. Set state + and return. */ + + vf->pcm_offset=total; + + if(link!=vf->current_link){ + /* Different link; dump entire decode machine */ + _decode_clear(vf); + + vf->current_link=link; + vf->current_serialno=vf->serialnos[link]; + vf->ready_state=STREAMSET; + + }else{ + vorbis_synthesis_restart(&vf->vd); + } + + ogg_stream_reset_serialno(&vf->os,vf->current_serialno); + ogg_stream_pagein(&vf->os,&og); + + }else + goto seek_error; + + }else{ + + /* Bisection found our page. seek to it, update pcm offset. Easier case than + raw_seek, don't keep packets preceding granulepos. */ + ogg_page og; ogg_packet op; @@ -1534,23 +1622,23 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ while(1){ result=ogg_stream_packetpeek(&vf->os,&op); if(result==0){ - /* !!! the packet finishing this page originated on a - preceding page. Keep fetching previous pages until we - get one with a granulepos or without the 'continued' flag - set. Then just use raw_seek for simplicity. */ - - result=_seek_helper(vf,best); - if(result<0) goto seek_error; - - while(1){ - result=_get_prev_page(vf,&og); + /* No packet returned; we exited the bisection with 'best' + pointing to a page with a granule position, so the packet + finishing this page ('best') originated on a preceding + page. Keep fetching previous pages until we get one with + a granulepos or without the 'continued' flag set. Then + just use raw_seek for simplicity. */ + /* Do not rewind past the beginning of link data; if we do, + it's either a bug or a broken stream */ + result=best; + while(result>vf->dataoffsets[link]){ + result=_get_prev_page(vf,result,&og); if(result<0) goto seek_error; if(ogg_page_serialno(&og)==vf->current_serialno && (ogg_page_granulepos(&og)>-1 || !ogg_page_continued(&og))){ return ov_raw_seek(vf,result); } - vf->offset=result; } } if(result<0){ @@ -2054,14 +2142,14 @@ long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int length, } } -extern float *vorbis_window(vorbis_dsp_state *v,int W); +extern const float *vorbis_window(vorbis_dsp_state *v,int W); static void _ov_splice(float **pcm,float **lappcm, int n1, int n2, int ch1, int ch2, - float *w1, float *w2){ + const float *w1, const float *w2){ int i,j; - float *w=w1; + const float *w=w1; int n=n1; if(n1>n2){ @@ -2169,7 +2257,7 @@ int ov_crosslap(OggVorbis_File *vf1, OggVorbis_File *vf2){ vorbis_info *vi1,*vi2; float **lappcm; float **pcm; - float *w1,*w2; + const float *w1,*w2; int n1,n2,i,ret,hs1,hs2; if(vf1==vf2)return(0); /* degenerate case */ @@ -2223,7 +2311,7 @@ static int _ov_64_seek_lap(OggVorbis_File *vf,ogg_int64_t pos, vorbis_info *vi; float **lappcm; float **pcm; - float *w1,*w2; + const float *w1,*w2; int n1,n2,ch1,ch2,hs; int i,ret; @@ -2284,7 +2372,7 @@ static int _ov_d_seek_lap(OggVorbis_File *vf,double pos, vorbis_info *vi; float **lappcm; float **pcm; - float *w1,*w2; + const float *w1,*w2; int n1,n2,ch1,ch2,hs; int i,ret; diff --git a/Engine/lib/libvorbis/lib/window.c b/Engine/lib/libvorbis/lib/window.c index efebbfa8a..0305b7929 100644 --- a/Engine/lib/libvorbis/lib/window.c +++ b/Engine/lib/libvorbis/lib/window.c @@ -11,7 +11,7 @@ ******************************************************************** function: window functions - last mod: $Id: window.c 16227 2009-07-08 06:58:46Z xiphmont $ + last mod: $Id: window.c 19028 2013-12-02 23:23:39Z tterribe $ ********************************************************************/ @@ -19,6 +19,7 @@ #include #include "os.h" #include "misc.h" +#include "window.h" static const float vwin64[32] = { 0.0009460463F, 0.0085006468F, 0.0235352254F, 0.0458950567F, diff --git a/Engine/lib/libvorbis/lib/window.h b/Engine/lib/libvorbis/lib/window.h index 192bd9cfe..51f97599f 100644 --- a/Engine/lib/libvorbis/lib/window.h +++ b/Engine/lib/libvorbis/lib/window.h @@ -11,14 +11,14 @@ ******************************************************************** function: window functions - last mod: $Id: window.h 13293 2007-07-24 00:09:47Z xiphmont $ + last mod: $Id: window.h 19028 2013-12-02 23:23:39Z tterribe $ ********************************************************************/ #ifndef _V_WINDOW_ #define _V_WINDOW_ -extern float *_vorbis_window_get(int n); +extern const float *_vorbis_window_get(int n); extern void _vorbis_apply_window(float *d,int *winno,long *blocksizes, int lW,int W,int nW); diff --git a/Engine/lib/sdl/Android.mk b/Engine/lib/sdl/Android.mk old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/BUGS.txt b/Engine/lib/sdl/BUGS.txt index c5ed3af23..6a4cbb7ad 100644 --- a/Engine/lib/sdl/BUGS.txt +++ b/Engine/lib/sdl/BUGS.txt @@ -1,7 +1,7 @@ Bugs are now managed in the SDL bug tracker, here: - http://bugzilla.libsdl.org/ + https://bugzilla.libsdl.org/ You may report bugs there, and search to see if a given issue has already been reported, discussed, and maybe even fixed. diff --git a/Engine/lib/sdl/CMakeLists.txt b/Engine/lib/sdl/CMakeLists.txt index 63244a9e2..54a23f0c7 100644 --- a/Engine/lib/sdl/CMakeLists.txt +++ b/Engine/lib/sdl/CMakeLists.txt @@ -2,8 +2,19 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the SDL source code and call cmake from there") endif() -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.5) project(SDL2 C) + +# !!! FIXME: this should probably do "MACOSX_RPATH ON" as a target property +# !!! FIXME: for the SDL2 shared library (so you get an +# !!! FIXME: install_name ("soname") of "@rpath/libSDL-whatever.dylib" +# !!! FIXME: instead of "/usr/local/lib/libSDL-whatever.dylib"), but I'm +# !!! FIXME: punting for now and leaving the existing behavior. Until this +# !!! FIXME: properly resolved, this line silences a warning in CMake 3.0+. +# !!! FIXME: remove it and this comment entirely once the problem is +# !!! FIXME: properly resolved. +#cmake_policy(SET CMP0042 OLD) + include(CheckFunctionExists) include(CheckLibraryExists) include(CheckIncludeFiles) @@ -15,6 +26,7 @@ include(CheckTypeSize) include(CheckStructHasMember) include(CMakeDependentOption) include(FindPkgConfig) +include(GNUInstallDirs) set(CMAKE_MODULE_PATH "${SDL2_SOURCE_DIR}/cmake") include(${SDL2_SOURCE_DIR}/cmake/macros.cmake) include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake) @@ -29,9 +41,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake) # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0. set(SDL_MAJOR_VERSION 2) set(SDL_MINOR_VERSION 0) -set(SDL_MICRO_VERSION 4) -set(SDL_INTERFACE_AGE 0) -set(SDL_BINARY_AGE 4) +set(SDL_MICRO_VERSION 5) +set(SDL_INTERFACE_AGE 1) +set(SDL_BINARY_AGE 5) set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") # Calculate a libtool-like version number @@ -147,8 +159,10 @@ endif() # Default flags, if not set otherwise if("$ENV{CFLAGS}" STREQUAL "") - if(USE_GCC OR USE_CLANG) - set(CMAKE_C_FLAGS "-g -O3") + if(CMAKE_BUILD_TYPE STREQUAL "") + if(USE_GCC OR USE_CLANG) + set(CMAKE_C_FLAGS "-g -O3") + endif() endif() else() set(CMAKE_C_FLAGS "$ENV{CFLAGS}") @@ -183,8 +197,8 @@ endif() set(SDL_LIBS "-lSDL2") set(SDL_CFLAGS "") -# Emscripten toolchain has a nonempty default value for this, and the checks -# in this file need to change that, so remember the original value, and +# Emscripten toolchain has a nonempty default value for this, and the checks +# in this file need to change that, so remember the original value, and # restore back to that afterwards. For check_function_exists() to work in # Emscripten, this value must be at its default value. set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) @@ -192,7 +206,7 @@ set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) if(CYGWIN) # We build SDL on cygwin without the UNIX emulation layer include_directories("-I/usr/include/mingw") - set(CMAKE_REQUIRED_FLAGS "-mno-cygwin") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mno-cygwin") check_c_source_compiles("int main(int argc, char **argv) {}" HAVE_GCC_NO_CYGWIN) set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) @@ -212,7 +226,7 @@ include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include) set(OPT_DEF_ASM TRUE) if(EMSCRIPTEN) # Set up default values for the currently supported set of subsystems: - # Emscripten/Javascript does not have assembly support, a dynamic library + # Emscripten/Javascript does not have assembly support, a dynamic library # loading architecture, low-level CPU inspection or multithreading. set(OPT_DEF_ASM FALSE) set(SDL_SHARED_ENABLED_BY_DEFAULT OFF) @@ -299,6 +313,8 @@ set_option(VIDEO_VIVANTE "Use Vivante EGL video driver" ${UNIX_SYS}) set(SDL_SHARED ${SDL_SHARED_ENABLED_BY_DEFAULT} CACHE BOOL "Build a shared version of the library") set(SDL_STATIC ON CACHE BOOL "Build a static version of the library") +dep_option(SDL_STATIC_PIC "Static version of the library should be built with Position Independent Code" OFF "SDL_STATIC" OFF) + # General source files file(GLOB SOURCE_FILES ${SDL2_SOURCE_DIR}/src/*.c @@ -334,6 +350,24 @@ set(HAVE_ASSERTIONS ${ASSERTIONS}) # Compiler option evaluation if(USE_GCC OR USE_CLANG) + # Check for -Wall first, so later things can override pieces of it. + check_c_compiler_flag(-Wall HAVE_GCC_WALL) + if(HAVE_GCC_WALL) + list(APPEND EXTRA_CFLAGS "-Wall") + if(HAIKU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar") + endif() + endif() + + check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT) + if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT) + check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT) + if(HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT) + list(APPEND EXTRA_CFLAGS "-Werror=declaration-after-statement") + endif() + list(APPEND EXTRA_CFLAGS "-Wdeclaration-after-statement") + endif() + if(DEPENDENCY_TRACKING) check_c_source_compiles(" #if !defined(__GNUC__) || __GNUC__ < 3 @@ -375,26 +409,16 @@ if(USE_GCC OR USE_CLANG) endif() set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) - check_c_compiler_flag(-Wall HAVE_GCC_WALL) - if(HAVE_GCC_WALL) - list(APPEND EXTRA_CFLAGS "-Wall") - if(HAIKU) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar") - endif() - endif() check_c_compiler_flag(-Wshadow HAVE_GCC_WSHADOW) if(HAVE_GCC_WSHADOW) list(APPEND EXTRA_CFLAGS "-Wshadow") endif() - # --no-undefined is unsupported with clang - if(NOT USE_CLANG) - set(CMAKE_REQUIRED_FLAGS "-Wl,--no-undefined") - check_c_compiler_flag("" HAVE_NO_UNDEFINED) - set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) - if(HAVE_NO_UNDEFINED) - list(APPEND EXTRA_LDFLAGS "-Wl,--no-undefined") - endif() + set(CMAKE_REQUIRED_FLAGS "-Wl,--no-undefined") + check_c_compiler_flag("" HAVE_NO_UNDEFINED) + set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) + if(HAVE_NO_UNDEFINED) + list(APPEND EXTRA_LDFLAGS "-Wl,--no-undefined") endif() endif() @@ -773,6 +797,16 @@ if(EMSCRIPTEN) set(SOURCE_FILES ${SOURCE_FILES} ${EM_POWER_SOURCES}) set(HAVE_SDL_POWER TRUE) endif() + if(SDL_TIMERS) + set(SDL_TIMER_UNIX 1) + file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/unix/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES}) + set(HAVE_SDL_TIMERS TRUE) + + if(CLOCK_GETTIME) + set(HAVE_CLOCK_GETTIME 1) + endif() + endif() if(SDL_VIDEO) set(SDL_VIDEO_DRIVER_EMSCRIPTEN 1) file(GLOB EM_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/emscripten/*.c) @@ -839,7 +873,7 @@ elseif(UNIX AND NOT APPLE) #include #include - int main(int argc, char **argv) + int main(int argc, char **argv) { struct kbentry kbe; kbe.kb_table = KG_CTRL; @@ -866,8 +900,24 @@ elseif(UNIX AND NOT APPLE) check_include_file("libudev.h" HAVE_LIBUDEV_H) - # !!! FIXME: this needs pkg-config to find the include path, I think. - check_include_file("dbus/dbus.h" HAVE_DBUS_DBUS_H) + if(PKG_CONFIG_FOUND) + pkg_search_module(DBUS dbus-1 dbus) + if(DBUS_FOUND) + set(HAVE_DBUS_DBUS_H TRUE) + include_directories(${DBUS_INCLUDE_DIRS}) + list(APPEND EXTRA_LIBS ${DBUS_LIBRARIES}) + endif() + + pkg_search_module(IBUS ibus-1.0 ibus) + if(IBUS_FOUND) + set(HAVE_IBUS_IBUS_H TRUE) + include_directories(${IBUS_INCLUDE_DIRS}) + list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES}) + endif() + endif() + + check_include_file("fcitx/frontend.h" HAVE_FCITX_FRONTEND_H) + endif() if(INPUT_TSLIB) @@ -936,7 +986,14 @@ elseif(UNIX AND NOT APPLE) if(RPATH) set(SDL_RLD_FLAGS "") if(BSDI OR FREEBSD OR LINUX OR NETBSD) - set(SDL_RLD_FLAGS "-Wl,-rpath,\${libdir}") + set(CMAKE_REQUIRED_FLAGS "-Wl,--enable-new-dtags") + check_c_compiler_flag("" HAVE_ENABLE_NEW_DTAGS) + set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) + if(HAVE_ENABLE_NEW_DTAGS) + set(SDL_RLD_FLAGS "-Wl,-rpath,\${libdir} -Wl,--enable-new-dtags") + else() + set(SDL_RLD_FLAGS "-Wl,-rpath,\${libdir}") + endif() elseif(SOLARIS) set(SDL_RLD_FLAGS "-R\${libdir}") endif() @@ -1108,7 +1165,7 @@ elseif(WINDOWS) set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES}) if(HAVE_DINPUT_H) set(SDL_JOYSTICK_DINPUT 1) - list(APPEND EXTRA_LIBS dinput8 dxguid) + list(APPEND EXTRA_LIBS dinput8) if(CMAKE_COMPILER_IS_MINGW) list(APPEND EXTRA_LIBS dxerr8) elseif (NOT USE_WINSDK_DIRECTX) @@ -1166,16 +1223,20 @@ elseif(APPLE) if(SDL_AUDIO) set(SDL_AUDIO_DRIVER_COREAUDIO 1) - file(GLOB AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/coreaudio/*.c) + file(GLOB AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/coreaudio/*.m) set(SOURCE_FILES ${SOURCE_FILES} ${AUDIO_SOURCES}) set(HAVE_SDL_AUDIO TRUE) set(SDL_FRAMEWORK_COREAUDIO 1) - set(SDL_FRAMEWORK_AUDIOUNIT 1) + set(SDL_FRAMEWORK_AUDIOTOOLBOX 1) endif() if(SDL_JOYSTICK) set(SDL_JOYSTICK_IOKIT 1) - file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/darwin/*.c) + if (IOS) + file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/iphoneos/*.m) + else() + file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/darwin/*.c) + endif() set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES}) set(HAVE_SDL_JOYSTICK TRUE) set(SDL_FRAMEWORK_IOKIT 1) @@ -1184,7 +1245,12 @@ elseif(APPLE) if(SDL_HAPTIC) set(SDL_HAPTIC_IOKIT 1) - file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/darwin/*.c) + if (IOS) + file(GLOB POWER_SOURCES ${SDL2_SOURCE_DIR}/src/power/dummy/*.c) + set(SDL_HAPTIC_DUMMY 1) + else() + file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/darwin/*.c) + endif() set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES}) set(HAVE_SDL_HAPTIC TRUE) set(SDL_FRAMEWORK_IOKIT 1) @@ -1196,7 +1262,11 @@ elseif(APPLE) if(SDL_POWER) set(SDL_POWER_MACOSX 1) - file(GLOB POWER_SOURCES ${SDL2_SOURCE_DIR}/src/power/macosx/*.c) + if (IOS) + file(GLOB POWER_SOURCES ${SDL2_SOURCE_DIR}/src/power/uikit/*.m) + else() + file(GLOB POWER_SOURCES ${SDL2_SOURCE_DIR}/src/power/macosx/*.c) + endif() set(SOURCE_FILES ${SOURCE_FILES} ${POWER_SOURCES}) set(HAVE_SDL_POWER TRUE) set(SDL_FRAMEWORK_CARBON 1) @@ -1243,19 +1313,25 @@ elseif(APPLE) find_library(COREAUDIO CoreAudio) list(APPEND EXTRA_LIBS ${COREAUDIO}) endif() - if(SDL_FRAMEWORK_AUDIOUNIT) - find_library(AUDIOUNIT AudioUnit) - list(APPEND EXTRA_LIBS ${AUDIOUNIT}) + if(SDL_FRAMEWORK_AUDIOTOOLBOX) + find_library(AUDIOTOOLBOX AudioToolbox) + list(APPEND EXTRA_LIBS ${AUDIOTOOLBOX}) endif() # iOS hack needed - http://code.google.com/p/ios-cmake/ ? if(SDL_VIDEO) - CheckCOCOA() - if(VIDEO_OPENGL) - set(SDL_VIDEO_OPENGL 1) - set(SDL_VIDEO_OPENGL_CGL 1) - set(SDL_VIDEO_RENDER_OGL 1) - set(HAVE_VIDEO_OPENGL TRUE) + if (IOS) + set(SDL_VIDEO_DRIVER_UIKIT 1) + file(GLOB UIKITVIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/uikit/*.m) + set(SOURCE_FILES ${SOURCE_FILES} ${UIKITVIDEO_SOURCES}) + else() + CheckCOCOA() + if(VIDEO_OPENGL) + set(SDL_VIDEO_OPENGL 1) + set(SDL_VIDEO_OPENGL_CGL 1) + set(SDL_VIDEO_RENDER_OGL 1) + set(HAVE_VIDEO_OPENGL TRUE) + endif() endif() endif() @@ -1442,6 +1518,9 @@ message(STATUS " EXTRA_LIBS: ${EXTRA_LIBS}") message(STATUS "") message(STATUS " Build Shared Library: ${SDL_SHARED}") message(STATUS " Build Static Library: ${SDL_STATIC}") +if(SDL_STATIC) + message(STATUS " Build Static Library with Position Independent Code: ${SDL_STATIC_PIC}") +endif() message(STATUS "") if(UNIX) message(STATUS "If something was not detected, although the libraries") @@ -1458,7 +1537,7 @@ add_library(SDL2main STATIC ${SDLMAIN_SOURCES}) set(_INSTALL_LIBS "SDL2main") if(SDL_SHARED) - add_library(SDL2 SHARED ${SOURCE_FILES}) + add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES}) if(UNIX) set_target_properties(SDL2 PROPERTIES VERSION ${LT_VERSION} @@ -1484,6 +1563,7 @@ if(SDL_STATIC) set (BUILD_SHARED_LIBS FALSE) add_library(SDL2-static STATIC ${SOURCE_FILES}) set_target_properties(SDL2-static PROPERTIES OUTPUT_NAME "SDL2") + set_target_properties(SDL2-static PROPERTIES POSITION_INDEPENDENT_CODE ${SDL_STATIC_PIC}) if(MSVC) set_target_properties(SDL2-static PROPERTIES LINK_FLAGS_RELEASE "/NODEFAULTLIB") set_target_properties(SDL2-static PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB") @@ -1510,12 +1590,17 @@ endforeach() list(APPEND INCLUDE_FILES ${BIN_INCLUDE_FILES}) install(FILES ${INCLUDE_FILES} DESTINATION include/SDL2) -if(NOT WINDOWS OR CYGWIN) +if(NOT (WINDOWS OR CYGWIN)) if(SDL_SHARED) + if (APPLE) + set(SOEXT "dylib") + else() + set(SOEXT "so") + endif() install(CODE " execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - \"libSDL2-2.0.so\" \"libSDL2.so\")") - install(FILES ${SDL2_BINARY_DIR}/libSDL2.so DESTINATION "lib${LIB_SUFFIX}") + \"libSDL2-2.0.${SOEXT}\" \"libSDL2.${SOEXT}\")") + install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SOEXT} DESTINATION "lib${LIB_SUFFIX}") endif() if(FREEBSD) # FreeBSD uses ${PREFIX}/libdata/pkgconfig @@ -1526,7 +1611,7 @@ if(NOT WINDOWS OR CYGWIN) endif() install(PROGRAMS ${SDL2_BINARY_DIR}/sdl2-config DESTINATION bin) # TODO: what about the .spec file? Is it only needed for RPM creation? - install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "share/aclocal") + install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal") endif() ##### Uninstall target ##### diff --git a/Engine/lib/sdl/Makefile.in b/Engine/lib/sdl/Makefile.in index b66e0f5e2..a7cbddf26 100644 --- a/Engine/lib/sdl/Makefile.in +++ b/Engine/lib/sdl/Makefile.in @@ -3,6 +3,7 @@ top_builddir = . srcdir = @srcdir@ objects = build +gen = gen prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -31,6 +32,8 @@ WINDRES = @WINDRES@ TARGET = libSDL2.la OBJECTS = @OBJECTS@ +GEN_HEADERS = @GEN_HEADERS@ +GEN_OBJECTS = @GEN_OBJECTS@ VERSION_OBJECTS = @VERSION_OBJECTS@ SDLMAIN_TARGET = libSDL2main.a @@ -39,6 +42,8 @@ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ SDLTEST_TARGET = libSDL2_test.a SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ +WAYLAND_SCANNER = @WAYLAND_SCANNER@ + SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS GEN_DIST = SDL2.spec @@ -48,6 +53,7 @@ RUN_CMD_CC = @echo " CC " $@; RUN_CMD_CXX = @echo " CXX " $@; RUN_CMD_LTLINK = @echo " LTLINK" $@; RUN_CMD_RANLIB = @echo " RANLIB" $@; +RUN_CMD_GEN = @echo " GEN " $@; LIBTOOL += --quiet endif @@ -137,8 +143,8 @@ update-revision: .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) -$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) +$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) + $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS) @@ -200,6 +206,7 @@ uninstall-data: clean: rm -rf $(objects) + rm -rf $(gen) if test -f test/Makefile; then (cd test; $(MAKE) $@); fi distclean: clean diff --git a/Engine/lib/sdl/Makefile.pandora b/Engine/lib/sdl/Makefile.pandora index bb89d52a6..8b78f2734 100644 --- a/Engine/lib/sdl/Makefile.pandora +++ b/Engine/lib/sdl/Makefile.pandora @@ -19,7 +19,7 @@ SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \ ./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \ ./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \ ./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \ - ./src/atomic/linux/*.c ./src/filesystem/unix/*.c \ + ./src/atomic/*.c ./src/filesystem/unix/*.c \ ./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o ./src/video/x11/*.c diff --git a/Engine/lib/sdl/Makefile.psp b/Engine/lib/sdl/Makefile.psp index 5e7dcd29a..93fb9e447 100644 --- a/Engine/lib/sdl/Makefile.psp +++ b/Engine/lib/sdl/Makefile.psp @@ -49,6 +49,7 @@ OBJS= src/SDL.o \ src/stdlib/SDL_stdlib.o \ src/stdlib/SDL_string.o \ src/thread/SDL_thread.o \ + src/thread/generic/SDL_systls.o \ src/thread/psp/SDL_syssem.o \ src/thread/psp/SDL_systhread.o \ src/thread/psp/SDL_sysmutex.o \ diff --git a/Engine/lib/sdl/Makefile.wiz b/Engine/lib/sdl/Makefile.wiz index bb7705789..0981be853 100644 --- a/Engine/lib/sdl/Makefile.wiz +++ b/Engine/lib/sdl/Makefile.wiz @@ -9,8 +9,8 @@ STRIP = $(WIZSDK)/bin/arm-openwiz-linux-gnu-strip CFLAGS = -Wall -fPIC -I./include -I$(WIZSDK)/include -DWIZ_GLES_LITE -TARGET_STATIC = libSDL13.a -TARGET_SHARED = libSDL13.so +TARGET_STATIC = libSDL2.a +TARGET_SHARED = libSDL2.so SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \ ./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \ @@ -43,7 +43,7 @@ clean: install: mkdir -p $(WIZSDK)/lib - mkdir -p $(WIZSDK)/include/SDL13 + mkdir -p $(WIZSDK)/include/SDL2 cp -f $(TARGET_STATIC) $(WIZSDK)/lib cp -f $(TARGET_SHARED).0.0.1 $(WIZSDK)/lib rm -f $(WIZSDK)/lib/$(TARGET_SHARED).0 $(WIZSDK)/lib/$(TARGET_SHARED) @@ -57,5 +57,5 @@ install: ln -s ../../toolchain/libs/$(TARGET_SHARED).0 ../../toolchain/libs/$(TARGET_SHARED) cp $(TARGET_SHARED).0.0.1 ../nehe_demos/build/$(TARGET_SHARED).0 - cp -f include/*.h $(WIZSDK)/include/SDL13/ - cp -f include/*.h ../../toolchain/include/SDL13/ + cp -f include/*.h $(WIZSDK)/include/SDL2/ + cp -f include/*.h ../../toolchain/include/SDL2/ diff --git a/Engine/lib/sdl/README-SDL.txt b/Engine/lib/sdl/README-SDL.txt index fade0b958..8eaf051f7 100644 --- a/Engine/lib/sdl/README-SDL.txt +++ b/Engine/lib/sdl/README-SDL.txt @@ -2,8 +2,8 @@ Please distribute this file with the SDL runtime environment: The Simple DirectMedia Layer (SDL for short) is a cross-platform library -designed to make it easy to write multi-media software, such as games and -emulators. +designed to make it easy to write multi-media software, such as games +and emulators. The Simple DirectMedia Layer library source code is available from: http://www.libsdl.org/ diff --git a/Engine/lib/sdl/SDL2.spec b/Engine/lib/sdl/SDL2.spec index 0fe57540f..5dfda5802 100644 --- a/Engine/lib/sdl/SDL2.spec +++ b/Engine/lib/sdl/SDL2.spec @@ -1,6 +1,6 @@ Summary: Simple DirectMedia Layer Name: SDL2 -Version: 2.0.4 +Version: 2.0.5 Release: 2 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz URL: http://www.libsdl.org/ diff --git a/Engine/lib/sdl/VisualC.html b/Engine/lib/sdl/VisualC.html index 89035d677..0631832e8 100644 --- a/Engine/lib/sdl/VisualC.html +++ b/Engine/lib/sdl/VisualC.html @@ -21,7 +21,7 @@

There are different solution files for the various - versions of the IDE. Please use the appropiate version + versions of the IDE. Please use the appropriate version 2008, 2010, 2012 or 2013.

@@ -101,7 +101,7 @@ files to project")

Instead of adding the files to your project it is more - desireable to add them to the linker options: Project|Properties|Linker|Command + desirable to add them to the linker options: Project|Properties|Linker|Command Line and type the names of the libraries to link with in the "Additional Options:" box.  Note: This must be done for each build configuration (e.g. Release,Debug).

diff --git a/Engine/lib/sdl/VisualC/clean.sh b/Engine/lib/sdl/VisualC/clean.sh deleted file mode 100644 index fd16f9a12..000000000 --- a/Engine/lib/sdl/VisualC/clean.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -find . -type f \( -name '*.user' -o -name '*.sdf' -o -name '*.ncb' -o -name '*.suo' \) -print -delete -find . -type f \( -name '*.bmp' -o -name '*.wav' -o -name '*.dat' \) -print -delete -find . -depth -type d \( -name Win32 -o -name x64 \) -exec rm -rv {} \; diff --git a/Engine/lib/sdl/WhatsNew.txt b/Engine/lib/sdl/WhatsNew.txt index 9b7139f5d..1979ac2b3 100644 --- a/Engine/lib/sdl/WhatsNew.txt +++ b/Engine/lib/sdl/WhatsNew.txt @@ -1,6 +1,69 @@ This is a list of major changes in SDL's version history. +--------------------------------------------------------------------------- +2.0.5: +--------------------------------------------------------------------------- + +General: +* Implemented audio capture support for some platforms +* Added SDL_DequeueAudio() to retrieve audio when buffer queuing is turned on for audio capture +* Added events for dragging and dropping text +* Added events for dragging and dropping multiple items +* By default the click raising a window will not be delivered to the SDL application. You can set the hint SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH to "1" to allow that click through to the window. +* Saving a surface with an alpha channel as a BMP will use a newer BMP format that supports alpha information. You can set the hint SDL_HINT_BMP_SAVE_LEGACY_FORMAT to "1" to use the old format. +* Added SDL_GetHintBoolean() to get the boolean value of a hint +* Added SDL_RenderSetIntegerScale() to set whether to smoothly scale or use integral multiples of the viewport size when scaling the rendering output +* Added SDL_CreateRGBSurfaceWithFormat() and SDL_CreateRGBSurfaceWithFormatFrom() to create an SDL surface with a specific pixel format +* Added SDL_GetDisplayUsableBounds() which returns the area usable for windows. For example, on Mac OS X, this subtracts the area occupied by the menu bar and dock. +* Added SDL_GetWindowBordersSize() which returns the size of the window's borders around the client area +* Added a window event SDL_WINDOWEVENT_HIT_TEST when a window had a hit test that wasn't SDL_HITTEST_NORMAL (e.g. in the title bar or window frame) +* Added SDL_SetWindowResizable() to change whether a window is resizable +* Added SDL_SetWindowOpacity() and SDL_GetWindowOpacity() to affect the window transparency +* Added SDL_SetWindowModalFor() to set a window as modal for another window +* Added support for AUDIO_U16LSB and AUDIO_U16MSB to SDL_MixAudioFormat() +* Fixed flipped images when reading back from target textures when using the OpenGL renderer +* Fixed texture color modulation with SDL_BLENDMODE_NONE when using the OpenGL renderer +* Fixed bug where the alpha value of colorkeys was ignored when blitting in some cases + +Windows: +* Added a hint SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING to prevent SDL from raising a debugger exception to name threads. This exception can cause problems with .NET applications when running under a debugger. +* The hint SDL_HINT_THREAD_STACK_SIZE is now supported on Windows +* Fixed XBox controller triggers automatically being pulled at startup +* The first icon from the executable is used as the default window icon at runtime +* Fixed SDL log messages being printed twice if SDL was built with C library support +* Reset dead keys when the SDL window loses focus, so dead keys pressed in SDL applications don't affect text input into other applications. + +Mac OS X: +* Fixed selecting the dummy video driver +* The caps lock key now generates a pressed event when pressed and a released event when released, instead of a press/release event pair when pressed. +* Fixed mouse wheel events on Mac OS X 10.12 +* The audio driver has been updated to use AVFoundation for better compatibility with newer versions of Mac OS X + +Linux: +* Added support for the Fcitx IME +* Added a window event SDL_WINDOWEVENT_TAKE_FOCUS when a window manager asks the SDL window whether it wants to take focus. +* Refresh rates are now rounded instead of truncated, e.g. 59.94 Hz is rounded up to 60 Hz instead of 59. +* Added initial support for touchscreens on Raspberry Pi + +OpenBSD: +* SDL_GetBasePath() is now implemented on OpenBSD + +iOS: +* Added support for dynamically loaded objects on iOS 8 and newer + +tvOS: +* Added support for Apple TV +* Added a hint SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION to control whether he Apple TV remote's joystick axes will automatically match the rotation of the remote. + +Android: +* Fixed SDL not resizing window when Android screen resolution changes +* Corrected the joystick Z axis reporting for the accelerometer + +Emscripten (running in a web browser): +* Many bug fixes and improvements + + --------------------------------------------------------------------------- 2.0.4: --------------------------------------------------------------------------- diff --git a/Engine/lib/sdl/Xcode/SDL/Info-Framework.plist b/Engine/lib/sdl/Xcode/SDL/Info-Framework.plist index bccaa8afc..da4183466 100644 --- a/Engine/lib/sdl/Xcode/SDL/Info-Framework.plist +++ b/Engine/lib/sdl/Xcode/SDL/Info-Framework.plist @@ -11,7 +11,7 @@ CFBundleIconFile CFBundleIdentifier - org.libsdl.SDL2 + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -19,10 +19,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.4 + 2.0.5 CFBundleSignature SDLX CFBundleVersion - 2.0.4 + 2.0.5 diff --git a/Engine/lib/sdl/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Engine/lib/sdl/Xcode/SDL/SDL.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 9fc2a5019..1f16953cf --- a/Engine/lib/sdl/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Engine/lib/sdl/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -7,15 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 007317A20858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; }; - 007317A30858DECD00B2BC32 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; }; 007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; }; - 007317A50858DECD00B2BC32 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; }; 007317A60858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; }; - 007317A90858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; }; - 007317AA0858DECD00B2BC32 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; }; 007317AB0858DECD00B2BC32 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; }; - 007317AC0858DECD00B2BC32 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; }; 007317AD0858DECD00B2BC32 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; }; 007317C30858E15000B2BC32 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; }; 00CFA89D106B4BA100758660 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; }; @@ -57,14 +51,12 @@ 04BD000912E6671800899322 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; }; 04BD001012E6671800899322 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; }; 04BD001112E6671800899322 /* SDL_dummyaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD9512E6671700899322 /* SDL_dummyaudio.h */; }; - 04BD001812E6671800899322 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDA012E6671700899322 /* SDL_coreaudio.c */; }; 04BD001912E6671800899322 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; }; 04BD002612E6671800899322 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB412E6671700899322 /* SDL_audio.c */; }; 04BD002712E6671800899322 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB512E6671700899322 /* SDL_audio_c.h */; }; 04BD002812E6671800899322 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; }; 04BD002912E6671800899322 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; }; 04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; }; - 04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; }; 04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; }; 04BD002D12E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; }; 04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; }; @@ -211,14 +203,12 @@ 04BD022512E6671800899322 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; }; 04BD022C12E6671800899322 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; }; 04BD022D12E6671800899322 /* SDL_dummyaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD9512E6671700899322 /* SDL_dummyaudio.h */; }; - 04BD023412E6671800899322 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDA012E6671700899322 /* SDL_coreaudio.c */; }; 04BD023512E6671800899322 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; }; 04BD024212E6671800899322 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB412E6671700899322 /* SDL_audio.c */; }; 04BD024312E6671800899322 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB512E6671700899322 /* SDL_audio_c.h */; }; 04BD024412E6671800899322 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; }; 04BD024512E6671800899322 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; }; 04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; }; - 04BD024712E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; }; 04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; }; 04BD024912E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; }; 04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; }; @@ -387,6 +377,10 @@ 04F7805D12FB74A200FC43C0 /* SDL_drawline.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804512FB74A200FC43C0 /* SDL_drawline.h */; }; 04F7805E12FB74A200FC43C0 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F7804612FB74A200FC43C0 /* SDL_drawpoint.c */; }; 04F7805F12FB74A200FC43C0 /* SDL_drawpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F7804712FB74A200FC43C0 /* SDL_drawpoint.h */; }; + 562C4AE91D8F496200AF9EBE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7381E931D8B69C300B177DD /* AudioToolbox.framework */; }; + 562C4AEA1D8F496300AF9EBE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7381E931D8B69C300B177DD /* AudioToolbox.framework */; }; + 562D3C7C1D8F4933003FEEE6 /* SDL_coreaudio.m in Sources */ = {isa = PBXBuildFile; fileRef = FABA34C61D8B5DB100915323 /* SDL_coreaudio.m */; }; + 562D3C7D1D8F4933003FEEE6 /* SDL_coreaudio.m in Sources */ = {isa = PBXBuildFile; fileRef = FABA34C61D8B5DB100915323 /* SDL_coreaudio.m */; }; 566CDE8F148F0AC200C5A9BB /* SDL_dropevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 566CDE8D148F0AC200C5A9BB /* SDL_dropevents_c.h */; }; 566CDE90148F0AC200C5A9BB /* SDL_dropevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 566CDE8E148F0AC200C5A9BB /* SDL_dropevents.c */; }; 567E2F1C17C44BB2005F1892 /* SDL_sysfilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 567E2F1B17C44BB2005F1892 /* SDL_sysfilesystem.m */; }; @@ -406,6 +400,12 @@ 56A6702A185654B40007D20F /* SDL_dynapi_overrides.h in Headers */ = {isa = PBXBuildFile; fileRef = 56A67020185654B40007D20F /* SDL_dynapi_overrides.h */; }; 56A6702B185654B40007D20F /* SDL_dynapi_overrides.h in Headers */ = {isa = PBXBuildFile; fileRef = 56A67020185654B40007D20F /* SDL_dynapi_overrides.h */; }; 56A6702C185654B40007D20F /* SDL_dynapi_overrides.h in Headers */ = {isa = PBXBuildFile; fileRef = 56A67020185654B40007D20F /* SDL_dynapi_overrides.h */; }; + 56C5237E1D8F4985001F2F30 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7381E951D8B69D600B177DD /* CoreAudio.framework */; }; + 56C5237F1D8F4985001F2F30 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7381E951D8B69D600B177DD /* CoreAudio.framework */; }; + 56C523801D8F498B001F2F30 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D0D08310675DD9004B05EF /* CoreFoundation.framework */; }; + 56C523811D8F498C001F2F30 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D0D08310675DD9004B05EF /* CoreFoundation.framework */; }; + A7381E961D8B69D600B177DD /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7381E951D8B69D600B177DD /* CoreAudio.framework */; }; + A7381E971D8B6A0300B177DD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7381E931D8B69C300B177DD /* AudioToolbox.framework */; }; A77E6EB4167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; settings = {ATTRIBUTES = (Public, ); }; }; A77E6EB5167AB0A90010E40B /* SDL_gamecontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */; settings = {ATTRIBUTES = (Public, ); }; }; AA0AD09D16648D1700CE5896 /* SDL_gamecontroller.c in Sources */ = {isa = PBXBuildFile; fileRef = BBFC088A164C6514003E6A99 /* SDL_gamecontroller.c */; }; @@ -563,7 +563,6 @@ DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; }; DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB512E6671700899322 /* SDL_audio_c.h */; }; DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; }; - DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; }; DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; }; DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; }; DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD612E6671700899322 /* blank_cursor.h */; }; @@ -698,7 +697,6 @@ DB313FFF17554B71006C0E22 /* SDL_spinlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD7512E6671700899322 /* SDL_spinlock.c */; }; DB31400017554B71006C0E22 /* SDL_diskaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD8812E6671700899322 /* SDL_diskaudio.c */; }; DB31400117554B71006C0E22 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; }; - DB31400217554B71006C0E22 /* SDL_coreaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDA012E6671700899322 /* SDL_coreaudio.c */; }; DB31400317554B71006C0E22 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB412E6671700899322 /* SDL_audio.c */; }; DB31400417554B71006C0E22 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; }; DB31400517554B71006C0E22 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; }; @@ -802,10 +800,7 @@ DB31406817554B71006C0E22 /* SDL_x11xinput2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628ACF159367F2005138DD /* SDL_x11xinput2.c */; }; DB31406917554B71006C0E22 /* SDL_x11messagebox.c in Sources */ = {isa = PBXBuildFile; fileRef = AA9E4092163BE51E007A2AD0 /* SDL_x11messagebox.c */; }; DB31406A17554B71006C0E22 /* SDL_cocoamessagebox.m in Sources */ = {isa = PBXBuildFile; fileRef = AABCC38C164063D200AB8930 /* SDL_cocoamessagebox.m */; }; - DB31406C17554B71006C0E22 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */; }; - DB31406D17554B71006C0E22 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179C0858DECD00B2BC32 /* AudioUnit.framework */; }; DB31406E17554B71006C0E22 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179D0858DECD00B2BC32 /* Cocoa.framework */; }; - DB31406F17554B71006C0E22 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179E0858DECD00B2BC32 /* CoreAudio.framework */; }; DB31407017554B71006C0E22 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0073179F0858DECD00B2BC32 /* IOKit.framework */; }; DB31407217554B71006C0E22 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; }; DB31408B17554D37006C0E22 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; }; @@ -813,6 +808,7 @@ FA73671D19A540EF004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; }; FA73671E19A54140004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; }; FA73671F19A54144004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; }; + FABA34C71D8B5DB100915323 /* SDL_coreaudio.m in Sources */ = {isa = PBXBuildFile; fileRef = FABA34C61D8B5DB100915323 /* SDL_coreaudio.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -826,10 +822,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; - 0073179C0858DECD00B2BC32 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 0073179D0858DECD00B2BC32 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 0073179E0858DECD00B2BC32 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 0073179F0858DECD00B2BC32 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 007317C10858E15000B2BC32 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 00794D3F09D0C461003FC8A1 /* License.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = License.txt; sourceTree = ""; }; @@ -857,14 +850,12 @@ 04BDFD8912E6671700899322 /* SDL_diskaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_diskaudio.h; sourceTree = ""; }; 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dummyaudio.c; sourceTree = ""; }; 04BDFD9512E6671700899322 /* SDL_dummyaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dummyaudio.h; sourceTree = ""; }; - 04BDFDA012E6671700899322 /* SDL_coreaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_coreaudio.c; sourceTree = ""; }; 04BDFDA112E6671700899322 /* SDL_coreaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_coreaudio.h; sourceTree = ""; }; 04BDFDB412E6671700899322 /* SDL_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audio.c; sourceTree = ""; }; 04BDFDB512E6671700899322 /* SDL_audio_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audio_c.h; sourceTree = ""; }; 04BDFDB612E6671700899322 /* SDL_audiocvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiocvt.c; sourceTree = ""; }; 04BDFDB712E6671700899322 /* SDL_audiodev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiodev.c; sourceTree = ""; }; 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiodev_c.h; sourceTree = ""; }; - 04BDFDB912E6671700899322 /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = ""; }; 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = ""; }; 04BDFDBB12E6671700899322 /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = ""; }; 04BDFDC212E6671700899322 /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = ""; }; @@ -1027,6 +1018,8 @@ 56A6701E185654B40007D20F /* SDL_dynapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_dynapi.c; path = ../../src/dynapi/SDL_dynapi.c; sourceTree = ""; }; 56A6701F185654B40007D20F /* SDL_dynapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_dynapi.h; path = ../../src/dynapi/SDL_dynapi.h; sourceTree = ""; }; 56A67020185654B40007D20F /* SDL_dynapi_overrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_dynapi_overrides.h; path = ../../src/dynapi/SDL_dynapi_overrides.h; sourceTree = ""; }; + A7381E931D8B69C300B177DD /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + A7381E951D8B69D600B177DD /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; A77E6EB3167AB0A90010E40B /* SDL_gamecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gamecontroller.h; sourceTree = ""; }; AA0F8490178D5ECC00823F9D /* SDL_systls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_systls.c; sourceTree = ""; }; AA628AC8159367B7005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = ""; }; @@ -1106,6 +1099,7 @@ F59C710600D5CB5801000001 /* SDL.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SDL.info; sourceTree = ""; }; F5A2EF3900C6A39A01000001 /* BUGS.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = BUGS.txt; path = ../../BUGS.txt; sourceTree = SOURCE_ROOT; }; FA73671C19A540EF004122E4 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; + FABA34C61D8B5DB100915323 /* SDL_coreaudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_coreaudio.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1113,11 +1107,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A7381E971D8B6A0300B177DD /* AudioToolbox.framework in Frameworks */, + A7381E961D8B69D600B177DD /* CoreAudio.framework in Frameworks */, FA73671D19A540EF004122E4 /* CoreVideo.framework in Frameworks */, - 007317A20858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */, - 007317A30858DECD00B2BC32 /* AudioUnit.framework in Frameworks */, 007317A40858DECD00B2BC32 /* Cocoa.framework in Frameworks */, - 007317A50858DECD00B2BC32 /* CoreAudio.framework in Frameworks */, 007317A60858DECD00B2BC32 /* IOKit.framework in Frameworks */, 00D0D08410675DD9004B05EF /* CoreFoundation.framework in Frameworks */, 00D0D0D810675E46004B05EF /* Carbon.framework in Frameworks */, @@ -1129,14 +1122,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56C5237E1D8F4985001F2F30 /* CoreAudio.framework in Frameworks */, FA73671E19A54140004122E4 /* CoreVideo.framework in Frameworks */, - 007317A90858DECD00B2BC32 /* AudioToolbox.framework in Frameworks */, - 007317AA0858DECD00B2BC32 /* AudioUnit.framework in Frameworks */, 007317AB0858DECD00B2BC32 /* Cocoa.framework in Frameworks */, - 007317AC0858DECD00B2BC32 /* CoreAudio.framework in Frameworks */, 007317AD0858DECD00B2BC32 /* IOKit.framework in Frameworks */, + 56C523801D8F498B001F2F30 /* CoreFoundation.framework in Frameworks */, 007317C30858E15000B2BC32 /* Carbon.framework in Frameworks */, DB31408B17554D37006C0E22 /* ForceFeedback.framework in Frameworks */, + 562C4AE91D8F496200AF9EBE /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1144,14 +1137,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 56C5237F1D8F4985001F2F30 /* CoreAudio.framework in Frameworks */, FA73671F19A54144004122E4 /* CoreVideo.framework in Frameworks */, - DB31406C17554B71006C0E22 /* AudioToolbox.framework in Frameworks */, - DB31406D17554B71006C0E22 /* AudioUnit.framework in Frameworks */, DB31406E17554B71006C0E22 /* Cocoa.framework in Frameworks */, - DB31406F17554B71006C0E22 /* CoreAudio.framework in Frameworks */, DB31407017554B71006C0E22 /* IOKit.framework in Frameworks */, + 56C523811D8F498C001F2F30 /* CoreFoundation.framework in Frameworks */, DB31407217554B71006C0E22 /* Carbon.framework in Frameworks */, DB31408D17554D3C006C0E22 /* ForceFeedback.framework in Frameworks */, + 562C4AEA1D8F496300AF9EBE /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1307,7 +1300,6 @@ 04BDFDB612E6671700899322 /* SDL_audiocvt.c */, 04BDFDB712E6671700899322 /* SDL_audiodev.c */, 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */, - 04BDFDB912E6671700899322 /* SDL_audiomem.h */, 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */, 04BDFDBB12E6671700899322 /* SDL_mixer.c */, 04BDFDC212E6671700899322 /* SDL_sysaudio.h */, @@ -1339,8 +1331,8 @@ 04BDFD9F12E6671700899322 /* coreaudio */ = { isa = PBXGroup; children = ( - 04BDFDA012E6671700899322 /* SDL_coreaudio.c */, 04BDFDA112E6671700899322 /* SDL_coreaudio.h */, + FABA34C61D8B5DB100915323 /* SDL_coreaudio.m */, ); path = coreaudio; sourceTree = ""; @@ -1737,13 +1729,12 @@ BEC562FE0761C0E800A33029 /* Linked Frameworks */ = { isa = PBXGroup; children = ( + A7381E931D8B69C300B177DD /* AudioToolbox.framework */, + A7381E951D8B69D600B177DD /* CoreAudio.framework */, FA73671C19A540EF004122E4 /* CoreVideo.framework */, 00D0D08310675DD9004B05EF /* CoreFoundation.framework */, 007317C10858E15000B2BC32 /* Carbon.framework */, - 0073179B0858DECD00B2BC32 /* AudioToolbox.framework */, - 0073179C0858DECD00B2BC32 /* AudioUnit.framework */, 0073179D0858DECD00B2BC32 /* Cocoa.framework */, - 0073179E0858DECD00B2BC32 /* CoreAudio.framework */, 0073179F0858DECD00B2BC32 /* IOKit.framework */, 00CFA89C106B4BA100758660 /* ForceFeedback.framework */, ); @@ -1840,7 +1831,6 @@ 04BD001912E6671800899322 /* SDL_coreaudio.h in Headers */, 04BD002712E6671800899322 /* SDL_audio_c.h in Headers */, 04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */, - 04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */, 04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */, 04BD003612E6671800899322 /* SDL_wave.h in Headers */, 04BD004212E6671800899322 /* blank_cursor.h in Headers */, @@ -1996,7 +1986,6 @@ 04BD024312E6671800899322 /* SDL_audio_c.h in Headers */, 04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */, AAC070FD195606770073DCDF /* SDL_opengles2_gl2.h in Headers */, - 04BD024712E6671800899322 /* SDL_audiomem.h in Headers */, 04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */, 04BD025212E6671800899322 /* SDL_wave.h in Headers */, 04BD025D12E6671800899322 /* blank_cursor.h in Headers */, @@ -2151,7 +2140,6 @@ DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */, DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */, AAC070FE195606770073DCDF /* SDL_opengles2_gl2.h in Headers */, - DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */, DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */, DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */, DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */, @@ -2323,7 +2311,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0730; TargetAttributes = { BECDF5FE0761BA81005FE872 = { DevelopmentTeam = EH385AYQ6F; @@ -2404,7 +2392,6 @@ 04BDFFFC12E6671800899322 /* SDL_spinlock.c in Sources */, 04BD000812E6671800899322 /* SDL_diskaudio.c in Sources */, 04BD001012E6671800899322 /* SDL_dummyaudio.c in Sources */, - 04BD001812E6671800899322 /* SDL_coreaudio.c in Sources */, 04BD002612E6671800899322 /* SDL_audio.c in Sources */, 04BD002812E6671800899322 /* SDL_audiocvt.c in Sources */, 04BD002912E6671800899322 /* SDL_audiodev.c in Sources */, @@ -2440,6 +2427,7 @@ 04BD00A812E6671800899322 /* SDL_string.c in Sources */, 04BD00BD12E6671800899322 /* SDL_syscond.c in Sources */, 04BD00BE12E6671800899322 /* SDL_sysmutex.c in Sources */, + FABA34C71D8B5DB100915323 /* SDL_coreaudio.m in Sources */, 04BD00C012E6671800899322 /* SDL_syssem.c in Sources */, 04BD00C112E6671800899322 /* SDL_systhread.c in Sources */, 04BD00CA12E6671800899322 /* SDL_thread.c in Sources */, @@ -2523,7 +2511,6 @@ 04BD021812E6671800899322 /* SDL_spinlock.c in Sources */, 04BD022412E6671800899322 /* SDL_diskaudio.c in Sources */, 04BD022C12E6671800899322 /* SDL_dummyaudio.c in Sources */, - 04BD023412E6671800899322 /* SDL_coreaudio.c in Sources */, 04BD024212E6671800899322 /* SDL_audio.c in Sources */, 04BD024412E6671800899322 /* SDL_audiocvt.c in Sources */, 04BD024512E6671800899322 /* SDL_audiodev.c in Sources */, @@ -2559,6 +2546,7 @@ 04BD02C012E6671800899322 /* SDL_qsort.c in Sources */, 04BD02C112E6671800899322 /* SDL_stdlib.c in Sources */, 04BD02C212E6671800899322 /* SDL_string.c in Sources */, + 562D3C7C1D8F4933003FEEE6 /* SDL_coreaudio.m in Sources */, 04BD02D712E6671800899322 /* SDL_syscond.c in Sources */, 04BD02D812E6671800899322 /* SDL_sysmutex.c in Sources */, 04BD02DA12E6671800899322 /* SDL_syssem.c in Sources */, @@ -2642,7 +2630,6 @@ DB313FFF17554B71006C0E22 /* SDL_spinlock.c in Sources */, DB31400017554B71006C0E22 /* SDL_diskaudio.c in Sources */, DB31400117554B71006C0E22 /* SDL_dummyaudio.c in Sources */, - DB31400217554B71006C0E22 /* SDL_coreaudio.c in Sources */, DB31400317554B71006C0E22 /* SDL_audio.c in Sources */, DB31400417554B71006C0E22 /* SDL_audiocvt.c in Sources */, DB31400517554B71006C0E22 /* SDL_audiodev.c in Sources */, @@ -2678,6 +2665,7 @@ DB31402417554B71006C0E22 /* SDL_qsort.c in Sources */, DB31402517554B71006C0E22 /* SDL_stdlib.c in Sources */, DB31402617554B71006C0E22 /* SDL_string.c in Sources */, + 562D3C7D1D8F4933003FEEE6 /* SDL_coreaudio.m in Sources */, DB31402717554B71006C0E22 /* SDL_syscond.c in Sources */, DB31402817554B71006C0E22 /* SDL_sysmutex.c in Sources */, DB31402917554B71006C0E22 /* SDL_syssem.c in Sources */, @@ -2767,14 +2755,31 @@ 00CFA621106A567900758660 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEPLOYMENT_POSTPROCESSING = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_ALTIVEC_EXTENSIONS = YES; GCC_AUTO_VECTORIZATION = YES; GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_SYMBOLS_PRIVATE_EXTERN = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; STRIP_STYLE = "non-global"; }; @@ -2783,15 +2788,17 @@ 00CFA622106A567900758660 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 5.0.0; + DYLIB_CURRENT_VERSION = 5.1.0; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@rpath"; OTHER_LDFLAGS = "-liconv"; + PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL2; PRODUCT_NAME = SDL2; PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = framework; @@ -2827,12 +2834,30 @@ 00CFA627106A568900758660 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_ALTIVEC_EXTENSIONS = YES; GCC_AUTO_VECTORIZATION = YES; GCC_ENABLE_SSE3_EXTENSIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_SYMBOLS_PRIVATE_EXTERN = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; @@ -2842,15 +2867,17 @@ 00CFA628106A568900758660 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1.0.0; - DYLIB_CURRENT_VERSION = 5.0.0; + DYLIB_CURRENT_VERSION = 5.1.0; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = /usr/X11R6/include; INFOPLIST_FILE = "Info-Framework.plist"; INSTALL_PATH = "@rpath"; OTHER_LDFLAGS = "-liconv"; + PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL2; PRODUCT_NAME = SDL2; PROVISIONING_PROFILE = ""; WRAPPER_EXTENSION = framework; diff --git a/Engine/lib/sdl/Xcode/SDL/pkg-support/SDL.info b/Engine/lib/sdl/Xcode/SDL/pkg-support/SDL.info old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/Xcode/SDL/pkg-support/resources/ReadMe.txt b/Engine/lib/sdl/Xcode/SDL/pkg-support/resources/ReadMe.txt old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj b/Engine/lib/sdl/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 59cdd631b..144d24ca5 --- a/Engine/lib/sdl/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj +++ b/Engine/lib/sdl/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj @@ -3934,7 +3934,7 @@ ); GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ../../include; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; }; name = Debug; }; @@ -4060,7 +4060,7 @@ ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; HEADER_SEARCH_PATHS = ../../include; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; }; name = Release; }; diff --git a/Engine/lib/sdl/autogen.sh b/Engine/lib/sdl/autogen.sh old mode 100644 new mode 100755 index 649d7b31e..3e958e195 --- a/Engine/lib/sdl/autogen.sh +++ b/Engine/lib/sdl/autogen.sh @@ -3,6 +3,10 @@ echo "Generating build information using autoconf" echo "This may take a while ..." +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. +pushd $srcdir + # Regenerate configuration files cat acinclude/* >aclocal.m4 found=false @@ -15,5 +19,7 @@ if test x$found = xfalse; then fi (cd test; sh autogen.sh) +popd + # Run configure for this platform echo "Now you are ready to run ./configure" diff --git a/Engine/lib/sdl/build-scripts/androidbuild.sh b/Engine/lib/sdl/build-scripts/androidbuild.sh old mode 100644 new mode 100755 index 8ca3c916d..fb48e2e5b --- a/Engine/lib/sdl/build-scripts/androidbuild.sh +++ b/Engine/lib/sdl/build-scripts/androidbuild.sh @@ -87,8 +87,8 @@ else fi cp -r $SDLPATH/Android.mk $BUILDPATH/jni/SDL -sed -i "s|YourSourceHere.c|$MKSOURCES|g" $BUILDPATH/jni/src/Android.mk -sed -i "s|org\.libsdl\.app|$APP|g" $BUILDPATH/AndroidManifest.xml +sed -i -e "s|YourSourceHere.c|$MKSOURCES|g" $BUILDPATH/jni/src/Android.mk +sed -i -e "s|org\.libsdl\.app|$APP|g" $BUILDPATH/AndroidManifest.xml # Copy user sources for src in "${SOURCES[@]}" @@ -105,8 +105,8 @@ do done ACTIVITY="${folder}Activity" -sed -i "s|SDLActivity|$ACTIVITY|g" $BUILDPATH/AndroidManifest.xml -sed -i "s|SDLActivity|$APP|g" $BUILDPATH/build.xml +sed -i -e "s|SDLActivity|$ACTIVITY|g" $BUILDPATH/AndroidManifest.xml +sed -i -e "s|SDLActivity|$APP|g" $BUILDPATH/build.xml # Fill in a default Activity echo "package $APP;" > "$ACTIVITY.java" diff --git a/Engine/lib/sdl/build-scripts/checker-buildbot.sh b/Engine/lib/sdl/build-scripts/checker-buildbot.sh old mode 100644 new mode 100755 index 682e7fbbb..eb014311a --- a/Engine/lib/sdl/build-scripts/checker-buildbot.sh +++ b/Engine/lib/sdl/build-scripts/checker-buildbot.sh @@ -61,13 +61,13 @@ mkdir checker-buildbot cd checker-buildbot # You might want to do this for CMake-backed builds instead... -PATH="$CHECKERDIR:$PATH" scan-build -o analysis cmake -DCMAKE_BUILD_TYPE=Debug .. +PATH="$CHECKERDIR:$PATH" scan-build -o analysis cmake -DCMAKE_BUILD_TYPE=Debug -DASSERTIONS=enabled .. # ...or run configure without the scan-build wrapper... -#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0" ../configure +#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0" ../configure --enable-assertions=enabled # ...but this works for our buildbots just fine (EXCEPT ON LATEST MAC OS X). -#CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure +#CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure --enable-assertions=enabled rm -rf analysis PATH="$CHECKERDIR:$PATH" scan-build -o analysis $MAKE diff --git a/Engine/lib/sdl/build-scripts/emscripten-buildbot.sh b/Engine/lib/sdl/build-scripts/emscripten-buildbot.sh old mode 100644 new mode 100755 index db5fb8184..42eebb697 --- a/Engine/lib/sdl/build-scripts/emscripten-buildbot.sh +++ b/Engine/lib/sdl/build-scripts/emscripten-buildbot.sh @@ -51,13 +51,14 @@ mkdir buildbot pushd buildbot echo "Configuring..." -emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$PWD/emscripten-sdl2-installed" +emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$PWD/emscripten-sdl2-installed" || exit $? echo "Building..." -emmake $MAKE +emmake $MAKE || exit $? echo "Moving things around..." -emmake $MAKE install +emmake $MAKE install || exit $? + # Fix up a few things to a real install path perl -w -pi -e "s#$PWD/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config mkdir -p ./usr diff --git a/Engine/lib/sdl/build-scripts/g++-fat.sh b/Engine/lib/sdl/build-scripts/g++-fat.sh old mode 100644 new mode 100755 index 29b04302f..0dbe99039 --- a/Engine/lib/sdl/build-scripts/g++-fat.sh +++ b/Engine/lib/sdl/build-scripts/g++-fat.sh @@ -6,11 +6,11 @@ DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer" -# Intel 32-bit compiler flags (10.5 runtime compatibility) -GCC_COMPILE_X86="g++ -arch i386 -mmacosx-version-min=10.5 \ +# Intel 32-bit compiler flags (10.6 runtime compatibility) +GCC_COMPILE_X86="g++ -arch i386 -mmacosx-version-min=10.6 \ -I/usr/local/include" -GCC_LINK_X86="-mmacosx-version-min=10.5" +GCC_LINK_X86="-mmacosx-version-min=10.6" # Intel 64-bit compiler flags (10.6 runtime compatibility) GCC_COMPILE_X64="g++ -arch x86_64 -mmacosx-version-min=10.6 \ diff --git a/Engine/lib/sdl/build-scripts/gcc-fat.sh b/Engine/lib/sdl/build-scripts/gcc-fat.sh old mode 100644 new mode 100755 index e556c1dd1..65f759d4a --- a/Engine/lib/sdl/build-scripts/gcc-fat.sh +++ b/Engine/lib/sdl/build-scripts/gcc-fat.sh @@ -6,15 +6,15 @@ DEVELOPER="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer" -# Intel 32-bit compiler flags (10.5 runtime compatibility) -GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.5 \ +# Intel 32-bit compiler flags (10.6 runtime compatibility) +GCC_COMPILE_X86="gcc -arch i386 -mmacosx-version-min=10.6 \ -I/usr/local/include" -GCC_LINK_X86="-mmacosx-version-min=10.5" +GCC_LINK_X86="-mmacosx-version-min=10.6" # Intel 64-bit compiler flags (10.6 runtime compatibility) GCC_COMPILE_X64="gcc -arch x86_64 -mmacosx-version-min=10.6 \ --DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \ +-DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \ -I/usr/local/include" GCC_LINK_X64="-mmacosx-version-min=10.6" diff --git a/Engine/lib/sdl/build-scripts/install-sh b/Engine/lib/sdl/build-scripts/install-sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/iosbuild.sh b/Engine/lib/sdl/build-scripts/iosbuild.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/ltmain.sh b/Engine/lib/sdl/build-scripts/ltmain.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/mkinstalldirs b/Engine/lib/sdl/build-scripts/mkinstalldirs old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/nacl-buildbot.sh b/Engine/lib/sdl/build-scripts/nacl-buildbot.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/naclbuild.sh b/Engine/lib/sdl/build-scripts/naclbuild.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/raspberrypi-buildbot.sh b/Engine/lib/sdl/build-scripts/raspberrypi-buildbot.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/showrev.sh b/Engine/lib/sdl/build-scripts/showrev.sh old mode 100644 new mode 100755 index 2a68fe694..517992d9c --- a/Engine/lib/sdl/build-scripts/showrev.sh +++ b/Engine/lib/sdl/build-scripts/showrev.sh @@ -2,6 +2,4 @@ # # Print the current source revision, if available -# FIXME: this prints the tip, which isn't useful if you're on a different -# branch, or just not sync'd to the tip. -hg tip --template 'hg-{rev}:{node|short}' || (echo "hg-0:baadf00d"; exit 1) +hg parents --template 'hg-{rev}:{node|short}' || (echo "hg-0:baadf00d"; exit 1) diff --git a/Engine/lib/sdl/build-scripts/strip_fPIC.sh b/Engine/lib/sdl/build-scripts/strip_fPIC.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/update-copyright.sh b/Engine/lib/sdl/build-scripts/update-copyright.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/build-scripts/updaterev.sh b/Engine/lib/sdl/build-scripts/updaterev.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/cmake/sdlchecks.cmake b/Engine/lib/sdl/cmake/sdlchecks.cmake index 7ff0985fd..b10078192 100644 --- a/Engine/lib/sdl/cmake/sdlchecks.cmake +++ b/Engine/lib/sdl/cmake/sdlchecks.cmake @@ -105,7 +105,9 @@ macro(CheckALSA) if(ALSA) CHECK_INCLUDE_FILE(alsa/asoundlib.h HAVE_ASOUNDLIB_H) if(HAVE_ASOUNDLIB_H) - CHECK_LIBRARY_EXISTS(asound snd_pcm_open "" HAVE_LIBASOUND) + CHECK_LIBRARY_EXISTS(asound snd_pcm_recover "" HAVE_LIBASOUND) + endif() + if(HAVE_LIBASOUND) set(HAVE_ALSA TRUE) file(GLOB ALSA_SOURCES ${SDL2_SOURCE_DIR}/src/audio/alsa/*.c) set(SOURCE_FILES ${SOURCE_FILES} ${ALSA_SOURCES}) @@ -537,6 +539,27 @@ macro(CheckMir) endif() endmacro() +macro(WaylandProtocolGen _SCANNER _XML _PROTL) + set(_WAYLAND_PROT_C_CODE "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols/${_PROTL}-protocol.c") + set(_WAYLAND_PROT_H_CODE "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols/${_PROTL}-client-protocol.h") + + add_custom_command( + OUTPUT "${_WAYLAND_PROT_H_CODE}" + DEPENDS "${_XML}" + COMMAND "${_SCANNER}" + ARGS client-header "${_XML}" "${_WAYLAND_PROT_H_CODE}" + ) + + add_custom_command( + OUTPUT "${_WAYLAND_PROT_C_CODE}" + DEPENDS "${_WAYLAND_PROT_H_CODE}" + COMMAND "${_SCANNER}" + ARGS code "${_XML}" "${_WAYLAND_PROT_C_CODE}" + ) + + set(SOURCE_FILES ${SOURCE_FILES} "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols/${_PROTL}-protocol.c") +endmacro() + # Requires: # - EGL # - PkgCheckModules @@ -545,7 +568,51 @@ endmacro() # - HAVE_DLOPEN opt macro(CheckWayland) if(VIDEO_WAYLAND) - pkg_check_modules(WAYLAND wayland-client wayland-cursor wayland-egl egl xkbcommon) + pkg_check_modules(WAYLAND wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon) + + # We have to generate some protocol interface code for some various Wayland features. + if(WAYLAND_FOUND) + execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-client + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + RESULT_VARIABLE WAYLAND_CORE_PROTOCOL_DIR_RC + OUTPUT_VARIABLE WAYLAND_CORE_PROTOCOL_DIR + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NOT WAYLAND_CORE_PROTOCOL_DIR_RC EQUAL 0) + set(WAYLAND_FOUND FALSE) + endif() + endif() + + if(WAYLAND_FOUND) + execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir wayland-protocols + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + RESULT_VARIABLE WAYLAND_PROTOCOLS_DIR_RC + OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NOT WAYLAND_PROTOCOLS_DIR_RC EQUAL 0) + set(WAYLAND_FOUND FALSE) + endif() + endif() + + if(WAYLAND_FOUND) + execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=wayland_scanner wayland-scanner + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + RESULT_VARIABLE WAYLAND_SCANNER_RC + OUTPUT_VARIABLE WAYLAND_SCANNER + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NOT WAYLAND_SCANNER_RC EQUAL 0) + set(WAYLAND_FOUND FALSE) + endif() + endif() + if(WAYLAND_FOUND) link_directories( ${WAYLAND_LIBRARY_DIRS} @@ -559,6 +626,17 @@ macro(CheckWayland) file(GLOB WAYLAND_SOURCES ${SDL2_SOURCE_DIR}/src/video/wayland/*.c) set(SOURCE_FILES ${SOURCE_FILES} ${WAYLAND_SOURCES}) + # We have to generate some protocol interface code for some unstable Wayland features. + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols") + include_directories("${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols") + + WaylandProtocolGen("${WAYLAND_SCANNER}" "${WAYLAND_CORE_PROTOCOL_DIR}/wayland.xml" "wayland") + + foreach(_PROTL relative-pointer-unstable-v1 pointer-constraints-unstable-v1) + string(REGEX REPLACE "\\-unstable\\-.*$" "" PROTSUBDIR ${_PROTL}) + WaylandProtocolGen("${WAYLAND_SCANNER}" "${WAYLAND_PROTOCOLS_DIR}/unstable/${PROTSUBDIR}/${_PROTL}.xml" "${_PROTL}") + endforeach() + if(VIDEO_WAYLAND_QT_TOUCH) set(SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH 1) endif() @@ -679,7 +757,6 @@ macro(CheckOpenGLX11) set(SDL_VIDEO_OPENGL 1) set(SDL_VIDEO_OPENGL_GLX 1) set(SDL_VIDEO_RENDER_OGL 1) - list(APPEND EXTRA_LIBS GL) endif() endif() endmacro() @@ -767,7 +844,8 @@ macro(CheckPTHREAD) endif() # Run some tests - set(CMAKE_REQUIRED_FLAGS "${PTHREAD_CFLAGS} ${PTHREAD_LDFLAGS}") + set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LDFLAGS}") if(CMAKE_CROSSCOMPILING) set(HAVE_PTHREADS 1) else() @@ -829,7 +907,7 @@ macro(CheckPTHREAD) int main(int argc, char** argv) { return 0; }" HAVE_PTHREAD_NP_H) check_function_exists(pthread_setname_np HAVE_PTHREAD_SETNAME_NP) check_function_exists(pthread_set_name_np HAVE_PTHREAD_SET_NAME_NP) - set(CMAKE_REQUIRED_FLAGS) + set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS}") set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/thread/pthread/SDL_systhread.c @@ -883,7 +961,8 @@ macro(CheckUSBHID) endif() endif() - set(CMAKE_REQUIRED_FLAGS "${USB_CFLAGS}") + set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${USB_CFLAGS}") set(CMAKE_REQUIRED_LIBRARIES "${USB_LIBS}") check_c_source_compiles(" #include @@ -984,7 +1063,7 @@ macro(CheckUSBHID) set(HAVE_SDL_JOYSTICK TRUE) set(CMAKE_REQUIRED_LIBRARIES) - set(CMAKE_REQUIRED_FLAGS) + set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS}") endif() endmacro() @@ -998,12 +1077,13 @@ macro(CheckRPI) listtostr(VIDEO_RPI_INCLUDE_DIRS VIDEO_RPI_INCLUDE_FLAGS "-I") listtostr(VIDEO_RPI_LIBRARY_DIRS VIDEO_RPI_LIBRARY_FLAGS "-L") - set(CMAKE_REQUIRED_FLAGS "${VIDEO_RPI_INCLUDE_FLAGS} ${VIDEO_RPI_LIBRARY_FLAGS}") + set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${VIDEO_RPI_INCLUDE_FLAGS} ${VIDEO_RPI_LIBRARY_FLAGS}") set(CMAKE_REQUIRED_LIBRARIES "${VIDEO_RPI_LIBS}") check_c_source_compiles(" #include int main(int argc, char **argv) {}" HAVE_VIDEO_RPI) - set(CMAKE_REQUIRED_FLAGS) + set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS}") set(CMAKE_REQUIRED_LIBRARIES) if(SDL_VIDEO AND HAVE_VIDEO_RPI) diff --git a/Engine/lib/sdl/configure b/Engine/lib/sdl/configure old mode 100644 new mode 100755 index a41f02595..5070f6e6a --- a/Engine/lib/sdl/configure +++ b/Engine/lib/sdl/configure @@ -630,6 +630,7 @@ ac_includes_default="\ #endif" ac_subst_vars='LTLIBOBJS +WAYLAND_SCANNER EXTRA_LDFLAGS BUILD_LDFLAGS EXTRA_CFLAGS @@ -637,6 +638,8 @@ BUILD_CFLAGS SDLTEST_OBJECTS SDLMAIN_OBJECTS VERSION_OBJECTS +GEN_OBJECTS +GEN_HEADERS OBJECTS INCLUDE ac_aux_dir @@ -846,7 +849,9 @@ enable_video_opengles1 enable_video_opengles2 enable_libudev enable_dbus +enable_ime enable_ibus +enable_fcitx enable_input_tslib enable_pthreads enable_pthread_sem @@ -1584,7 +1589,9 @@ Optional Features: include OpenGL ES 2.0 support [[default=yes]] --enable-libudev enable libudev support [[default=yes]] --enable-dbus enable D-Bus support [[default=yes]] + --enable-ime enable IME support [[default=yes]] --enable-ibus enable IBus support [[default=yes]] + --enable-fcitx enable fcitx support [[default=yes]] --enable-input-tslib use the Touchscreen library for input [[default=yes]] --enable-pthreads use POSIX threads for multi-threading @@ -2683,9 +2690,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=4 -SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=4 +SDL_MICRO_VERSION=5 +SDL_INTERFACE_AGE=1 +SDL_BINARY_AGE=5 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION @@ -17601,7 +17608,7 @@ LIBS="$ALSA_LIBS $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 $as_echo "$ALSA_LIBS" >&6; } -min_alsa_version=0.9.0 +min_alsa_version=1.0.11 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libasound headers version >= $min_alsa_version" >&5 $as_echo_n "checking for libasound headers version >= $min_alsa_version... " >&6; } no_alsa="" @@ -18650,6 +18657,43 @@ $as_echo "$have_gcc_preferred_stack_boundary" >&6; } fi } +CheckDeclarationAfterStatement() +{ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC -Wdeclaration-after-statement option" >&5 +$as_echo_n "checking for GCC -Wdeclaration-after-statement option... " >&6; } + have_gcc_declaration_after_statement=no + + save_CFLAGS="$CFLAGS" + CFLAGS="$save_CFLAGS -Wdeclaration-after-statement -Werror=declaration-after-statement" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + int x = 0; + +int +main () +{ + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + have_gcc_declaration_after_statement=yes + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_declaration_after_statement" >&5 +$as_echo "$have_gcc_declaration_after_statement" >&6; } + CFLAGS="$save_CFLAGS" + + if test x$have_gcc_declaration_after_statement = xyes; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wdeclaration-after-statement -Werror=declaration-after-statement" + fi +} + CheckWarnAll() { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC -Wall option" >&5 @@ -18767,9 +18811,12 @@ $as_echo_n "checking for Wayland support... " >&6; } if test x$PKG_CONFIG != xno && \ test x$video_opengl_egl = xyes && \ test x$video_opengles_v2 = xyes; then - if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor egl xkbcommon ; then + if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` + WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` + WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` video_wayland=yes fi fi @@ -18785,8 +18832,11 @@ $as_echo "#define SDL_VIDEO_DRIVER_WAYLAND 1" >>confdefs.h $as_echo "#define SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH 1" >>confdefs.h fi + + WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1" + SOURCES="$SOURCES $srcdir/src/video/wayland/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)" # Check whether --enable-wayland-shared was given. if test "${enable_wayland_shared+set}" = set; then : enableval=$enable_wayland_shared; @@ -18928,7 +18978,7 @@ int main () { - MirMotionToolType tool = mir_motion_tool_type_mouse; + MirTouchAction actions = mir_touch_actions ; return 0; @@ -21604,6 +21654,23 @@ $as_echo "#define HAVE_DBUS_DBUS_H 1" >>confdefs.h fi } +CheckIME() +{ + # Check whether --enable-ime was given. +if test "${enable_ime+set}" = set; then : + enableval=$enable_ime; +else + enable_ime=yes +fi + + if test x$enable_ime = xyes; then + +$as_echo "#define SDL_USE_IME 1" >>confdefs.h + + SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c" + fi +} + CheckIBus() { # Check whether --enable-ibus was given. @@ -21677,7 +21744,11 @@ fi CFLAGS="$save_CFLAGS" if test x$have_ibus_ibus_h_hdr = xyes; then - if test x$enable_dbus != xyes; then + if test x$enable_ime != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for IBus." >&5 +$as_echo "$as_me: WARNING: IME support is required for IBus." >&2;} + have_ibus_ibus_h_hdr=no + elif test x$enable_dbus != xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for IBus." >&5 $as_echo "$as_me: WARNING: DBus support is required for IBus." >&2;} have_ibus_ibus_h_hdr=no @@ -21697,6 +21768,90 @@ $as_echo "#define HAVE_IBUS_IBUS_H 1" >>confdefs.h fi } +CheckFcitx() +{ + # Check whether --enable-fcitx was given. +if test "${enable_fcitx+set}" = set; then : + enableval=$enable_fcitx; +else + enable_fcitx=yes +fi + + if test x$enable_fcitx = xyes; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x$PKG_CONFIG != xno; then + FCITX_CFLAGS=`$PKG_CONFIG --cflags fcitx` + CFLAGS="$CFLAGS $FCITX_CFLAGS" + ac_fn_c_check_header_mongrel "$LINENO" "fcitx/frontend.h" "ac_cv_header_fcitx_frontend_h" "$ac_includes_default" +if test "x$ac_cv_header_fcitx_frontend_h" = xyes; then : + have_fcitx_frontend_h_hdr=yes +else + have_fcitx_frontend_h_hdr=no +fi + + + CFLAGS="$save_CFLAGS" + if test x$have_fcitx_frontend_h_hdr = xyes; then + if test x$enable_ime != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IME support is required for fcitx." >&5 +$as_echo "$as_me: WARNING: IME support is required for fcitx." >&2;} + have_fcitx_frontend_h_hdr=no + elif test x$enable_dbus != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBus support is required for fcitx." >&5 +$as_echo "$as_me: WARNING: DBus support is required for fcitx." >&2;} + have_fcitx_frontend_h_hdr=no + else + +$as_echo "#define HAVE_FCITX_FRONTEND_H 1" >>confdefs.h + + EXTRA_CFLAGS="$EXTRA_CFLAGS $FCITX_CFLAGS" + SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c" + fi + fi + fi + fi +} + CheckTslib() { # Check whether --enable-input-tslib was given. @@ -22894,6 +23049,8 @@ fi } +CheckWarnAll + case "$host" in *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*) case "$host" in @@ -22962,6 +23119,7 @@ case "$host" in *-*-minix*) ARCH=minix ;; esac CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -22982,7 +23140,9 @@ case "$host" in CheckWayland CheckLibUDev CheckDBus + CheckIME CheckIBus + CheckFcitx case $ARCH in linux) CheckInputEvents @@ -23392,6 +23552,7 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h ARCH=ios CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -23402,7 +23563,7 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h # Set up files for the audio library if test x$enable_audio = xyes; then - SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.c" + SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.m" SUMMARY_audio="${SUMMARY_audio} coreaudio" have_audio=yes fi @@ -23461,6 +23622,7 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX" CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -23476,7 +23638,8 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h $as_echo "#define SDL_AUDIO_DRIVER_COREAUDIO 1" >>confdefs.h - SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.c" + SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.m" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox" SUMMARY_audio="${SUMMARY_audio} coreaudio" have_audio=yes fi @@ -23494,8 +23657,8 @@ $as_echo "#define SDL_JOYSTICK_IOKIT 1" >>confdefs.h $as_echo "#define SDL_HAPTIC_IOKIT 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" - have_haptic=yes EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" + have_haptic=yes fi # Set up files for the power library if test x$enable_power = xyes; then @@ -23532,10 +23695,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit" - # If audio is used, add the AudioUnit framework - if test x$enable_audio = xyes; then - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit" - fi ;; *-nacl|*-pnacl) ARCH=nacl @@ -23581,6 +23740,7 @@ $as_echo "#define SDL_AUDIO_DRIVER_EMSCRIPTEN 1" >>confdefs.h fi CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -23630,8 +23790,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h ;; esac -CheckWarnAll - # Verify that we have all the platform specific files we need if test x$have_joystick != xyes; then @@ -23687,6 +23845,57 @@ if test x$SDLMAIN_SOURCES = x; then fi SDLTEST_SOURCES="$srcdir/src/test/*.c" +if test x$video_wayland = xyes; then + WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c' + WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h' + WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\ + sed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'` + WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\ + sed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'` + GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES" + GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS" + + WAYLAND_CORE_PROTOCOL_SOURCE_DEPENDS=" +$WAYLAND_CORE_PROTOCOL_SOURCE: $WAYLAND_CORE_PROTOCOL_DIR/wayland.xml + \$(SHELL) \$(auxdir)/mkinstalldirs \$(gen) + \$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) code \$< \$@" + + WAYLAND_CORE_PROTOCOL_HEADER_DEPENDS=" +$WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_DIR/wayland.xml + \$(SHELL) \$(auxdir)/mkinstalldirs \$(gen) + \$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) client-header \$< \$@" + + WAYLAND_CORE_PROTOCOL_OBJECT=" +\$(objects)/`echo $WAYLAND_CORE_PROTOCOL_SOURCE | sed 's/\$(gen)\/\(.*\).c$/\1.lo/'`: $WAYLAND_CORE_PROTOCOL_SOURCE + \$(RUN_CMD_CC)\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \$< -o \$@" + + WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\ + do echo ; echo \$p | sed\ + "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\ + \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\ + \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done` + + WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\ + do echo ; echo \$p | sed\ + "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\ + \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\ + \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done` + + WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\ + do echo ; echo \$p | sed\ + "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\ + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done` + + WAYLAND_PROTOCOLS_DEPENDS=" +$WAYLAND_CORE_PROTOCOL_SOURCE_DEPENDS +$WAYLAND_CORE_PROTOCOL_HEADER_DEPENDS +$WAYLAND_CORE_PROTOCOL_OBJECT +$WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS +$WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS +$WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE +" +fi + OBJECTS=`echo $SOURCES` DEPENDS=`echo $SOURCES | tr ' ' '\n'` for EXT in asm cc m c S; do @@ -23696,6 +23905,8 @@ for EXT in asm cc m c S; do \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` done +GEN_OBJECTS=`echo "$GEN_SOURCES" | sed 's,[^ ]*/\([^ ]*\)\.c,$(objects)/\1.lo,g'` + VERSION_OBJECTS=`echo $VERSION_SOURCES` VERSION_DEPENDS=`echo $VERSION_SOURCES` VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.rc,$(objects)/\1.o,g'` @@ -23722,6 +23933,36 @@ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.c,\\ if test "x$enable_rpath" = "xyes"; then if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker option --enable-new-dtags" >&5 +$as_echo_n "checking for linker option --enable-new-dtags... " >&6; } + have_enable_new_dtags=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + have_enable_new_dtags=yes + SDL_RLD_FLAGS="$SDL_RLD_FLAGS -Wl,--enable-new-dtags" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_enable_new_dtags" >&5 +$as_echo "$have_enable_new_dtags" >&6; } fi if test $ARCH = solaris; then SDL_RLD_FLAGS="-R\${libdir}" @@ -23767,6 +24008,9 @@ fi + + + cat >Makefile.rules <<__EOF__ # Build rules for objects @@ -23778,6 +24022,7 @@ $DEPENDS $VERSION_DEPENDS $SDLMAIN_DEPENDS $SDLTEST_DEPENDS +$WAYLAND_PROTOCOLS_DEPENDS __EOF__ ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config sdl2-config.cmake SDL2.spec sdl2.pc" @@ -23810,11 +24055,21 @@ if test x$have_dbus_dbus_h_hdr = xyes; then else SUMMARY="${SUMMARY}Using dbus : NO\n" fi +if test x$enable_ime = xyes; then + SUMMARY="${SUMMARY}Using ime : YES\n" +else + SUMMARY="${SUMMARY}Using ime : NO\n" +fi if test x$have_ibus_ibus_h_hdr = xyes; then SUMMARY="${SUMMARY}Using ibus : YES\n" else SUMMARY="${SUMMARY}Using ibus : NO\n" fi +if test x$have_fcitx_frontend_h_hdr = xyes; then + SUMMARY="${SUMMARY}Using fcitx : YES\n" +else + SUMMARY="${SUMMARY}Using fcitx : NO\n" +fi ac_config_commands="$ac_config_commands summary" diff --git a/Engine/lib/sdl/configure.in b/Engine/lib/sdl/configure.in index f585d01af..37c57e288 100644 --- a/Engine/lib/sdl/configure.in +++ b/Engine/lib/sdl/configure.in @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=4 -SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=4 +SDL_MICRO_VERSION=5 +SDL_INTERFACE_AGE=1 +SDL_BINARY_AGE=5 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION AC_SUBST(SDL_MAJOR_VERSION) @@ -770,7 +770,7 @@ CheckALSA() AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]), , enable_alsa=yes) if test x$enable_audio = xyes -a x$enable_alsa = xyes; then - AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no) + AM_PATH_ALSA(1.0.11, have_alsa=yes, have_alsa=no) # Restore all flags from before the ALSA detection runs CFLAGS="$alsa_save_CFLAGS" LDFLAGS="$alsa_save_LDFLAGS" @@ -1124,6 +1124,30 @@ CheckStackBoundary() fi } +dnl See if GCC's -Wdeclaration-after-statement is supported. +dnl This lets us catch things that would fail on a C89 compiler when using +dnl a modern GCC. +CheckDeclarationAfterStatement() +{ + AC_MSG_CHECKING(for GCC -Wdeclaration-after-statement option) + have_gcc_declaration_after_statement=no + + save_CFLAGS="$CFLAGS" + CFLAGS="$save_CFLAGS -Wdeclaration-after-statement -Werror=declaration-after-statement" + AC_TRY_COMPILE([ + int x = 0; + ],[ + ],[ + have_gcc_declaration_after_statement=yes + ]) + AC_MSG_RESULT($have_gcc_declaration_after_statement) + CFLAGS="$save_CFLAGS" + + if test x$have_gcc_declaration_after_statement = xyes; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wdeclaration-after-statement -Werror=declaration-after-statement" + fi +} + dnl See if GCC's -Wall is supported. CheckWarnAll() { @@ -1177,9 +1201,12 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for if test x$PKG_CONFIG != xno && \ test x$video_opengl_egl = xyes && \ test x$video_opengles_v2 = xyes; then - if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor egl xkbcommon ; then + if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` + WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` + WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` video_wayland=yes fi fi @@ -1190,8 +1217,11 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for if test x$enable_video_wayland_qt_touch = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH, 1, [ ]) fi + + WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 pointer-constraints-unstable-v1" + SOURCES="$SOURCES $srcdir/src/video/wayland/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)" AC_ARG_ENABLE(wayland-shared, AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[default=maybe]]]), , enable_wayland_shared=maybe) @@ -1260,12 +1290,12 @@ AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]), MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon` save_CFLAGS="$CFLAGS" CFLAGS="$save_CFLAGS $MIR_CFLAGS" - - dnl This will disable Mir on Ubuntu < 14.04 + + dnl This will disable Mir if >= v0.25 is not available AC_TRY_COMPILE([ #include ],[ - MirMotionToolType tool = mir_motion_tool_type_mouse; + MirTouchAction actions = mir_touch_actions ],[ video_mir=yes ]) @@ -2230,6 +2260,18 @@ AC_HELP_STRING([--enable-dbus], [enable D-Bus support [[default=yes]]]), fi } +dnl See if the platform wanna IME support. +CheckIME() +{ + AC_ARG_ENABLE(ime, +AC_HELP_STRING([--enable-ime], [enable IME support [[default=yes]]]), + , enable_ime=yes) + if test x$enable_ime = xyes; then + AC_DEFINE(SDL_USE_IME, 1, [ ]) + SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c" + fi +} + dnl See if the platform has libibus IME support. CheckIBus() { @@ -2250,7 +2292,10 @@ AC_HELP_STRING([--enable-ibus], [enable IBus support [[default=yes]]]), have_inotify_inotify_h_hdr=no) CFLAGS="$save_CFLAGS" if test x$have_ibus_ibus_h_hdr = xyes; then - if test x$enable_dbus != xyes; then + if test x$enable_ime != xyes; then + AC_MSG_WARN([IME support is required for IBus.]) + have_ibus_ibus_h_hdr=no + elif test x$enable_dbus != xyes; then AC_MSG_WARN([DBus support is required for IBus.]) have_ibus_ibus_h_hdr=no elif test x$have_inotify_inotify_h_hdr != xyes; then @@ -2266,6 +2311,38 @@ AC_HELP_STRING([--enable-ibus], [enable IBus support [[default=yes]]]), fi } +dnl See if the platform has fcitx IME support. +CheckFcitx() +{ + AC_ARG_ENABLE(fcitx, +AC_HELP_STRING([--enable-fcitx], [enable fcitx support [[default=yes]]]), + , enable_fcitx=yes) + if test x$enable_fcitx = xyes; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + if test x$PKG_CONFIG != xno; then + FCITX_CFLAGS=`$PKG_CONFIG --cflags fcitx` + CFLAGS="$CFLAGS $FCITX_CFLAGS" + AC_CHECK_HEADER(fcitx/frontend.h, + have_fcitx_frontend_h_hdr=yes, + have_fcitx_frontend_h_hdr=no) + CFLAGS="$save_CFLAGS" + if test x$have_fcitx_frontend_h_hdr = xyes; then + if test x$enable_ime != xyes; then + AC_MSG_WARN([IME support is required for fcitx.]) + have_fcitx_frontend_h_hdr=no + elif test x$enable_dbus != xyes; then + AC_MSG_WARN([DBus support is required for fcitx.]) + have_fcitx_frontend_h_hdr=no + else + AC_DEFINE(HAVE_FCITX_FRONTEND_H, 1, [ ]) + EXTRA_CFLAGS="$EXTRA_CFLAGS $FCITX_CFLAGS" + SOURCES="$SOURCES $srcdir/src/core/linux/SDL_fcitx.c" + fi + fi + fi + fi +} + dnl See if we can use the Touchscreen input library CheckTslib() { @@ -2801,6 +2878,9 @@ AC_HELP_STRING([--enable-rpath], [use an rpath when linking SDL [[default=yes]]] , enable_rpath=yes) } +dnl Do this on all platforms, before everything else (other things might want to override it). +CheckWarnAll + dnl Set up the configuration based on the host platform! case "$host" in *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*) @@ -2870,6 +2950,7 @@ case "$host" in *-*-minix*) ARCH=minix ;; esac CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -2890,7 +2971,9 @@ case "$host" in CheckWayland CheckLibUDev CheckDBus + CheckIME CheckIBus + CheckFcitx case $ARCH in linux) CheckInputEvents @@ -3196,6 +3279,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ARCH=ios CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3206,7 +3290,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau # Set up files for the audio library if test x$enable_audio = xyes; then - SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.c" + SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.m" SUMMARY_audio="${SUMMARY_audio} coreaudio" have_audio=yes fi @@ -3265,6 +3349,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX" CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3278,7 +3363,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau # Set up files for the audio library if test x$enable_audio = xyes; then AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO, 1, [ ]) - SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.c" + SOURCES="$SOURCES $srcdir/src/audio/coreaudio/*.m" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox" SUMMARY_audio="${SUMMARY_audio} coreaudio" have_audio=yes fi @@ -3292,8 +3378,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau if test x$enable_haptic = xyes; then AC_DEFINE(SDL_HAPTIC_IOKIT, 1, [ ]) SOURCES="$SOURCES $srcdir/src/haptic/darwin/*.c" - have_haptic=yes EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" + have_haptic=yes fi # Set up files for the power library if test x$enable_power = xyes; then @@ -3324,10 +3410,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit" - # If audio is used, add the AudioUnit framework - if test x$enable_audio = xyes; then - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit" - fi ;; *-nacl|*-pnacl) ARCH=nacl @@ -3366,6 +3448,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau fi CheckVisibilityHidden + CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3407,9 +3490,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ;; esac -dnl Do this on all platforms, after everything else. -CheckWarnAll - # Verify that we have all the platform specific files we need if test x$have_joystick != xyes; then @@ -3453,6 +3533,57 @@ if test x$SDLMAIN_SOURCES = x; then fi SDLTEST_SOURCES="$srcdir/src/test/*.c" +if test x$video_wayland = xyes; then + WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c' + WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h' + WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\ + sed 's,[[^ ]]\+,\\$(gen)/&-protocol.c,g'` + WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\ + sed 's,[[^ ]]\+,\\$(gen)/&-client-protocol.h,g'` + GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES" + GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS" + + WAYLAND_CORE_PROTOCOL_SOURCE_DEPENDS=" +$WAYLAND_CORE_PROTOCOL_SOURCE: $WAYLAND_CORE_PROTOCOL_DIR/wayland.xml + \$(SHELL) \$(auxdir)/mkinstalldirs \$(gen) + \$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) code \$< \$@" + + WAYLAND_CORE_PROTOCOL_HEADER_DEPENDS=" +$WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_DIR/wayland.xml + \$(SHELL) \$(auxdir)/mkinstalldirs \$(gen) + \$(RUN_CMD_GEN)\$(WAYLAND_SCANNER) client-header \$< \$@" + + WAYLAND_CORE_PROTOCOL_OBJECT=" +\$(objects)/`echo $WAYLAND_CORE_PROTOCOL_SOURCE | sed 's/\$(gen)\/\(.*\).c$/\1.lo/'`: $WAYLAND_CORE_PROTOCOL_SOURCE + \$(RUN_CMD_CC)\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \$< -o \$@" + + WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\ + do echo ; echo \$p | sed\ + "s,^\\([[a-z\\-]]\\+\\)-unstable-\\(v[[0-9]]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\ + \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\ + \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done` + + WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\ + do echo ; echo \$p | sed\ + "s,^\\([[a-z\\-]]\\+\\)-unstable-\\(v[[0-9]]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\ + \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\ + \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done` + + WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\ + do echo ; echo \$p | sed\ + "s,^\\([[a-z\\-]]\\+\\)-unstable-\\(v[[0-9]]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\ + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done` + + WAYLAND_PROTOCOLS_DEPENDS=" +$WAYLAND_CORE_PROTOCOL_SOURCE_DEPENDS +$WAYLAND_CORE_PROTOCOL_HEADER_DEPENDS +$WAYLAND_CORE_PROTOCOL_OBJECT +$WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS +$WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS +$WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE +" +fi + OBJECTS=`echo $SOURCES` DEPENDS=`echo $SOURCES | tr ' ' '\n'` for EXT in asm cc m c S; do @@ -3462,6 +3593,8 @@ for EXT in asm cc m c S; do \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` done +GEN_OBJECTS=`echo "$GEN_SOURCES" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` + VERSION_OBJECTS=`echo $VERSION_SOURCES` VERSION_DEPENDS=`echo $VERSION_SOURCES` VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` @@ -3488,6 +3621,19 @@ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\. if test "x$enable_rpath" = "xyes"; then if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}" + + AC_MSG_CHECKING(for linker option --enable-new-dtags) + have_enable_new_dtags=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags" + AC_TRY_LINK([ + ],[ + ],[ + have_enable_new_dtags=yes + SDL_RLD_FLAGS="$SDL_RLD_FLAGS -Wl,--enable-new-dtags" + ]) + LDFLAGS="$save_LDFLAGS" + AC_MSG_RESULT($have_enable_new_dtags) fi if test $ARCH = solaris; then SDL_RLD_FLAGS="-R\${libdir}" @@ -3526,6 +3672,8 @@ dnl Expand the sources and objects needed to build the library AC_SUBST(ac_aux_dir) AC_SUBST(INCLUDE) AC_SUBST(OBJECTS) +AC_SUBST(GEN_HEADERS) +AC_SUBST(GEN_OBJECTS) AC_SUBST(VERSION_OBJECTS) AC_SUBST(SDLMAIN_OBJECTS) AC_SUBST(SDLTEST_OBJECTS) @@ -3534,6 +3682,7 @@ AC_SUBST(EXTRA_CFLAGS) AC_SUBST(BUILD_LDFLAGS) AC_SUBST(EXTRA_LDFLAGS) AC_SUBST(WINDRES) +AC_SUBST(WAYLAND_SCANNER) cat >Makefile.rules <<__EOF__ @@ -3546,6 +3695,7 @@ $DEPENDS $VERSION_DEPENDS $SDLMAIN_DEPENDS $SDLTEST_DEPENDS +$WAYLAND_PROTOCOLS_DEPENDS __EOF__ AC_CONFIG_FILES([ @@ -3578,11 +3728,21 @@ if test x$have_dbus_dbus_h_hdr = xyes; then else SUMMARY="${SUMMARY}Using dbus : NO\n" fi +if test x$enable_ime = xyes; then + SUMMARY="${SUMMARY}Using ime : YES\n" +else + SUMMARY="${SUMMARY}Using ime : NO\n" +fi if test x$have_ibus_ibus_h_hdr = xyes; then SUMMARY="${SUMMARY}Using ibus : YES\n" else SUMMARY="${SUMMARY}Using ibus : NO\n" fi +if test x$have_fcitx_frontend_h_hdr = xyes; then + SUMMARY="${SUMMARY}Using fcitx : YES\n" +else + SUMMARY="${SUMMARY}Using fcitx : NO\n" +fi AC_CONFIG_COMMANDS([summary], [echo -en "$SUMMARY"], [SUMMARY="$SUMMARY"]) AC_OUTPUT diff --git a/Engine/lib/sdl/debian/changelog b/Engine/lib/sdl/debian/changelog index 84d1b878b..6a88d2473 100644 --- a/Engine/lib/sdl/debian/changelog +++ b/Engine/lib/sdl/debian/changelog @@ -1,3 +1,9 @@ +libsdl2 (2.0.4) UNRELEASED; urgency=low + + * Updated SDL to version 2.0.4 + + -- Sam Lantinga Thu, 07 Jan 2016 11:02:39 -0800 + libsdl2 (2.0.3) UNRELEASED; urgency=low * Updated SDL to version 2.0.3 diff --git a/Engine/lib/sdl/debian/copyright b/Engine/lib/sdl/debian/copyright index 8ce26d1c5..99c3d4496 100644 --- a/Engine/lib/sdl/debian/copyright +++ b/Engine/lib/sdl/debian/copyright @@ -31,10 +31,6 @@ Copyright: 1995 Erik Corry 1995 Brown University License: BrownUn_UnCalifornia_ErikCorry -Files: src/stdlib/SDL_qsort.c -Copyright: 1998 Gareth McCaughan -License: Gareth_McCaughan - Files: src/test/SDL_test_md5.c Copyright: 1997-2016 Sam Lantinga 1990 RSA Data Security, Inc. @@ -270,13 +266,6 @@ License: BrownUn_UnCalifornia_ErikCorry * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -License: Gareth_McCaughan - You may use it in anything you like; you may make money - out of it; you may distribute it in object form or as - part of an executable without including source code; - you don't have to credit me. (But it would be nice if - you did.) - License: Johnson_M._Hart Permission is granted for any and all use providing that this copyright is properly acknowledged. diff --git a/Engine/lib/sdl/debian/libsdl2-dev.install b/Engine/lib/sdl/debian/libsdl2-dev.install index 7f99ff427..af2c5b19d 100644 --- a/Engine/lib/sdl/debian/libsdl2-dev.install +++ b/Engine/lib/sdl/debian/libsdl2-dev.install @@ -5,4 +5,5 @@ usr/lib/*/libSDL2.a usr/lib/*/libSDL2main.a usr/lib/*/libSDL2_test.a usr/lib/*/pkgconfig/sdl2.pc +usr/lib/*/cmake/SDL2/sdl2-config.cmake usr/share/aclocal/sdl2.m4 diff --git a/Engine/lib/sdl/debian/rules b/Engine/lib/sdl/debian/rules old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/include/SDL.h b/Engine/lib/sdl/include/SDL.h index 7647b5111..1a3fa285c 100644 --- a/Engine/lib/sdl/include/SDL.h +++ b/Engine/lib/sdl/include/SDL.h @@ -72,14 +72,14 @@ extern "C" { * specify the subsystems which you will be using in your application. */ /* @{ */ -#define SDL_INIT_TIMER 0x00000001 -#define SDL_INIT_AUDIO 0x00000010 -#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */ -#define SDL_INIT_JOYSTICK 0x00000200 /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */ -#define SDL_INIT_HAPTIC 0x00001000 -#define SDL_INIT_GAMECONTROLLER 0x00002000 /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */ -#define SDL_INIT_EVENTS 0x00004000 -#define SDL_INIT_NOPARACHUTE 0x00100000 /**< compatibility; this flag is ignored. */ +#define SDL_INIT_TIMER 0x00000001u +#define SDL_INIT_AUDIO 0x00000010u +#define SDL_INIT_VIDEO 0x00000020u /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */ +#define SDL_INIT_JOYSTICK 0x00000200u /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */ +#define SDL_INIT_HAPTIC 0x00001000u +#define SDL_INIT_GAMECONTROLLER 0x00002000u /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */ +#define SDL_INIT_EVENTS 0x00004000u +#define SDL_INIT_NOPARACHUTE 0x00100000u /**< compatibility; this flag is ignored. */ #define SDL_INIT_EVERYTHING ( \ SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \ SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \ @@ -95,8 +95,8 @@ extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); * This function initializes specific SDL subsystems * * Subsystem initialization is ref-counted, you must call - * SDL_QuitSubSystem for each SDL_InitSubSystem to correctly - * shutdown a subsystem manually (or call SDL_Quit to force shutdown). + * SDL_QuitSubSystem() for each SDL_InitSubSystem() to correctly + * shutdown a subsystem manually (or call SDL_Quit() to force shutdown). * If a subsystem is already loaded then this call will * increase the ref-count and return. */ diff --git a/Engine/lib/sdl/include/SDL_audio.h b/Engine/lib/sdl/include/SDL_audio.h index 4f6552146..d51f0d1ce 100644 --- a/Engine/lib/sdl/include/SDL_audio.h +++ b/Engine/lib/sdl/include/SDL_audio.h @@ -278,7 +278,8 @@ extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); * protect data structures that it accesses by calling SDL_LockAudio() * and SDL_UnlockAudio() in your code. Alternately, you may pass a NULL * pointer here, and call SDL_QueueAudio() with some frequency, to queue - * more audio samples to be played. + * more audio samples to be played (or for capture devices, call + * SDL_DequeueAudio() with some frequency, to obtain audio samples). * - \c desired->userdata is passed as the first parameter to your callback * function. If you passed a NULL callback, this value is ignored. * @@ -482,6 +483,10 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, /** * Queue more audio on non-callback devices. * + * (If you are looking to retrieve queued audio from a non-callback capture + * device, you want SDL_DequeueAudio() instead. This will return -1 to + * signify an error if you use it with capture devices.) + * * SDL offers two ways to feed audio to the device: you can either supply a * callback that SDL triggers with some frequency to obtain more audio * (pull method), or you can supply no callback, and then SDL will expect @@ -516,21 +521,76 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, */ extern DECLSPEC int SDLCALL SDL_QueueAudio(SDL_AudioDeviceID dev, const void *data, Uint32 len); +/** + * Dequeue more audio on non-callback devices. + * + * (If you are looking to queue audio for output on a non-callback playback + * device, you want SDL_QueueAudio() instead. This will always return 0 + * if you use it with playback devices.) + * + * SDL offers two ways to retrieve audio from a capture device: you can + * either supply a callback that SDL triggers with some frequency as the + * device records more audio data, (push method), or you can supply no + * callback, and then SDL will expect you to retrieve data at regular + * intervals (pull method) with this function. + * + * There are no limits on the amount of data you can queue, short of + * exhaustion of address space. Data from the device will keep queuing as + * necessary without further intervention from you. This means you will + * eventually run out of memory if you aren't routinely dequeueing data. + * + * Capture devices will not queue data when paused; if you are expecting + * to not need captured audio for some length of time, use + * SDL_PauseAudioDevice() to stop the capture device from queueing more + * data. This can be useful during, say, level loading times. When + * unpaused, capture devices will start queueing data from that point, + * having flushed any capturable data available while paused. + * + * This function is thread-safe, but dequeueing from the same device from + * two threads at once does not promise which thread will dequeued data + * first. + * + * You may not dequeue audio from a device that is using an + * application-supplied callback; doing so returns an error. You have to use + * the audio callback, or dequeue audio with this function, but not both. + * + * You should not call SDL_LockAudio() on the device before queueing; SDL + * handles locking internally for this function. + * + * \param dev The device ID from which we will dequeue audio. + * \param data A pointer into where audio data should be copied. + * \param len The number of bytes (not samples!) to which (data) points. + * \return number of bytes dequeued, which could be less than requested. + * + * \sa SDL_GetQueuedAudioSize + * \sa SDL_ClearQueuedAudio + */ +extern DECLSPEC Uint32 SDLCALL SDL_DequeueAudio(SDL_AudioDeviceID dev, void *data, Uint32 len); + /** * Get the number of bytes of still-queued audio. * - * This is the number of bytes that have been queued for playback with - * SDL_QueueAudio(), but have not yet been sent to the hardware. + * For playback device: * - * Once we've sent it to the hardware, this function can not decide the exact - * byte boundary of what has been played. It's possible that we just gave the - * hardware several kilobytes right before you called this function, but it - * hasn't played any of it yet, or maybe half of it, etc. + * This is the number of bytes that have been queued for playback with + * SDL_QueueAudio(), but have not yet been sent to the hardware. This + * number may shrink at any time, so this only informs of pending data. + * + * Once we've sent it to the hardware, this function can not decide the + * exact byte boundary of what has been played. It's possible that we just + * gave the hardware several kilobytes right before you called this + * function, but it hasn't played any of it yet, or maybe half of it, etc. + * + * For capture devices: + * + * This is the number of bytes that have been captured by the device and + * are waiting for you to dequeue. This number may grow at any time, so + * this only informs of the lower-bound of available data. * * You may not queue audio on a device that is using an application-supplied * callback; calling this function on such a device always returns 0. - * You have to use the audio callback or queue audio with SDL_QueueAudio(), - * but not both. + * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use + * the audio callback, but not both. * * You should not call SDL_LockAudio() on the device before querying; SDL * handles locking internally for this function. @@ -544,10 +604,17 @@ extern DECLSPEC int SDLCALL SDL_QueueAudio(SDL_AudioDeviceID dev, const void *da extern DECLSPEC Uint32 SDLCALL SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev); /** - * Drop any queued audio data waiting to be sent to the hardware. + * Drop any queued audio data. For playback devices, this is any queued data + * still waiting to be submitted to the hardware. For capture devices, this + * is any data that was queued by the device that hasn't yet been dequeued by + * the application. * - * Immediately after this call, SDL_GetQueuedAudioSize() will return 0 and - * the hardware will start playing silence if more audio isn't queued. + * Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For + * playback devices, the hardware will start playing silence if more audio + * isn't queued. Unpaused capture devices will start filling the queue again + * as soon as they have more data available (which, depending on the state + * of the hardware and the thread, could be before this function call + * returns!). * * This will not prevent playback of queued audio that's already been sent * to the hardware, as we can not undo that, so expect there to be some @@ -557,8 +624,8 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev); * * You may not queue audio on a device that is using an application-supplied * callback; calling this function on such a device is always a no-op. - * You have to use the audio callback or queue audio with SDL_QueueAudio(), - * but not both. + * You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use + * the audio callback, but not both. * * You should not call SDL_LockAudio() on the device before clearing the * queue; SDL handles locking internally for this function. diff --git a/Engine/lib/sdl/include/SDL_config.h.cmake b/Engine/lib/sdl/include/SDL_config.h.cmake index 44173a053..98c62a994 100644 --- a/Engine/lib/sdl/include/SDL_config.h.cmake +++ b/Engine/lib/sdl/include/SDL_config.h.cmake @@ -81,6 +81,8 @@ #cmakedefine HAVE_PTHREAD_NP_H 1 #cmakedefine HAVE_LIBUDEV_H 1 #cmakedefine HAVE_DBUS_DBUS_H 1 +#cmakedefine HAVE_IBUS_IBUS_H 1 +#cmakedefine HAVE_FCITX_FRONTEND_H 1 /* C library functions */ #cmakedefine HAVE_MALLOC 1 diff --git a/Engine/lib/sdl/include/SDL_config.h.in b/Engine/lib/sdl/include/SDL_config.h.in index 2071be4e5..d610cd6ba 100644 --- a/Engine/lib/sdl/include/SDL_config.h.in +++ b/Engine/lib/sdl/include/SDL_config.h.in @@ -82,6 +82,7 @@ #undef HAVE_LIBUDEV_H #undef HAVE_DBUS_DBUS_H #undef HAVE_IBUS_IBUS_H +#undef HAVE_FCITX_FRONTEND_H /* C library functions */ #undef HAVE_MALLOC @@ -356,4 +357,7 @@ #undef SDL_ASSEMBLY_ROUTINES #undef SDL_ALTIVEC_BLITTERS +/* Enable ime support */ +#undef SDL_USE_IME + #endif /* _SDL_config_h */ diff --git a/Engine/lib/sdl/include/SDL_config_android.h b/Engine/lib/sdl/include/SDL_config_android.h index a388ba8de..996cf76c9 100644 --- a/Engine/lib/sdl/include/SDL_config_android.h +++ b/Engine/lib/sdl/include/SDL_config_android.h @@ -43,6 +43,7 @@ #define HAVE_STDINT_H 1 #define HAVE_CTYPE_H 1 #define HAVE_MATH_H 1 +#define HAVE_SIGNAL_H 1 /* C library functions */ #define HAVE_MALLOC 1 @@ -75,6 +76,7 @@ #define HAVE_STRTOULL 1 #define HAVE_STRTOD 1 #define HAVE_ATOI 1 +#define HAVE_ATOF 1 #define HAVE_STRCMP 1 #define HAVE_STRNCMP 1 #define HAVE_STRCASECMP 1 @@ -101,6 +103,7 @@ #define HAVE_SQRTF 1 #define HAVE_TAN 1 #define HAVE_TANF 1 +#define HAVE_SIGACTION 1 #define HAVE_SETJMP 1 #define HAVE_NANOSLEEP 1 #define HAVE_SYSCONF 1 diff --git a/Engine/lib/sdl/include/SDL_config_iphoneos.h b/Engine/lib/sdl/include/SDL_config_iphoneos.h index 304c89201..470985f80 100644 --- a/Engine/lib/sdl/include/SDL_config_iphoneos.h +++ b/Engine/lib/sdl/include/SDL_config_iphoneos.h @@ -119,11 +119,7 @@ #define SDL_JOYSTICK_MFI 1 /* Enable Unix style SO loading */ -/* Technically this works, but violates the iOS dev agreement prior to iOS 8 */ -/* #define SDL_LOADSO_DLOPEN 1 */ - -/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ -#define SDL_LOADSO_DISABLED 1 +#define SDL_LOADSO_DLOPEN 1 /* Enable various threading systems */ #define SDL_THREAD_PTHREAD 1 diff --git a/Engine/lib/sdl/include/SDL_events.h b/Engine/lib/sdl/include/SDL_events.h index 1437f4c70..edb89ef49 100644 --- a/Engine/lib/sdl/include/SDL_events.h +++ b/Engine/lib/sdl/include/SDL_events.h @@ -136,6 +136,9 @@ typedef enum /* Drag and drop events */ SDL_DROPFILE = 0x1000, /**< The system requests a file open */ + SDL_DROPTEXT, /**< text/plain drag-and-drop event */ + SDL_DROPBEGIN, /**< A new set of drops is beginning (NULL filename) */ + SDL_DROPCOMPLETE, /**< Current set of drops is now complete (NULL filename) */ /* Audio hotplug events */ SDL_AUDIODEVICEADDED = 0x1100, /**< A new audio device is available */ @@ -461,9 +464,10 @@ typedef struct SDL_DollarGestureEvent */ typedef struct SDL_DropEvent { - Uint32 type; /**< ::SDL_DROPFILE */ + Uint32 type; /**< ::SDL_DROPBEGIN or ::SDL_DROPFILE or ::SDL_DROPTEXT or ::SDL_DROPCOMPLETE */ Uint32 timestamp; - char *file; /**< The file name, which should be freed with SDL_free() */ + char *file; /**< The file name, which should be freed with SDL_free(), is NULL on begin/complete */ + Uint32 windowID; /**< The window that was dropped on, if any */ } SDL_DropEvent; diff --git a/Engine/lib/sdl/include/SDL_gamecontroller.h b/Engine/lib/sdl/include/SDL_gamecontroller.h index 42087eea1..e67fd9fd0 100644 --- a/Engine/lib/sdl/include/SDL_gamecontroller.h +++ b/Engine/lib/sdl/include/SDL_gamecontroller.h @@ -93,7 +93,7 @@ typedef struct SDL_GameControllerButtonBind * } * } * - * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: + * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping() you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: * guid,name,mappings * * Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones. @@ -136,14 +136,14 @@ extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping( const char* mappingStr /** * Get a mapping string for a GUID * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available + * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available */ extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid ); /** * Get a mapping string for an open GameController * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available + * \return the mapping string. Must be freed with SDL_free(). Returns NULL if no mapping is available */ extern DECLSPEC char * SDLCALL SDL_GameControllerMapping( SDL_GameController * gamecontroller ); diff --git a/Engine/lib/sdl/include/SDL_haptic.h b/Engine/lib/sdl/include/SDL_haptic.h index b36d78b12..9421c8f17 100644 --- a/Engine/lib/sdl/include/SDL_haptic.h +++ b/Engine/lib/sdl/include/SDL_haptic.h @@ -149,7 +149,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticCondition */ -#define SDL_HAPTIC_CONSTANT (1<<0) +#define SDL_HAPTIC_CONSTANT (1u<<0) /** * \brief Sine wave effect supported. @@ -158,7 +158,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticPeriodic */ -#define SDL_HAPTIC_SINE (1<<1) +#define SDL_HAPTIC_SINE (1u<<1) /** * \brief Left/Right effect supported. @@ -169,7 +169,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry, * we ran out of bits, and this is important for XInput devices. */ -#define SDL_HAPTIC_LEFTRIGHT (1<<2) +#define SDL_HAPTIC_LEFTRIGHT (1u<<2) /* !!! FIXME: put this back when we have more bits in 2.1 */ /* #define SDL_HAPTIC_SQUARE (1<<2) */ @@ -181,7 +181,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticPeriodic */ -#define SDL_HAPTIC_TRIANGLE (1<<3) +#define SDL_HAPTIC_TRIANGLE (1u<<3) /** * \brief Sawtoothup wave effect supported. @@ -190,7 +190,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticPeriodic */ -#define SDL_HAPTIC_SAWTOOTHUP (1<<4) +#define SDL_HAPTIC_SAWTOOTHUP (1u<<4) /** * \brief Sawtoothdown wave effect supported. @@ -199,7 +199,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticPeriodic */ -#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5) +#define SDL_HAPTIC_SAWTOOTHDOWN (1u<<5) /** * \brief Ramp effect supported. @@ -208,7 +208,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticRamp */ -#define SDL_HAPTIC_RAMP (1<<6) +#define SDL_HAPTIC_RAMP (1u<<6) /** * \brief Spring effect supported - uses axes position. @@ -218,7 +218,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticCondition */ -#define SDL_HAPTIC_SPRING (1<<7) +#define SDL_HAPTIC_SPRING (1u<<7) /** * \brief Damper effect supported - uses axes velocity. @@ -228,7 +228,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticCondition */ -#define SDL_HAPTIC_DAMPER (1<<8) +#define SDL_HAPTIC_DAMPER (1u<<8) /** * \brief Inertia effect supported - uses axes acceleration. @@ -238,7 +238,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticCondition */ -#define SDL_HAPTIC_INERTIA (1<<9) +#define SDL_HAPTIC_INERTIA (1u<<9) /** * \brief Friction effect supported - uses axes movement. @@ -248,14 +248,14 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticCondition */ -#define SDL_HAPTIC_FRICTION (1<<10) +#define SDL_HAPTIC_FRICTION (1u<<10) /** * \brief Custom effect is supported. * * User defined custom haptic effect. */ -#define SDL_HAPTIC_CUSTOM (1<<11) +#define SDL_HAPTIC_CUSTOM (1u<<11) /* @} *//* Haptic effects */ @@ -268,7 +268,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticSetGain */ -#define SDL_HAPTIC_GAIN (1<<12) +#define SDL_HAPTIC_GAIN (1u<<12) /** * \brief Device can set autocenter. @@ -277,7 +277,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticSetAutocenter */ -#define SDL_HAPTIC_AUTOCENTER (1<<13) +#define SDL_HAPTIC_AUTOCENTER (1u<<13) /** * \brief Device can be queried for effect status. @@ -286,7 +286,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * * \sa SDL_HapticGetEffectStatus */ -#define SDL_HAPTIC_STATUS (1<<14) +#define SDL_HAPTIC_STATUS (1u<<14) /** * \brief Device can be paused. @@ -294,7 +294,7 @@ typedef struct _SDL_Haptic SDL_Haptic; * \sa SDL_HapticPause * \sa SDL_HapticUnpause */ -#define SDL_HAPTIC_PAUSE (1<<15) +#define SDL_HAPTIC_PAUSE (1u<<15) /** diff --git a/Engine/lib/sdl/include/SDL_hints.h b/Engine/lib/sdl/include/SDL_hints.h index 3bd5435fb..dd1546431 100644 --- a/Engine/lib/sdl/include/SDL_hints.h +++ b/Engine/lib/sdl/include/SDL_hints.h @@ -233,16 +233,27 @@ extern "C" { #define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" /** -* \brief A variable controlling whether relative mouse mode is implemented using mouse warping -* -* This variable can be set to the following values: -* "0" - Relative mouse mode uses raw input -* "1" - Relative mouse mode uses mouse warping -* -* By default SDL will use raw input for relative mouse mode -*/ + * \brief A variable controlling whether relative mouse mode is implemented using mouse warping + * + * This variable can be set to the following values: + * "0" - Relative mouse mode uses raw input + * "1" - Relative mouse mode uses mouse warping + * + * By default SDL will use raw input for relative mouse mode + */ #define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" +/** + * \brief Allow mouse click events when clicking to focus an SDL window + * + * This variable can be set to the following values: + * "0" - Ignore mouse clicks that activate a window + * "1" - Generate events for mouse clicks that activate a window + * + * By default SDL will ignore mouse clicks that activate a window + */ +#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH" + /** * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. * @@ -257,8 +268,8 @@ extern "C" { * this is problematic. This functionality can be disabled by setting this * hint. * - * As of SDL 2.0.4, SDL_EnableScreenSaver and SDL_DisableScreenSaver accomplish - * the same thing on iOS. They should be preferred over this hint. + * As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver() + * accomplish the same thing on iOS. They should be preferred over this hint. * * This variable can be set to the following values: * "0" - Enable idle timer @@ -276,7 +287,35 @@ extern "C" { * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" */ #define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" - + +/** + * \brief A variable controlling whether controllers used with the Apple TV + * generate UI events. + * + * When UI events are generated by controller input, the app will be + * backgrounded when the Apple TV remote's menu button is pressed, and when the + * pause or B buttons on gamepads are pressed. + * + * More information about properly making use of controllers for the Apple TV + * can be found here: + * https://developer.apple.com/tvos/human-interface-guidelines/remote-and-controllers/ + * + * This variable can be set to the following values: + * "0" - Controller input does not generate UI events (the default). + * "1" - Controller input generates UI events. + */ +#define SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS "SDL_APPLE_TV_CONTROLLER_UI_EVENTS" + +/** + * \brief A variable controlling whether the Apple TV remote's joystick axes + * will automatically match the rotation of the remote. + * + * This variable can be set to the following values: + * "0" - Remote orientation does not affect joystick axes (the default). + * "1" - Joystick axes are based on the orientation of the remote. + */ +#define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION" + /** * \brief A variable controlling whether the Android / iOS built-in * accelerometer should be listed as a joystick device, rather than listing @@ -369,7 +408,7 @@ extern "C" { * Use this hint in case you need to set SDL's threads stack size to other than the default. * This is specially useful if you build SDL against a non glibc libc library (such as musl) which * provides a relatively small default thread stack size (a few kilobytes versus the default 8MB glibc uses). -* Support for this hint is currently available only in the pthread backend. +* Support for this hint is currently available only in the pthread, Windows, and PSP backend. */ #define SDL_HINT_THREAD_STACK_SIZE "SDL_THREAD_STACK_SIZE" @@ -431,7 +470,7 @@ extern "C" { * privacy policy. * * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init functions. The contents of the hint should + * before calling any SDL_Init() functions. The contents of the hint should * be a valid URL. For example, "http://www.example.com". * * The default value is "", which will prevent SDL from adding a privacy policy @@ -461,7 +500,7 @@ extern "C" { * The contents of this hint should be encoded as a UTF8 string. * * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init. + * initialization, preferably before any calls to SDL_Init(). * * For additional information on linking to a privacy policy, see the documentation for * SDL_HINT_WINRT_PRIVACY_POLICY_URL. @@ -630,6 +669,44 @@ extern "C" { */ #define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4" +/** + * \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs. + * + * The bitmap header version 4 is required for proper alpha channel support and + * SDL will use it when required. Should this not be desired, this hint can + * force the use of the 40 byte header version which is supported everywhere. + * + * The variable can be set to the following values: + * "0" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file with an alpha mask. SDL will use the bitmap + * header version 4 and set the alpha mask accordingly. + * "1" - Surfaces with a colorkey or an alpha channel are saved to a + * 32-bit BMP file without an alpha mask. The alpha channel data + * will be in the file, but applications are going to ignore it. + * + * The default value is "0". + */ +#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT" + +/** + * \brief Tell SDL not to name threads on Windows. + * + * The variable can be set to the following values: + * "0" - SDL will raise the 0x406D1388 Exception to name threads. + * This is the default behavior of SDL <= 2.0.4. (default) + * "1" - SDL will not raise this exception, and threads will be unnamed. + * For .NET languages this is required when running under a debugger. + */ +#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING" + +/** + * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI + * + * Also known as Z-order. The variable can take a negative or positive value. + * The default is 10000. + */ +#define SDL_HINT_RPI_VIDEO_LAYER "SDL_RPI_VIDEO_LAYER" + /** * \brief An enumeration of hint priorities */ @@ -669,6 +746,13 @@ extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, */ extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); +/** + * \brief Get a hint + * + * \return The boolean value of a hint variable. + */ +extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value); + /** * \brief Add a function to watch a particular hint * diff --git a/Engine/lib/sdl/include/SDL_joystick.h b/Engine/lib/sdl/include/SDL_joystick.h index 266f3b387..f5dbc9487 100644 --- a/Engine/lib/sdl/include/SDL_joystick.h +++ b/Engine/lib/sdl/include/SDL_joystick.h @@ -24,7 +24,7 @@ * * Include file for SDL joystick event handling * - * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick + * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks(), with the exact joystick * behind a device_index changing as joysticks are plugged and unplugged. * * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted diff --git a/Engine/lib/sdl/include/SDL_keyboard.h b/Engine/lib/sdl/include/SDL_keyboard.h index bbba0f07b..f80b6d2de 100644 --- a/Engine/lib/sdl/include/SDL_keyboard.h +++ b/Engine/lib/sdl/include/SDL_keyboard.h @@ -136,7 +136,7 @@ extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); * copy it. If the key doesn't have a name, this function returns an * empty string (""). * - * \sa SDL_Key + * \sa SDL_Keycode */ extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); diff --git a/Engine/lib/sdl/include/SDL_main.h b/Engine/lib/sdl/include/SDL_main.h index 9ce3754e9..67afea5e7 100644 --- a/Engine/lib/sdl/include/SDL_main.h +++ b/Engine/lib/sdl/include/SDL_main.h @@ -63,7 +63,7 @@ /* On Android SDL provides a Java class in SDLActivity.java that is the main activity entry point. - See README-android.txt for more details on extending that class. + See README-android.md for more details on extending that class. */ #define SDL_MAIN_NEEDED diff --git a/Engine/lib/sdl/include/SDL_mouse.h b/Engine/lib/sdl/include/SDL_mouse.h index ea9622f0f..46f046d0c 100644 --- a/Engine/lib/sdl/include/SDL_mouse.h +++ b/Engine/lib/sdl/include/SDL_mouse.h @@ -41,7 +41,7 @@ extern "C" { typedef struct SDL_Cursor SDL_Cursor; /* Implementation dependent */ /** - * \brief Cursor types for SDL_CreateSystemCursor. + * \brief Cursor types for SDL_CreateSystemCursor(). */ typedef enum { @@ -254,9 +254,11 @@ extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); /** - * \brief Frees a cursor created with SDL_CreateCursor(). + * \brief Frees a cursor created with SDL_CreateCursor() or similar functions. * * \sa SDL_CreateCursor() + * \sa SDL_CreateColorCursor() + * \sa SDL_CreateSystemCursor() */ extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); diff --git a/Engine/lib/sdl/include/SDL_opengles.h b/Engine/lib/sdl/include/SDL_opengles.h index bcc127779..15abee796 100644 --- a/Engine/lib/sdl/include/SDL_opengles.h +++ b/Engine/lib/sdl/include/SDL_opengles.h @@ -24,6 +24,7 @@ * * This is a simple file to encapsulate the OpenGL ES 1.X API headers. */ +#include "SDL_config.h" #ifdef __IPHONEOS__ #include diff --git a/Engine/lib/sdl/include/SDL_opengles2.h b/Engine/lib/sdl/include/SDL_opengles2.h index edcd1a24a..c961f0f7d 100644 --- a/Engine/lib/sdl/include/SDL_opengles2.h +++ b/Engine/lib/sdl/include/SDL_opengles2.h @@ -24,6 +24,8 @@ * * This is a simple file to encapsulate the OpenGL ES 2.0 API headers. */ +#include "SDL_config.h" + #ifndef _MSC_VER #ifdef __IPHONEOS__ diff --git a/Engine/lib/sdl/include/SDL_pixels.h b/Engine/lib/sdl/include/SDL_pixels.h index 8499c3289..cf6a33f08 100644 --- a/Engine/lib/sdl/include/SDL_pixels.h +++ b/Engine/lib/sdl/include/SDL_pixels.h @@ -29,6 +29,7 @@ #define _SDL_pixels_h #include "SDL_stdinc.h" +#include "SDL_endian.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ @@ -260,6 +261,19 @@ enum SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, SDL_PACKEDLAYOUT_2101010, 32, 4), + /* Aliases for RGBA byte arrays of color data, for the current platform */ +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + SDL_PIXELFORMAT_RGBA32 = SDL_PIXELFORMAT_RGBA8888, + SDL_PIXELFORMAT_ARGB32 = SDL_PIXELFORMAT_ARGB8888, + SDL_PIXELFORMAT_BGRA32 = SDL_PIXELFORMAT_BGRA8888, + SDL_PIXELFORMAT_ABGR32 = SDL_PIXELFORMAT_ABGR8888, +#else + SDL_PIXELFORMAT_RGBA32 = SDL_PIXELFORMAT_ABGR8888, + SDL_PIXELFORMAT_ARGB32 = SDL_PIXELFORMAT_BGRA8888, + SDL_PIXELFORMAT_BGRA32 = SDL_PIXELFORMAT_ARGB8888, + SDL_PIXELFORMAT_ABGR32 = SDL_PIXELFORMAT_RGBA8888, +#endif + SDL_PIXELFORMAT_YV12 = /**< Planar mode: Y + V + U (3 planes) */ SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'), SDL_PIXELFORMAT_IYUV = /**< Planar mode: Y + U + V (3 planes) */ diff --git a/Engine/lib/sdl/include/SDL_platform.h b/Engine/lib/sdl/include/SDL_platform.h index c6c21398b..03cf17061 100644 --- a/Engine/lib/sdl/include/SDL_platform.h +++ b/Engine/lib/sdl/include/SDL_platform.h @@ -70,18 +70,22 @@ /* lets us know what version of Mac OS X we're compiling on */ #include "AvailabilityMacros.h" #include "TargetConditionals.h" +#if TARGET_OS_TV +#undef __TVOS__ +#define __TVOS__ 1 +#endif #if TARGET_OS_IPHONE -/* if compiling for iPhone */ +/* if compiling for iOS */ #undef __IPHONEOS__ #define __IPHONEOS__ 1 #undef __MACOSX__ #else -/* if not compiling for iPhone */ +/* if not compiling for iOS */ #undef __MACOSX__ #define __MACOSX__ 1 -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -# error SDL for Mac OS X only supports deploying on 10.5 and above. -#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */ +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 +# error SDL for Mac OS X only supports deploying on 10.6 and above. +#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */ #endif /* TARGET_OS_IPHONE */ #endif /* defined(__APPLE__) */ diff --git a/Engine/lib/sdl/include/SDL_render.h b/Engine/lib/sdl/include/SDL_render.h index e4ed2af69..60c87b66a 100644 --- a/Engine/lib/sdl/include/SDL_render.h +++ b/Engine/lib/sdl/include/SDL_render.h @@ -499,6 +499,30 @@ extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, in */ extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); +/** + * \brief Set whether to force integer scales for resolution-independent rendering + * + * \param renderer The renderer for which integer scaling should be set. + * \param enable Enable or disable integer scaling + * + * This function restricts the logical viewport to integer values - that is, when + * a resolution is between two multiples of a logical size, the viewport size is + * rounded down to the lower multiple. + * + * \sa SDL_RenderSetLogicalSize() + */ +extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer, + SDL_bool enable); + +/** + * \brief Get whether integer scales are forced for resolution-independent rendering + * + * \param renderer The renderer from which integer scaling should be queried. + * + * \sa SDL_RenderSetIntegerScale() + */ +extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer); + /** * \brief Set the drawing area for rendering on the current target. * @@ -658,7 +682,8 @@ extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, /** * \brief Clear the current rendering target with the drawing color * - * This function clears the entire rendering target, ignoring the viewport. + * This function clears the entire rendering target, ignoring the viewport and + * the clip rectangle. * * \return 0 on success, or -1 on error */ diff --git a/Engine/lib/sdl/include/SDL_revision.h b/Engine/lib/sdl/include/SDL_revision.h index 6d7163d4d..341dc5cce 100644 --- a/Engine/lib/sdl/include/SDL_revision.h +++ b/Engine/lib/sdl/include/SDL_revision.h @@ -1,2 +1,2 @@ -#define SDL_REVISION "hg-10001:e12c38730512" -#define SDL_REVISION_NUMBER 10001 +#define SDL_REVISION "hg-10556:007dfe83abf8" +#define SDL_REVISION_NUMBER 10556 diff --git a/Engine/lib/sdl/include/SDL_rwops.h b/Engine/lib/sdl/include/SDL_rwops.h index f460ae7d4..1ad3ac406 100644 --- a/Engine/lib/sdl/include/SDL_rwops.h +++ b/Engine/lib/sdl/include/SDL_rwops.h @@ -39,12 +39,12 @@ extern "C" { #endif /* RWops Types */ -#define SDL_RWOPS_UNKNOWN 0 /* Unknown stream type */ -#define SDL_RWOPS_WINFILE 1 /* Win32 file */ -#define SDL_RWOPS_STDFILE 2 /* Stdio file */ -#define SDL_RWOPS_JNIFILE 3 /* Android asset */ -#define SDL_RWOPS_MEMORY 4 /* Memory stream */ -#define SDL_RWOPS_MEMORY_RO 5 /* Read-Only memory stream */ +#define SDL_RWOPS_UNKNOWN 0U /* Unknown stream type */ +#define SDL_RWOPS_WINFILE 1U /* Win32 file */ +#define SDL_RWOPS_STDFILE 2U /* Stdio file */ +#define SDL_RWOPS_JNIFILE 3U /* Android asset */ +#define SDL_RWOPS_MEMORY 4U /* Memory stream */ +#define SDL_RWOPS_MEMORY_RO 5U /* Read-Only memory stream */ /** * This is the read/write operation structure -- very basic. diff --git a/Engine/lib/sdl/include/SDL_stdinc.h b/Engine/lib/sdl/include/SDL_stdinc.h index 887bcd2d4..fdf96415f 100644 --- a/Engine/lib/sdl/include/SDL_stdinc.h +++ b/Engine/lib/sdl/include/SDL_stdinc.h @@ -83,9 +83,6 @@ #ifdef HAVE_FLOAT_H # include #endif -#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) -# include -#endif /** * The number of elements in an array. @@ -93,6 +90,13 @@ #define SDL_arraysize(array) (sizeof(array)/sizeof(array[0])) #define SDL_TABLESIZE(table) SDL_arraysize(table) +/** + * Macro useful for building other macros with strings in them + * + * e.g. #define LOG_ERROR(X) OutputDebugString(SDL_STRINGIFY_ARG(__FUNCTION__) ": " X "\n") + */ +#define SDL_STRINGIFY_ARG(arg) #arg + /** * \name Cast operators * diff --git a/Engine/lib/sdl/include/SDL_surface.h b/Engine/lib/sdl/include/SDL_surface.h index e63ca8903..e4a06a204 100644 --- a/Engine/lib/sdl/include/SDL_surface.h +++ b/Engine/lib/sdl/include/SDL_surface.h @@ -118,6 +118,8 @@ typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect, extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface (Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); +extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormat + (Uint32 flags, int width, int height, int depth, Uint32 format); extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, @@ -127,6 +129,8 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); +extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormatFrom + (void *pixels, int width, int height, int depth, int pitch, Uint32 format); extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); /** @@ -184,6 +188,12 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, /** * Save a surface to a seekable SDL data stream (memory or file). * + * Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the + * BMP directly. Other RGB formats with 8-bit or higher get converted to a + * 24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit + * surface before they are saved. YUV and paletted 1-bit and 4-bit formats are + * not supported. + * * If \c freedst is non-zero, the stream will be closed after being written. * * \return 0 if successful or -1 if there was an error. diff --git a/Engine/lib/sdl/include/SDL_syswm.h b/Engine/lib/sdl/include/SDL_syswm.h index 1056e526b..71ba5f1f3 100644 --- a/Engine/lib/sdl/include/SDL_syswm.h +++ b/Engine/lib/sdl/include/SDL_syswm.h @@ -106,6 +106,10 @@ typedef struct ANativeWindow ANativeWindow; typedef void *EGLSurface; #endif +#if defined(SDL_VIDEO_DRIVER_VIVANTE) +#include "SDL_egl.h" +#endif + /** * These are the various supported windowing subsystems */ @@ -120,7 +124,8 @@ typedef enum SDL_SYSWM_WAYLAND, SDL_SYSWM_MIR, SDL_SYSWM_WINRT, - SDL_SYSWM_ANDROID + SDL_SYSWM_ANDROID, + SDL_SYSWM_VIVANTE } SDL_SYSWM_TYPE; /** @@ -166,6 +171,13 @@ struct SDL_SysWMmsg int dummy; /* No UIKit window events yet */ } uikit; +#endif +#if defined(SDL_VIDEO_DRIVER_VIVANTE) + struct + { + int dummy; + /* No Vivante window events yet */ + } vivante; #endif /* Can't have an empty union */ int dummy; @@ -259,6 +271,14 @@ struct SDL_SysWMinfo } android; #endif +#if defined(SDL_VIDEO_DRIVER_VIVANTE) + struct + { + EGLNativeDisplayType display; + EGLNativeWindowType window; + } vivante; +#endif + /* Can't have an empty union */ int dummy; } info; diff --git a/Engine/lib/sdl/include/SDL_version.h b/Engine/lib/sdl/include/SDL_version.h index de1f16056..1700efdd1 100644 --- a/Engine/lib/sdl/include/SDL_version.h +++ b/Engine/lib/sdl/include/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 4 +#define SDL_PATCHLEVEL 5 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/Engine/lib/sdl/include/SDL_video.h b/Engine/lib/sdl/include/SDL_video.h index 52dbbc765..73c33eb32 100644 --- a/Engine/lib/sdl/include/SDL_video.h +++ b/Engine/lib/sdl/include/SDL_video.h @@ -83,6 +83,7 @@ typedef struct * \sa SDL_SetWindowPosition() * \sa SDL_SetWindowSize() * \sa SDL_SetWindowBordered() + * \sa SDL_SetWindowResizable() * \sa SDL_SetWindowTitle() * \sa SDL_ShowWindow() */ @@ -95,6 +96,7 @@ typedef struct SDL_Window SDL_Window; */ typedef enum { + /* !!! FIXME: change this to name = (1<= $min_sdl_version) no_sdl="" - if test "$SDL2_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags` - SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs` + if test "$SDL2_CONFIG" = "no" -a "x$search_sdl_framework" = "xyes"; then + AC_MSG_CHECKING(for SDL2.framework) + if test "x$SDL2_FRAMEWORK" != x; then + sdl_framework=$SDL2_FRAMEWORK + else + for d in / ~/ /System/; do + if test -d "$dLibrary/Frameworks/SDL2.framework"; then + sdl_framework="$dLibrary/Frameworks/SDL2.framework" + fi + done + fi + + if test -d $sdl_framework; then + AC_MSG_RESULT($sdl_framework) + sdl_framework_dir=`dirname $sdl_framework` + SDL_CFLAGS="-F$sdl_framework_dir -Wl,-framework,SDL2 -I$sdl_framework/include" + SDL_LIBS="-F$sdl_framework_dir -Wl,-framework,SDL2" + else + no_sdl=yes + fi + fi + + if test "$SDL2_CONFIG" != "no"; then + if test "x$sdl_pc" = "xno"; then + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs` + fi sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` @@ -141,12 +170,15 @@ int main (int argc, char *argv[]) CFLAGS="$ac_save_CFLAGS" CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" + + fi + if test "x$sdl_pc" = "xno"; then + if test "x$no_sdl" = "xyes"; then + AC_MSG_RESULT(no) + else + AC_MSG_RESULT(yes) + fi fi - fi - if test "x$no_sdl" = x ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) fi fi if test "x$no_sdl" = x ; then diff --git a/Engine/lib/sdl/src/SDL.c b/Engine/lib/sdl/src/SDL.c index 5d310021a..9eef00cd3 100644 --- a/Engine/lib/sdl/src/SDL.c +++ b/Engine/lib/sdl/src/SDL.c @@ -115,6 +115,16 @@ SDL_InitSubSystem(Uint32 flags) /* Clear the error message */ SDL_ClearError(); + if ((flags & SDL_INIT_GAMECONTROLLER)) { + /* game controller implies joystick */ + flags |= SDL_INIT_JOYSTICK; + } + + if ((flags & (SDL_INIT_VIDEO|SDL_INIT_JOYSTICK))) { + /* video or joystick implies events */ + flags |= SDL_INIT_EVENTS; + } + #if SDL_VIDEO_DRIVER_WINDOWS if ((flags & (SDL_INIT_HAPTIC|SDL_INIT_JOYSTICK))) { if (SDL_HelperWindowCreate() < 0) { @@ -127,16 +137,6 @@ SDL_InitSubSystem(Uint32 flags) SDL_TicksInit(); #endif - if ((flags & SDL_INIT_GAMECONTROLLER)) { - /* game controller implies joystick */ - flags |= SDL_INIT_JOYSTICK; - } - - if ((flags & (SDL_INIT_VIDEO|SDL_INIT_JOYSTICK))) { - /* video or joystick implies events */ - flags |= SDL_INIT_EVENTS; - } - /* Initialize the event subsystem */ if ((flags & SDL_INIT_EVENTS)) { #if !SDL_EVENTS_DISABLED @@ -443,6 +443,8 @@ SDL_GetPlatform() return "Windows"; #elif __WINRT__ return "WinRT"; +#elif __TVOS__ + return "tvOS"; #elif __IPHONEOS__ return "iOS"; #elif __PSP__ diff --git a/Engine/lib/sdl/src/SDL_error.c b/Engine/lib/sdl/src/SDL_error.c index ace5cc397..804a1eb38 100644 --- a/Engine/lib/sdl/src/SDL_error.c +++ b/Engine/lib/sdl/src/SDL_error.c @@ -116,6 +116,10 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) return -1; } +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" +#endif /* This function has a bit more overhead than most error functions so that it supports internationalization and thread-safe errors. */ @@ -216,6 +220,9 @@ SDL_GetErrorMsg(char *errstr, int maxlen) } return (errstr); } +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif /* Available for backwards compatibility */ const char * diff --git a/Engine/lib/sdl/src/SDL_hints.c b/Engine/lib/sdl/src/SDL_hints.c index 04523327a..390d94f9f 100644 --- a/Engine/lib/sdl/src/SDL_hints.c +++ b/Engine/lib/sdl/src/SDL_hints.c @@ -118,6 +118,19 @@ SDL_GetHint(const char *name) return env; } +SDL_bool +SDL_GetHintBoolean(const char *name, SDL_bool default_value) +{ + const char *hint = SDL_GetHint(name); + if (!hint) { + return default_value; + } + if (*hint == '0' || SDL_strcasecmp(hint, "false") == 0) { + return SDL_FALSE; + } + return SDL_TRUE; +} + void SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata) { diff --git a/Engine/lib/sdl/src/SDL_log.c b/Engine/lib/sdl/src/SDL_log.c index 60bac9f65..760cb13de 100644 --- a/Engine/lib/sdl/src/SDL_log.c +++ b/Engine/lib/sdl/src/SDL_log.c @@ -324,7 +324,7 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, size_t length; LPTSTR tstr; -#ifndef __WINRT__ +#if !defined(HAVE_STDIO_H) && !defined(__WINRT__) BOOL attachResult; DWORD attachError; unsigned long charsWritten; @@ -356,7 +356,7 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, stderrHandle = GetStdHandle(STD_ERROR_HANDLE); } } -#endif /* ifndef __WINRT__ */ +#endif /* !defined(HAVE_STDIO_H) && !defined(__WINRT__) */ length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1 + 1; output = SDL_stack_alloc(char, length); @@ -366,7 +366,7 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, /* Output to debugger */ OutputDebugString(tstr); -#ifndef __WINRT__ +#if !defined(HAVE_STDIO_H) && !defined(__WINRT__) /* Screen output to stderr, if console was attached. */ if (consoleAttached == 1) { if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) { @@ -376,7 +376,7 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, } } } -#endif /* ifndef __WINRT__ */ +#endif /* !defined(HAVE_STDIO_H) && !defined(__WINRT__) */ SDL_free(tstr); SDL_stack_free(output); diff --git a/Engine/lib/sdl/src/audio/SDL_audio.c b/Engine/lib/sdl/src/audio/SDL_audio.c index 2ffd216c0..460852d7f 100644 --- a/Engine/lib/sdl/src/audio/SDL_audio.c +++ b/Engine/lib/sdl/src/audio/SDL_audio.c @@ -25,33 +25,29 @@ #include "SDL.h" #include "SDL_audio.h" #include "SDL_audio_c.h" -#include "SDL_audiomem.h" #include "SDL_sysaudio.h" +#include "../thread/SDL_systhread.h" #define _THIS SDL_AudioDevice *_this static SDL_AudioDriver current_audio; static SDL_AudioDevice *open_devices[16]; -/* !!! FIXME: These are wordy and unlocalized... */ -#define DEFAULT_OUTPUT_DEVNAME "System audio output device" -#define DEFAULT_INPUT_DEVNAME "System audio capture device" - - /* * Not all of these will be compiled and linked in, but it's convenient * to have a complete list here and saves yet-another block of #ifdefs... * Please see bootstrap[], below, for the actual #ifdef mess. */ +extern AudioBootStrap PULSEAUDIO_bootstrap; +extern AudioBootStrap ALSA_bootstrap; +extern AudioBootStrap SNDIO_bootstrap; extern AudioBootStrap BSD_AUDIO_bootstrap; extern AudioBootStrap DSP_bootstrap; -extern AudioBootStrap ALSA_bootstrap; -extern AudioBootStrap PULSEAUDIO_bootstrap; extern AudioBootStrap QSAAUDIO_bootstrap; extern AudioBootStrap SUNAUDIO_bootstrap; extern AudioBootStrap ARTS_bootstrap; extern AudioBootStrap ESD_bootstrap; -extern AudioBootStrap NACLAUD_bootstrap; +extern AudioBootStrap NACLAUDIO_bootstrap; extern AudioBootStrap NAS_bootstrap; extern AudioBootStrap XAUDIO2_bootstrap; extern AudioBootStrap DSOUND_bootstrap; @@ -59,18 +55,13 @@ extern AudioBootStrap WINMM_bootstrap; extern AudioBootStrap PAUDIO_bootstrap; extern AudioBootStrap HAIKUAUDIO_bootstrap; extern AudioBootStrap COREAUDIO_bootstrap; -extern AudioBootStrap SNDMGR_bootstrap; -extern AudioBootStrap DISKAUD_bootstrap; -extern AudioBootStrap DUMMYAUD_bootstrap; -extern AudioBootStrap DCAUD_bootstrap; -extern AudioBootStrap DART_bootstrap; -extern AudioBootStrap NDSAUD_bootstrap; +extern AudioBootStrap DISKAUDIO_bootstrap; +extern AudioBootStrap DUMMYAUDIO_bootstrap; extern AudioBootStrap FUSIONSOUND_bootstrap; -extern AudioBootStrap ANDROIDAUD_bootstrap; -extern AudioBootStrap PSPAUD_bootstrap; +extern AudioBootStrap ANDROIDAUDIO_bootstrap; +extern AudioBootStrap PSPAUDIO_bootstrap; extern AudioBootStrap SNDIO_bootstrap; -extern AudioBootStrap EmscriptenAudio_bootstrap; - +extern AudioBootStrap EMSCRIPTENAUDIO_bootstrap; /* Available audio drivers */ static const AudioBootStrap *const bootstrap[] = { @@ -102,7 +93,7 @@ static const AudioBootStrap *const bootstrap[] = { &ESD_bootstrap, #endif #if SDL_AUDIO_DRIVER_NACL - &NACLAUD_bootstrap, + &NACLAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_NAS &NAS_bootstrap, @@ -126,22 +117,22 @@ static const AudioBootStrap *const bootstrap[] = { &COREAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_DISK - &DISKAUD_bootstrap, + &DISKAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_DUMMY - &DUMMYAUD_bootstrap, + &DUMMYAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_FUSIONSOUND &FUSIONSOUND_bootstrap, #endif #if SDL_AUDIO_DRIVER_ANDROID - &ANDROIDAUD_bootstrap, + &ANDROIDAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_PSP - &PSPAUD_bootstrap, + &PSPAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_EMSCRIPTEN - &EmscriptenAudio_bootstrap, + &EMSCRIPTENAUDIO_bootstrap, #endif NULL }; @@ -165,7 +156,7 @@ SDL_AudioDetectDevices_Default(void) { /* you have to write your own implementation if these assertions fail. */ SDL_assert(current_audio.impl.OnlyHasDefaultOutputDevice); - SDL_assert(current_audio.impl.OnlyHasDefaultInputDevice || !current_audio.impl.HasCaptureSupport); + SDL_assert(current_audio.impl.OnlyHasDefaultCaptureDevice || !current_audio.impl.HasCaptureSupport); SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) ((size_t) 0x1)); if (current_audio.impl.HasCaptureSupport) { @@ -200,8 +191,19 @@ SDL_AudioGetDeviceBuf_Default(_THIS) return NULL; } +static int +SDL_AudioCaptureFromDevice_Default(_THIS, void *buffer, int buflen) +{ + return -1; /* just fail immediately. */ +} + static void -SDL_AudioWaitDone_Default(_THIS) +SDL_AudioFlushCapture_Default(_THIS) +{ /* no-op. */ +} + +static void +SDL_AudioPrepareToClose_Default(_THIS) { /* no-op. */ } @@ -257,15 +259,28 @@ SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device) } } +static void +SDL_AudioLockOrUnlockDeviceWithNoMixerLock(SDL_AudioDevice * device) +{ +} static void -finalize_audio_entry_points(void) +finish_audio_entry_points_init(void) { /* * Fill in stub functions for unused driver entry points. This lets us * blindly call them without having to check for validity first. */ + if (current_audio.impl.SkipMixerLock) { + if (current_audio.impl.LockDevice == NULL) { + current_audio.impl.LockDevice = SDL_AudioLockOrUnlockDeviceWithNoMixerLock; + } + if (current_audio.impl.UnlockDevice == NULL) { + current_audio.impl.UnlockDevice = SDL_AudioLockOrUnlockDeviceWithNoMixerLock; + } + } + #define FILL_STUB(x) \ if (current_audio.impl.x == NULL) { \ current_audio.impl.x = SDL_Audio##x##_Default; \ @@ -277,7 +292,9 @@ finalize_audio_entry_points(void) FILL_STUB(PlayDevice); FILL_STUB(GetPendingBytes); FILL_STUB(GetDeviceBuf); - FILL_STUB(WaitDone); + FILL_STUB(CaptureFromDevice); + FILL_STUB(FlushCapture); + FILL_STUB(PrepareToClose); FILL_STUB(CloseDevice); FILL_STUB(LockDevice); FILL_STUB(UnlockDevice); @@ -316,7 +333,7 @@ add_audio_device(const char *name, void *handle, SDL_AudioDeviceItem **devices, static SDL_INLINE int add_capture_device(const char *name, void *handle) { - /* !!! FIXME: add this later. SDL_assert(current_audio.impl.HasCaptureSupport);*/ + SDL_assert(current_audio.impl.HasCaptureSupport); return add_audio_device(name, handle, ¤t_audio.inputDevices, ¤t_audio.inputDeviceCount); } @@ -365,14 +382,14 @@ void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device) { SDL_assert(get_audio_device(device->id) == device); - if (!device->enabled) { + if (!SDL_AtomicGet(&device->enabled)) { return; } /* Ends the audio callback and mark the device as STOPPED, but the app still needs to close the device to free resources. */ current_audio.impl.LockDevice(device); - device->enabled = 0; + SDL_AtomicSet(&device->enabled, 0); current_audio.impl.UnlockDevice(device); /* Post the event, if desired */ @@ -404,13 +421,26 @@ mark_device_removed(void *handle, SDL_AudioDeviceItem *devices, SDL_bool *remove void SDL_RemoveAudioDevice(const int iscapture, void *handle) { + int device_index; + SDL_AudioDevice *device = NULL; + SDL_LockMutex(current_audio.detectionLock); if (iscapture) { mark_device_removed(handle, current_audio.inputDevices, ¤t_audio.captureDevicesRemoved); } else { mark_device_removed(handle, current_audio.outputDevices, ¤t_audio.outputDevicesRemoved); } + for (device_index = 0; device_index < SDL_arraysize(open_devices); device_index++) + { + device = open_devices[device_index]; + if (device != NULL && device->handle == handle) + { + SDL_OpenedAudioDeviceDisconnected(device); + break; + } + } SDL_UnlockMutex(current_audio.detectionLock); + current_audio.impl.FreeDeviceHandle(handle); } @@ -420,77 +450,24 @@ SDL_RemoveAudioDevice(const int iscapture, void *handle) /* this expects that you managed thread safety elsewhere. */ static void -free_audio_queue(SDL_AudioBufferQueue *buffer) +free_audio_queue(SDL_AudioBufferQueue *packet) { - while (buffer) { - SDL_AudioBufferQueue *next = buffer->next; - SDL_free(buffer); - buffer = next; + while (packet) { + SDL_AudioBufferQueue *next = packet->next; + SDL_free(packet); + packet = next; } } -static void SDLCALL -SDL_BufferQueueDrainCallback(void *userdata, Uint8 *stream, int _len) +/* NOTE: This assumes you'll hold the mixer lock before calling! */ +static int +queue_audio_to_device(SDL_AudioDevice *device, const Uint8 *data, Uint32 len) { - /* this function always holds the mixer lock before being called. */ - Uint32 len = (Uint32) _len; - SDL_AudioDevice *device = (SDL_AudioDevice *) userdata; - SDL_AudioBufferQueue *buffer; - - SDL_assert(device != NULL); /* this shouldn't ever happen, right?! */ - SDL_assert(_len >= 0); /* this shouldn't ever happen, right?! */ - - while ((len > 0) && ((buffer = device->buffer_queue_head) != NULL)) { - const Uint32 avail = buffer->datalen - buffer->startpos; - const Uint32 cpy = SDL_min(len, avail); - SDL_assert(device->queued_bytes >= avail); - - SDL_memcpy(stream, buffer->data + buffer->startpos, cpy); - buffer->startpos += cpy; - stream += cpy; - device->queued_bytes -= cpy; - len -= cpy; - - if (buffer->startpos == buffer->datalen) { /* packet is done, put it in the pool. */ - device->buffer_queue_head = buffer->next; - SDL_assert((buffer->next != NULL) || (buffer == device->buffer_queue_tail)); - buffer->next = device->buffer_queue_pool; - device->buffer_queue_pool = buffer; - } - } - - SDL_assert((device->buffer_queue_head != NULL) == (device->queued_bytes != 0)); - - if (len > 0) { /* fill any remaining space in the stream with silence. */ - SDL_assert(device->buffer_queue_head == NULL); - SDL_memset(stream, device->spec.silence, len); - } - - if (device->buffer_queue_head == NULL) { - device->buffer_queue_tail = NULL; /* in case we drained the queue entirely. */ - } -} - -int -SDL_QueueAudio(SDL_AudioDeviceID devid, const void *_data, Uint32 len) -{ - SDL_AudioDevice *device = get_audio_device(devid); - const Uint8 *data = (const Uint8 *) _data; SDL_AudioBufferQueue *orighead; SDL_AudioBufferQueue *origtail; Uint32 origlen; Uint32 datalen; - if (!device) { - return -1; /* get_audio_device() will have set the error state */ - } - - if (device->spec.callback != SDL_BufferQueueDrainCallback) { - return SDL_SetError("Audio device has a callback, queueing not allowed"); - } - - current_audio.impl.LockDevice(device); - orighead = device->buffer_queue_head; origtail = device->buffer_queue_tail; origlen = origtail ? origtail->datalen : 0; @@ -520,8 +497,6 @@ SDL_QueueAudio(SDL_AudioDeviceID devid, const void *_data, Uint32 len) device->buffer_queue_tail = origtail; device->buffer_queue_pool = NULL; - current_audio.impl.UnlockDevice(device); - free_audio_queue(packet); /* give back what we can. */ return SDL_OutOfMemory(); @@ -548,22 +523,142 @@ SDL_QueueAudio(SDL_AudioDeviceID devid, const void *_data, Uint32 len) device->queued_bytes += datalen; } - current_audio.impl.UnlockDevice(device); - return 0; } +/* NOTE: This assumes you'll hold the mixer lock before calling! */ +static Uint32 +dequeue_audio_from_device(SDL_AudioDevice *device, Uint8 *stream, Uint32 len) +{ + SDL_AudioBufferQueue *packet; + Uint8 *ptr = stream; + + while ((len > 0) && ((packet = device->buffer_queue_head) != NULL)) { + const Uint32 avail = packet->datalen - packet->startpos; + const Uint32 cpy = SDL_min(len, avail); + SDL_assert(device->queued_bytes >= avail); + + SDL_memcpy(ptr, packet->data + packet->startpos, cpy); + packet->startpos += cpy; + ptr += cpy; + device->queued_bytes -= cpy; + len -= cpy; + + if (packet->startpos == packet->datalen) { /* packet is done, put it in the pool. */ + device->buffer_queue_head = packet->next; + SDL_assert((packet->next != NULL) || (packet == device->buffer_queue_tail)); + packet->next = device->buffer_queue_pool; + device->buffer_queue_pool = packet; + } + } + + SDL_assert((device->buffer_queue_head != NULL) == (device->queued_bytes != 0)); + + if (device->buffer_queue_head == NULL) { + device->buffer_queue_tail = NULL; /* in case we drained the queue entirely. */ + } + + return (Uint32) (ptr - stream); +} + +static void SDLCALL +SDL_BufferQueueDrainCallback(void *userdata, Uint8 *stream, int len) +{ + /* this function always holds the mixer lock before being called. */ + SDL_AudioDevice *device = (SDL_AudioDevice *) userdata; + Uint32 written; + + SDL_assert(device != NULL); /* this shouldn't ever happen, right?! */ + SDL_assert(!device->iscapture); /* this shouldn't ever happen, right?! */ + SDL_assert(len >= 0); /* this shouldn't ever happen, right?! */ + + written = dequeue_audio_from_device(device, stream, (Uint32) len); + stream += written; + len -= (int) written; + + if (len > 0) { /* fill any remaining space in the stream with silence. */ + SDL_assert(device->buffer_queue_head == NULL); + SDL_memset(stream, device->spec.silence, len); + } +} + +static void SDLCALL +SDL_BufferQueueFillCallback(void *userdata, Uint8 *stream, int len) +{ + /* this function always holds the mixer lock before being called. */ + SDL_AudioDevice *device = (SDL_AudioDevice *) userdata; + + SDL_assert(device != NULL); /* this shouldn't ever happen, right?! */ + SDL_assert(device->iscapture); /* this shouldn't ever happen, right?! */ + SDL_assert(len >= 0); /* this shouldn't ever happen, right?! */ + + /* note that if this needs to allocate more space and run out of memory, + we have no choice but to quietly drop the data and hope it works out + later, but you probably have bigger problems in this case anyhow. */ + queue_audio_to_device(device, stream, (Uint32) len); +} + +int +SDL_QueueAudio(SDL_AudioDeviceID devid, const void *data, Uint32 len) +{ + SDL_AudioDevice *device = get_audio_device(devid); + int rc = 0; + + if (!device) { + return -1; /* get_audio_device() will have set the error state */ + } else if (device->iscapture) { + return SDL_SetError("This is a capture device, queueing not allowed"); + } else if (device->spec.callback != SDL_BufferQueueDrainCallback) { + return SDL_SetError("Audio device has a callback, queueing not allowed"); + } + + if (len > 0) { + current_audio.impl.LockDevice(device); + rc = queue_audio_to_device(device, data, len); + current_audio.impl.UnlockDevice(device); + } + + return rc; +} + +Uint32 +SDL_DequeueAudio(SDL_AudioDeviceID devid, void *data, Uint32 len) +{ + SDL_AudioDevice *device = get_audio_device(devid); + Uint32 rc; + + if ( (len == 0) || /* nothing to do? */ + (!device) || /* called with bogus device id */ + (!device->iscapture) || /* playback devices can't dequeue */ + (device->spec.callback != SDL_BufferQueueFillCallback) ) { /* not set for queueing */ + return 0; /* just report zero bytes dequeued. */ + } + + current_audio.impl.LockDevice(device); + rc = dequeue_audio_from_device(device, data, len); + current_audio.impl.UnlockDevice(device); + return rc; +} + Uint32 SDL_GetQueuedAudioSize(SDL_AudioDeviceID devid) { Uint32 retval = 0; SDL_AudioDevice *device = get_audio_device(devid); + if (!device) { + return 0; + } + /* Nothing to do unless we're set up for queueing. */ - if (device && (device->spec.callback == SDL_BufferQueueDrainCallback)) { + if (device->spec.callback == SDL_BufferQueueDrainCallback) { current_audio.impl.LockDevice(device); retval = device->queued_bytes + current_audio.impl.GetPendingBytes(device); current_audio.impl.UnlockDevice(device); + } else if (device->spec.callback == SDL_BufferQueueFillCallback) { + current_audio.impl.LockDevice(device); + retval = device->queued_bytes; + current_audio.impl.UnlockDevice(device); } return retval; @@ -573,25 +668,49 @@ void SDL_ClearQueuedAudio(SDL_AudioDeviceID devid) { SDL_AudioDevice *device = get_audio_device(devid); - SDL_AudioBufferQueue *buffer = NULL; + SDL_AudioBufferQueue *packet; + if (!device) { return; /* nothing to do. */ } /* Blank out the device and release the mutex. Free it afterwards. */ current_audio.impl.LockDevice(device); - buffer = device->buffer_queue_head; + + /* merge the available pool and the current queue into one list. */ + packet = device->buffer_queue_head; + if (packet) { + device->buffer_queue_tail->next = device->buffer_queue_pool; + } else { + packet = device->buffer_queue_pool; + } + + /* Remove the queued packets from the device. */ device->buffer_queue_tail = NULL; device->buffer_queue_head = NULL; device->queued_bytes = 0; + device->buffer_queue_pool = packet; + + /* Keep up to two packets in the pool to reduce future malloc pressure. */ + if (packet) { + if (!packet->next) { + packet = NULL; /* one packet (the only one) for the pool. */ + } else { + SDL_AudioBufferQueue *next = packet->next->next; + packet->next->next = NULL; /* two packets for the pool. */ + packet = next; /* rest will be freed. */ + } + } + current_audio.impl.UnlockDevice(device); - free_audio_queue(buffer); + /* free any extra packets we didn't keep in the pool. */ + free_audio_queue(packet); } /* The general mixing thread function */ -int SDLCALL +static int SDLCALL SDL_RunAudio(void *devicep) { SDL_AudioDevice *device = (SDL_AudioDevice *) devicep; @@ -600,7 +719,9 @@ SDL_RunAudio(void *devicep) const int stream_len = (device->convert.needed) ? device->convert.len : device->spec.size; Uint8 *stream; void *udata = device->spec.userdata; - void (SDLCALL *fill) (void *, Uint8 *, int) = device->spec.callback; + void (SDLCALL *callback) (void *, Uint8 *, int) = device->spec.callback; + + SDL_assert(!device->iscapture); /* The audio mixing is always a high priority thread */ SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH); @@ -610,11 +731,11 @@ SDL_RunAudio(void *devicep) current_audio.impl.ThreadInit(device); /* Loop, filling the audio buffers */ - while (!device->shutdown) { + while (!SDL_AtomicGet(&device->shutdown)) { /* Fill the current buffer with sound */ if (device->convert.needed) { stream = device->convert.buf; - } else if (device->enabled) { + } else if (SDL_AtomicGet(&device->enabled)) { stream = current_audio.impl.GetDeviceBuf(device); } else { /* if the device isn't enabled, we still write to the @@ -630,16 +751,18 @@ SDL_RunAudio(void *devicep) } /* !!! FIXME: this should be LockDevice. */ - SDL_LockMutex(device->mixer_lock); - if (device->paused) { - SDL_memset(stream, silence, stream_len); - } else { - (*fill) (udata, stream, stream_len); + if ( SDL_AtomicGet(&device->enabled) ) { + SDL_LockMutex(device->mixer_lock); + if (SDL_AtomicGet(&device->paused)) { + SDL_memset(stream, silence, stream_len); + } else { + (*callback) (udata, stream, stream_len); + } + SDL_UnlockMutex(device->mixer_lock); } - SDL_UnlockMutex(device->mixer_lock); /* Convert the audio if necessary */ - if (device->enabled && device->convert.needed) { + if (device->convert.needed && SDL_AtomicGet(&device->enabled)) { SDL_ConvertAudio(&device->convert); stream = current_audio.impl.GetDeviceBuf(device); if (stream == NULL) { @@ -659,8 +782,91 @@ SDL_RunAudio(void *devicep) } } + current_audio.impl.PrepareToClose(device); + /* Wait for the audio to drain. */ - current_audio.impl.WaitDone(device); + SDL_Delay(((device->spec.samples * 1000) / device->spec.freq) * 2); + + return 0; +} + +/* The general capture thread function */ +static int SDLCALL +SDL_CaptureAudio(void *devicep) +{ + SDL_AudioDevice *device = (SDL_AudioDevice *) devicep; + const int silence = (int) device->spec.silence; + const Uint32 delay = ((device->spec.samples * 1000) / device->spec.freq); + const int stream_len = (device->convert.needed) ? device->convert.len : device->spec.size; + Uint8 *stream; + void *udata = device->spec.userdata; + void (SDLCALL *callback) (void *, Uint8 *, int) = device->spec.callback; + + SDL_assert(device->iscapture); + + /* The audio mixing is always a high priority thread */ + SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH); + + /* Perform any thread setup */ + device->threadid = SDL_ThreadID(); + current_audio.impl.ThreadInit(device); + + /* Loop, filling the audio buffers */ + while (!SDL_AtomicGet(&device->shutdown)) { + int still_need; + Uint8 *ptr; + + if (!SDL_AtomicGet(&device->enabled) || SDL_AtomicGet(&device->paused)) { + SDL_Delay(delay); /* just so we don't cook the CPU. */ + current_audio.impl.FlushCapture(device); /* dump anything pending. */ + continue; + } + + /* Fill the current buffer with sound */ + still_need = stream_len; + if (device->convert.needed) { + ptr = stream = device->convert.buf; + } else { + /* just use the "fake" stream to hold data read from the device. */ + ptr = stream = device->fake_stream; + } + + /* We still read from the device when "paused" to keep the state sane, + and block when there isn't data so this thread isn't eating CPU. + But we don't process it further or call the app's callback. */ + + while (still_need > 0) { + const int rc = current_audio.impl.CaptureFromDevice(device, ptr, still_need); + SDL_assert(rc <= still_need); /* device should not overflow buffer. :) */ + if (rc > 0) { + still_need -= rc; + ptr += rc; + } else { /* uhoh, device failed for some reason! */ + SDL_OpenedAudioDeviceDisconnected(device); + break; + } + } + + if (still_need > 0) { + /* Keep any data we already read, silence the rest. */ + SDL_memset(ptr, silence, still_need); + } + + if (device->convert.needed) { + SDL_ConvertAudio(&device->convert); + } + + /* !!! FIXME: this should be LockDevice. */ + SDL_LockMutex(device->mixer_lock); + if (SDL_AtomicGet(&device->paused)) { + current_audio.impl.FlushCapture(device); /* one snuck in! */ + } else { + (*callback)(udata, stream, stream_len); + } + SDL_UnlockMutex(device->mixer_lock); + } + + current_audio.impl.FlushCapture(device); return 0; } @@ -757,7 +963,7 @@ SDL_AudioInit(const char *driver_name) current_audio.detectionLock = SDL_CreateMutex(); - finalize_audio_entry_points(); + finish_audio_entry_points_init(); /* Make sure we have a list of devices available at startup. */ current_audio.impl.DetectDevices(); @@ -872,27 +1078,38 @@ SDL_GetAudioDeviceName(int index, int iscapture) static void close_audio_device(SDL_AudioDevice * device) { - device->enabled = 0; - device->shutdown = 1; + if (!device) { + return; + } + + if (device->id > 0) { + SDL_AudioDevice *opendev = open_devices[device->id - 1]; + SDL_assert((opendev == device) || (opendev == NULL)); + if (opendev == device) { + open_devices[device->id - 1] = NULL; + } + } + + SDL_AtomicSet(&device->shutdown, 1); + SDL_AtomicSet(&device->enabled, 0); if (device->thread != NULL) { SDL_WaitThread(device->thread, NULL); } if (device->mixer_lock != NULL) { SDL_DestroyMutex(device->mixer_lock); } - SDL_FreeAudioMem(device->fake_stream); + SDL_free(device->fake_stream); if (device->convert.needed) { - SDL_FreeAudioMem(device->convert.buf); + SDL_free(device->convert.buf); } - if (device->opened) { + if (device->hidden != NULL) { current_audio.impl.CloseDevice(device); - device->opened = 0; } free_audio_queue(device->buffer_queue_head); free_audio_queue(device->buffer_queue_pool); - SDL_FreeAudioMem(device); + SDL_free(device); } @@ -963,12 +1180,12 @@ open_audio_device(const char *devname, int iscapture, const SDL_AudioSpec * desired, SDL_AudioSpec * obtained, int allowed_changes, int min_id) { + const SDL_bool is_internal_thread = (desired->callback != NULL); SDL_AudioDeviceID id = 0; SDL_AudioSpec _obtained; SDL_AudioDevice *device; SDL_bool build_cvt; void *handle = NULL; - Uint32 stream_len; int i = 0; if (!SDL_WasInit(SDL_INIT_AUDIO)) { @@ -981,6 +1198,7 @@ open_audio_device(const char *devname, int iscapture, return 0; } + /* !!! FIXME: there is a race condition here if two devices open from two threads at once. */ /* Find an available device ID... */ for (id = min_id - 1; id < SDL_arraysize(open_devices); id++) { if (open_devices[id] == NULL) { @@ -1015,7 +1233,7 @@ open_audio_device(const char *devname, int iscapture, * opens of the default system device. */ - if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) { + if ((iscapture) && (current_audio.impl.OnlyHasDefaultCaptureDevice)) { if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) { SDL_SetError("No such device"); return 0; @@ -1067,17 +1285,19 @@ open_audio_device(const char *devname, int iscapture, } } - device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof(SDL_AudioDevice)); + device = (SDL_AudioDevice *) SDL_calloc(1, sizeof (SDL_AudioDevice)); if (device == NULL) { SDL_OutOfMemory(); return 0; } - SDL_zerop(device); device->id = id + 1; device->spec = *obtained; - device->enabled = 1; - device->paused = 1; - device->iscapture = iscapture; + device->iscapture = iscapture ? SDL_TRUE : SDL_FALSE; + device->handle = handle; + + SDL_AtomicSet(&device->shutdown, 0); /* just in case. */ + SDL_AtomicSet(&device->paused, 1); + SDL_AtomicSet(&device->enabled, 1); /* Create a mutex for locking the sound buffers */ if (!current_audio.impl.SkipMixerLock) { @@ -1093,7 +1313,10 @@ open_audio_device(const char *devname, int iscapture, close_audio_device(device); return 0; } - device->opened = 1; + + /* if your target really doesn't need it, set it to 0x1 or something. */ + /* otherwise, close_audio_device() won't call impl.CloseDevice(). */ + SDL_assert(device->hidden != NULL); /* See if we need to do any conversion */ build_cvt = SDL_FALSE; @@ -1143,7 +1366,7 @@ open_audio_device(const char *devname, int iscapture, device->convert.len_ratio); device->convert.buf = - (Uint8 *) SDL_AllocAudioMem(device->convert.len * + (Uint8 *) SDL_malloc(device->convert.len * device->convert.len_mult); if (device->convert.buf == NULL) { close_audio_device(device); @@ -1153,19 +1376,6 @@ open_audio_device(const char *devname, int iscapture, } } - /* Allocate a fake audio memory buffer */ - stream_len = (device->convert.needed) ? device->convert.len_cvt : 0; - if (device->spec.size > stream_len) { - stream_len = device->spec.size; - } - SDL_assert(stream_len > 0); - device->fake_stream = (Uint8 *)SDL_AllocAudioMem(stream_len); - if (device->fake_stream == NULL) { - close_audio_device(device); - SDL_OutOfMemory(); - return 0; - } - if (device->spec.callback == NULL) { /* use buffer queueing? */ /* pool a few packets to start. Enough for two callbacks. */ const int packetlen = SDL_AUDIOBUFFERQUEUE_PACKETLEN; @@ -1181,7 +1391,7 @@ open_audio_device(const char *devname, int iscapture, } } - device->spec.callback = SDL_BufferQueueDrainCallback; + device->spec.callback = iscapture ? SDL_BufferQueueFillCallback : SDL_BufferQueueDrainCallback; device->spec.userdata = device; } @@ -1191,21 +1401,30 @@ open_audio_device(const char *devname, int iscapture, /* Start the audio thread if necessary */ if (!current_audio.impl.ProvidesOwnCallbackThread) { /* Start the audio thread */ - char name[64]; - SDL_snprintf(name, sizeof (name), "SDLAudioDev%d", (int) device->id); -/* !!! FIXME: this is nasty. */ -#if defined(__WIN32__) && !defined(HAVE_LIBC) -#undef SDL_CreateThread -#if SDL_DYNAMIC_API - device->thread = SDL_CreateThread_REAL(SDL_RunAudio, name, device, NULL, NULL); -#else - device->thread = SDL_CreateThread(SDL_RunAudio, name, device, NULL, NULL); -#endif -#else - device->thread = SDL_CreateThread(SDL_RunAudio, name, device); -#endif + /* !!! FIXME: we don't force the audio thread stack size here if it calls into user code, but maybe we should? */ + /* buffer queueing callback only needs a few bytes, so make the stack tiny. */ + const size_t stacksize = is_internal_thread ? 64 * 1024 : 0; + char threadname[64]; + + /* Allocate a fake audio buffer; only used by our internal threads. */ + Uint32 stream_len = (device->convert.needed) ? device->convert.len_cvt : 0; + if (device->spec.size > stream_len) { + stream_len = device->spec.size; + } + SDL_assert(stream_len > 0); + + device->fake_stream = (Uint8 *) SDL_malloc(stream_len); + if (device->fake_stream == NULL) { + close_audio_device(device); + SDL_OutOfMemory(); + return 0; + } + + SDL_snprintf(threadname, sizeof (threadname), "SDLAudioDev%d", (int) device->id); + device->thread = SDL_CreateThreadInternal(iscapture ? SDL_CaptureAudio : SDL_RunAudio, threadname, stacksize, device); + if (device->thread == NULL) { - SDL_CloseAudioDevice(device->id); + close_audio_device(device); SDL_SetError("Couldn't create audio thread"); return 0; } @@ -1258,8 +1477,8 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid) { SDL_AudioDevice *device = get_audio_device(devid); SDL_AudioStatus status = SDL_AUDIO_STOPPED; - if (device && device->enabled) { - if (device->paused) { + if (device && SDL_AtomicGet(&device->enabled)) { + if (SDL_AtomicGet(&device->paused)) { status = SDL_AUDIO_PAUSED; } else { status = SDL_AUDIO_PLAYING; @@ -1281,7 +1500,7 @@ SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on) SDL_AudioDevice *device = get_audio_device(devid); if (device) { current_audio.impl.LockDevice(device); - device->paused = pause_on; + SDL_AtomicSet(&device->paused, pause_on ? 1 : 0); current_audio.impl.UnlockDevice(device); } } @@ -1328,11 +1547,7 @@ SDL_UnlockAudio(void) void SDL_CloseAudioDevice(SDL_AudioDeviceID devid) { - SDL_AudioDevice *device = get_audio_device(devid); - if (device) { - close_audio_device(device); - open_devices[devid - 1] = NULL; - } + close_audio_device(get_audio_device(devid)); } void @@ -1351,9 +1566,7 @@ SDL_AudioQuit(void) } for (i = 0; i < SDL_arraysize(open_devices); i++) { - if (open_devices[i] != NULL) { - SDL_CloseAudioDevice(i+1); - } + close_audio_device(open_devices[i]); } free_device_list(¤t_audio.outputDevices, ¤t_audio.outputDeviceCount); diff --git a/Engine/lib/sdl/src/audio/SDL_audio_c.h b/Engine/lib/sdl/src/audio/SDL_audio_c.h index b03a9156f..7cde3a662 100644 --- a/Engine/lib/sdl/src/audio/SDL_audio_c.h +++ b/Engine/lib/sdl/src/audio/SDL_audio_c.h @@ -29,9 +29,6 @@ extern SDL_AudioFormat SDL_NextAudioFormat(void); /* Function to calculate the size and silence for a SDL_AudioSpec */ extern void SDL_CalculateAudioSpec(SDL_AudioSpec * spec); -/* The actual mixing thread function */ -extern int SDLCALL SDL_RunAudio(void *audiop); - /* this is used internally to access some autogenerated code. */ typedef struct { diff --git a/Engine/lib/sdl/src/audio/SDL_mixer.c b/Engine/lib/sdl/src/audio/SDL_mixer.c index b49c73dab..e0219392d 100644 --- a/Engine/lib/sdl/src/audio/SDL_mixer.c +++ b/Engine/lib/sdl/src/audio/SDL_mixer.c @@ -202,6 +202,54 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, } break; + case AUDIO_U16LSB: + { + Uint16 src1, src2; + int dst_sample; + const int max_audioval = 0xFFFF; + + len /= 2; + while (len--) { + src1 = ((src[1]) << 8 | src[0]); + ADJUST_VOLUME(src1, volume); + src2 = ((dst[1]) << 8 | dst[0]); + src += 2; + dst_sample = src1 + src2; + if (dst_sample > max_audioval) { + dst_sample = max_audioval; + } + dst[0] = dst_sample & 0xFF; + dst_sample >>= 8; + dst[1] = dst_sample & 0xFF; + dst += 2; + } + } + break; + + case AUDIO_U16MSB: + { + Uint16 src1, src2; + int dst_sample; + const int max_audioval = 0xFFFF; + + len /= 2; + while (len--) { + src1 = ((src[0]) << 8 | src[1]); + ADJUST_VOLUME(src1, volume); + src2 = ((dst[0]) << 8 | dst[1]); + src += 2; + dst_sample = src1 + src2; + if (dst_sample > max_audioval) { + dst_sample = max_audioval; + } + dst[1] = dst_sample & 0xFF; + dst_sample >>= 8; + dst[0] = dst_sample & 0xFF; + dst += 2; + } + } + break; + case AUDIO_S32LSB: { const Uint32 *src32 = (Uint32 *) src; @@ -313,7 +361,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, break; default: /* If this happens... FIXME! */ - SDL_SetError("SDL_MixAudio(): unknown audio format"); + SDL_SetError("SDL_MixAudioFormat(): unknown audio format"); return; } } diff --git a/Engine/lib/sdl/src/audio/SDL_sysaudio.h b/Engine/lib/sdl/src/audio/SDL_sysaudio.h index 426a190f1..943169bf7 100644 --- a/Engine/lib/sdl/src/audio/SDL_sysaudio.h +++ b/Engine/lib/sdl/src/audio/SDL_sysaudio.h @@ -26,6 +26,10 @@ #include "SDL_mutex.h" #include "SDL_thread.h" +/* !!! FIXME: These are wordy and unlocalized... */ +#define DEFAULT_OUTPUT_DEVNAME "System audio output device" +#define DEFAULT_INPUT_DEVNAME "System audio capture device" + /* The SDL audio driver */ typedef struct SDL_AudioDevice SDL_AudioDevice; #define _THIS SDL_AudioDevice *_this @@ -75,7 +79,9 @@ typedef struct SDL_AudioDriverImpl void (*PlayDevice) (_THIS); int (*GetPendingBytes) (_THIS); Uint8 *(*GetDeviceBuf) (_THIS); - void (*WaitDone) (_THIS); + int (*CaptureFromDevice) (_THIS, void *buffer, int buflen); + void (*FlushCapture) (_THIS); + void (*PrepareToClose) (_THIS); /**< Called between run and draining wait for playback devices */ void (*CloseDevice) (_THIS); void (*LockDevice) (_THIS); void (*UnlockDevice) (_THIS); @@ -87,10 +93,10 @@ typedef struct SDL_AudioDriverImpl /* Some flags to push duplicate code into the core and reduce #ifdefs. */ /* !!! FIXME: these should be SDL_bool */ int ProvidesOwnCallbackThread; - int SkipMixerLock; /* !!! FIXME: do we need this anymore? */ + int SkipMixerLock; int HasCaptureSupport; int OnlyHasDefaultOutputDevice; - int OnlyHasDefaultInputDevice; + int OnlyHasDefaultCaptureDevice; int AllowsArbitraryDeviceNames; } SDL_AudioDriverImpl; @@ -157,12 +163,10 @@ struct SDL_AudioDevice SDL_AudioStreamer streamer; /* Current state flags */ - /* !!! FIXME: should be SDL_bool */ - int iscapture; - int enabled; /* true if device is functioning and connected. */ - int shutdown; /* true if we are signaling the play thread to end. */ - int paused; - int opened; + SDL_atomic_t shutdown; /* true if we are signaling the play thread to end. */ + SDL_atomic_t enabled; /* true if device is functioning and connected. */ + SDL_atomic_t paused; + SDL_bool iscapture; /* Fake audio buffer for when the audio hardware is busy */ Uint8 *fake_stream; @@ -183,6 +187,8 @@ struct SDL_AudioDevice /* * * */ /* Data private to this driver */ struct SDL_PrivateAudioData *hidden; + + void *handle; }; #undef _THIS diff --git a/Engine/lib/sdl/src/audio/SDL_wave.c b/Engine/lib/sdl/src/audio/SDL_wave.c index 99daac64b..d173b4a92 100644 --- a/Engine/lib/sdl/src/audio/SDL_wave.c +++ b/Engine/lib/sdl/src/audio/SDL_wave.c @@ -504,7 +504,7 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc, was_error = 1; goto done; } - SDL_memset(spec, 0, (sizeof *spec)); + SDL_zerop(spec); spec->freq = SDL_SwapLE32(format->frequency); if (IEEE_float_encoded) { diff --git a/Engine/lib/sdl/src/audio/alsa/SDL_alsa_audio.c b/Engine/lib/sdl/src/audio/alsa/SDL_alsa_audio.c index af952371b..574d51bd5 100644 --- a/Engine/lib/sdl/src/audio/alsa/SDL_alsa_audio.c +++ b/Engine/lib/sdl/src/audio/alsa/SDL_alsa_audio.c @@ -29,9 +29,9 @@ #include #include +#include "SDL_assert.h" #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_alsa_audio.h" @@ -42,8 +42,10 @@ static int (*ALSA_snd_pcm_open) (snd_pcm_t **, const char *, snd_pcm_stream_t, int); static int (*ALSA_snd_pcm_close) (snd_pcm_t * pcm); -static snd_pcm_sframes_t(*ALSA_snd_pcm_writei) +static snd_pcm_sframes_t (*ALSA_snd_pcm_writei) (snd_pcm_t *, const void *, snd_pcm_uframes_t); +static snd_pcm_sframes_t (*ALSA_snd_pcm_readi) + (snd_pcm_t *, void *, snd_pcm_uframes_t); static int (*ALSA_snd_pcm_recover) (snd_pcm_t *, int, int); static int (*ALSA_snd_pcm_prepare) (snd_pcm_t *); static int (*ALSA_snd_pcm_drain) (snd_pcm_t *); @@ -85,6 +87,10 @@ static int (*ALSA_snd_pcm_nonblock) (snd_pcm_t *, int); static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int); static int (*ALSA_snd_pcm_sw_params_set_avail_min) (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t); +static int (*ALSA_snd_pcm_reset)(snd_pcm_t *); +static int (*ALSA_snd_device_name_hint) (int, const char *, void ***); +static char* (*ALSA_snd_device_name_get_hint) (const void *, const char *); +static int (*ALSA_snd_device_name_free_hint) (void **); #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC #define snd_pcm_hw_params_sizeof ALSA_snd_pcm_hw_params_sizeof @@ -118,6 +124,7 @@ load_alsa_syms(void) SDL_ALSA_SYM(snd_pcm_open); SDL_ALSA_SYM(snd_pcm_close); SDL_ALSA_SYM(snd_pcm_writei); + SDL_ALSA_SYM(snd_pcm_readi); SDL_ALSA_SYM(snd_pcm_recover); SDL_ALSA_SYM(snd_pcm_prepare); SDL_ALSA_SYM(snd_pcm_drain); @@ -144,6 +151,11 @@ load_alsa_syms(void) SDL_ALSA_SYM(snd_pcm_nonblock); SDL_ALSA_SYM(snd_pcm_wait); SDL_ALSA_SYM(snd_pcm_sw_params_set_avail_min); + SDL_ALSA_SYM(snd_pcm_reset); + SDL_ALSA_SYM(snd_device_name_hint); + SDL_ALSA_SYM(snd_device_name_get_hint); + SDL_ALSA_SYM(snd_device_name_free_hint); + return 0; } @@ -196,25 +208,27 @@ LoadALSALibrary(void) #endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */ static const char * -get_audio_device(int channels) +get_audio_device(void *handle, const int channels) { const char *device; - device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */ - if (device == NULL) { - switch (channels) { - case 6: - device = "plug:surround51"; - break; - case 4: - device = "plug:surround40"; - break; - default: - device = "default"; - break; - } + if (handle != NULL) { + return (const char *) handle; } - return device; + + /* !!! FIXME: we also check "SDL_AUDIO_DEVICE_NAME" at the higher level. */ + device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */ + if (device != NULL) { + return device; + } + + if (channels == 6) { + return "plug:surround51"; + } else if (channels == 4) { + return "plug:surround40"; + } + + return "default"; } @@ -232,37 +246,37 @@ ALSA_WaitDevice(_THIS) * "For Linux ALSA, this is FL-FR-RL-RR-C-LFE * and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR" */ -#define SWIZ6(T) \ - T *ptr = (T *) this->hidden->mixbuf; \ +#define SWIZ6(T, buf, numframes) \ + T *ptr = (T *) buf; \ Uint32 i; \ - for (i = 0; i < this->spec.samples; i++, ptr += 6) { \ + for (i = 0; i < numframes; i++, ptr += 6) { \ T tmp; \ tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \ tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \ } static SDL_INLINE void -swizzle_alsa_channels_6_64bit(_THIS) +swizzle_alsa_channels_6_64bit(void *buffer, Uint32 bufferlen) { - SWIZ6(Uint64); + SWIZ6(Uint64, buffer, bufferlen); } static SDL_INLINE void -swizzle_alsa_channels_6_32bit(_THIS) +swizzle_alsa_channels_6_32bit(void *buffer, Uint32 bufferlen) { - SWIZ6(Uint32); + SWIZ6(Uint32, buffer, bufferlen); } static SDL_INLINE void -swizzle_alsa_channels_6_16bit(_THIS) +swizzle_alsa_channels_6_16bit(void *buffer, Uint32 bufferlen) { - SWIZ6(Uint16); + SWIZ6(Uint16, buffer, bufferlen); } static SDL_INLINE void -swizzle_alsa_channels_6_8bit(_THIS) +swizzle_alsa_channels_6_8bit(void *buffer, Uint32 bufferlen) { - SWIZ6(Uint8); + SWIZ6(Uint8, buffer, bufferlen); } #undef SWIZ6 @@ -273,18 +287,16 @@ swizzle_alsa_channels_6_8bit(_THIS) * channels from Windows/Mac order to the format alsalib will want. */ static SDL_INLINE void -swizzle_alsa_channels(_THIS) +swizzle_alsa_channels(_THIS, void *buffer, Uint32 bufferlen) { if (this->spec.channels == 6) { - const Uint16 fmtsize = (this->spec.format & 0xFF); /* bits/channel. */ - if (fmtsize == 16) - swizzle_alsa_channels_6_16bit(this); - else if (fmtsize == 8) - swizzle_alsa_channels_6_8bit(this); - else if (fmtsize == 32) - swizzle_alsa_channels_6_32bit(this); - else if (fmtsize == 64) - swizzle_alsa_channels_6_64bit(this); + switch (SDL_AUDIO_BITSIZE(this->spec.format)) { + case 8: swizzle_alsa_channels_6_8bit(buffer, bufferlen); break; + case 16: swizzle_alsa_channels_6_16bit(buffer, bufferlen); break; + case 32: swizzle_alsa_channels_6_32bit(buffer, bufferlen); break; + case 64: swizzle_alsa_channels_6_64bit(buffer, bufferlen); break; + default: SDL_assert(!"unhandled bitsize"); break; + } } /* !!! FIXME: update this for 7.1 if needed, later. */ @@ -294,19 +306,29 @@ swizzle_alsa_channels(_THIS) static void ALSA_PlayDevice(_THIS) { - int status; const Uint8 *sample_buf = (const Uint8 *) this->hidden->mixbuf; - const int frame_size = (((int) (this->spec.format & 0xFF)) / 8) * + const int frame_size = (((int) SDL_AUDIO_BITSIZE(this->spec.format)) / 8) * this->spec.channels; snd_pcm_uframes_t frames_left = ((snd_pcm_uframes_t) this->spec.samples); - swizzle_alsa_channels(this); + swizzle_alsa_channels(this, this->hidden->mixbuf, frames_left); + + while ( frames_left > 0 && SDL_AtomicGet(&this->enabled) ) { + int status; + + /* This wait is a work-around for a hang when USB devices are + unplugged. Normally it should not result in any waiting, + but in the case of a USB unplug, it serves as a way to + join the playback thread after the timeout occurs */ + status = ALSA_snd_pcm_wait(this->hidden->pcm_handle, 1000); + if (status == 0) { + /*fprintf(stderr, "ALSA timeout waiting for available buffer space\n");*/ + SDL_OpenedAudioDeviceDisconnected(this); + return; + } - while ( frames_left > 0 && this->enabled ) { - /* !!! FIXME: This works, but needs more testing before going live */ - /* ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */ status = ALSA_snd_pcm_writei(this->hidden->pcm_handle, - sample_buf, frames_left); + sample_buf, frames_left); if (status < 0) { if (status == -EAGAIN) { @@ -336,20 +358,71 @@ ALSA_GetDeviceBuf(_THIS) return (this->hidden->mixbuf); } +static int +ALSA_CaptureFromDevice(_THIS, void *buffer, int buflen) +{ + Uint8 *sample_buf = (Uint8 *) buffer; + const int frame_size = (((int) SDL_AUDIO_BITSIZE(this->spec.format)) / 8) * + this->spec.channels; + const int total_frames = buflen / frame_size; + snd_pcm_uframes_t frames_left = total_frames; + + SDL_assert((buflen % frame_size) == 0); + + while ( frames_left > 0 && SDL_AtomicGet(&this->enabled) ) { + /* !!! FIXME: This works, but needs more testing before going live */ + /* ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */ + int status = ALSA_snd_pcm_readi(this->hidden->pcm_handle, + sample_buf, frames_left); + + if (status < 0) { + /*printf("ALSA: capture error %d\n", status);*/ + if (status == -EAGAIN) { + /* Apparently snd_pcm_recover() doesn't handle this case - + does it assume snd_pcm_wait() above? */ + SDL_Delay(1); + continue; + } + status = ALSA_snd_pcm_recover(this->hidden->pcm_handle, status, 0); + if (status < 0) { + /* Hmm, not much we can do - abort */ + fprintf(stderr, "ALSA read failed (unrecoverable): %s\n", + ALSA_snd_strerror(status)); + return -1; + } + continue; + } + + /*printf("ALSA: captured %d bytes\n", status * frame_size);*/ + sample_buf += status * frame_size; + frames_left -= status; + } + + swizzle_alsa_channels(this, buffer, total_frames - frames_left); + + return (total_frames - frames_left) * frame_size; +} + +static void +ALSA_FlushCapture(_THIS) +{ + ALSA_snd_pcm_reset(this->hidden->pcm_handle); +} + static void ALSA_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->pcm_handle) { - ALSA_snd_pcm_drain(this->hidden->pcm_handle); - ALSA_snd_pcm_close(this->hidden->pcm_handle); - this->hidden->pcm_handle = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->pcm_handle) { + /* Wait for the submitted audio to drain + ALSA_snd_pcm_drop() can hang, so don't use that. + */ + Uint32 delay = ((this->spec.samples * 1000) / this->spec.freq) * 2; + SDL_Delay(delay); + + ALSA_snd_pcm_close(this->hidden->pcm_handle); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int @@ -482,16 +555,16 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Open the audio device */ /* Name of device should depend on # channels in spec */ status = ALSA_snd_pcm_open(&pcm_handle, - get_audio_device(this->spec.channels), - SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); + get_audio_device(handle, this->spec.channels), + iscapture ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK, + SND_PCM_NONBLOCK); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't open audio device: %s", ALSA_snd_strerror(status)); } @@ -502,7 +575,6 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) snd_pcm_hw_params_alloca(&hwparams); status = ALSA_snd_pcm_hw_params_any(pcm_handle, hwparams); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't get hardware config: %s", ALSA_snd_strerror(status)); } @@ -511,7 +583,6 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) status = ALSA_snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't set interleaved access: %s", ALSA_snd_strerror(status)); } @@ -565,7 +636,6 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } } if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't find any hardware audio formats"); } this->spec.format = test_format; @@ -577,7 +647,6 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (status < 0) { status = ALSA_snd_pcm_hw_params_get_channels(hwparams, &channels); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't set audio channels"); } this->spec.channels = channels; @@ -588,7 +657,6 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) status = ALSA_snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &rate, NULL); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't set audio frequency: %s", ALSA_snd_strerror(status)); } @@ -598,8 +666,8 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if ( ALSA_set_period_size(this, hwparams, 0) < 0 && ALSA_set_buffer_size(this, hwparams, 0) < 0 ) { /* Failed to set desired buffer size, do the best you can... */ - if ( ALSA_set_period_size(this, hwparams, 1) < 0 ) { - ALSA_CloseDevice(this); + status = ALSA_set_period_size(this, hwparams, 1); + if (status < 0) { return SDL_SetError("Couldn't set hardware audio parameters: %s", ALSA_snd_strerror(status)); } } @@ -607,26 +675,22 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) snd_pcm_sw_params_alloca(&swparams); status = ALSA_snd_pcm_sw_params_current(pcm_handle, swparams); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't get software config: %s", ALSA_snd_strerror(status)); } status = ALSA_snd_pcm_sw_params_set_avail_min(pcm_handle, swparams, this->spec.samples); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("Couldn't set minimum available samples: %s", ALSA_snd_strerror(status)); } status = ALSA_snd_pcm_sw_params_set_start_threshold(pcm_handle, swparams, 1); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("ALSA: Couldn't set start threshold: %s", ALSA_snd_strerror(status)); } status = ALSA_snd_pcm_sw_params(pcm_handle, swparams); if (status < 0) { - ALSA_CloseDevice(this); return SDL_SetError("Couldn't set software audio parameters: %s", ALSA_snd_strerror(status)); } @@ -635,13 +699,14 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) SDL_CalculateAudioSpec(&this->spec); /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - ALSA_CloseDevice(this); - return SDL_OutOfMemory(); + if (!iscapture) { + this->hidden->mixlen = this->spec.size; + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); + if (this->hidden->mixbuf == NULL) { + return SDL_OutOfMemory(); + } + SDL_memset(this->hidden->mixbuf, this->spec.silence, this->hidden->mixlen); } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->hidden->mixlen); /* Switch to blocking mode for playback */ ALSA_snd_pcm_nonblock(pcm_handle, 0); @@ -650,9 +715,238 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) return 0; } +typedef struct ALSA_Device +{ + char *name; + SDL_bool iscapture; + struct ALSA_Device *next; +} ALSA_Device; + +static void +add_device(const int iscapture, const char *name, void *hint, ALSA_Device **pSeen) +{ + ALSA_Device *dev = SDL_malloc(sizeof (ALSA_Device)); + char *desc = ALSA_snd_device_name_get_hint(hint, "DESC"); + char *handle = NULL; + char *ptr; + + if (!desc) { + SDL_free(dev); + return; + } else if (!dev) { + free(desc); + return; + } + + SDL_assert(name != NULL); + + /* some strings have newlines, like "HDA NVidia, HDMI 0\nHDMI Audio Output". + just chop the extra lines off, this seems to get a reasonable device + name without extra details. */ + if ((ptr = strchr(desc, '\n')) != NULL) { + *ptr = '\0'; + } + + /*printf("ALSA: adding %s device '%s' (%s)\n", iscapture ? "capture" : "output", name, desc);*/ + + handle = SDL_strdup(name); + if (!handle) { + free(desc); + SDL_free(dev); + return; + } + + SDL_AddAudioDevice(iscapture, desc, handle); + free(desc); + + dev->name = handle; + dev->iscapture = iscapture; + dev->next = *pSeen; + *pSeen = dev; +} + + +static SDL_atomic_t ALSA_hotplug_shutdown; +static SDL_Thread *ALSA_hotplug_thread; + +static int SDLCALL +ALSA_HotplugThread(void *arg) +{ + SDL_sem *first_run_semaphore = (SDL_sem *) arg; + ALSA_Device *devices = NULL; + ALSA_Device *next; + ALSA_Device *dev; + Uint32 ticks; + + while (!SDL_AtomicGet(&ALSA_hotplug_shutdown)) { + void **hints = NULL; + if (ALSA_snd_device_name_hint(-1, "pcm", &hints) != -1) { + ALSA_Device *unseen = devices; + ALSA_Device *seen = NULL; + ALSA_Device *prev; + int i, j; + const char *match = NULL; + int bestmatch = 0xFFFF; + size_t match_len = 0; + int defaultdev = -1; + static const char * const prefixes[] = { + "hw:", "sysdefault:", "default:", NULL + }; + + /* Apparently there are several different ways that ALSA lists + actual hardware. It could be prefixed with "hw:" or "default:" + or "sysdefault:" and maybe others. Go through the list and see + if we can find a preferred prefix for the system. */ + for (i = 0; hints[i]; i++) { + char *name = ALSA_snd_device_name_get_hint(hints[i], "NAME"); + if (!name) { + continue; + } + + /* full name, not a prefix */ + if ((defaultdev == -1) && (SDL_strcmp(name, "default") == 0)) { + defaultdev = i; + } + + for (j = 0; prefixes[j]; j++) { + const char *prefix = prefixes[j]; + const size_t prefixlen = SDL_strlen(prefix); + if (SDL_strncmp(name, prefix, prefixlen) == 0) { + if (j < bestmatch) { + bestmatch = j; + match = prefix; + match_len = prefixlen; + } + } + } + + free(name); + } + + /* look through the list of device names to find matches */ + for (i = 0; hints[i]; i++) { + char *name; + + /* if we didn't find a device name prefix we like at all... */ + if ((!match) && (defaultdev != i)) { + continue; /* ...skip anything that isn't the default device. */ + } + + name = ALSA_snd_device_name_get_hint(hints[i], "NAME"); + if (!name) { + continue; + } + + /* only want physical hardware interfaces */ + if (!match || (SDL_strncmp(name, match, match_len) == 0)) { + char *ioid = ALSA_snd_device_name_get_hint(hints[i], "IOID"); + const SDL_bool isoutput = (ioid == NULL) || (SDL_strcmp(ioid, "Output") == 0); + const SDL_bool isinput = (ioid == NULL) || (SDL_strcmp(ioid, "Input") == 0); + SDL_bool have_output = SDL_FALSE; + SDL_bool have_input = SDL_FALSE; + + free(ioid); + + if (!isoutput && !isinput) { + free(name); + continue; + } + + prev = NULL; + for (dev = unseen; dev; dev = next) { + next = dev->next; + if ( (SDL_strcmp(dev->name, name) == 0) && (((isinput) && dev->iscapture) || ((isoutput) && !dev->iscapture)) ) { + if (prev) { + prev->next = next; + } else { + unseen = next; + } + dev->next = seen; + seen = dev; + if (isinput) have_input = SDL_TRUE; + if (isoutput) have_output = SDL_TRUE; + } else { + prev = dev; + } + } + + if (isinput && !have_input) { + add_device(SDL_TRUE, name, hints[i], &seen); + } + if (isoutput && !have_output) { + add_device(SDL_FALSE, name, hints[i], &seen); + } + } + + free(name); + } + + ALSA_snd_device_name_free_hint(hints); + + devices = seen; /* now we have a known-good list of attached devices. */ + + /* report anything still in unseen as removed. */ + for (dev = unseen; dev; dev = next) { + /*printf("ALSA: removing %s device '%s'\n", dev->iscapture ? "capture" : "output", dev->name);*/ + next = dev->next; + SDL_RemoveAudioDevice(dev->iscapture, dev->name); + SDL_free(dev->name); + SDL_free(dev); + } + } + + /* On first run, tell ALSA_DetectDevices() that we have a complete device list so it can return. */ + if (first_run_semaphore) { + SDL_SemPost(first_run_semaphore); + first_run_semaphore = NULL; /* let other thread clean it up. */ + } + + /* Block awhile before checking again, unless we're told to stop. */ + ticks = SDL_GetTicks() + 5000; + while (!SDL_AtomicGet(&ALSA_hotplug_shutdown) && !SDL_TICKS_PASSED(SDL_GetTicks(), ticks)) { + SDL_Delay(100); + } + } + + /* Shutting down! Clean up any data we've gathered. */ + for (dev = devices; dev; dev = next) { + /*printf("ALSA: at shutdown, removing %s device '%s'\n", dev->iscapture ? "capture" : "output", dev->name);*/ + next = dev->next; + SDL_free(dev->name); + SDL_free(dev); + } + + return 0; +} + +static void +ALSA_DetectDevices(void) +{ + /* Start the device detection thread here, wait for an initial iteration to complete. */ + SDL_sem *semaphore = SDL_CreateSemaphore(0); + if (!semaphore) { + return; /* oh well. */ + } + + SDL_AtomicSet(&ALSA_hotplug_shutdown, 0); + + ALSA_hotplug_thread = SDL_CreateThread(ALSA_HotplugThread, "SDLHotplugALSA", semaphore); + if (ALSA_hotplug_thread) { + SDL_SemWait(semaphore); /* wait for the first iteration to finish. */ + } + + SDL_DestroySemaphore(semaphore); +} + static void ALSA_Deinitialize(void) { + if (ALSA_hotplug_thread != NULL) { + SDL_AtomicSet(&ALSA_hotplug_shutdown, 1); + SDL_WaitThread(ALSA_hotplug_thread, NULL); + ALSA_hotplug_thread = NULL; + } + UnloadALSALibrary(); } @@ -664,13 +958,17 @@ ALSA_Init(SDL_AudioDriverImpl * impl) } /* Set the function pointers */ + impl->DetectDevices = ALSA_DetectDevices; impl->OpenDevice = ALSA_OpenDevice; impl->WaitDevice = ALSA_WaitDevice; impl->GetDeviceBuf = ALSA_GetDeviceBuf; impl->PlayDevice = ALSA_PlayDevice; impl->CloseDevice = ALSA_CloseDevice; impl->Deinitialize = ALSA_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; /* !!! FIXME: Add device enum! */ + impl->CaptureFromDevice = ALSA_CaptureFromDevice; + impl->FlushCapture = ALSA_FlushCapture; + + impl->HasCaptureSupport = SDL_TRUE; return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/android/SDL_androidaudio.c b/Engine/lib/sdl/src/audio/android/SDL_androidaudio.c index 4a4faadcf..96f6d631a 100644 --- a/Engine/lib/sdl/src/audio/android/SDL_androidaudio.c +++ b/Engine/lib/sdl/src/audio/android/SDL_androidaudio.c @@ -24,6 +24,7 @@ /* Output audio to Android */ +#include "SDL_assert.h" #include "SDL_audio.h" #include "../SDL_audio_c.h" #include "SDL_androidaudio.h" @@ -33,23 +34,22 @@ #include static SDL_AudioDevice* audioDevice = NULL; +static SDL_AudioDevice* captureDevice = NULL; static int -AndroidAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +ANDROIDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { SDL_AudioFormat test_format; + SDL_assert((captureDevice == NULL) || !iscapture); + SDL_assert((audioDevice == NULL) || iscapture); + if (iscapture) { - /* TODO: implement capture */ - return SDL_SetError("Capture not supported on Android"); + captureDevice = this; + } else { + audioDevice = this; } - if (audioDevice != NULL) { - return SDL_SetError("Only one audio device at a time please!"); - } - - audioDevice = this; - this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, (sizeof *this->hidden)); if (this->hidden == NULL) { return SDL_OutOfMemory(); @@ -82,100 +82,137 @@ AndroidAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) this->spec.freq = 48000; } - /* TODO: pass in/return a (Java) device ID, also whether we're opening for input or output */ - this->spec.samples = Android_JNI_OpenAudioDevice(this->spec.freq, this->spec.format == AUDIO_U8 ? 0 : 1, this->spec.channels, this->spec.samples); - SDL_CalculateAudioSpec(&this->spec); + /* TODO: pass in/return a (Java) device ID */ + this->spec.samples = Android_JNI_OpenAudioDevice(iscapture, this->spec.freq, this->spec.format == AUDIO_U8 ? 0 : 1, this->spec.channels, this->spec.samples); if (this->spec.samples == 0) { /* Init failed? */ return SDL_SetError("Java-side initialization failed!"); } + SDL_CalculateAudioSpec(&this->spec); + return 0; } static void -AndroidAUD_PlayDevice(_THIS) +ANDROIDAUDIO_PlayDevice(_THIS) { Android_JNI_WriteAudioBuffer(); } static Uint8 * -AndroidAUD_GetDeviceBuf(_THIS) +ANDROIDAUDIO_GetDeviceBuf(_THIS) { return Android_JNI_GetAudioBuffer(); } +static int +ANDROIDAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) +{ + return Android_JNI_CaptureAudioBuffer(buffer, buflen); +} + static void -AndroidAUD_CloseDevice(_THIS) +ANDROIDAUDIO_FlushCapture(_THIS) +{ + Android_JNI_FlushCapturedAudio(); +} + +static void +ANDROIDAUDIO_CloseDevice(_THIS) { /* At this point SDL_CloseAudioDevice via close_audio_device took care of terminating the audio thread so it's safe to terminate the Java side buffer and AudioTrack */ - Android_JNI_CloseAudioDevice(); - - if (audioDevice == this) { - if (audioDevice->hidden != NULL) { - SDL_free(this->hidden); - this->hidden = NULL; - } + Android_JNI_CloseAudioDevice(this->iscapture); + if (this->iscapture) { + SDL_assert(captureDevice == this); + captureDevice = NULL; + } else { + SDL_assert(audioDevice == this); audioDevice = NULL; } + SDL_free(this->hidden); } static int -AndroidAUD_Init(SDL_AudioDriverImpl * impl) +ANDROIDAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = AndroidAUD_OpenDevice; - impl->PlayDevice = AndroidAUD_PlayDevice; - impl->GetDeviceBuf = AndroidAUD_GetDeviceBuf; - impl->CloseDevice = AndroidAUD_CloseDevice; + impl->OpenDevice = ANDROIDAUDIO_OpenDevice; + impl->PlayDevice = ANDROIDAUDIO_PlayDevice; + impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf; + impl->CloseDevice = ANDROIDAUDIO_CloseDevice; + impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice; + impl->FlushCapture = ANDROIDAUDIO_FlushCapture; /* and the capabilities */ - impl->HasCaptureSupport = 0; /* TODO */ + impl->HasCaptureSupport = SDL_TRUE; impl->OnlyHasDefaultOutputDevice = 1; - impl->OnlyHasDefaultInputDevice = 1; + impl->OnlyHasDefaultCaptureDevice = 1; return 1; /* this audio target is available. */ } -AudioBootStrap ANDROIDAUD_bootstrap = { - "android", "SDL Android audio driver", AndroidAUD_Init, 0 +AudioBootStrap ANDROIDAUDIO_bootstrap = { + "android", "SDL Android audio driver", ANDROIDAUDIO_Init, 0 }; /* Pause (block) all non already paused audio devices by taking their mixer lock */ -void AndroidAUD_PauseDevices(void) +void ANDROIDAUDIO_PauseDevices(void) { /* TODO: Handle multiple devices? */ struct SDL_PrivateAudioData *private; if(audioDevice != NULL && audioDevice->hidden != NULL) { private = (struct SDL_PrivateAudioData *) audioDevice->hidden; - if (audioDevice->paused) { + if (SDL_AtomicGet(&audioDevice->paused)) { /* The device is already paused, leave it alone */ private->resume = SDL_FALSE; } else { SDL_LockMutex(audioDevice->mixer_lock); - audioDevice->paused = SDL_TRUE; + SDL_AtomicSet(&audioDevice->paused, 1); + private->resume = SDL_TRUE; + } + } + + if(captureDevice != NULL && captureDevice->hidden != NULL) { + private = (struct SDL_PrivateAudioData *) captureDevice->hidden; + if (SDL_AtomicGet(&captureDevice->paused)) { + /* The device is already paused, leave it alone */ + private->resume = SDL_FALSE; + } + else { + SDL_LockMutex(captureDevice->mixer_lock); + SDL_AtomicSet(&captureDevice->paused, 1); private->resume = SDL_TRUE; } } } /* Resume (unblock) all non already paused audio devices by releasing their mixer lock */ -void AndroidAUD_ResumeDevices(void) +void ANDROIDAUDIO_ResumeDevices(void) { /* TODO: Handle multiple devices? */ struct SDL_PrivateAudioData *private; if(audioDevice != NULL && audioDevice->hidden != NULL) { private = (struct SDL_PrivateAudioData *) audioDevice->hidden; if (private->resume) { - audioDevice->paused = SDL_FALSE; + SDL_AtomicSet(&audioDevice->paused, 0); private->resume = SDL_FALSE; SDL_UnlockMutex(audioDevice->mixer_lock); } } + + if(captureDevice != NULL && captureDevice->hidden != NULL) { + private = (struct SDL_PrivateAudioData *) captureDevice->hidden; + if (private->resume) { + SDL_AtomicSet(&captureDevice->paused, 0); + private->resume = SDL_FALSE; + SDL_UnlockMutex(captureDevice->mixer_lock); + } + } } diff --git a/Engine/lib/sdl/src/audio/android/SDL_androidaudio.h b/Engine/lib/sdl/src/audio/android/SDL_androidaudio.h index 639be9c08..133615302 100644 --- a/Engine/lib/sdl/src/audio/android/SDL_androidaudio.h +++ b/Engine/lib/sdl/src/audio/android/SDL_androidaudio.h @@ -34,8 +34,6 @@ struct SDL_PrivateAudioData int resume; }; -static void AndroidAUD_CloseDevice(_THIS); - #endif /* _SDL_androidaudio_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/audio/arts/SDL_artsaudio.c b/Engine/lib/sdl/src/audio/arts/SDL_artsaudio.c index 5d40cd14e..6054e36b6 100644 --- a/Engine/lib/sdl/src/audio/arts/SDL_artsaudio.c +++ b/Engine/lib/sdl/src/audio/arts/SDL_artsaudio.c @@ -32,7 +32,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_artsaudio.h" @@ -186,13 +185,6 @@ ARTS_PlayDevice(_THIS) #endif } -static void -ARTS_WaitDone(_THIS) -{ - /* !!! FIXME: camp here until buffer drains... SDL_Delay(???); */ -} - - static Uint8 * ARTS_GetDeviceBuf(_THIS) { @@ -203,17 +195,12 @@ ARTS_GetDeviceBuf(_THIS) static void ARTS_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->stream) { - SDL_NAME(arts_close_stream) (this->hidden->stream); - this->hidden->stream = 0; - } - SDL_NAME(arts_free) (); - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->stream) { + SDL_NAME(arts_close_stream) (this->hidden->stream); } + SDL_NAME(arts_free) (); + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int @@ -241,7 +228,7 @@ ARTS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Try for a closest match on audio format */ for (test_format = SDL_FirstAudioFormat(this->spec.format); @@ -267,19 +254,16 @@ ARTS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } } if (format == 0) { - ARTS_CloseDevice(this); return SDL_SetError("Couldn't find any hardware audio formats"); } this->spec.format = test_format; if ((rc = SDL_NAME(arts_init) ()) != 0) { - ARTS_CloseDevice(this); return SDL_SetError("Unable to initialize ARTS: %s", SDL_NAME(arts_error_text) (rc)); } if (!ARTS_Suspend()) { - ARTS_CloseDevice(this); return SDL_SetError("ARTS can not open audio device"); } @@ -297,7 +281,6 @@ ARTS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Determine the power of two of the fragment size */ for (frag_spec = 0; (0x01 << frag_spec) < this->spec.size; ++frag_spec); if ((0x01 << frag_spec) != this->spec.size) { - ARTS_CloseDevice(this); return SDL_SetError("Fragment size must be a power of two"); } frag_spec |= 0x00020000; /* two fragments, for low latency */ @@ -316,9 +299,8 @@ ARTS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Allocate mixing buffer */ this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); if (this->hidden->mixbuf == NULL) { - ARTS_CloseDevice(this); return SDL_OutOfMemory(); } SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); @@ -367,7 +349,6 @@ ARTS_Init(SDL_AudioDriverImpl * impl) impl->WaitDevice = ARTS_WaitDevice; impl->GetDeviceBuf = ARTS_GetDeviceBuf; impl->CloseDevice = ARTS_CloseDevice; - impl->WaitDone = ARTS_WaitDone; impl->Deinitialize = ARTS_Deinitialize; impl->OnlyHasDefaultOutputDevice = 1; diff --git a/Engine/lib/sdl/src/audio/bsd/SDL_bsdaudio.c b/Engine/lib/sdl/src/audio/bsd/SDL_bsdaudio.c index eeb257371..6a970b9c7 100644 --- a/Engine/lib/sdl/src/audio/bsd/SDL_bsdaudio.c +++ b/Engine/lib/sdl/src/audio/bsd/SDL_bsdaudio.c @@ -38,7 +38,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" #include "SDL_bsdaudio.h" @@ -63,13 +62,17 @@ BSDAUDIO_Status(_THIS) #ifdef DEBUG_AUDIO /* *INDENT-OFF* */ audio_info_t info; + const audio_prinfo *prinfo; if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) { fprintf(stderr, "AUDIO_GETINFO failed.\n"); return; } + + prinfo = this->iscapture ? &info.play : &info.record; + fprintf(stderr, "\n" - "[play/record info]\n" + "[%s info]\n" "buffer size : %d bytes\n" "sample rate : %i Hz\n" "channels : %i\n" @@ -83,18 +86,19 @@ BSDAUDIO_Status(_THIS) "waiting : %s\n" "active : %s\n" "", - info.play.buffer_size, - info.play.sample_rate, - info.play.channels, - info.play.precision, - info.play.encoding, - info.play.seek, - info.play.samples, - info.play.eof, - info.play.pause ? "yes" : "no", - info.play.error ? "yes" : "no", - info.play.waiting ? "yes" : "no", - info.play.active ? "yes" : "no"); + this->iscapture ? "record" : "play", + prinfo->buffer_size, + prinfo->sample_rate, + prinfo->channels, + prinfo->precision, + prinfo->encoding, + prinfo->seek, + prinfo->samples, + prinfo->eof, + prinfo->pause ? "yes" : "no", + prinfo->error ? "yes" : "no", + prinfo->waiting ? "yes" : "no", + prinfo->active ? "yes" : "no"); fprintf(stderr, "\n" "[audio info]\n" @@ -182,11 +186,15 @@ BSDAUDIO_PlayDevice(_THIS) break; } - if (p < written +#ifdef DEBUG_AUDIO + fprintf(stderr, "Wrote %d bytes of audio data\n", written); +#endif + + if (p < this->hidden->mixlen || ((written < 0) && ((errno == 0) || (errno == EAGAIN)))) { SDL_Delay(1); /* Let a little CPU time go by */ } - } while (p < written); + } while (p < this->hidden->mixlen); /* If timer synchronization is enabled, set the next write frame */ if (this->hidden->frame_ticks) { @@ -197,9 +205,6 @@ BSDAUDIO_PlayDevice(_THIS) if (written < 0) { SDL_OpenedAudioDeviceDisconnected(this); } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif } static Uint8 * @@ -208,27 +213,74 @@ BSDAUDIO_GetDeviceBuf(_THIS) return (this->hidden->mixbuf); } + +static int +BSDAUDIO_CaptureFromDevice(_THIS, void *_buffer, int buflen) +{ + Uint8 *buffer = (Uint8 *) _buffer; + int br, p = 0; + + /* Write the audio data, checking for EAGAIN on broken audio drivers */ + do { + br = read(this->hidden->audio_fd, buffer + p, buflen - p); + if (br > 0) + p += br; + if (br == -1 && errno != 0 && errno != EAGAIN && errno != EINTR) { + /* Non recoverable error has occurred. It should be reported!!! */ + perror("audio"); + return p ? p : -1; + } + +#ifdef DEBUG_AUDIO + fprintf(stderr, "Captured %d bytes of audio data\n", br); +#endif + + if (p < buflen + || ((br < 0) && ((errno == 0) || (errno == EAGAIN)))) { + SDL_Delay(1); /* Let a little CPU time go by */ + } + } while (p < buflen); +} + +static void +BSDAUDIO_FlushCapture(_THIS) +{ + audio_info_t info; + size_t remain; + Uint8 buf[512]; + + if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) { + return; /* oh well. */ + } + + remain = (size_t) (info.record.samples * (SDL_AUDIO_BITSIZE(this->spec.format) / 8)); + while (remain > 0) { + const size_t len = SDL_min(sizeof (buf), remain); + const int br = read(this->hidden->audio_fd, buf, len); + if (br <= 0) { + return; /* oh well. */ + } + remain -= br; + } +} + static void BSDAUDIO_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->audio_fd >= 0) { - close(this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->audio_fd >= 0) { + close(this->hidden->audio_fd); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int BSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); + const int flags = iscapture ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT; SDL_AudioFormat format = 0; audio_info_t info; + audio_prinfo *prinfo = iscapture ? &info.play : &info.record; /* We don't care what the devname is...we'll try to open anything. */ /* ...but default to first name in the list... */ @@ -245,7 +297,7 @@ BSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Open the audio device */ this->hidden->audio_fd = open(devname, flags, 0); @@ -259,9 +311,8 @@ BSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) SDL_CalculateAudioSpec(&this->spec); /* Set to play mode */ - info.mode = AUMODE_PLAY; + info.mode = iscapture ? AUMODE_RECORD : AUMODE_PLAY; if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) < 0) { - BSDAUDIO_CloseDevice(this); return SDL_SetError("Couldn't put device into play mode"); } @@ -270,28 +321,28 @@ BSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) format; format = SDL_NextAudioFormat()) { switch (format) { case AUDIO_U8: - info.play.encoding = AUDIO_ENCODING_ULINEAR; - info.play.precision = 8; + prinfo->encoding = AUDIO_ENCODING_ULINEAR; + prinfo->precision = 8; break; case AUDIO_S8: - info.play.encoding = AUDIO_ENCODING_SLINEAR; - info.play.precision = 8; + prinfo->encoding = AUDIO_ENCODING_SLINEAR; + prinfo->precision = 8; break; case AUDIO_S16LSB: - info.play.encoding = AUDIO_ENCODING_SLINEAR_LE; - info.play.precision = 16; + prinfo->encoding = AUDIO_ENCODING_SLINEAR_LE; + prinfo->precision = 16; break; case AUDIO_S16MSB: - info.play.encoding = AUDIO_ENCODING_SLINEAR_BE; - info.play.precision = 16; + prinfo->encoding = AUDIO_ENCODING_SLINEAR_BE; + prinfo->precision = 16; break; case AUDIO_U16LSB: - info.play.encoding = AUDIO_ENCODING_ULINEAR_LE; - info.play.precision = 16; + prinfo->encoding = AUDIO_ENCODING_ULINEAR_LE; + prinfo->precision = 16; break; case AUDIO_U16MSB: - info.play.encoding = AUDIO_ENCODING_ULINEAR_BE; - info.play.precision = 16; + prinfo->encoding = AUDIO_ENCODING_ULINEAR_BE; + prinfo->precision = 16; break; default: continue; @@ -303,33 +354,34 @@ BSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (!format) { - BSDAUDIO_CloseDevice(this); return SDL_SetError("No supported encoding for 0x%x", this->spec.format); } this->spec.format = format; AUDIO_INITINFO(&info); - info.play.channels = this->spec.channels; + prinfo->channels = this->spec.channels; if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) == -1) { this->spec.channels = 1; } AUDIO_INITINFO(&info); - info.play.sample_rate = this->spec.freq; + prinfo->sample_rate = this->spec.freq; info.blocksize = this->spec.size; info.hiwat = 5; info.lowat = 3; (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info); (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info); - this->spec.freq = info.play.sample_rate; - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - BSDAUDIO_CloseDevice(this); - return SDL_OutOfMemory(); + this->spec.freq = prinfo->sample_rate; + + if (!iscapture) { + /* Allocate mixing buffer */ + this->hidden->mixlen = this->spec.size; + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); + if (this->hidden->mixbuf == NULL) { + return SDL_OutOfMemory(); + } + SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); BSDAUDIO_Status(this); @@ -347,7 +399,10 @@ BSDAUDIO_Init(SDL_AudioDriverImpl * impl) impl->WaitDevice = BSDAUDIO_WaitDevice; impl->GetDeviceBuf = BSDAUDIO_GetDeviceBuf; impl->CloseDevice = BSDAUDIO_CloseDevice; + impl->CaptureFromDevice = BSDAUDIO_CaptureFromDevice; + impl->FlushCapture = BSDAUDIO_FlushCapture; + impl->HasCaptureSupport = SDL_TRUE; impl->AllowsArbitraryDeviceNames = 1; return 1; /* this audio target is available. */ diff --git a/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.h b/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.h index 577f9fb32..b7e5b8e21 100644 --- a/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.h +++ b/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.h @@ -33,9 +33,11 @@ #include #include #else -#include +#import +#import #endif +#include #include /* Hidden "this" pointer for the audio functions */ @@ -43,13 +45,21 @@ struct SDL_PrivateAudioData { - AudioUnit audioUnit; - int audioUnitOpened; + SDL_Thread *thread; + AudioQueueRef audioQueue; + AudioQueueBufferRef audioBuffer[2]; void *buffer; UInt32 bufferOffset; UInt32 bufferSize; + AudioStreamBasicDescription strdesc; + SDL_sem *ready_semaphore; + char *thread_error; + SDL_atomic_t shutdown; #if MACOSX_COREAUDIO AudioDeviceID deviceID; +#else + SDL_bool interrupted; + CFTypeRef interruption_listener; #endif }; diff --git a/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.c b/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.m similarity index 52% rename from Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.c rename to Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.m index 46b617dc0..85129050f 100644 --- a/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.c +++ b/Engine/lib/sdl/src/audio/coreaudio/SDL_coreaudio.m @@ -22,19 +22,19 @@ #if SDL_AUDIO_DRIVER_COREAUDIO +/* !!! FIXME: clean out some of the macro salsa in here. */ + #include "SDL_audio.h" #include "../SDL_audio_c.h" #include "../SDL_sysaudio.h" #include "SDL_coreaudio.h" #include "SDL_assert.h" +#include "../../thread/SDL_systhread.h" #define DEBUG_COREAUDIO 0 -static void COREAUDIO_CloseDevice(_THIS); - #define CHECK_RESULT(msg) \ if (result != noErr) { \ - COREAUDIO_CloseDevice(this); \ SDL_SetError("CoreAudio error (%s): %d", msg, (int) result); \ return 0; \ } @@ -185,7 +185,7 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata) #if DEBUG_COREAUDIO printf("COREAUDIO: Found %s device #%d: '%s' (devid %d)\n", ((iscapture) ? "capture" : "output"), - (int) *devCount, ptr, (int) dev); + (int) i, ptr, (int) dev); #endif addfn(ptr, iscapture, dev, addfndata); } @@ -268,42 +268,147 @@ device_list_changed(AudioObjectID systemObj, UInt32 num_addr, const AudioObjectP } #endif -/* The CoreAudio callback */ -static OSStatus -outputCallback(void *inRefCon, - AudioUnitRenderActionFlags * ioActionFlags, - const AudioTimeStamp * inTimeStamp, - UInt32 inBusNumber, UInt32 inNumberFrames, - AudioBufferList * ioData) -{ - SDL_AudioDevice *this = (SDL_AudioDevice *) inRefCon; - AudioBuffer *abuf; - UInt32 remaining, len; - void *ptr; - UInt32 i; - /* Only do anything if audio is enabled and not paused */ - if (!this->enabled || this->paused) { - for (i = 0; i < ioData->mNumberBuffers; i++) { - abuf = &ioData->mBuffers[i]; - SDL_memset(abuf->mData, this->spec.silence, abuf->mDataByteSize); +static int open_playback_devices = 0; +static int open_capture_devices = 0; + +#if !MACOSX_COREAUDIO + +static void interruption_begin(_THIS) +{ + if (this != NULL && this->hidden->audioQueue != NULL) { + this->hidden->interrupted = SDL_TRUE; + AudioQueuePause(this->hidden->audioQueue); + } +} + +static void interruption_end(_THIS) +{ + if (this != NULL && this->hidden != NULL && this->hidden->audioQueue != NULL + && this->hidden->interrupted) { + this->hidden->interrupted = SDL_FALSE; + AudioQueueStart(this->hidden->audioQueue, NULL); + } +} + +@interface SDLInterruptionListener : NSObject + +@property (nonatomic, assign) SDL_AudioDevice *device; + +@end + +@implementation SDLInterruptionListener + +- (void)audioSessionInterruption:(NSNotification *)note +{ + @synchronized (self) { + NSNumber *type = note.userInfo[AVAudioSessionInterruptionTypeKey]; + if (type.unsignedIntegerValue == AVAudioSessionInterruptionTypeBegan) { + interruption_begin(self.device); + } else { + interruption_end(self.device); + } + } +} + +- (void)applicationBecameActive:(NSNotification *)note +{ + @synchronized (self) { + interruption_end(self.device); + } +} + +@end + +static BOOL update_audio_session(_THIS, SDL_bool open) +{ + @autoreleasepool { + AVAudioSession *session = [AVAudioSession sharedInstance]; + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; + NSString *category; + NSError *err = nil; + + if (open_playback_devices && open_capture_devices) { + category = AVAudioSessionCategoryPlayAndRecord; + } else if (open_capture_devices) { + category = AVAudioSessionCategoryRecord; + } else { + /* Set category to ambient so that other music continues playing. + You can change this at runtime in your own code if you need different + behavior. If this is common, we can add an SDL hint for this. */ + category = AVAudioSessionCategoryAmbient; + } + + if (![session setCategory:category error:&err]) { + NSString *desc = err.description; + SDL_SetError("Could not set Audio Session category: %s", desc.UTF8String); + return NO; + } + + if (open_playback_devices + open_capture_devices == 1) { + if (![session setActive:YES error:&err]) { + NSString *desc = err.description; + SDL_SetError("Could not activate Audio Session: %s", desc.UTF8String); + return NO; + } + } else if (!open_playback_devices && !open_capture_devices) { + [session setActive:NO error:nil]; + } + + if (open) { + SDLInterruptionListener *listener = [SDLInterruptionListener new]; + listener.device = this; + + [center addObserver:listener + selector:@selector(audioSessionInterruption:) + name:AVAudioSessionInterruptionNotification + object:session]; + + /* An interruption end notification is not guaranteed to be sent if + we were previously interrupted... resuming if needed when the app + becomes active seems to be the way to go. */ + [center addObserver:listener + selector:@selector(applicationBecameActive:) + name:UIApplicationDidBecomeActiveNotification + object:session]; + + [center addObserver:listener + selector:@selector(applicationBecameActive:) + name:UIApplicationWillEnterForegroundNotification + object:session]; + + this->hidden->interruption_listener = CFBridgingRetain(listener); + } else { + if (this->hidden->interruption_listener != NULL) { + SDLInterruptionListener *listener = nil; + listener = (SDLInterruptionListener *) CFBridgingRelease(this->hidden->interruption_listener); + @synchronized (listener) { + listener.device = NULL; + } + [center removeObserver:listener]; + } } - return 0; } - /* No SDL conversion should be needed here, ever, since we accept - any input format in OpenAudio, and leave the conversion to CoreAudio. - */ - /* - SDL_assert(!this->convert.needed); - SDL_assert(this->spec.channels == ioData->mNumberChannels); - */ + return YES; +} +#endif + + +/* The AudioQueue callback */ +static void +outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer) +{ + SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData; + if (!SDL_AtomicGet(&this->enabled) || SDL_AtomicGet(&this->paused)) { + /* Supply silence if audio is enabled and not paused */ + SDL_memset(inBuffer->mAudioData, this->spec.silence, inBuffer->mAudioDataBytesCapacity); + } else { + UInt32 remaining = inBuffer->mAudioDataBytesCapacity; + Uint8 *ptr = (Uint8 *) inBuffer->mAudioData; - for (i = 0; i < ioData->mNumberBuffers; i++) { - abuf = &ioData->mBuffers[i]; - remaining = abuf->mDataByteSize; - ptr = abuf->mData; while (remaining > 0) { + UInt32 len; if (this->hidden->bufferOffset >= this->hidden->bufferSize) { /* Generate the data */ SDL_LockMutex(this->mixer_lock); @@ -314,29 +419,56 @@ outputCallback(void *inRefCon, } len = this->hidden->bufferSize - this->hidden->bufferOffset; - if (len > remaining) + if (len > remaining) { len = remaining; + } SDL_memcpy(ptr, (char *)this->hidden->buffer + this->hidden->bufferOffset, len); - ptr = (char *)ptr + len; + ptr = ptr + len; remaining -= len; this->hidden->bufferOffset += len; } } - return 0; + if (!SDL_AtomicGet(&this->hidden->shutdown)) { + AudioQueueEnqueueBuffer(this->hidden->audioQueue, inBuffer, 0, NULL); + } + + inBuffer->mAudioDataByteSize = inBuffer->mAudioDataBytesCapacity; } -static OSStatus -inputCallback(void *inRefCon, - AudioUnitRenderActionFlags * ioActionFlags, - const AudioTimeStamp * inTimeStamp, - UInt32 inBusNumber, UInt32 inNumberFrames, - AudioBufferList * ioData) +static void +inputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer, + const AudioTimeStamp *inStartTime, UInt32 inNumberPacketDescriptions, + const AudioStreamPacketDescription *inPacketDescs ) { - /* err = AudioUnitRender(afr->fAudioUnit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, afr->fAudioBuffer); */ - /* !!! FIXME: write me! */ - return noErr; + SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData; + if (SDL_AtomicGet(&this->enabled) && !SDL_AtomicGet(&this->paused)) { /* ignore unless we're active. */ + const Uint8 *ptr = (const Uint8 *) inBuffer->mAudioData; + UInt32 remaining = inBuffer->mAudioDataByteSize; + while (remaining > 0) { + UInt32 len = this->hidden->bufferSize - this->hidden->bufferOffset; + if (len > remaining) { + len = remaining; + } + + SDL_memcpy((char *)this->hidden->buffer + this->hidden->bufferOffset, ptr, len); + ptr += len; + remaining -= len; + this->hidden->bufferOffset += len; + + if (this->hidden->bufferOffset >= this->hidden->bufferSize) { + SDL_LockMutex(this->mixer_lock); + (*this->spec.callback)(this->spec.userdata, this->hidden->buffer, this->hidden->bufferSize); + SDL_UnlockMutex(this->mixer_lock); + this->hidden->bufferOffset = 0; + } + } + } + + if (!SDL_AtomicGet(&this->hidden->shutdown)) { + AudioQueueEnqueueBuffer(this->hidden->audioQueue, inBuffer, 0, NULL); + } } @@ -357,7 +489,7 @@ device_unplugged(AudioObjectID devid, UInt32 num_addr, const AudioObjectProperty UInt32 size = sizeof (isAlive); OSStatus error; - if (!this->enabled) { + if (!SDL_AtomicGet(&this->enabled)) { return 0; /* already known to be dead. */ } @@ -381,43 +513,46 @@ device_unplugged(AudioObjectID devid, UInt32 num_addr, const AudioObjectProperty static void COREAUDIO_CloseDevice(_THIS) { - if (this->hidden != NULL) { - if (this->hidden->audioUnitOpened) { - #if MACOSX_COREAUDIO - /* Unregister our disconnect callback. */ - AudioObjectRemovePropertyListener(this->hidden->deviceID, &alive_address, device_unplugged, this); - #endif + const SDL_bool iscapture = this->iscapture; + int i; - AURenderCallbackStruct callback; - const AudioUnitElement output_bus = 0; - const AudioUnitElement input_bus = 1; - const int iscapture = this->iscapture; - const AudioUnitElement bus = - ((iscapture) ? input_bus : output_bus); - const AudioUnitScope scope = - ((iscapture) ? kAudioUnitScope_Output : - kAudioUnitScope_Input); +/* !!! FIXME: what does iOS do when a bluetooth audio device vanishes? Headphones unplugged? */ +/* !!! FIXME: (we only do a "default" device on iOS right now...can we do more?) */ +#if MACOSX_COREAUDIO + /* Fire a callback if the device stops being "alive" (disconnected, etc). */ + AudioObjectRemovePropertyListener(this->hidden->deviceID, &alive_address, device_unplugged, this); +#endif - /* stop processing the audio unit */ - AudioOutputUnitStop(this->hidden->audioUnit); +#if !MACOSX_COREAUDIO + update_audio_session(this, SDL_FALSE); +#endif - /* Remove the input callback */ - SDL_memset(&callback, 0, sizeof(AURenderCallbackStruct)); - AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_SetRenderCallback, - scope, bus, &callback, sizeof(callback)); + if (this->hidden->thread) { + SDL_AtomicSet(&this->hidden->shutdown, 1); + SDL_WaitThread(this->hidden->thread, NULL); + } - #if MACOSX_COREAUDIO - CloseComponent(this->hidden->audioUnit); - #else - AudioComponentInstanceDispose(this->hidden->audioUnit); - #endif - - this->hidden->audioUnitOpened = 0; + if (this->hidden->audioQueue) { + for (i = 0; i < SDL_arraysize(this->hidden->audioBuffer); i++) { + if (this->hidden->audioBuffer[i]) { + AudioQueueFreeBuffer(this->hidden->audioQueue, this->hidden->audioBuffer[i]); + } } - SDL_free(this->hidden->buffer); - SDL_free(this->hidden); - this->hidden = NULL; + AudioQueueDispose(this->hidden->audioQueue, 1); + } + + if (this->hidden->ready_semaphore) { + SDL_DestroySemaphore(this->hidden->ready_semaphore); + } + + SDL_free(this->hidden->thread_error); + SDL_free(this->hidden->buffer); + SDL_free(this->hidden); + + if (iscapture) { + open_capture_devices--; + } else { + open_playback_devices--; } } @@ -477,116 +612,105 @@ prepare_device(_THIS, void *handle, int iscapture) #endif static int -prepare_audiounit(_THIS, void *handle, int iscapture, - const AudioStreamBasicDescription * strdesc) +prepare_audioqueue(_THIS) { - OSStatus result = noErr; - AURenderCallbackStruct callback; -#if MACOSX_COREAUDIO - ComponentDescription desc; - Component comp = NULL; -#else - AudioComponentDescription desc; - AudioComponent comp = NULL; -#endif - const AudioUnitElement output_bus = 0; - const AudioUnitElement input_bus = 1; - const AudioUnitElement bus = ((iscapture) ? input_bus : output_bus); - const AudioUnitScope scope = ((iscapture) ? kAudioUnitScope_Output : - kAudioUnitScope_Input); + const AudioStreamBasicDescription *strdesc = &this->hidden->strdesc; + const int iscapture = this->iscapture; + OSStatus result; + int i; -#if MACOSX_COREAUDIO - if (!prepare_device(this, handle, iscapture)) { - return 0; - } -#endif + SDL_assert(CFRunLoopGetCurrent() != NULL); - SDL_zero(desc); - desc.componentType = kAudioUnitType_Output; - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - -#if MACOSX_COREAUDIO - desc.componentSubType = kAudioUnitSubType_DefaultOutput; - comp = FindNextComponent(NULL, &desc); -#else - desc.componentSubType = kAudioUnitSubType_RemoteIO; - comp = AudioComponentFindNext(NULL, &desc); -#endif - - if (comp == NULL) { - SDL_SetError("Couldn't find requested CoreAudio component"); - return 0; + if (iscapture) { + result = AudioQueueNewInput(strdesc, inputCallback, this, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &this->hidden->audioQueue); + CHECK_RESULT("AudioQueueNewInput"); + } else { + result = AudioQueueNewOutput(strdesc, outputCallback, this, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &this->hidden->audioQueue); + CHECK_RESULT("AudioQueueNewOutput"); } - /* Open & initialize the audio unit */ #if MACOSX_COREAUDIO - result = OpenAComponent(comp, &this->hidden->audioUnit); - CHECK_RESULT("OpenAComponent"); -#else - /* - AudioComponentInstanceNew only available on iPhone OS 2.0 and Mac OS X 10.6 - We can't use OpenAComponent on iPhone because it is not present - */ - result = AudioComponentInstanceNew(comp, &this->hidden->audioUnit); - CHECK_RESULT("AudioComponentInstanceNew"); +{ + const AudioObjectPropertyAddress prop = { + kAudioDevicePropertyDeviceUID, + iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput, + kAudioObjectPropertyElementMaster + }; + CFStringRef devuid; + UInt32 devuidsize = sizeof (devuid); + result = AudioObjectGetPropertyData(this->hidden->deviceID, &prop, 0, NULL, &devuidsize, &devuid); + CHECK_RESULT("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceUID)"); + result = AudioQueueSetProperty(this->hidden->audioQueue, kAudioQueueProperty_CurrentDevice, &devuid, devuidsize); + CHECK_RESULT("AudioQueueSetProperty (kAudioQueueProperty_CurrentDevice)"); + + /* !!! FIXME: what does iOS do when a bluetooth audio device vanishes? Headphones unplugged? */ + /* !!! FIXME: (we only do a "default" device on iOS right now...can we do more?) */ + /* Fire a callback if the device stops being "alive" (disconnected, etc). */ + AudioObjectAddPropertyListener(this->hidden->deviceID, &alive_address, device_unplugged, this); +} #endif - this->hidden->audioUnitOpened = 1; - -#if MACOSX_COREAUDIO - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioOutputUnitProperty_CurrentDevice, - kAudioUnitScope_Global, 0, - &this->hidden->deviceID, - sizeof(AudioDeviceID)); - CHECK_RESULT - ("AudioUnitSetProperty (kAudioOutputUnitProperty_CurrentDevice)"); -#endif - - /* Set the data format of the audio unit. */ - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_StreamFormat, - scope, bus, strdesc, sizeof(*strdesc)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)"); - - /* Set the audio callback */ - SDL_memset(&callback, 0, sizeof(AURenderCallbackStruct)); - callback.inputProc = ((iscapture) ? inputCallback : outputCallback); - callback.inputProcRefCon = this; - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_SetRenderCallback, - scope, bus, &callback, sizeof(callback)); - CHECK_RESULT - ("AudioUnitSetProperty (kAudioUnitProperty_SetRenderCallback)"); - /* Calculate the final parameters for this audio specification */ SDL_CalculateAudioSpec(&this->spec); /* Allocate a sample buffer */ - this->hidden->bufferOffset = this->hidden->bufferSize = this->spec.size; + this->hidden->bufferSize = this->spec.size; + this->hidden->bufferOffset = iscapture ? 0 : this->hidden->bufferSize; + this->hidden->buffer = SDL_malloc(this->hidden->bufferSize); + if (this->hidden->buffer == NULL) { + SDL_OutOfMemory(); + return 0; + } - result = AudioUnitInitialize(this->hidden->audioUnit); - CHECK_RESULT("AudioUnitInitialize"); + for (i = 0; i < SDL_arraysize(this->hidden->audioBuffer); i++) { + result = AudioQueueAllocateBuffer(this->hidden->audioQueue, this->spec.size, &this->hidden->audioBuffer[i]); + CHECK_RESULT("AudioQueueAllocateBuffer"); + SDL_memset(this->hidden->audioBuffer[i]->mAudioData, this->spec.silence, this->hidden->audioBuffer[i]->mAudioDataBytesCapacity); + this->hidden->audioBuffer[i]->mAudioDataByteSize = this->hidden->audioBuffer[i]->mAudioDataBytesCapacity; + result = AudioQueueEnqueueBuffer(this->hidden->audioQueue, this->hidden->audioBuffer[i], 0, NULL); + CHECK_RESULT("AudioQueueEnqueueBuffer"); + } - /* Finally, start processing of the audio unit */ - result = AudioOutputUnitStart(this->hidden->audioUnit); - CHECK_RESULT("AudioOutputUnitStart"); - -#if MACOSX_COREAUDIO - /* Fire a callback if the device stops being "alive" (disconnected, etc). */ - AudioObjectAddPropertyListener(this->hidden->deviceID, &alive_address, device_unplugged, this); -#endif + result = AudioQueueStart(this->hidden->audioQueue, NULL); + CHECK_RESULT("AudioQueueStart"); /* We're running! */ return 1; } +static int +audioqueue_thread(void *arg) +{ + SDL_AudioDevice *this = (SDL_AudioDevice *) arg; + const int rc = prepare_audioqueue(this); + if (!rc) { + this->hidden->thread_error = SDL_strdup(SDL_GetError()); + SDL_SemPost(this->hidden->ready_semaphore); + return 0; + } + + /* init was successful, alert parent thread and start running... */ + SDL_SemPost(this->hidden->ready_semaphore); + while (!SDL_AtomicGet(&this->hidden->shutdown)) { + CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.10, 1); + } + + if (this->iscapture) { /* just stop immediately for capture devices. */ + AudioQueueStop(this->hidden->audioQueue, 1); + } else { /* Drain off any pending playback. */ + AudioQueueStop(this->hidden->audioQueue, 0); + const CFTimeInterval secs = (((this->spec.size / (SDL_AUDIO_BITSIZE(this->spec.format) / 8)) / this->spec.channels) / ((CFTimeInterval) this->spec.freq)) * 2.0; + CFRunLoopRunInMode(kCFRunLoopDefaultMode, secs, 0); + } + + return 0; +} static int COREAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { - AudioStreamBasicDescription strdesc; + AudioStreamBasicDescription *strdesc; SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format); int valid_datatype = 0; @@ -596,15 +720,29 @@ COREAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); + + strdesc = &this->hidden->strdesc; + + if (iscapture) { + open_capture_devices++; + } else { + open_playback_devices++; + } + +#if !MACOSX_COREAUDIO + if (!update_audio_session(this, SDL_TRUE)) { + return -1; + } +#endif /* Setup a AudioStreamBasicDescription with the requested format */ - SDL_memset(&strdesc, '\0', sizeof(AudioStreamBasicDescription)); - strdesc.mFormatID = kAudioFormatLinearPCM; - strdesc.mFormatFlags = kLinearPCMFormatFlagIsPacked; - strdesc.mChannelsPerFrame = this->spec.channels; - strdesc.mSampleRate = this->spec.freq; - strdesc.mFramesPerPacket = 1; + SDL_zerop(strdesc); + strdesc->mFormatID = kAudioFormatLinearPCM; + strdesc->mFormatFlags = kLinearPCMFormatFlagIsPacked; + strdesc->mChannelsPerFrame = this->spec.channels; + strdesc->mSampleRate = this->spec.freq; + strdesc->mFramesPerPacket = 1; while ((!valid_datatype) && (test_format)) { this->spec.format = test_format; @@ -621,34 +759,53 @@ COREAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) case AUDIO_F32LSB: case AUDIO_F32MSB: valid_datatype = 1; - strdesc.mBitsPerChannel = SDL_AUDIO_BITSIZE(this->spec.format); + strdesc->mBitsPerChannel = SDL_AUDIO_BITSIZE(this->spec.format); if (SDL_AUDIO_ISBIGENDIAN(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; + strdesc->mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; if (SDL_AUDIO_ISFLOAT(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsFloat; + strdesc->mFormatFlags |= kLinearPCMFormatFlagIsFloat; else if (SDL_AUDIO_ISSIGNED(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; + strdesc->mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; break; } } if (!valid_datatype) { /* shouldn't happen, but just in case... */ - COREAUDIO_CloseDevice(this); return SDL_SetError("Unsupported audio format"); } - strdesc.mBytesPerFrame = - strdesc.mBitsPerChannel * strdesc.mChannelsPerFrame / 8; - strdesc.mBytesPerPacket = - strdesc.mBytesPerFrame * strdesc.mFramesPerPacket; + strdesc->mBytesPerFrame = strdesc->mBitsPerChannel * strdesc->mChannelsPerFrame / 8; + strdesc->mBytesPerPacket = strdesc->mBytesPerFrame * strdesc->mFramesPerPacket; - if (!prepare_audiounit(this, handle, iscapture, &strdesc)) { - COREAUDIO_CloseDevice(this); - return -1; /* prepare_audiounit() will call SDL_SetError()... */ +#if MACOSX_COREAUDIO + if (!prepare_device(this, handle, iscapture)) { + return -1; + } +#endif + + /* This has to init in a new thread so it can get its own CFRunLoop. :/ */ + SDL_AtomicSet(&this->hidden->shutdown, 0); + this->hidden->ready_semaphore = SDL_CreateSemaphore(0); + if (!this->hidden->ready_semaphore) { + return -1; /* oh well. */ } - return 0; /* good to go. */ + this->hidden->thread = SDL_CreateThreadInternal(audioqueue_thread, "AudioQueue thread", 512 * 1024, this); + if (!this->hidden->thread) { + return -1; + } + + SDL_SemWait(this->hidden->ready_semaphore); + SDL_DestroySemaphore(this->hidden->ready_semaphore); + this->hidden->ready_semaphore = NULL; + + if ((this->hidden->thread != NULL) && (this->hidden->thread_error != NULL)) { + SDL_SetError("%s", this->hidden->thread_error); + return -1; + } + + return (this->hidden->thread != NULL) ? 0 : -1; } static void @@ -674,17 +831,11 @@ COREAUDIO_Init(SDL_AudioDriverImpl * impl) AudioObjectAddPropertyListener(kAudioObjectSystemObject, &devlist_address, device_list_changed, NULL); #else impl->OnlyHasDefaultOutputDevice = 1; - - /* Set category to ambient sound so that other music continues playing. - You can change this at runtime in your own code if you need different - behavior. If this is common, we can add an SDL hint for this. - */ - AudioSessionInitialize(NULL, NULL, NULL, nil); - UInt32 category = kAudioSessionCategory_AmbientSound; - AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(UInt32), &category); + impl->OnlyHasDefaultCaptureDevice = 1; #endif impl->ProvidesOwnCallbackThread = 1; + impl->HasCaptureSupport = 1; return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/directsound/SDL_directsound.c b/Engine/lib/sdl/src/audio/directsound/SDL_directsound.c index 065e163a6..5d261c92e 100644 --- a/Engine/lib/sdl/src/audio/directsound/SDL_directsound.c +++ b/Engine/lib/sdl/src/audio/directsound/SDL_directsound.c @@ -24,6 +24,7 @@ /* Allow access to a raw mixing buffer */ +#include "SDL_assert.h" #include "SDL_timer.h" #include "SDL_loadso.h" #include "SDL_audio.h" @@ -36,11 +37,13 @@ /* DirectX function pointers for audio */ static void* DSoundDLL = NULL; -typedef HRESULT(WINAPI*fnDirectSoundCreate8)(LPGUID,LPDIRECTSOUND*,LPUNKNOWN); -typedef HRESULT(WINAPI*fnDirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID); -typedef HRESULT(WINAPI*fnDirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW,LPVOID); +typedef HRESULT (WINAPI *fnDirectSoundCreate8)(LPGUID,LPDIRECTSOUND*,LPUNKNOWN); +typedef HRESULT (WINAPI *fnDirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID); +typedef HRESULT (WINAPI *fnDirectSoundCaptureCreate8)(LPCGUID,LPDIRECTSOUNDCAPTURE8 *,LPUNKNOWN); +typedef HRESULT (WINAPI *fnDirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW,LPVOID); static fnDirectSoundCreate8 pDirectSoundCreate8 = NULL; static fnDirectSoundEnumerateW pDirectSoundEnumerateW = NULL; +static fnDirectSoundCaptureCreate8 pDirectSoundCaptureCreate8 = NULL; static fnDirectSoundCaptureEnumerateW pDirectSoundCaptureEnumerateW = NULL; static void @@ -48,6 +51,7 @@ DSOUND_Unload(void) { pDirectSoundCreate8 = NULL; pDirectSoundEnumerateW = NULL; + pDirectSoundCaptureCreate8 = NULL; pDirectSoundCaptureEnumerateW = NULL; if (DSoundDLL != NULL) { @@ -76,6 +80,7 @@ DSOUND_Load(void) loaded = 1; /* will reset if necessary. */ DSOUNDLOAD(DirectSoundCreate8); DSOUNDLOAD(DirectSoundEnumerateW); + DSOUNDLOAD(DirectSoundCaptureCreate8); DSOUNDLOAD(DirectSoundCaptureEnumerateW); #undef DSOUNDLOAD @@ -155,7 +160,7 @@ FindAllDevs(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID data) { const int iscapture = (int) ((size_t) data); if (guid != NULL) { /* skip default device */ - char *str = WIN_StringToUTF8(desc); + char *str = WIN_LookupAudioDeviceName(desc, guid); if (str != NULL) { LPGUID cpyguid = (LPGUID) SDL_malloc(sizeof (GUID)); SDL_memcpy(cpyguid, guid, sizeof (GUID)); @@ -197,7 +202,7 @@ DSOUND_WaitDevice(_THIS) return; } - while ((cursor / this->hidden->mixlen) == this->hidden->lastchunk) { + while ((cursor / this->spec.size) == this->hidden->lastchunk) { /* FIXME: find out how much time is left and sleep that long */ SDL_Delay(1); @@ -239,9 +244,8 @@ DSOUND_PlayDevice(_THIS) if (this->hidden->locked_buf) { IDirectSoundBuffer_Unlock(this->hidden->mixbuf, this->hidden->locked_buf, - this->hidden->mixlen, NULL, 0); + this->spec.size, NULL, 0); } - } static Uint8 * @@ -265,7 +269,7 @@ DSOUND_GetDeviceBuf(_THIS) SetDSerror("DirectSound GetCurrentPosition", result); return (NULL); } - cursor /= this->hidden->mixlen; + cursor /= this->spec.size; #ifdef DEBUG_SOUND /* Detect audio dropouts */ { @@ -281,17 +285,17 @@ DSOUND_GetDeviceBuf(_THIS) #endif this->hidden->lastchunk = cursor; cursor = (cursor + 1) % this->hidden->num_buffers; - cursor *= this->hidden->mixlen; + cursor *= this->spec.size; /* Lock the audio buffer */ result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor, - this->hidden->mixlen, + this->spec.size, (LPVOID *) & this->hidden->locked_buf, &rawlen, NULL, &junk, 0); if (result == DSERR_BUFFERLOST) { IDirectSoundBuffer_Restore(this->hidden->mixbuf); result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor, - this->hidden->mixlen, + this->spec.size, (LPVOID *) & this-> hidden->locked_buf, &rawlen, NULL, &junk, 0); @@ -303,109 +307,106 @@ DSOUND_GetDeviceBuf(_THIS) return (this->hidden->locked_buf); } -static void -DSOUND_WaitDone(_THIS) +static int +DSOUND_CaptureFromDevice(_THIS, void *buffer, int buflen) { - Uint8 *stream = DSOUND_GetDeviceBuf(this); + struct SDL_PrivateAudioData *h = this->hidden; + DWORD junk, cursor, ptr1len, ptr2len; + VOID *ptr1, *ptr2; - /* Wait for the playing chunk to finish */ - if (stream != NULL) { - SDL_memset(stream, this->spec.silence, this->hidden->mixlen); - DSOUND_PlayDevice(this); + SDL_assert(buflen == this->spec.size); + + while (SDL_TRUE) { + if (SDL_AtomicGet(&this->shutdown)) { /* in case the buffer froze... */ + SDL_memset(buffer, this->spec.silence, buflen); + return buflen; + } + + if (IDirectSoundCaptureBuffer_GetCurrentPosition(h->capturebuf, &junk, &cursor) != DS_OK) { + return -1; + } + if ((cursor / this->spec.size) == h->lastchunk) { + SDL_Delay(1); /* FIXME: find out how much time is left and sleep that long */ + } else { + break; + } } - DSOUND_WaitDevice(this); - /* Stop the looping sound buffer */ - IDirectSoundBuffer_Stop(this->hidden->mixbuf); + if (IDirectSoundCaptureBuffer_Lock(h->capturebuf, h->lastchunk * this->spec.size, this->spec.size, &ptr1, &ptr1len, &ptr2, &ptr2len, 0) != DS_OK) { + return -1; + } + + SDL_assert(ptr1len == this->spec.size); + SDL_assert(ptr2 == NULL); + SDL_assert(ptr2len == 0); + + SDL_memcpy(buffer, ptr1, ptr1len); + + if (IDirectSoundCaptureBuffer_Unlock(h->capturebuf, ptr1, ptr1len, ptr2, ptr2len) != DS_OK) { + return -1; + } + + h->lastchunk = (h->lastchunk + 1) % h->num_buffers; + + return ptr1len; +} + +static void +DSOUND_FlushCapture(_THIS) +{ + struct SDL_PrivateAudioData *h = this->hidden; + DWORD junk, cursor; + if (IDirectSoundCaptureBuffer_GetCurrentPosition(h->capturebuf, &junk, &cursor) == DS_OK) { + h->lastchunk = cursor / this->spec.size; + } } static void DSOUND_CloseDevice(_THIS) { - if (this->hidden != NULL) { - if (this->hidden->sound != NULL) { - if (this->hidden->mixbuf != NULL) { - /* Clean up the audio buffer */ - IDirectSoundBuffer_Release(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - IDirectSound_Release(this->hidden->sound); - this->hidden->sound = NULL; - } - - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->mixbuf != NULL) { + IDirectSoundBuffer_Stop(this->hidden->mixbuf); + IDirectSoundBuffer_Release(this->hidden->mixbuf); } + if (this->hidden->sound != NULL) { + IDirectSound_Release(this->hidden->sound); + } + if (this->hidden->capturebuf != NULL) { + IDirectSoundCaptureBuffer_Stop(this->hidden->capturebuf); + IDirectSoundCaptureBuffer_Release(this->hidden->capturebuf); + } + if (this->hidden->capture != NULL) { + IDirectSoundCapture_Release(this->hidden->capture); + } + SDL_free(this->hidden); } /* This function tries to create a secondary audio buffer, and returns the - number of audio chunks available in the created buffer. + number of audio chunks available in the created buffer. This is for + playback devices, not capture. */ static int -CreateSecondary(_THIS, HWND focus) +CreateSecondary(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt) { LPDIRECTSOUND sndObj = this->hidden->sound; LPDIRECTSOUNDBUFFER *sndbuf = &this->hidden->mixbuf; - Uint32 chunksize = this->spec.size; - const int numchunks = 8; HRESULT result = DS_OK; DSBUFFERDESC format; LPVOID pvAudioPtr1, pvAudioPtr2; DWORD dwAudioBytes1, dwAudioBytes2; - WAVEFORMATEX wfmt; - - SDL_zero(wfmt); - - if (SDL_AUDIO_ISFLOAT(this->spec.format)) { - wfmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - } else { - wfmt.wFormatTag = WAVE_FORMAT_PCM; - } - - wfmt.wBitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format); - wfmt.nChannels = this->spec.channels; - wfmt.nSamplesPerSec = this->spec.freq; - wfmt.nBlockAlign = wfmt.nChannels * (wfmt.wBitsPerSample / 8); - wfmt.nAvgBytesPerSec = wfmt.nSamplesPerSec * wfmt.nBlockAlign; - - /* Update the fragment size as size in bytes */ - SDL_CalculateAudioSpec(&this->spec); - - /* Try to set primary mixing privileges */ - if (focus) { - result = IDirectSound_SetCooperativeLevel(sndObj, - focus, DSSCL_PRIORITY); - } else { - result = IDirectSound_SetCooperativeLevel(sndObj, - GetDesktopWindow(), - DSSCL_NORMAL); - } - if (result != DS_OK) { - return SetDSerror("DirectSound SetCooperativeLevel", result); - } /* Try to create the secondary buffer */ SDL_zero(format); format.dwSize = sizeof(format); format.dwFlags = DSBCAPS_GETCURRENTPOSITION2; - if (!focus) { - format.dwFlags |= DSBCAPS_GLOBALFOCUS; - } else { - format.dwFlags |= DSBCAPS_STICKYFOCUS; - } - format.dwBufferBytes = numchunks * chunksize; - if ((format.dwBufferBytes < DSBSIZE_MIN) || - (format.dwBufferBytes > DSBSIZE_MAX)) { - return SDL_SetError("Sound buffer size must be between %d and %d", - DSBSIZE_MIN / numchunks, DSBSIZE_MAX / numchunks); - } - format.dwReserved = 0; - format.lpwfxFormat = &wfmt; + format.dwFlags |= DSBCAPS_GLOBALFOCUS; + format.dwBufferBytes = bufsize; + format.lpwfxFormat = wfmt; result = IDirectSound_CreateSoundBuffer(sndObj, &format, sndbuf, NULL); if (result != DS_OK) { return SetDSerror("DirectSound CreateSoundBuffer", result); } - IDirectSoundBuffer_SetFormat(*sndbuf, &wfmt); + IDirectSoundBuffer_SetFormat(*sndbuf, wfmt); /* Silence the initial audio buffer */ result = IDirectSoundBuffer_Lock(*sndbuf, 0, format.dwBufferBytes, @@ -420,31 +421,90 @@ CreateSecondary(_THIS, HWND focus) } /* We're ready to go */ - return (numchunks); + return 0; +} + +/* This function tries to create a capture buffer, and returns the + number of audio chunks available in the created buffer. This is for + capture devices, not playback. +*/ +static int +CreateCaptureBuffer(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt) +{ + LPDIRECTSOUNDCAPTURE capture = this->hidden->capture; + LPDIRECTSOUNDCAPTUREBUFFER *capturebuf = &this->hidden->capturebuf; + DSCBUFFERDESC format; +// DWORD junk, cursor; + HRESULT result; + + SDL_zero(format); + format.dwSize = sizeof (format); + format.dwFlags = DSCBCAPS_WAVEMAPPED; + format.dwBufferBytes = bufsize; + format.lpwfxFormat = wfmt; + + result = IDirectSoundCapture_CreateCaptureBuffer(capture, &format, capturebuf, NULL); + if (result != DS_OK) { + return SetDSerror("DirectSound CreateCaptureBuffer", result); + } + + result = IDirectSoundCaptureBuffer_Start(*capturebuf, DSCBSTART_LOOPING); + if (result != DS_OK) { + IDirectSoundCaptureBuffer_Release(*capturebuf); + return SetDSerror("DirectSound Start", result); + } + +#if 0 + /* presumably this starts at zero, but just in case... */ + result = IDirectSoundCaptureBuffer_GetCurrentPosition(*capturebuf, &junk, &cursor); + if (result != DS_OK) { + IDirectSoundCaptureBuffer_Stop(*capturebuf); + IDirectSoundCaptureBuffer_Release(*capturebuf); + return SetDSerror("DirectSound GetCurrentPosition", result); + } + + this->hidden->lastchunk = cursor / this->spec.size; +#endif + + return 0; } static int DSOUND_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { + const DWORD numchunks = 8; HRESULT result; SDL_bool valid_format = SDL_FALSE; SDL_bool tried_format = SDL_FALSE; SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format); LPGUID guid = (LPGUID) handle; - + DWORD bufsize; + /* Initialize all variables that we clean on shutdown */ this->hidden = (struct SDL_PrivateAudioData *) SDL_malloc((sizeof *this->hidden)); if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Open the audio device */ - result = pDirectSoundCreate8(guid, &this->hidden->sound, NULL); - if (result != DS_OK) { - DSOUND_CloseDevice(this); - return SetDSerror("DirectSoundCreate", result); + if (iscapture) { + result = pDirectSoundCaptureCreate8(guid, &this->hidden->capture, NULL); + if (result != DS_OK) { + return SetDSerror("DirectSoundCaptureCreate8", result); + } + } else { + result = pDirectSoundCreate8(guid, &this->hidden->sound, NULL); + if (result != DS_OK) { + return SetDSerror("DirectSoundCreate8", result); + } + result = IDirectSound_SetCooperativeLevel(this->hidden->sound, + GetDesktopWindow(), + DSSCL_NORMAL); + if (result != DS_OK) { + return SetDSerror("DirectSound SetCooperativeLevel", result); + } } while ((!valid_format) && (test_format)) { @@ -454,10 +514,38 @@ DSOUND_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) case AUDIO_S32: case AUDIO_F32: tried_format = SDL_TRUE; + this->spec.format = test_format; - this->hidden->num_buffers = CreateSecondary(this, NULL); - if (this->hidden->num_buffers > 0) { - valid_format = SDL_TRUE; + + /* Update the fragment size as size in bytes */ + SDL_CalculateAudioSpec(&this->spec); + + bufsize = numchunks * this->spec.size; + if ((bufsize < DSBSIZE_MIN) || (bufsize > DSBSIZE_MAX)) { + SDL_SetError("Sound buffer size must be between %d and %d", + (DSBSIZE_MIN < numchunks) ? 1 : DSBSIZE_MIN / numchunks, + DSBSIZE_MAX / numchunks); + } else { + int rc; + WAVEFORMATEX wfmt; + SDL_zero(wfmt); + if (SDL_AUDIO_ISFLOAT(this->spec.format)) { + wfmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + } else { + wfmt.wFormatTag = WAVE_FORMAT_PCM; + } + + wfmt.wBitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format); + wfmt.nChannels = this->spec.channels; + wfmt.nSamplesPerSec = this->spec.freq; + wfmt.nBlockAlign = wfmt.nChannels * (wfmt.wBitsPerSample / 8); + wfmt.nAvgBytesPerSec = wfmt.nSamplesPerSec * wfmt.nBlockAlign; + + rc = iscapture ? CreateCaptureBuffer(this, bufsize, &wfmt) : CreateSecondary(this, bufsize, &wfmt); + if (rc == 0) { + this->hidden->num_buffers = numchunks; + valid_format = SDL_TRUE; + } } break; } @@ -465,15 +553,13 @@ DSOUND_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (!valid_format) { - DSOUND_CloseDevice(this); if (tried_format) { return -1; /* CreateSecondary() should have called SDL_SetError(). */ } return SDL_SetError("DirectSound: Unsupported audio format"); } - /* The buffer will auto-start playing in DSOUND_WaitDevice() */ - this->hidden->mixlen = this->spec.size; + /* Playback buffers will auto-start playing in DSOUND_WaitDevice() */ return 0; /* good to go. */ } @@ -498,13 +584,15 @@ DSOUND_Init(SDL_AudioDriverImpl * impl) impl->OpenDevice = DSOUND_OpenDevice; impl->PlayDevice = DSOUND_PlayDevice; impl->WaitDevice = DSOUND_WaitDevice; - impl->WaitDone = DSOUND_WaitDone; impl->GetDeviceBuf = DSOUND_GetDeviceBuf; + impl->CaptureFromDevice = DSOUND_CaptureFromDevice; + impl->FlushCapture = DSOUND_FlushCapture; impl->CloseDevice = DSOUND_CloseDevice; impl->FreeDeviceHandle = DSOUND_FreeDeviceHandle; - impl->Deinitialize = DSOUND_Deinitialize; + impl->HasCaptureSupport = SDL_TRUE; + return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/directsound/SDL_directsound.h b/Engine/lib/sdl/src/audio/directsound/SDL_directsound.h index 0d5f6bd76..d646c303f 100644 --- a/Engine/lib/sdl/src/audio/directsound/SDL_directsound.h +++ b/Engine/lib/sdl/src/audio/directsound/SDL_directsound.h @@ -35,8 +35,9 @@ struct SDL_PrivateAudioData { LPDIRECTSOUND sound; LPDIRECTSOUNDBUFFER mixbuf; + LPDIRECTSOUNDCAPTURE capture; + LPDIRECTSOUNDCAPTUREBUFFER capturebuf; int num_buffers; - int mixlen; DWORD lastchunk; Uint8 *locked_buf; }; diff --git a/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.c b/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.c index 28745f9d0..ee5368844 100644 --- a/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.c +++ b/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.c @@ -31,46 +31,33 @@ #include "SDL_rwops.h" #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_diskaudio.h" +/* !!! FIXME: these should be SDL hints, not environment variables. */ /* environment variables and defaults. */ #define DISKENVR_OUTFILE "SDL_DISKAUDIOFILE" #define DISKDEFAULT_OUTFILE "sdlaudio.raw" -#define DISKENVR_WRITEDELAY "SDL_DISKAUDIODELAY" -#define DISKDEFAULT_WRITEDELAY 150 - -static const char * -DISKAUD_GetOutputFilename(const char *devname) -{ - if (devname == NULL) { - devname = SDL_getenv(DISKENVR_OUTFILE); - if (devname == NULL) { - devname = DISKDEFAULT_OUTFILE; - } - } - return devname; -} +#define DISKENVR_INFILE "SDL_DISKAUDIOFILEIN" +#define DISKDEFAULT_INFILE "sdlaudio-in.raw" +#define DISKENVR_IODELAY "SDL_DISKAUDIODELAY" /* This function waits until it is possible to write a full sound buffer */ static void -DISKAUD_WaitDevice(_THIS) +DISKAUDIO_WaitDevice(_THIS) { - SDL_Delay(this->hidden->write_delay); + SDL_Delay(this->hidden->io_delay); } static void -DISKAUD_PlayDevice(_THIS) +DISKAUDIO_PlayDevice(_THIS) { - size_t written; - - /* Write the audio data */ - written = SDL_RWwrite(this->hidden->output, - this->hidden->mixbuf, 1, this->hidden->mixlen); + const size_t written = SDL_RWwrite(this->hidden->io, + this->hidden->mixbuf, + 1, this->spec.size); /* If we couldn't write, assume fatal error for now */ - if (written != this->hidden->mixlen) { + if (written != this->spec.size) { SDL_OpenedAudioDeviceDisconnected(this); } #ifdef DEBUG_AUDIO @@ -79,63 +66,105 @@ DISKAUD_PlayDevice(_THIS) } static Uint8 * -DISKAUD_GetDeviceBuf(_THIS) +DISKAUDIO_GetDeviceBuf(_THIS) { return (this->hidden->mixbuf); } -static void -DISKAUD_CloseDevice(_THIS) +static int +DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->output != NULL) { - SDL_RWclose(this->hidden->output); - this->hidden->output = NULL; + struct SDL_PrivateAudioData *h = this->hidden; + const int origbuflen = buflen; + + SDL_Delay(h->io_delay); + + if (h->io) { + const size_t br = SDL_RWread(h->io, buffer, 1, buflen); + buflen -= (int) br; + buffer = ((Uint8 *) buffer) + br; + if (buflen > 0) { /* EOF (or error, but whatever). */ + SDL_RWclose(h->io); + h->io = NULL; } - SDL_free(this->hidden); - this->hidden = NULL; } + + /* if we ran out of file, just write silence. */ + SDL_memset(buffer, this->spec.silence, buflen); + + return origbuflen; +} + +static void +DISKAUDIO_FlushCapture(_THIS) +{ + /* no op...we don't advance the file pointer or anything. */ +} + + +static void +DISKAUDIO_CloseDevice(_THIS) +{ + if (this->hidden->io != NULL) { + SDL_RWclose(this->hidden->io); + } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); +} + + +static const char * +get_filename(const int iscapture, const char *devname) +{ + if (devname == NULL) { + devname = SDL_getenv(iscapture ? DISKENVR_INFILE : DISKENVR_OUTFILE); + if (devname == NULL) { + devname = iscapture ? DISKDEFAULT_INFILE : DISKDEFAULT_OUTFILE; + } + } + return devname; } static int -DISKAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +DISKAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { /* handle != NULL means "user specified the placeholder name on the fake detected device list" */ - const char *fname = DISKAUD_GetOutputFilename(handle ? NULL : devname); - const char *envr = SDL_getenv(DISKENVR_WRITEDELAY); + const char *fname = get_filename(iscapture, handle ? NULL : devname); + const char *envr = SDL_getenv(DISKENVR_IODELAY); this->hidden = (struct SDL_PrivateAudioData *) SDL_malloc(sizeof(*this->hidden)); if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, sizeof(*this->hidden)); + SDL_zerop(this->hidden); - this->hidden->mixlen = this->spec.size; - this->hidden->write_delay = - (envr) ? SDL_atoi(envr) : DISKDEFAULT_WRITEDELAY; + if (envr != NULL) { + this->hidden->io_delay = SDL_atoi(envr); + } else { + this->hidden->io_delay = ((this->spec.samples * 1000) / this->spec.freq); + } /* Open the audio device */ - this->hidden->output = SDL_RWFromFile(fname, "wb"); - if (this->hidden->output == NULL) { - DISKAUD_CloseDevice(this); + this->hidden->io = SDL_RWFromFile(fname, iscapture ? "rb" : "wb"); + if (this->hidden->io == NULL) { return -1; } /* Allocate mixing buffer */ - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - DISKAUD_CloseDevice(this); - return -1; + if (!iscapture) { + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size); + if (this->hidden->mixbuf == NULL) { + return SDL_OutOfMemory(); + } + SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); #if HAVE_STDIO_H fprintf(stderr, - "WARNING: You are using the SDL disk writer audio driver!\n" - " Writing to file [%s].\n", fname); + "WARNING: You are using the SDL disk i/o audio driver!\n" + " %s file [%s].\n", iscapture ? "Reading from" : "Writing to", + fname); #endif /* We're ready to rock and roll. :-) */ @@ -143,30 +172,34 @@ DISKAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } static void -DISKAUD_DetectDevices(void) +DISKAUDIO_DetectDevices(void) { - /* !!! FIXME: stole this literal string from DEFAULT_OUTPUT_DEVNAME in SDL_audio.c */ - SDL_AddAudioDevice(SDL_FALSE, "System audio output device", (void *) 0x1); + SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) 0x1); + SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, (void *) 0x2); } static int -DISKAUD_Init(SDL_AudioDriverImpl * impl) +DISKAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = DISKAUD_OpenDevice; - impl->WaitDevice = DISKAUD_WaitDevice; - impl->PlayDevice = DISKAUD_PlayDevice; - impl->GetDeviceBuf = DISKAUD_GetDeviceBuf; - impl->CloseDevice = DISKAUD_CloseDevice; - impl->DetectDevices = DISKAUD_DetectDevices; + impl->OpenDevice = DISKAUDIO_OpenDevice; + impl->WaitDevice = DISKAUDIO_WaitDevice; + impl->PlayDevice = DISKAUDIO_PlayDevice; + impl->GetDeviceBuf = DISKAUDIO_GetDeviceBuf; + impl->CaptureFromDevice = DISKAUDIO_CaptureFromDevice; + impl->FlushCapture = DISKAUDIO_FlushCapture; + + impl->CloseDevice = DISKAUDIO_CloseDevice; + impl->DetectDevices = DISKAUDIO_DetectDevices; impl->AllowsArbitraryDeviceNames = 1; + impl->HasCaptureSupport = SDL_TRUE; return 1; /* this audio target is available. */ } -AudioBootStrap DISKAUD_bootstrap = { - "disk", "direct-to-disk audio", DISKAUD_Init, 1 +AudioBootStrap DISKAUDIO_bootstrap = { + "disk", "direct-to-disk audio", DISKAUDIO_Init, 1 }; #endif /* SDL_AUDIO_DRIVER_DISK */ diff --git a/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.h b/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.h index b5666f7fc..ad152a9ce 100644 --- a/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.h +++ b/Engine/lib/sdl/src/audio/disk/SDL_diskaudio.h @@ -32,10 +32,9 @@ struct SDL_PrivateAudioData { /* The file descriptor for the audio device */ - SDL_RWops *output; + SDL_RWops *io; + Uint32 io_delay; Uint8 *mixbuf; - Uint32 mixlen; - Uint32 write_delay; }; #endif /* _SDL_diskaudio_h */ diff --git a/Engine/lib/sdl/src/audio/dsp/SDL_dspaudio.c b/Engine/lib/sdl/src/audio/dsp/SDL_dspaudio.c index 17e029e1d..a5a31b3aa 100644 --- a/Engine/lib/sdl/src/audio/dsp/SDL_dspaudio.c +++ b/Engine/lib/sdl/src/audio/dsp/SDL_dspaudio.c @@ -44,7 +44,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" #include "SDL_dspaudio.h" @@ -60,16 +59,11 @@ DSP_DetectDevices(void) static void DSP_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->audio_fd >= 0) { - close(this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->audio_fd >= 0) { + close(this->hidden->audio_fd); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } @@ -106,23 +100,20 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Open the audio device */ this->hidden->audio_fd = open(devname, flags, 0); if (this->hidden->audio_fd < 0) { - DSP_CloseDevice(this); return SDL_SetError("Couldn't open %s: %s", devname, strerror(errno)); } - this->hidden->mixbuf = NULL; - /* Make the file descriptor use blocking writes with fcntl() */ + /* Make the file descriptor use blocking i/o with fcntl() */ { long ctlflags; ctlflags = fcntl(this->hidden->audio_fd, F_GETFL); ctlflags &= ~O_NONBLOCK; if (fcntl(this->hidden->audio_fd, F_SETFL, ctlflags) < 0) { - DSP_CloseDevice(this); return SDL_SetError("Couldn't set audio blocking mode"); } } @@ -130,7 +121,6 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Get a list of supported hardware formats */ if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0) { perror("SNDCTL_DSP_GETFMTS"); - DSP_CloseDevice(this); return SDL_SetError("Couldn't get audio format list"); } @@ -187,7 +177,6 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } } if (format == 0) { - DSP_CloseDevice(this); return SDL_SetError("Couldn't find any hardware audio formats"); } this->spec.format = test_format; @@ -197,7 +186,6 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if ((ioctl(this->hidden->audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || (value != format)) { perror("SNDCTL_DSP_SETFMT"); - DSP_CloseDevice(this); return SDL_SetError("Couldn't set audio format"); } @@ -205,7 +193,6 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) value = this->spec.channels; if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_CHANNELS, &value) < 0) { perror("SNDCTL_DSP_CHANNELS"); - DSP_CloseDevice(this); return SDL_SetError("Cannot set the number of channels"); } this->spec.channels = value; @@ -214,7 +201,6 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) value = this->spec.freq; if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_SPEED, &value) < 0) { perror("SNDCTL_DSP_SPEED"); - DSP_CloseDevice(this); return SDL_SetError("Couldn't set audio frequency"); } this->spec.freq = value; @@ -225,7 +211,6 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Determine the power of two of the fragment size */ for (frag_spec = 0; (0x01U << frag_spec) < this->spec.size; ++frag_spec); if ((0x01U << frag_spec) != this->spec.size) { - DSP_CloseDevice(this); return SDL_SetError("Fragment size must be a power of two"); } frag_spec |= 0x00020000; /* two fragments, for low latency */ @@ -250,13 +235,14 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) #endif /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - DSP_CloseDevice(this); - return SDL_OutOfMemory(); + if (!iscapture) { + this->hidden->mixlen = this->spec.size; + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); + if (this->hidden->mixbuf == NULL) { + return SDL_OutOfMemory(); + } + SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); /* We're ready to rock and roll. :-) */ return 0; @@ -266,14 +252,13 @@ DSP_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) static void DSP_PlayDevice(_THIS) { - const Uint8 *mixbuf = this->hidden->mixbuf; - const int mixlen = this->hidden->mixlen; - if (write(this->hidden->audio_fd, mixbuf, mixlen) == -1) { + struct SDL_PrivateAudioData *h = this->hidden; + if (write(h->audio_fd, h->mixbuf, h->mixlen) == -1) { perror("Audio write"); SDL_OpenedAudioDeviceDisconnected(this); } #ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", mixlen); + fprintf(stderr, "Wrote %d bytes of audio data\n", h->mixlen); #endif } @@ -283,6 +268,30 @@ DSP_GetDeviceBuf(_THIS) return (this->hidden->mixbuf); } +static int +DSP_CaptureFromDevice(_THIS, void *buffer, int buflen) +{ + return (int) read(this->hidden->audio_fd, buffer, buflen); +} + +static void +DSP_FlushCapture(_THIS) +{ + struct SDL_PrivateAudioData *h = this->hidden; + audio_buf_info info; + if (ioctl(h->audio_fd, SNDCTL_DSP_GETISPACE, &info) == 0) { + while (info.bytes > 0) { + char buf[512]; + const size_t len = SDL_min(sizeof (buf), info.bytes); + const ssize_t br = read(h->audio_fd, buf, len); + if (br <= 0) { + break; + } + info.bytes -= br; + } + } +} + static int DSP_Init(SDL_AudioDriverImpl * impl) { @@ -292,8 +301,11 @@ DSP_Init(SDL_AudioDriverImpl * impl) impl->PlayDevice = DSP_PlayDevice; impl->GetDeviceBuf = DSP_GetDeviceBuf; impl->CloseDevice = DSP_CloseDevice; + impl->CaptureFromDevice = DSP_CaptureFromDevice; + impl->FlushCapture = DSP_FlushCapture; impl->AllowsArbitraryDeviceNames = 1; + impl->HasCaptureSupport = SDL_TRUE; return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/dummy/SDL_dummyaudio.c b/Engine/lib/sdl/src/audio/dummy/SDL_dummyaudio.c index 107f0b073..b39f8e327 100644 --- a/Engine/lib/sdl/src/audio/dummy/SDL_dummyaudio.c +++ b/Engine/lib/sdl/src/audio/dummy/SDL_dummyaudio.c @@ -22,27 +22,44 @@ /* Output audio to nowhere... */ +#include "SDL_timer.h" #include "SDL_audio.h" #include "../SDL_audio_c.h" #include "SDL_dummyaudio.h" static int -DUMMYAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +DUMMYAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { return 0; /* always succeeds. */ } static int -DUMMYAUD_Init(SDL_AudioDriverImpl * impl) +DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) +{ + /* Delay to make this sort of simulate real audio input. */ + SDL_Delay((this->spec.samples * 1000) / this->spec.freq); + + /* always return a full buffer of silence. */ + SDL_memset(buffer, this->spec.silence, buflen); + return buflen; +} + +static int +DUMMYAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = DUMMYAUD_OpenDevice; + impl->OpenDevice = DUMMYAUDIO_OpenDevice; + impl->CaptureFromDevice = DUMMYAUDIO_CaptureFromDevice; + impl->OnlyHasDefaultOutputDevice = 1; + impl->OnlyHasDefaultCaptureDevice = 1; + impl->HasCaptureSupport = SDL_TRUE; + return 1; /* this audio target is available. */ } -AudioBootStrap DUMMYAUD_bootstrap = { - "dummy", "SDL dummy audio driver", DUMMYAUD_Init, 1 +AudioBootStrap DUMMYAUDIO_bootstrap = { + "dummy", "SDL dummy audio driver", DUMMYAUDIO_Init, 1 }; /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/audio/emscripten/SDL_emscriptenaudio.c b/Engine/lib/sdl/src/audio/emscripten/SDL_emscriptenaudio.c index 8378233ca..839d445ee 100644 --- a/Engine/lib/sdl/src/audio/emscripten/SDL_emscriptenaudio.c +++ b/Engine/lib/sdl/src/audio/emscripten/SDL_emscriptenaudio.c @@ -61,16 +61,15 @@ HandleAudioProcess(_THIS) Uint8 *buf = NULL; int byte_len = 0; int bytes = SDL_AUDIO_BITSIZE(this->spec.format) / 8; - int bytes_in = SDL_AUDIO_BITSIZE(this->convert.src_format) / 8; - /* Only do soemthing if audio is enabled */ - if (!this->enabled) - return; - - if (this->paused) + /* Only do something if audio is enabled */ + if (!SDL_AtomicGet(&this->enabled) || SDL_AtomicGet(&this->paused)) { return; + } if (this->convert.needed) { + const int bytes_in = SDL_AUDIO_BITSIZE(this->convert.src_format) / 8; + if (this->hidden->conv_in_len != 0) { this->convert.len = this->hidden->conv_in_len * bytes_in * this->spec.channels; } @@ -128,7 +127,7 @@ HandleAudioProcess(_THIS) } for (var j = 0; j < $1; ++j) { - channelData[j] = getValue($0 + (j*numChannels + c)*4, 'float'); + channelData[j] = HEAPF32[$0 + ((j*numChannels + c) << 2) >> 2]; } } }, buf, byte_len / bytes / this->spec.channels); @@ -136,29 +135,147 @@ HandleAudioProcess(_THIS) } static void -Emscripten_CloseDevice(_THIS) +HandleCaptureProcess(_THIS) { - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - /* Clean up the audio buffer */ - SDL_free(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } + Uint8 *buf; + int buflen; - SDL_free(this->hidden); - this->hidden = NULL; + /* Only do something if audio is enabled */ + if (!SDL_AtomicGet(&this->enabled) || SDL_AtomicGet(&this->paused)) { + return; } + + if (this->convert.needed) { + buf = this->convert.buf; + buflen = this->convert.len_cvt; + } else { + if (!this->hidden->mixbuf) { + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size); + if (!this->hidden->mixbuf) { + return; /* oh well. */ + } + } + buf = this->hidden->mixbuf; + buflen = this->spec.size; + } + + EM_ASM_ARGS({ + var numChannels = SDL2.capture.currentCaptureBuffer.numberOfChannels; + if (numChannels == 1) { /* fastpath this a little for the common (mono) case. */ + var channelData = SDL2.capture.currentCaptureBuffer.getChannelData(0); + if (channelData.length != $1) { + throw 'Web Audio capture buffer length mismatch! Destination size: ' + channelData.length + ' samples vs expected ' + $1 + ' samples!'; + } + for (var j = 0; j < $1; ++j) { + setValue($0 + (j * 4), channelData[j], 'float'); + } + } else { + for (var c = 0; c < numChannels; ++c) { + var channelData = SDL2.capture.currentCaptureBuffer.getChannelData(c); + if (channelData.length != $1) { + throw 'Web Audio capture buffer length mismatch! Destination size: ' + channelData.length + ' samples vs expected ' + $1 + ' samples!'; + } + + for (var j = 0; j < $1; ++j) { + setValue($0 + (((j * numChannels) + c) * 4), channelData[j], 'float'); + } + } + } + }, buf, (this->spec.size / sizeof (float)) / this->spec.channels); + + /* okay, we've got an interleaved float32 array in C now. */ + + if (this->convert.needed) { + SDL_ConvertAudio(&this->convert); + } + + /* Send it to the app. */ + (*this->spec.callback) (this->spec.userdata, buf, buflen); +} + + + +static void +EMSCRIPTENAUDIO_CloseDevice(_THIS) +{ + EM_ASM_({ + if ($0) { + if (SDL2.capture.silenceTimer !== undefined) { + clearTimeout(SDL2.capture.silenceTimer); + } + if (SDL2.capture.stream !== undefined) { + var tracks = SDL2.capture.stream.getAudioTracks(); + for (var i = 0; i < tracks.length; i++) { + SDL2.capture.stream.removeTrack(tracks[i]); + } + SDL2.capture.stream = undefined; + } + if (SDL2.capture.scriptProcessorNode !== undefined) { + SDL2.capture.scriptProcessorNode.onaudioprocess = function(audioProcessingEvent) {}; + SDL2.capture.scriptProcessorNode.disconnect(); + SDL2.capture.scriptProcessorNode = undefined; + } + if (SDL2.capture.mediaStreamNode !== undefined) { + SDL2.capture.mediaStreamNode.disconnect(); + SDL2.capture.mediaStreamNode = undefined; + } + if (SDL2.capture.silenceBuffer !== undefined) { + SDL2.capture.silenceBuffer = undefined + } + SDL2.capture = undefined; + } else { + if (SDL2.audio.scriptProcessorNode != undefined) { + SDL2.audio.scriptProcessorNode.disconnect(); + SDL2.audio.scriptProcessorNode = undefined; + } + SDL2.audio = undefined; + } + if ((SDL2.audioContext !== undefined) && (SDL2.audio === undefined) && (SDL2.capture === undefined)) { + SDL2.audioContext.close(); + SDL2.audioContext = undefined; + } + }, this->iscapture); + + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int -Emscripten_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +EMSCRIPTENAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { SDL_bool valid_format = SDL_FALSE; - SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format); + SDL_AudioFormat test_format; int i; float f; int result; + /* based on parts of library_sdl.js */ + + /* create context (TODO: this puts stuff in the global namespace...)*/ + result = EM_ASM_INT({ + if(typeof(SDL2) === 'undefined') { + SDL2 = {}; + } + if (!$0) { + SDL2.audio = {}; + } else { + SDL2.capture = {}; + } + + if (!SDL2.audioContext) { + if (typeof(AudioContext) !== 'undefined') { + SDL2.audioContext = new AudioContext(); + } else if (typeof(webkitAudioContext) !== 'undefined') { + SDL2.audioContext = new webkitAudioContext(); + } + } + return SDL2.audioContext === undefined ? -1 : 0; + }, iscapture); + if (result < 0) { + return SDL_SetError("Web Audio API is not available!"); + } + + test_format = SDL_FirstAudioFormat(this->spec.format); while ((!valid_format) && (test_format)) { switch (test_format) { case AUDIO_F32: /* web audio only supports floats */ @@ -181,36 +298,11 @@ Emscripten_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* based on parts of library_sdl.js */ - - /* create context (TODO: this puts stuff in the global namespace...)*/ - result = EM_ASM_INT_V({ - if(typeof(SDL2) === 'undefined') - SDL2 = {}; - - if(typeof(SDL2.audio) === 'undefined') - SDL2.audio = {}; - - if (!SDL2.audioContext) { - if (typeof(AudioContext) !== 'undefined') { - SDL2.audioContext = new AudioContext(); - } else if (typeof(webkitAudioContext) !== 'undefined') { - SDL2.audioContext = new webkitAudioContext(); - } else { - return -1; - } - } - return 0; - }); - if (result < 0) { - return SDL_SetError("Web Audio API is not available!"); - } + SDL_zerop(this->hidden); /* limit to native freq */ - int sampleRate = EM_ASM_INT_V({ - return SDL2.audioContext['sampleRate']; + const int sampleRate = EM_ASM_INT_V({ + return SDL2.audioContext.sampleRate; }); if(this->spec.freq != sampleRate) { @@ -227,26 +319,86 @@ Emscripten_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) SDL_CalculateAudioSpec(&this->spec); - /* setup a ScriptProcessorNode */ - EM_ASM_ARGS({ - SDL2.audio.scriptProcessorNode = SDL2.audioContext['createScriptProcessor']($1, 0, $0); - SDL2.audio.scriptProcessorNode['onaudioprocess'] = function (e) { - SDL2.audio.currentOutputBuffer = e['outputBuffer']; - Runtime.dynCall('vi', $2, [$3]); - }; - SDL2.audio.scriptProcessorNode['connect'](SDL2.audioContext['destination']); - }, this->spec.channels, this->spec.samples, HandleAudioProcess, this); + if (iscapture) { + /* The idea is to take the capture media stream, hook it up to an + audio graph where we can pass it through a ScriptProcessorNode + to access the raw PCM samples and push them to the SDL app's + callback. From there, we "process" the audio data into silence + and forget about it. */ + + /* This should, strictly speaking, use MediaRecorder for capture, but + this API is cleaner to use and better supported, and fires a + callback whenever there's enough data to fire down into the app. + The downside is that we are spending CPU time silencing a buffer + that the audiocontext uselessly mixes into any output. On the + upside, both of those things are not only run in native code in + the browser, they're probably SIMD code, too. MediaRecorder + feels like it's a pretty inefficient tapdance in similar ways, + to be honest. */ + + EM_ASM_({ + var have_microphone = function(stream) { + //console.log('SDL audio capture: we have a microphone! Replacing silence callback.'); + if (SDL2.capture.silenceTimer !== undefined) { + clearTimeout(SDL2.capture.silenceTimer); + SDL2.capture.silenceTimer = undefined; + } + SDL2.capture.mediaStreamNode = SDL2.audioContext.createMediaStreamSource(stream); + SDL2.capture.scriptProcessorNode = SDL2.audioContext.createScriptProcessor($1, $0, 1); + SDL2.capture.scriptProcessorNode.onaudioprocess = function(audioProcessingEvent) { + if ((SDL2 === undefined) || (SDL2.capture === undefined)) { return; } + audioProcessingEvent.outputBuffer.getChannelData(0).fill(0.0); + SDL2.capture.currentCaptureBuffer = audioProcessingEvent.inputBuffer; + Runtime.dynCall('vi', $2, [$3]); + }; + SDL2.capture.mediaStreamNode.connect(SDL2.capture.scriptProcessorNode); + SDL2.capture.scriptProcessorNode.connect(SDL2.audioContext.destination); + SDL2.capture.stream = stream; + }; + + var no_microphone = function(error) { + //console.log('SDL audio capture: we DO NOT have a microphone! (' + error.name + ')...leaving silence callback running.'); + }; + + /* we write silence to the audio callback until the microphone is available (user approves use, etc). */ + SDL2.capture.silenceBuffer = SDL2.audioContext.createBuffer($0, $1, SDL2.audioContext.sampleRate); + SDL2.capture.silenceBuffer.getChannelData(0).fill(0.0); + var silence_callback = function() { + SDL2.capture.currentCaptureBuffer = SDL2.capture.silenceBuffer; + Runtime.dynCall('vi', $2, [$3]); + }; + + SDL2.capture.silenceTimer = setTimeout(silence_callback, ($1 / SDL2.audioContext.sampleRate) * 1000); + + if ((navigator.mediaDevices !== undefined) && (navigator.mediaDevices.getUserMedia !== undefined)) { + navigator.mediaDevices.getUserMedia({ audio: true, video: false }).then(have_microphone).catch(no_microphone); + } else if (navigator.webkitGetUserMedia !== undefined) { + navigator.webkitGetUserMedia({ audio: true, video: false }, have_microphone, no_microphone); + } + }, this->spec.channels, this->spec.samples, HandleCaptureProcess, this); + } else { + /* setup a ScriptProcessorNode */ + EM_ASM_ARGS({ + SDL2.audio.scriptProcessorNode = SDL2.audioContext['createScriptProcessor']($1, 0, $0); + SDL2.audio.scriptProcessorNode['onaudioprocess'] = function (e) { + if ((SDL2 === undefined) || (SDL2.audio === undefined)) { return; } + SDL2.audio.currentOutputBuffer = e['outputBuffer']; + Runtime.dynCall('vi', $2, [$3]); + }; + SDL2.audio.scriptProcessorNode['connect'](SDL2.audioContext['destination']); + }, this->spec.channels, this->spec.samples, HandleAudioProcess, this); + } + return 0; } static int -Emscripten_Init(SDL_AudioDriverImpl * impl) +EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = Emscripten_OpenDevice; - impl->CloseDevice = Emscripten_CloseDevice; + impl->OpenDevice = EMSCRIPTENAUDIO_OpenDevice; + impl->CloseDevice = EMSCRIPTENAUDIO_CloseDevice; - /* only one output */ impl->OnlyHasDefaultOutputDevice = 1; /* no threads here */ @@ -254,7 +406,7 @@ Emscripten_Init(SDL_AudioDriverImpl * impl) impl->ProvidesOwnCallbackThread = 1; /* check availability */ - int available = EM_ASM_INT_V({ + const int available = EM_ASM_INT_V({ if (typeof(AudioContext) !== 'undefined') { return 1; } else if (typeof(webkitAudioContext) !== 'undefined') { @@ -267,11 +419,23 @@ Emscripten_Init(SDL_AudioDriverImpl * impl) SDL_SetError("No audio context available"); } + const int capture_available = available && EM_ASM_INT_V({ + if ((typeof(navigator.mediaDevices) !== 'undefined') && (typeof(navigator.mediaDevices.getUserMedia) !== 'undefined')) { + return 1; + } else if (typeof(navigator.webkitGetUserMedia) !== 'undefined') { + return 1; + } + return 0; + }); + + impl->HasCaptureSupport = capture_available ? SDL_TRUE : SDL_FALSE; + impl->OnlyHasDefaultCaptureDevice = capture_available ? SDL_TRUE : SDL_FALSE; + return available; } -AudioBootStrap EmscriptenAudio_bootstrap = { - "emscripten", "SDL emscripten audio driver", Emscripten_Init, 0 +AudioBootStrap EMSCRIPTENAUDIO_bootstrap = { + "emscripten", "SDL emscripten audio driver", EMSCRIPTENAUDIO_Init, 0 }; #endif /* SDL_AUDIO_DRIVER_EMSCRIPTEN */ diff --git a/Engine/lib/sdl/src/audio/esd/SDL_esdaudio.c b/Engine/lib/sdl/src/audio/esd/SDL_esdaudio.c index 6a7882dcb..3eb719791 100644 --- a/Engine/lib/sdl/src/audio/esd/SDL_esdaudio.c +++ b/Engine/lib/sdl/src/audio/esd/SDL_esdaudio.c @@ -32,7 +32,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_esdaudio.h" @@ -174,17 +173,11 @@ ESD_GetDeviceBuf(_THIS) static void ESD_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->audio_fd >= 0) { - SDL_NAME(esd_close) (this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->audio_fd >= 0) { + SDL_NAME(esd_close) (this->hidden->audio_fd); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } /* Try to get the name of the program */ @@ -227,7 +220,7 @@ ESD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); this->hidden->audio_fd = -1; /* Convert audio spec to the ESD audio format */ @@ -252,7 +245,6 @@ ESD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (!found) { - ESD_CloseDevice(this); return SDL_SetError("Couldn't find any hardware audio formats"); } @@ -271,7 +263,6 @@ ESD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) get_progname()); if (this->hidden->audio_fd < 0) { - ESD_CloseDevice(this); return SDL_SetError("Couldn't open ESD connection"); } @@ -283,9 +274,8 @@ ESD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Allocate mixing buffer */ this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); if (this->hidden->mixbuf == NULL) { - ESD_CloseDevice(this); return SDL_OutOfMemory(); } SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); diff --git a/Engine/lib/sdl/src/audio/fusionsound/SDL_fsaudio.c b/Engine/lib/sdl/src/audio/fusionsound/SDL_fsaudio.c index b22a3e9a3..daa0f9dd6 100644 --- a/Engine/lib/sdl/src/audio/fusionsound/SDL_fsaudio.c +++ b/Engine/lib/sdl/src/audio/fusionsound/SDL_fsaudio.c @@ -22,6 +22,8 @@ #if SDL_AUDIO_DRIVER_FUSIONSOUND +/* !!! FIXME: why is this is SDL_FS_* instead of FUSIONSOUND_*? */ + /* Allow access to a raw mixing buffer */ #ifdef HAVE_SIGNAL_H @@ -31,7 +33,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_fsaudio.h" @@ -150,13 +151,6 @@ SDL_FS_PlayDevice(_THIS) #endif } -static void -SDL_FS_WaitDone(_THIS) -{ - this->hidden->stream->Wait(this->hidden->stream, - this->hidden->mixsamples * FUSION_BUFFERS); -} - static Uint8 * SDL_FS_GetDeviceBuf(_THIS) @@ -168,20 +162,14 @@ SDL_FS_GetDeviceBuf(_THIS) static void SDL_FS_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->stream) { - this->hidden->stream->Release(this->hidden->stream); - this->hidden->stream = NULL; - } - if (this->hidden->fs) { - this->hidden->fs->Release(this->hidden->fs); - this->hidden->fs = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->stream) { + this->hidden->stream->Release(this->hidden->stream); } + if (this->hidden->fs) { + this->hidden->fs->Release(this->hidden->fs); + } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } @@ -200,7 +188,7 @@ SDL_FS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Try for a closest match on audio format */ for (test_format = SDL_FirstAudioFormat(this->spec.format); @@ -239,7 +227,6 @@ SDL_FS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (format == 0) { - SDL_FS_CloseDevice(this); return SDL_SetError("Couldn't find any hardware audio formats"); } this->spec.format = test_format; @@ -247,7 +234,6 @@ SDL_FS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Retrieve the main sound interface. */ ret = SDL_NAME(FusionSoundCreate) (&this->hidden->fs); if (ret) { - SDL_FS_CloseDevice(this); return SDL_SetError("Unable to initialize FusionSound: %d", ret); } @@ -266,7 +252,6 @@ SDL_FS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) this->hidden->fs->CreateStream(this->hidden->fs, &desc, &this->hidden->stream); if (ret) { - SDL_FS_CloseDevice(this); return SDL_SetError("Unable to create FusionSoundStream: %d", ret); } @@ -285,9 +270,8 @@ SDL_FS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Allocate mixing buffer */ this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); if (this->hidden->mixbuf == NULL) { - SDL_FS_CloseDevice(this); return SDL_OutOfMemory(); } SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); @@ -328,7 +312,6 @@ SDL_FS_Init(SDL_AudioDriverImpl * impl) impl->WaitDevice = SDL_FS_WaitDevice; impl->GetDeviceBuf = SDL_FS_GetDeviceBuf; impl->CloseDevice = SDL_FS_CloseDevice; - impl->WaitDone = SDL_FS_WaitDone; impl->Deinitialize = SDL_FS_Deinitialize; impl->OnlyHasDefaultOutputDevice = 1; diff --git a/Engine/lib/sdl/src/audio/haiku/SDL_haikuaudio.cc b/Engine/lib/sdl/src/audio/haiku/SDL_haikuaudio.cc index 38f3b9621..25b1fa217 100644 --- a/Engine/lib/sdl/src/audio/haiku/SDL_haikuaudio.cc +++ b/Engine/lib/sdl/src/audio/haiku/SDL_haikuaudio.cc @@ -49,10 +49,11 @@ FillSound(void *device, void *stream, size_t len, SDL_AudioDevice *audio = (SDL_AudioDevice *) device; /* Only do soemthing if audio is enabled */ - if (!audio->enabled) + if (!SDL_AtomicGet(&audio->enabled)) { return; + } - if (!audio->paused) { + if (!SDL_AtomicGet(&audio->paused)) { if (audio->convert.needed) { SDL_LockMutex(audio->mixer_lock); (*audio->spec.callback) (audio->spec.userdata, @@ -73,16 +74,11 @@ FillSound(void *device, void *stream, size_t len, static void HAIKUAUDIO_CloseDevice(_THIS) { - if (_this->hidden != NULL) { - if (_this->hidden->audio_obj) { - _this->hidden->audio_obj->Stop(); - delete _this->hidden->audio_obj; - _this->hidden->audio_obj = NULL; - } - - delete _this->hidden; - _this->hidden = NULL; + if (_this->hidden->audio_obj) { + _this->hidden->audio_obj->Stop(); + delete _this->hidden->audio_obj; } + delete _this->hidden; } @@ -122,10 +118,10 @@ HAIKUAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (_this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(_this->hidden, 0, (sizeof *_this->hidden)); + SDL_zerop(_this->hidden); /* Parse the audio format and fill the Be raw audio format */ - SDL_memset(&format, '\0', sizeof(media_raw_audio_format)); + SDL_zero(format); format.byte_order = B_MEDIA_LITTLE_ENDIAN; format.frame_rate = (float) _this->spec.freq; format.channel_count = _this->spec.channels; /* !!! FIXME: support > 2? */ @@ -176,7 +172,6 @@ HAIKUAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (!valid_datatype) { /* shouldn't happen, but just in case... */ - HAIKUAUDIO_CloseDevice(_this); return SDL_SetError("Unsupported audio format"); } @@ -195,7 +190,6 @@ HAIKUAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (_this->hidden->audio_obj->Start() == B_NO_ERROR) { _this->hidden->audio_obj->SetHasData(true); } else { - HAIKUAUDIO_CloseDevice(_this); return SDL_SetError("Unable to start Be audio"); } diff --git a/Engine/lib/sdl/src/audio/nacl/SDL_naclaudio.c b/Engine/lib/sdl/src/audio/nacl/SDL_naclaudio.c index 2d1ee73e9..33cbe1c83 100644 --- a/Engine/lib/sdl/src/audio/nacl/SDL_naclaudio.c +++ b/Engine/lib/sdl/src/audio/nacl/SDL_naclaudio.c @@ -27,7 +27,6 @@ #include "SDL_audio.h" #include "SDL_mutex.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" @@ -38,22 +37,20 @@ #include "ppapi_simple/ps_event.h" /* The tag name used by NACL audio */ -#define NACLAUD_DRIVER_NAME "nacl" +#define NACLAUDIO_DRIVER_NAME "nacl" #define SAMPLE_FRAME_COUNT 4096 /* Audio driver functions */ -static int NACLAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture); -static void NACLAUD_CloseDevice(_THIS); static void nacl_audio_callback(void* samples, uint32_t buffer_size, PP_TimeDelta latency, void* data); /* FIXME: Make use of latency if needed */ static void nacl_audio_callback(void* samples, uint32_t buffer_size, PP_TimeDelta latency, void* data) { SDL_AudioDevice* _this = (SDL_AudioDevice*) data; - SDL_LockMutex(private->mutex); + SDL_LockMutex(private->mutex); /* !!! FIXME: is this mutex necessary? */ - if (_this->enabled && !_this->paused) { + if (SDL_AtomicGet(&_this->enabled) && !SDL_AtomicGet(&_this->paused)) { if (_this->convert.needed) { SDL_LockMutex(_this->mixer_lock); (*_this->spec.callback) (_this->spec.userdata, @@ -68,13 +65,13 @@ static void nacl_audio_callback(void* samples, uint32_t buffer_size, PP_TimeDelt SDL_UnlockMutex(_this->mixer_lock); } } else { - SDL_memset(samples, 0, buffer_size); + SDL_memset(samples, _this->spec.silence, buffer_size); } - return; + SDL_UnlockMutex(private->mutex); } -static void NACLAUD_CloseDevice(SDL_AudioDevice *device) { +static void NACLAUDIO_CloseDevice(SDL_AudioDevice *device) { const PPB_Core *core = PSInterfaceCore(); const PPB_Audio *ppb_audio = PSInterfaceAudio(); SDL_PrivateAudioData *hidden = (SDL_PrivateAudioData *) device->hidden; @@ -85,7 +82,7 @@ static void NACLAUD_CloseDevice(SDL_AudioDevice *device) { } static int -NACLAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { +NACLAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { PP_Instance instance = PSGetInstanceId(); const PPB_Audio *ppb_audio = PSInterfaceAudio(); const PPB_AudioConfig *ppb_audiocfg = PSInterfaceAudioConfig(); @@ -121,30 +118,30 @@ NACLAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { } static int -NACLAUD_Init(SDL_AudioDriverImpl * impl) +NACLAUDIO_Init(SDL_AudioDriverImpl * impl) { if (PSGetInstanceId() == 0) { return 0; } /* Set the function pointers */ - impl->OpenDevice = NACLAUD_OpenDevice; - impl->CloseDevice = NACLAUD_CloseDevice; + impl->OpenDevice = NACLAUDIO_OpenDevice; + impl->CloseDevice = NACLAUDIO_CloseDevice; impl->OnlyHasDefaultOutputDevice = 1; impl->ProvidesOwnCallbackThread = 1; /* - * impl->WaitDevice = NACLAUD_WaitDevice; - * impl->GetDeviceBuf = NACLAUD_GetDeviceBuf; - * impl->PlayDevice = NACLAUD_PlayDevice; - * impl->Deinitialize = NACLAUD_Deinitialize; + * impl->WaitDevice = NACLAUDIO_WaitDevice; + * impl->GetDeviceBuf = NACLAUDIO_GetDeviceBuf; + * impl->PlayDevice = NACLAUDIO_PlayDevice; + * impl->Deinitialize = NACLAUDIO_Deinitialize; */ return 1; } -AudioBootStrap NACLAUD_bootstrap = { - NACLAUD_DRIVER_NAME, "SDL NaCl Audio Driver", - NACLAUD_Init, 0 +AudioBootStrap NACLAUDIO_bootstrap = { + NACLAUDIO_DRIVER_NAME, "SDL NaCl Audio Driver", + NACLAUDIO_Init, 0 }; #endif /* SDL_AUDIO_DRIVER_NACL */ diff --git a/Engine/lib/sdl/src/audio/nas/SDL_nasaudio.c b/Engine/lib/sdl/src/audio/nas/SDL_nasaudio.c index 9de5ff8b4..fe15cd696 100644 --- a/Engine/lib/sdl/src/audio/nas/SDL_nasaudio.c +++ b/Engine/lib/sdl/src/audio/nas/SDL_nasaudio.c @@ -30,22 +30,21 @@ #include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_loadso.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_nasaudio.h" -static struct SDL_PrivateAudioData *this2 = NULL; - - static void (*NAS_AuCloseServer) (AuServer *); static void (*NAS_AuNextEvent) (AuServer *, AuBool, AuEvent *); static AuBool(*NAS_AuDispatchEvent) (AuServer *, AuEvent *); +static void (*NAS_AuHandleEvents) (AuServer *); static AuFlowID(*NAS_AuCreateFlow) (AuServer *, AuStatus *); static void (*NAS_AuStartFlow) (AuServer *, AuFlowID, AuStatus *); static void (*NAS_AuSetElements) (AuServer *, AuFlowID, AuBool, int, AuElement *, AuStatus *); static void (*NAS_AuWriteElement) (AuServer *, AuFlowID, int, AuUint32, AuPointer, AuBool, AuStatus *); +static AuUint32 (*NAS_AuReadElement) + (AuServer *, AuFlowID, int, AuUint32, AuPointer, AuStatus *); static AuServer *(*NAS_AuOpenServer) (_AuConst char *, int, _AuConst char *, int, _AuConst char *, char **); static AuEventHandlerRec *(*NAS_AuRegisterEventHandler) @@ -80,10 +79,12 @@ load_nas_syms(void) SDL_NAS_SYM(AuCloseServer); SDL_NAS_SYM(AuNextEvent); SDL_NAS_SYM(AuDispatchEvent); + SDL_NAS_SYM(AuHandleEvents); SDL_NAS_SYM(AuCreateFlow); SDL_NAS_SYM(AuStartFlow); SDL_NAS_SYM(AuSetElements); SDL_NAS_SYM(AuWriteElement); + SDL_NAS_SYM(AuReadElement); SDL_NAS_SYM(AuOpenServer); SDL_NAS_SYM(AuRegisterEventHandler); return 0; @@ -187,19 +188,53 @@ NAS_GetDeviceBuf(_THIS) return (this->hidden->mixbuf); } +static int +NAS_CaptureFromDevice(_THIS, void *buffer, int buflen) +{ + struct SDL_PrivateAudioData *h = this->hidden; + int retval; + + while (SDL_TRUE) { + /* just keep the event queue moving and the server chattering. */ + NAS_AuHandleEvents(h->aud); + + retval = (int) NAS_AuReadElement(h->aud, h->flow, 1, buflen, buffer, NULL); + /*printf("read %d capture bytes\n", (int) retval);*/ + if (retval == 0) { + SDL_Delay(10); /* don't burn the CPU if we're waiting for data. */ + } else { + break; + } + } + + return retval; +} + +static void +NAS_FlushCapture(_THIS) +{ + struct SDL_PrivateAudioData *h = this->hidden; + AuUint32 total = 0; + AuUint32 br; + Uint8 buf[512]; + + do { + /* just keep the event queue moving and the server chattering. */ + NAS_AuHandleEvents(h->aud); + br = NAS_AuReadElement(h->aud, h->flow, 1, sizeof (buf), buf, NULL); + /*printf("flushed %d capture bytes\n", (int) br);*/ + total += br; + } while ((br == sizeof (buf)) && (total < this->spec.size)); +} + static void NAS_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->aud) { - NAS_AuCloseServer(this->hidden->aud); - this->hidden->aud = 0; - } - SDL_free(this->hidden); - this2 = this->hidden = NULL; + if (this->hidden->aud) { + NAS_AuCloseServer(this->hidden->aud); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static unsigned char @@ -225,6 +260,12 @@ sdlformat_to_auformat(unsigned int fmt) static AuBool event_handler(AuServer * aud, AuEvent * ev, AuEventHandlerRec * hnd) { + SDL_AudioDevice *this = (SDL_AudioDevice *) hnd->data; + struct SDL_PrivateAudioData *h = this->hidden; + if (this->iscapture) { + return AuTrue; /* we don't (currently) care about any of this for capture devices */ + } + switch (ev->type) { case AuEventTypeElementNotify: { @@ -232,24 +273,24 @@ event_handler(AuServer * aud, AuEvent * ev, AuEventHandlerRec * hnd) switch (event->kind) { case AuElementNotifyKindLowWater: - if (this2->buf_free >= 0) { - this2->really += event->num_bytes; - gettimeofday(&this2->last_tv, 0); - this2->buf_free += event->num_bytes; + if (h->buf_free >= 0) { + h->really += event->num_bytes; + gettimeofday(&h->last_tv, 0); + h->buf_free += event->num_bytes; } else { - this2->buf_free = event->num_bytes; + h->buf_free = event->num_bytes; } break; case AuElementNotifyKindState: switch (event->cur_state) { case AuStatePause: if (event->reason != AuReasonUser) { - if (this2->buf_free >= 0) { - this2->really += event->num_bytes; - gettimeofday(&this2->last_tv, 0); - this2->buf_free += event->num_bytes; + if (h->buf_free >= 0) { + h->really += event->num_bytes; + gettimeofday(&h->last_tv, 0); + h->buf_free += event->num_bytes; } else { - this2->buf_free = event->num_bytes; + h->buf_free = event->num_bytes; } } break; @@ -261,15 +302,29 @@ event_handler(AuServer * aud, AuEvent * ev, AuEventHandlerRec * hnd) } static AuDeviceID -find_device(_THIS, int nch) +find_device(_THIS) { /* These "Au" things are all macros, not functions... */ + struct SDL_PrivateAudioData *h = this->hidden; + const unsigned int devicekind = this->iscapture ? AuComponentKindPhysicalInput : AuComponentKindPhysicalOutput; + const int numdevs = AuServerNumDevices(h->aud); + const int nch = this->spec.channels; int i; - for (i = 0; i < AuServerNumDevices(this->hidden->aud); i++) { - if ((AuDeviceKind(AuServerDevice(this->hidden->aud, i)) == - AuComponentKindPhysicalOutput) && - AuDeviceNumTracks(AuServerDevice(this->hidden->aud, i)) == nch) { - return AuDeviceIdentifier(AuServerDevice(this->hidden->aud, i)); + + /* Try to find exact match on channels first... */ + for (i = 0; i < numdevs; i++) { + const AuDeviceAttributes *dev = AuServerDevice(h->aud, i); + if ((AuDeviceKind(dev) == devicekind) && (AuDeviceNumTracks(dev) == nch)) { + return AuDeviceIdentifier(dev); + } + } + + /* Take anything, then... */ + for (i = 0; i < numdevs; i++) { + const AuDeviceAttributes *dev = AuServerDevice(h->aud, i); + if (AuDeviceKind(dev) == devicekind) { + this->spec.channels = AuDeviceNumTracks(dev); + return AuDeviceIdentifier(dev); } } return AuNone; @@ -288,7 +343,7 @@ NAS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Try for a closest match on audio format */ format = 0; @@ -300,21 +355,18 @@ NAS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } } if (format == 0) { - NAS_CloseDevice(this); return SDL_SetError("NAS: Couldn't find any hardware audio formats"); } this->spec.format = test_format; this->hidden->aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); if (this->hidden->aud == 0) { - NAS_CloseDevice(this); return SDL_SetError("NAS: Couldn't open connection to NAS server"); } - this->hidden->dev = find_device(this, this->spec.channels); + this->hidden->dev = find_device(this); if ((this->hidden->dev == AuNone) || (!(this->hidden->flow = NAS_AuCreateFlow(this->hidden->aud, 0)))) { - NAS_CloseDevice(this); return SDL_SetError("NAS: Couldn't find a fitting device on NAS server"); } @@ -328,29 +380,38 @@ NAS_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Calculate the final parameters for this audio specification */ SDL_CalculateAudioSpec(&this->spec); - this2 = this->hidden; + if (iscapture) { + AuMakeElementImportDevice(elms, this->spec.freq, this->hidden->dev, + AuUnlimitedSamples, 0, NULL); + AuMakeElementExportClient(elms + 1, 0, this->spec.freq, format, + this->spec.channels, AuTrue, buffer_size, + buffer_size, 0, NULL); + } else { + AuMakeElementImportClient(elms, this->spec.freq, format, + this->spec.channels, AuTrue, buffer_size, + buffer_size / 4, 0, NULL); + AuMakeElementExportDevice(elms + 1, 0, this->hidden->dev, this->spec.freq, + AuUnlimitedSamples, 0, NULL); + } + + NAS_AuSetElements(this->hidden->aud, this->hidden->flow, AuTrue, + 2, elms, NULL); - AuMakeElementImportClient(elms, this->spec.freq, format, - this->spec.channels, AuTrue, buffer_size, - buffer_size / 4, 0, NULL); - AuMakeElementExportDevice(elms + 1, 0, this->hidden->dev, this->spec.freq, - AuUnlimitedSamples, 0, NULL); - NAS_AuSetElements(this->hidden->aud, this->hidden->flow, AuTrue, 2, elms, - NULL); NAS_AuRegisterEventHandler(this->hidden->aud, AuEventHandlerIDMask, 0, this->hidden->flow, event_handler, - (AuPointer) NULL); + (AuPointer) this); NAS_AuStartFlow(this->hidden->aud, this->hidden->flow, NULL); /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - NAS_CloseDevice(this); - return SDL_OutOfMemory(); + if (!iscapture) { + this->hidden->mixlen = this->spec.size; + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); + if (this->hidden->mixbuf == NULL) { + return SDL_OutOfMemory(); + } + SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); /* We're ready to rock and roll. :-) */ return 0; @@ -381,9 +442,14 @@ NAS_Init(SDL_AudioDriverImpl * impl) impl->PlayDevice = NAS_PlayDevice; impl->WaitDevice = NAS_WaitDevice; impl->GetDeviceBuf = NAS_GetDeviceBuf; + impl->CaptureFromDevice = NAS_CaptureFromDevice; + impl->FlushCapture = NAS_FlushCapture; impl->CloseDevice = NAS_CloseDevice; impl->Deinitialize = NAS_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; /* !!! FIXME: is this true? */ + + impl->OnlyHasDefaultOutputDevice = 1; + impl->OnlyHasDefaultCaptureDevice = 1; + impl->HasCaptureSupport = SDL_TRUE; return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/paudio/SDL_paudio.c b/Engine/lib/sdl/src/audio/paudio/SDL_paudio.c index 14c9701f4..57202245f 100644 --- a/Engine/lib/sdl/src/audio/paudio/SDL_paudio.c +++ b/Engine/lib/sdl/src/audio/paudio/SDL_paudio.c @@ -35,7 +35,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" #include "SDL_stdinc.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_paudio.h" @@ -228,16 +227,11 @@ PAUDIO_GetDeviceBuf(_THIS) static void PAUDIO_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if (this->hidden->audio_fd >= 0) { - close(this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; + if (this->hidden->audio_fd >= 0) { + close(this->hidden->audio_fd); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int @@ -262,13 +256,12 @@ PAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Open the audio device */ fd = OpenAudioPath(audiodev, sizeof(audiodev), OPEN_FLAGS, 0); this->hidden->audio_fd = fd; if (fd < 0) { - PAUDIO_CloseDevice(this); return SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno)); } @@ -277,7 +270,6 @@ PAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) * that we can have. */ if (ioctl(fd, AUDIO_BUFFER, &paud_bufinfo) < 0) { - PAUDIO_CloseDevice(this); return SDL_SetError("Couldn't get audio buffer information"); } @@ -391,7 +383,6 @@ PAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) #ifdef DEBUG_AUDIO fprintf(stderr, "Couldn't find any hardware audio formats\n"); #endif - PAUDIO_CloseDevice(this); return SDL_SetError("Couldn't find any hardware audio formats"); } this->spec.format = test_format; @@ -449,15 +440,13 @@ PAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (err != NULL) { - PAUDIO_CloseDevice(this); return SDL_SetError("Paudio: %s", err); } /* Allocate mixing buffer */ this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); if (this->hidden->mixbuf == NULL) { - PAUDIO_CloseDevice(this); return SDL_OutOfMemory(); } SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); @@ -492,7 +481,6 @@ PAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) paud_control.ioctl_request = AUDIO_START; paud_control.position = 0; if (ioctl(fd, AUDIO_CONTROL, &paud_control) < 0) { - PAUDIO_CloseDevice(this); #ifdef DEBUG_AUDIO fprintf(stderr, "Can't start audio play\n"); #endif diff --git a/Engine/lib/sdl/src/audio/psp/SDL_pspaudio.c b/Engine/lib/sdl/src/audio/psp/SDL_pspaudio.c index 18d2947e4..bd3456d3f 100644 --- a/Engine/lib/sdl/src/audio/psp/SDL_pspaudio.c +++ b/Engine/lib/sdl/src/audio/psp/SDL_pspaudio.c @@ -30,7 +30,6 @@ #include "SDL_audio.h" #include "SDL_error.h" #include "SDL_timer.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" #include "../SDL_sysaudio.h" @@ -40,10 +39,10 @@ #include /* The tag name used by PSP audio */ -#define PSPAUD_DRIVER_NAME "psp" +#define PSPAUDIO_DRIVER_NAME "psp" static int -PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +PSPAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { int format, mixlen, i; this->hidden = (struct SDL_PrivateAudioData *) @@ -51,7 +50,7 @@ PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, sizeof(*this->hidden)); + SDL_zerop(this->hidden); switch (this->spec.format & 0xff) { case 8: case 16: @@ -66,20 +65,7 @@ PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) this->spec.freq = 44100; /* Update the fragment size as size in bytes. */ -/* SDL_CalculateAudioSpec(this->spec); MOD */ - switch (this->spec.format) { - case AUDIO_U8: - this->spec.silence = 0x80; - break; - default: - this->spec.silence = 0x00; - break; - } - this->spec.size = SDL_AUDIO_BITSIZE(this->spec.format) / 8; - this->spec.size *= this->spec.channels; - this->spec.size *= this->spec.samples; - -/* ========================================== */ + SDL_CalculateAudioSpec(&this->spec); /* Allocate the mixing buffer. Its size and starting address must be a multiple of 64 bytes. Our sample count is already a multiple of @@ -112,7 +98,7 @@ PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) return 0; } -static void PSPAUD_PlayDevice(_THIS) +static void PSPAUDIO_PlayDevice(_THIS) { Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer]; @@ -126,28 +112,25 @@ static void PSPAUD_PlayDevice(_THIS) } /* This function waits until it is possible to write a full sound buffer */ -static void PSPAUD_WaitDevice(_THIS) +static void PSPAUDIO_WaitDevice(_THIS) { /* Because we block when sending audio, there's no need for this function to do anything. */ } -static Uint8 *PSPAUD_GetDeviceBuf(_THIS) +static Uint8 *PSPAUDIO_GetDeviceBuf(_THIS) { return this->hidden->mixbufs[this->hidden->next_buffer]; } -static void PSPAUD_CloseDevice(_THIS) +static void PSPAUDIO_CloseDevice(_THIS) { if (this->hidden->channel >= 0) { sceAudioChRelease(this->hidden->channel); - this->hidden->channel = -1; - } - - if (this->hidden->rawbuf != NULL) { - free(this->hidden->rawbuf); - this->hidden->rawbuf = NULL; } + free(this->hidden->rawbuf); /* this uses memalign(), not SDL_malloc(). */ + SDL_free(this->hidden); } -static void PSPAUD_ThreadInit(_THIS) + +static void PSPAUDIO_ThreadInit(_THIS) { /* Increase the priority of this audio thread by 1 to put it ahead of other SDL threads. */ @@ -162,24 +145,22 @@ static void PSPAUD_ThreadInit(_THIS) static int -PSPAUD_Init(SDL_AudioDriverImpl * impl) +PSPAUDIO_Init(SDL_AudioDriverImpl * impl) { - /* Set the function pointers */ - impl->OpenDevice = PSPAUD_OpenDevice; - impl->PlayDevice = PSPAUD_PlayDevice; - impl->WaitDevice = PSPAUD_WaitDevice; - impl->GetDeviceBuf = PSPAUD_GetDeviceBuf; - impl->WaitDone = PSPAUD_WaitDevice; - impl->CloseDevice = PSPAUD_CloseDevice; - impl->ThreadInit = PSPAUD_ThreadInit; + impl->OpenDevice = PSPAUDIO_OpenDevice; + impl->PlayDevice = PSPAUDIO_PlayDevice; + impl->WaitDevice = PSPAUDIO_WaitDevice; + impl->GetDeviceBuf = PSPAUDIO_GetDeviceBuf; + impl->CloseDevice = PSPAUDIO_CloseDevice; + impl->ThreadInit = PSPAUDIO_ThreadInit; /* PSP audio device */ impl->OnlyHasDefaultOutputDevice = 1; /* impl->HasCaptureSupport = 1; - impl->OnlyHasDefaultInputDevice = 1; + impl->OnlyHasDefaultCaptureDevice = 1; */ /* impl->DetectDevices = DSOUND_DetectDevices; @@ -188,8 +169,8 @@ PSPAUD_Init(SDL_AudioDriverImpl * impl) return 1; /* this audio target is available. */ } -AudioBootStrap PSPAUD_bootstrap = { - "psp", "PSP audio driver", PSPAUD_Init, 0 +AudioBootStrap PSPAUDIO_bootstrap = { + "psp", "PSP audio driver", PSPAUDIO_Init, 0 }; /* SDL_AUDI */ diff --git a/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.c b/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.c index 6b11e066f..9ced49d21 100644 --- a/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.c +++ b/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.c @@ -42,10 +42,10 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_pulseaudio.h" #include "SDL_loadso.h" +#include "../../thread/SDL_systhread.h" #if (PA_API_VERSION < 12) /** Return non-zero if the passed state is one of the connected states */ @@ -99,12 +99,19 @@ static pa_stream * (*PULSEAUDIO_pa_stream_new) (pa_context *, const char *, const pa_sample_spec *, const pa_channel_map *); static int (*PULSEAUDIO_pa_stream_connect_playback) (pa_stream *, const char *, const pa_buffer_attr *, pa_stream_flags_t, pa_cvolume *, pa_stream *); +static int (*PULSEAUDIO_pa_stream_connect_record) (pa_stream *, const char *, + const pa_buffer_attr *, pa_stream_flags_t); static pa_stream_state_t (*PULSEAUDIO_pa_stream_get_state) (pa_stream *); static size_t (*PULSEAUDIO_pa_stream_writable_size) (pa_stream *); +static size_t (*PULSEAUDIO_pa_stream_readable_size) (pa_stream *); static int (*PULSEAUDIO_pa_stream_write) (pa_stream *, const void *, size_t, pa_free_cb_t, int64_t, pa_seek_mode_t); static pa_operation * (*PULSEAUDIO_pa_stream_drain) (pa_stream *, pa_stream_success_cb_t, void *); +static int (*PULSEAUDIO_pa_stream_peek) (pa_stream *, const void **, size_t *); +static int (*PULSEAUDIO_pa_stream_drop) (pa_stream *); +static pa_operation * (*PULSEAUDIO_pa_stream_flush) (pa_stream *, + pa_stream_success_cb_t, void *); static int (*PULSEAUDIO_pa_stream_disconnect) (pa_stream *); static void (*PULSEAUDIO_pa_stream_unref) (pa_stream *); @@ -205,11 +212,16 @@ load_pulseaudio_syms(void) SDL_PULSEAUDIO_SYM(pa_context_unref); SDL_PULSEAUDIO_SYM(pa_stream_new); SDL_PULSEAUDIO_SYM(pa_stream_connect_playback); + SDL_PULSEAUDIO_SYM(pa_stream_connect_record); SDL_PULSEAUDIO_SYM(pa_stream_get_state); SDL_PULSEAUDIO_SYM(pa_stream_writable_size); + SDL_PULSEAUDIO_SYM(pa_stream_readable_size); SDL_PULSEAUDIO_SYM(pa_stream_write); SDL_PULSEAUDIO_SYM(pa_stream_drain); SDL_PULSEAUDIO_SYM(pa_stream_disconnect); + SDL_PULSEAUDIO_SYM(pa_stream_peek); + SDL_PULSEAUDIO_SYM(pa_stream_drop); + SDL_PULSEAUDIO_SYM(pa_stream_flush); SDL_PULSEAUDIO_SYM(pa_stream_unref); SDL_PULSEAUDIO_SYM(pa_channel_map_init_auto); SDL_PULSEAUDIO_SYM(pa_strerror); @@ -238,6 +250,12 @@ getAppName(void) return "SDL Application"; /* oh well. */ } +static void +stream_operation_complete_no_op(pa_stream *s, int success, void *userdata) +{ + /* no-op for pa_stream_drain(), etc, to use for callback. */ +} + static void WaitForPulseOperation(pa_mainloop *mainloop, pa_operation *o) { @@ -325,7 +343,7 @@ PULSEAUDIO_WaitDevice(_THIS) { struct SDL_PrivateAudioData *h = this->hidden; - while (this->enabled) { + while (SDL_AtomicGet(&this->enabled)) { if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY || PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY || PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) { @@ -343,41 +361,13 @@ PULSEAUDIO_PlayDevice(_THIS) { /* Write the audio data */ struct SDL_PrivateAudioData *h = this->hidden; - if (this->enabled) { + if (SDL_AtomicGet(&this->enabled)) { if (PULSEAUDIO_pa_stream_write(h->stream, h->mixbuf, h->mixlen, NULL, 0LL, PA_SEEK_RELATIVE) < 0) { SDL_OpenedAudioDeviceDisconnected(this); } } } -static void -stream_drain_complete(pa_stream *s, int success, void *userdata) -{ - /* no-op for pa_stream_drain() to use for callback. */ -} - -static void -PULSEAUDIO_WaitDone(_THIS) -{ - if (this->enabled) { - struct SDL_PrivateAudioData *h = this->hidden; - pa_operation *o = PULSEAUDIO_pa_stream_drain(h->stream, stream_drain_complete, NULL); - if (o) { - while (PULSEAUDIO_pa_operation_get_state(o) != PA_OPERATION_DONE) { - if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY || - PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY || - PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) { - PULSEAUDIO_pa_operation_cancel(o); - break; - } - } - PULSEAUDIO_pa_operation_unref(o); - } - } -} - - - static Uint8 * PULSEAUDIO_GetDeviceBuf(_THIS) { @@ -385,24 +375,96 @@ PULSEAUDIO_GetDeviceBuf(_THIS) } +static int +PULSEAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) +{ + struct SDL_PrivateAudioData *h = this->hidden; + const void *data = NULL; + size_t nbytes = 0; + + while (SDL_AtomicGet(&this->enabled)) { + if (h->capturebuf != NULL) { + const int cpy = SDL_min(buflen, h->capturelen); + SDL_memcpy(buffer, h->capturebuf, cpy); + /*printf("PULSEAUDIO: fed %d captured bytes\n", cpy);*/ + h->capturebuf += cpy; + h->capturelen -= cpy; + if (h->capturelen == 0) { + h->capturebuf = NULL; + PULSEAUDIO_pa_stream_drop(h->stream); /* done with this fragment. */ + } + return cpy; /* new data, return it. */ + } + + if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY || + PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY || + PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) { + SDL_OpenedAudioDeviceDisconnected(this); + return -1; /* uhoh, pulse failed! */ + } + + if (PULSEAUDIO_pa_stream_readable_size(h->stream) == 0) { + continue; /* no data available yet. */ + } + + /* a new fragment is available! */ + PULSEAUDIO_pa_stream_peek(h->stream, &data, &nbytes); + SDL_assert(nbytes > 0); + if (data == NULL) { /* NULL==buffer had a hole. Ignore that. */ + PULSEAUDIO_pa_stream_drop(h->stream); /* drop this fragment. */ + } else { + /* store this fragment's data, start feeding it to SDL. */ + /*printf("PULSEAUDIO: captured %d new bytes\n", (int) nbytes);*/ + h->capturebuf = (const Uint8 *) data; + h->capturelen = nbytes; + } + } + + return -1; /* not enabled? */ +} + +static void +PULSEAUDIO_FlushCapture(_THIS) +{ + struct SDL_PrivateAudioData *h = this->hidden; + + if (h->capturebuf != NULL) { + PULSEAUDIO_pa_stream_drop(h->stream); + h->capturebuf = NULL; + h->capturelen = 0; + } + + WaitForPulseOperation(h->mainloop, PULSEAUDIO_pa_stream_flush(h->stream, stream_operation_complete_no_op, NULL)); +} + static void PULSEAUDIO_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - SDL_free(this->hidden->device_name); - if (this->hidden->stream) { - PULSEAUDIO_pa_stream_disconnect(this->hidden->stream); - PULSEAUDIO_pa_stream_unref(this->hidden->stream); + if (this->hidden->stream) { + if (this->hidden->capturebuf != NULL) { + PULSEAUDIO_pa_stream_drop(this->hidden->stream); } - DisconnectFromPulseServer(this->hidden->mainloop, this->hidden->context); - SDL_free(this->hidden); - this->hidden = NULL; + PULSEAUDIO_pa_stream_disconnect(this->hidden->stream); + PULSEAUDIO_pa_stream_unref(this->hidden->stream); + } + + DisconnectFromPulseServer(this->hidden->mainloop, this->hidden->context); + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden->device_name); + SDL_free(this->hidden); +} + +static void +SinkDeviceNameCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data) +{ + if (i) { + char **devname = (char **) data; + *devname = SDL_strdup(i->name); } } static void -DeviceNameCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data) +SourceDeviceNameCallback(pa_context *c, const pa_source_info *i, int is_last, void *data) { if (i) { char **devname = (char **) data; @@ -411,7 +473,7 @@ DeviceNameCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data } static SDL_bool -FindDeviceName(struct SDL_PrivateAudioData *h, void *handle) +FindDeviceName(struct SDL_PrivateAudioData *h, const int iscapture, void *handle) { const uint32_t idx = ((uint32_t) ((size_t) handle)) - 1; @@ -419,7 +481,16 @@ FindDeviceName(struct SDL_PrivateAudioData *h, void *handle) return SDL_TRUE; } - WaitForPulseOperation(h->mainloop, PULSEAUDIO_pa_context_get_sink_info_by_index(h->context, idx, DeviceNameCallback, &h->device_name)); + if (iscapture) { + WaitForPulseOperation(h->mainloop, + PULSEAUDIO_pa_context_get_source_info_by_index(h->context, idx, + SourceDeviceNameCallback, &h->device_name)); + } else { + WaitForPulseOperation(h->mainloop, + PULSEAUDIO_pa_context_get_sink_info_by_index(h->context, idx, + SinkDeviceNameCallback, &h->device_name)); + } + return (h->device_name != NULL); } @@ -433,15 +504,15 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) pa_channel_map pacmap; pa_stream_flags_t flags = 0; int state = 0; + int rc = 0; /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) + h = this->hidden = (struct SDL_PrivateAudioData *) SDL_malloc((sizeof *this->hidden)); if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - h = this->hidden; + SDL_zerop(this->hidden); paspec.format = PA_SAMPLE_INVALID; @@ -482,7 +553,6 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } } if (paspec.format == PA_SAMPLE_INVALID) { - PULSEAUDIO_CloseDevice(this); return SDL_SetError("Couldn't find any hardware audio formats"); } this->spec.format = test_format; @@ -494,13 +564,14 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) SDL_CalculateAudioSpec(&this->spec); /* Allocate mixing buffer */ - h->mixlen = this->spec.size; - h->mixbuf = (Uint8 *) SDL_AllocAudioMem(h->mixlen); - if (h->mixbuf == NULL) { - PULSEAUDIO_CloseDevice(this); - return SDL_OutOfMemory(); + if (!iscapture) { + h->mixlen = this->spec.size; + h->mixbuf = (Uint8 *) SDL_malloc(h->mixlen); + if (h->mixbuf == NULL) { + return SDL_OutOfMemory(); + } + SDL_memset(h->mixbuf, this->spec.silence, this->spec.size); } - SDL_memset(h->mixbuf, this->spec.silence, this->spec.size); paspec.channels = this->spec.channels; paspec.rate = this->spec.freq; @@ -522,13 +593,11 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) #endif if (ConnectToPulseServer(&h->mainloop, &h->context) < 0) { - PULSEAUDIO_CloseDevice(this); return SDL_SetError("Could not connect to PulseAudio server"); } - if (!FindDeviceName(h, handle)) { - PULSEAUDIO_CloseDevice(this); - return SDL_SetError("Requested PulseAudio sink missing?"); + if (!FindDeviceName(h, iscapture, handle)) { + return SDL_SetError("Requested PulseAudio sink/source missing?"); } /* The SDL ALSA output hints us that we use Windows' channel mapping */ @@ -544,7 +613,6 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) ); if (h->stream == NULL) { - PULSEAUDIO_CloseDevice(this); return SDL_SetError("Could not set up PulseAudio stream"); } @@ -554,20 +622,22 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) flags |= PA_STREAM_DONT_MOVE; } - if (PULSEAUDIO_pa_stream_connect_playback(h->stream, h->device_name, &paattr, flags, - NULL, NULL) < 0) { - PULSEAUDIO_CloseDevice(this); + if (iscapture) { + rc = PULSEAUDIO_pa_stream_connect_record(h->stream, h->device_name, &paattr, flags); + } else { + rc = PULSEAUDIO_pa_stream_connect_playback(h->stream, h->device_name, &paattr, flags, NULL, NULL); + } + + if (rc < 0) { return SDL_SetError("Could not connect PulseAudio stream"); } do { if (PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) { - PULSEAUDIO_CloseDevice(this); return SDL_SetError("pa_mainloop_iterate() failed"); } state = PULSEAUDIO_pa_stream_get_state(h->stream); if (!PA_STREAM_IS_GOOD(state)) { - PULSEAUDIO_CloseDevice(this); return SDL_SetError("Could not connect PulseAudio stream"); } } while (state != PA_STREAM_READY); @@ -646,7 +716,7 @@ PULSEAUDIO_DetectDevices() WaitForPulseOperation(hotplug_mainloop, PULSEAUDIO_pa_context_get_source_info_list(hotplug_context, SourceInfoCallback, NULL)); /* ok, we have a sane list, let's set up hotplug notifications now... */ - hotplug_thread = SDL_CreateThread(HotplugThread, "PulseHotplug", NULL); + hotplug_thread = SDL_CreateThreadInternal(HotplugThread, "PulseHotplug", 256 * 1024, NULL); } static void @@ -684,8 +754,11 @@ PULSEAUDIO_Init(SDL_AudioDriverImpl * impl) impl->WaitDevice = PULSEAUDIO_WaitDevice; impl->GetDeviceBuf = PULSEAUDIO_GetDeviceBuf; impl->CloseDevice = PULSEAUDIO_CloseDevice; - impl->WaitDone = PULSEAUDIO_WaitDone; impl->Deinitialize = PULSEAUDIO_Deinitialize; + impl->CaptureFromDevice = PULSEAUDIO_CaptureFromDevice; + impl->FlushCapture = PULSEAUDIO_FlushCapture; + + impl->HasCaptureSupport = SDL_TRUE; return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.h b/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.h index c57ab7132..e12000f2a 100644 --- a/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.h +++ b/Engine/lib/sdl/src/audio/pulseaudio/SDL_pulseaudio.h @@ -42,6 +42,9 @@ struct SDL_PrivateAudioData /* Raw mixing buffer */ Uint8 *mixbuf; int mixlen; + + const Uint8 *capturebuf; + int capturelen; }; #endif /* _SDL_pulseaudio_h */ diff --git a/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.c b/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.c index 1899ca6d9..149cad90a 100644 --- a/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.c +++ b/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.c @@ -45,7 +45,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_qsa_audio.h" @@ -138,8 +137,7 @@ QSA_ThreadInit(_THIS) static void QSA_InitAudioParams(snd_pcm_channel_params_t * cpars) { - SDL_memset(cpars, 0, sizeof(snd_pcm_channel_params_t)); - + SDL_zerop(cpars); cpars->channel = SND_PCM_CHANNEL_PLAYBACK; cpars->mode = SND_PCM_MODE_BLOCK; cpars->start_mode = SND_PCM_START_DATA; @@ -229,7 +227,7 @@ QSA_PlayDevice(_THIS) int towrite; void *pcmbuffer; - if ((!this->enabled) || (!this->hidden)) { + if (!SDL_AtomicGet(&this->enabled) || !this->hidden) { return; } @@ -262,7 +260,7 @@ QSA_PlayDevice(_THIS) continue; } else { if ((errno == EINVAL) || (errno == EIO)) { - SDL_memset(&cstatus, 0, sizeof(cstatus)); + SDL_zero(cstatus); if (!this->hidden->iscapture) { cstatus.channel = SND_PCM_CHANNEL_PLAYBACK; } else { @@ -305,7 +303,7 @@ QSA_PlayDevice(_THIS) towrite -= written; pcmbuffer += written * this->spec.channels; } - } while ((towrite > 0) && (this->enabled)); + } while ((towrite > 0) && SDL_AtomicGet(&this->enabled)); /* If we couldn't write, assume fatal error for now */ if (towrite != 0) { @@ -322,27 +320,21 @@ QSA_GetDeviceBuf(_THIS) static void QSA_CloseDevice(_THIS) { - if (this->hidden != NULL) { - if (this->hidden->audio_handle != NULL) { - if (!this->hidden->iscapture) { - /* Finish playing available samples */ - snd_pcm_plugin_flush(this->hidden->audio_handle, - SND_PCM_CHANNEL_PLAYBACK); - } else { - /* Cancel unread samples during capture */ - snd_pcm_plugin_flush(this->hidden->audio_handle, - SND_PCM_CHANNEL_CAPTURE); - } - snd_pcm_close(this->hidden->audio_handle); - this->hidden->audio_handle = NULL; + if (this->hidden->audio_handle != NULL) { + if (!this->hidden->iscapture) { + /* Finish playing available samples */ + snd_pcm_plugin_flush(this->hidden->audio_handle, + SND_PCM_CHANNEL_PLAYBACK); + } else { + /* Cancel unread samples during capture */ + snd_pcm_plugin_flush(this->hidden->audio_handle, + SND_PCM_CHANNEL_CAPTURE); } - - SDL_FreeAudioMem(this->hidden->pcm_buf); - this->hidden->pcm_buf = NULL; - - SDL_free(this->hidden); - this->hidden = NULL; + snd_pcm_close(this->hidden->audio_handle); } + + SDL_free(this->hidden->pcm_buf); + SDL_free(this->hidden); } static int @@ -365,13 +357,13 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, sizeof(struct SDL_PrivateAudioData)); + SDL_zerop(this->hidden); /* Initialize channel transfer parameters to default */ QSA_InitAudioParams(&cparams); /* Initialize channel direction: capture or playback */ - this->hidden->iscapture = iscapture; + this->hidden->iscapture = iscapture ? SDL_TRUE : SDL_FALSE; if (device != NULL) { /* Open requested audio device */ @@ -391,7 +383,6 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Check if requested device is opened */ if (status < 0) { this->hidden->audio_handle = NULL; - QSA_CloseDevice(this); return QSA_SetError("snd_pcm_open", status); } @@ -401,7 +392,6 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) snd_pcm_plugin_set_disable(this->hidden->audio_handle, PLUGIN_DISABLE_MMAP); if (status < 0) { - QSA_CloseDevice(this); return QSA_SetError("snd_pcm_plugin_set_disable", status); } } @@ -487,7 +477,6 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* assumes test_format not 0 on success */ if (test_format == 0) { - QSA_CloseDevice(this); return SDL_SetError("QSA: Couldn't find any hardware audio formats"); } @@ -505,12 +494,11 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Setup the transfer parameters according to cparams */ status = snd_pcm_plugin_params(this->hidden->audio_handle, &cparams); if (status < 0) { - QSA_CloseDevice(this); return QSA_SetError("snd_pcm_channel_params", status); } /* Make sure channel is setup right one last time */ - SDL_memset(&csetup, 0, sizeof(csetup)); + SDL_zero(csetup); if (!this->hidden->iscapture) { csetup.channel = SND_PCM_CHANNEL_PLAYBACK; } else { @@ -519,7 +507,6 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Setup an audio channel */ if (snd_pcm_plugin_setup(this->hidden->audio_handle, &csetup) < 0) { - QSA_CloseDevice(this); return SDL_SetError("QSA: Unable to setup channel"); } @@ -540,9 +527,8 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) * closest multiple) */ this->hidden->pcm_buf = - (Uint8 *) SDL_AllocAudioMem(this->hidden->pcm_len); + (Uint8 *) SDL_malloc(this->hidden->pcm_len); if (this->hidden->pcm_buf == NULL) { - QSA_CloseDevice(this); return SDL_OutOfMemory(); } SDL_memset(this->hidden->pcm_buf, this->spec.silence, @@ -560,7 +546,6 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (this->hidden->audio_fd < 0) { - QSA_CloseDevice(this); return QSA_SetError("snd_pcm_file_descriptor", status); } @@ -578,7 +563,6 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (status < 0) { - QSA_CloseDevice(this); return QSA_SetError("snd_pcm_plugin_prepare", status); } @@ -724,32 +708,13 @@ QSA_DetectDevices(void) } } -static void -QSA_WaitDone(_THIS) -{ - if (!this->hidden->iscapture) { - if (this->hidden->audio_handle != NULL) { - /* Wait till last fragment is played and stop channel */ - snd_pcm_plugin_flush(this->hidden->audio_handle, - SND_PCM_CHANNEL_PLAYBACK); - } - } else { - if (this->hidden->audio_handle != NULL) { - /* Discard all unread data and stop channel */ - snd_pcm_plugin_flush(this->hidden->audio_handle, - SND_PCM_CHANNEL_CAPTURE); - } - } -} - static void QSA_Deinitialize(void) { /* Clear devices array on shutdown */ - SDL_memset(qsa_playback_device, 0x00, - sizeof(QSA_Device) * QSA_MAX_DEVICES); - SDL_memset(qsa_capture_device, 0x00, - sizeof(QSA_Device) * QSA_MAX_DEVICES); + /* !!! FIXME: we zero these on init...any reason to do it here? */ + SDL_zero(qsa_playback_device); + SDL_zero(qsa_capture_device); qsa_playback_devices = 0; qsa_capture_devices = 0; } @@ -761,10 +726,8 @@ QSA_Init(SDL_AudioDriverImpl * impl) int32_t status = 0; /* Clear devices array */ - SDL_memset(qsa_playback_device, 0x00, - sizeof(QSA_Device) * QSA_MAX_DEVICES); - SDL_memset(qsa_capture_device, 0x00, - sizeof(QSA_Device) * QSA_MAX_DEVICES); + SDL_zero(qsa_playback_device); + SDL_zero(qsa_capture_device); qsa_playback_devices = 0; qsa_capture_devices = 0; @@ -778,7 +741,6 @@ QSA_Init(SDL_AudioDriverImpl * impl) impl->PlayDevice = QSA_PlayDevice; impl->GetDeviceBuf = QSA_GetDeviceBuf; impl->CloseDevice = QSA_CloseDevice; - impl->WaitDone = QSA_WaitDone; impl->Deinitialize = QSA_Deinitialize; impl->LockDevice = NULL; impl->UnlockDevice = NULL; @@ -788,7 +750,7 @@ QSA_Init(SDL_AudioDriverImpl * impl) impl->SkipMixerLock = 0; impl->HasCaptureSupport = 1; impl->OnlyHasDefaultOutputDevice = 0; - impl->OnlyHasDefaultInputDevice = 0; + impl->OnlyHasDefaultCaptureDevice = 0; /* Check if io-audio manager is running or not */ status = snd_cards(); diff --git a/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.h b/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.h index 53d37e96f..19a2215aa 100644 --- a/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.h +++ b/Engine/lib/sdl/src/audio/qsa/SDL_qsa_audio.h @@ -34,7 +34,7 @@ struct SDL_PrivateAudioData { /* SDL capture state */ - int iscapture; + SDL_bool iscapture; /* The audio device handle */ int cardno; diff --git a/Engine/lib/sdl/src/audio/sdlgenaudiocvt.pl b/Engine/lib/sdl/src/audio/sdlgenaudiocvt.pl old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/src/audio/sndio/SDL_sndioaudio.c b/Engine/lib/sdl/src/audio/sndio/SDL_sndioaudio.c index 64565ae88..fb7d78ff1 100644 --- a/Engine/lib/sdl/src/audio/sndio/SDL_sndioaudio.c +++ b/Engine/lib/sdl/src/audio/sndio/SDL_sndioaudio.c @@ -36,7 +36,6 @@ #include #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "SDL_sndioaudio.h" @@ -171,25 +170,15 @@ SNDIO_GetDeviceBuf(_THIS) return this->hidden->mixbuf; } -static void -SNDIO_WaitDone(_THIS) -{ - SNDIO_sio_stop(this->hidden->dev); -} - static void SNDIO_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - if ( this->hidden->dev != NULL ) { - SNDIO_sio_close(this->hidden->dev); - this->hidden->dev = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; + if ( this->hidden->dev != NULL ) { + SNDIO_sio_stop(this->hidden->dev); + SNDIO_sio_close(this->hidden->dev); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int @@ -204,13 +193,12 @@ SNDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, sizeof(*this->hidden)); + SDL_zerop(this->hidden); this->hidden->mixlen = this->spec.size; /* !!! FIXME: SIO_DEVANY can be a specific device... */ if ((this->hidden->dev = SNDIO_sio_open(SIO_DEVANY, SIO_PLAY, 0)) == NULL) { - SNDIO_CloseDevice(this); return SDL_SetError("sio_open() failed"); } @@ -233,7 +221,6 @@ SNDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) continue; } if (SNDIO_sio_getpar(this->hidden->dev, &par) == 0) { - SNDIO_CloseDevice(this); return SDL_SetError("sio_getpar() failed"); } if (par.bps != SIO_BPS(par.bits)) { @@ -248,7 +235,6 @@ SNDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (status < 0) { - SNDIO_CloseDevice(this); return SDL_SetError("sndio: Couldn't find any hardware audio formats"); } @@ -269,7 +255,6 @@ SNDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) else if ((par.bps == 1) && (!par.sig)) this->spec.format = AUDIO_U8; else { - SNDIO_CloseDevice(this); return SDL_SetError("sndio: Got unsupported hardware audio format."); } @@ -282,9 +267,8 @@ SNDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Allocate mixing buffer */ this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen); if (this->hidden->mixbuf == NULL) { - SNDIO_CloseDevice(this); return SDL_OutOfMemory(); } SDL_memset(this->hidden->mixbuf, this->spec.silence, this->hidden->mixlen); @@ -315,7 +299,6 @@ SNDIO_Init(SDL_AudioDriverImpl * impl) impl->WaitDevice = SNDIO_WaitDevice; impl->PlayDevice = SNDIO_PlayDevice; impl->GetDeviceBuf = SNDIO_GetDeviceBuf; - impl->WaitDone = SNDIO_WaitDone; impl->CloseDevice = SNDIO_CloseDevice; impl->Deinitialize = SNDIO_Deinitialize; impl->OnlyHasDefaultOutputDevice = 1; /* !!! FIXME: sndio can handle multiple devices. */ diff --git a/Engine/lib/sdl/src/audio/sun/SDL_sunaudio.c b/Engine/lib/sdl/src/audio/sun/SDL_sunaudio.c index 71029d21f..b994c12c3 100644 --- a/Engine/lib/sdl/src/audio/sun/SDL_sunaudio.c +++ b/Engine/lib/sdl/src/audio/sun/SDL_sunaudio.c @@ -40,7 +40,6 @@ #include "SDL_timer.h" #include "SDL_audio.h" -#include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" #include "SDL_sunaudio.h" @@ -183,18 +182,12 @@ SUNAUDIO_GetDeviceBuf(_THIS) static void SUNAUDIO_CloseDevice(_THIS) { - if (this->hidden != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - SDL_free(this->hidden->ulaw_buf); - this->hidden->ulaw_buf = NULL; - if (this->hidden->audio_fd >= 0) { - close(this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; + SDL_free(this->hidden->ulaw_buf); + if (this->hidden->audio_fd >= 0) { + close(this->hidden->audio_fd); } + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int @@ -219,7 +212,7 @@ SUNAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Open the audio device */ this->hidden->audio_fd = open(devname, flags, 0); @@ -340,7 +333,7 @@ SUNAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) SDL_CalculateAudioSpec(&this->spec); /* Allocate mixing buffer */ - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->spec.size); + this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size); if (this->hidden->mixbuf == NULL) { return SDL_OutOfMemory(); } diff --git a/Engine/lib/sdl/src/audio/winmm/SDL_winmm.c b/Engine/lib/sdl/src/audio/winmm/SDL_winmm.c index 6d05a65ef..34f543ddb 100644 --- a/Engine/lib/sdl/src/audio/winmm/SDL_winmm.c +++ b/Engine/lib/sdl/src/audio/winmm/SDL_winmm.c @@ -27,6 +27,7 @@ #include "../../core/windows/SDL_windows.h" #include +#include "SDL_assert.h" #include "SDL_timer.h" #include "SDL_audio.h" #include "../SDL_audio_c.h" @@ -40,11 +41,11 @@ static void DetectWave##typ##Devs(void) { \ const UINT iscapture = iscap ? 1 : 0; \ const UINT devcount = wave##typ##GetNumDevs(); \ - capstyp caps; \ + capstyp##2W caps; \ UINT i; \ for (i = 0; i < devcount; i++) { \ - if (wave##typ##GetDevCaps(i,&caps,sizeof(caps))==MMSYSERR_NOERROR) { \ - char *name = WIN_StringToUTF8(caps.szPname); \ + if (wave##typ##GetDevCaps(i,(LP##capstyp##W)&caps,sizeof(caps))==MMSYSERR_NOERROR) { \ + char *name = WIN_LookupAudioDeviceName(caps.szPname,&caps.NameGuid); \ if (name != NULL) { \ SDL_AddAudioDevice((int) iscapture, name, (void *) ((size_t) i+1)); \ SDL_free(name); \ @@ -134,63 +135,87 @@ WINMM_PlayDevice(_THIS) this->hidden->next_buffer = (this->hidden->next_buffer + 1) % NUM_BUFFERS; } -static void -WINMM_WaitDone(_THIS) +static int +WINMM_CaptureFromDevice(_THIS, void *buffer, int buflen) { - int i, left; + const int nextbuf = this->hidden->next_buffer; + MMRESULT result; - do { - left = NUM_BUFFERS; - for (i = 0; i < NUM_BUFFERS; ++i) { - if (this->hidden->wavebuf[i].dwFlags & WHDR_DONE) { - --left; - } - } - if (left > 0) { - SDL_Delay(100); - } - } while (left > 0); + SDL_assert(buflen == this->spec.size); + + /* Wait for an audio chunk to finish */ + WaitForSingleObject(this->hidden->audio_sem, INFINITE); + + /* Copy it to caller's buffer... */ + SDL_memcpy(buffer, this->hidden->wavebuf[nextbuf].lpData, this->spec.size); + + /* requeue the buffer that just finished. */ + result = waveInAddBuffer(this->hidden->hin, + &this->hidden->wavebuf[nextbuf], + sizeof (this->hidden->wavebuf[nextbuf])); + if (result != MMSYSERR_NOERROR) { + return -1; /* uhoh! Disable the device. */ + } + + /* queue the next buffer in sequence, next time. */ + this->hidden->next_buffer = (nextbuf + 1) % NUM_BUFFERS; + return this->spec.size; +} + +static void +WINMM_FlushCapture(_THIS) +{ + /* Wait for an audio chunk to finish */ + if (WaitForSingleObject(this->hidden->audio_sem, 0) == WAIT_OBJECT_0) { + const int nextbuf = this->hidden->next_buffer; + /* requeue the buffer that just finished without reading from it. */ + waveInAddBuffer(this->hidden->hin, + &this->hidden->wavebuf[nextbuf], + sizeof (this->hidden->wavebuf[nextbuf])); + this->hidden->next_buffer = (nextbuf + 1) % NUM_BUFFERS; + } } static void WINMM_CloseDevice(_THIS) { - /* Close up audio */ - if (this->hidden != NULL) { - int i; + int i; - if (this->hidden->audio_sem) { - CloseHandle(this->hidden->audio_sem); - this->hidden->audio_sem = 0; - } + if (this->hidden->hout) { + waveOutReset(this->hidden->hout); /* Clean up mixing buffers */ for (i = 0; i < NUM_BUFFERS; ++i) { if (this->hidden->wavebuf[i].dwUser != 0xFFFF) { waveOutUnprepareHeader(this->hidden->hout, &this->hidden->wavebuf[i], - sizeof(this->hidden->wavebuf[i])); - this->hidden->wavebuf[i].dwUser = 0xFFFF; + sizeof (this->hidden->wavebuf[i])); } } - /* Free raw mixing buffer */ - SDL_free(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - - if (this->hidden->hin) { - waveInClose(this->hidden->hin); - this->hidden->hin = 0; - } - - if (this->hidden->hout) { - waveOutClose(this->hidden->hout); - this->hidden->hout = 0; - } - - SDL_free(this->hidden); - this->hidden = NULL; + waveOutClose(this->hidden->hout); } + + if (this->hidden->hin) { + waveInReset(this->hidden->hin); + + /* Clean up mixing buffers */ + for (i = 0; i < NUM_BUFFERS; ++i) { + if (this->hidden->wavebuf[i].dwUser != 0xFFFF) { + waveInUnprepareHeader(this->hidden->hin, + &this->hidden->wavebuf[i], + sizeof (this->hidden->wavebuf[i])); + } + } + waveInClose(this->hidden->hin); + } + + if (this->hidden->audio_sem) { + CloseHandle(this->hidden->audio_sem); + } + + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static SDL_bool @@ -239,7 +264,7 @@ WINMM_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) if (this->hidden == NULL) { return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); /* Initialize the wavebuf structures for closing */ for (i = 0; i < NUM_BUFFERS; ++i) @@ -269,7 +294,6 @@ WINMM_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (!valid_datatype) { - WINMM_CloseDevice(this); return SDL_SetError("Unsupported audio format"); } @@ -281,36 +305,45 @@ WINMM_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) result = waveInOpen(&this->hidden->hin, devId, &waveformat, (DWORD_PTR) CaptureSound, (DWORD_PTR) this, CALLBACK_FUNCTION); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveInOpen()", result); + } } else { result = waveOutOpen(&this->hidden->hout, devId, &waveformat, (DWORD_PTR) FillSound, (DWORD_PTR) this, CALLBACK_FUNCTION); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveOutOpen()", result); + } } - if (result != MMSYSERR_NOERROR) { - WINMM_CloseDevice(this); - return SetMMerror("waveOutOpen()", result); - } #ifdef SOUND_DEBUG /* Check the sound device we retrieved */ { - WAVEOUTCAPS caps; - - result = waveOutGetDevCaps((UINT) this->hidden->hout, - &caps, sizeof(caps)); - if (result != MMSYSERR_NOERROR) { - WINMM_CloseDevice(this); - return SetMMerror("waveOutGetDevCaps()", result); + if (iscapture) { + WAVEINCAPS caps; + result = waveInGetDevCaps((UINT) this->hidden->hout, + &caps, sizeof (caps)); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveInGetDevCaps()", result); + } + printf("Audio device: %s\n", caps.szPname); + } else { + WAVEOUTCAPS caps; + result = waveOutGetDevCaps((UINT) this->hidden->hout, + &caps, sizeof(caps)); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveOutGetDevCaps()", result); + } + printf("Audio device: %s\n", caps.szPname); } - printf("Audio device: %s\n", caps.szPname); } #endif /* Create the audio buffer semaphore */ this->hidden->audio_sem = - CreateSemaphore(NULL, NUM_BUFFERS - 1, NUM_BUFFERS, NULL); + CreateSemaphore(NULL, iscapture ? 0 : NUM_BUFFERS - 1, NUM_BUFFERS, NULL); if (this->hidden->audio_sem == NULL) { - WINMM_CloseDevice(this); return SDL_SetError("Couldn't create semaphore"); } @@ -318,22 +351,44 @@ WINMM_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) this->hidden->mixbuf = (Uint8 *) SDL_malloc(NUM_BUFFERS * this->spec.size); if (this->hidden->mixbuf == NULL) { - WINMM_CloseDevice(this); return SDL_OutOfMemory(); } + + SDL_zero(this->hidden->wavebuf); for (i = 0; i < NUM_BUFFERS; ++i) { - SDL_memset(&this->hidden->wavebuf[i], 0, - sizeof(this->hidden->wavebuf[i])); this->hidden->wavebuf[i].dwBufferLength = this->spec.size; this->hidden->wavebuf[i].dwFlags = WHDR_DONE; this->hidden->wavebuf[i].lpData = (LPSTR) & this->hidden->mixbuf[i * this->spec.size]; - result = waveOutPrepareHeader(this->hidden->hout, - &this->hidden->wavebuf[i], - sizeof(this->hidden->wavebuf[i])); + + if (iscapture) { + result = waveInPrepareHeader(this->hidden->hin, + &this->hidden->wavebuf[i], + sizeof(this->hidden->wavebuf[i])); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveInPrepareHeader()", result); + } + + result = waveInAddBuffer(this->hidden->hin, + &this->hidden->wavebuf[i], + sizeof(this->hidden->wavebuf[i])); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveInAddBuffer()", result); + } + } else { + result = waveOutPrepareHeader(this->hidden->hout, + &this->hidden->wavebuf[i], + sizeof(this->hidden->wavebuf[i])); + if (result != MMSYSERR_NOERROR) { + return SetMMerror("waveOutPrepareHeader()", result); + } + } + } + + if (iscapture) { + result = waveInStart(this->hidden->hin); if (result != MMSYSERR_NOERROR) { - WINMM_CloseDevice(this); - return SetMMerror("waveOutPrepareHeader()", result); + return SetMMerror("waveInStart()", result); } } @@ -349,10 +404,13 @@ WINMM_Init(SDL_AudioDriverImpl * impl) impl->OpenDevice = WINMM_OpenDevice; impl->PlayDevice = WINMM_PlayDevice; impl->WaitDevice = WINMM_WaitDevice; - impl->WaitDone = WINMM_WaitDone; impl->GetDeviceBuf = WINMM_GetDeviceBuf; + impl->CaptureFromDevice = WINMM_CaptureFromDevice; + impl->FlushCapture = WINMM_FlushCapture; impl->CloseDevice = WINMM_CloseDevice; + impl->HasCaptureSupport = SDL_TRUE; + return 1; /* this audio target is available. */ } diff --git a/Engine/lib/sdl/src/audio/xaudio2/SDL_xaudio2.c b/Engine/lib/sdl/src/audio/xaudio2/SDL_xaudio2.c index dff234b40..a18e5d24e 100644 --- a/Engine/lib/sdl/src/audio/xaudio2/SDL_xaudio2.c +++ b/Engine/lib/sdl/src/audio/xaudio2/SDL_xaudio2.c @@ -195,7 +195,7 @@ XAUDIO2_PlayDevice(_THIS) IXAudio2SourceVoice *source = this->hidden->source; HRESULT result = S_OK; - if (!this->enabled) { /* shutting down? */ + if (!SDL_AtomicGet(&this->enabled)) { /* shutting down? */ return; } @@ -226,64 +226,47 @@ XAUDIO2_PlayDevice(_THIS) static void XAUDIO2_WaitDevice(_THIS) { - if (this->enabled) { + if (SDL_AtomicGet(&this->enabled)) { SDL_SemWait(this->hidden->semaphore); } } static void -XAUDIO2_WaitDone(_THIS) +XAUDIO2_PrepareToClose(_THIS) { IXAudio2SourceVoice *source = this->hidden->source; - XAUDIO2_VOICE_STATE state; - SDL_assert(!this->enabled); /* flag that stops playing. */ - IXAudio2SourceVoice_Discontinuity(source); -#if SDL_XAUDIO2_WIN8 - IXAudio2SourceVoice_GetState(source, &state, XAUDIO2_VOICE_NOSAMPLESPLAYED); -#else - IXAudio2SourceVoice_GetState(source, &state); -#endif - while (state.BuffersQueued > 0) { - SDL_SemWait(this->hidden->semaphore); -#if SDL_XAUDIO2_WIN8 - IXAudio2SourceVoice_GetState(source, &state, XAUDIO2_VOICE_NOSAMPLESPLAYED); -#else - IXAudio2SourceVoice_GetState(source, &state); -#endif + if (source) { + IXAudio2SourceVoice_Discontinuity(source); } } - static void XAUDIO2_CloseDevice(_THIS) { - if (this->hidden != NULL) { - IXAudio2 *ixa2 = this->hidden->ixa2; - IXAudio2SourceVoice *source = this->hidden->source; - IXAudio2MasteringVoice *mastering = this->hidden->mastering; + IXAudio2 *ixa2 = this->hidden->ixa2; + IXAudio2SourceVoice *source = this->hidden->source; + IXAudio2MasteringVoice *mastering = this->hidden->mastering; - if (source != NULL) { - IXAudio2SourceVoice_Stop(source, 0, XAUDIO2_COMMIT_NOW); - IXAudio2SourceVoice_FlushSourceBuffers(source); - IXAudio2SourceVoice_DestroyVoice(source); - } - if (ixa2 != NULL) { - IXAudio2_StopEngine(ixa2); - } - if (mastering != NULL) { - IXAudio2MasteringVoice_DestroyVoice(mastering); - } - if (ixa2 != NULL) { - IXAudio2_Release(ixa2); - } - SDL_free(this->hidden->mixbuf); - if (this->hidden->semaphore != NULL) { - SDL_DestroySemaphore(this->hidden->semaphore); - } - - SDL_free(this->hidden); - this->hidden = NULL; + if (source != NULL) { + IXAudio2SourceVoice_Stop(source, 0, XAUDIO2_COMMIT_NOW); + IXAudio2SourceVoice_FlushSourceBuffers(source); + IXAudio2SourceVoice_DestroyVoice(source); } + if (ixa2 != NULL) { + IXAudio2_StopEngine(ixa2); + } + if (mastering != NULL) { + IXAudio2MasteringVoice_DestroyVoice(mastering); + } + if (ixa2 != NULL) { + IXAudio2_Release(ixa2); + } + if (this->hidden->semaphore != NULL) { + SDL_DestroySemaphore(this->hidden->semaphore); + } + + SDL_free(this->hidden->mixbuf); + SDL_free(this->hidden); } static int @@ -345,12 +328,11 @@ XAUDIO2_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) IXAudio2_Release(ixa2); return SDL_OutOfMemory(); } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); + SDL_zerop(this->hidden); this->hidden->ixa2 = ixa2; this->hidden->semaphore = SDL_CreateSemaphore(1); if (this->hidden->semaphore == NULL) { - XAUDIO2_CloseDevice(this); return SDL_SetError("XAudio2: CreateSemaphore() failed!"); } @@ -368,7 +350,6 @@ XAUDIO2_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } if (!valid_format) { - XAUDIO2_CloseDevice(this); return SDL_SetError("XAudio2: Unsupported audio format"); } @@ -379,11 +360,10 @@ XAUDIO2_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) this->hidden->mixlen = this->spec.size; this->hidden->mixbuf = (Uint8 *) SDL_malloc(2 * this->hidden->mixlen); if (this->hidden->mixbuf == NULL) { - XAUDIO2_CloseDevice(this); return SDL_OutOfMemory(); } this->hidden->nextbuf = this->hidden->mixbuf; - SDL_memset(this->hidden->mixbuf, 0, 2 * this->hidden->mixlen); + SDL_memset(this->hidden->mixbuf, this->spec.silence, 2 * this->hidden->mixlen); /* We use XAUDIO2_DEFAULT_CHANNELS instead of this->spec.channels. On Xbox360, this means 5.1 output, but on Windows, it means "figure out @@ -401,7 +381,6 @@ XAUDIO2_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) this->spec.freq, 0, devId, NULL); #endif if (result != S_OK) { - XAUDIO2_CloseDevice(this); return SDL_SetError("XAudio2: Couldn't create mastering voice"); } @@ -436,7 +415,6 @@ XAUDIO2_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) #endif if (result != S_OK) { - XAUDIO2_CloseDevice(this); return SDL_SetError("XAudio2: Couldn't create source voice"); } this->hidden->source = source; @@ -444,13 +422,11 @@ XAUDIO2_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) /* Start everything playing! */ result = IXAudio2_StartEngine(ixa2); if (result != S_OK) { - XAUDIO2_CloseDevice(this); return SDL_SetError("XAudio2: Couldn't start engine"); } result = IXAudio2SourceVoice_Start(source, 0, XAUDIO2_COMMIT_NOW); if (result != S_OK) { - XAUDIO2_CloseDevice(this); return SDL_SetError("XAudio2: Couldn't start source voice"); } @@ -499,7 +475,7 @@ XAUDIO2_Init(SDL_AudioDriverImpl * impl) impl->OpenDevice = XAUDIO2_OpenDevice; impl->PlayDevice = XAUDIO2_PlayDevice; impl->WaitDevice = XAUDIO2_WaitDevice; - impl->WaitDone = XAUDIO2_WaitDone; + impl->PrepareToClose = XAUDIO2_PrepareToClose; impl->GetDeviceBuf = XAUDIO2_GetDeviceBuf; impl->CloseDevice = XAUDIO2_CloseDevice; impl->Deinitialize = XAUDIO2_Deinitialize; diff --git a/Engine/lib/sdl/src/core/android/SDL_android.c b/Engine/lib/sdl/src/core/android/SDL_android.c index f6e0a833c..b93b16255 100644 --- a/Engine/lib/sdl/src/core/android/SDL_android.c +++ b/Engine/lib/sdl/src/core/android/SDL_android.c @@ -71,10 +71,14 @@ static jclass mActivityClass; /* method signatures */ static jmethodID midGetNativeSurface; -static jmethodID midAudioInit; +static jmethodID midAudioOpen; static jmethodID midAudioWriteShortBuffer; static jmethodID midAudioWriteByteBuffer; -static jmethodID midAudioQuit; +static jmethodID midAudioClose; +static jmethodID midCaptureOpen; +static jmethodID midCaptureReadShortBuffer; +static jmethodID midCaptureReadByteBuffer; +static jmethodID midCaptureClose; static jmethodID midPollInputDevices; /* Accelerometer data storage */ @@ -118,34 +122,45 @@ JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv* mEnv, jclass cls) midGetNativeSurface = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, "getNativeSurface","()Landroid/view/Surface;"); - midAudioInit = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, - "audioInit", "(IZZI)I"); + midAudioOpen = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, + "audioOpen", "(IZZI)I"); midAudioWriteShortBuffer = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, "audioWriteShortBuffer", "([S)V"); midAudioWriteByteBuffer = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, "audioWriteByteBuffer", "([B)V"); - midAudioQuit = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, - "audioQuit", "()V"); + midAudioClose = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, + "audioClose", "()V"); + midCaptureOpen = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, + "captureOpen", "(IZZI)I"); + midCaptureReadShortBuffer = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, + "captureReadShortBuffer", "([SZ)I"); + midCaptureReadByteBuffer = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, + "captureReadByteBuffer", "([BZ)I"); + midCaptureClose = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, + "captureClose", "()V"); midPollInputDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass, "pollInputDevices", "()V"); bHasNewData = SDL_FALSE; - if (!midGetNativeSurface || !midAudioInit || - !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit || !midPollInputDevices) { + if (!midGetNativeSurface || + !midAudioOpen || !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioClose || + !midCaptureOpen || !midCaptureReadShortBuffer || !midCaptureReadByteBuffer || !midCaptureClose || + !midPollInputDevices) { __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly"); } __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init() finished!"); } /* Drop file */ -void Java_org_libsdl_app_SDLActivity_onNativeDropFile( +JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeDropFile( JNIEnv* env, jclass jcls, jstring filename) { const char *path = (*env)->GetStringUTFChars(env, filename, NULL); - SDL_SendDropFile(path); + SDL_SendDropFile(NULL, path); (*env)->ReleaseStringUTFChars(env, filename, path); + SDL_SendDropComplete(NULL); } /* Resize */ @@ -555,11 +570,15 @@ int Android_JNI_SetupThread(void) static jboolean audioBuffer16Bit = JNI_FALSE; static jobject audioBuffer = NULL; static void* audioBufferPinned = NULL; +static jboolean captureBuffer16Bit = JNI_FALSE; +static jobject captureBuffer = NULL; -int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames) +int Android_JNI_OpenAudioDevice(int iscapture, int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames) { jboolean audioBufferStereo; int audioBufferFrames; + jobject jbufobj = NULL; + jboolean isCopy; JNIEnv *env = Android_JNI_GetEnv(); @@ -568,14 +587,24 @@ int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, i } Android_JNI_SetupThread(); - __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device"); - audioBuffer16Bit = is16Bit; audioBufferStereo = channelCount > 1; - if ((*env)->CallStaticIntMethod(env, mActivityClass, midAudioInit, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames) != 0) { - /* Error during audio initialization */ - __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: error on AudioTrack initialization!"); - return 0; + if (iscapture) { + __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device for capture"); + captureBuffer16Bit = is16Bit; + if ((*env)->CallStaticIntMethod(env, mActivityClass, midCaptureOpen, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames) != 0) { + /* Error during audio initialization */ + __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: error on AudioRecord initialization!"); + return 0; + } + } else { + __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device for output"); + audioBuffer16Bit = is16Bit; + if ((*env)->CallStaticIntMethod(env, mActivityClass, midAudioOpen, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames) != 0) { + /* Error during audio initialization */ + __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: error on AudioTrack initialization!"); + return 0; + } } /* Allocating the audio buffer from the Java side and passing it as the return value for audioInit no longer works on @@ -584,31 +613,43 @@ int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, i if (is16Bit) { jshortArray audioBufferLocal = (*env)->NewShortArray(env, desiredBufferFrames * (audioBufferStereo ? 2 : 1)); if (audioBufferLocal) { - audioBuffer = (*env)->NewGlobalRef(env, audioBufferLocal); + jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal); (*env)->DeleteLocalRef(env, audioBufferLocal); } } else { jbyteArray audioBufferLocal = (*env)->NewByteArray(env, desiredBufferFrames * (audioBufferStereo ? 2 : 1)); if (audioBufferLocal) { - audioBuffer = (*env)->NewGlobalRef(env, audioBufferLocal); + jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal); (*env)->DeleteLocalRef(env, audioBufferLocal); } } - if (audioBuffer == NULL) { + if (jbufobj == NULL) { __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: could not allocate an audio buffer!"); return 0; } - jboolean isCopy = JNI_FALSE; - if (audioBuffer16Bit) { - audioBufferPinned = (*env)->GetShortArrayElements(env, (jshortArray)audioBuffer, &isCopy); + if (iscapture) { + captureBuffer = jbufobj; + } else { + audioBuffer = jbufobj; + } + + isCopy = JNI_FALSE; + + if (is16Bit) { + if (!iscapture) { + audioBufferPinned = (*env)->GetShortArrayElements(env, (jshortArray)audioBuffer, &isCopy); + } audioBufferFrames = (*env)->GetArrayLength(env, (jshortArray)audioBuffer); } else { - audioBufferPinned = (*env)->GetByteArrayElements(env, (jbyteArray)audioBuffer, &isCopy); + if (!iscapture) { + audioBufferPinned = (*env)->GetByteArrayElements(env, (jbyteArray)audioBuffer, &isCopy); + } audioBufferFrames = (*env)->GetArrayLength(env, (jbyteArray)audioBuffer); } + if (audioBufferStereo) { audioBufferFrames /= 2; } @@ -636,16 +677,71 @@ void Android_JNI_WriteAudioBuffer(void) /* JNI_COMMIT means the changes are committed to the VM but the buffer remains pinned */ } -void Android_JNI_CloseAudioDevice(void) +int Android_JNI_CaptureAudioBuffer(void *buffer, int buflen) +{ + JNIEnv *env = Android_JNI_GetEnv(); + jboolean isCopy = JNI_FALSE; + jint br; + + if (captureBuffer16Bit) { + SDL_assert((*env)->GetArrayLength(env, (jshortArray)captureBuffer) == (buflen / 2)); + br = (*env)->CallStaticIntMethod(env, mActivityClass, midCaptureReadShortBuffer, (jshortArray)captureBuffer, JNI_TRUE); + if (br > 0) { + jshort *ptr = (*env)->GetShortArrayElements(env, (jshortArray)captureBuffer, &isCopy); + br *= 2; + SDL_memcpy(buffer, ptr, br); + (*env)->ReleaseShortArrayElements(env, (jshortArray)captureBuffer, (jshort *)ptr, JNI_ABORT); + } + } else { + SDL_assert((*env)->GetArrayLength(env, (jshortArray)captureBuffer) == buflen); + br = (*env)->CallStaticIntMethod(env, mActivityClass, midCaptureReadByteBuffer, (jbyteArray)captureBuffer, JNI_TRUE); + if (br > 0) { + jbyte *ptr = (*env)->GetByteArrayElements(env, (jbyteArray)captureBuffer, &isCopy); + SDL_memcpy(buffer, ptr, br); + (*env)->ReleaseByteArrayElements(env, (jbyteArray)captureBuffer, (jbyte *)ptr, JNI_ABORT); + } + } + + return (int) br; +} + +void Android_JNI_FlushCapturedAudio(void) +{ + JNIEnv *env = Android_JNI_GetEnv(); + #if 0 /* !!! FIXME: this needs API 23, or it'll do blocking reads and never end. */ + if (captureBuffer16Bit) { + const jint len = (*env)->GetArrayLength(env, (jshortArray)captureBuffer); + while ((*env)->CallStaticIntMethod(env, mActivityClass, midCaptureReadShortBuffer, (jshortArray)captureBuffer, JNI_FALSE) == len) { /* spin */ } + } else { + const jint len = (*env)->GetArrayLength(env, (jbyteArray)captureBuffer); + while ((*env)->CallStaticIntMethod(env, mActivityClass, midCaptureReadByteBuffer, (jbyteArray)captureBuffer, JNI_FALSE) == len) { /* spin */ } + } + #else + if (captureBuffer16Bit) { + (*env)->CallStaticIntMethod(env, mActivityClass, midCaptureReadShortBuffer, (jshortArray)captureBuffer, JNI_FALSE); + } else { + (*env)->CallStaticIntMethod(env, mActivityClass, midCaptureReadByteBuffer, (jbyteArray)captureBuffer, JNI_FALSE); + } + #endif +} + +void Android_JNI_CloseAudioDevice(const int iscapture) { JNIEnv *env = Android_JNI_GetEnv(); - (*env)->CallStaticVoidMethod(env, mActivityClass, midAudioQuit); - - if (audioBuffer) { - (*env)->DeleteGlobalRef(env, audioBuffer); - audioBuffer = NULL; - audioBufferPinned = NULL; + if (iscapture) { + (*env)->CallStaticVoidMethod(env, mActivityClass, midCaptureClose); + if (captureBuffer) { + (*env)->DeleteGlobalRef(env, captureBuffer); + captureBuffer = NULL; + } + } else { + (*env)->CallStaticVoidMethod(env, mActivityClass, midAudioClose); + if (audioBuffer) { + (*env)->DeleteGlobalRef(env, audioBuffer); + audioBuffer = NULL; + audioBufferPinned = NULL; + } } } @@ -653,10 +749,12 @@ void Android_JNI_CloseAudioDevice(void) /* If the parameter silent is truthy then SDL_SetError() will not be called. */ static SDL_bool Android_JNI_ExceptionOccurred(SDL_bool silent) { - SDL_assert(LocalReferenceHolder_IsActive()); JNIEnv *mEnv = Android_JNI_GetEnv(); + jthrowable exception; - jthrowable exception = (*mEnv)->ExceptionOccurred(mEnv); + SDL_assert(LocalReferenceHolder_IsActive()); + + exception = (*mEnv)->ExceptionOccurred(mEnv); if (exception != NULL) { jmethodID mid; @@ -666,13 +764,16 @@ static SDL_bool Android_JNI_ExceptionOccurred(SDL_bool silent) if (!silent) { jclass exceptionClass = (*mEnv)->GetObjectClass(mEnv, exception); jclass classClass = (*mEnv)->FindClass(mEnv, "java/lang/Class"); + jstring exceptionName; + const char* exceptionNameUTF8; + jstring exceptionMessage; mid = (*mEnv)->GetMethodID(mEnv, classClass, "getName", "()Ljava/lang/String;"); - jstring exceptionName = (jstring)(*mEnv)->CallObjectMethod(mEnv, exceptionClass, mid); - const char* exceptionNameUTF8 = (*mEnv)->GetStringUTFChars(mEnv, exceptionName, 0); + exceptionName = (jstring)(*mEnv)->CallObjectMethod(mEnv, exceptionClass, mid); + exceptionNameUTF8 = (*mEnv)->GetStringUTFChars(mEnv, exceptionName, 0); mid = (*mEnv)->GetMethodID(mEnv, exceptionClass, "getMessage", "()Ljava/lang/String;"); - jstring exceptionMessage = (jstring)(*mEnv)->CallObjectMethod(mEnv, exception, mid); + exceptionMessage = (jstring)(*mEnv)->CallObjectMethod(mEnv, exception, mid); if (exceptionMessage != NULL) { const char* exceptionMessageUTF8 = (*mEnv)->GetStringUTFChars(mEnv, exceptionMessage, 0); @@ -855,6 +956,7 @@ int Android_JNI_FileOpen(SDL_RWops* ctx, struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__); JNIEnv *mEnv = Android_JNI_GetEnv(); int retval; + jstring fileNameJString; if (!LocalReferenceHolder_Init(&refs, mEnv)) { LocalReferenceHolder_Cleanup(&refs); @@ -866,7 +968,7 @@ int Android_JNI_FileOpen(SDL_RWops* ctx, return -1; } - jstring fileNameJString = (*mEnv)->NewStringUTF(mEnv, fileName); + fileNameJString = (*mEnv)->NewStringUTF(mEnv, fileName); ctx->hidden.androidio.fileNameRef = (*mEnv)->NewGlobalRef(mEnv, fileNameJString); ctx->hidden.androidio.inputStreamRef = NULL; ctx->hidden.androidio.readableByteChannelRef = NULL; @@ -885,10 +987,11 @@ size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, if (ctx->hidden.androidio.assetFileDescriptorRef) { size_t bytesMax = size * maxnum; + size_t result; if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && ctx->hidden.androidio.position + bytesMax > ctx->hidden.androidio.size) { bytesMax = ctx->hidden.androidio.size - ctx->hidden.androidio.position; } - size_t result = read(ctx->hidden.androidio.fd, buffer, bytesMax ); + result = read(ctx->hidden.androidio.fd, buffer, bytesMax ); if (result > 0) { ctx->hidden.androidio.position += result; LocalReferenceHolder_Cleanup(&refs); @@ -900,19 +1003,23 @@ size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, jlong bytesRemaining = (jlong) (size * maxnum); jlong bytesMax = (jlong) (ctx->hidden.androidio.size - ctx->hidden.androidio.position); int bytesRead = 0; + JNIEnv *mEnv; + jobject readableByteChannel; + jmethodID readMethod; + jobject byteBuffer; /* Don't read more bytes than those that remain in the file, otherwise we get an exception */ if (bytesRemaining > bytesMax) bytesRemaining = bytesMax; - JNIEnv *mEnv = Android_JNI_GetEnv(); + mEnv = Android_JNI_GetEnv(); if (!LocalReferenceHolder_Init(&refs, mEnv)) { LocalReferenceHolder_Cleanup(&refs); return 0; } - jobject readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannelRef; - jmethodID readMethod = (jmethodID)ctx->hidden.androidio.readMethod; - jobject byteBuffer = (*mEnv)->NewDirectByteBuffer(mEnv, buffer, bytesRemaining); + readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannelRef; + readMethod = (jmethodID)ctx->hidden.androidio.readMethod; + byteBuffer = (*mEnv)->NewDirectByteBuffer(mEnv, buffer, bytesRemaining); while (bytesRemaining > 0) { /* result = readableByteChannel.read(...); */ @@ -1002,6 +1109,7 @@ Sint64 Android_JNI_FileSize(SDL_RWops* ctx) Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence) { if (ctx->hidden.androidio.assetFileDescriptorRef) { + off_t ret; switch (whence) { case RW_SEEK_SET: if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size; @@ -1020,11 +1128,12 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence) } whence = SEEK_SET; - off_t ret = lseek(ctx->hidden.androidio.fd, (off_t)offset, SEEK_SET); + ret = lseek(ctx->hidden.androidio.fd, (off_t)offset, SEEK_SET); if (ret == -1) return -1; ctx->hidden.androidio.position = ret - ctx->hidden.androidio.offset; } else { Sint64 newPosition; + Sint64 movement; switch (whence) { case RW_SEEK_SET: @@ -1048,17 +1157,18 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence) newPosition = ctx->hidden.androidio.size; } - Sint64 movement = newPosition - ctx->hidden.androidio.position; + movement = newPosition - ctx->hidden.androidio.position; if (movement > 0) { unsigned char buffer[4096]; /* The easy case where we're seeking forwards */ while (movement > 0) { Sint64 amount = sizeof (buffer); + size_t result; if (amount > movement) { amount = movement; } - size_t result = Android_JNI_FileRead(ctx, buffer, 1, amount); + result = Android_JNI_FileRead(ctx, buffer, 1, amount); if (result <= 0) { /* Failed to read/skip the required amount, so fail */ return -1; @@ -1091,21 +1201,23 @@ static jobject Android_JNI_GetSystemServiceObject(const char* name) struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__); JNIEnv* env = Android_JNI_GetEnv(); jobject retval = NULL; + jstring service; + jmethodID mid; + jobject context; + jobject manager; if (!LocalReferenceHolder_Init(&refs, env)) { LocalReferenceHolder_Cleanup(&refs); return NULL; } - jstring service = (*env)->NewStringUTF(env, name); - - jmethodID mid; + service = (*env)->NewStringUTF(env, name); mid = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;"); - jobject context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid); + context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid); mid = (*env)->GetMethodID(env, mActivityClass, "getSystemServiceFromUiThread", "(Ljava/lang/String;)Ljava/lang/Object;"); - jobject manager = (*env)->CallObjectMethod(env, context, mid, service); + manager = (*env)->CallObjectMethod(env, context, mid, service); (*env)->DeleteLocalRef(env, service); @@ -1117,11 +1229,12 @@ static jobject Android_JNI_GetSystemServiceObject(const char* name) #define SETUP_CLIPBOARD(error) \ struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__); \ JNIEnv* env = Android_JNI_GetEnv(); \ + jobject clipboard; \ if (!LocalReferenceHolder_Init(&refs, env)) { \ LocalReferenceHolder_Cleanup(&refs); \ return error; \ } \ - jobject clipboard = Android_JNI_GetSystemServiceObject("clipboard"); \ + clipboard = Android_JNI_GetSystemServiceObject("clipboard"); \ if (!clipboard) { \ LocalReferenceHolder_Cleanup(&refs); \ return error; \ @@ -1132,14 +1245,17 @@ static jobject Android_JNI_GetSystemServiceObject(const char* name) int Android_JNI_SetClipboardText(const char* text) { + /* Watch out for C89 scoping rules because of the macro */ SETUP_CLIPBOARD(-1) - jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "setText", "(Ljava/lang/CharSequence;)V"); - jstring string = (*env)->NewStringUTF(env, text); - (*env)->CallVoidMethod(env, clipboard, mid, string); - (*env)->DeleteGlobalRef(env, clipboard); - (*env)->DeleteLocalRef(env, string); - + /* Nest the following in a scope to avoid C89 declaration rules triggered by the macro */ + { + jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "setText", "(Ljava/lang/CharSequence;)V"); + jstring string = (*env)->NewStringUTF(env, text); + (*env)->CallVoidMethod(env, clipboard, mid, string); + (*env)->DeleteGlobalRef(env, clipboard); + (*env)->DeleteLocalRef(env, string); + } CLEANUP_CLIPBOARD(); return 0; @@ -1147,25 +1263,30 @@ int Android_JNI_SetClipboardText(const char* text) char* Android_JNI_GetClipboardText(void) { + /* Watch out for C89 scoping rules because of the macro */ SETUP_CLIPBOARD(SDL_strdup("")) - jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "getText", "()Ljava/lang/CharSequence;"); - jobject sequence = (*env)->CallObjectMethod(env, clipboard, mid); - (*env)->DeleteGlobalRef(env, clipboard); - if (sequence) { - mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, sequence), "toString", "()Ljava/lang/String;"); - jstring string = (jstring)((*env)->CallObjectMethod(env, sequence, mid)); - const char* utf = (*env)->GetStringUTFChars(env, string, 0); - if (utf) { - char* text = SDL_strdup(utf); - (*env)->ReleaseStringUTFChars(env, string, utf); + /* Nest the following in a scope to avoid C89 declaration rules triggered by the macro */ + { + jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "getText", "()Ljava/lang/CharSequence;"); + jobject sequence = (*env)->CallObjectMethod(env, clipboard, mid); + (*env)->DeleteGlobalRef(env, clipboard); + if (sequence) { + jstring string; + const char* utf; + mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, sequence), "toString", "()Ljava/lang/String;"); + string = (jstring)((*env)->CallObjectMethod(env, sequence, mid)); + utf = (*env)->GetStringUTFChars(env, string, 0); + if (utf) { + char* text = SDL_strdup(utf); + (*env)->ReleaseStringUTFChars(env, string, utf); - CLEANUP_CLIPBOARD(); + CLEANUP_CLIPBOARD(); - return text; + return text; + } } } - CLEANUP_CLIPBOARD(); return SDL_strdup(""); @@ -1173,10 +1294,13 @@ char* Android_JNI_GetClipboardText(void) SDL_bool Android_JNI_HasClipboardText(void) { + jmethodID mid; + jboolean has; + /* Watch out for C89 scoping rules because of the macro */ SETUP_CLIPBOARD(SDL_FALSE) - jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "hasText", "()Z"); - jboolean has = (*env)->CallBooleanMethod(env, clipboard, mid); + mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "hasText", "()Z"); + has = (*env)->CallBooleanMethod(env, clipboard, mid); (*env)->DeleteGlobalRef(env, clipboard); CLEANUP_CLIPBOARD(); @@ -1193,49 +1317,61 @@ int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seco { struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__); JNIEnv* env = Android_JNI_GetEnv(); + jmethodID mid; + jobject context; + jstring action; + jclass cls; + jobject filter; + jobject intent; + jstring iname; + jmethodID imid; + jstring bname; + jmethodID bmid; if (!LocalReferenceHolder_Init(&refs, env)) { LocalReferenceHolder_Cleanup(&refs); return -1; } - jmethodID mid; mid = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;"); - jobject context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid); + context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid); - jstring action = (*env)->NewStringUTF(env, "android.intent.action.BATTERY_CHANGED"); + action = (*env)->NewStringUTF(env, "android.intent.action.BATTERY_CHANGED"); - jclass cls = (*env)->FindClass(env, "android/content/IntentFilter"); + cls = (*env)->FindClass(env, "android/content/IntentFilter"); mid = (*env)->GetMethodID(env, cls, "", "(Ljava/lang/String;)V"); - jobject filter = (*env)->NewObject(env, cls, mid, action); + filter = (*env)->NewObject(env, cls, mid, action); (*env)->DeleteLocalRef(env, action); mid = (*env)->GetMethodID(env, mActivityClass, "registerReceiver", "(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;"); - jobject intent = (*env)->CallObjectMethod(env, context, mid, NULL, filter); + intent = (*env)->CallObjectMethod(env, context, mid, NULL, filter); (*env)->DeleteLocalRef(env, filter); cls = (*env)->GetObjectClass(env, intent); - jstring iname; - jmethodID imid = (*env)->GetMethodID(env, cls, "getIntExtra", "(Ljava/lang/String;I)I"); + imid = (*env)->GetMethodID(env, cls, "getIntExtra", "(Ljava/lang/String;I)I"); + /* Watch out for C89 scoping rules because of the macro */ #define GET_INT_EXTRA(var, key) \ + int var; \ iname = (*env)->NewStringUTF(env, key); \ - int var = (*env)->CallIntMethod(env, intent, imid, iname, -1); \ + var = (*env)->CallIntMethod(env, intent, imid, iname, -1); \ (*env)->DeleteLocalRef(env, iname); - jstring bname; - jmethodID bmid = (*env)->GetMethodID(env, cls, "getBooleanExtra", "(Ljava/lang/String;Z)Z"); + bmid = (*env)->GetMethodID(env, cls, "getBooleanExtra", "(Ljava/lang/String;Z)Z"); + /* Watch out for C89 scoping rules because of the macro */ #define GET_BOOL_EXTRA(var, key) \ + int var; \ bname = (*env)->NewStringUTF(env, key); \ - int var = (*env)->CallBooleanMethod(env, intent, bmid, bname, JNI_FALSE); \ + var = (*env)->CallBooleanMethod(env, intent, bmid, bname, JNI_FALSE); \ (*env)->DeleteLocalRef(env, bname); if (plugged) { + /* Watch out for C89 scoping rules because of the macro */ GET_INT_EXTRA(plug, "plugged") /* == BatteryManager.EXTRA_PLUGGED (API 5) */ if (plug == -1) { LocalReferenceHolder_Cleanup(&refs); @@ -1247,6 +1383,7 @@ int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seco } if (charged) { + /* Watch out for C89 scoping rules because of the macro */ GET_INT_EXTRA(status, "status") /* == BatteryManager.EXTRA_STATUS (API 5) */ if (status == -1) { LocalReferenceHolder_Cleanup(&refs); @@ -1266,8 +1403,20 @@ int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seco } if (percent) { - GET_INT_EXTRA(level, "level") /* == BatteryManager.EXTRA_LEVEL (API 5) */ - GET_INT_EXTRA(scale, "scale") /* == BatteryManager.EXTRA_SCALE (API 5) */ + int level; + int scale; + + /* Watch out for C89 scoping rules because of the macro */ + { + GET_INT_EXTRA(level_temp, "level") /* == BatteryManager.EXTRA_LEVEL (API 5) */ + level = level_temp; + } + /* Watch out for C89 scoping rules because of the macro */ + { + GET_INT_EXTRA(scale_temp, "scale") /* == BatteryManager.EXTRA_SCALE (API 5) */ + scale = scale_temp; + } + if ((level == -1) || (scale == -1)) { LocalReferenceHolder_Cleanup(&refs); return -1; @@ -1320,14 +1469,16 @@ void Android_JNI_PollInputDevices(void) int Android_JNI_SendMessage(int command, int param) { JNIEnv *env = Android_JNI_GetEnv(); + jmethodID mid; + jboolean success; if (!env) { return -1; } - jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "sendMessage", "(II)Z"); + mid = (*env)->GetStaticMethodID(env, mActivityClass, "sendMessage", "(II)Z"); if (!mid) { return -1; } - jboolean success = (*env)->CallStaticBooleanMethod(env, mActivityClass, mid, command, param); + success = (*env)->CallStaticBooleanMethod(env, mActivityClass, mid, command, param); return success ? 0 : -1; } @@ -1339,11 +1490,12 @@ void Android_JNI_SuspendScreenSaver(SDL_bool suspend) void Android_JNI_ShowTextInput(SDL_Rect *inputRect) { JNIEnv *env = Android_JNI_GetEnv(); + jmethodID mid; if (!env) { return; } - jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "showTextInput", "(IIII)Z"); + mid = (*env)->GetStaticMethodID(env, mActivityClass, "showTextInput", "(IIII)Z"); if (!mid) { return; } diff --git a/Engine/lib/sdl/src/core/android/SDL_android.h b/Engine/lib/sdl/src/core/android/SDL_android.h index 8e2ab93c3..cb7ff0736 100644 --- a/Engine/lib/sdl/src/core/android/SDL_android.h +++ b/Engine/lib/sdl/src/core/android/SDL_android.h @@ -40,10 +40,12 @@ extern void Android_JNI_HideTextInput(void); extern ANativeWindow* Android_JNI_GetNativeWindow(void); /* Audio support */ -extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames); +extern int Android_JNI_OpenAudioDevice(int iscapture, int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames); extern void* Android_JNI_GetAudioBuffer(void); extern void Android_JNI_WriteAudioBuffer(void); -extern void Android_JNI_CloseAudioDevice(void); +extern int Android_JNI_CaptureAudioBuffer(void *buffer, int buflen); +extern void Android_JNI_FlushCapturedAudio(void); +extern void Android_JNI_CloseAudioDevice(const int iscapture); #include "SDL_rwops.h" diff --git a/Engine/lib/sdl/src/core/linux/SDL_dbus.c b/Engine/lib/sdl/src/core/linux/SDL_dbus.c index 5d0df050c..ab73ca17c 100644 --- a/Engine/lib/sdl/src/core/linux/SDL_dbus.c +++ b/Engine/lib/sdl/src/core/linux/SDL_dbus.c @@ -27,7 +27,7 @@ static const char *dbus_library = "libdbus-1.so.3"; static void *dbus_handle = NULL; static unsigned int screensaver_cookie = 0; -static SDL_DBusContext dbus = {0}; +static SDL_DBusContext dbus; static int LoadDBUSSyms(void) diff --git a/Engine/lib/sdl/src/core/linux/SDL_evdev.c b/Engine/lib/sdl/src/core/linux/SDL_evdev.c index a8f2b138e..4761f3e46 100644 --- a/Engine/lib/sdl/src/core/linux/SDL_evdev.c +++ b/Engine/lib/sdl/src/core/linux/SDL_evdev.c @@ -29,10 +29,7 @@ * The evtest application is also useful to debug the protocol */ - #include "SDL_evdev.h" -#define _THIS SDL_EVDEV_PrivateData *_this -static _THIS = NULL; #include #include @@ -43,18 +40,8 @@ static _THIS = NULL; #ifdef SDL_INPUT_LINUXKD #include #include -#endif - - -/* We need this to prevent keystrokes from appear in the console */ -#ifndef KDSKBMUTE -#define KDSKBMUTE 0x4B51 -#endif -#ifndef KDSKBMODE -#define KDSKBMODE 0x4B45 -#endif -#ifndef K_OFF -#define K_OFF 0x04 +#include +#include /* for TIOCL_GETSHIFTSTATE */ #endif #include "SDL.h" @@ -63,273 +50,71 @@ static _THIS = NULL; #include "../../core/linux/SDL_udev.h" #include "SDL_scancode.h" #include "../../events/SDL_events_c.h" +#include "../../events/scancodes_linux.h" /* adds linux_scancode_table */ /* This isn't defined in older Linux kernel headers */ #ifndef SYN_DROPPED #define SYN_DROPPED 3 #endif +typedef struct SDL_evdevlist_item +{ + char *path; + int fd; + + /* TODO: use this for every device, not just touchscreen */ + int out_of_sync; + + /* TODO: expand on this to have data for every possible class (mouse, + keyboard, touchpad, etc.). Also there's probably some things in here we + can pull out to the SDL_evdevlist_item i.e. name */ + int is_touchscreen; + struct { + char* name; + + int min_x, max_x, range_x; + int min_y, max_y, range_y; + + int max_slots; + int current_slot; + struct { + enum { + EVDEV_TOUCH_SLOTDELTA_NONE = 0, + EVDEV_TOUCH_SLOTDELTA_DOWN, + EVDEV_TOUCH_SLOTDELTA_UP, + EVDEV_TOUCH_SLOTDELTA_MOVE + } delta; + int tracking_id; + int x, y; + } * slots; + } * touchscreen_data; + + struct SDL_evdevlist_item *next; +} SDL_evdevlist_item; + +typedef struct SDL_EVDEV_PrivateData +{ + SDL_evdevlist_item *first; + SDL_evdevlist_item *last; + int num_devices; + int ref_count; + int console_fd; + int kb_mode; +} SDL_EVDEV_PrivateData; + +#define _THIS SDL_EVDEV_PrivateData *_this +static _THIS = NULL; + static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode); static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item); -static int SDL_EVDEV_device_removed(const char *devpath); +static int SDL_EVDEV_device_removed(const char *dev_path); #if SDL_USE_LIBUDEV -static int SDL_EVDEV_device_added(const char *devpath); -void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath); +static int SDL_EVDEV_device_added(const char *dev_path, int udev_class); +void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, + const char *dev_path); #endif /* SDL_USE_LIBUDEV */ -static SDL_Scancode EVDEV_Keycodes[] = { - SDL_SCANCODE_UNKNOWN, /* KEY_RESERVED 0 */ - SDL_SCANCODE_ESCAPE, /* KEY_ESC 1 */ - SDL_SCANCODE_1, /* KEY_1 2 */ - SDL_SCANCODE_2, /* KEY_2 3 */ - SDL_SCANCODE_3, /* KEY_3 4 */ - SDL_SCANCODE_4, /* KEY_4 5 */ - SDL_SCANCODE_5, /* KEY_5 6 */ - SDL_SCANCODE_6, /* KEY_6 7 */ - SDL_SCANCODE_7, /* KEY_7 8 */ - SDL_SCANCODE_8, /* KEY_8 9 */ - SDL_SCANCODE_9, /* KEY_9 10 */ - SDL_SCANCODE_0, /* KEY_0 11 */ - SDL_SCANCODE_MINUS, /* KEY_MINUS 12 */ - SDL_SCANCODE_EQUALS, /* KEY_EQUAL 13 */ - SDL_SCANCODE_BACKSPACE, /* KEY_BACKSPACE 14 */ - SDL_SCANCODE_TAB, /* KEY_TAB 15 */ - SDL_SCANCODE_Q, /* KEY_Q 16 */ - SDL_SCANCODE_W, /* KEY_W 17 */ - SDL_SCANCODE_E, /* KEY_E 18 */ - SDL_SCANCODE_R, /* KEY_R 19 */ - SDL_SCANCODE_T, /* KEY_T 20 */ - SDL_SCANCODE_Y, /* KEY_Y 21 */ - SDL_SCANCODE_U, /* KEY_U 22 */ - SDL_SCANCODE_I, /* KEY_I 23 */ - SDL_SCANCODE_O, /* KEY_O 24 */ - SDL_SCANCODE_P, /* KEY_P 25 */ - SDL_SCANCODE_LEFTBRACKET, /* KEY_LEFTBRACE 26 */ - SDL_SCANCODE_RIGHTBRACKET, /* KEY_RIGHTBRACE 27 */ - SDL_SCANCODE_RETURN, /* KEY_ENTER 28 */ - SDL_SCANCODE_LCTRL, /* KEY_LEFTCTRL 29 */ - SDL_SCANCODE_A, /* KEY_A 30 */ - SDL_SCANCODE_S, /* KEY_S 31 */ - SDL_SCANCODE_D, /* KEY_D 32 */ - SDL_SCANCODE_F, /* KEY_F 33 */ - SDL_SCANCODE_G, /* KEY_G 34 */ - SDL_SCANCODE_H, /* KEY_H 35 */ - SDL_SCANCODE_J, /* KEY_J 36 */ - SDL_SCANCODE_K, /* KEY_K 37 */ - SDL_SCANCODE_L, /* KEY_L 38 */ - SDL_SCANCODE_SEMICOLON, /* KEY_SEMICOLON 39 */ - SDL_SCANCODE_APOSTROPHE, /* KEY_APOSTROPHE 40 */ - SDL_SCANCODE_GRAVE, /* KEY_GRAVE 41 */ - SDL_SCANCODE_LSHIFT, /* KEY_LEFTSHIFT 42 */ - SDL_SCANCODE_BACKSLASH, /* KEY_BACKSLASH 43 */ - SDL_SCANCODE_Z, /* KEY_Z 44 */ - SDL_SCANCODE_X, /* KEY_X 45 */ - SDL_SCANCODE_C, /* KEY_C 46 */ - SDL_SCANCODE_V, /* KEY_V 47 */ - SDL_SCANCODE_B, /* KEY_B 48 */ - SDL_SCANCODE_N, /* KEY_N 49 */ - SDL_SCANCODE_M, /* KEY_M 50 */ - SDL_SCANCODE_COMMA, /* KEY_COMMA 51 */ - SDL_SCANCODE_PERIOD, /* KEY_DOT 52 */ - SDL_SCANCODE_SLASH, /* KEY_SLASH 53 */ - SDL_SCANCODE_RSHIFT, /* KEY_RIGHTSHIFT 54 */ - SDL_SCANCODE_KP_MULTIPLY, /* KEY_KPASTERISK 55 */ - SDL_SCANCODE_LALT, /* KEY_LEFTALT 56 */ - SDL_SCANCODE_SPACE, /* KEY_SPACE 57 */ - SDL_SCANCODE_CAPSLOCK, /* KEY_CAPSLOCK 58 */ - SDL_SCANCODE_F1, /* KEY_F1 59 */ - SDL_SCANCODE_F2, /* KEY_F2 60 */ - SDL_SCANCODE_F3, /* KEY_F3 61 */ - SDL_SCANCODE_F4, /* KEY_F4 62 */ - SDL_SCANCODE_F5, /* KEY_F5 63 */ - SDL_SCANCODE_F6, /* KEY_F6 64 */ - SDL_SCANCODE_F7, /* KEY_F7 65 */ - SDL_SCANCODE_F8, /* KEY_F8 66 */ - SDL_SCANCODE_F9, /* KEY_F9 67 */ - SDL_SCANCODE_F10, /* KEY_F10 68 */ - SDL_SCANCODE_NUMLOCKCLEAR, /* KEY_NUMLOCK 69 */ - SDL_SCANCODE_SCROLLLOCK, /* KEY_SCROLLLOCK 70 */ - SDL_SCANCODE_KP_7, /* KEY_KP7 71 */ - SDL_SCANCODE_KP_8, /* KEY_KP8 72 */ - SDL_SCANCODE_KP_9, /* KEY_KP9 73 */ - SDL_SCANCODE_KP_MINUS, /* KEY_KPMINUS 74 */ - SDL_SCANCODE_KP_4, /* KEY_KP4 75 */ - SDL_SCANCODE_KP_5, /* KEY_KP5 76 */ - SDL_SCANCODE_KP_6, /* KEY_KP6 77 */ - SDL_SCANCODE_KP_PLUS, /* KEY_KPPLUS 78 */ - SDL_SCANCODE_KP_1, /* KEY_KP1 79 */ - SDL_SCANCODE_KP_2, /* KEY_KP2 80 */ - SDL_SCANCODE_KP_3, /* KEY_KP3 81 */ - SDL_SCANCODE_KP_0, /* KEY_KP0 82 */ - SDL_SCANCODE_KP_PERIOD, /* KEY_KPDOT 83 */ - SDL_SCANCODE_UNKNOWN, /* 84 */ - SDL_SCANCODE_LANG5, /* KEY_ZENKAKUHANKAKU 85 */ - SDL_SCANCODE_UNKNOWN, /* KEY_102ND 86 */ - SDL_SCANCODE_F11, /* KEY_F11 87 */ - SDL_SCANCODE_F12, /* KEY_F12 88 */ - SDL_SCANCODE_UNKNOWN, /* KEY_RO 89 */ - SDL_SCANCODE_LANG3, /* KEY_KATAKANA 90 */ - SDL_SCANCODE_LANG4, /* KEY_HIRAGANA 91 */ - SDL_SCANCODE_UNKNOWN, /* KEY_HENKAN 92 */ - SDL_SCANCODE_LANG3, /* KEY_KATAKANAHIRAGANA 93 */ - SDL_SCANCODE_UNKNOWN, /* KEY_MUHENKAN 94 */ - SDL_SCANCODE_KP_COMMA, /* KEY_KPJPCOMMA 95 */ - SDL_SCANCODE_KP_ENTER, /* KEY_KPENTER 96 */ - SDL_SCANCODE_RCTRL, /* KEY_RIGHTCTRL 97 */ - SDL_SCANCODE_KP_DIVIDE, /* KEY_KPSLASH 98 */ - SDL_SCANCODE_SYSREQ, /* KEY_SYSRQ 99 */ - SDL_SCANCODE_RALT, /* KEY_RIGHTALT 100 */ - SDL_SCANCODE_UNKNOWN, /* KEY_LINEFEED 101 */ - SDL_SCANCODE_HOME, /* KEY_HOME 102 */ - SDL_SCANCODE_UP, /* KEY_UP 103 */ - SDL_SCANCODE_PAGEUP, /* KEY_PAGEUP 104 */ - SDL_SCANCODE_LEFT, /* KEY_LEFT 105 */ - SDL_SCANCODE_RIGHT, /* KEY_RIGHT 106 */ - SDL_SCANCODE_END, /* KEY_END 107 */ - SDL_SCANCODE_DOWN, /* KEY_DOWN 108 */ - SDL_SCANCODE_PAGEDOWN, /* KEY_PAGEDOWN 109 */ - SDL_SCANCODE_INSERT, /* KEY_INSERT 110 */ - SDL_SCANCODE_DELETE, /* KEY_DELETE 111 */ - SDL_SCANCODE_UNKNOWN, /* KEY_MACRO 112 */ - SDL_SCANCODE_MUTE, /* KEY_MUTE 113 */ - SDL_SCANCODE_VOLUMEDOWN, /* KEY_VOLUMEDOWN 114 */ - SDL_SCANCODE_VOLUMEUP, /* KEY_VOLUMEUP 115 */ - SDL_SCANCODE_POWER, /* KEY_POWER 116 SC System Power Down */ - SDL_SCANCODE_KP_EQUALS, /* KEY_KPEQUAL 117 */ - SDL_SCANCODE_KP_MINUS, /* KEY_KPPLUSMINUS 118 */ - SDL_SCANCODE_PAUSE, /* KEY_PAUSE 119 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SCALE 120 AL Compiz Scale (Expose) */ - SDL_SCANCODE_KP_COMMA, /* KEY_KPCOMMA 121 */ - SDL_SCANCODE_LANG1, /* KEY_HANGEUL,KEY_HANGUEL 122 */ - SDL_SCANCODE_LANG2, /* KEY_HANJA 123 */ - SDL_SCANCODE_INTERNATIONAL3,/* KEY_YEN 124 */ - SDL_SCANCODE_LGUI, /* KEY_LEFTMETA 125 */ - SDL_SCANCODE_RGUI, /* KEY_RIGHTMETA 126 */ - SDL_SCANCODE_APPLICATION, /* KEY_COMPOSE 127 */ - SDL_SCANCODE_STOP, /* KEY_STOP 128 AC Stop */ - SDL_SCANCODE_AGAIN, /* KEY_AGAIN 129 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PROPS 130 AC Properties */ - SDL_SCANCODE_UNDO, /* KEY_UNDO 131 AC Undo */ - SDL_SCANCODE_UNKNOWN, /* KEY_FRONT 132 */ - SDL_SCANCODE_COPY, /* KEY_COPY 133 AC Copy */ - SDL_SCANCODE_UNKNOWN, /* KEY_OPEN 134 AC Open */ - SDL_SCANCODE_PASTE, /* KEY_PASTE 135 AC Paste */ - SDL_SCANCODE_FIND, /* KEY_FIND 136 AC Search */ - SDL_SCANCODE_CUT, /* KEY_CUT 137 AC Cut */ - SDL_SCANCODE_HELP, /* KEY_HELP 138 AL Integrated Help Center */ - SDL_SCANCODE_MENU, /* KEY_MENU 139 Menu (show menu) */ - SDL_SCANCODE_CALCULATOR, /* KEY_CALC 140 AL Calculator */ - SDL_SCANCODE_UNKNOWN, /* KEY_SETUP 141 */ - SDL_SCANCODE_SLEEP, /* KEY_SLEEP 142 SC System Sleep */ - SDL_SCANCODE_UNKNOWN, /* KEY_WAKEUP 143 System Wake Up */ - SDL_SCANCODE_UNKNOWN, /* KEY_FILE 144 AL Local Machine Browser */ - SDL_SCANCODE_UNKNOWN, /* KEY_SENDFILE 145 */ - SDL_SCANCODE_UNKNOWN, /* KEY_DELETEFILE 146 */ - SDL_SCANCODE_UNKNOWN, /* KEY_XFER 147 */ - SDL_SCANCODE_APP1, /* KEY_PROG1 148 */ - SDL_SCANCODE_APP1, /* KEY_PROG2 149 */ - SDL_SCANCODE_WWW, /* KEY_WWW 150 AL Internet Browser */ - SDL_SCANCODE_UNKNOWN, /* KEY_MSDOS 151 */ - SDL_SCANCODE_UNKNOWN, /* KEY_COFFEE,KEY_SCREENLOCK 152 AL Terminal Lock/Screensaver */ - SDL_SCANCODE_UNKNOWN, /* KEY_DIRECTION 153 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CYCLEWINDOWS 154 */ - SDL_SCANCODE_MAIL, /* KEY_MAIL 155 */ - SDL_SCANCODE_AC_BOOKMARKS, /* KEY_BOOKMARKS 156 AC Bookmarks */ - SDL_SCANCODE_COMPUTER, /* KEY_COMPUTER 157 */ - SDL_SCANCODE_AC_BACK, /* KEY_BACK 158 AC Back */ - SDL_SCANCODE_AC_FORWARD, /* KEY_FORWARD 159 AC Forward */ - SDL_SCANCODE_UNKNOWN, /* KEY_CLOSECD 160 */ - SDL_SCANCODE_EJECT, /* KEY_EJECTCD 161 */ - SDL_SCANCODE_UNKNOWN, /* KEY_EJECTCLOSECD 162 */ - SDL_SCANCODE_AUDIONEXT, /* KEY_NEXTSONG 163 */ - SDL_SCANCODE_AUDIOPLAY, /* KEY_PLAYPAUSE 164 */ - SDL_SCANCODE_AUDIOPREV, /* KEY_PREVIOUSSONG 165 */ - SDL_SCANCODE_AUDIOSTOP, /* KEY_STOPCD 166 */ - SDL_SCANCODE_UNKNOWN, /* KEY_RECORD 167 */ - SDL_SCANCODE_UNKNOWN, /* KEY_REWIND 168 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PHONE 169 Media Select Telephone */ - SDL_SCANCODE_UNKNOWN, /* KEY_ISO 170 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CONFIG 171 AL Consumer Control Configuration */ - SDL_SCANCODE_AC_HOME, /* KEY_HOMEPAGE 172 AC Home */ - SDL_SCANCODE_AC_REFRESH, /* KEY_REFRESH 173 AC Refresh */ - SDL_SCANCODE_UNKNOWN, /* KEY_EXIT 174 AC Exit */ - SDL_SCANCODE_UNKNOWN, /* KEY_MOVE 175 */ - SDL_SCANCODE_UNKNOWN, /* KEY_EDIT 176 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLUP 177 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLDOWN 178 */ - SDL_SCANCODE_KP_LEFTPAREN, /* KEY_KPLEFTPAREN 179 */ - SDL_SCANCODE_KP_RIGHTPAREN, /* KEY_KPRIGHTPAREN 180 */ - SDL_SCANCODE_UNKNOWN, /* KEY_NEW 181 AC New */ - SDL_SCANCODE_AGAIN, /* KEY_REDO 182 AC Redo/Repeat */ - SDL_SCANCODE_F13, /* KEY_F13 183 */ - SDL_SCANCODE_F14, /* KEY_F14 184 */ - SDL_SCANCODE_F15, /* KEY_F15 185 */ - SDL_SCANCODE_F16, /* KEY_F16 186 */ - SDL_SCANCODE_F17, /* KEY_F17 187 */ - SDL_SCANCODE_F18, /* KEY_F18 188 */ - SDL_SCANCODE_F19, /* KEY_F19 189 */ - SDL_SCANCODE_F20, /* KEY_F20 190 */ - SDL_SCANCODE_F21, /* KEY_F21 191 */ - SDL_SCANCODE_F22, /* KEY_F22 192 */ - SDL_SCANCODE_F23, /* KEY_F23 193 */ - SDL_SCANCODE_F24, /* KEY_F24 194 */ - SDL_SCANCODE_UNKNOWN, /* 195 */ - SDL_SCANCODE_UNKNOWN, /* 196 */ - SDL_SCANCODE_UNKNOWN, /* 197 */ - SDL_SCANCODE_UNKNOWN, /* 198 */ - SDL_SCANCODE_UNKNOWN, /* 199 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PLAYCD 200 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PAUSECD 201 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PROG3 202 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PROG4 203 */ - SDL_SCANCODE_UNKNOWN, /* KEY_DASHBOARD 204 AL Dashboard */ - SDL_SCANCODE_UNKNOWN, /* KEY_SUSPEND 205 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CLOSE 206 AC Close */ - SDL_SCANCODE_UNKNOWN, /* KEY_PLAY 207 */ - SDL_SCANCODE_UNKNOWN, /* KEY_FASTFORWARD 208 */ - SDL_SCANCODE_UNKNOWN, /* KEY_BASSBOOST 209 */ - SDL_SCANCODE_UNKNOWN, /* KEY_PRINT 210 AC Print */ - SDL_SCANCODE_UNKNOWN, /* KEY_HP 211 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CAMERA 212 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SOUND 213 */ - SDL_SCANCODE_UNKNOWN, /* KEY_QUESTION 214 */ - SDL_SCANCODE_UNKNOWN, /* KEY_EMAIL 215 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CHAT 216 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SEARCH 217 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CONNECT 218 */ - SDL_SCANCODE_UNKNOWN, /* KEY_FINANCE 219 AL Checkbook/Finance */ - SDL_SCANCODE_UNKNOWN, /* KEY_SPORT 220 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SHOP 221 */ - SDL_SCANCODE_UNKNOWN, /* KEY_ALTERASE 222 */ - SDL_SCANCODE_UNKNOWN, /* KEY_CANCEL 223 AC Cancel */ - SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESSDOWN 224 */ - SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESSUP 225 */ - SDL_SCANCODE_UNKNOWN, /* KEY_MEDIA 226 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SWITCHVIDEOMODE 227 Cycle between available video outputs (Monitor/LCD/TV-out/etc) */ - SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMTOGGLE 228 */ - SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMDOWN 229 */ - SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMUP 230 */ - SDL_SCANCODE_UNKNOWN, /* KEY_SEND 231 AC Send */ - SDL_SCANCODE_UNKNOWN, /* KEY_REPLY 232 AC Reply */ - SDL_SCANCODE_UNKNOWN, /* KEY_FORWARDMAIL 233 AC Forward Msg */ - SDL_SCANCODE_UNKNOWN, /* KEY_SAVE 234 AC Save */ - SDL_SCANCODE_UNKNOWN, /* KEY_DOCUMENTS 235 */ - SDL_SCANCODE_UNKNOWN, /* KEY_BATTERY 236 */ - SDL_SCANCODE_UNKNOWN, /* KEY_BLUETOOTH 237 */ - SDL_SCANCODE_UNKNOWN, /* KEY_WLAN 238 */ - SDL_SCANCODE_UNKNOWN, /* KEY_UWB 239 */ - SDL_SCANCODE_UNKNOWN, /* KEY_UNKNOWN 240 */ - SDL_SCANCODE_UNKNOWN, /* KEY_VIDEO_NEXT 241 drive next video source */ - SDL_SCANCODE_UNKNOWN, /* KEY_VIDEO_PREV 242 drive previous video source */ - SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESS_CYCLE 243 brightness up, after max is min */ - SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESS_ZERO 244 brightness off, use ambient */ - SDL_SCANCODE_UNKNOWN, /* KEY_DISPLAY_OFF 245 display device to off state */ - SDL_SCANCODE_UNKNOWN, /* KEY_WIMAX 246 */ - SDL_SCANCODE_UNKNOWN, /* KEY_RFKILL 247 Key that controls all radios */ - SDL_SCANCODE_UNKNOWN, /* KEY_MICMUTE 248 Mute / unmute the microphone */ -}; - static Uint8 EVDEV_MouseButtons[] = { SDL_BUTTON_LEFT, /* BTN_LEFT 0x110 */ SDL_BUTTON_RIGHT, /* BTN_RIGHT 0x111 */ @@ -342,121 +127,98 @@ static Uint8 EVDEV_MouseButtons[] = { }; static const char* EVDEV_consoles[] = { - "/proc/self/fd/0", + /* "/proc/self/fd/0", "/dev/tty", - "/dev/tty0", + "/dev/tty0", */ /* the tty ioctl's prohibit these */ "/dev/tty1", "/dev/tty2", "/dev/tty3", "/dev/tty4", "/dev/tty5", "/dev/tty6", + "/dev/tty7", /* usually X is spawned in tty7 */ "/dev/vc/0", "/dev/console" }; -#define IS_CONSOLE(fd) isatty (fd) && ioctl(fd, KDGKBTYPE, &arg) == 0 && ((arg == KB_101) || (arg == KB_84)) - -static int SDL_EVDEV_get_console_fd(void) -{ - int fd, i; - char arg = 0; +static int SDL_EVDEV_is_console(int fd) { + int type; - /* Try a few consoles to see which one we have read access to */ - - for(i = 0; i < SDL_arraysize(EVDEV_consoles); i++) { - fd = open(EVDEV_consoles[i], O_RDONLY); - if (fd >= 0) { - if (IS_CONSOLE(fd)) return fd; - close(fd); - } - } - - /* Try stdin, stdout, stderr */ - - for(fd = 0; fd < 3; fd++) { - if (IS_CONSOLE(fd)) return fd; - } - - /* We won't be able to send SDL_TEXTINPUT events */ - return -1; + return isatty(fd) && ioctl(fd, KDGKBTYPE, &type) == 0 && + (type == KB_101 || type == KB_84); } /* Prevent keystrokes from reaching the tty */ -static int SDL_EVDEV_mute_keyboard(int tty, int *kb_mode) +static int SDL_EVDEV_mute_keyboard(int tty_fd, int* old_kb_mode) { - char arg; - - *kb_mode = 0; /* FIXME: Is this a sane default in case KDGKBMODE fails? */ - if (!IS_CONSOLE(tty)) { + if (!SDL_EVDEV_is_console(tty_fd)) { return SDL_SetError("Tried to mute an invalid tty"); } - ioctl(tty, KDGKBMODE, kb_mode); /* It's not fatal if this fails */ - if (ioctl(tty, KDSKBMUTE, 1) && ioctl(tty, KDSKBMODE, K_OFF)) { - return SDL_SetError("EVDEV: Failed muting keyboard"); + + if (ioctl(tty_fd, KDGKBMODE, old_kb_mode) < 0) { + return SDL_SetError("Failed to get keyboard mode during muting"); } + /* FIXME: atm this absolutely ruins the vt, and KDSKBMUTE isn't implemented + in the kernel */ + /* + if (ioctl(tty_fd, KDSKBMODE, K_OFF) < 0) { + return SDL_SetError("Failed to set keyboard mode during muting"); + } + */ + return 0; } /* Restore the keyboard mode for given tty */ -static void SDL_EVDEV_unmute_keyboard(int tty, int kb_mode) +static void SDL_EVDEV_unmute_keyboard(int tty_fd, int kb_mode) { - if (ioctl(tty, KDSKBMUTE, 0) && ioctl(tty, KDSKBMODE, kb_mode)) { - SDL_Log("EVDEV: Failed restoring keyboard mode"); + /* read above */ + /* + if (ioctl(tty_fd, KDSKBMODE, kb_mode) < 0) { + SDL_Log("Failed to unmute keyboard"); } + */ } -/* Read /sys/class/tty/tty0/active and open the tty */ static int SDL_EVDEV_get_active_tty() -{ - int fd, len; - char ttyname[NAME_MAX + 1]; - char ttypath[PATH_MAX+1] = "/dev/"; - char arg; +{ + int i, fd, ret, tty = 0; + char tiocl; + struct vt_stat vt_state; + char path[PATH_MAX + 1]; - fd = open("/sys/class/tty/tty0/active", O_RDONLY); - if (fd < 0) { - return SDL_SetError("Could not determine which tty is active"); - } - - len = read(fd, ttyname, NAME_MAX); - close(fd); - - if (len <= 0) { - return SDL_SetError("Could not read which tty is active"); - } - - if (ttyname[len-1] == '\n') { - ttyname[len-1] = '\0'; - } - else { - ttyname[len] = '\0'; - } - - SDL_strlcat(ttypath, ttyname, PATH_MAX); - fd = open(ttypath, O_RDWR | O_NOCTTY); - if (fd < 0) { - return SDL_SetError("Could not open tty: %s", ttypath); - } - - if (!IS_CONSOLE(fd)) { + for(i = 0; i < SDL_arraysize(EVDEV_consoles); i++) { + fd = open(EVDEV_consoles[i], O_RDONLY); + + if (fd < 0 && !SDL_EVDEV_is_console(fd)) + break; + + tiocl = TIOCL_GETFGCONSOLE; + if ((ret = ioctl(fd, TIOCLINUX, &tiocl)) >= 0) + tty = ret + 1; + else if (ioctl(fd, VT_GETSTATE, &vt_state) == 0) + tty = vt_state.v_active; + close(fd); - return SDL_SetError("Invalid tty obtained: %s", ttypath); + + if (tty) { + sprintf(path, "/dev/tty%u", tty); + fd = open(path, O_RDONLY); + if (fd >= 0 && SDL_EVDEV_is_console(fd)) + return fd; + } } - - return fd; + + return SDL_SetError("Failed to determine active tty"); } int SDL_EVDEV_Init(void) { - int retval = 0; - if (_this == NULL) { - - _this = (SDL_EVDEV_PrivateData *) SDL_calloc(1, sizeof(*_this)); - if(_this == NULL) { + _this = (SDL_EVDEV_PrivateData*)SDL_calloc(1, sizeof(*_this)); + if (_this == NULL) { return SDL_OutOfMemory(); } @@ -469,7 +231,9 @@ SDL_EVDEV_Init(void) /* Set up the udev callback */ if (SDL_UDEV_AddCallback(SDL_EVDEV_udev_callback) < 0) { - SDL_EVDEV_Quit(); + SDL_UDEV_Quit(); + SDL_free(_this); + _this = NULL; return -1; } @@ -479,26 +243,18 @@ SDL_EVDEV_Init(void) /* TODO: Scan the devices manually, like a caveman */ #endif /* SDL_USE_LIBUDEV */ - /* We need a physical terminal (not PTS) to be able to translate key code to symbols via the kernel tables */ - _this->console_fd = SDL_EVDEV_get_console_fd(); + /* We need a physical terminal (not PTS) to be able to translate key + code to symbols via the kernel tables */ + _this->console_fd = SDL_EVDEV_get_active_tty(); - /* Mute the keyboard so keystrokes only generate evdev events and do not leak through to the console */ - _this->tty = STDIN_FILENO; - if (SDL_EVDEV_mute_keyboard(_this->tty, &_this->kb_mode) < 0) { - /* stdin is not a tty, probably we were launched remotely, so we try to disable the active tty */ - _this->tty = SDL_EVDEV_get_active_tty(); - if (_this->tty >= 0) { - if (SDL_EVDEV_mute_keyboard(_this->tty, &_this->kb_mode) < 0) { - close(_this->tty); - _this->tty = -1; - } - } - } + /* Mute the keyboard so keystrokes only generate evdev events and do not + leak through to the console */ + SDL_EVDEV_mute_keyboard(_this->console_fd, &_this->kb_mode); } _this->ref_count += 1; - return retval; + return 0; } void @@ -511,21 +267,16 @@ SDL_EVDEV_Quit(void) _this->ref_count -= 1; if (_this->ref_count < 1) { - #if SDL_USE_LIBUDEV SDL_UDEV_DelCallback(SDL_EVDEV_udev_callback); SDL_UDEV_Quit(); #endif /* SDL_USE_LIBUDEV */ if (_this->console_fd >= 0) { + SDL_EVDEV_unmute_keyboard(_this->console_fd, _this->kb_mode); close(_this->console_fd); } - if (_this->tty >= 0) { - SDL_EVDEV_unmute_keyboard(_this->tty, _this->kb_mode); - close(_this->tty); - } - /* Remove existing devices */ while(_this->first != NULL) { SDL_EVDEV_device_removed(_this->first->path); @@ -533,7 +284,7 @@ SDL_EVDEV_Quit(void) SDL_assert(_this->first == NULL); SDL_assert(_this->last == NULL); - SDL_assert(_this->numdevices == 0); + SDL_assert(_this->num_devices == 0); SDL_free(_this); _this = NULL; @@ -541,47 +292,116 @@ SDL_EVDEV_Quit(void) } #if SDL_USE_LIBUDEV -void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath) +void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_class, + const char* dev_path) { - if (devpath == NULL) { + if (dev_path == NULL) { return; } - switch(udev_type) { + switch(udev_event) { case SDL_UDEV_DEVICEADDED: - if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE|SDL_UDEV_DEVICE_KEYBOARD))) { + if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE | SDL_UDEV_DEVICE_KEYBOARD | + SDL_UDEV_DEVICE_TOUCHSCREEN))) return; - } - SDL_EVDEV_device_added(devpath); - break; - + + SDL_EVDEV_device_added(dev_path, udev_class); + break; case SDL_UDEV_DEVICEREMOVED: - SDL_EVDEV_device_removed(devpath); + SDL_EVDEV_device_removed(dev_path); break; - default: break; } } - #endif /* SDL_USE_LIBUDEV */ +#ifdef SDL_INPUT_LINUXKD +/* this logic is pulled from kbd_keycode() in drivers/tty/vt/keyboard.c in the + Linux kernel source */ +static void SDL_EVDEV_do_text_input(unsigned short keycode) { + char shift_state; + int locks_state; + struct kbentry kbe; + unsigned char type; + char text[2] = { 0 }; + + if (_this->console_fd < 0) + return; + + shift_state = TIOCL_GETSHIFTSTATE; + if (ioctl(_this->console_fd, TIOCLINUX, &shift_state) < 0) { + /* TODO: error */ + return; + } + + kbe.kb_table = shift_state; + kbe.kb_index = keycode; + + if (ioctl(_this->console_fd, KDGKBENT, &kbe) < 0) { + /* TODO: error */ + return; + } + + type = KTYP(kbe.kb_value); + + if (type < 0xf0) { + /* + * FIXME: keysyms with a type below 0xf0 represent a unicode character + * which requires special handling due to dead characters, diacritics, + * etc. For perfect input a proper way to deal with such characters + * should be implemented. + * + * For reference, the only place I was able to find out about this + * special 0xf0 value was in an unused? couple of patches listed below. + * + * http://ftp.tc.edu.tw/pub/docs/Unicode/utf8/linux-2.3.12-keyboard.diff + * http://ftp.tc.edu.tw/pub/docs/Unicode/utf8/linux-2.3.12-console.diff + */ + + return; + } + + type -= 0xf0; + + /* if type is KT_LETTER then it can be affected by Caps Lock */ + if (type == KT_LETTER) { + type = KT_LATIN; + + if (ioctl(_this->console_fd, KDGKBLED, &locks_state) < 0) { + /* TODO: error */ + return; + } + + if (locks_state & K_CAPSLOCK) { + kbe.kb_table = shift_state ^ (1 << KG_SHIFT); + + if (ioctl(_this->console_fd, KDGKBENT, &kbe) < 0) { + /* TODO: error */ + return; + } + } + } + + /* TODO: convert values >= 0x80 from ISO-8859-1? to UTF-8 */ + if (type != KT_LATIN || KVAL(kbe.kb_value) >= 0x80) + return; + + *text = KVAL(kbe.kb_value); + SDL_SendKeyboardText(text); +} +#endif /* SDL_INPUT_LINUXKD */ + void SDL_EVDEV_Poll(void) { struct input_event events[32]; - int i, len; + int i, j, len; SDL_evdevlist_item *item; SDL_Scancode scan_code; int mouse_button; SDL_Mouse *mouse; -#ifdef SDL_INPUT_LINUXKD - Uint16 modstate; - struct kbentry kbe; - static char keysym[8]; - char *end; - Uint32 kval; -#endif + float norm_x, norm_y; if (!_this) { return; @@ -597,6 +417,13 @@ SDL_EVDEV_Poll(void) while ((len = read(item->fd, events, (sizeof events))) > 0) { len /= sizeof(events[0]); for (i = 0; i < len; ++i) { + /* special handling for touchscreen, that should eventually be + used for all devices */ + if (item->out_of_sync && item->is_touchscreen && + events[i].type == EV_SYN && events[i].code != SYN_REPORT) { + break; + } + switch (events[i].type) { case EV_KEY: if (events[i].code >= BTN_MOUSE && events[i].code < BTN_MOUSE + SDL_arraysize(EVDEV_MouseButtons)) { @@ -614,57 +441,55 @@ SDL_EVDEV_Poll(void) if (scan_code != SDL_SCANCODE_UNKNOWN) { if (events[i].value == 0) { SDL_SendKeyboardKey(SDL_RELEASED, scan_code); - } else if (events[i].value == 1 || events[i].value == 2 /* Key repeated */) { + } else if (events[i].value == 1 || events[i].value == 2 /* key repeated */) { SDL_SendKeyboardKey(SDL_PRESSED, scan_code); #ifdef SDL_INPUT_LINUXKD - if (_this->console_fd >= 0) { - kbe.kb_index = events[i].code; - /* Convert the key to an UTF-8 char */ - /* Ref: http://www.linuxjournal.com/article/2783 */ - modstate = SDL_GetModState(); - kbe.kb_table = 0; - - /* Ref: http://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching */ - kbe.kb_table |= -((modstate & KMOD_LCTRL) != 0) & (1 << KG_CTRLL | 1 << KG_CTRL); - kbe.kb_table |= -((modstate & KMOD_RCTRL) != 0) & (1 << KG_CTRLR | 1 << KG_CTRL); - kbe.kb_table |= -((modstate & KMOD_LSHIFT) != 0) & (1 << KG_SHIFTL | 1 << KG_SHIFT); - kbe.kb_table |= -((modstate & KMOD_RSHIFT) != 0) & (1 << KG_SHIFTR | 1 << KG_SHIFT); - kbe.kb_table |= -((modstate & KMOD_LALT) != 0) & (1 << KG_ALT); - kbe.kb_table |= -((modstate & KMOD_RALT) != 0) & (1 << KG_ALTGR); - - if (ioctl(_this->console_fd, KDGKBENT, (unsigned long)&kbe) == 0 && - ((KTYP(kbe.kb_value) == KT_LATIN) || (KTYP(kbe.kb_value) == KT_ASCII) || (KTYP(kbe.kb_value) == KT_LETTER))) - { - kval = KVAL(kbe.kb_value); - - /* While there's a KG_CAPSSHIFT symbol, it's not useful to build the table index with it - * because 1 << KG_CAPSSHIFT overflows the 8 bits of kb_table - * So, we do the CAPS LOCK logic here. Note that isalpha depends on the locale! - */ - if (modstate & KMOD_CAPS && isalpha(kval)) { - if (isupper(kval)) { - kval = tolower(kval); - } else { - kval = toupper(kval); - } - } - - /* Convert to UTF-8 and send */ - end = SDL_UCS4ToUTF8(kval, keysym); - *end = '\0'; - SDL_SendKeyboardText(keysym); - } - } + SDL_EVDEV_do_text_input(events[i].code); #endif /* SDL_INPUT_LINUXKD */ } } break; case EV_ABS: switch(events[i].code) { + case ABS_MT_SLOT: + if (!item->is_touchscreen) /* FIXME: temp hack */ + break; + item->touchscreen_data->current_slot = events[i].value; + break; + case ABS_MT_TRACKING_ID: + if (!item->is_touchscreen) /* FIXME: temp hack */ + break; + if (events[i].value >= 0) { + item->touchscreen_data->slots[item->touchscreen_data->current_slot].tracking_id = events[i].value; + item->touchscreen_data->slots[item->touchscreen_data->current_slot].delta = EVDEV_TOUCH_SLOTDELTA_DOWN; + } else { + item->touchscreen_data->slots[item->touchscreen_data->current_slot].delta = EVDEV_TOUCH_SLOTDELTA_UP; + } + break; + case ABS_MT_POSITION_X: + if (!item->is_touchscreen) /* FIXME: temp hack */ + break; + item->touchscreen_data->slots[item->touchscreen_data->current_slot].x = events[i].value; + if (item->touchscreen_data->slots[item->touchscreen_data->current_slot].delta == EVDEV_TOUCH_SLOTDELTA_NONE) { + item->touchscreen_data->slots[item->touchscreen_data->current_slot].delta = EVDEV_TOUCH_SLOTDELTA_MOVE; + } + break; + case ABS_MT_POSITION_Y: + if (!item->is_touchscreen) /* FIXME: temp hack */ + break; + item->touchscreen_data->slots[item->touchscreen_data->current_slot].y = events[i].value; + if (item->touchscreen_data->slots[item->touchscreen_data->current_slot].delta == EVDEV_TOUCH_SLOTDELTA_NONE) { + item->touchscreen_data->slots[item->touchscreen_data->current_slot].delta = EVDEV_TOUCH_SLOTDELTA_MOVE; + } + break; case ABS_X: + if (item->is_touchscreen) /* FIXME: temp hack */ + break; SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, events[i].value, mouse->y); break; case ABS_Y: + if (item->is_touchscreen) /* FIXME: temp hack */ + break; SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, mouse->x, events[i].value); break; default: @@ -691,7 +516,41 @@ SDL_EVDEV_Poll(void) break; case EV_SYN: switch (events[i].code) { + case SYN_REPORT: + if (!item->is_touchscreen) /* FIXME: temp hack */ + break; + + for(j = 0; j < item->touchscreen_data->max_slots; j++) { + norm_x = (float)(item->touchscreen_data->slots[j].x - item->touchscreen_data->min_x) / + (float)item->touchscreen_data->range_x; + norm_y = (float)(item->touchscreen_data->slots[j].y - item->touchscreen_data->min_y) / + (float)item->touchscreen_data->range_y; + + switch(item->touchscreen_data->slots[j].delta) { + case EVDEV_TOUCH_SLOTDELTA_DOWN: + SDL_SendTouch(item->fd, item->touchscreen_data->slots[j].tracking_id, SDL_TRUE, norm_x, norm_y, 1.0f); + item->touchscreen_data->slots[j].delta = EVDEV_TOUCH_SLOTDELTA_NONE; + break; + case EVDEV_TOUCH_SLOTDELTA_UP: + SDL_SendTouch(item->fd, item->touchscreen_data->slots[j].tracking_id, SDL_FALSE, norm_x, norm_y, 1.0f); + item->touchscreen_data->slots[j].tracking_id = -1; + item->touchscreen_data->slots[j].delta = EVDEV_TOUCH_SLOTDELTA_NONE; + break; + case EVDEV_TOUCH_SLOTDELTA_MOVE: + SDL_SendTouchMotion(item->fd, item->touchscreen_data->slots[j].tracking_id, norm_x, norm_y, 1.0f); + item->touchscreen_data->slots[j].delta = EVDEV_TOUCH_SLOTDELTA_NONE; + break; + default: + break; + } + } + + if (item->out_of_sync) + item->out_of_sync = 0; + break; case SYN_DROPPED: + if (item->is_touchscreen) + item->out_of_sync = 1; SDL_EVDEV_sync_device(item); break; default: @@ -709,30 +568,227 @@ SDL_EVDEV_translate_keycode(int keycode) { SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN; - if (keycode < SDL_arraysize(EVDEV_Keycodes)) { - scancode = EVDEV_Keycodes[keycode]; - } + if (keycode < SDL_arraysize(linux_scancode_table)) + scancode = linux_scancode_table[keycode]; + if (scancode == SDL_SCANCODE_UNKNOWN) { - SDL_Log("The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list EVDEV KeyCode %d \n", keycode); + SDL_Log("The key you just pressed is not recognized by SDL. To help " + "get this fixed, please report this to the SDL mailing list " + " EVDEV KeyCode %d\n", keycode); } + return scancode; } +#ifdef SDL_USE_LIBUDEV +static int +SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item) +{ + int ret, i; + char name[64]; + struct input_absinfo abs_info; + + if (!item->is_touchscreen) + return 0; + + item->touchscreen_data = SDL_calloc(1, sizeof(*item->touchscreen_data)); + if (item->touchscreen_data == NULL) + return SDL_OutOfMemory(); + + ret = ioctl(item->fd, EVIOCGNAME(sizeof(name)), name); + if (ret < 0) { + SDL_free(item->touchscreen_data); + return SDL_SetError("Failed to get evdev touchscreen name"); + } + + item->touchscreen_data->name = SDL_strdup(name); + if (item->touchscreen_data->name == NULL) { + SDL_free(item->touchscreen_data); + return SDL_OutOfMemory(); + } + + ret = ioctl(item->fd, EVIOCGABS(ABS_MT_POSITION_X), &abs_info); + if (ret < 0) { + SDL_free(item->touchscreen_data->name); + SDL_free(item->touchscreen_data); + return SDL_SetError("Failed to get evdev touchscreen limits"); + } + item->touchscreen_data->min_x = abs_info.minimum; + item->touchscreen_data->max_x = abs_info.maximum; + item->touchscreen_data->range_x = abs_info.maximum - abs_info.minimum; + + ret = ioctl(item->fd, EVIOCGABS(ABS_MT_POSITION_Y), &abs_info); + if (ret < 0) { + SDL_free(item->touchscreen_data->name); + SDL_free(item->touchscreen_data); + return SDL_SetError("Failed to get evdev touchscreen limits"); + } + item->touchscreen_data->min_y = abs_info.minimum; + item->touchscreen_data->max_y = abs_info.maximum; + item->touchscreen_data->range_y = abs_info.maximum - abs_info.minimum; + + ret = ioctl(item->fd, EVIOCGABS(ABS_MT_SLOT), &abs_info); + if (ret < 0) { + SDL_free(item->touchscreen_data->name); + SDL_free(item->touchscreen_data); + return SDL_SetError("Failed to get evdev touchscreen limits"); + } + item->touchscreen_data->max_slots = abs_info.maximum + 1; + + item->touchscreen_data->slots = SDL_calloc( + item->touchscreen_data->max_slots, + sizeof(*item->touchscreen_data->slots)); + if (item->touchscreen_data->slots == NULL) { + SDL_free(item->touchscreen_data->name); + SDL_free(item->touchscreen_data); + return SDL_OutOfMemory(); + } + + for(i = 0; i < item->touchscreen_data->max_slots; i++) { + item->touchscreen_data->slots[i].tracking_id = -1; + } + + ret = SDL_AddTouch(item->fd, /* I guess our fd is unique enough */ + item->touchscreen_data->name); + if (ret < 0) { + SDL_free(item->touchscreen_data->slots); + SDL_free(item->touchscreen_data->name); + SDL_free(item->touchscreen_data); + return ret; + } + + return 0; +} +#endif /* SDL_USE_LIBUDEV */ + +static void +SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item* item) { + if (!item->is_touchscreen) + return; + + SDL_DelTouch(item->fd); + SDL_free(item->touchscreen_data->slots); + SDL_free(item->touchscreen_data->name); + SDL_free(item->touchscreen_data); +} + static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item) { - /* TODO: get full state of device and report whatever is required */ +#ifdef EVIOCGMTSLOTS + int i, ret; + struct input_absinfo abs_info; + /* + * struct input_mt_request_layout { + * __u32 code; + * __s32 values[num_slots]; + * }; + * + * this is the structure we're trying to emulate + */ + __u32* mt_req_code; + __s32* mt_req_values; + size_t mt_req_size; + + /* TODO: sync devices other than touchscreen */ + if (!item->is_touchscreen) + return; + + mt_req_size = sizeof(*mt_req_code) + + sizeof(*mt_req_values) * item->touchscreen_data->max_slots; + + mt_req_code = SDL_calloc(1, mt_req_size); + if (mt_req_code == NULL) { + return; + } + + mt_req_values = (__s32*)mt_req_code + 1; + + *mt_req_code = ABS_MT_TRACKING_ID; + ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code); + if (ret < 0) { + SDL_free(mt_req_code); + return; + } + for(i = 0; i < item->touchscreen_data->max_slots; i++) { + /* + * This doesn't account for the very edge case of the user removing their + * finger and replacing it on the screen during the time we're out of sync, + * which'll mean that we're not going from down -> up or up -> down, we're + * going from down -> down but with a different tracking id, meaning we'd + * have to tell SDL of the two events, but since we wait till SYN_REPORT in + * SDL_EVDEV_Poll to tell SDL, the current structure of this code doesn't + * allow it. Lets just pray to God it doesn't happen. + */ + if (item->touchscreen_data->slots[i].tracking_id < 0 && + mt_req_values[i] >= 0) { + item->touchscreen_data->slots[i].tracking_id = mt_req_values[i]; + item->touchscreen_data->slots[i].delta = EVDEV_TOUCH_SLOTDELTA_DOWN; + } else if (item->touchscreen_data->slots[i].tracking_id >= 0 && + mt_req_values[i] < 0) { + item->touchscreen_data->slots[i].tracking_id = -1; + item->touchscreen_data->slots[i].delta = EVDEV_TOUCH_SLOTDELTA_UP; + } + } + + *mt_req_code = ABS_MT_POSITION_X; + ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code); + if (ret < 0) { + SDL_free(mt_req_code); + return; + } + for(i = 0; i < item->touchscreen_data->max_slots; i++) { + if (item->touchscreen_data->slots[i].tracking_id >= 0 && + item->touchscreen_data->slots[i].x != mt_req_values[i]) { + item->touchscreen_data->slots[i].x = mt_req_values[i]; + if (item->touchscreen_data->slots[i].delta == + EVDEV_TOUCH_SLOTDELTA_NONE) { + item->touchscreen_data->slots[i].delta = + EVDEV_TOUCH_SLOTDELTA_MOVE; + } + } + } + + *mt_req_code = ABS_MT_POSITION_Y; + ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code); + if (ret < 0) { + SDL_free(mt_req_code); + return; + } + for(i = 0; i < item->touchscreen_data->max_slots; i++) { + if (item->touchscreen_data->slots[i].tracking_id >= 0 && + item->touchscreen_data->slots[i].y != mt_req_values[i]) { + item->touchscreen_data->slots[i].y = mt_req_values[i]; + if (item->touchscreen_data->slots[i].delta == + EVDEV_TOUCH_SLOTDELTA_NONE) { + item->touchscreen_data->slots[i].delta = + EVDEV_TOUCH_SLOTDELTA_MOVE; + } + } + } + + ret = ioctl(item->fd, EVIOCGABS(ABS_MT_SLOT), &abs_info); + if (ret < 0) { + SDL_free(mt_req_code); + return; + } + item->touchscreen_data->current_slot = abs_info.value; + + SDL_free(mt_req_code); + +#endif /* EVIOCGMTSLOTS */ } #if SDL_USE_LIBUDEV static int -SDL_EVDEV_device_added(const char *devpath) +SDL_EVDEV_device_added(const char *dev_path, int udev_class) { + int ret; SDL_evdevlist_item *item; /* Check to make sure it's not already in list. */ for (item = _this->first; item != NULL; item = item->next) { - if (SDL_strcmp(devpath, item->path) == 0) { + if (SDL_strcmp(dev_path, item->path) == 0) { return -1; /* already have this one */ } } @@ -742,21 +798,28 @@ SDL_EVDEV_device_added(const char *devpath) return SDL_OutOfMemory(); } - item->fd = open(devpath, O_RDONLY, 0); + item->fd = open(dev_path, O_RDONLY | O_NONBLOCK); if (item->fd < 0) { SDL_free(item); - return SDL_SetError("Unable to open %s", devpath); + return SDL_SetError("Unable to open %s", dev_path); } - item->path = SDL_strdup(devpath); + item->path = SDL_strdup(dev_path); if (item->path == NULL) { close(item->fd); SDL_free(item); return SDL_OutOfMemory(); } - /* Non blocking read mode */ - fcntl(item->fd, F_SETFL, O_NONBLOCK); + if (udev_class & SDL_UDEV_DEVICE_TOUCHSCREEN) { + item->is_touchscreen = 1; + + if ((ret = SDL_EVDEV_init_touchscreen(item)) < 0) { + close(item->fd); + SDL_free(item); + return ret; + } + } if (_this->last == NULL) { _this->first = _this->last = item; @@ -767,19 +830,19 @@ SDL_EVDEV_device_added(const char *devpath) SDL_EVDEV_sync_device(item); - return _this->numdevices++; + return _this->num_devices++; } #endif /* SDL_USE_LIBUDEV */ static int -SDL_EVDEV_device_removed(const char *devpath) +SDL_EVDEV_device_removed(const char *dev_path) { SDL_evdevlist_item *item; SDL_evdevlist_item *prev = NULL; for (item = _this->first; item != NULL; item = item->next) { /* found it, remove it. */ - if (SDL_strcmp(devpath, item->path) == 0) { + if (SDL_strcmp(dev_path, item->path) == 0) { if (prev != NULL) { prev->next = item->next; } else { @@ -789,10 +852,13 @@ SDL_EVDEV_device_removed(const char *devpath) if (item == _this->last) { _this->last = prev; } + if (item->is_touchscreen) { + SDL_EVDEV_destroy_touchscreen(item); + } close(item->fd); SDL_free(item->path); SDL_free(item); - _this->numdevices--; + _this->num_devices--; return 0; } prev = item; @@ -805,4 +871,3 @@ SDL_EVDEV_device_removed(const char *devpath) #endif /* SDL_INPUT_LINUXEV */ /* vi: set ts=4 sw=4 expandtab: */ - diff --git a/Engine/lib/sdl/src/core/linux/SDL_evdev.h b/Engine/lib/sdl/src/core/linux/SDL_evdev.h index 989ced858..85b193864 100644 --- a/Engine/lib/sdl/src/core/linux/SDL_evdev.h +++ b/Engine/lib/sdl/src/core/linux/SDL_evdev.h @@ -27,31 +27,11 @@ #ifdef SDL_INPUT_LINUXEV #include "SDL_events.h" -#include - -typedef struct SDL_evdevlist_item -{ - char *path; - int fd; - struct SDL_evdevlist_item *next; -} SDL_evdevlist_item; - -typedef struct SDL_EVDEV_PrivateData -{ - SDL_evdevlist_item *first; - SDL_evdevlist_item *last; - int numdevices; - int ref_count; - int console_fd; - int kb_mode; - int tty; -} SDL_EVDEV_PrivateData; extern int SDL_EVDEV_Init(void); extern void SDL_EVDEV_Quit(void); extern void SDL_EVDEV_Poll(void); - #endif /* SDL_INPUT_LINUXEV */ #endif /* _SDL_evdev_h */ diff --git a/Engine/lib/sdl/src/core/linux/SDL_fcitx.c b/Engine/lib/sdl/src/core/linux/SDL_fcitx.c new file mode 100644 index 000000000..83d19e690 --- /dev/null +++ b/Engine/lib/sdl/src/core/linux/SDL_fcitx.c @@ -0,0 +1,553 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +#include "../../SDL_internal.h" + +#ifdef HAVE_FCITX_FRONTEND_H + +#include +#include + +#include "SDL_fcitx.h" +#include "SDL_keycode.h" +#include "SDL_keyboard.h" +#include "../../events/SDL_keyboard_c.h" +#include "SDL_dbus.h" +#include "SDL_syswm.h" +#if SDL_VIDEO_DRIVER_X11 +# include "../../video/x11/SDL_x11video.h" +#endif +#include "SDL_hints.h" + +#define FCITX_DBUS_SERVICE "org.fcitx.Fcitx" + +#define FCITX_IM_DBUS_PATH "/inputmethod" +#define FCITX_IC_DBUS_PATH "/inputcontext_%d" + +#define FCITX_IM_DBUS_INTERFACE "org.fcitx.Fcitx.InputMethod" +#define FCITX_IC_DBUS_INTERFACE "org.fcitx.Fcitx.InputContext" + +#define IC_NAME_MAX 64 +#define DBUS_TIMEOUT 500 + +typedef struct _FcitxClient +{ + SDL_DBusContext *dbus; + + char servicename[IC_NAME_MAX]; + char icname[IC_NAME_MAX]; + + int id; + + SDL_Rect cursor_rect; +} FcitxClient; + +static FcitxClient fcitx_client; + +static int +GetDisplayNumber() +{ + const char *display = SDL_getenv("DISPLAY"); + const char *p = NULL; + int number = 0; + + if (display == NULL) + return 0; + + display = SDL_strchr(display, ':'); + if (display == NULL) + return 0; + + display++; + p = SDL_strchr(display, '.'); + if (p == NULL && display != NULL) { + number = SDL_strtod(display, NULL); + } else { + char *buffer = SDL_strdup(display); + buffer[p - display] = '\0'; + number = SDL_strtod(buffer, NULL); + SDL_free(buffer); + } + + return number; +} + +static char* +GetAppName() +{ +#if defined(__LINUX__) || defined(__FREEBSD__) + char *spot; + char procfile[1024]; + char linkfile[1024]; + int linksize; + +#if defined(__LINUX__) + SDL_snprintf(procfile, sizeof(procfile), "/proc/%d/exe", getpid()); +#elif defined(__FREEBSD__) + SDL_snprintf(procfile, sizeof(procfile), "/proc/%d/file", getpid()); +#endif + linksize = readlink(procfile, linkfile, sizeof(linkfile) - 1); + if (linksize > 0) { + linkfile[linksize] = '\0'; + spot = SDL_strrchr(linkfile, '/'); + if (spot) { + return SDL_strdup(spot + 1); + } else { + return SDL_strdup(linkfile); + } + } +#endif /* __LINUX__ || __FREEBSD__ */ + + return SDL_strdup("SDL_App"); +} + +/* + * Copied from fcitx source + */ +#define CONT(i) ISUTF8_CB(in[i]) +#define VAL(i, s) ((in[i]&0x3f) << s) + +static char * +_fcitx_utf8_get_char(const char *i, uint32_t *chr) +{ + const unsigned char* in = (const unsigned char *)i; + if (!(in[0] & 0x80)) { + *(chr) = *(in); + return (char *)in + 1; + } + + /* 2-byte, 0x80-0x7ff */ + if ((in[0] & 0xe0) == 0xc0 && CONT(1)) { + *chr = ((in[0] & 0x1f) << 6) | VAL(1, 0); + return (char *)in + 2; + } + + /* 3-byte, 0x800-0xffff */ + if ((in[0] & 0xf0) == 0xe0 && CONT(1) && CONT(2)) { + *chr = ((in[0] & 0xf) << 12) | VAL(1, 6) | VAL(2, 0); + return (char *)in + 3; + } + + /* 4-byte, 0x10000-0x1FFFFF */ + if ((in[0] & 0xf8) == 0xf0 && CONT(1) && CONT(2) && CONT(3)) { + *chr = ((in[0] & 0x7) << 18) | VAL(1, 12) | VAL(2, 6) | VAL(3, 0); + return (char *)in + 4; + } + + /* 5-byte, 0x200000-0x3FFFFFF */ + if ((in[0] & 0xfc) == 0xf8 && CONT(1) && CONT(2) && CONT(3) && CONT(4)) { + *chr = ((in[0] & 0x3) << 24) | VAL(1, 18) | VAL(2, 12) | VAL(3, 6) | VAL(4, 0); + return (char *)in + 5; + } + + /* 6-byte, 0x400000-0x7FFFFFF */ + if ((in[0] & 0xfe) == 0xfc && CONT(1) && CONT(2) && CONT(3) && CONT(4) && CONT(5)) { + *chr = ((in[0] & 0x1) << 30) | VAL(1, 24) | VAL(2, 18) | VAL(3, 12) | VAL(4, 6) | VAL(5, 0); + return (char *)in + 6; + } + + *chr = *in; + + return (char *)in + 1; +} + +static size_t +_fcitx_utf8_strlen(const char *s) +{ + unsigned int l = 0; + + while (*s) { + uint32_t chr; + + s = _fcitx_utf8_get_char(s, &chr); + l++; + } + + return l; +} + +static DBusHandlerResult +DBus_MessageFilter(DBusConnection *conn, DBusMessage *msg, void *data) +{ + SDL_DBusContext *dbus = (SDL_DBusContext *)data; + + if (dbus->message_is_signal(msg, FCITX_IC_DBUS_INTERFACE, "CommitString")) { + DBusMessageIter iter; + const char *text = NULL; + + dbus->message_iter_init(msg, &iter); + dbus->message_iter_get_basic(&iter, &text); + + if (text) + SDL_SendKeyboardText(text); + + return DBUS_HANDLER_RESULT_HANDLED; + } + + if (dbus->message_is_signal(msg, FCITX_IC_DBUS_INTERFACE, "UpdatePreedit")) { + DBusMessageIter iter; + const char *text; + + dbus->message_iter_init(msg, &iter); + dbus->message_iter_get_basic(&iter, &text); + + if (text && *text) { + char buf[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; + size_t text_bytes = SDL_strlen(text), i = 0; + size_t cursor = 0; + + while (i < text_bytes) { + size_t sz = SDL_utf8strlcpy(buf, text + i, sizeof(buf)); + size_t chars = _fcitx_utf8_strlen(buf); + + SDL_SendEditingText(buf, cursor, chars); + + i += sz; + cursor += chars; + } + } + + SDL_Fcitx_UpdateTextRect(NULL); + return DBUS_HANDLER_RESULT_HANDLED; + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +static DBusMessage* +FcitxClientICNewMethod(FcitxClient *client, + const char *method) +{ + SDL_DBusContext *dbus = client->dbus; + return dbus->message_new_method_call( + client->servicename, + client->icname, + FCITX_IC_DBUS_INTERFACE, + method); +} + +static void +FcitxClientICCallMethod(FcitxClient *client, + const char *method) +{ + SDL_DBusContext *dbus = client->dbus; + DBusMessage *msg = FcitxClientICNewMethod(client, method); + + if (msg == NULL) + return ; + + if (dbus->connection_send(dbus->session_conn, msg, NULL)) { + dbus->connection_flush(dbus->session_conn); + } + + dbus->message_unref(msg); +} + +static void +Fcitx_SetCapabilities(void *data, + const char *name, + const char *old_val, + const char *internal_editing) +{ + FcitxClient *client = (FcitxClient *)data; + SDL_DBusContext *dbus = client->dbus; + Uint32 caps = CAPACITY_NONE; + + DBusMessage *msg = FcitxClientICNewMethod(client, "SetCapacity"); + if (msg == NULL) + return ; + + if (!(internal_editing && *internal_editing == '1')) { + caps |= CAPACITY_PREEDIT; + } + + dbus->message_append_args(msg, + DBUS_TYPE_UINT32, &caps, + DBUS_TYPE_INVALID); + if (dbus->connection_send(dbus->session_conn, msg, NULL)) { + dbus->connection_flush(dbus->session_conn); + } + + dbus->message_unref(msg); +} + +static void +FcitxClientCreateIC(FcitxClient *client) +{ + char *appname = NULL; + pid_t pid = 0; + int id = 0; + SDL_bool enable; + Uint32 arg1, arg2, arg3, arg4; + + SDL_DBusContext *dbus = client->dbus; + DBusMessage *reply = NULL; + DBusMessage *msg = dbus->message_new_method_call( + client->servicename, + FCITX_IM_DBUS_PATH, + FCITX_IM_DBUS_INTERFACE, + "CreateICv3" + ); + + if (msg == NULL) + return ; + + appname = GetAppName(); + pid = getpid(); + dbus->message_append_args(msg, + DBUS_TYPE_STRING, &appname, + DBUS_TYPE_INT32, &pid, + DBUS_TYPE_INVALID); + + do { + reply = dbus->connection_send_with_reply_and_block( + dbus->session_conn, + msg, + DBUS_TIMEOUT, + NULL); + + if (!reply) + break; + if (!dbus->message_get_args(reply, NULL, + DBUS_TYPE_INT32, &id, + DBUS_TYPE_BOOLEAN, &enable, + DBUS_TYPE_UINT32, &arg1, + DBUS_TYPE_UINT32, &arg2, + DBUS_TYPE_UINT32, &arg3, + DBUS_TYPE_UINT32, &arg4, + DBUS_TYPE_INVALID)) + break; + + if (id < 0) + break; + client->id = id; + + SDL_snprintf(client->icname, IC_NAME_MAX, + FCITX_IC_DBUS_PATH, client->id); + + dbus->bus_add_match(dbus->session_conn, + "type='signal', interface='org.fcitx.Fcitx.InputContext'", + NULL); + dbus->connection_add_filter(dbus->session_conn, + &DBus_MessageFilter, dbus, + NULL); + dbus->connection_flush(dbus->session_conn); + + SDL_AddHintCallback(SDL_HINT_IME_INTERNAL_EDITING, &Fcitx_SetCapabilities, client); + } + while (0); + + if (reply) + dbus->message_unref(reply); + dbus->message_unref(msg); + SDL_free(appname); +} + +static Uint32 +Fcitx_ModState(void) +{ + Uint32 fcitx_mods = 0; + SDL_Keymod sdl_mods = SDL_GetModState(); + + if (sdl_mods & KMOD_SHIFT) fcitx_mods |= FcitxKeyState_Shift; + if (sdl_mods & KMOD_CAPS) fcitx_mods |= FcitxKeyState_CapsLock; + if (sdl_mods & KMOD_CTRL) fcitx_mods |= FcitxKeyState_Ctrl; + if (sdl_mods & KMOD_ALT) fcitx_mods |= FcitxKeyState_Alt; + if (sdl_mods & KMOD_NUM) fcitx_mods |= FcitxKeyState_NumLock; + if (sdl_mods & KMOD_LGUI) fcitx_mods |= FcitxKeyState_Super; + if (sdl_mods & KMOD_RGUI) fcitx_mods |= FcitxKeyState_Meta; + + return fcitx_mods; +} + +SDL_bool +SDL_Fcitx_Init() +{ + fcitx_client.dbus = SDL_DBus_GetContext(); + + fcitx_client.cursor_rect.x = -1; + fcitx_client.cursor_rect.y = -1; + fcitx_client.cursor_rect.w = 0; + fcitx_client.cursor_rect.h = 0; + + SDL_snprintf(fcitx_client.servicename, IC_NAME_MAX, + "%s-%d", + FCITX_DBUS_SERVICE, GetDisplayNumber()); + + FcitxClientCreateIC(&fcitx_client); + + return SDL_TRUE; +} + +void +SDL_Fcitx_Quit() +{ + FcitxClientICCallMethod(&fcitx_client, "DestroyIC"); +} + +void +SDL_Fcitx_SetFocus(SDL_bool focused) +{ + if (focused) { + FcitxClientICCallMethod(&fcitx_client, "FocusIn"); + } else { + FcitxClientICCallMethod(&fcitx_client, "FocusOut"); + } +} + +void +SDL_Fcitx_Reset(void) +{ + FcitxClientICCallMethod(&fcitx_client, "Reset"); + FcitxClientICCallMethod(&fcitx_client, "CloseIC"); +} + +SDL_bool +SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode) +{ + DBusMessage *msg = NULL; + DBusMessage *reply = NULL; + SDL_DBusContext *dbus = fcitx_client.dbus; + + Uint32 state = 0; + SDL_bool handled = SDL_FALSE; + int type = FCITX_PRESS_KEY; + Uint32 event_time = 0; + + msg = FcitxClientICNewMethod(&fcitx_client, "ProcessKeyEvent"); + if (msg == NULL) + return SDL_FALSE; + + state = Fcitx_ModState(); + dbus->message_append_args(msg, + DBUS_TYPE_UINT32, &keysym, + DBUS_TYPE_UINT32, &keycode, + DBUS_TYPE_UINT32, &state, + DBUS_TYPE_INT32, &type, + DBUS_TYPE_UINT32, &event_time, + DBUS_TYPE_INVALID); + + reply = dbus->connection_send_with_reply_and_block(dbus->session_conn, + msg, + -1, + NULL); + + if (reply) { + dbus->message_get_args(reply, + NULL, + DBUS_TYPE_INT32, &handled, + DBUS_TYPE_INVALID); + + dbus->message_unref(reply); + } + + if (handled) { + SDL_Fcitx_UpdateTextRect(NULL); + } + + return handled; +} + +void +SDL_Fcitx_UpdateTextRect(SDL_Rect *rect) +{ + SDL_Window *focused_win = NULL; + SDL_SysWMinfo info; + int x = 0, y = 0; + SDL_Rect *cursor = &fcitx_client.cursor_rect; + + SDL_DBusContext *dbus = fcitx_client.dbus; + DBusMessage *msg = NULL; + DBusConnection *conn; + + if (rect) { + SDL_memcpy(cursor, rect, sizeof(SDL_Rect)); + } + + focused_win = SDL_GetKeyboardFocus(); + if (!focused_win) { + return ; + } + + SDL_VERSION(&info.version); + if (!SDL_GetWindowWMInfo(focused_win, &info)) { + return; + } + + SDL_GetWindowPosition(focused_win, &x, &y); + +#if SDL_VIDEO_DRIVER_X11 + if (info.subsystem == SDL_SYSWM_X11) { + SDL_DisplayData *displaydata = (SDL_DisplayData *) SDL_GetDisplayForWindow(focused_win)->driverdata; + + Display *x_disp = info.info.x11.display; + Window x_win = info.info.x11.window; + int x_screen = displaydata->screen; + Window unused; + X11_XTranslateCoordinates(x_disp, x_win, RootWindow(x_disp, x_screen), 0, 0, &x, &y, &unused); + } +#endif + + if (cursor->x == -1 && cursor->y == -1 && cursor->w == 0 && cursor->h == 0) { + // move to bottom left + int w = 0, h = 0; + SDL_GetWindowSize(focused_win, &w, &h); + cursor->x = 0; + cursor->y = h; + } + + x += cursor->x; + y += cursor->y; + + msg = FcitxClientICNewMethod(&fcitx_client, "SetCursorRect"); + if (msg == NULL) + return ; + + dbus->message_append_args(msg, + DBUS_TYPE_INT32, &x, + DBUS_TYPE_INT32, &y, + DBUS_TYPE_INT32, &cursor->w, + DBUS_TYPE_INT32, &cursor->h, + DBUS_TYPE_INVALID); + + conn = dbus->session_conn; + if (dbus->connection_send(conn, msg, NULL)) + dbus->connection_flush(conn); + + dbus->message_unref(msg); +} + +void +SDL_Fcitx_PumpEvents() +{ + SDL_DBusContext *dbus = fcitx_client.dbus; + DBusConnection *conn = dbus->session_conn; + + dbus->connection_read_write(conn, 0); + + while (dbus->connection_dispatch(conn) == DBUS_DISPATCH_DATA_REMAINS) { + /* Do nothing, actual work happens in DBus_MessageFilter */ + usleep(10); + } +} + +#endif /* HAVE_FCITX_FRONTEND_H */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/core/linux/SDL_fcitx.h b/Engine/lib/sdl/src/core/linux/SDL_fcitx.h new file mode 100644 index 000000000..64020475c --- /dev/null +++ b/Engine/lib/sdl/src/core/linux/SDL_fcitx.h @@ -0,0 +1,40 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef _SDL_fcitx_h +#define _SDL_fcitx_h + +#include "../../SDL_internal.h" + +#include "SDL_stdinc.h" +#include "SDL_rect.h" + +extern SDL_bool SDL_Fcitx_Init(void); +extern void SDL_Fcitx_Quit(void); +extern void SDL_Fcitx_SetFocus(SDL_bool focused); +extern void SDL_Fcitx_Reset(void); +extern SDL_bool SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode); +extern void SDL_Fcitx_UpdateTextRect(SDL_Rect *rect); +extern void SDL_Fcitx_PumpEvents(); + +#endif /* _SDL_fcitx_h */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/core/linux/SDL_ibus.c b/Engine/lib/sdl/src/core/linux/SDL_ibus.c index c9804c90a..3d63b8b30 100644 --- a/Engine/lib/sdl/src/core/linux/SDL_ibus.c +++ b/Engine/lib/sdl/src/core/linux/SDL_ibus.c @@ -42,7 +42,7 @@ static const char IBUS_INTERFACE[] = "org.freedesktop.IBus"; static const char IBUS_INPUT_INTERFACE[] = "org.freedesktop.IBus.InputContext"; static char *input_ctx_path = NULL; -static SDL_Rect ibus_cursor_rect = {0}; +static SDL_Rect ibus_cursor_rect = { 0, 0, 0, 0 }; static DBusConnection *ibus_conn = NULL; static char *ibus_addr_file = NULL; int inotify_fd = -1, inotify_wd = -1; @@ -341,7 +341,9 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr) const char *path = NULL; SDL_bool result = SDL_FALSE; DBusMessage *msg; - DBusObjectPathVTable ibus_vtable = {0}; + DBusObjectPathVTable ibus_vtable; + + SDL_zero(ibus_vtable); ibus_vtable.message_function = &IBus_MessageHandler; ibus_conn = dbus->connection_open_private(addr, NULL); diff --git a/Engine/lib/sdl/src/core/linux/SDL_ime.c b/Engine/lib/sdl/src/core/linux/SDL_ime.c new file mode 100644 index 000000000..049bd6e02 --- /dev/null +++ b/Engine/lib/sdl/src/core/linux/SDL_ime.c @@ -0,0 +1,138 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#include "SDL_ime.h" +#include "SDL_ibus.h" +#include "SDL_fcitx.h" + +typedef SDL_bool (*_SDL_IME_Init)(); +typedef void (*_SDL_IME_Quit)(); +typedef void (*_SDL_IME_SetFocus)(SDL_bool); +typedef void (*_SDL_IME_Reset)(); +typedef SDL_bool (*_SDL_IME_ProcessKeyEvent)(Uint32, Uint32); +typedef void (*_SDL_IME_UpdateTextRect)(SDL_Rect *); +typedef void (*_SDL_IME_PumpEvents)(); + +static _SDL_IME_Init SDL_IME_Init_Real = NULL; +static _SDL_IME_Quit SDL_IME_Quit_Real = NULL; +static _SDL_IME_SetFocus SDL_IME_SetFocus_Real = NULL; +static _SDL_IME_Reset SDL_IME_Reset_Real = NULL; +static _SDL_IME_ProcessKeyEvent SDL_IME_ProcessKeyEvent_Real = NULL; +static _SDL_IME_UpdateTextRect SDL_IME_UpdateTextRect_Real = NULL; +static _SDL_IME_PumpEvents SDL_IME_PumpEvents_Real = NULL; + +static void +InitIME() +{ + static SDL_bool inited = SDL_FALSE; +#ifdef HAVE_FCITX_FRONTEND_H + const char *im_module = SDL_getenv("SDL_IM_MODULE"); + const char *xmodifiers = SDL_getenv("XMODIFIERS"); +#endif + + if (inited == SDL_TRUE) + return; + + inited = SDL_TRUE; + + /* See if fcitx IME support is being requested */ +#ifdef HAVE_FCITX_FRONTEND_H + if (!SDL_IME_Init_Real && + ((im_module && SDL_strcmp(im_module, "fcitx") == 0) || + (!im_module && xmodifiers && SDL_strstr(xmodifiers, "@im=fcitx") != NULL))) { + SDL_IME_Init_Real = SDL_Fcitx_Init; + SDL_IME_Quit_Real = SDL_Fcitx_Quit; + SDL_IME_SetFocus_Real = SDL_Fcitx_SetFocus; + SDL_IME_Reset_Real = SDL_Fcitx_Reset; + SDL_IME_ProcessKeyEvent_Real = SDL_Fcitx_ProcessKeyEvent; + SDL_IME_UpdateTextRect_Real = SDL_Fcitx_UpdateTextRect; + SDL_IME_PumpEvents_Real = SDL_Fcitx_PumpEvents; + } +#endif /* HAVE_FCITX_FRONTEND_H */ + + /* default to IBus */ +#ifdef HAVE_IBUS_IBUS_H + if (!SDL_IME_Init_Real) { + SDL_IME_Init_Real = SDL_IBus_Init; + SDL_IME_Quit_Real = SDL_IBus_Quit; + SDL_IME_SetFocus_Real = SDL_IBus_SetFocus; + SDL_IME_Reset_Real = SDL_IBus_Reset; + SDL_IME_ProcessKeyEvent_Real = SDL_IBus_ProcessKeyEvent; + SDL_IME_UpdateTextRect_Real = SDL_IBus_UpdateTextRect; + SDL_IME_PumpEvents_Real = SDL_IBus_PumpEvents; + } +#endif /* HAVE_IBUS_IBUS_H */ +} + +SDL_bool +SDL_IME_Init(void) +{ + InitIME(); + + if (SDL_IME_Init_Real) + return SDL_IME_Init_Real(); + + return SDL_FALSE; +} + +void +SDL_IME_Quit(void) +{ + if (SDL_IME_Quit_Real) + SDL_IME_Quit_Real(); +} + +void +SDL_IME_SetFocus(SDL_bool focused) +{ + if (SDL_IME_SetFocus_Real) + SDL_IME_SetFocus_Real(focused); +} + +void +SDL_IME_Reset(void) +{ + if (SDL_IME_Reset_Real) + SDL_IME_Reset_Real(); +} + +SDL_bool +SDL_IME_ProcessKeyEvent(Uint32 keysym, Uint32 keycode) +{ + if (SDL_IME_ProcessKeyEvent_Real) + return SDL_IME_ProcessKeyEvent_Real(keysym, keycode); + + return SDL_FALSE; +} + +void +SDL_IME_UpdateTextRect(SDL_Rect *rect) +{ + if (SDL_IME_UpdateTextRect_Real) + SDL_IME_UpdateTextRect_Real(rect); +} + +void +SDL_IME_PumpEvents() +{ + if (SDL_IME_PumpEvents_Real) + SDL_IME_PumpEvents_Real(); +} diff --git a/Engine/lib/sdl/src/core/linux/SDL_ime.h b/Engine/lib/sdl/src/core/linux/SDL_ime.h new file mode 100644 index 000000000..22b31de39 --- /dev/null +++ b/Engine/lib/sdl/src/core/linux/SDL_ime.h @@ -0,0 +1,38 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef _SDL_ime_h +#define _SDL_ime_h + +#include "../../SDL_internal.h" + +#include "SDL_stdinc.h" +#include "SDL_rect.h" + +extern SDL_bool SDL_IME_Init(); +extern void SDL_IME_Quit(); +extern void SDL_IME_SetFocus(SDL_bool focused); +extern void SDL_IME_Reset(); +extern SDL_bool SDL_IME_ProcessKeyEvent(Uint32 keysym, Uint32 keycode); +extern void SDL_IME_UpdateTextRect(SDL_Rect *rect); +extern void SDL_IME_PumpEvents(); + +#endif /* _SDL_ime_h */ diff --git a/Engine/lib/sdl/src/core/linux/SDL_udev.c b/Engine/lib/sdl/src/core/linux/SDL_udev.c index 099cc435e..ae78ddd68 100644 --- a/Engine/lib/sdl/src/core/linux/SDL_udev.c +++ b/Engine/lib/sdl/src/core/linux/SDL_udev.c @@ -349,7 +349,9 @@ guess_device_class(struct udev_device *dev) } else if (test_bit(BTN_MOUSE, bitmask_key)) { devclass |= SDL_UDEV_DEVICE_MOUSE; /* ID_INPUT_MOUSE */ } else if (test_bit(BTN_TOUCH, bitmask_key)) { - ; /* ID_INPUT_TOUCHSCREEN */ + /* TODO: better determining between touchscreen and multitouch touchpad, + see https://github.com/systemd/systemd/blob/master/src/udev/udev-builtin-input_id.c */ + devclass |= SDL_UDEV_DEVICE_TOUCHSCREEN; /* ID_INPUT_TOUCHSCREEN */ } if (test_bit(BTN_TRIGGER, bitmask_key) || @@ -411,6 +413,11 @@ device_event(SDL_UDEV_deviceevent type, struct udev_device *dev) if (val != NULL && SDL_strcmp(val, "1") == 0 ) { devclass |= SDL_UDEV_DEVICE_MOUSE; } + + val = _this->udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN"); + if (val != NULL && SDL_strcmp(val, "1") == 0 ) { + devclass |= SDL_UDEV_DEVICE_TOUCHSCREEN; + } /* The undocumented rule is: - All devices with keys get ID_INPUT_KEY diff --git a/Engine/lib/sdl/src/core/linux/SDL_udev.h b/Engine/lib/sdl/src/core/linux/SDL_udev.h index 2e4434e62..9ffbb3252 100644 --- a/Engine/lib/sdl/src/core/linux/SDL_udev.h +++ b/Engine/lib/sdl/src/core/linux/SDL_udev.h @@ -42,17 +42,19 @@ typedef enum { - SDL_UDEV_DEVICEADDED = 0x0001, + SDL_UDEV_DEVICEADDED = 1, SDL_UDEV_DEVICEREMOVED } SDL_UDEV_deviceevent; /* A device can be any combination of these classes */ typedef enum { + SDL_UDEV_DEVICE_UNKNOWN = 0x0000, SDL_UDEV_DEVICE_MOUSE = 0x0001, SDL_UDEV_DEVICE_KEYBOARD = 0x0002, SDL_UDEV_DEVICE_JOYSTICK = 0x0004, - SDL_UDEV_DEVICE_SOUND = 0x0008 + SDL_UDEV_DEVICE_SOUND = 0x0008, + SDL_UDEV_DEVICE_TOUCHSCREEN = 0x0010 } SDL_UDEV_deviceclass; typedef void (*SDL_UDEV_Callback)(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath); diff --git a/Engine/lib/sdl/src/core/windows/SDL_windows.c b/Engine/lib/sdl/src/core/windows/SDL_windows.c index bc4afe0aa..6433fe26f 100644 --- a/Engine/lib/sdl/src/core/windows/SDL_windows.c +++ b/Engine/lib/sdl/src/core/windows/SDL_windows.c @@ -124,6 +124,84 @@ BOOL WIN_IsWindowsVistaOrGreater() #endif } +/* +WAVExxxCAPS gives you 31 bytes for the device name, and just truncates if it's +longer. However, since WinXP, you can use the WAVExxxCAPS2 structure, which +will give you a name GUID. The full name is in the Windows Registry under +that GUID, located here: HKLM\System\CurrentControlSet\Control\MediaCategories + +Note that drivers can report GUID_NULL for the name GUID, in which case, +Windows makes a best effort to fill in those 31 bytes in the usual place. +This info summarized from MSDN: + +http://web.archive.org/web/20131027093034/http://msdn.microsoft.com/en-us/library/windows/hardware/ff536382(v=vs.85).aspx + +Always look this up in the registry if possible, because the strings are +different! At least on Win10, I see "Yeti Stereo Microphone" in the +Registry, and a unhelpful "Microphone(Yeti Stereo Microph" in winmm. Sigh. + +(Also, DirectSound shouldn't be limited to 32 chars, but its device enum +has the same problem.) +*/ +char * +WIN_LookupAudioDeviceName(const WCHAR *name, const GUID *guid) +{ +#if __WINRT__ + return WIN_StringToUTF8(name); /* No registry access on WinRT/UWP, go with what we've got. */ +#else + static const GUID nullguid = { 0 }; + const unsigned char *ptr; + char keystr[128]; + WCHAR *strw = NULL; + SDL_bool rc; + HKEY hkey; + DWORD len = 0; + char *retval = NULL; + + if (SDL_memcmp(guid, &nullguid, sizeof (*guid)) == 0) { + return WIN_StringToUTF8(name); /* No GUID, go with what we've got. */ + } + + ptr = (const unsigned char *) guid; + SDL_snprintf(keystr, sizeof (keystr), + "System\\CurrentControlSet\\Control\\MediaCategories\\{%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + ptr[3], ptr[2], ptr[1], ptr[0], ptr[5], ptr[4], ptr[7], ptr[6], + ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]); + + strw = WIN_UTF8ToString(keystr); + rc = (RegOpenKeyExW(HKEY_LOCAL_MACHINE, strw, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS); + SDL_free(strw); + if (!rc) { + return WIN_StringToUTF8(name); /* oh well. */ + } + + rc = (RegQueryValueExW(hkey, L"Name", NULL, NULL, NULL, &len) == ERROR_SUCCESS); + if (!rc) { + RegCloseKey(hkey); + return WIN_StringToUTF8(name); /* oh well. */ + } + + strw = (WCHAR *) SDL_malloc(len + sizeof (WCHAR)); + if (!strw) { + RegCloseKey(hkey); + return WIN_StringToUTF8(name); /* oh well. */ + } + + rc = (RegQueryValueExW(hkey, L"Name", NULL, NULL, (LPBYTE) strw, &len) == ERROR_SUCCESS); + RegCloseKey(hkey); + if (!rc) { + SDL_free(strw); + return WIN_StringToUTF8(name); /* oh well. */ + } + + strw[len / 2] = 0; /* make sure it's null-terminated. */ + + retval = WIN_StringToUTF8(strw); + SDL_free(strw); + return retval ? retval : WIN_StringToUTF8(name); +#endif /* if __WINRT__ / else */ +} + #endif /* __WIN32__ || __WINRT__ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/core/windows/SDL_windows.h b/Engine/lib/sdl/src/core/windows/SDL_windows.h index 0c99b03d4..0f67e4be5 100644 --- a/Engine/lib/sdl/src/core/windows/SDL_windows.h +++ b/Engine/lib/sdl/src/core/windows/SDL_windows.h @@ -59,6 +59,9 @@ extern void WIN_CoUninitialize(void); /* Returns SDL_TRUE if we're running on Windows Vista and newer */ extern BOOL WIN_IsWindowsVistaOrGreater(); +/* You need to SDL_free() the result of this call. */ +extern char *WIN_LookupAudioDeviceName(const WCHAR *name, const GUID *guid); + #endif /* _INCLUDED_WINDOWS_H */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp b/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp index 5ab2ef9a2..e4ffadaad 100644 --- a/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp +++ b/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp @@ -254,6 +254,18 @@ void SDL_WinRTApp::Initialize(CoreApplicationView^ applicationView) CoreApplication::Exiting += ref new EventHandler(this, &SDL_WinRTApp::OnExiting); + +#if NTDDI_VERSION >= NTDDI_WIN10 + /* HACK ALERT! Xbox One doesn't seem to detect gamepads unless something + gets registered to receive Win10's Windows.Gaming.Input.Gamepad.GamepadAdded + events. We'll register an event handler for these events here, to make + sure that gamepad detection works later on, if requested. + */ + Windows::Gaming::Input::Gamepad::GamepadAdded += + ref new Windows::Foundation::EventHandler( + this, &SDL_WinRTApp::OnGamepadAdded + ); +#endif } #if NTDDI_VERSION > NTDDI_WIN8 @@ -810,11 +822,8 @@ static void WINRT_OnBackButtonPressed(BackButtonEventArgs ^ args) SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_AC_BACK); SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_AC_BACK); - const char *hint = SDL_GetHint(SDL_HINT_WINRT_HANDLE_BACK_BUTTON); - if (hint) { - if (*hint == '1') { - args->Handled = true; - } + if (SDL_GetHintBoolean(SDL_HINT_WINRT_HANDLE_BACK_BUTTON, SDL_FALSE)) { + args->Handled = true; } } @@ -832,3 +841,15 @@ void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone: } #endif +#if NTDDI_VERSION >= NTDDI_WIN10 +void SDL_WinRTApp::OnGamepadAdded(Platform::Object ^sender, Windows::Gaming::Input::Gamepad ^gamepad) +{ + /* HACK ALERT: Nothing needs to be done here, as this method currently + only exists to allow something to be registered with Win10's + GamepadAdded event, an operation that seems to be necessary to get + Xinput-based detection to work on Xbox One. + */ +} +#endif + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.h b/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.h index 0b69c2bb9..4b48115f0 100644 --- a/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.h +++ b/Engine/lib/sdl/src/core/winrt/SDL_winrtapp_direct3d.h @@ -80,6 +80,10 @@ protected: void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args); #endif +#if NTDDI_VERSION >= NTDDI_WIN10 + void OnGamepadAdded(Platform::Object ^sender, Windows::Gaming::Input::Gamepad ^gamepad); +#endif + private: bool m_windowClosed; bool m_windowVisible; diff --git a/Engine/lib/sdl/src/dynapi/SDL_dynapi.c b/Engine/lib/sdl/src/dynapi/SDL_dynapi.c index 1411f8c93..c26baf379 100644 --- a/Engine/lib/sdl/src/dynapi/SDL_dynapi.c +++ b/Engine/lib/sdl/src/dynapi/SDL_dynapi.c @@ -293,7 +293,7 @@ SDL_InitDynamicAPI(void) * SDL_CreateThread() would also call this function before building the * new thread). */ - static volatile SDL_bool already_initialized = SDL_FALSE; + static SDL_bool already_initialized = SDL_FALSE; /* SDL_AtomicLock calls SDL mutex functions to emulate if SDL_ATOMIC_DISABLED, which we can't do here, so in such a diff --git a/Engine/lib/sdl/src/dynapi/SDL_dynapi.h b/Engine/lib/sdl/src/dynapi/SDL_dynapi.h index 5faac2194..5e78338f2 100644 --- a/Engine/lib/sdl/src/dynapi/SDL_dynapi.h +++ b/Engine/lib/sdl/src/dynapi/SDL_dynapi.h @@ -43,9 +43,15 @@ #include "TargetConditionals.h" #endif -#if TARGET_OS_IPHONE || __native_client__ || __EMSCRIPTEN__ /* probably not useful on iOS, NACL or Emscripten. */ +#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE /* probably not useful on iOS. */ #define SDL_DYNAMIC_API 0 -#elif SDL_BUILDING_WINRT /* probaly not useful on WinRT, given current .dll loading restrictions */ +#elif defined(__native_client__) && __native_client__ /* probably not useful on NACL. */ +#define SDL_DYNAMIC_API 0 +#elif defined(__EMSCRIPTEN__) && __EMSCRIPTEN__ /* probably not useful on Emscripten. */ +#define SDL_DYNAMIC_API 0 +#elif defined(SDL_BUILDING_WINRT) && SDL_BUILDING_WINRT /* probably not useful on WinRT, given current .dll loading restrictions */ +#define SDL_DYNAMIC_API 0 +#elif defined(__PSP__) && __PSP__ #define SDL_DYNAMIC_API 0 #elif defined(__clang_analyzer__) #define SDL_DYNAMIC_API 0 /* Turn off for static analysis, so reports are more clear. */ diff --git a/Engine/lib/sdl/src/dynapi/SDL_dynapi_overrides.h b/Engine/lib/sdl/src/dynapi/SDL_dynapi_overrides.h index c9ebfffe2..9541611ce 100644 --- a/Engine/lib/sdl/src/dynapi/SDL_dynapi_overrides.h +++ b/Engine/lib/sdl/src/dynapi/SDL_dynapi_overrides.h @@ -445,6 +445,8 @@ #define SDL_iconv_close SDL_iconv_close_REAL #define SDL_iconv SDL_iconv_REAL #define SDL_iconv_string SDL_iconv_string_REAL +#define SDL_CreateRGBSurfaceWithFormat SDL_CreateRGBSurfaceWithFormat_REAL +#define SDL_CreateRGBSurfaceWithFormatFrom SDL_CreateRGBSurfaceWithFormatFrom_REAL #define SDL_CreateRGBSurface SDL_CreateRGBSurface_REAL #define SDL_CreateRGBSurfaceFrom SDL_CreateRGBSurfaceFrom_REAL #define SDL_FreeSurface SDL_FreeSurface_REAL @@ -597,3 +599,16 @@ #define SDL_JoystickCurrentPowerLevel SDL_JoystickCurrentPowerLevel_REAL #define SDL_GameControllerFromInstanceID SDL_GameControllerFromInstanceID_REAL #define SDL_JoystickFromInstanceID SDL_JoystickFromInstanceID_REAL +#define SDL_GetDisplayUsableBounds SDL_GetDisplayUsableBounds_REAL +#define SDL_GetWindowBordersSize SDL_GetWindowBordersSize_REAL +#define SDL_SetWindowOpacity SDL_SetWindowOpacity_REAL +#define SDL_GetWindowOpacity SDL_GetWindowOpacity_REAL +#define SDL_SetWindowInputFocus SDL_SetWindowInputFocus_REAL +#define SDL_SetWindowModalFor SDL_SetWindowModalFor_REAL +#define SDL_RenderSetIntegerScale SDL_RenderSetIntegerScale_REAL +#define SDL_RenderGetIntegerScale SDL_RenderGetIntegerScale_REAL +#define SDL_DequeueAudio SDL_DequeueAudio_REAL +#define SDL_SetWindowResizable SDL_SetWindowResizable_REAL +#define SDL_CreateRGBSurfaceWithFormat SDL_CreateRGBSurfaceWithFormat_REAL +#define SDL_CreateRGBSurfaceWithFormatFrom SDL_CreateRGBSurfaceWithFormatFrom_REAL +#define SDL_GetHintBoolean SDL_GetHintBoolean_REAL diff --git a/Engine/lib/sdl/src/dynapi/SDL_dynapi_procs.h b/Engine/lib/sdl/src/dynapi/SDL_dynapi_procs.h index 3f11a25f9..a08835b26 100644 --- a/Engine/lib/sdl/src/dynapi/SDL_dynapi_procs.h +++ b/Engine/lib/sdl/src/dynapi/SDL_dynapi_procs.h @@ -631,3 +631,16 @@ SDL_DYNAPI_PROC(int,SDL_GetDisplayDPI,(int a, float *b, float *c, float *d),(a,b SDL_DYNAPI_PROC(SDL_JoystickPowerLevel,SDL_JoystickCurrentPowerLevel,(SDL_Joystick *a),(a),return) SDL_DYNAPI_PROC(SDL_GameController*,SDL_GameControllerFromInstanceID,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(SDL_Joystick*,SDL_JoystickFromInstanceID,(SDL_JoystickID a),(a),return) +SDL_DYNAPI_PROC(int,SDL_GetDisplayUsableBounds,(int a, SDL_Rect *b),(a,b),return) +SDL_DYNAPI_PROC(int,SDL_GetWindowBordersSize,(SDL_Window *a, int *b, int *c, int *d, int *e),(a,b,c,d,e),return) +SDL_DYNAPI_PROC(int,SDL_SetWindowOpacity,(SDL_Window *a, float b),(a,b),return) +SDL_DYNAPI_PROC(int,SDL_GetWindowOpacity,(SDL_Window *a, float *b),(a,b),return) +SDL_DYNAPI_PROC(int,SDL_SetWindowInputFocus,(SDL_Window *a),(a),return) +SDL_DYNAPI_PROC(int,SDL_SetWindowModalFor,(SDL_Window *a, SDL_Window *b),(a,b),return) +SDL_DYNAPI_PROC(int,SDL_RenderSetIntegerScale,(SDL_Renderer *a, SDL_bool b),(a,b),return) +SDL_DYNAPI_PROC(SDL_bool,SDL_RenderGetIntegerScale,(SDL_Renderer *a),(a),return) +SDL_DYNAPI_PROC(Uint32,SDL_DequeueAudio,(SDL_AudioDeviceID a, void *b, Uint32 c),(a,b,c),return) +SDL_DYNAPI_PROC(void,SDL_SetWindowResizable,(SDL_Window *a, SDL_bool b),(a,b),) +SDL_DYNAPI_PROC(SDL_Surface*,SDL_CreateRGBSurfaceWithFormat,(Uint32 a, int b, int c, int d, Uint32 e),(a,b,c,d,e),return) +SDL_DYNAPI_PROC(SDL_Surface*,SDL_CreateRGBSurfaceWithFormatFrom,(void *a, int b, int c, int d, int e, Uint32 f),(a,b,c,d,e,f),return) +SDL_DYNAPI_PROC(SDL_bool,SDL_GetHintBoolean,(const char *a, SDL_bool b),(a,b),return) diff --git a/Engine/lib/sdl/src/dynapi/gendynapi.pl b/Engine/lib/sdl/src/dynapi/gendynapi.pl old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/src/events/SDL_dropevents.c b/Engine/lib/sdl/src/events/SDL_dropevents.c index 8f4405efa..49b07d9a6 100644 --- a/Engine/lib/sdl/src/events/SDL_dropevents.c +++ b/Engine/lib/sdl/src/events/SDL_dropevents.c @@ -26,21 +26,73 @@ #include "SDL_events_c.h" #include "SDL_dropevents_c.h" +#include "../video/SDL_sysvideo.h" /* for SDL_Window internals. */ -int -SDL_SendDropFile(const char *file) + +static int +SDL_SendDrop(SDL_Window *window, const SDL_EventType evtype, const char *data) { - int posted; + static SDL_bool app_is_dropping = SDL_FALSE; + int posted = 0; /* Post the event, if desired */ - posted = 0; - if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) { + if (SDL_GetEventState(evtype) == SDL_ENABLE) { + const SDL_bool need_begin = window ? !window->is_dropping : !app_is_dropping; SDL_Event event; - event.type = SDL_DROPFILE; - event.drop.file = SDL_strdup(file); + + if (need_begin) { + SDL_zero(event); + event.type = SDL_DROPBEGIN; + + if (window) { + event.drop.windowID = window->id; + } + + posted = (SDL_PushEvent(&event) > 0); + if (!posted) { + return 0; + } + if (window) { + window->is_dropping = SDL_TRUE; + } else { + app_is_dropping = SDL_TRUE; + } + } + + SDL_zero(event); + event.type = evtype; + event.drop.file = data ? SDL_strdup(data) : NULL; + event.drop.windowID = window ? window->id : 0; posted = (SDL_PushEvent(&event) > 0); + + if (posted && (evtype == SDL_DROPCOMPLETE)) { + if (window) { + window->is_dropping = SDL_FALSE; + } else { + app_is_dropping = SDL_FALSE; + } + } } - return (posted); + return posted; } +int +SDL_SendDropFile(SDL_Window *window, const char *file) +{ + return SDL_SendDrop(window, SDL_DROPFILE, file); +} + +int +SDL_SendDropText(SDL_Window *window, const char *text) +{ + return SDL_SendDrop(window, SDL_DROPTEXT, text); +} + +int +SDL_SendDropComplete(SDL_Window *window) +{ + return SDL_SendDrop(window, SDL_DROPCOMPLETE, NULL); +} + + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/events/SDL_dropevents_c.h b/Engine/lib/sdl/src/events/SDL_dropevents_c.h index a60e089f3..a7adb8560 100644 --- a/Engine/lib/sdl/src/events/SDL_dropevents_c.h +++ b/Engine/lib/sdl/src/events/SDL_dropevents_c.h @@ -23,7 +23,9 @@ #ifndef _SDL_dropevents_c_h #define _SDL_dropevents_c_h -extern int SDL_SendDropFile(const char *file); +extern int SDL_SendDropFile(SDL_Window *window, const char *file); +extern int SDL_SendDropText(SDL_Window *window, const char *text); +extern int SDL_SendDropComplete(SDL_Window *window); #endif /* _SDL_dropevents_c_h */ diff --git a/Engine/lib/sdl/src/events/SDL_events.c b/Engine/lib/sdl/src/events/SDL_events.c index ffd103824..2f5b0af29 100644 --- a/Engine/lib/sdl/src/events/SDL_events.c +++ b/Engine/lib/sdl/src/events/SDL_events.c @@ -73,15 +73,15 @@ typedef struct _SDL_SysWMEntry static struct { SDL_mutex *lock; - volatile SDL_bool active; - volatile int count; - volatile int max_events_seen; + SDL_atomic_t active; + SDL_atomic_t count; + int max_events_seen; SDL_EventEntry *head; SDL_EventEntry *tail; SDL_EventEntry *free; SDL_SysWMEntry *wmmsg_used; SDL_SysWMEntry *wmmsg_free; -} SDL_EventQ = { NULL, SDL_TRUE, 0, 0, NULL, NULL, NULL, NULL, NULL }; +} SDL_EventQ = { NULL, { 1 }, { 0 }, 0, NULL, NULL, NULL, NULL, NULL }; /* Public functions */ @@ -98,7 +98,7 @@ SDL_StopEventLoop(void) SDL_LockMutex(SDL_EventQ.lock); } - SDL_EventQ.active = SDL_FALSE; + SDL_AtomicSet(&SDL_EventQ.active, 0); if (report && SDL_atoi(report)) { SDL_Log("SDL EVENT QUEUE: Maximum events in-flight: %d\n", @@ -127,7 +127,7 @@ SDL_StopEventLoop(void) wmmsg = next; } - SDL_EventQ.count = 0; + SDL_AtomicSet(&SDL_EventQ.count, 0); SDL_EventQ.max_events_seen = 0; SDL_EventQ.head = NULL; SDL_EventQ.tail = NULL; @@ -171,7 +171,7 @@ SDL_StartEventLoop(void) SDL_EventQ.lock = SDL_CreateMutex(); } if (SDL_EventQ.lock == NULL) { - return (-1); + return -1; } #endif /* !SDL_THREADS_DISABLED */ @@ -180,9 +180,9 @@ SDL_StartEventLoop(void) SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE); SDL_EventState(SDL_SYSWMEVENT, SDL_DISABLE); - SDL_EventQ.active = SDL_TRUE; + SDL_AtomicSet(&SDL_EventQ.active, 1); - return (0); + return 0; } @@ -191,9 +191,11 @@ static int SDL_AddEvent(SDL_Event * event) { SDL_EventEntry *entry; + const int initial_count = SDL_AtomicGet(&SDL_EventQ.count); + int final_count; - if (SDL_EventQ.count >= SDL_MAX_QUEUED_EVENTS) { - SDL_SetError("Event queue is full (%d events)", SDL_EventQ.count); + if (initial_count >= SDL_MAX_QUEUED_EVENTS) { + SDL_SetError("Event queue is full (%d events)", initial_count); return 0; } @@ -225,10 +227,10 @@ SDL_AddEvent(SDL_Event * event) entry->prev = NULL; entry->next = NULL; } - ++SDL_EventQ.count; - if (SDL_EventQ.count > SDL_EventQ.max_events_seen) { - SDL_EventQ.max_events_seen = SDL_EventQ.count; + final_count = SDL_AtomicAdd(&SDL_EventQ.count, 1) + 1; + if (final_count > SDL_EventQ.max_events_seen) { + SDL_EventQ.max_events_seen = final_count; } return 1; @@ -256,8 +258,8 @@ SDL_CutEvent(SDL_EventEntry *entry) entry->next = SDL_EventQ.free; SDL_EventQ.free = entry; - SDL_assert(SDL_EventQ.count > 0); - --SDL_EventQ.count; + SDL_assert(SDL_AtomicGet(&SDL_EventQ.count) > 0); + SDL_AtomicAdd(&SDL_EventQ.count, -1); } /* Lock the event queue, take a peep at it, and unlock it */ @@ -268,7 +270,7 @@ SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action, int i, used; /* Don't look after we've quit */ - if (!SDL_EventQ.active) { + if (!SDL_AtomicGet(&SDL_EventQ.active)) { /* We get a few spurious events at shutdown, so don't warn then */ if (action != SDL_ADDEVENT) { SDL_SetError("The event system has been shut down"); @@ -285,56 +287,54 @@ SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action, } else { SDL_EventEntry *entry, *next; SDL_SysWMEntry *wmmsg, *wmmsg_next; - SDL_Event tmpevent; Uint32 type; - /* If 'events' is NULL, just see if they exist */ - if (events == NULL) { - action = SDL_PEEKEVENT; - numevents = 1; - events = &tmpevent; + if (action == SDL_GETEVENT) { + /* Clean out any used wmmsg data + FIXME: Do we want to retain the data for some period of time? + */ + for (wmmsg = SDL_EventQ.wmmsg_used; wmmsg; wmmsg = wmmsg_next) { + wmmsg_next = wmmsg->next; + wmmsg->next = SDL_EventQ.wmmsg_free; + SDL_EventQ.wmmsg_free = wmmsg; + } + SDL_EventQ.wmmsg_used = NULL; } - /* Clean out any used wmmsg data - FIXME: Do we want to retain the data for some period of time? - */ - for (wmmsg = SDL_EventQ.wmmsg_used; wmmsg; wmmsg = wmmsg_next) { - wmmsg_next = wmmsg->next; - wmmsg->next = SDL_EventQ.wmmsg_free; - SDL_EventQ.wmmsg_free = wmmsg; - } - SDL_EventQ.wmmsg_used = NULL; - - for (entry = SDL_EventQ.head; entry && used < numevents; entry = next) { + for (entry = SDL_EventQ.head; entry && (!events || used < numevents); entry = next) { next = entry->next; type = entry->event.type; if (minType <= type && type <= maxType) { - events[used] = entry->event; - if (entry->event.type == SDL_SYSWMEVENT) { - /* We need to copy the wmmsg somewhere safe. - For now we'll guarantee it's valid at least until - the next call to SDL_PeepEvents() - */ - if (SDL_EventQ.wmmsg_free) { - wmmsg = SDL_EventQ.wmmsg_free; - SDL_EventQ.wmmsg_free = wmmsg->next; - } else { - wmmsg = (SDL_SysWMEntry *)SDL_malloc(sizeof(*wmmsg)); + if (events) { + events[used] = entry->event; + if (entry->event.type == SDL_SYSWMEVENT) { + /* We need to copy the wmmsg somewhere safe. + For now we'll guarantee it's valid at least until + the next call to SDL_PeepEvents() + */ + if (SDL_EventQ.wmmsg_free) { + wmmsg = SDL_EventQ.wmmsg_free; + SDL_EventQ.wmmsg_free = wmmsg->next; + } else { + wmmsg = (SDL_SysWMEntry *)SDL_malloc(sizeof(*wmmsg)); + } + wmmsg->msg = *entry->event.syswm.msg; + wmmsg->next = SDL_EventQ.wmmsg_used; + SDL_EventQ.wmmsg_used = wmmsg; + events[used].syswm.msg = &wmmsg->msg; + } + + if (action == SDL_GETEVENT) { + SDL_CutEvent(entry); } - wmmsg->msg = *entry->event.syswm.msg; - wmmsg->next = SDL_EventQ.wmmsg_used; - SDL_EventQ.wmmsg_used = wmmsg; - events[used].syswm.msg = &wmmsg->msg; } ++used; - - if (action == SDL_GETEVENT) { - SDL_CutEvent(entry); - } } } } - SDL_UnlockMutex(SDL_EventQ.lock); + if (SDL_EventQ.lock) { + SDL_UnlockMutex(SDL_EventQ.lock); + } } else { return SDL_SetError("Couldn't lock event queue"); } @@ -363,7 +363,7 @@ void SDL_FlushEvents(Uint32 minType, Uint32 maxType) { /* Don't look after we've quit */ - if (!SDL_EventQ.active) { + if (!SDL_AtomicGet(&SDL_EventQ.active)) { return; } @@ -376,7 +376,7 @@ SDL_FlushEvents(Uint32 minType, Uint32 maxType) #endif /* Lock the event queue */ - if (SDL_LockMutex(SDL_EventQ.lock) == 0) { + if (SDL_EventQ.lock && SDL_LockMutex(SDL_EventQ.lock) == 0) { SDL_EventEntry *entry, *next; Uint32 type; for (entry = SDL_EventQ.head; entry; entry = next) { @@ -437,8 +437,6 @@ SDL_WaitEventTimeout(SDL_Event * event, int timeout) switch (SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT)) { case -1: return 0; - case 1: - return 1; case 0: if (timeout == 0) { /* Polling and no events, just return */ @@ -450,6 +448,9 @@ SDL_WaitEventTimeout(SDL_Event * event, int timeout) } SDL_Delay(10); break; + default: + /* Has events */ + return 1; } } } diff --git a/Engine/lib/sdl/src/events/SDL_gesture.c b/Engine/lib/sdl/src/events/SDL_gesture.c index 66def4429..43914202c 100644 --- a/Engine/lib/sdl/src/events/SDL_gesture.c +++ b/Engine/lib/sdl/src/events/SDL_gesture.c @@ -21,7 +21,7 @@ #include "../SDL_internal.h" -/* General mouse handling code for SDL */ +/* General gesture handling code for SDL */ #include "SDL_events.h" #include "SDL_endian.h" diff --git a/Engine/lib/sdl/src/events/SDL_mouse.c b/Engine/lib/sdl/src/events/SDL_mouse.c index 7793de870..4236a9901 100644 --- a/Engine/lib/sdl/src/events/SDL_mouse.c +++ b/Engine/lib/sdl/src/events/SDL_mouse.c @@ -322,15 +322,13 @@ static SDL_MouseClickState *GetMouseClickState(SDL_Mouse *mouse, Uint8 button) return &mouse->clickstate[button]; } -int -SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button) +static int +SDL_PrivateSendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button, int clicks) { SDL_Mouse *mouse = SDL_GetMouse(); int posted; Uint32 type; Uint32 buttonstate = mouse->buttonstate; - SDL_MouseClickState *clickstate = GetMouseClickState(mouse, button); - Uint8 click_count; /* Figure out which event to perform */ switch (state) { @@ -358,25 +356,28 @@ SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 } mouse->buttonstate = buttonstate; - if (clickstate) { - if (state == SDL_PRESSED) { - Uint32 now = SDL_GetTicks(); + if (clicks < 0) { + SDL_MouseClickState *clickstate = GetMouseClickState(mouse, button); + if (clickstate) { + if (state == SDL_PRESSED) { + Uint32 now = SDL_GetTicks(); - if (SDL_TICKS_PASSED(now, clickstate->last_timestamp + SDL_double_click_time) || - SDL_abs(mouse->x - clickstate->last_x) > SDL_double_click_radius || - SDL_abs(mouse->y - clickstate->last_y) > SDL_double_click_radius) { - clickstate->click_count = 0; - } - clickstate->last_timestamp = now; - clickstate->last_x = mouse->x; - clickstate->last_y = mouse->y; - if (clickstate->click_count < 255) { - ++clickstate->click_count; + if (SDL_TICKS_PASSED(now, clickstate->last_timestamp + SDL_double_click_time) || + SDL_abs(mouse->x - clickstate->last_x) > SDL_double_click_radius || + SDL_abs(mouse->y - clickstate->last_y) > SDL_double_click_radius) { + clickstate->click_count = 0; + } + clickstate->last_timestamp = now; + clickstate->last_x = mouse->x; + clickstate->last_y = mouse->y; + if (clickstate->click_count < 255) { + ++clickstate->click_count; + } } + clicks = clickstate->click_count; + } else { + clicks = 1; } - click_count = clickstate->click_count; - } else { - click_count = 1; } /* Post the event, if desired */ @@ -388,7 +389,7 @@ SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 event.button.which = mouseID; event.button.state = state; event.button.button = button; - event.button.clicks = click_count; + event.button.clicks = (Uint8) SDL_min(clicks, 255); event.button.x = mouse->x; event.button.y = mouse->y; posted = (SDL_PushEvent(&event) > 0); @@ -398,10 +399,23 @@ SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 if (window && state == SDL_RELEASED) { SDL_UpdateMouseFocus(window, mouse->x, mouse->y, buttonstate); } - + return posted; } +int +SDL_SendMouseButtonClicks(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button, int clicks) +{ + clicks = SDL_max(clicks, 0); + return SDL_PrivateSendMouseButton(window, mouseID, state, button, clicks); +} + +int +SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button) +{ + return SDL_PrivateSendMouseButton(window, mouseID, state, button, -1); +} + int SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, int x, int y, SDL_MouseWheelDirection direction) { @@ -550,21 +564,11 @@ SDL_WarpMouseGlobal(int x, int y) static SDL_bool ShouldUseRelativeModeWarp(SDL_Mouse *mouse) { - const char *hint; - if (!mouse->SetRelativeMouseMode) { return SDL_TRUE; } - hint = SDL_GetHint(SDL_HINT_MOUSE_RELATIVE_MODE_WARP); - if (hint) { - if (*hint == '0') { - return SDL_FALSE; - } else { - return SDL_TRUE; - } - } - return SDL_FALSE; + return SDL_GetHintBoolean(SDL_HINT_MOUSE_RELATIVE_MODE_WARP, SDL_FALSE); } int diff --git a/Engine/lib/sdl/src/events/SDL_mouse_c.h b/Engine/lib/sdl/src/events/SDL_mouse_c.h index 03aca0a5c..06dc88701 100644 --- a/Engine/lib/sdl/src/events/SDL_mouse_c.h +++ b/Engine/lib/sdl/src/events/SDL_mouse_c.h @@ -119,6 +119,9 @@ extern int SDL_SendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int rel /* Send a mouse button event */ extern int SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button); +/* Send a mouse button event with a click count */ +extern int SDL_SendMouseButtonClicks(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button, int clicks); + /* Send a mouse wheel event */ extern int SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, int x, int y, SDL_MouseWheelDirection direction); diff --git a/Engine/lib/sdl/src/events/SDL_quit.c b/Engine/lib/sdl/src/events/SDL_quit.c index 5b7105ef8..3cb6b3d4f 100644 --- a/Engine/lib/sdl/src/events/SDL_quit.c +++ b/Engine/lib/sdl/src/events/SDL_quit.c @@ -91,9 +91,7 @@ SDL_QuitInit_Internal(void) int SDL_QuitInit(void) { - const char *hint = SDL_GetHint(SDL_HINT_NO_SIGNAL_HANDLERS); - disable_signals = hint && (SDL_atoi(hint) == 1); - if (!disable_signals) { + if (!SDL_GetHintBoolean(SDL_HINT_NO_SIGNAL_HANDLERS, SDL_FALSE)) { return SDL_QuitInit_Internal(); } return 0; diff --git a/Engine/lib/sdl/src/events/SDL_windowevents.c b/Engine/lib/sdl/src/events/SDL_windowevents.c index 785ea4e0c..b45015bd0 100644 --- a/Engine/lib/sdl/src/events/SDL_windowevents.c +++ b/Engine/lib/sdl/src/events/SDL_windowevents.c @@ -70,6 +70,20 @@ RemovePendingMoveEvents(void * userdata, SDL_Event *event) return 1; } +static int +RemovePendingExposedEvents(void * userdata, SDL_Event *event) +{ + SDL_Event *new_event = (SDL_Event *)userdata; + + if (event->type == SDL_WINDOWEVENT && + event->window.event == SDL_WINDOWEVENT_EXPOSED && + event->window.windowID == new_event->window.windowID) { + /* We're about to post a new exposed event, drop the old one */ + return 0; + } + return 1; +} + int SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1, int data2) @@ -195,7 +209,9 @@ SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1, if (windowevent == SDL_WINDOWEVENT_MOVED) { SDL_FilterEvents(RemovePendingMoveEvents, &event); } - + if (windowevent == SDL_WINDOWEVENT_EXPOSED) { + SDL_FilterEvents(RemovePendingExposedEvents, &event); + } posted = (SDL_PushEvent(&event) > 0); } diff --git a/Engine/lib/sdl/src/events/scancodes_linux.h b/Engine/lib/sdl/src/events/scancodes_linux.h index 8db37df5b..e197ee3fe 100644 --- a/Engine/lib/sdl/src/events/scancodes_linux.h +++ b/Engine/lib/sdl/src/events/scancodes_linux.h @@ -111,7 +111,7 @@ static SDL_Scancode const linux_scancode_table[] = { /* 82 */ SDL_SCANCODE_KP_0, /* 83 */ SDL_SCANCODE_KP_PERIOD, 0, - /* 85 */ SDL_SCANCODE_UNKNOWN, /* KEY_ZENKAKUHANKAKU */ + /* 85 */ SDL_SCANCODE_LANG5, /* KEY_ZENKAKUHANKAKU */ /* 86 */ SDL_SCANCODE_NONUSBACKSLASH, /* KEY_102ND */ /* 87 */ SDL_SCANCODE_F11, /* 88 */ SDL_SCANCODE_F12, @@ -153,7 +153,7 @@ static SDL_Scancode const linux_scancode_table[] = { /* 124 */ SDL_SCANCODE_INTERNATIONAL3, /* KEY_YEN */ /* 125 */ SDL_SCANCODE_LGUI, /* 126 */ SDL_SCANCODE_RGUI, - /* 127 */ SDL_SCANCODE_UNKNOWN, /* KEY_COMPOSE */ + /* 127 */ SDL_SCANCODE_APPLICATION, /* KEY_COMPOSE */ /* 128 */ SDL_SCANCODE_STOP, /* 129 */ SDL_SCANCODE_AGAIN, /* 130 */ SDL_SCANCODE_UNKNOWN, /* KEY_PROPS */ @@ -174,9 +174,9 @@ static SDL_Scancode const linux_scancode_table[] = { /* 145 */ SDL_SCANCODE_UNKNOWN, /* KEY_SENDFILE */ /* 146 */ SDL_SCANCODE_UNKNOWN, /* KEY_DELETEFILE */ /* 147 */ SDL_SCANCODE_UNKNOWN, /* KEY_XFER */ - /* 148 */ SDL_SCANCODE_UNKNOWN, /* KEY_PROG1 */ - /* 149 */ SDL_SCANCODE_UNKNOWN, /* KEY_PROG2 */ - /* 150 */ SDL_SCANCODE_UNKNOWN, /* KEY_WWW */ + /* 148 */ SDL_SCANCODE_APP1, /* KEY_PROG1 */ + /* 149 */ SDL_SCANCODE_APP2, /* KEY_PROG2 */ + /* 150 */ SDL_SCANCODE_WWW, /* KEY_WWW */ /* 151 */ SDL_SCANCODE_UNKNOWN, /* KEY_MSDOS */ /* 152 */ SDL_SCANCODE_UNKNOWN, /* KEY_COFFEE */ /* 153 */ SDL_SCANCODE_UNKNOWN, /* KEY_DIRECTION */ @@ -192,7 +192,7 @@ static SDL_Scancode const linux_scancode_table[] = { /* 163 */ SDL_SCANCODE_AUDIONEXT, /* KEY_NEXTSONG */ /* 164 */ SDL_SCANCODE_AUDIOPLAY, /* KEY_PLAYPAUSE */ /* 165 */ SDL_SCANCODE_AUDIOPREV, /* KEY_PREVIOUSSONG */ - /* 166 */ SDL_SCANCODE_UNKNOWN, /* KEY_STOPCD */ + /* 166 */ SDL_SCANCODE_AUDIOSTOP, /* KEY_STOPCD */ /* 167 */ SDL_SCANCODE_UNKNOWN, /* KEY_RECORD */ /* 168 */ SDL_SCANCODE_UNKNOWN, /* KEY_REWIND */ /* 169 */ SDL_SCANCODE_UNKNOWN, /* KEY_PHONE */ @@ -221,7 +221,7 @@ static SDL_Scancode const linux_scancode_table[] = { /* 192 */ SDL_SCANCODE_F22, /* 193 */ SDL_SCANCODE_F23, /* 194 */ SDL_SCANCODE_F24, - 0, 0, 0, 0, + 0, 0, 0, 0, 0, /* 200 */ SDL_SCANCODE_UNKNOWN, /* KEY_PLAYCD */ /* 201 */ SDL_SCANCODE_UNKNOWN, /* KEY_PAUSECD */ /* 202 */ SDL_SCANCODE_UNKNOWN, /* KEY_PROG3 */ diff --git a/Engine/lib/sdl/src/events/scancodes_xfree86.h b/Engine/lib/sdl/src/events/scancodes_xfree86.h index 29d9ef944..804196ca4 100644 --- a/Engine/lib/sdl/src/events/scancodes_xfree86.h +++ b/Engine/lib/sdl/src/events/scancodes_xfree86.h @@ -418,4 +418,89 @@ static const SDL_Scancode xfree86_scancode_table2[] = { /* 238 */ SDL_SCANCODE_UNKNOWN, /* XF86WLAN */ }; +/* Xvnc / Xtightvnc scancodes from xmodmap -pk */ +static const SDL_Scancode xvnc_scancode_table[] = { + /* 0 */ SDL_SCANCODE_LCTRL, + /* 1 */ SDL_SCANCODE_RCTRL, + /* 2 */ SDL_SCANCODE_LSHIFT, + /* 3 */ SDL_SCANCODE_RSHIFT, + /* 4 */ SDL_SCANCODE_UNKNOWN, /* Meta_L */ + /* 5 */ SDL_SCANCODE_UNKNOWN, /* Meta_R */ + /* 6 */ SDL_SCANCODE_LALT, + /* 7 */ SDL_SCANCODE_RALT, + /* 8 */ SDL_SCANCODE_SPACE, + /* 9 */ SDL_SCANCODE_0, + /* 10 */ SDL_SCANCODE_1, + /* 11 */ SDL_SCANCODE_2, + /* 12 */ SDL_SCANCODE_3, + /* 13 */ SDL_SCANCODE_4, + /* 14 */ SDL_SCANCODE_5, + /* 15 */ SDL_SCANCODE_6, + /* 16 */ SDL_SCANCODE_7, + /* 17 */ SDL_SCANCODE_8, + /* 18 */ SDL_SCANCODE_9, + /* 19 */ SDL_SCANCODE_MINUS, + /* 20 */ SDL_SCANCODE_EQUALS, + /* 21 */ SDL_SCANCODE_LEFTBRACKET, + /* 22 */ SDL_SCANCODE_RIGHTBRACKET, + /* 23 */ SDL_SCANCODE_SEMICOLON, + /* 24 */ SDL_SCANCODE_APOSTROPHE, + /* 25 */ SDL_SCANCODE_GRAVE, + /* 26 */ SDL_SCANCODE_COMMA, + /* 27 */ SDL_SCANCODE_PERIOD, + /* 28 */ SDL_SCANCODE_SLASH, + /* 29 */ SDL_SCANCODE_BACKSLASH, + /* 30 */ SDL_SCANCODE_A, + /* 31 */ SDL_SCANCODE_B, + /* 32 */ SDL_SCANCODE_C, + /* 33 */ SDL_SCANCODE_D, + /* 34 */ SDL_SCANCODE_E, + /* 35 */ SDL_SCANCODE_F, + /* 36 */ SDL_SCANCODE_G, + /* 37 */ SDL_SCANCODE_H, + /* 38 */ SDL_SCANCODE_I, + /* 39 */ SDL_SCANCODE_J, + /* 40 */ SDL_SCANCODE_K, + /* 41 */ SDL_SCANCODE_L, + /* 42 */ SDL_SCANCODE_M, + /* 43 */ SDL_SCANCODE_N, + /* 44 */ SDL_SCANCODE_O, + /* 45 */ SDL_SCANCODE_P, + /* 46 */ SDL_SCANCODE_Q, + /* 47 */ SDL_SCANCODE_R, + /* 48 */ SDL_SCANCODE_S, + /* 49 */ SDL_SCANCODE_T, + /* 50 */ SDL_SCANCODE_U, + /* 51 */ SDL_SCANCODE_V, + /* 52 */ SDL_SCANCODE_W, + /* 53 */ SDL_SCANCODE_X, + /* 54 */ SDL_SCANCODE_Y, + /* 55 */ SDL_SCANCODE_Z, + /* 56 */ SDL_SCANCODE_BACKSPACE, + /* 57 */ SDL_SCANCODE_RETURN, + /* 58 */ SDL_SCANCODE_TAB, + /* 59 */ SDL_SCANCODE_ESCAPE, + /* 60 */ SDL_SCANCODE_DELETE, + /* 61 */ SDL_SCANCODE_HOME, + /* 62 */ SDL_SCANCODE_END, + /* 63 */ SDL_SCANCODE_PAGEUP, + /* 64 */ SDL_SCANCODE_PAGEDOWN, + /* 65 */ SDL_SCANCODE_UP, + /* 66 */ SDL_SCANCODE_DOWN, + /* 67 */ SDL_SCANCODE_LEFT, + /* 68 */ SDL_SCANCODE_RIGHT, + /* 69 */ SDL_SCANCODE_F1, + /* 70 */ SDL_SCANCODE_F2, + /* 71 */ SDL_SCANCODE_F3, + /* 72 */ SDL_SCANCODE_F4, + /* 73 */ SDL_SCANCODE_F5, + /* 74 */ SDL_SCANCODE_F6, + /* 75 */ SDL_SCANCODE_F7, + /* 76 */ SDL_SCANCODE_F8, + /* 77 */ SDL_SCANCODE_F9, + /* 78 */ SDL_SCANCODE_F10, + /* 79 */ SDL_SCANCODE_F11, + /* 80 */ SDL_SCANCODE_F12, +}; + /* *INDENT-ON* */ diff --git a/Engine/lib/sdl/src/filesystem/dummy/SDL_sysfilesystem.c b/Engine/lib/sdl/src/filesystem/dummy/SDL_sysfilesystem.c index 45273f24a..2570f4c75 100644 --- a/Engine/lib/sdl/src/filesystem/dummy/SDL_sysfilesystem.c +++ b/Engine/lib/sdl/src/filesystem/dummy/SDL_sysfilesystem.c @@ -20,7 +20,7 @@ */ #include "../../SDL_internal.h" -#ifdef SDL_FILESYSTEM_DUMMY +#if defined(SDL_FILESYSTEM_DUMMY) || defined(SDL_FILESYSTEM_DISABLED) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent filesystem routines */ @@ -42,6 +42,6 @@ SDL_GetPrefPath(const char *org, const char *app) return NULL; } -#endif /* SDL_FILESYSTEM_DUMMY */ +#endif /* SDL_FILESYSTEM_DUMMY || SDL_FILESYSTEM_DISABLED */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/filesystem/unix/SDL_sysfilesystem.c b/Engine/lib/sdl/src/filesystem/unix/SDL_sysfilesystem.c index fa034a456..bd2e84cd1 100644 --- a/Engine/lib/sdl/src/filesystem/unix/SDL_sysfilesystem.c +++ b/Engine/lib/sdl/src/filesystem/unix/SDL_sysfilesystem.c @@ -33,7 +33,7 @@ #include #include -#ifdef __FREEBSD__ +#if defined(__FREEBSD__) || defined(__OPENBSD__) #include #endif @@ -90,7 +90,26 @@ SDL_GetBasePath(void) return NULL; } } -#elif defined(__SOLARIS__) +#endif +#if defined(__OPENBSD__) + char **retvalargs; + size_t len; + const int mib[] = { CTL_KERN, KERN_PROC_ARGS, getpid(), KERN_PROC_ARGV }; + if (sysctl(mib, 4, NULL, &len, NULL, 0) != -1) { + retvalargs = SDL_malloc(len); + if (!retvalargs) { + SDL_OutOfMemory(); + return NULL; + } + sysctl(mib, 4, retvalargs, &len, NULL, 0); + retval = SDL_malloc(PATH_MAX + 1); + if (retval) + realpath(retvalargs[0], retval); + + SDL_free(retvalargs); + } +#endif +#if defined(__SOLARIS__) const char *path = getexecname(); if ((path != NULL) && (path[0] == '/')) { /* must be absolute path... */ retval = SDL_strdup(path); diff --git a/Engine/lib/sdl/src/haptic/linux/SDL_syshaptic.c b/Engine/lib/sdl/src/haptic/linux/SDL_syshaptic.c index e8d785535..7bd966449 100644 --- a/Engine/lib/sdl/src/haptic/linux/SDL_syshaptic.c +++ b/Engine/lib/sdl/src/haptic/linux/SDL_syshaptic.c @@ -609,7 +609,7 @@ SDL_SYS_HapticQuit(void) /* Opened and not closed haptics are leaked, this is on purpose. * Close your haptic devices after usage. */ SDL_free(item->fname); - item->fname = NULL; + SDL_free(item); } #if SDL_USE_LIBUDEV @@ -690,7 +690,7 @@ SDL_SYS_ToDirection(Uint16 *dest, SDL_HapticDirection * src) else if (!src->dir[0]) *dest = (src->dir[1] >= 0 ? 0x8000 : 0); else { - float f = atan2(src->dir[1], src->dir[0]); /* Ideally we'd use fixed point math instead of floats... */ + float f = SDL_atan2(src->dir[1], src->dir[0]); /* Ideally we'd use fixed point math instead of floats... */ /* atan2 takes the parameters: Y-axis-value and X-axis-value (in that order) - Y-axis-value is the second coordinate (from center to SOUTH) diff --git a/Engine/lib/sdl/src/haptic/windows/SDL_dinputhaptic.c b/Engine/lib/sdl/src/haptic/windows/SDL_dinputhaptic.c index c51470dd5..c81432c26 100644 --- a/Engine/lib/sdl/src/haptic/windows/SDL_dinputhaptic.c +++ b/Engine/lib/sdl/src/haptic/windows/SDL_dinputhaptic.c @@ -325,20 +325,12 @@ SDL_DINPUT_HapticOpenFromDevice(SDL_Haptic * haptic, LPDIRECTINPUTDEVICE8 device /* Set data format. */ ret = IDirectInputDevice8_SetDataFormat(haptic->hwdata->device, - &c_dfDIJoystick2); + &SDL_c_dfDIJoystick2); if (FAILED(ret)) { DI_SetError("Setting data format", ret); goto acquire_err; } - /* Get number of axes. */ - ret = IDirectInputDevice8_EnumObjects(haptic->hwdata->device, - DI_DeviceObjectCallback, - haptic, DIDFT_AXIS); - if (FAILED(ret)) { - DI_SetError("Getting device axes", ret); - goto acquire_err; - } /* Acquire the device. */ ret = IDirectInputDevice8_Acquire(haptic->hwdata->device); @@ -348,6 +340,15 @@ SDL_DINPUT_HapticOpenFromDevice(SDL_Haptic * haptic, LPDIRECTINPUTDEVICE8 device } } + /* Get number of axes. */ + ret = IDirectInputDevice8_EnumObjects(haptic->hwdata->device, + DI_DeviceObjectCallback, + haptic, DIDFT_AXIS); + if (FAILED(ret)) { + DI_SetError("Getting device axes", ret); + goto acquire_err; + } + /* Reset all actuators - just in case. */ ret = IDirectInputDevice8_SendForceFeedbackCommand(haptic->hwdata->device, DISFFC_RESET); diff --git a/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic.c b/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic.c index 0c038fb1b..c6bcba1f3 100644 --- a/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic.c +++ b/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic.c @@ -255,7 +255,7 @@ SDL_SYS_HapticQuit(void) for (hapticitem = SDL_haptics; hapticitem; hapticitem = hapticitem->next) { if ((hapticitem->hwdata->bXInputHaptic) && (hapticitem->hwdata->thread)) { /* we _have_ to stop the thread before we free the XInput DLL! */ - hapticitem->hwdata->stopThread = 1; + SDL_AtomicSet(&hapticitem->hwdata->stopThread, 1); SDL_WaitThread(hapticitem->hwdata->thread, NULL); hapticitem->hwdata->thread = NULL; } diff --git a/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic_c.h b/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic_c.h index 89fdd2cb9..f34426442 100644 --- a/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic_c.h +++ b/Engine/lib/sdl/src/haptic/windows/SDL_windowshaptic_c.h @@ -42,8 +42,8 @@ struct haptic_hwdata Uint8 userid; /* XInput userid index for this joystick */ SDL_Thread *thread; SDL_mutex *mutex; - volatile Uint32 stopTicks; - volatile int stopThread; + Uint32 stopTicks; + SDL_atomic_t stopThread; }; diff --git a/Engine/lib/sdl/src/haptic/windows/SDL_xinputhaptic.c b/Engine/lib/sdl/src/haptic/windows/SDL_xinputhaptic.c index a46ae5f97..afbab456a 100644 --- a/Engine/lib/sdl/src/haptic/windows/SDL_xinputhaptic.c +++ b/Engine/lib/sdl/src/haptic/windows/SDL_xinputhaptic.c @@ -33,6 +33,7 @@ #include "SDL_xinputhaptic_c.h" #include "../../core/windows/SDL_xinput.h" #include "../../joystick/windows/SDL_windowsjoystick_c.h" +#include "../../thread/SDL_systhread.h" /* * Internal stuff. @@ -43,8 +44,7 @@ static SDL_bool loaded_xinput = SDL_FALSE; int SDL_XINPUT_HapticInit(void) { - const char *env = SDL_GetHint(SDL_HINT_XINPUT_ENABLED); - if (!env || SDL_atoi(env)) { + if (SDL_GetHintBoolean(SDL_HINT_XINPUT_ENABLED, SDL_TRUE)) { loaded_xinput = (WIN_LoadXInputDLL() == 0); } @@ -146,7 +146,7 @@ SDL_RunXInputHaptic(void *arg) { struct haptic_hwdata *hwdata = (struct haptic_hwdata *) arg; - while (!hwdata->stopThread) { + while (!SDL_AtomicGet(&hwdata->stopThread)) { SDL_Delay(50); SDL_LockMutex(hwdata->mutex); /* If we're currently running and need to stop... */ @@ -205,17 +205,8 @@ SDL_XINPUT_HapticOpenFromUserIndex(SDL_Haptic *haptic, const Uint8 userid) } SDL_snprintf(threadName, sizeof(threadName), "SDLXInputDev%d", (int)userid); + haptic->hwdata->thread = SDL_CreateThreadInternal(SDL_RunXInputHaptic, threadName, 64 * 1024, haptic->hwdata); -#if defined(__WIN32__) && !defined(HAVE_LIBC) /* !!! FIXME: this is nasty. */ -#undef SDL_CreateThread -#if SDL_DYNAMIC_API - haptic->hwdata->thread = SDL_CreateThread_REAL(SDL_RunXInputHaptic, threadName, haptic->hwdata, NULL, NULL); -#else - haptic->hwdata->thread = SDL_CreateThread(SDL_RunXInputHaptic, threadName, haptic->hwdata, NULL, NULL); -#endif -#else - haptic->hwdata->thread = SDL_CreateThread(SDL_RunXInputHaptic, threadName, haptic->hwdata); -#endif if (haptic->hwdata->thread == NULL) { SDL_DestroyMutex(haptic->hwdata->mutex); SDL_free(haptic->effects); @@ -261,7 +252,7 @@ SDL_XINPUT_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick) void SDL_XINPUT_HapticClose(SDL_Haptic * haptic) { - haptic->hwdata->stopThread = 1; + SDL_AtomicSet(&haptic->hwdata->stopThread, 1); SDL_WaitThread(haptic->hwdata->thread, NULL); SDL_DestroyMutex(haptic->hwdata->mutex); } diff --git a/Engine/lib/sdl/src/joystick/SDL_gamecontroller.c b/Engine/lib/sdl/src/joystick/SDL_gamecontroller.c index 0fd1ef4a7..1d3a4c203 100644 --- a/Engine/lib/sdl/src/joystick/SDL_gamecontroller.c +++ b/Engine/lib/sdl/src/joystick/SDL_gamecontroller.c @@ -45,7 +45,8 @@ struct _SDL_HatMapping Uint8 mask; }; -#define k_nMaxReverseEntries 20 +/* We need 36 entries for Android (as of SDL v2.0.4) */ +#define k_nMaxReverseEntries 48 /** * We are encoding the "HAT" as 0xhm. where h == hat ID and m == mask @@ -105,6 +106,35 @@ struct _SDL_GameController int SDL_PrivateGameControllerAxis(SDL_GameController * gamecontroller, SDL_GameControllerAxis axis, Sint16 value); int SDL_PrivateGameControllerButton(SDL_GameController * gamecontroller, SDL_GameControllerButton button, Uint8 state); +/* + * If there is an existing add event in the queue, it needs to be modified + * to have the right value for which, because the number of controllers in + * the system is now one less. + */ +static void UpdateEventsForDeviceRemoval() +{ + int i, num_events; + SDL_Event *events; + + num_events = SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, SDL_CONTROLLERDEVICEADDED, SDL_CONTROLLERDEVICEADDED); + if (num_events <= 0) { + return; + } + + events = SDL_stack_alloc(SDL_Event, num_events); + if (!events) { + return; + } + + num_events = SDL_PeepEvents(events, num_events, SDL_GETEVENT, SDL_CONTROLLERDEVICEADDED, SDL_CONTROLLERDEVICEADDED); + for (i = 0; i < num_events; ++i) { + --events[i].cdevice.which; + } + SDL_PeepEvents(events, num_events, SDL_ADDEVENT, 0, 0); + + SDL_stack_free(events); +} + /* * Event filter to fire controller events from joystick ones */ @@ -115,7 +145,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) { SDL_GameController *controllerlist; - if (event->jaxis.axis >= k_nMaxReverseEntries) break; + if (event->jaxis.axis >= k_nMaxReverseEntries) + { + SDL_SetError("SDL_GameControllerEventWatcher: Axis index %d too large, ignoring motion", (int)event->jaxis.axis); + break; + } controllerlist = SDL_gamecontrollers; while (controllerlist) { @@ -126,8 +160,8 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) switch (axis) { case SDL_CONTROLLER_AXIS_TRIGGERLEFT: case SDL_CONTROLLER_AXIS_TRIGGERRIGHT: - /* Shift it to be 0 - 32767. */ value = value / 2 + 16384; + break; default: break; } @@ -146,7 +180,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) { SDL_GameController *controllerlist; - if (event->jbutton.button >= k_nMaxReverseEntries) break; + if (event->jbutton.button >= k_nMaxReverseEntries) + { + SDL_SetError("SDL_GameControllerEventWatcher: Button index %d too large, ignoring update", (int)event->jbutton.button); + break; + } controllerlist = SDL_gamecontrollers; while (controllerlist) { @@ -223,9 +261,12 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) while (controllerlist) { if (controllerlist->joystick->instance_id == event->jdevice.which) { SDL_Event deviceevent; + deviceevent.type = SDL_CONTROLLERDEVICEREMOVED; deviceevent.cdevice.which = event->jdevice.which; SDL_PushEvent(&deviceevent); + + UpdateEventsForDeviceRemoval(); break; } controllerlist = controllerlist->next; @@ -861,7 +902,6 @@ SDL_GameControllerInit(void) { int i = 0; const char *pMappingString = NULL; - s_pSupportedControllers = NULL; pMappingString = s_ControllerMappings[i]; while (pMappingString) { SDL_GameControllerAddMapping(pMappingString); @@ -971,6 +1011,20 @@ SDL_GameControllerOpen(int device_index) SDL_PrivateLoadButtonMapping(&gamecontroller->mapping, pSupportedController->guid, pSupportedController->name, pSupportedController->mapping); + /* The triggers are mapped from -32768 to 32767, where -32768 is the 'unpressed' value */ + { + int leftTriggerMapping = gamecontroller->mapping.axes[SDL_CONTROLLER_AXIS_TRIGGERLEFT]; + int rightTriggerMapping = gamecontroller->mapping.axes[SDL_CONTROLLER_AXIS_TRIGGERRIGHT]; + if (leftTriggerMapping >= 0) { + gamecontroller->joystick->axes[leftTriggerMapping] = + gamecontroller->joystick->axes_zero[leftTriggerMapping] = (Sint16)-32768; + } + if (rightTriggerMapping >= 0) { + gamecontroller->joystick->axes[rightTriggerMapping] = + gamecontroller->joystick->axes_zero[rightTriggerMapping] = (Sint16)-32768; + } + } + /* Add joystick to list */ ++gamecontroller->ref_count; /* Link the joystick in the list */ @@ -1007,7 +1061,7 @@ SDL_GameControllerGetAxis(SDL_GameController * gamecontroller, SDL_GameControlle switch (axis) { case SDL_CONTROLLER_AXIS_TRIGGERLEFT: case SDL_CONTROLLER_AXIS_TRIGGERRIGHT: - /* Shift it to be 0 - 32767. */ + /* Shift it to be 0 - 32767 */ value = value / 2 + 16384; default: break; diff --git a/Engine/lib/sdl/src/joystick/SDL_gamecontrollerdb.h b/Engine/lib/sdl/src/joystick/SDL_gamecontrollerdb.h index 211d00d01..1e623cbb8 100644 --- a/Engine/lib/sdl/src/joystick/SDL_gamecontrollerdb.h +++ b/Engine/lib/sdl/src/joystick/SDL_gamecontrollerdb.h @@ -35,6 +35,7 @@ static const char *s_ControllerMappings [] = "xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", #endif #if SDL_JOYSTICK_DINPUT + "10280900000000000000504944564944,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", "e8206058000000000000504944564944,Cideko AK08b,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,", "ffff0000000000000000504944564944,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", @@ -48,6 +49,7 @@ static const char *s_ControllerMappings [] = "4c05c405000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", #endif #if defined(__MACOSX__) + "10280000000000000900000000000000,8Bitdo SFC30 GamePad Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", "830500000000000031b0000000000000,Cideko AK08b,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "6d0400000000000016c2000000000000,Logitech F310 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* Guide button doesn't seem to be sent in DInput mode. */ @@ -56,11 +58,14 @@ static const char *s_ControllerMappings [] = "6d0400000000000019c2000000000000,Logitech Wireless Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* This includes F710 in DInput mode and the "Logitech Cordless RumblePad 2", at the very least. */ "4c050000000000006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", "4c05000000000000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", + "351200000000000021ab000000000000,SFC30 Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", "11010000000000002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", "11010000000000001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", "5e040000000000008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,", #endif #if defined(__LINUX__) + "05000000102800000900000000010000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", + "03000000100000008200000011010000,Akishop Customs PS360+ v1.66,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,", "03000000e82000006058000001010000,Cideko AK08b,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,", "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "030000006f0e00000104000000010000,Gamestop Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", @@ -71,6 +76,12 @@ static const char *s_ControllerMappings [] = "030000006d04000019c2000011010000,Logitech F710 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* Guide button doesn't seem to be sent in DInput mode. */ "030000006d0400001fc2000005030000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "030000006d04000018c2000010010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", + "03000000380700008433000011010000,Mad Catz FightStick TE S+ PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", + "03000000380700008483000011010000,Mad Catz FightStick TE S+ PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", + "03000000380700003847000090040000,Mad Catz Wired Xbox 360 Controller (SFIV),a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", + "03000000380700008034000011010000,Mad Catz fightstick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", + "03000000380700008084000011010000,Mad Catz fightstick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", + "03000000380700001888000010010000,MadCatz PC USB Wired Stick 8818,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", "03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", "050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "050000003620000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", @@ -78,12 +89,15 @@ static const char *s_ControllerMappings [] = "03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", "030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", "050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", + "030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", + "050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", "03000000c6240000045d000025010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "03000000321500000009000011010000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", "050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", "03000000de280000fc11000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "03000000de280000ff11000001000000,Valve Streaming Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", + "050000005e040000e002000003090000,Xbox One Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", "030000005e040000d102000001010000,Xbox One Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", #endif #if defined(__ANDROID__) diff --git a/Engine/lib/sdl/src/joystick/SDL_joystick.c b/Engine/lib/sdl/src/joystick/SDL_joystick.c index dc910a82b..c426a39e5 100644 --- a/Engine/lib/sdl/src/joystick/SDL_joystick.c +++ b/Engine/lib/sdl/src/joystick/SDL_joystick.c @@ -142,8 +142,8 @@ SDL_JoystickOpen(int device_index) joystick->name = NULL; if (joystick->naxes > 0) { - joystick->axes = (Sint16 *) SDL_malloc - (joystick->naxes * sizeof(Sint16)); + joystick->axes = (Sint16 *) SDL_malloc(joystick->naxes * sizeof(Sint16)); + joystick->axes_zero = (Sint16 *) SDL_malloc(joystick->naxes * sizeof(Sint16)); } if (joystick->nhats > 0) { joystick->hats = (Uint8 *) SDL_malloc @@ -167,6 +167,7 @@ SDL_JoystickOpen(int device_index) } if (joystick->axes) { SDL_memset(joystick->axes, 0, joystick->naxes * sizeof(Sint16)); + SDL_memset(joystick->axes_zero, 0, joystick->naxes * sizeof(Sint16)); } if (joystick->hats) { SDL_memset(joystick->hats, 0, joystick->nhats * sizeof(Uint8)); @@ -497,6 +498,71 @@ SDL_PrivateJoystickShouldIgnoreEvent() /* These are global for SDL_sysjoystick.c and SDL_events.c */ +void SDL_PrivateJoystickAdded(int device_index) +{ +#if !SDL_EVENTS_DISABLED + SDL_Event event; + + event.type = SDL_JOYDEVICEADDED; + + if (SDL_GetEventState(event.type) == SDL_ENABLE) { + event.jdevice.which = device_index; + if ( (SDL_EventOK == NULL) || + (*SDL_EventOK) (SDL_EventOKParam, &event) ) { + SDL_PushEvent(&event); + } + } +#endif /* !SDL_EVENTS_DISABLED */ +} + +/* + * If there is an existing add event in the queue, it needs to be modified + * to have the right value for which, because the number of controllers in + * the system is now one less. + */ +static void UpdateEventsForDeviceRemoval() +{ + int i, num_events; + SDL_Event *events; + + num_events = SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, SDL_JOYDEVICEADDED, SDL_JOYDEVICEADDED); + if (num_events <= 0) { + return; + } + + events = SDL_stack_alloc(SDL_Event, num_events); + if (!events) { + return; + } + + num_events = SDL_PeepEvents(events, num_events, SDL_GETEVENT, SDL_JOYDEVICEADDED, SDL_JOYDEVICEADDED); + for (i = 0; i < num_events; ++i) { + --events[i].jdevice.which; + } + SDL_PeepEvents(events, num_events, SDL_ADDEVENT, 0, 0); + + SDL_stack_free(events); +} + +void SDL_PrivateJoystickRemoved(SDL_JoystickID device_instance) +{ +#if !SDL_EVENTS_DISABLED + SDL_Event event; + + event.type = SDL_JOYDEVICEREMOVED; + + if (SDL_GetEventState(event.type) == SDL_ENABLE) { + event.jdevice.which = device_instance; + if ( (SDL_EventOK == NULL) || + (*SDL_EventOK) (SDL_EventOKParam, &event) ) { + SDL_PushEvent(&event); + } + } + + UpdateEventsForDeviceRemoval(); +#endif /* !SDL_EVENTS_DISABLED */ +} + int SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value) { @@ -514,8 +580,8 @@ SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value) * events. */ if (SDL_PrivateJoystickShouldIgnoreEvent()) { - if ((value > 0 && value >= joystick->axes[axis]) || - (value < 0 && value <= joystick->axes[axis])) { + if ((value > joystick->axes_zero[axis] && value >= joystick->axes[axis]) || + (value < joystick->axes_zero[axis] && value <= joystick->axes[axis])) { return 0; } } @@ -688,7 +754,7 @@ SDL_JoystickUpdate(void) /* Tell the app that everything is centered/unpressed... */ for (i = 0; i < joystick->naxes; i++) { - SDL_PrivateJoystickAxis(joystick, i, 0); + SDL_PrivateJoystickAxis(joystick, i, joystick->axes_zero[i]); } for (i = 0; i < joystick->nbuttons; i++) { diff --git a/Engine/lib/sdl/src/joystick/SDL_joystick_c.h b/Engine/lib/sdl/src/joystick/SDL_joystick_c.h index 4a076f6d6..cb9c92544 100644 --- a/Engine/lib/sdl/src/joystick/SDL_joystick_c.h +++ b/Engine/lib/sdl/src/joystick/SDL_joystick_c.h @@ -33,6 +33,8 @@ extern void SDL_GameControllerQuit(void); /* Internal event queueing functions */ +extern void SDL_PrivateJoystickAdded(int device_index); +extern void SDL_PrivateJoystickRemoved(SDL_JoystickID device_instance); extern int SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value); extern int SDL_PrivateJoystickBall(SDL_Joystick * joystick, @@ -41,8 +43,8 @@ extern int SDL_PrivateJoystickHat(SDL_Joystick * joystick, Uint8 hat, Uint8 value); extern int SDL_PrivateJoystickButton(SDL_Joystick * joystick, Uint8 button, Uint8 state); -extern void SDL_PrivateJoystickBatteryLevel( SDL_Joystick * joystick, - SDL_JoystickPowerLevel ePowerLevel ); +extern void SDL_PrivateJoystickBatteryLevel(SDL_Joystick * joystick, + SDL_JoystickPowerLevel ePowerLevel); /* Internal sanity checking functions */ extern int SDL_PrivateJoystickValid(SDL_Joystick * joystick); diff --git a/Engine/lib/sdl/src/joystick/SDL_sysjoystick.h b/Engine/lib/sdl/src/joystick/SDL_sysjoystick.h index 1015840af..f4cad05ec 100644 --- a/Engine/lib/sdl/src/joystick/SDL_sysjoystick.h +++ b/Engine/lib/sdl/src/joystick/SDL_sysjoystick.h @@ -36,6 +36,7 @@ struct _SDL_Joystick int naxes; /* Number of axis controls on the joystick */ Sint16 *axes; /* Current axis states */ + Sint16 *axes_zero; /* Zero point on the axis (-32768 for triggers) */ int nhats; /* Number of hats on the joystick */ Uint8 *hats; /* Current hat states */ diff --git a/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick.c b/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick.c index 8656a5322..a09e9a12c 100644 --- a/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick.c +++ b/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick.c @@ -27,10 +27,6 @@ #include "SDL_error.h" #include "SDL_events.h" -#if !SDL_EVENTS_DISABLED -#include "../../events/SDL_events_c.h" -#endif - #include "SDL_joystick.h" #include "SDL_hints.h" #include "SDL_assert.h" @@ -191,8 +187,8 @@ Android_OnPadDown(int device_id, int keycode) item = JoystickByDeviceId(device_id); if (item && item->joystick) { SDL_PrivateJoystickButton(item->joystick, button , SDL_PRESSED); - return 0; } + return 0; } return -1; @@ -207,8 +203,8 @@ Android_OnPadUp(int device_id, int keycode) item = JoystickByDeviceId(device_id); if (item && item->joystick) { SDL_PrivateJoystickButton(item->joystick, button, SDL_RELEASED); - return 0; } + return 0; } return -1; @@ -252,9 +248,6 @@ Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, { SDL_JoystickGUID guid; SDL_joylist_item *item; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif if(JoystickByDeviceId(device_id) != NULL || name == NULL) { return -1; @@ -299,17 +292,7 @@ Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, /* Need to increment the joystick count before we post the event */ ++numjoysticks; -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEADDED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = (numjoysticks - 1); - if ( (SDL_EventOK == NULL) || - (*SDL_EventOK) (SDL_EventOKParam, &event) ) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickAdded(numjoysticks - 1); #ifdef DEBUG_JOYSTICK SDL_Log("Added joystick %s with device_id %d", name, device_id); @@ -323,9 +306,6 @@ Android_RemoveJoystick(int device_id) { SDL_joylist_item *item = SDL_joylist; SDL_joylist_item *prev = NULL; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif /* Don't call JoystickByDeviceId here or there'll be an infinite loop! */ while (item != NULL) { @@ -340,7 +320,6 @@ Android_RemoveJoystick(int device_id) return -1; } - const int retval = item->device_instance; if (item->joystick) { item->joystick->hwdata = NULL; } @@ -358,17 +337,7 @@ Android_RemoveJoystick(int device_id) /* Need to decrement the joystick count before we post the event */ --numjoysticks; -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEREMOVED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = item->device_instance; - if ( (SDL_EventOK == NULL) || - (*SDL_EventOK) (SDL_EventOKParam, &event) ) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickRemoved(item->device_instance); #ifdef DEBUG_JOYSTICK SDL_Log("Removed joystick with device_id %d", device_id); @@ -376,18 +345,16 @@ Android_RemoveJoystick(int device_id) SDL_free(item->name); SDL_free(item); - return retval; + return numjoysticks; } int SDL_SYS_JoystickInit(void) { - const char *hint; SDL_SYS_JoystickDetect(); - hint = SDL_GetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK); - if (!hint || SDL_atoi(hint)) { + if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE)) { /* Default behavior, accelerometer as joystick */ Android_AddJoystick(ANDROID_ACCELEROMETER_DEVICE_ID, ANDROID_ACCELEROMETER_NAME, SDL_TRUE, 0, 3, 0, 0); } @@ -539,6 +506,10 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) void SDL_SYS_JoystickClose(SDL_Joystick * joystick) { + SDL_joylist_item *item = (SDL_joylist_item *) joystick->hwdata; + if (item) { + item->joystick = NULL; + } } /* Function to perform any system-specific joystick related cleanup */ diff --git a/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick_c.h b/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick_c.h index 49b494c54..51803db35 100644 --- a/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick_c.h +++ b/Engine/lib/sdl/src/joystick/android/SDL_sysjoystick_c.h @@ -1,23 +1,23 @@ /* - Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - */ + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ #include "../../SDL_internal.h" diff --git a/Engine/lib/sdl/src/joystick/bsd/SDL_sysjoystick.c b/Engine/lib/sdl/src/joystick/bsd/SDL_sysjoystick.c index 509d43f75..ddc899f6e 100644 --- a/Engine/lib/sdl/src/joystick/bsd/SDL_sysjoystick.c +++ b/Engine/lib/sdl/src/joystick/bsd/SDL_sysjoystick.c @@ -179,7 +179,7 @@ SDL_SYS_JoystickInit(void) SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i); - joynames[SDL_SYS_numjoysticks] = strdup(s); + joynames[SDL_SYS_numjoysticks] = SDL_strdup(s); if (SDL_SYS_JoystickOpen(&nj, SDL_SYS_numjoysticks) == 0) { SDL_SYS_JoystickClose(&nj); @@ -193,7 +193,7 @@ SDL_SYS_JoystickInit(void) SDL_snprintf(s, SDL_arraysize(s), "/dev/joy%d", i); fd = open(s, O_RDONLY); if (fd != -1) { - joynames[SDL_SYS_numjoysticks++] = strdup(s); + joynames[SDL_SYS_numjoysticks++] = SDL_strdup(s); close(fd); } } @@ -304,14 +304,14 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index) } joy->hwdata = hw; hw->fd = fd; - hw->path = strdup(path); + hw->path = SDL_strdup(path); if (!SDL_strncmp(path, "/dev/joy", 8)) { hw->type = BSDJOY_JOY; joy->naxes = 2; joy->nbuttons = 2; joy->nhats = 0; joy->nballs = 0; - joydevnames[device_index] = strdup("Gameport joystick"); + joydevnames[device_index] = SDL_strdup("Gameport joystick"); goto usbend; } else { hw->type = BSDJOY_UHID; @@ -363,7 +363,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index) str[i] = '\0'; asprintf(&new_name, "%s @ %s", str, path); if (new_name != NULL) { - free(joydevnames[SDL_SYS_numjoysticks]); + SDL_free(joydevnames[SDL_SYS_numjoysticks]); joydevnames[SDL_SYS_numjoysticks] = new_name; } } diff --git a/Engine/lib/sdl/src/joystick/darwin/SDL_sysjoystick.c b/Engine/lib/sdl/src/joystick/darwin/SDL_sysjoystick.c index 6dd306aa8..da10fbac5 100644 --- a/Engine/lib/sdl/src/joystick/darwin/SDL_sysjoystick.c +++ b/Engine/lib/sdl/src/joystick/darwin/SDL_sysjoystick.c @@ -34,9 +34,6 @@ #include "SDL_sysjoystick_c.h" #include "SDL_events.h" #include "../../haptic/darwin/SDL_syshaptic_c.h" /* For haptic hot plugging */ -#if !SDL_EVENTS_DISABLED -#include "../../events/SDL_events_c.h" -#endif #define SDL_JOYSTICK_RUNLOOP_MODE CFSTR("SDLJoystick") @@ -154,21 +151,7 @@ JoystickDeviceWasRemovedCallback(void *ctx, IOReturn result, void *sender) MacHaptic_MaybeRemoveDevice(device->ffservice); #endif -/* !!! FIXME: why isn't there an SDL_PrivateJoyDeviceRemoved()? */ -#if !SDL_EVENTS_DISABLED - { - SDL_Event event; - event.type = SDL_JOYDEVICEREMOVED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = device->instance_id; - if ((SDL_EventOK == NULL) - || (*SDL_EventOK) (SDL_EventOKParam, &event)) { - SDL_PushEvent(&event); - } - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickRemoved(device->instance_id); } @@ -249,6 +232,7 @@ AddHIDElement(const void *value, void *parameter) case kHIDUsage_GD_DPadLeft: case kHIDUsage_GD_Start: case kHIDUsage_GD_Select: + case kHIDUsage_GD_SystemMainMenu: if (!ElementAlreadyAdded(cookie, pDevice->firstButton)) { element = (recElement *) SDL_calloc(1, sizeof (recElement)); if (element) { @@ -422,6 +406,7 @@ JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDevic { recDevice *device; int device_index = 0; + io_service_t ioservice; if (res != kIOReturnSuccess) { return; @@ -451,20 +436,11 @@ JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDevic device->instance_id = ++s_joystick_instance_id; /* We have to do some storage of the io_service_t for SDL_HapticOpenFromJoystick */ - -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - if (IOHIDDeviceGetService != NULL) { /* weak reference: available in 10.6 and later. */ -#endif - - const io_service_t ioservice = IOHIDDeviceGetService(ioHIDDeviceObject); + ioservice = IOHIDDeviceGetService(ioHIDDeviceObject); #if SDL_HAPTIC_IOKIT - if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) { - device->ffservice = ioservice; - MacHaptic_MaybeAddDevice(ioservice); - } -#endif - -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 + if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) { + device->ffservice = ioservice; + MacHaptic_MaybeAddDevice(ioservice); } #endif @@ -483,21 +459,7 @@ JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDevic ++device_index; /* bump by one since we counted by pNext. */ } -/* !!! FIXME: why isn't there an SDL_PrivateJoyDeviceAdded()? */ -#if !SDL_EVENTS_DISABLED - { - SDL_Event event; - event.type = SDL_JOYDEVICEADDED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = device_index; - if ((SDL_EventOK == NULL) - || (*SDL_EventOK) (SDL_EventOKParam, &event)) { - SDL_PushEvent(&event); - } - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickAdded(device_index); } static SDL_bool diff --git a/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick.c b/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick.c index e0c5833bf..6b203667a 100644 --- a/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick.c +++ b/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick.c @@ -27,10 +27,6 @@ #include "SDL_error.h" #include "SDL_events.h" -#if !SDL_EVENTS_DISABLED -#include "../../events/SDL_events_c.h" -#endif - #include "SDL_joystick.h" #include "SDL_hints.h" #include "SDL_assert.h" @@ -57,10 +53,6 @@ Emscripten_JoyStickConnected(int eventType, const EmscriptenGamepadEvent *gamepa return 1; } -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif - item = (SDL_joylist_item *) SDL_malloc(sizeof (SDL_joylist_item)); if (item == NULL) { return 1; @@ -105,20 +97,12 @@ Emscripten_JoyStickConnected(int eventType, const EmscriptenGamepadEvent *gamepa } ++numjoysticks; + + SDL_PrivateJoystickAdded(numjoysticks - 1); + #ifdef DEBUG_JOYSTICK SDL_Log("Number of joysticks is %d", numjoysticks); #endif -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEADDED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = numjoysticks - 1; - if ( (SDL_EventOK == NULL) || - (*SDL_EventOK) (SDL_EventOKParam, &event) ) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ #ifdef DEBUG_JOYSTICK SDL_Log("Added joystick with index %d", item->index); @@ -132,9 +116,6 @@ Emscripten_JoyStickDisconnected(int eventType, const EmscriptenGamepadEvent *gam { SDL_joylist_item *item = SDL_joylist; SDL_joylist_item *prev = NULL; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif while (item != NULL) { if (item->index == gamepadEvent->index) { @@ -165,17 +146,7 @@ Emscripten_JoyStickDisconnected(int eventType, const EmscriptenGamepadEvent *gam /* Need to decrement the joystick count before we post the event */ --numjoysticks; -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEREMOVED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = item->device_instance; - if ( (SDL_EventOK == NULL) || - (*SDL_EventOK) (SDL_EventOKParam, &event) ) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickRemoved(item->device_instance); #ifdef DEBUG_JOYSTICK SDL_Log("Removed joystick with id %d", item->device_instance); @@ -377,6 +348,10 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick) void SDL_SYS_JoystickClose(SDL_Joystick * joystick) { + SDL_joylist_item *item = (SDL_joylist_item *) joystick->hwdata; + if (item) { + item->joystick = NULL; + } } /* Function to perform any system-specific joystick related cleanup */ diff --git a/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h b/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h index c7103c56a..41f613e11 100644 --- a/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h +++ b/Engine/lib/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h @@ -1,23 +1,23 @@ /* - Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - */ + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ #include "../../SDL_internal.h" diff --git a/Engine/lib/sdl/src/joystick/haiku/SDL_haikujoystick.cc b/Engine/lib/sdl/src/joystick/haiku/SDL_haikujoystick.cc index 3ec9ae107..a680189c7 100644 --- a/Engine/lib/sdl/src/joystick/haiku/SDL_haikujoystick.cc +++ b/Engine/lib/sdl/src/joystick/haiku/SDL_haikujoystick.cc @@ -74,8 +74,8 @@ extern "C" if (joystick.Open(name) != B_ERROR) { BString stick_name; joystick.GetControllerName(&stick_name); - SDL_joyport[SDL_SYS_numjoysticks] = strdup(name); - SDL_joyname[SDL_SYS_numjoysticks] = strdup(stick_name.String()); + SDL_joyport[SDL_SYS_numjoysticks] = SDL_strdup(name); + SDL_joyname[SDL_SYS_numjoysticks] = SDL_strdup(stick_name.String()); SDL_SYS_numjoysticks++; joystick.Close(); } diff --git a/Engine/lib/sdl/src/joystick/iphoneos/SDL_sysjoystick.m b/Engine/lib/sdl/src/joystick/iphoneos/SDL_sysjoystick.m index c8a42af05..eb7e00032 100644 --- a/Engine/lib/sdl/src/joystick/iphoneos/SDL_sysjoystick.m +++ b/Engine/lib/sdl/src/joystick/iphoneos/SDL_sysjoystick.m @@ -26,6 +26,7 @@ /* needed for SDL_IPHONE_MAX_GFORCE macro */ #include "SDL_config_iphoneos.h" +#include "SDL_events.h" #include "SDL_joystick.h" #include "SDL_hints.h" #include "SDL_stdinc.h" @@ -36,7 +37,9 @@ #include "../../events/SDL_events_c.h" #endif +#if !TARGET_OS_TV #import +#endif #ifdef SDL_JOYSTICK_MFI #import @@ -45,8 +48,10 @@ static id connectObserver = nil; static id disconnectObserver = nil; #endif /* SDL_JOYSTICK_MFI */ +#if !TARGET_OS_TV static const char *accelerometerName = "iOS Accelerometer"; static CMMotionManager *motionManager = nil; +#endif /* !TARGET_OS_TV */ static SDL_JoystickDeviceItem *deviceList = NULL; @@ -105,6 +110,11 @@ SDL_SYS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCController *contr } else if (controller.gamepad) { device->guid.data[10] = 2; } +#if TARGET_OS_TV + else if (controller.microGamepad) { + device->guid.data[10] = 3; + } +#endif /* TARGET_OS_TV */ if (controller.extendedGamepad) { device->naxes = 6; /* 2 thumbsticks and 2 triggers */ @@ -115,21 +125,27 @@ SDL_SYS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCController *contr device->nhats = 1; /* d-pad */ device->nbuttons = 7; /* ABXY, shoulder buttons, pause button */ } - /* TODO: Handle micro profiles on tvOS. */ +#if TARGET_OS_TV + else if (controller.microGamepad) { + device->naxes = 2; /* treat the touch surface as two axes */ + device->nhats = 0; /* apparently the touch surface-as-dpad is buggy */ + device->nbuttons = 3; /* AX, pause button */ + + controller.microGamepad.allowsRotation = SDL_GetHintBoolean(SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION, SDL_FALSE); + } +#endif /* TARGET_OS_TV */ /* This will be set when the first button press of the controller is * detected. */ controller.playerIndex = -1; -#endif + +#endif /* SDL_JOYSTICK_MFI */ } static void SDL_SYS_AddJoystickDevice(GCController *controller, SDL_bool accelerometer) { SDL_JoystickDeviceItem *device = deviceList; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif while (device != NULL) { if (device->controller == controller) { @@ -149,6 +165,10 @@ SDL_SYS_AddJoystickDevice(GCController *controller, SDL_bool accelerometer) device->instance_id = instancecounter++; if (accelerometer) { +#if TARGET_OS_TV + SDL_free(device); + return; +#else device->name = SDL_strdup(accelerometerName); device->naxes = 3; /* Device acceleration in the x, y, and z axes. */ device->nhats = 0; @@ -156,6 +176,7 @@ SDL_SYS_AddJoystickDevice(GCController *controller, SDL_bool accelerometer) /* Use the accelerometer name as a GUID. */ SDL_memcpy(&device->guid.data, device->name, SDL_min(sizeof(SDL_JoystickGUID), SDL_strlen(device->name))); +#endif /* TARGET_OS_TV */ } else if (controller) { SDL_SYS_AddMFIJoystickDevice(device, controller); } @@ -172,17 +193,7 @@ SDL_SYS_AddJoystickDevice(GCController *controller, SDL_bool accelerometer) ++numjoysticks; -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEADDED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = numjoysticks - 1; - if ((SDL_EventOK == NULL) || - (*SDL_EventOK)(SDL_EventOKParam, &event)) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickAdded(numjoysticks - 1); } static SDL_JoystickDeviceItem * @@ -191,9 +202,6 @@ SDL_SYS_RemoveJoystickDevice(SDL_JoystickDeviceItem *device) SDL_JoystickDeviceItem *prev = NULL; SDL_JoystickDeviceItem *next = NULL; SDL_JoystickDeviceItem *item = deviceList; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif if (device == NULL) { return NULL; @@ -234,17 +242,7 @@ SDL_SYS_RemoveJoystickDevice(SDL_JoystickDeviceItem *device) --numjoysticks; -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEREMOVED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = device->instance_id; - if ((SDL_EventOK == NULL) || - (*SDL_EventOK)(SDL_EventOKParam, &event)) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickRemoved(device->instance_id); SDL_free(device->name); SDL_free(device); @@ -252,6 +250,22 @@ SDL_SYS_RemoveJoystickDevice(SDL_JoystickDeviceItem *device) return next; } +#if TARGET_OS_TV +static void +SDL_AppleTVRemoteRotationHintChanged(void *udata, const char *name, const char *oldValue, const char *newValue) +{ + BOOL allowRotation = newValue != NULL && *newValue != '0'; + + @autoreleasepool { + for (GCController *controller in [GCController controllers]) { + if (controller.microGamepad) { + controller.microGamepad.allowsRotation = allowRotation; + } + } + } +} +#endif /* TARGET_OS_TV */ + /* Function to scan the system for joysticks. * Joystick 0 should be the system default joystick. * It should return 0, or -1 on an unrecoverable fatal error. @@ -261,12 +275,13 @@ SDL_SYS_JoystickInit(void) { @autoreleasepool { NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - const char *hint = SDL_GetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK); - if (!hint || SDL_atoi(hint)) { +#if !TARGET_OS_TV + if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE)) { /* Default behavior, accelerometer as joystick */ SDL_SYS_AddJoystickDevice(nil, SDL_TRUE); } +#endif /* !TARGET_OS_TV */ #ifdef SDL_JOYSTICK_MFI /* GameController.framework was added in iOS 7. */ @@ -278,6 +293,11 @@ SDL_SYS_JoystickInit(void) SDL_SYS_AddJoystickDevice(controller, SDL_FALSE); } +#if TARGET_OS_TV + SDL_AddHintCallback(SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION, + SDL_AppleTVRemoteRotationHintChanged, NULL); +#endif /* TARGET_OS_TV */ + connectObserver = [center addObserverForName:GCControllerDidConnectNotification object:nil queue:nil @@ -355,6 +375,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index) @autoreleasepool { if (device->accelerometer) { +#if !TARGET_OS_TV if (motionManager == nil) { motionManager = [[CMMotionManager alloc] init]; } @@ -362,6 +383,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index) /* Shorter times between updates can significantly increase CPU usage. */ motionManager.accelerometerUpdateInterval = 0.1; [motionManager startAccelerometerUpdates]; +#endif /* !TARGET_OS_TV */ } else { #ifdef SDL_JOYSTICK_MFI GCController *controller = device->controller; @@ -387,6 +409,7 @@ SDL_SYS_JoystickAttached(SDL_Joystick *joystick) static void SDL_SYS_AccelerometerUpdate(SDL_Joystick * joystick) { +#if !TARGET_OS_TV const float maxgforce = SDL_IPHONE_MAX_GFORCE; const SInt16 maxsint16 = 0x7FFF; CMAcceleration accel; @@ -424,6 +447,7 @@ SDL_SYS_AccelerometerUpdate(SDL_Joystick * joystick) SDL_PrivateJoystickAxis(joystick, 0, (accel.x / maxgforce) * maxsint16); SDL_PrivateJoystickAxis(joystick, 1, -(accel.y / maxgforce) * maxsint16); SDL_PrivateJoystickAxis(joystick, 2, (accel.z / maxgforce) * maxsint16); +#endif /* !TARGET_OS_TV */ } #ifdef SDL_JOYSTICK_MFI @@ -455,7 +479,7 @@ SDL_SYS_MFIJoystickHatStateForDPad(GCControllerDirectionPad *dpad) static void SDL_SYS_MFIJoystickUpdate(SDL_Joystick * joystick) { -#ifdef SDL_JOYSTICK_MFI +#if SDL_JOYSTICK_MFI @autoreleasepool { GCController *controller = joystick->hwdata->controller; Uint8 hatstate = SDL_HAT_CENTERED; @@ -517,7 +541,36 @@ SDL_SYS_MFIJoystickUpdate(SDL_Joystick * joystick) SDL_PrivateJoystickButton(joystick, i, buttons[i]); } } - /* TODO: Handle micro profiles on tvOS. */ +#if TARGET_OS_TV + else if (controller.microGamepad) { + GCMicroGamepad *gamepad = controller.microGamepad; + + Sint16 axes[] = { + (Sint16) (gamepad.dpad.xAxis.value * 32767), + (Sint16) (gamepad.dpad.yAxis.value * -32767), + }; + + for (i = 0; i < SDL_arraysize(axes); i++) { + updateplayerindex |= (joystick->axes[i] != axes[i]); + SDL_PrivateJoystickAxis(joystick, i, axes[i]); + } + + /* Apparently the dpad values are not accurate enough to be useful. */ + /* hatstate = SDL_SYS_MFIJoystickHatStateForDPad(gamepad.dpad); */ + + Uint8 buttons[] = { + gamepad.buttonA.isPressed, + gamepad.buttonX.isPressed, + }; + + for (i = 0; i < SDL_arraysize(buttons); i++) { + updateplayerindex |= (joystick->buttons[i] != buttons[i]); + SDL_PrivateJoystickButton(joystick, i, buttons[i]); + } + + /* TODO: Figure out what to do with reportsAbsoluteDpadValues */ + } +#endif /* TARGET_OS_TV */ if (joystick->nhats > 0) { updateplayerindex |= (joystick->hats[0] != hatstate); @@ -557,7 +610,7 @@ SDL_SYS_MFIJoystickUpdate(SDL_Joystick * joystick) } } } -#endif +#endif /* SDL_JOYSTICK_MFI */ } /* Function to update the state of a joystick - called as a device poll. @@ -595,7 +648,9 @@ SDL_SYS_JoystickClose(SDL_Joystick * joystick) @autoreleasepool { if (device->accelerometer) { +#if !TARGET_OS_TV [motionManager stopAccelerometerUpdates]; +#endif /* !TARGET_OS_TV */ } else if (device->controller) { #ifdef SDL_JOYSTICK_MFI GCController *controller = device->controller; @@ -623,13 +678,20 @@ SDL_SYS_JoystickQuit(void) [center removeObserver:disconnectObserver name:GCControllerDidDisconnectNotification object:nil]; disconnectObserver = nil; } + +#if TARGET_OS_TV + SDL_DelHintCallback(SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION, + SDL_AppleTVRemoteRotationHintChanged, NULL); +#endif /* TARGET_OS_TV */ #endif /* SDL_JOYSTICK_MFI */ while (deviceList != NULL) { SDL_SYS_RemoveJoystickDevice(deviceList); } +#if !TARGET_OS_TV motionManager = nil; +#endif /* !TARGET_OS_TV */ } numjoysticks = 0; diff --git a/Engine/lib/sdl/src/joystick/linux/SDL_sysjoystick.c b/Engine/lib/sdl/src/joystick/linux/SDL_sysjoystick.c index 8c73859ea..bd52b1808 100644 --- a/Engine/lib/sdl/src/joystick/linux/SDL_sysjoystick.c +++ b/Engine/lib/sdl/src/joystick/linux/SDL_sysjoystick.c @@ -42,11 +42,6 @@ #include "../SDL_joystick_c.h" #include "SDL_sysjoystick_c.h" -/* !!! FIXME: move this somewhere else. */ -#if !SDL_EVENTS_DISABLED -#include "../../events/SDL_events_c.h" -#endif - /* This isn't defined in older Linux kernel headers */ #ifndef SYN_DROPPED #define SYN_DROPPED 3 @@ -176,9 +171,6 @@ MaybeAddDevice(const char *path) char namebuf[128]; SDL_JoystickGUID guid; SDL_joylist_item *item; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif if (path == NULL) { return -1; @@ -239,18 +231,7 @@ MaybeAddDevice(const char *path) /* Need to increment the joystick count before we post the event */ ++numjoysticks; - /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */ -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEADDED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = (numjoysticks - 1); - if ( (SDL_EventOK == NULL) || - (*SDL_EventOK) (SDL_EventOKParam, &event) ) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickAdded(numjoysticks - 1); return numjoysticks; } @@ -262,9 +243,6 @@ MaybeRemoveDevice(const char *path) { SDL_joylist_item *item; SDL_joylist_item *prev = NULL; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif if (path == NULL) { return -1; @@ -290,18 +268,7 @@ MaybeRemoveDevice(const char *path) /* Need to decrement the joystick count before we post the event */ --numjoysticks; - /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */ -#if !SDL_EVENTS_DISABLED - event.type = SDL_JOYDEVICEREMOVED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = item->device_instance; - if ( (SDL_EventOK == NULL) || - (*SDL_EventOK) (SDL_EventOKParam, &event) ) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickRemoved(item->device_instance); SDL_free(item->path); SDL_free(item->name); diff --git a/Engine/lib/sdl/src/joystick/psp/SDL_sysjoystick.c b/Engine/lib/sdl/src/joystick/psp/SDL_sysjoystick.c index e5247254f..352960edf 100644 --- a/Engine/lib/sdl/src/joystick/psp/SDL_sysjoystick.c +++ b/Engine/lib/sdl/src/joystick/psp/SDL_sysjoystick.c @@ -34,9 +34,9 @@ #include "SDL_events.h" #include "SDL_error.h" -#include "SDL_thread.h" #include "SDL_mutex.h" #include "SDL_timer.h" +#include "../../thread/SDL_systhread.h" /* Current pad state */ static SceCtrlData pad = { .Lx = 0, .Ly = 0, .Buttons = 0 }; @@ -116,7 +116,7 @@ int SDL_SYS_JoystickInit(void) return SDL_SetError("Can't create input semaphore"); } running = 1; - if((thread = SDL_CreateThread(JoystickUpdate, "JoySitckThread",NULL)) == NULL) { + if((thread = SDL_CreateThreadInternal(JoystickUpdate, "JoystickThread", 4096, NULL)) == NULL) { return SDL_SetError("Can't create input thread"); } diff --git a/Engine/lib/sdl/src/joystick/sort_controllers.py b/Engine/lib/sdl/src/joystick/sort_controllers.py old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/src/joystick/windows/SDL_dinputjoystick.c b/Engine/lib/sdl/src/joystick/windows/SDL_dinputjoystick.c index f6b0cc88d..7166075b1 100644 --- a/Engine/lib/sdl/src/joystick/windows/SDL_dinputjoystick.c +++ b/Engine/lib/sdl/src/joystick/windows/SDL_dinputjoystick.c @@ -214,7 +214,7 @@ static DIOBJECTDATAFORMAT dfDIJoystick2[] = { { &GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[1]), DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0 }, }; -const DIDATAFORMAT c_dfDIJoystick2 = { +const DIDATAFORMAT SDL_c_dfDIJoystick2 = { sizeof(DIDATAFORMAT), sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, @@ -240,11 +240,23 @@ SDL_IsXInputDevice(const GUID* pGuidProductFromDirectInput) static GUID IID_ValveStreamingGamepad = { MAKELONG(0x28DE, 0x11FF), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; static GUID IID_X360WiredGamepad = { MAKELONG(0x045E, 0x02A1), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; static GUID IID_X360WirelessGamepad = { MAKELONG(0x045E, 0x028E), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; + static GUID IID_XOneWiredGamepad = { MAKELONG(0x045E, 0x02FF), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; + static GUID IID_XOneWirelessGamepad = { MAKELONG(0x045E, 0x02DD), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; + static GUID IID_XOneNewWirelessGamepad = { MAKELONG(0x045E, 0x02D1), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; + static GUID IID_XOneSWirelessGamepad = { MAKELONG(0x045E, 0x02EA), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; + static GUID IID_XOneSBluetoothGamepad = { MAKELONG(0x045E, 0x02E0), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; + static GUID IID_XOneEliteWirelessGamepad = { MAKELONG(0x045E, 0x02E3), 0x0000, 0x0000, { 0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44 } }; static const GUID *s_XInputProductGUID[] = { &IID_ValveStreamingGamepad, - &IID_X360WiredGamepad, /* Microsoft's wired X360 controller for Windows. */ - &IID_X360WirelessGamepad /* Microsoft's wireless X360 controller for Windows. */ + &IID_X360WiredGamepad, /* Microsoft's wired X360 controller for Windows. */ + &IID_X360WirelessGamepad, /* Microsoft's wireless X360 controller for Windows. */ + &IID_XOneWiredGamepad, /* Microsoft's wired Xbox One controller for Windows. */ + &IID_XOneWirelessGamepad, /* Microsoft's wireless Xbox One controller for Windows. */ + &IID_XOneNewWirelessGamepad, /* Microsoft's updated wireless Xbox One controller (w/ 3.5 mm jack) for Windows. */ + &IID_XOneSWirelessGamepad, /* Microsoft's wireless Xbox One S controller for Windows. */ + &IID_XOneSBluetoothGamepad, /* Microsoft's Bluetooth Xbox One S controller for Windows. */ + &IID_XOneEliteWirelessGamepad /* Microsoft's wireless Xbox One Elite controller for Windows. */ }; size_t iDevice; @@ -582,7 +594,7 @@ SDL_DINPUT_JoystickOpen(SDL_Joystick * joystick, JoyStick_DeviceData *joystickde /* Use the extended data structure: DIJOYSTATE2. */ result = IDirectInputDevice8_SetDataFormat(joystick->hwdata->InputDevice, - &c_dfDIJoystick2); + &SDL_c_dfDIJoystick2); if (FAILED(result)) { return SetDIerror("IDirectInputDevice8::SetDataFormat", result); } diff --git a/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick.c b/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick.c index 7123c6151..e528afa7f 100644 --- a/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick.c +++ b/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick.c @@ -35,16 +35,13 @@ #include "SDL_error.h" #include "SDL_assert.h" #include "SDL_events.h" -#include "SDL_thread.h" #include "SDL_timer.h" #include "SDL_mutex.h" #include "SDL_events.h" #include "SDL_hints.h" #include "SDL_joystick.h" #include "../SDL_sysjoystick.h" -#if !SDL_EVENTS_DISABLED -#include "../../events/SDL_events_c.h" -#endif +#include "../../thread/SDL_systhread.h" #include "../../core/windows/SDL_windows.h" #if !defined(__WINRT__) #include @@ -301,18 +298,9 @@ SDL_SYS_JoystickInit(void) SDL_SYS_JoystickDetect(); if (!s_threadJoystick) { - s_bJoystickThreadQuit = SDL_FALSE; /* spin up the thread to detect hotplug of devices */ -#if defined(__WIN32__) && !defined(HAVE_LIBC) -#undef SDL_CreateThread -#if SDL_DYNAMIC_API - s_threadJoystick= SDL_CreateThread_REAL(SDL_JoystickThread, "SDL_joystick", NULL, NULL, NULL); -#else - s_threadJoystick= SDL_CreateThread(SDL_JoystickThread, "SDL_joystick", NULL, NULL, NULL); -#endif -#else - s_threadJoystick = SDL_CreateThread(SDL_JoystickThread, "SDL_joystick", NULL); -#endif + s_bJoystickThreadQuit = SDL_FALSE; + s_threadJoystick = SDL_CreateThreadInternal(SDL_JoystickThread, "SDL_joystick", 64 * 1024, NULL); } return SDL_SYS_NumJoysticks(); } @@ -336,9 +324,6 @@ void SDL_SYS_JoystickDetect() { JoyStick_DeviceData *pCurList = NULL; -#if !SDL_EVENTS_DISABLED - SDL_Event event; -#endif /* only enum the devices if the joystick thread told us something changed */ if (!s_bDeviceAdded && !s_bDeviceRemoved) { @@ -370,17 +355,7 @@ SDL_SYS_JoystickDetect() SDL_DINPUT_MaybeRemoveDevice(&pCurList->dxdevice); } -#if !SDL_EVENTS_DISABLED - SDL_zero(event); - event.type = SDL_JOYDEVICEREMOVED; - - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = pCurList->nInstanceID; - if ((!SDL_EventOK) || (*SDL_EventOK) (SDL_EventOKParam, &event)) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ + SDL_PrivateJoystickRemoved(pCurList->nInstanceID); pListNext = pCurList->pNext; SDL_free(pCurList->joystickname); @@ -401,17 +376,8 @@ SDL_SYS_JoystickDetect() SDL_DINPUT_MaybeAddDevice(&pNewJoystick->dxdevice); } -#if !SDL_EVENTS_DISABLED - SDL_zero(event); - event.type = SDL_JOYDEVICEADDED; + SDL_PrivateJoystickAdded(device_index); - if (SDL_GetEventState(event.type) == SDL_ENABLE) { - event.jdevice.which = device_index; - if ((!SDL_EventOK) || (*SDL_EventOK) (SDL_EventOKParam, &event)) { - SDL_PushEvent(&event); - } - } -#endif /* !SDL_EVENTS_DISABLED */ pNewJoystick->send_add_event = SDL_FALSE; } device_index++; @@ -543,6 +509,9 @@ SDL_SYS_JoystickQuit(void) SDL_DINPUT_JoystickQuit(); SDL_XINPUT_JoystickQuit(); + + s_bDeviceAdded = SDL_FALSE; + s_bDeviceRemoved = SDL_FALSE; } /* return the stable device guid for this device index */ diff --git a/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick_c.h b/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick_c.h index ab946b4f7..d3c5fcaab 100644 --- a/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick_c.h +++ b/Engine/lib/sdl/src/joystick/windows/SDL_windowsjoystick_c.h @@ -83,6 +83,10 @@ struct joystick_hwdata DWORD dwPacketNumber; }; +#if SDL_JOYSTICK_DINPUT +extern const DIDATAFORMAT SDL_c_dfDIJoystick2; +#endif + extern void SDL_SYS_AddJoystickDevice(JoyStick_DeviceData *device); /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/joystick/windows/SDL_xinputjoystick.c b/Engine/lib/sdl/src/joystick/windows/SDL_xinputjoystick.c index 2f27c47dc..d581d45b9 100644 --- a/Engine/lib/sdl/src/joystick/windows/SDL_xinputjoystick.c +++ b/Engine/lib/sdl/src/joystick/windows/SDL_xinputjoystick.c @@ -40,8 +40,7 @@ SDL_XInputUseOldJoystickMapping() { static int s_XInputUseOldJoystickMapping = -1; if (s_XInputUseOldJoystickMapping < 0) { - const char *hint = SDL_GetHint(SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING); - s_XInputUseOldJoystickMapping = (hint && *hint == '1') ? 1 : 0; + s_XInputUseOldJoystickMapping = SDL_GetHintBoolean(SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING, SDL_FALSE); } return (s_XInputUseOldJoystickMapping > 0); } @@ -54,10 +53,7 @@ SDL_bool SDL_XINPUT_Enabled(void) int SDL_XINPUT_JoystickInit(void) { - const char *env = SDL_GetHint(SDL_HINT_XINPUT_ENABLED); - if (env && !SDL_atoi(env)) { - s_bXInputEnabled = SDL_FALSE; - } + s_bXInputEnabled = SDL_GetHintBoolean(SDL_HINT_XINPUT_ENABLED, SDL_TRUE); if (s_bXInputEnabled && WIN_LoadXInputDLL() < 0) { s_bXInputEnabled = SDL_FALSE; /* oh well. */ @@ -376,7 +372,7 @@ SDL_SYS_IsXInputGamepad_DeviceIndex(int device_index) for (index = device_index; index > 0; index--) device = device->pNext; - return (device->SubType == XINPUT_DEVSUBTYPE_GAMEPAD); + return device->bXInputDevice; } #else /* !SDL_JOYSTICK_XINPUT */ diff --git a/Engine/lib/sdl/src/loadso/dlopen/SDL_sysloadso.c b/Engine/lib/sdl/src/loadso/dlopen/SDL_sysloadso.c index 03ffae129..7b30b7735 100644 --- a/Engine/lib/sdl/src/loadso/dlopen/SDL_sysloadso.c +++ b/Engine/lib/sdl/src/loadso/dlopen/SDL_sysloadso.c @@ -30,11 +30,25 @@ #include "SDL_loadso.h" +#if SDL_VIDEO_DRIVER_UIKIT +#include "../../video/uikit/SDL_uikitvideo.h" +#endif + void * SDL_LoadObject(const char *sofile) { - void *handle = dlopen(sofile, RTLD_NOW|RTLD_LOCAL); - const char *loaderror = (char *) dlerror(); + void *handle; + const char *loaderror; + +#if SDL_VIDEO_DRIVER_UIKIT + if (!UIKit_IsSystemVersionAtLeast(8.0)) { + SDL_SetError("SDL_LoadObject requires iOS 8+"); + return NULL; + } +#endif + + handle = dlopen(sofile, RTLD_NOW|RTLD_LOCAL); + loaderror = (char *) dlerror(); if (handle == NULL) { SDL_SetError("Failed loading %s: %s", sofile, loaderror); } diff --git a/Engine/lib/sdl/src/main/android/SDL_android_main.c b/Engine/lib/sdl/src/main/android/SDL_android_main.c index 4173bcb1d..671d9328e 100644 --- a/Engine/lib/sdl/src/main/android/SDL_android_main.c +++ b/Engine/lib/sdl/src/main/android/SDL_android_main.c @@ -16,12 +16,17 @@ /* Called before SDL_main() to initialize JNI bindings in SDL library */ extern void SDL_Android_Init(JNIEnv* env, jclass cls); +/* This prototype is needed to prevent a warning about the missing prototype for global function below */ +JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject array); + /* Start up the SDL app */ JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject array) { int i; int argc; int status; + int len; + char** argv; /* This interface could expand with ABI negotiation, callbacks, etc. */ SDL_Android_Init(env, cls); @@ -30,8 +35,8 @@ JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jc /* Prepare the arguments. */ - int len = (*env)->GetArrayLength(env, array); - char* argv[1 + len + 1]; + len = (*env)->GetArrayLength(env, array); + argv = SDL_stack_alloc(char*, 1 + len + 1); argc = 0; /* Use the name "app_process" so PHYSFS_platformCalcBaseDir() works. https://bitbucket.org/MartinFelis/love-android-sdl2/issue/23/release-build-crash-on-start @@ -66,7 +71,7 @@ JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jc for (i = 0; i < argc; ++i) { SDL_free(argv[i]); } - + SDL_stack_free(argv); /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */ /* exit(status); */ diff --git a/Engine/lib/sdl/src/main/haiku/SDL_BApp.h b/Engine/lib/sdl/src/main/haiku/SDL_BApp.h index 157c23635..9672d462c 100644 --- a/Engine/lib/sdl/src/main/haiku/SDL_BApp.h +++ b/Engine/lib/sdl/src/main/haiku/SDL_BApp.h @@ -193,7 +193,8 @@ public: if(_current_context) _current_context->UnlockGL(); _current_context = newContext; - _current_context->LockGL(); + if (_current_context) + _current_context->LockGL(); } private: /* Event management */ @@ -272,6 +273,17 @@ private: } BE_SetKeyState(scancode, state); SDL_SendKeyboardKey(state, BE_GetScancodeFromBeKey(scancode)); + + if (state == SDL_PRESSED && SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) { + const int8 *keyUtf8; + ssize_t count; + if (msg->FindData("key-utf8", B_INT8_TYPE, (const void**)&keyUtf8, &count) == B_OK) { + char text[SDL_TEXTINPUTEVENT_TEXT_SIZE]; + SDL_zero(text); + SDL_memcpy(text, keyUtf8, count); + SDL_SendKeyboardText(text); + } + } } void _HandleMouseFocus(BMessage *msg) { diff --git a/Engine/lib/sdl/src/main/haiku/SDL_BeApp.cc b/Engine/lib/sdl/src/main/haiku/SDL_BeApp.cc index 36c2a1ab8..4c5df0954 100644 --- a/Engine/lib/sdl/src/main/haiku/SDL_BeApp.cc +++ b/Engine/lib/sdl/src/main/haiku/SDL_BeApp.cc @@ -31,7 +31,6 @@ #include "SDL_BApp.h" /* SDL_BApp class definition */ #include "SDL_BeApp.h" -#include "SDL_thread.h" #include "SDL_timer.h" #include "SDL_error.h" @@ -40,6 +39,9 @@ #ifdef __cplusplus extern "C" { #endif + +#include "../../thread/SDL_systhread.h" + /* Flag to tell whether or not the Be application is active or not */ int SDL_BeAppActive = 0; static SDL_Thread *SDL_AppThread = NULL; @@ -62,7 +64,7 @@ SDL_InitBeApp(void) { /* Create the BApplication that handles appserver interaction */ if (SDL_BeAppActive <= 0) { - SDL_AppThread = SDL_CreateThread(StartBeApp, "SDLApplication", NULL); + SDL_AppThread = SDL_CreateThreadInternal(StartBeApp, "SDLApplication", 0, NULL); if (SDL_AppThread == NULL) { return SDL_SetError("Couldn't create BApplication thread"); } diff --git a/Engine/lib/sdl/src/main/windows/SDL_windows_main.c b/Engine/lib/sdl/src/main/windows/SDL_windows_main.c index e6378081f..b502ed50e 100644 --- a/Engine/lib/sdl/src/main/windows/SDL_windows_main.c +++ b/Engine/lib/sdl/src/main/windows/SDL_windows_main.c @@ -126,44 +126,15 @@ main_utf8(int argc, char *argv[]) return SDL_main(argc, argv); } -/* This is where execution begins [console apps, ansi] */ -int -console_ansi_main(int argc, char *argv[]) -{ - /* !!! FIXME: are these in the system codepage? We need to convert to UTF-8. */ - return main_utf8(argc, argv); -} - - -#if UNICODE -/* This is where execution begins [console apps, unicode] */ -int -console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp) -{ - int retval = 0; - char **argv = SDL_stack_alloc(char*, argc); - int i; - - for (i = 0; i < argc; ++i) { - argv[i] = WIN_StringToUTF8(wargv[i]); - } - - retval = main_utf8(argc, argv); - - /* !!! FIXME: we are leaking all the elements of argv we allocated. */ - SDL_stack_free(argv); - - return retval; -} -#endif - -/* This is where execution begins [windowed apps] */ -int WINAPI -WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) +/* Gets the arguments with GetCommandLine, converts them to argc and argv + and calls main_utf8 */ +static int +main_getcmdline() { char **argv; int argc; char *cmdline; + int retval = 0; /* Grab the command line */ TCHAR *text = GetCommandLine(); @@ -185,15 +156,50 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) } ParseCommandLine(cmdline, argv); - /* Run the main program */ - main_utf8(argc, argv); + retval = main_utf8(argc, argv); SDL_stack_free(argv); - SDL_free(cmdline); - /* Hush little compiler, don't you cry... */ - return 0; + return retval; +} + +/* This is where execution begins [console apps, ansi] */ +int +console_ansi_main(int argc, char *argv[]) +{ + return main_getcmdline(); +} + + +#if UNICODE +/* This is where execution begins [console apps, unicode] */ +int +console_wmain(int argc, wchar_t *wargv[], wchar_t *wenvp) +{ + int retval = 0; + char **argv = SDL_stack_alloc(char*, argc + 1); + int i; + + for (i = 0; i < argc; ++i) { + argv[i] = WIN_StringToUTF8(wargv[i]); + } + argv[argc] = NULL; + + retval = main_utf8(argc, argv); + + /* !!! FIXME: we are leaking all the elements of argv we allocated. */ + SDL_stack_free(argv); + + return retval; +} +#endif + +/* This is where execution begins [windowed apps] */ +int WINAPI +WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) +{ + return main_getcmdline(); } #endif /* __WIN32__ */ diff --git a/Engine/lib/sdl/src/main/windows/version.rc b/Engine/lib/sdl/src/main/windows/version.rc index 8597154aa..e10443b06 100644 --- a/Engine/lib/sdl/src/main/windows/version.rc +++ b/Engine/lib/sdl/src/main/windows/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,4,0 - PRODUCTVERSION 2,0,4,0 + FILEVERSION 2,0,5,0 + PRODUCTVERSION 2,0,5,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "2, 0, 4, 0\0" + VALUE "FileVersion", "2, 0, 5, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright © 2016 Sam Lantinga\0" VALUE "OriginalFilename", "SDL2.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 4, 0\0" + VALUE "ProductVersion", "2, 0, 5, 0\0" END END BLOCK "VarFileInfo" diff --git a/Engine/lib/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur b/Engine/lib/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur new file mode 100644 index 000000000..c6556b8a7 Binary files /dev/null and b/Engine/lib/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur differ diff --git a/Engine/lib/sdl/src/main/winrt/SDL2-WinRTResources.rc b/Engine/lib/sdl/src/main/winrt/SDL2-WinRTResources.rc new file mode 100644 index 000000000..988a8d57d --- /dev/null +++ b/Engine/lib/sdl/src/main/winrt/SDL2-WinRTResources.rc @@ -0,0 +1,3 @@ +#include "winres.h" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +5000 CURSOR "SDL2-WinRTResource_BlankCursor.cur" diff --git a/Engine/lib/sdl/src/power/uikit/SDL_syspower.m b/Engine/lib/sdl/src/power/uikit/SDL_syspower.m index 14ce3576a..7186b219c 100644 --- a/Engine/lib/sdl/src/power/uikit/SDL_syspower.m +++ b/Engine/lib/sdl/src/power/uikit/SDL_syspower.m @@ -30,6 +30,7 @@ #include "SDL_assert.h" #include "SDL_syspower.h" +#if !TARGET_OS_TV /* turn off the battery monitor if it's been more than X ms since last check. */ static const int BATTERY_MONITORING_TIMEOUT = 3000; static Uint32 SDL_UIKitLastPowerInfoQuery = 0; @@ -46,10 +47,22 @@ SDL_UIKit_UpdateBatteryMonitoring(void) } } } +#else +void +SDL_UIKit_UpdateBatteryMonitoring(void) +{ + /* Do nothing. */ +} +#endif /* !TARGET_OS_TV */ SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState * state, int *seconds, int *percent) { +#if TARGET_OS_TV + *state = SDL_POWERSTATE_NO_BATTERY; + *seconds = -1; + *percent = -1; +#else /* TARGET_OS_TV */ @autoreleasepool { UIDevice *uidev = [UIDevice currentDevice]; @@ -88,8 +101,10 @@ SDL_GetPowerInfo_UIKit(SDL_PowerState * state, int *seconds, int *percent) const float level = uidev.batteryLevel; *percent = ( (level < 0.0f) ? -1 : ((int) ((level * 100) + 0.5f)) ); - return SDL_TRUE; /* always the definitive answer on iOS. */ } +#endif /* TARGET_OS_TV */ + + return SDL_TRUE; /* always the definitive answer on iOS. */ } #endif /* SDL_POWER_UIKIT */ diff --git a/Engine/lib/sdl/src/render/SDL_render.c b/Engine/lib/sdl/src/render/SDL_render.c index 923973ec7..94750810d 100644 --- a/Engine/lib/sdl/src/render/SDL_render.c +++ b/Engine/lib/sdl/src/render/SDL_render.c @@ -234,12 +234,11 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags) return NULL; } - hint = SDL_GetHint(SDL_HINT_RENDER_VSYNC); - if (hint) { - if (*hint == '0') { - flags &= ~SDL_RENDERER_PRESENTVSYNC; - } else { + if (SDL_GetHint(SDL_HINT_RENDER_VSYNC)) { + if (SDL_GetHintBoolean(SDL_HINT_RENDER_VSYNC, SDL_TRUE)) { flags |= SDL_RENDERER_PRESENTVSYNC; + } else { + flags &= ~SDL_RENDERER_PRESENTVSYNC; } } @@ -1106,6 +1105,8 @@ SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture) renderer->viewport.y = 0; renderer->viewport.w = texture->w; renderer->viewport.h = texture->h; + SDL_zero(renderer->clip_rect); + renderer->clipping_enabled = SDL_FALSE; renderer->scale.x = 1.0f; renderer->scale.y = 1.0f; renderer->logical_w = texture->w; @@ -1144,6 +1145,9 @@ UpdateLogicalSize(SDL_Renderer *renderer) float scale; SDL_Rect viewport; + if (!renderer->logical_w || !renderer->logical_h) { + return 0; + } if (SDL_GetRendererOutputSize(renderer, &w, &h) < 0) { return -1; } @@ -1154,7 +1158,19 @@ UpdateLogicalSize(SDL_Renderer *renderer) /* Clear the scale because we're setting viewport in output coordinates */ SDL_RenderSetScale(renderer, 1.0f, 1.0f); - if (SDL_fabs(want_aspect-real_aspect) < 0.0001) { + if (renderer->integer_scale) { + if (want_aspect > real_aspect) { + scale = (float)(w / renderer->logical_w); + } else { + scale = (float)(h / renderer->logical_h); + } + viewport.w = (int)SDL_ceil(renderer->logical_w * scale); + viewport.x = (w - viewport.w) / 2; + viewport.h = (int)SDL_ceil(renderer->logical_h * scale); + viewport.y = (h - viewport.h) / 2; + + SDL_RenderSetViewport(renderer, &viewport); + } else if (SDL_fabs(want_aspect-real_aspect) < 0.0001) { /* The aspect ratios are the same, just scale appropriately */ scale = (float)w / renderer->logical_w; SDL_RenderSetViewport(renderer, NULL); @@ -1215,6 +1231,24 @@ SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h) } } +int +SDL_RenderSetIntegerScale(SDL_Renderer * renderer, SDL_bool enable) +{ + CHECK_RENDERER_MAGIC(renderer, -1); + + renderer->integer_scale = enable; + + return UpdateLogicalSize(renderer); +} + +SDL_bool +SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer) +{ + CHECK_RENDERER_MAGIC(renderer, SDL_FALSE); + + return renderer->integer_scale; +} + int SDL_RenderSetViewport(SDL_Renderer * renderer, const SDL_Rect * rect) { @@ -1425,6 +1459,7 @@ SDL_RenderDrawPoints(SDL_Renderer * renderer, if (count < 1) { return 0; } + /* Don't draw while we're hidden */ if (renderer->hidden) { return 0; @@ -1534,6 +1569,7 @@ SDL_RenderDrawLines(SDL_Renderer * renderer, if (count < 2) { return 0; } + /* Don't draw while we're hidden */ if (renderer->hidden) { return 0; @@ -1607,6 +1643,7 @@ SDL_RenderDrawRects(SDL_Renderer * renderer, if (renderer->hidden) { return 0; } + for (i = 0; i < count; ++i) { if (SDL_RenderDrawRect(renderer, &rects[i]) < 0) { return -1; @@ -1648,6 +1685,7 @@ SDL_RenderFillRects(SDL_Renderer * renderer, if (count < 1) { return 0; } + /* Don't draw while we're hidden */ if (renderer->hidden) { return 0; @@ -1686,6 +1724,11 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, return SDL_SetError("Texture was not created with this renderer"); } + /* Don't draw while we're hidden */ + if (renderer->hidden) { + return 0; + } + real_srcrect.x = 0; real_srcrect.y = 0; real_srcrect.w = texture->w; @@ -1710,11 +1753,6 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, texture = texture->native; } - /* Don't draw while we're hidden */ - if (renderer->hidden) { - return 0; - } - frect.x = real_dstrect.x * renderer->scale.x; frect.y = real_dstrect.y * renderer->scale.y; frect.w = real_dstrect.w * renderer->scale.x; @@ -1735,7 +1773,7 @@ SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, SDL_FRect frect; SDL_FPoint fcenter; - if (flip == SDL_FLIP_NONE && angle == 0) { /* fast path when we don't need rotation or flipping */ + if (flip == SDL_FLIP_NONE && (int)(angle/360) == angle/360) { /* fast path when we don't need rotation or flipping */ return SDL_RenderCopy(renderer, texture, srcrect, dstrect); } @@ -1749,6 +1787,11 @@ SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, return SDL_SetError("Renderer does not support RenderCopyEx"); } + /* Don't draw while we're hidden */ + if (renderer->hidden) { + return 0; + } + real_srcrect.x = 0; real_srcrect.y = 0; real_srcrect.w = texture->w; @@ -1772,8 +1815,9 @@ SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, texture = texture->native; } - if(center) real_center = *center; - else { + if (center) { + real_center = *center; + } else { real_center.x = real_dstrect.w/2; real_center.y = real_dstrect.h/2; } diff --git a/Engine/lib/sdl/src/render/SDL_sysrender.h b/Engine/lib/sdl/src/render/SDL_sysrender.h index 19dfe8e64..378fc4d97 100644 --- a/Engine/lib/sdl/src/render/SDL_sysrender.h +++ b/Engine/lib/sdl/src/render/SDL_sysrender.h @@ -135,6 +135,9 @@ struct SDL_Renderer int logical_w_backup; int logical_h_backup; + /* Whether or not to force the viewport to even integer intervals */ + SDL_bool integer_scale; + /* The drawable area within the window */ SDL_Rect viewport; SDL_Rect viewport_backup; diff --git a/Engine/lib/sdl/src/render/direct3d/SDL_render_d3d.c b/Engine/lib/sdl/src/render/direct3d/SDL_render_d3d.c index 9d7564224..151dbbf04 100644 --- a/Engine/lib/sdl/src/render/direct3d/SDL_render_d3d.c +++ b/Engine/lib/sdl/src/render/direct3d/SDL_render_d3d.c @@ -512,7 +512,6 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags) D3D_RenderData *data; SDL_SysWMinfo windowinfo; HRESULT result; - const char *hint; D3DPRESENT_PARAMETERS pparams; IDirect3DSwapChain9 *chain; D3DCAPS9 caps; @@ -607,8 +606,7 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags) device_flags |= D3DCREATE_SOFTWARE_VERTEXPROCESSING; } - hint = SDL_GetHint(SDL_HINT_RENDER_DIRECT3D_THREADSAFE); - if (hint && SDL_atoi(hint)) { + if (SDL_GetHintBoolean(SDL_HINT_RENDER_DIRECT3D_THREADSAFE, SDL_FALSE)) { device_flags |= D3DCREATE_MULTITHREADED; } @@ -1004,6 +1002,10 @@ D3D_RecreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) D3D_RenderData *data = (D3D_RenderData *)renderer->driverdata; D3D_TextureData *texturedata = (D3D_TextureData *)texture->driverdata; + if (!texturedata) { + return 0; + } + if (D3D_RecreateTextureRep(data->device, &texturedata->texture, texture->format, texture->w, texture->h) < 0) { return -1; } @@ -1307,6 +1309,10 @@ D3D_RenderClear(SDL_Renderer * renderer) BackBufferHeight = data->pparams.BackBufferHeight; } + if (renderer->clipping_enabled) { + IDirect3DDevice9_SetRenderState(data->device, D3DRS_SCISSORTESTENABLE, FALSE); + } + /* Don't reset the viewport if we don't have to! */ if (!renderer->viewport.x && !renderer->viewport.y && renderer->viewport.w == BackBufferWidth && @@ -1336,6 +1342,10 @@ D3D_RenderClear(SDL_Renderer * renderer) IDirect3DDevice9_SetViewport(data->device, &viewport); } + if (renderer->clipping_enabled) { + IDirect3DDevice9_SetRenderState(data->device, D3DRS_SCISSORTESTENABLE, TRUE); + } + if (FAILED(result)) { return D3D_SetError("Clear()", result); } diff --git a/Engine/lib/sdl/src/render/direct3d11/SDL_render_d3d11.c b/Engine/lib/sdl/src/render/direct3d11/SDL_render_d3d11.c index a48eacee7..df0f1558a 100644 --- a/Engine/lib/sdl/src/render/direct3d11/SDL_render_d3d11.c +++ b/Engine/lib/sdl/src/render/direct3d11/SDL_render_d3d11.c @@ -51,6 +51,8 @@ extern ISwapChainBackgroundPanelNative * WINRT_GlobalSwapChainBackgroundPanelNat #endif /* __WINRT__ */ +#define SDL_COMPOSE_ERROR(str) SDL_STRINGIFY_ARG(__FUNCTION__) ", " str + #define SAFE_RELEASE(X) if ((X)) { IUnknown_Release(SDL_static_cast(IUnknown*, X)); X = NULL; } @@ -136,14 +138,31 @@ typedef struct } D3D11_RenderData; -/* Defined here so we don't have to include uuid.lib */ -static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; -static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } }; -static const GUID IID_IDXGIDevice3 = { 0x6007896c, 0x3244, 0x4afd, { 0xbf, 0x18, 0xa6, 0xd3, 0xbe, 0xda, 0x50, 0x23 } }; -static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } }; -static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } }; -static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } }; -static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } }; +/* Define D3D GUIDs here so we don't have to include uuid.lib. +* +* Fix for SDL bug https://bugzilla.libsdl.org/show_bug.cgi?id=3437: +* The extra 'SDL_' was added to the start of each IID's name, in order +* to prevent build errors on both MinGW-w64 and WinRT/UWP. +* (SDL bug https://bugzilla.libsdl.org/show_bug.cgi?id=3336 led to +* linker errors in WinRT/UWP builds.) +*/ + +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-const-variable" +#endif + +static const GUID SDL_IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; +static const GUID SDL_IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } }; +static const GUID SDL_IID_IDXGIDevice3 = { 0x6007896c, 0x3244, 0x4afd, { 0xbf, 0x18, 0xa6, 0xd3, 0xbe, 0xda, 0x50, 0x23 } }; +static const GUID SDL_IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } }; +static const GUID SDL_IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } }; +static const GUID SDL_IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } }; +static const GUID SDL_IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } }; + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif /* Direct3D 11.x shaders @@ -961,7 +980,7 @@ D3D11_CreateBlendMode(SDL_Renderer * renderer, blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBlendState", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateBlendState"), result); return result; } @@ -976,13 +995,11 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) PFN_CREATE_DXGI_FACTORY CreateDXGIFactoryFunc; D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata; PFN_D3D11_CREATE_DEVICE D3D11CreateDeviceFunc; - IDXGIAdapter *d3dAdapter = NULL; ID3D11Device *d3dDevice = NULL; ID3D11DeviceContext *d3dContext = NULL; IDXGIDevice1 *dxgiDevice = NULL; HRESULT result = S_OK; UINT creationFlags; - const char *hint; /* This array defines the set of DirectX hardware feature levels this app will support. * Note the ordering should be preserved. @@ -1041,16 +1058,16 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) } #endif /* __WINRT__ */ - result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory); + result = CreateDXGIFactoryFunc(&SDL_IID_IDXGIFactory2, (void **)&data->dxgiFactory); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("CreateDXGIFactory"), result); goto done; } /* FIXME: Should we use the default adapter? */ result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("D3D11CreateDevice"), result); goto done; } @@ -1060,8 +1077,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) creationFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; /* Make sure Direct3D's debugging feature gets used, if the app requests it. */ - hint = SDL_GetHint(SDL_HINT_RENDER_DIRECT3D11_DEBUG); - if (hint && SDL_atoi(hint) > 0) { + if (SDL_GetHintBoolean(SDL_HINT_RENDER_DIRECT3D11_DEBUG, SDL_FALSE)) { creationFlags |= D3D11_CREATE_DEVICE_DEBUG; } @@ -1079,25 +1095,25 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &d3dContext /* Returns the device immediate context. */ ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("D3D11CreateDevice"), result); goto done; } - result = ID3D11Device_QueryInterface(d3dDevice, &IID_ID3D11Device1, &data->d3dDevice); + result = ID3D11Device_QueryInterface(d3dDevice, &SDL_IID_ID3D11Device1, (void **)&data->d3dDevice); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to ID3D11Device1", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device to ID3D11Device1"), result); goto done; } - result = ID3D11DeviceContext_QueryInterface(d3dContext, &IID_ID3D11DeviceContext1, &data->d3dContext); + result = ID3D11DeviceContext_QueryInterface(d3dContext, &SDL_IID_ID3D11DeviceContext1, (void **)&data->d3dContext); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext to ID3D11DeviceContext1", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11DeviceContext to ID3D11DeviceContext1"), result); goto done; } - result = ID3D11Device_QueryInterface(d3dDevice, &IID_IDXGIDevice1, &dxgiDevice); + result = ID3D11Device_QueryInterface(d3dDevice, &SDL_IID_IDXGIDevice1, (void **)&dxgiDevice); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice1", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device to IDXGIDevice1"), result); goto done; } @@ -1106,7 +1122,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) */ result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIDevice1::SetMaximumFrameLatency", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGIDevice1::SetMaximumFrameLatency"), result); goto done; } @@ -1135,7 +1151,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) break; default: - SDL_SetError(__FUNCTION__ ", Unexpected feature level: %d", data->featureLevel); + SDL_SetError("%s, Unexpected feature level: %d", __FUNCTION__, data->featureLevel); result = E_FAIL; goto done; } @@ -1148,7 +1164,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->vertexShader ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateVertexShader", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateVertexShader"), result); goto done; } @@ -1161,7 +1177,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->inputLayout ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateInputLayout", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateInputLayout"), result); goto done; } @@ -1173,7 +1189,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->colorPixelShader ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['color' shader]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreatePixelShader ['color' shader]"), result); goto done; } @@ -1184,7 +1200,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->texturePixelShader ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['textures' shader]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreatePixelShader ['textures' shader]"), result); goto done; } @@ -1195,7 +1211,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->yuvPixelShader ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreatePixelShader ['yuv' shader]"), result); goto done; } @@ -1210,7 +1226,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->vertexShaderConstants ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex shader constants]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateBuffer [vertex shader constants]"), result); goto done; } @@ -1230,7 +1246,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->nearestPixelSampler ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateSamplerState [nearest-pixel filter]"), result); goto done; } @@ -1240,7 +1256,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->linearSampler ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [linear filter]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateSamplerState [linear filter]"), result); goto done; } @@ -1258,14 +1274,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) rasterDesc.SlopeScaledDepthBias = 0.0f; result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateRasterizerState [main rasterizer]"), result); goto done; } rasterDesc.ScissorEnable = TRUE; result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->clippedRasterizer); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateRasterizerState [clipped rasterizer]"), result); goto done; } @@ -1358,7 +1374,6 @@ D3D11_GetRotationForCurrentRenderTarget(SDL_Renderer * renderer) static int D3D11_GetViewportAlignedD3DRect(SDL_Renderer * renderer, const SDL_Rect * sdlRect, D3D11_RECT * outRect, BOOL includeViewportOffset) { - D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata; const int rotation = D3D11_GetRotationForCurrentRenderTarget(renderer); switch (rotation) { case DXGI_MODE_ROTATION_IDENTITY: @@ -1444,7 +1459,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) &data->swapChain ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForCoreWindow", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGIFactory2::CreateSwapChainForCoreWindow"), result); goto done; } } else if (usingXAML) { @@ -1454,18 +1469,18 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) NULL, &data->swapChain); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForComposition", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGIFactory2::CreateSwapChainForComposition"), result); goto done; } #if WINAPI_FAMILY == WINAPI_FAMILY_APP result = ISwapChainBackgroundPanelNative_SetSwapChain(WINRT_GlobalSwapChainBackgroundPanelNative, (IDXGISwapChain *) data->swapChain); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ISwapChainBackgroundPanelNative::SetSwapChain", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ISwapChainBackgroundPanelNative::SetSwapChain"), result); goto done; } #else - SDL_SetError(__FUNCTION__ ", XAML support is not yet available for Windows Phone"); + SDL_SetError(SDL_COMPOSE_ERROR("XAML support is not yet available for Windows Phone")); result = E_FAIL; goto done; #endif @@ -1484,7 +1499,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) &data->swapChain ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGIFactory2::CreateSwapChainForHwnd"), result); goto done; } @@ -1545,7 +1560,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) */ goto done; } else if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGISwapChain::ResizeBuffers"), result); goto done; } #endif @@ -1576,7 +1591,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) { result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::SetRotation", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGISwapChain1::SetRotation"), result); goto done; } } @@ -1584,11 +1599,11 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) result = IDXGISwapChain_GetBuffer(data->swapChain, 0, - &IID_ID3D11Texture2D, - &backBuffer + &SDL_IID_ID3D11Texture2D, + (void **)&backBuffer ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::GetBuffer [back-buffer]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGISwapChain::GetBuffer [back-buffer]"), result); goto done; } @@ -1599,7 +1614,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) &data->mainRenderTargetView ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device::CreateRenderTargetView", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device::CreateRenderTargetView"), result); goto done; } @@ -1618,14 +1633,12 @@ done: static HRESULT D3D11_UpdateForWindowSizeChange(SDL_Renderer * renderer) { - D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata; return D3D11_CreateWindowSizeDependentResources(renderer); } HRESULT D3D11_HandleDeviceLost(SDL_Renderer * renderer) { - D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata; HRESULT result = S_OK; D3D11_ReleaseAll(renderer); @@ -1661,7 +1674,7 @@ D3D11_Trim(SDL_Renderer * renderer) HRESULT result = S_OK; IDXGIDevice3 *dxgiDevice = NULL; - result = ID3D11Device_QueryInterface(data->d3dDevice, &IID_IDXGIDevice3, &dxgiDevice); + result = ID3D11Device_QueryInterface(data->d3dDevice, &SDL_IID_IDXGIDevice3, &dxgiDevice); if (FAILED(result)) { //WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice3", result); return; @@ -1702,7 +1715,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) D3D11_TEXTURE2D_DESC textureDesc; D3D11_SHADER_RESOURCE_VIEW_DESC resourceViewDesc; - if (textureFormat == SDL_PIXELFORMAT_UNKNOWN) { + if (textureFormat == DXGI_FORMAT_UNKNOWN) { return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified", __FUNCTION__, texture->format); } @@ -1747,7 +1760,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateTexture2D"), result); return -1; } @@ -1765,7 +1778,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateTexture2D"), result); return -1; } @@ -1776,7 +1789,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateTexture2D"), result); return -1; } } @@ -1792,7 +1805,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateShaderResourceView"), result); return -1; } @@ -1804,7 +1817,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateShaderResourceView"), result); return -1; } result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice, @@ -1814,7 +1827,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateShaderResourceView"), result); return -1; } } @@ -1831,7 +1844,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) &textureData->mainTextureRenderTargetView); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRenderTargetView", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateRenderTargetView"), result); return -1; } } @@ -1887,7 +1900,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex NULL, &stagingTexture); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateTexture2D [create staging texture]"), result); return -1; } @@ -1900,7 +1913,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex &textureMemory ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11DeviceContext1::Map [map staging texture]"), result); SAFE_RELEASE(stagingTexture); return -1; } @@ -2062,7 +2075,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, NULL, &textureData->stagingTexture); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateTexture2D [create staging texture]"), result); return -1; } @@ -2075,7 +2088,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, &textureMemory ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11DeviceContext1::Map [map staging texture]"), result); SAFE_RELEASE(textureData->stagingTexture); return -1; } @@ -2359,7 +2372,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer, &mappedResource ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [vertex buffer]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11DeviceContext1::Map [vertex buffer]"), result); return -1; } SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes); @@ -2383,7 +2396,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer, &rendererData->vertexBuffer ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex buffer]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateBuffer [vertex buffer]"), result); return -1; } @@ -2842,18 +2855,18 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, HRESULT result; int status = -1; D3D11_TEXTURE2D_DESC stagingTextureDesc; - D3D11_RECT srcRect; + D3D11_RECT srcRect = {0, 0, 0, 0}; D3D11_BOX srcBox; D3D11_MAPPED_SUBRESOURCE textureMemory; /* Retrieve a pointer to the back buffer: */ result = IDXGISwapChain_GetBuffer(data->swapChain, 0, - &IID_ID3D11Texture2D, - &backBuffer + &SDL_IID_ID3D11Texture2D, + (void **)&backBuffer ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::GetBuffer [get back buffer]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGISwapChain1::GetBuffer [get back buffer]"), result); goto done; } @@ -2870,7 +2883,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, NULL, &stagingTexture); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11Device1::CreateTexture2D [create staging texture]"), result); goto done; } @@ -2902,7 +2915,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, 0, &textureMemory); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("ID3D11DeviceContext1::Map [map staging texture]"), result); goto done; } @@ -2921,7 +2934,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, * Get the error message, and attach some extra data to it. */ char errorMessage[1024]; - SDL_snprintf(errorMessage, sizeof(errorMessage), __FUNCTION__ ", Convert Pixels failed: %s", SDL_GetError()); + SDL_snprintf(errorMessage, sizeof(errorMessage), "%s, Convert Pixels failed: %s", __FUNCTION__, SDL_GetError()); SDL_SetError("%s", errorMessage); goto done; } @@ -2991,7 +3004,7 @@ D3D11_RenderPresent(SDL_Renderer * renderer) /* We probably went through a fullscreen <-> windowed transition */ D3D11_CreateWindowSizeDependentResources(renderer); } else { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::Present", result); + WIN_SetErrorFromHRESULT(SDL_COMPOSE_ERROR("IDXGISwapChain::Present"), result); } } } diff --git a/Engine/lib/sdl/src/render/opengl/SDL_render_gl.c b/Engine/lib/sdl/src/render/opengl/SDL_render_gl.c index 6a4fa3ecf..1ca2cb5c4 100644 --- a/Engine/lib/sdl/src/render/opengl/SDL_render_gl.c +++ b/Engine/lib/sdl/src/render/opengl/SDL_render_gl.c @@ -390,7 +390,6 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) { SDL_Renderer *renderer; GL_RenderData *data; - const char *hint; GLint value; Uint32 window_flags; int profile_mask = 0, major = 0, minor = 0; @@ -450,7 +449,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->GL_BindTexture = GL_BindTexture; renderer->GL_UnbindTexture = GL_UnbindTexture; renderer->info = GL_RenderDriver.info; - renderer->info.flags = (SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); + renderer->info.flags = SDL_RENDERER_ACCELERATED; renderer->driverdata = data; renderer->window = window; @@ -528,8 +527,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) } /* Check for shader support */ - hint = SDL_GetHint(SDL_HINT_RENDER_OPENGL_SHADERS); - if (!hint || *hint != '0') { + if (SDL_GetHintBoolean(SDL_HINT_RENDER_OPENGL_SHADERS, SDL_TRUE)) { data->shaders = GL_CreateShaderContext(); } SDL_LogInfo(SDL_LOG_CATEGORY_RENDER, "OpenGL shaders: %s", @@ -594,7 +592,6 @@ static int GL_GetOutputSize(SDL_Renderer * renderer, int *w, int *h) { SDL_GL_GetDrawableSize(renderer->window, w, h); - return 0; } @@ -664,6 +661,11 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) GL_ActivateRenderer(renderer); + if (texture->access == SDL_TEXTUREACCESS_TARGET && + !renderdata->GL_EXT_framebuffer_object_supported) { + return SDL_SetError("Render targets not supported by OpenGL"); + } + if (!convert_format(renderdata, texture->format, &internalFormat, &format, &type)) { return SDL_SetError("Texture format %s not supported by OpenGL", @@ -980,6 +982,10 @@ GL_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture) GL_ActivateRenderer(renderer); + if (!data->GL_EXT_framebuffer_object_supported) { + return SDL_SetError("Render targets not supported by OpenGL"); + } + if (texture == NULL) { data->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); return 0; @@ -1013,7 +1019,7 @@ GL_UpdateViewport(SDL_Renderer * renderer) } else { int w, h; - SDL_GetRendererOutputSize(renderer, &w, &h); + SDL_GL_GetDrawableSize(renderer->window, &w, &h); data->glViewport(renderer->viewport.x, (h - renderer->viewport.y - renderer->viewport.h), renderer->viewport.w, renderer->viewport.h); } @@ -1051,7 +1057,7 @@ GL_UpdateClipRect(SDL_Renderer * renderer) } else { int w, h; - SDL_GetRendererOutputSize(renderer, &w, &h); + SDL_GL_GetDrawableSize(renderer->window, &w, &h); data->glScissor(renderer->viewport.x + rect->x, h - renderer->viewport.y - rect->y - rect->h, rect->w, rect->h); } } else { @@ -1089,21 +1095,17 @@ GL_SetBlendMode(GL_RenderData * data, int blendMode) if (blendMode != data->current.blendMode) { switch (blendMode) { case SDL_BLENDMODE_NONE: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); data->glDisable(GL_BLEND); break; case SDL_BLENDMODE_BLEND: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); data->glEnable(GL_BLEND); data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); break; case SDL_BLENDMODE_ADD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); data->glEnable(GL_BLEND); data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE); break; case SDL_BLENDMODE_MOD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); data->glEnable(GL_BLEND); data->glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE); break; @@ -1141,8 +1143,16 @@ GL_RenderClear(SDL_Renderer * renderer) (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); + if (renderer->clipping_enabled) { + data->glDisable(GL_SCISSOR_TEST); + } + data->glClear(GL_COLOR_BUFFER_BIT); + if (renderer->clipping_enabled) { + data->glEnable(GL_SCISSOR_TEST); + } + return 0; } @@ -1409,7 +1419,7 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch) { GL_RenderData *data = (GL_RenderData *) renderer->driverdata; - Uint32 temp_format = SDL_PIXELFORMAT_ARGB8888; + Uint32 temp_format = renderer->target ? renderer->target->format : SDL_PIXELFORMAT_ARGB8888; void *temp_pixels; int temp_pitch; GLint internalFormat; @@ -1426,7 +1436,11 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, return SDL_OutOfMemory(); } - convert_format(data, temp_format, &internalFormat, &format, &type); + if (!convert_format(data, temp_format, &internalFormat, &format, &type)) { + SDL_free(temp_pixels); + return SDL_SetError("Texture format %s not supported by OpenGL", + SDL_GetPixelFormatName(temp_format)); + } SDL_GetRendererOutputSize(renderer, &w, &h); @@ -1434,28 +1448,30 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, data->glPixelStorei(GL_PACK_ROW_LENGTH, (temp_pitch / SDL_BYTESPERPIXEL(temp_format))); - data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h, - format, type, temp_pixels); + data->glReadPixels(rect->x, renderer->target ? rect->y : (h-rect->y)-rect->h, + rect->w, rect->h, format, type, temp_pixels); if (GL_CheckError("glReadPixels()", renderer) < 0) { SDL_free(temp_pixels); return -1; } - /* Flip the rows to be top-down */ - length = rect->w * SDL_BYTESPERPIXEL(temp_format); - src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch; - dst = (Uint8*)temp_pixels; - tmp = SDL_stack_alloc(Uint8, length); - rows = rect->h / 2; - while (rows--) { - SDL_memcpy(tmp, dst, length); - SDL_memcpy(dst, src, length); - SDL_memcpy(src, tmp, length); - dst += temp_pitch; - src -= temp_pitch; + /* Flip the rows to be top-down if necessary */ + if (!renderer->target) { + length = rect->w * SDL_BYTESPERPIXEL(temp_format); + src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch; + dst = (Uint8*)temp_pixels; + tmp = SDL_stack_alloc(Uint8, length); + rows = rect->h / 2; + while (rows--) { + SDL_memcpy(tmp, dst, length); + SDL_memcpy(dst, src, length); + SDL_memcpy(src, tmp, length); + dst += temp_pitch; + src -= temp_pitch; + } + SDL_stack_free(tmp); } - SDL_stack_free(tmp); status = SDL_ConvertPixels(rect->w, rect->h, temp_format, temp_pixels, temp_pitch, diff --git a/Engine/lib/sdl/src/render/opengles/SDL_render_gles.c b/Engine/lib/sdl/src/render/opengles/SDL_render_gles.c index 0d59da360..71f5b3a7a 100644 --- a/Engine/lib/sdl/src/render/opengles/SDL_render_gles.c +++ b/Engine/lib/sdl/src/render/opengles/SDL_render_gles.c @@ -129,8 +129,6 @@ typedef struct GLES_FBOList *framebuffers; GLuint window_framebuffer; - SDL_bool useDrawTexture; - SDL_bool GL_OES_draw_texture_supported; SDL_bool GL_OES_blend_func_separate_supported; } GLES_RenderData; @@ -369,19 +367,6 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC; } -#if SDL_VIDEO_DRIVER_PANDORA - data->GL_OES_draw_texture_supported = SDL_FALSE; - data->useDrawTexture = SDL_FALSE; -#else - if (SDL_GL_ExtensionSupported("GL_OES_draw_texture")) { - data->GL_OES_draw_texture_supported = SDL_TRUE; - data->useDrawTexture = SDL_TRUE; - } else { - data->GL_OES_draw_texture_supported = SDL_FALSE; - data->useDrawTexture = SDL_FALSE; - } -#endif - value = 0; data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value); renderer->info.max_texture_width = value; @@ -605,6 +590,7 @@ GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, data->format, data->formattype, src); + renderdata->glDisable(data->type); SDL_free(blob); if (renderdata->glGetError() != GL_NO_ERROR) { @@ -686,18 +672,27 @@ GLES_UpdateViewport(SDL_Renderer * renderer) } else { int w, h; - SDL_GetRendererOutputSize(renderer, &w, &h); + SDL_GL_GetDrawableSize(renderer->window, &w, &h); data->glViewport(renderer->viewport.x, (h - renderer->viewport.y - renderer->viewport.h), renderer->viewport.w, renderer->viewport.h); } + data->glMatrixMode(GL_PROJECTION); + data->glLoadIdentity(); if (renderer->viewport.w && renderer->viewport.h) { - data->glMatrixMode(GL_PROJECTION); - data->glLoadIdentity(); - data->glOrthof((GLfloat) 0, - (GLfloat) renderer->viewport.w, - (GLfloat) renderer->viewport.h, - (GLfloat) 0, 0.0, 1.0); + if (renderer->target) { + data->glOrthof((GLfloat) 0, + (GLfloat) renderer->viewport.w, + (GLfloat) 0, + (GLfloat) renderer->viewport.h, + 0.0, 1.0); + } else { + data->glOrthof((GLfloat) 0, + (GLfloat) renderer->viewport.w, + (GLfloat) renderer->viewport.h, + (GLfloat) 0, + 0.0, 1.0); + } } return 0; } @@ -720,7 +715,7 @@ GLES_UpdateClipRect(SDL_Renderer * renderer) } else { int w, h; - SDL_GetRendererOutputSize(renderer, &w, &h); + SDL_GL_GetDrawableSize(renderer->window, &w, &h); data->glScissor(renderer->viewport.x + rect->x, h - renderer->viewport.y - rect->y - rect->h, rect->w, rect->h); } } else { @@ -749,11 +744,9 @@ GLES_SetBlendMode(GLES_RenderData * data, int blendMode) if (blendMode != data->current.blendMode) { switch (blendMode) { case SDL_BLENDMODE_NONE: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); data->glDisable(GL_BLEND); break; case SDL_BLENDMODE_BLEND: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); data->glEnable(GL_BLEND); if (data->GL_OES_blend_func_separate_supported) { data->glBlendFuncSeparateOES(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); @@ -762,7 +755,6 @@ GLES_SetBlendMode(GLES_RenderData * data, int blendMode) } break; case SDL_BLENDMODE_ADD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); data->glEnable(GL_BLEND); if (data->GL_OES_blend_func_separate_supported) { data->glBlendFuncSeparateOES(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE); @@ -771,7 +763,6 @@ GLES_SetBlendMode(GLES_RenderData * data, int blendMode) } break; case SDL_BLENDMODE_MOD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); data->glEnable(GL_BLEND); if (data->GL_OES_blend_func_separate_supported) { data->glBlendFuncSeparateOES(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE); @@ -825,9 +816,17 @@ GLES_RenderClear(SDL_Renderer * renderer) (GLfloat) renderer->g * inv255f, (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); + + if (renderer->clipping_enabled) { + data->glDisable(GL_SCISSOR_TEST); + } data->glClear(GL_COLOR_BUFFER_BIT); + if (renderer->clipping_enabled) { + data->glEnable(GL_SCISSOR_TEST); + } + return 0; } @@ -952,71 +951,42 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, GLES_SetTexCoords(data, SDL_TRUE); - if (data->GL_OES_draw_texture_supported && data->useDrawTexture) { - /* this code is a little funny because the viewport is upside down vs SDL's coordinate system */ - GLint cropRect[4]; - int w, h; - SDL_Window *window = renderer->window; + minx = dstrect->x; + miny = dstrect->y; + maxx = dstrect->x + dstrect->w; + maxy = dstrect->y + dstrect->h; - SDL_GetWindowSize(window, &w, &h); - if (renderer->target) { - cropRect[0] = srcrect->x; - cropRect[1] = srcrect->y; - cropRect[2] = srcrect->w; - cropRect[3] = srcrect->h; - data->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, - cropRect); - data->glDrawTexfOES(renderer->viewport.x + dstrect->x, renderer->viewport.y + dstrect->y, 0, - dstrect->w, dstrect->h); - } else { - cropRect[0] = srcrect->x; - cropRect[1] = srcrect->y + srcrect->h; - cropRect[2] = srcrect->w; - cropRect[3] = -srcrect->h; - data->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, - cropRect); - data->glDrawTexfOES(renderer->viewport.x + dstrect->x, - h - (renderer->viewport.y + dstrect->y) - dstrect->h, 0, - dstrect->w, dstrect->h); - } - } else { + minu = (GLfloat) srcrect->x / texture->w; + minu *= texturedata->texw; + maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w; + maxu *= texturedata->texw; + minv = (GLfloat) srcrect->y / texture->h; + minv *= texturedata->texh; + maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h; + maxv *= texturedata->texh; - minx = dstrect->x; - miny = dstrect->y; - maxx = dstrect->x + dstrect->w; - maxy = dstrect->y + dstrect->h; + vertices[0] = minx; + vertices[1] = miny; + vertices[2] = maxx; + vertices[3] = miny; + vertices[4] = minx; + vertices[5] = maxy; + vertices[6] = maxx; + vertices[7] = maxy; - minu = (GLfloat) srcrect->x / texture->w; - minu *= texturedata->texw; - maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w; - maxu *= texturedata->texw; - minv = (GLfloat) srcrect->y / texture->h; - minv *= texturedata->texh; - maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h; - maxv *= texturedata->texh; + texCoords[0] = minu; + texCoords[1] = minv; + texCoords[2] = maxu; + texCoords[3] = minv; + texCoords[4] = minu; + texCoords[5] = maxv; + texCoords[6] = maxu; + texCoords[7] = maxv; - vertices[0] = minx; - vertices[1] = miny; - vertices[2] = maxx; - vertices[3] = miny; - vertices[4] = minx; - vertices[5] = maxy; - vertices[6] = maxx; - vertices[7] = maxy; + data->glVertexPointer(2, GL_FLOAT, 0, vertices); + data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords); + data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - texCoords[0] = minu; - texCoords[1] = minv; - texCoords[2] = maxu; - texCoords[3] = minv; - texCoords[4] = minu; - texCoords[5] = maxv; - texCoords[6] = maxu; - texCoords[7] = maxv; - - data->glVertexPointer(2, GL_FLOAT, 0, vertices); - data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords); - data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - } data->glDisable(GL_TEXTURE_2D); return 0; @@ -1117,7 +1087,7 @@ GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch) { GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; - Uint32 temp_format = SDL_PIXELFORMAT_ABGR8888; + Uint32 temp_format = renderer->target ? renderer->target->format : SDL_PIXELFORMAT_ABGR8888; void *temp_pixels; int temp_pitch; Uint8 *src, *dst, *tmp; @@ -1136,23 +1106,25 @@ GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, data->glPixelStorei(GL_PACK_ALIGNMENT, 1); - data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h, - GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels); + data->glReadPixels(rect->x, renderer->target ? rect->y : (h-rect->y)-rect->h, + rect->w, rect->h, GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels); - /* Flip the rows to be top-down */ - length = rect->w * SDL_BYTESPERPIXEL(temp_format); - src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch; - dst = (Uint8*)temp_pixels; - tmp = SDL_stack_alloc(Uint8, length); - rows = rect->h / 2; - while (rows--) { - SDL_memcpy(tmp, dst, length); - SDL_memcpy(dst, src, length); - SDL_memcpy(src, tmp, length); - dst += temp_pitch; - src -= temp_pitch; + /* Flip the rows to be top-down if necessary */ + if (!renderer->target) { + length = rect->w * SDL_BYTESPERPIXEL(temp_format); + src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch; + dst = (Uint8*)temp_pixels; + tmp = SDL_stack_alloc(Uint8, length); + rows = rect->h / 2; + while (rows--) { + SDL_memcpy(tmp, dst, length); + SDL_memcpy(dst, src, length); + SDL_memcpy(src, tmp, length); + dst += temp_pitch; + src -= temp_pitch; + } + SDL_stack_free(tmp); } - SDL_stack_free(tmp); status = SDL_ConvertPixels(rect->w, rect->h, temp_format, temp_pixels, temp_pitch, diff --git a/Engine/lib/sdl/src/render/opengles2/SDL_render_gles2.c b/Engine/lib/sdl/src/render/opengles2/SDL_render_gles2.c index e41ab6231..c846a7b39 100644 --- a/Engine/lib/sdl/src/render/opengles2/SDL_render_gles2.c +++ b/Engine/lib/sdl/src/render/opengles2/SDL_render_gles2.c @@ -388,7 +388,7 @@ GLES2_UpdateViewport(SDL_Renderer * renderer) } else { int w, h; - SDL_GetRendererOutputSize(renderer, &w, &h); + SDL_GL_GetDrawableSize(renderer->window, &w, &h); data->glViewport(renderer->viewport.x, (h - renderer->viewport.y - renderer->viewport.h), renderer->viewport.w, renderer->viewport.h); } @@ -417,7 +417,7 @@ GLES2_UpdateClipRect(SDL_Renderer * renderer) } else { int w, h; - SDL_GetRendererOutputSize(renderer, &w, &h); + SDL_GL_GetDrawableSize(renderer->window, &w, &h); data->glScissor(renderer->viewport.x + rect->x, h - renderer->viewport.y - rect->y - rect->h, rect->w, rect->h); } } else { @@ -1327,8 +1327,16 @@ GLES2_RenderClear(SDL_Renderer * renderer) data->clear_a = renderer->a; } + if (renderer->clipping_enabled) { + data->glDisable(GL_SCISSOR_TEST); + } + data->glClear(GL_COLOR_BUFFER_BIT); + if (renderer->clipping_enabled) { + data->glEnable(GL_SCISSOR_TEST); + } + return 0; } @@ -1817,7 +1825,7 @@ GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch) { GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata; - Uint32 temp_format = SDL_PIXELFORMAT_ABGR8888; + Uint32 temp_format = renderer->target ? renderer->target->format : SDL_PIXELFORMAT_ABGR8888; void *temp_pixels; int temp_pitch; Uint8 *src, *dst, *tmp; @@ -1834,26 +1842,28 @@ GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, SDL_GetRendererOutputSize(renderer, &w, &h); - data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h, - GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels); + data->glReadPixels(rect->x, renderer->target ? rect->y : (h-rect->y)-rect->h, + rect->w, rect->h, GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels); if (GL_CheckError("glReadPixels()", renderer) < 0) { return -1; } - /* Flip the rows to be top-down */ - length = rect->w * SDL_BYTESPERPIXEL(temp_format); - src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch; - dst = (Uint8*)temp_pixels; - tmp = SDL_stack_alloc(Uint8, length); - rows = rect->h / 2; - while (rows--) { - SDL_memcpy(tmp, dst, length); - SDL_memcpy(dst, src, length); - SDL_memcpy(src, tmp, length); - dst += temp_pitch; - src -= temp_pitch; + /* Flip the rows to be top-down if necessary */ + if (!renderer->target) { + length = rect->w * SDL_BYTESPERPIXEL(temp_format); + src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch; + dst = (Uint8*)temp_pixels; + tmp = SDL_stack_alloc(Uint8, length); + rows = rect->h / 2; + while (rows--) { + SDL_memcpy(tmp, dst, length); + SDL_memcpy(dst, src, length); + SDL_memcpy(src, tmp, length); + dst += temp_pitch; + src -= temp_pitch; + } + SDL_stack_free(tmp); } - SDL_stack_free(tmp); status = SDL_ConvertPixels(rect->w, rect->h, temp_format, temp_pixels, temp_pitch, @@ -1959,9 +1969,15 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags) int profile_mask = 0, major = 0, minor = 0; SDL_bool changed_window = SDL_FALSE; - SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask); - SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major); - SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor); + if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask) < 0) { + goto error; + } + if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major) < 0) { + goto error; + } + if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor) < 0) { + goto error; + } window_flags = SDL_GetWindowFlags(window); if (!(window_flags & SDL_WINDOW_OPENGL) || diff --git a/Engine/lib/sdl/src/render/psp/SDL_render_psp.c b/Engine/lib/sdl/src/render/psp/SDL_render_psp.c index 8e8c87353..f2851319e 100644 --- a/Engine/lib/sdl/src/render/psp/SDL_render_psp.c +++ b/Engine/lib/sdl/src/render/psp/SDL_render_psp.c @@ -50,6 +50,8 @@ static SDL_Renderer *PSP_CreateRenderer(SDL_Window * window, Uint32 flags); static void PSP_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event); static int PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture); +static int PSP_SetTextureColorMod(SDL_Renderer * renderer, + SDL_Texture * texture); static int PSP_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch); @@ -359,6 +361,7 @@ PSP_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->WindowEvent = PSP_WindowEvent; renderer->CreateTexture = PSP_CreateTexture; + renderer->SetTextureColorMod = PSP_SetTextureColorMod; renderer->UpdateTexture = PSP_UpdateTexture; renderer->LockTexture = PSP_LockTexture; renderer->UnlockTexture = PSP_UnlockTexture; @@ -501,6 +504,11 @@ PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) return 0; } +static int +PSP_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture) +{ + return SDL_Unsupported(); +} void TextureActivate(SDL_Texture * texture) @@ -853,7 +861,7 @@ PSP_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch) { - return 0; + return SDL_Unsupported(); } diff --git a/Engine/lib/sdl/src/render/software/SDL_render_sw.c b/Engine/lib/sdl/src/render/software/SDL_render_sw.c index dadd2442f..e7a6cd88d 100644 --- a/Engine/lib/sdl/src/render/software/SDL_render_sw.c +++ b/Engine/lib/sdl/src/render/software/SDL_render_sw.c @@ -677,8 +677,8 @@ SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture, } if (!retval) { - SDLgfx_rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, -angle, &dstwidth, &dstheight, &cangle, &sangle); - surface_rotated = SDLgfx_rotateSurface(surface_scaled, -angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle); + SDLgfx_rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, angle, &dstwidth, &dstheight, &cangle, &sangle); + surface_rotated = SDLgfx_rotateSurface(surface_scaled, angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle); if(surface_rotated) { /* Find out where the new origin is by rotating the four final_rect points around the center and then taking the extremes */ abscenterx = final_rect.x + (int)center->x; diff --git a/Engine/lib/sdl/src/render/software/SDL_rotate.c b/Engine/lib/sdl/src/render/software/SDL_rotate.c index 8d92758f8..0141d174d 100644 --- a/Engine/lib/sdl/src/render/software/SDL_rotate.c +++ b/Engine/lib/sdl/src/render/software/SDL_rotate.c @@ -110,31 +110,105 @@ SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle, int *dstwidth, int *dstheight, double *cangle, double *sangle) { - double x, y, cx, cy, sx, sy; - double radangle; - int dstwidthhalf, dstheighthalf; - - /* - * Determine destination width and height by rotating a centered source box - */ - radangle = angle * (M_PI / 180.0); - *sangle = SDL_sin(radangle); - *cangle = SDL_cos(radangle); - x = (double)(width / 2); - y = (double)(height / 2); - cx = *cangle * x; - cy = *cangle * y; - sx = *sangle * x; - sy = *sangle * y; - - dstwidthhalf = MAX((int) - SDL_ceil(MAX(MAX(MAX(SDL_fabs(cx + sy), SDL_fabs(cx - sy)), SDL_fabs(-cx + sy)), SDL_fabs(-cx - sy))), 1); - dstheighthalf = MAX((int) - SDL_ceil(MAX(MAX(MAX(SDL_fabs(sx + cy), SDL_fabs(sx - cy)), SDL_fabs(-sx + cy)), SDL_fabs(-sx - cy))), 1); - *dstwidth = 2 * dstwidthhalf; - *dstheight = 2 * dstheighthalf; + /* The trig code below gets the wrong size (due to FP inaccuracy?) when angle is a multiple of 90 degrees */ + int angle90 = (int)(angle/90); + if(angle90 == angle/90) { /* if the angle is a multiple of 90 degrees */ + angle90 %= 4; + if(angle90 < 0) angle90 += 4; /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */ + if(angle90 & 1) { + *dstwidth = height; + *dstheight = width; + *cangle = 0; + *sangle = angle90 == 1 ? -1 : 1; /* reversed because our rotations are clockwise */ + } else { + *dstwidth = width; + *dstheight = height; + *cangle = angle90 == 0 ? 1 : -1; + *sangle = 0; + } + } else { + double x, y, cx, cy, sx, sy; + double radangle; + int dstwidthhalf, dstheighthalf; + /* + * Determine destination width and height by rotating a centered source box + */ + radangle = angle * (M_PI / -180.0); /* reverse the angle because our rotations are clockwise */ + *sangle = SDL_sin(radangle); + *cangle = SDL_cos(radangle); + x = (double)(width / 2); + y = (double)(height / 2); + cx = *cangle * x; + cy = *cangle * y; + sx = *sangle * x; + sy = *sangle * y; + + dstwidthhalf = MAX((int) + SDL_ceil(MAX(MAX(MAX(SDL_fabs(cx + sy), SDL_fabs(cx - sy)), SDL_fabs(-cx + sy)), SDL_fabs(-cx - sy))), 1); + dstheighthalf = MAX((int) + SDL_ceil(MAX(MAX(MAX(SDL_fabs(sx + cy), SDL_fabs(sx - cy)), SDL_fabs(-sx + cy)), SDL_fabs(-sx - cy))), 1); + *dstwidth = 2 * dstwidthhalf; + *dstheight = 2 * dstheighthalf; + } } +/* Computes source pointer X/Y increments for a rotation that's a multiple of 90 degrees. */ +static void +computeSourceIncrements90(SDL_Surface * src, int bpp, int angle, int flipx, int flipy, + int *sincx, int *sincy, int *signx, int *signy) +{ + int pitch = flipy ? -src->pitch : src->pitch; + if (flipx) { + bpp = -bpp; + } + switch (angle) { /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */ + case 0: *sincx = bpp; *sincy = pitch - src->w * *sincx; *signx = *signy = 1; break; + case 1: *sincx = -pitch; *sincy = bpp - *sincx * src->h; *signx = 1; *signy = -1; break; + case 2: *sincx = -bpp; *sincy = -src->w * *sincx - pitch; *signx = *signy = -1; break; + case 3: default: *sincx = pitch; *sincy = -*sincx * src->h - bpp; *signx = -1; *signy = 1; break; + } + if (flipx) { + *signx = -*signx; + } + if (flipy) { + *signy = -*signy; + } +} + +/* Performs a relatively fast rotation/flip when the angle is a multiple of 90 degrees. */ +#define TRANSFORM_SURFACE_90(pixelType) \ + int dy, dincy = dst->pitch - dst->w*sizeof(pixelType), sincx, sincy, signx, signy; \ + Uint8 *sp = (Uint8*)src->pixels, *dp = (Uint8*)dst->pixels, *de; \ + \ + computeSourceIncrements90(src, sizeof(pixelType), angle, flipx, flipy, &sincx, &sincy, &signx, &signy); \ + if (signx < 0) sp += (src->w-1)*sizeof(pixelType); \ + if (signy < 0) sp += (src->h-1)*src->pitch; \ + \ + for (dy = 0; dy < dst->h; sp += sincy, dp += dincy, dy++) { \ + if (sincx == sizeof(pixelType)) { /* if advancing src and dest equally, use memcpy */ \ + SDL_memcpy(dp, sp, dst->w*sizeof(pixelType)); \ + sp += dst->w*sizeof(pixelType); \ + dp += dst->w*sizeof(pixelType); \ + } else { \ + for (de = dp + dst->w*sizeof(pixelType); dp != de; sp += sincx, dp += sizeof(pixelType)) { \ + *(pixelType*)dp = *(pixelType*)sp; \ + } \ + } \ + } + +static void +transformSurfaceRGBA90(SDL_Surface * src, SDL_Surface * dst, int angle, int flipx, int flipy) +{ + TRANSFORM_SURFACE_90(tColorRGBA); +} + +static void +transformSurfaceY90(SDL_Surface * src, SDL_Surface * dst, int angle, int flipx, int flipy) +{ + TRANSFORM_SURFACE_90(tColorY); +} + +#undef TRANSFORM_SURFACE_90 /* ! \brief Internal 32 bit rotozoomer with optional anti-aliasing. @@ -341,9 +415,9 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, { SDL_Surface *rz_src; SDL_Surface *rz_dst; - int is32bit; + int is32bit, angle90; int i; - Uint8 r,g,b; + Uint8 r = 0, g = 0, b = 0; Uint32 colorkey = 0; int colorKeyAvailable = 0; double sangleinv, cangleinv; @@ -370,18 +444,13 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, */ rz_src = src; } else { - Uint32 format = SDL_MasksToPixelFormatEnum(32, -#if SDL_BYTEORDER == SDL_LIL_ENDIAN - 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 -#else - 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff -#endif - ); - rz_src = SDL_ConvertSurfaceFormat(src, format, src->flags); + rz_src = SDL_ConvertSurfaceFormat(src, SDL_PIXELFORMAT_ARGB32, src->flags); + if (rz_src == NULL) { + return NULL; + } is32bit = 1; } - /* Determine target size */ /* _rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */ @@ -394,7 +463,6 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, /* * Alloc space to completely contain the rotated surface */ - rz_dst = NULL; if (is32bit) { /* * Target surface is 32bit with source RGBA/ABGR ordering @@ -430,6 +498,18 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, SDL_LockSurface(rz_src); } + /* check if the rotation is a multiple of 90 degrees so we can take a fast path and also somewhat reduce + * the off-by-one problem in _transformSurfaceRGBA that expresses itself when the rotation is near + * multiples of 90 degrees. + */ + angle90 = (int)(angle/90); + if (angle90 == angle/90) { + angle90 %= 4; + if (angle90 < 0) angle90 += 4; /* 0:0 deg, 1:90 deg, 2:180 deg, 3:270 deg */ + } else { + angle90 = -1; + } + /* * Check which kind of surface we have */ @@ -437,10 +517,11 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, /* * Call the 32bit transformation routine to do the rotation (using alpha) */ - _transformSurfaceRGBA(rz_src, rz_dst, centerx, centery, - (int) (sangleinv), (int) (cangleinv), - flipx, flipy, - smooth); + if (angle90 >= 0) { + transformSurfaceRGBA90(rz_src, rz_dst, angle90, flipx, flipy); + } else { + _transformSurfaceRGBA(rz_src, rz_dst, centerx, centery, (int) (sangleinv), (int) (cangleinv), flipx, flipy, smooth); + } /* * Turn on source-alpha support */ @@ -457,9 +538,11 @@ SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, /* * Call the 8bit transformation routine to do the rotation */ - transformSurfaceY(rz_src, rz_dst, centerx, centery, - (int) (sangleinv), (int) (cangleinv), - flipx, flipy); + if(angle90 >= 0) { + transformSurfaceY90(rz_src, rz_dst, angle90, flipx, flipy); + } else { + transformSurfaceY(rz_src, rz_dst, centerx, centery, (int)(sangleinv), (int)(cangleinv), flipx, flipy); + } SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src)); } diff --git a/Engine/lib/sdl/src/stdlib/SDL_iconv.c b/Engine/lib/sdl/src/stdlib/SDL_iconv.c index 8f0403734..34bcd8431 100644 --- a/Engine/lib/sdl/src/stdlib/SDL_iconv.c +++ b/Engine/lib/sdl/src/stdlib/SDL_iconv.c @@ -30,7 +30,8 @@ #include "SDL_stdinc.h" #include "SDL_endian.h" -#ifdef HAVE_ICONV +#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) +#include /* Depending on which standard the iconv() was implemented with, iconv() may or may not use const char ** for the inbuf param. diff --git a/Engine/lib/sdl/src/stdlib/SDL_qsort.c b/Engine/lib/sdl/src/stdlib/SDL_qsort.c index 0d1978424..2ef33b15e 100644 --- a/Engine/lib/sdl/src/stdlib/SDL_qsort.c +++ b/Engine/lib/sdl/src/stdlib/SDL_qsort.c @@ -1,46 +1,23 @@ -/* qsort.c - * (c) 1998 Gareth McCaughan - * - * This is a drop-in replacement for the C library's |qsort()| routine. - * - * Features: - * - Median-of-three pivoting (and more) - * - Truncation and final polishing by a single insertion sort - * - Early truncation when no swaps needed in pivoting step - * - Explicit recursion, guaranteed not to overflow - * - A few little wrinkles stolen from the GNU |qsort()|. - * - separate code for non-aligned / aligned / word-size objects - * - * This code may be reproduced freely provided - * - this file is retained unaltered apart from minor - * changes for portability and efficiency - * - no changes are made to this comment - * - any changes that *are* made are clearly flagged - * - the _ID string below is altered by inserting, after - * the date, the string " altered" followed at your option - * by other material. (Exceptions: you may change the name - * of the exported routine without changing the ID string. - * You may change the values of the macros TRUNC_* and - * PIVOT_THRESHOLD without changing the ID string, provided - * they remain constants with TRUNC_nonaligned, TRUNC_aligned - * and TRUNC_words/WORD_BYTES between 8 and 24, and - * PIVOT_THRESHOLD between 32 and 200.) - * - * You may use it in anything you like; you may make money - * out of it; you may distribute it in object form or as - * part of an executable without including source code; - * you don't have to credit me. (But it would be nice if - * you did.) - * - * If you find problems with this code, or find ways of - * making it significantly faster, please let me know! - * My e-mail address, valid as of early 1998 and certainly - * OK for at least the next 18 months, is - * gjm11@dpmms.cam.ac.uk - * Thanks! - * - * Gareth McCaughan Peterhouse Cambridge 1998 - */ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ #if defined(__clang_analyzer__) && !defined(SDL_DISABLE_ANALYZE_MACROS) #define SDL_DISABLE_ANALYZE_MACROS 1 @@ -48,11 +25,6 @@ #include "../SDL_internal.h" -/* -#include -#include -#include -*/ #include "SDL_stdinc.h" #include "SDL_assert.h" @@ -62,34 +34,128 @@ SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, c { qsort(base, nmemb, size, compare); } + #else #ifdef assert #undef assert #endif -#define assert(X) SDL_assert(X) +#define assert SDL_assert #ifdef malloc #undef malloc #endif -#define malloc SDL_malloc +#define malloc SDL_malloc #ifdef free #undef free #endif -#define free SDL_free +#define free SDL_free #ifdef memcpy #undef memcpy #endif -#define memcpy SDL_memcpy +#define memcpy SDL_memcpy #ifdef memmove #undef memmove #endif -#define memmove SDL_memmove -#ifdef qsort -#undef qsort +#define memmove SDL_memmove +#ifdef qsortG +#undef qsortG #endif -#define qsort SDL_qsort +#define qsortG SDL_qsort -static const char _ID[] = ""; +/* +This code came from Gareth McCaughan, under the zlib license. +Specifically this: https://www.mccaughan.org.uk/software/qsort.c-1.14 + +Everything below this comment until the HAVE_QSORT #endif was from Gareth +(any minor changes will be noted inline). + +Thank you to Gareth for relicensing this code under the zlib license for our +benefit! + +--ryan. +*/ + +/* This is a drop-in replacement for the C library's |qsort()| routine. + * + * It is intended for use where you know or suspect that your + * platform's qsort is bad. If that isn't the case, then you + * should probably use the qsort your system gives you in preference + * to mine -- it will likely have been tested and tuned better. + * + * Features: + * - Median-of-three pivoting (and more) + * - Truncation and final polishing by a single insertion sort + * - Early truncation when no swaps needed in pivoting step + * - Explicit recursion, guaranteed not to overflow + * - A few little wrinkles stolen from the GNU |qsort()|. + * (For the avoidance of doubt, no code was stolen, only + * broad ideas.) + * - separate code for non-aligned / aligned / word-size objects + * + * Earlier releases of this code used an idiosyncratic licence + * I wrote myself, because I'm an idiot. The code is now released + * under the "zlib/libpng licence"; you will find the actual + * terms in the next comment. I request (but do not require) + * that if you make any changes beyond the name of the exported + * routine and reasonable tweaks to the TRUNC_* and + * PIVOT_THRESHOLD values, you modify the _ID string so as + * to make it clear that you have changed the code. + * + * If you find problems with this code, or find ways of + * making it significantly faster, please let me know! + * My e-mail address, valid as of early 2016 and for the + * foreseeable future, is + * gareth.mccaughan@pobox.com + * Thanks! + * + * Gareth McCaughan + */ + +/* Copyright (c) 1998-2016 Gareth McCaughan + * + * This software is provided 'as-is', without any express or implied + * warranty. In no event will the authors be held liable for any + * damages arising from the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; + * you must not claim that you wrote the original software. + * If you use this software in a product, an acknowledgment + * in the product documentation would be appreciated but + * is not required. + * + * 2. Altered source versions must be plainly marked as such, + * and must not be misrepresented as being the original software. + * + * 3. This notice may not be removed or altered from any source + * distribution. + */ + +/* Revision history since release: + * 1998-03-19 v1.12 First release I have any records of. + * 2007-09-02 v1.13 Fix bug kindly reported by Dan Bodoh + * (premature termination of recursion). + * Add a few clarifying comments. + * Minor improvements to debug output. + * 2016-02-21 v1.14 Replace licence with 2-clause BSD, + * and clarify a couple of things in + * comments. No code changes. + */ + +/* BEGIN SDL CHANGE ... commented this out with an #if 0 block. --ryan. */ +#if 0 +#include +#include +#include + +#define DEBUG_QSORT + +static char _ID[]=""; +#endif +/* END SDL CHANGE ... commented this out with an #if 0 block. --ryan. */ /* How many bytes are there per word? (Must be a power of 2, * and must in fact equal sizeof(int).) @@ -110,7 +176,7 @@ static const char _ID[] = ""; */ #define TRUNC_nonaligned 12 #define TRUNC_aligned 12 -#define TRUNC_words 12*WORD_BYTES /* nb different meaning */ +#define TRUNC_words 12*WORD_BYTES /* nb different meaning */ /* We use a simple pivoting algorithm for shortish sub-arrays * and a more complicated one for larger ones. The threshold @@ -118,11 +184,7 @@ static const char _ID[] = ""; */ #define PIVOT_THRESHOLD 40 -typedef struct -{ - char *first; - char *last; -} stack_entry; +typedef struct { char * first; char * last; } stack_entry; #define pushLeft {stack[stacktop].first=ffirst;stack[stacktop++].last=last;} #define pushRight {stack[stacktop].first=first;stack[stacktop++].last=llast;} #define doLeft {first=ffirst;llast=last;continue;} @@ -197,7 +259,9 @@ typedef struct * 16-bit |int|s and 4096-bit |size_t|s. :-) */ -/* The recursion logic is the same in each case: */ +/* The recursion logic is the same in each case. + * We keep chopping up until we reach subarrays of size + * strictly less than Trunc; we leave these unsorted. */ #define Recurse(Trunc) \ { size_t l=last-ffirst,r=llast-first; \ if (lPIVOT_THRESHOLD*sz) mid=pivot_big(first,mid,last,sz,compare);\ + if (last-first>PIVOT_THRESHOLD*sz) mid=pivot_big(first,mid,last,sz,compare);\ else { \ if (compare(first,mid)<0) { \ if (compare(mid,last)>0) { \ @@ -235,26 +299,28 @@ typedef struct /* and so is the partitioning logic: */ #define Partition(swapper,sz) { \ - int swapped=0; \ do { \ while (compare(first,pivot)<0) first+=sz; \ while (compare(pivot,last)<0) last-=sz; \ if (firstlimit ? limit : nmemb-1)*sz;\ + last=first + ((nmemb>limit ? limit : nmemb)-1)*sz;\ while (last!=base) { \ if (compare(first,last)>0) first=last; \ last-=sz; } \ @@ -294,188 +360,175 @@ typedef struct /* ---------------------------------------------------------------------- */ -static char * -pivot_big(char *first, char *mid, char *last, size_t size, - int compare(const void *, const void *)) -{ - size_t d = (((last - first) / size) >> 3) * size; - char *m1, *m2, *m3; - { - char *a = first, *b = first + d, *c = first + 2 * d; +static char * pivot_big(char *first, char *mid, char *last, size_t size, + int compare(const void *, const void *)) { + int d=(((last-first)/size)>>3)*size; #ifdef DEBUG_QSORT - fprintf(stderr, "< %d %d %d\n", *(int *) a, *(int *) b, *(int *) c); +fprintf(stderr, "pivot_big: first=%p last=%p size=%lu n=%lu\n", first, (unsigned long)last, size, (unsigned long)((last-first+1)/size)); #endif - m1 = compare(a, b) < 0 ? - (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a)) - : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b)); - } - { - char *a = mid - d, *b = mid, *c = mid + d; + char *m1,*m2,*m3; + { char *a=first, *b=first+d, *c=first+2*d; #ifdef DEBUG_QSORT - fprintf(stderr, ". %d %d %d\n", *(int *) a, *(int *) b, *(int *) c); +fprintf(stderr,"< %d %d %d @ %p %p %p\n",*(int*)a,*(int*)b,*(int*)c, a,b,c); #endif - m2 = compare(a, b) < 0 ? - (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a)) - : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b)); - } - { - char *a = last - 2 * d, *b = last - d, *c = last; + m1 = compare(a,b)<0 ? + (compare(b,c)<0 ? b : (compare(a,c)<0 ? c : a)) + : (compare(a,c)<0 ? a : (compare(b,c)<0 ? c : b)); + } + { char *a=mid-d, *b=mid, *c=mid+d; #ifdef DEBUG_QSORT - fprintf(stderr, "> %d %d %d\n", *(int *) a, *(int *) b, *(int *) c); +fprintf(stderr,". %d %d %d @ %p %p %p\n",*(int*)a,*(int*)b,*(int*)c, a,b,c); #endif - m3 = compare(a, b) < 0 ? - (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a)) - : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b)); - } + m2 = compare(a,b)<0 ? + (compare(b,c)<0 ? b : (compare(a,c)<0 ? c : a)) + : (compare(a,c)<0 ? a : (compare(b,c)<0 ? c : b)); + } + { char *a=last-2*d, *b=last-d, *c=last; #ifdef DEBUG_QSORT - fprintf(stderr, "-> %d %d %d\n", *(int *) m1, *(int *) m2, *(int *) m3); +fprintf(stderr,"> %d %d %d @ %p %p %p\n",*(int*)a,*(int*)b,*(int*)c, a,b,c); #endif - return compare(m1, m2) < 0 ? - (compare(m2, m3) < 0 ? m2 : (compare(m1, m3) < 0 ? m3 : m1)) - : (compare(m1, m3) < 0 ? m1 : (compare(m2, m3) < 0 ? m3 : m2)); + m3 = compare(a,b)<0 ? + (compare(b,c)<0 ? b : (compare(a,c)<0 ? c : a)) + : (compare(a,c)<0 ? a : (compare(b,c)<0 ? c : b)); + } +#ifdef DEBUG_QSORT +fprintf(stderr,"-> %d %d %d @ %p %p %p\n",*(int*)m1,*(int*)m2,*(int*)m3, m1,m2,m3); +#endif + return compare(m1,m2)<0 ? + (compare(m2,m3)<0 ? m2 : (compare(m1,m3)<0 ? m3 : m1)) + : (compare(m1,m3)<0 ? m1 : (compare(m2,m3)<0 ? m3 : m2)); } /* ---------------------------------------------------------------------- */ -static void -qsort_nonaligned(void *base, size_t nmemb, size_t size, - int (*compare) (const void *, const void *)) -{ +static void qsort_nonaligned(void *base, size_t nmemb, size_t size, + int (*compare)(const void *, const void *)) { - stack_entry stack[STACK_SIZE]; - int stacktop = 0; - char *first, *last; - char *pivot = malloc(size); - size_t trunc = TRUNC_nonaligned * size; - assert(pivot != 0); + stack_entry stack[STACK_SIZE]; + int stacktop=0; + char *first,*last; + char *pivot=malloc(size); + size_t trunc=TRUNC_nonaligned*size; + assert(pivot!=0); - first = (char *) base; - last = first + (nmemb - 1) * size; + first=(char*)base; last=first+(nmemb-1)*size; - if ((size_t) (last - first) > trunc) { - char *ffirst = first, *llast = last; - while (1) { - /* Select pivot */ - { - char *mid = first + size * ((last - first) / size >> 1); - Pivot(SWAP_nonaligned, size); - memcpy(pivot, mid, size); - } - /* Partition. */ - Partition(SWAP_nonaligned, size); - /* Prepare to recurse/iterate. */ - Recurse(trunc)} + if (last-first>=trunc) { + char *ffirst=first, *llast=last; + while (1) { + /* Select pivot */ + { char * mid=first+size*((last-first)/size >> 1); + Pivot(SWAP_nonaligned,size); + memcpy(pivot,mid,size); + } + /* Partition. */ + Partition(SWAP_nonaligned,size); + /* Prepare to recurse/iterate. */ + Recurse(trunc) } - PreInsertion(SWAP_nonaligned, TRUNC_nonaligned, size); - Insertion(SWAP_nonaligned); - free(pivot); + } + PreInsertion(SWAP_nonaligned,TRUNC_nonaligned,size); + Insertion(SWAP_nonaligned); + free(pivot); } -static void -qsort_aligned(void *base, size_t nmemb, size_t size, - int (*compare) (const void *, const void *)) -{ +static void qsort_aligned(void *base, size_t nmemb, size_t size, + int (*compare)(const void *, const void *)) { - stack_entry stack[STACK_SIZE]; - int stacktop = 0; - char *first, *last; - char *pivot = malloc(size); - size_t trunc = TRUNC_aligned * size; - assert(pivot != 0); + stack_entry stack[STACK_SIZE]; + int stacktop=0; + char *first,*last; + char *pivot=malloc(size); + size_t trunc=TRUNC_aligned*size; + assert(pivot!=0); - first = (char *) base; - last = first + (nmemb - 1) * size; + first=(char*)base; last=first+(nmemb-1)*size; - if ((size_t) (last - first) > trunc) { - char *ffirst = first, *llast = last; - while (1) { - /* Select pivot */ - { - char *mid = first + size * ((last - first) / size >> 1); - Pivot(SWAP_aligned, size); - memcpy(pivot, mid, size); - } - /* Partition. */ - Partition(SWAP_aligned, size); - /* Prepare to recurse/iterate. */ - Recurse(trunc)} + if (last-first>=trunc) { + char *ffirst=first,*llast=last; + while (1) { + /* Select pivot */ + { char * mid=first+size*((last-first)/size >> 1); + Pivot(SWAP_aligned,size); + memcpy(pivot,mid,size); + } + /* Partition. */ + Partition(SWAP_aligned,size); + /* Prepare to recurse/iterate. */ + Recurse(trunc) } - PreInsertion(SWAP_aligned, TRUNC_aligned, size); - Insertion(SWAP_aligned); - free(pivot); + } + PreInsertion(SWAP_aligned,TRUNC_aligned,size); + Insertion(SWAP_aligned); + free(pivot); } -static void -qsort_words(void *base, size_t nmemb, - int (*compare) (const void *, const void *)) -{ +static void qsort_words(void *base, size_t nmemb, + int (*compare)(const void *, const void *)) { - stack_entry stack[STACK_SIZE]; - int stacktop = 0; - char *first, *last; - char *pivot = malloc(WORD_BYTES); - assert(pivot != 0); + stack_entry stack[STACK_SIZE]; + int stacktop=0; + char *first,*last; + char *pivot=malloc(WORD_BYTES); + assert(pivot!=0); - first = (char *) base; - last = first + (nmemb - 1) * WORD_BYTES; + first=(char*)base; last=first+(nmemb-1)*WORD_BYTES; - if (last - first > TRUNC_words) { - char *ffirst = first, *llast = last; - while (1) { + if (last-first>=TRUNC_words) { + char *ffirst=first, *llast=last; + while (1) { #ifdef DEBUG_QSORT - fprintf(stderr, "Doing %d:%d: ", - (first - (char *) base) / WORD_BYTES, - (last - (char *) base) / WORD_BYTES); +fprintf(stderr,"Doing %d:%d: ", + (first-(char*)base)/WORD_BYTES, + (last-(char*)base)/WORD_BYTES); #endif - /* Select pivot */ - { - char *mid = - first + WORD_BYTES * ((last - first) / (2 * WORD_BYTES)); - Pivot(SWAP_words, WORD_BYTES); - *(int *) pivot = *(int *) mid; - } + /* Select pivot */ + { char * mid=first+WORD_BYTES*((last-first) / (2*WORD_BYTES)); + Pivot(SWAP_words,WORD_BYTES); + *(int*)pivot=*(int*)mid; #ifdef DEBUG_QSORT - fprintf(stderr, "pivot=%d\n", *(int *) pivot); +fprintf(stderr,"pivot = %p = #%lu = %d\n", mid, (unsigned long)(((int*)mid)-((int*)base)), *(int*)mid); #endif - /* Partition. */ - Partition(SWAP_words, WORD_BYTES); - /* Prepare to recurse/iterate. */ - Recurse(TRUNC_words)} + } + /* Partition. */ + Partition(SWAP_words,WORD_BYTES); +#ifdef DEBUG_QSORT +fprintf(stderr, "after partitioning first=#%lu last=#%lu\n", (first-(char*)base)/4lu, (last-(char*)base)/4lu); +#endif + /* Prepare to recurse/iterate. */ + Recurse(TRUNC_words) } - PreInsertion(SWAP_words, (TRUNC_words / WORD_BYTES), WORD_BYTES); - /* Now do insertion sort. */ - last = ((char *) base) + nmemb * WORD_BYTES; - for (first = ((char *) base) + WORD_BYTES; first != last; - first += WORD_BYTES) { - /* Find the right place for |first|. My apologies for var reuse */ - int *pl = (int *) (first - WORD_BYTES), *pr = (int *) first; - *(int *) pivot = *(int *) first; - for (; compare(pl, pivot) > 0; pr = pl, --pl) { - *pr = *pl; - } - if (pr != (int *) first) - *pr = *(int *) pivot; - } - free(pivot); + } + PreInsertion(SWAP_words,(TRUNC_words/WORD_BYTES),WORD_BYTES); + /* Now do insertion sort. */ + last=((char*)base)+nmemb*WORD_BYTES; + for (first=((char*)base)+WORD_BYTES;first!=last;first+=WORD_BYTES) { + /* Find the right place for |first|. My apologies for var reuse */ + int *pl=(int*)(first-WORD_BYTES),*pr=(int*)first; + *(int*)pivot=*(int*)first; + for (;compare(pl,pivot)>0;pr=pl,--pl) { + *pr=*pl; } + if (pr!=(int*)first) *pr=*(int*)pivot; + } + free(pivot); } /* ---------------------------------------------------------------------- */ -void -qsort(void *base, size_t nmemb, size_t size, - int (*compare) (const void *, const void *)) -{ +extern void qsortG(void *base, size_t nmemb, size_t size, + int (*compare)(const void *, const void *)) { - if (nmemb <= 1) - return; - if (((uintptr_t) base | size) & (WORD_BYTES - 1)) - qsort_nonaligned(base, nmemb, size, compare); - else if (size != WORD_BYTES) - qsort_aligned(base, nmemb, size, compare); - else - qsort_words(base, nmemb, compare); + if (nmemb<=1) return; + if (((int)base|size)&(WORD_BYTES-1)) + qsort_nonaligned(base,nmemb,size,compare); + else if (size!=WORD_BYTES) + qsort_aligned(base,nmemb,size,compare); + else + qsort_words(base,nmemb,compare); } -#endif /* !SDL_qsort */ + +#endif /* HAVE_QSORT */ /* vi: set ts=4 sw=4 expandtab: */ + diff --git a/Engine/lib/sdl/src/stdlib/SDL_stdlib.c b/Engine/lib/sdl/src/stdlib/SDL_stdlib.c index 6723d4e2c..f5a152b49 100644 --- a/Engine/lib/sdl/src/stdlib/SDL_stdlib.c +++ b/Engine/lib/sdl/src/stdlib/SDL_stdlib.c @@ -34,7 +34,7 @@ double SDL_atan(double x) { -#ifdef HAVE_ATAN +#if defined(HAVE_ATAN) return atan(x); #else return SDL_uclibc_atan(x); @@ -90,7 +90,7 @@ SDL_asin(double val) double SDL_ceil(double x) { -#ifdef HAVE_CEIL +#if defined(HAVE_CEIL) return ceil(x); #else double integer = SDL_floor(x); @@ -127,7 +127,7 @@ SDL_cos(double x) float SDL_cosf(float x) { -#ifdef HAVE_COSF +#if defined(HAVE_COSF) return cosf(x); #else return (float)SDL_cos((double)x); @@ -199,7 +199,7 @@ SDL_sin(double x) float SDL_sinf(float x) { -#ifdef HAVE_SINF +#if defined(HAVE_SINF) return sinf(x); #else return (float)SDL_sin((double)x); @@ -248,14 +248,14 @@ SDL_tanf(float x) int SDL_abs(int x) { -#ifdef HAVE_ABS +#if defined(HAVE_ABS) return abs(x); #else return ((x) < 0 ? -(x) : (x)); #endif } -#ifdef HAVE_CTYPE_H +#if defined(HAVE_CTYPE_H) int SDL_isdigit(int x) { return isdigit(x); } int SDL_isspace(int x) { return isspace(x); } int SDL_toupper(int x) { return toupper(x); } @@ -279,7 +279,7 @@ __declspec(selectany) int _fltused = 1; #endif /* The optimizer on Visual Studio 2005 and later generates memcpy() calls */ -#if (_MSC_VER >= 1400) && defined(_WIN64) && !defined(_DEBUG) +#if (_MSC_VER >= 1400) && defined(_WIN64) && !defined(_DEBUG) && !(_MSC_VER >= 1900 && defined(_MT)) #include #pragma function(memcpy) diff --git a/Engine/lib/sdl/src/stdlib/SDL_string.c b/Engine/lib/sdl/src/stdlib/SDL_string.c index 5debb2285..debbebaed 100644 --- a/Engine/lib/sdl/src/stdlib/SDL_string.c +++ b/Engine/lib/sdl/src/stdlib/SDL_string.c @@ -1315,6 +1315,7 @@ static size_t SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *string) { size_t length = 0; + size_t slen; if (info && info->width && (size_t)info->width > SDL_strlen(string)) { char fill = info->pad_zeroes ? '0' : ' '; @@ -1326,7 +1327,8 @@ SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *str } } - length += SDL_strlcpy(text, string, maxlen); + slen = SDL_strlcpy(text, string, maxlen); + length += SDL_min(slen, maxlen); if (info) { if (info->force_case == SDL_CASE_LOWER) { @@ -1402,10 +1404,11 @@ SDL_PrintFloat(char *text, size_t maxlen, SDL_FormatInfo *info, double arg) } value = (unsigned long) arg; len = SDL_PrintUnsignedLong(text, left, NULL, value); - text += len; if (len >= left) { + text += (left > 1) ? left - 1 : 0; left = SDL_min(left, 1); } else { + text += len; left -= len; } arg -= value; @@ -1422,10 +1425,11 @@ SDL_PrintFloat(char *text, size_t maxlen, SDL_FormatInfo *info, double arg) while (info->precision-- > 0) { value = (unsigned long) (arg * mult); len = SDL_PrintUnsignedLong(text, left, NULL, value); - text += len; if (len >= left) { + text += (left > 1) ? left - 1 : 0; left = SDL_min(left, 1); } else { + text += len; left -= len; } arg -= (double) value / mult; @@ -1458,10 +1462,11 @@ SDL_PrintFloat(char *text, size_t maxlen, SDL_FormatInfo *info, double arg) } } len = (size_t)width; - text += len; if (len >= left) { + text += (left > 1) ? left - 1 : 0; left = SDL_min(left, 1); } else { + text += len; left -= len; } while (len--) { @@ -1637,10 +1642,11 @@ SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, } ++fmt; } - text += len; if (len >= left) { + text += (left > 1) ? left - 1 : 0; left = SDL_min(left, 1); } else { + text += len; left -= len; } } else { diff --git a/Engine/lib/sdl/src/test/SDL_test_assert.c b/Engine/lib/sdl/src/test/SDL_test_assert.c index 98a84d386..ee2f13248 100644 --- a/Engine/lib/sdl/src/test/SDL_test_assert.c +++ b/Engine/lib/sdl/src/test/SDL_test_assert.c @@ -30,10 +30,10 @@ #include "SDL_test.h" /* Assert check message format */ -const char *SDLTest_AssertCheckFormat = "Assert '%s': %s"; +#define SDLTEST_ASSERT_CHECK_FORMAT "Assert '%s': %s" /* Assert summary message format */ -const char *SDLTest_AssertSummaryFormat = "Assert Summary: Total=%d Passed=%d Failed=%d"; +#define SDLTEST_ASSERT_SUMMARY_FORMAT "Assert Summary: Total=%d Passed=%d Failed=%d" /* ! \brief counts the failed asserts */ static Uint32 SDLTest_AssertsFailed = 0; @@ -77,12 +77,12 @@ int SDLTest_AssertCheck(int assertCondition, SDL_PRINTF_FORMAT_STRING const char if (assertCondition == ASSERT_FAIL) { SDLTest_AssertsFailed++; - SDLTest_LogError(SDLTest_AssertCheckFormat, logMessage, "Failed"); + SDLTest_LogError(SDLTEST_ASSERT_CHECK_FORMAT, logMessage, "Failed"); } else { SDLTest_AssertsPassed++; - SDLTest_Log(SDLTest_AssertCheckFormat, logMessage, "Passed"); + SDLTest_Log(SDLTEST_ASSERT_CHECK_FORMAT, logMessage, "Passed"); } return assertCondition; @@ -104,7 +104,7 @@ void SDLTest_AssertPass(SDL_PRINTF_FORMAT_STRING const char *assertDescription, /* Log pass message */ SDLTest_AssertsPassed++; - SDLTest_Log(SDLTest_AssertCheckFormat, logMessage, "Pass"); + SDLTest_Log(SDLTEST_ASSERT_CHECK_FORMAT, logMessage, "Pass"); } /* @@ -125,11 +125,11 @@ void SDLTest_LogAssertSummary() Uint32 totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed; if (SDLTest_AssertsFailed == 0) { - SDLTest_Log(SDLTest_AssertSummaryFormat, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed); + SDLTest_Log(SDLTEST_ASSERT_SUMMARY_FORMAT, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed); } else { - SDLTest_LogError(SDLTest_AssertSummaryFormat, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed); + SDLTest_LogError(SDLTEST_ASSERT_SUMMARY_FORMAT, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed); } } diff --git a/Engine/lib/sdl/src/test/SDL_test_common.c b/Engine/lib/sdl/src/test/SDL_test_common.c index fee249cb9..1d0b005b5 100644 --- a/Engine/lib/sdl/src/test/SDL_test_common.c +++ b/Engine/lib/sdl/src/test/SDL_test_common.c @@ -1064,6 +1064,12 @@ SDLTest_PrintEvent(SDL_Event * event) case SDL_WINDOWEVENT_CLOSE: SDL_Log("SDL EVENT: Window %d closed", event->window.windowID); break; + case SDL_WINDOWEVENT_TAKE_FOCUS: + SDL_Log("SDL EVENT: Window %d take focus", event->window.windowID); + break; + case SDL_WINDOWEVENT_HIT_TEST: + SDL_Log("SDL EVENT: Window %d hit test", event->window.windowID); + break; default: SDL_Log("SDL EVENT: Window %d got unknown event %d", event->window.windowID, event->window.event); @@ -1368,6 +1374,24 @@ SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done) } } break; + case SDLK_o: + if (withControl) { + /* Ctrl-O (or Ctrl-Shift-O) changes window opacity. */ + SDL_Window *window = SDL_GetWindowFromID(event->key.windowID); + if (window) { + float opacity; + if (SDL_GetWindowOpacity(window, &opacity) == 0) { + if (withShift) { + opacity += 0.20f; + } else { + opacity -= 0.20f; + } + SDL_SetWindowOpacity(window, opacity); + } + } + } + break; + case SDLK_c: if (withControl) { /* Ctrl-C copy awesome text! */ diff --git a/Engine/lib/sdl/src/test/SDL_test_compare.c b/Engine/lib/sdl/src/test/SDL_test_compare.c index 45eb3c689..d06ead9f7 100644 --- a/Engine/lib/sdl/src/test/SDL_test_compare.c +++ b/Engine/lib/sdl/src/test/SDL_test_compare.c @@ -43,7 +43,7 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int bpp, bpp_reference; Uint8 *p, *p_reference; int dist; - int sampleErrorX, sampleErrorY, sampleDist; + int sampleErrorX = 0, sampleErrorY = 0, sampleDist = 0; Uint8 R, G, B, A; Uint8 Rd, Gd, Bd, Ad; char imageFilename[128]; diff --git a/Engine/lib/sdl/src/test/SDL_test_harness.c b/Engine/lib/sdl/src/test/SDL_test_harness.c index fec34164c..4b86c7a0d 100644 --- a/Engine/lib/sdl/src/test/SDL_test_harness.c +++ b/Engine/lib/sdl/src/test/SDL_test_harness.c @@ -29,13 +29,13 @@ #include /* Invalid test name/description message format */ -const char *SDLTest_InvalidNameFormat = "(Invalid)"; +#define SDLTEST_INVALID_NAME_FORMAT "(Invalid)" /* Log summary message format */ -const char *SDLTest_LogSummaryFormat = "%s Summary: Total=%d Passed=%d Failed=%d Skipped=%d"; +#define SDLTEST_LOG_SUMMARY_FORMAT "%s Summary: Total=%d Passed=%d Failed=%d Skipped=%d" /* Final result message format */ -const char *SDLTest_FinalResultFormat = ">>> %s '%s': %s\n"; +#define SDLTEST_FINAL_RESULT_FORMAT ">>> %s '%s': %s\n" /* ! \brief Timeout for single test case execution */ static Uint32 SDLTest_TestCaseTimeout = 3600; @@ -239,7 +239,7 @@ SDLTest_RunTest(SDLTest_TestSuiteReference *testSuite, SDLTest_TestCaseReference if (!testCase->enabled && forceTestRun == SDL_FALSE) { - SDLTest_Log((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Skipped (Disabled)"); + SDLTest_Log(SDLTEST_FINAL_RESULT_FORMAT, "Test", testCase->name, "Skipped (Disabled)"); return TEST_RESULT_SKIPPED; } @@ -256,7 +256,7 @@ SDLTest_RunTest(SDLTest_TestSuiteReference *testSuite, SDLTest_TestCaseReference if (testSuite->testSetUp) { testSuite->testSetUp(0x0); if (SDLTest_AssertSummaryToTestResult() == TEST_RESULT_FAILED) { - SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Suite Setup", testSuite->name, "Failed"); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT, "Suite Setup", testSuite->name, "Failed"); return TEST_RESULT_SETUP_FAILURE; } } @@ -298,13 +298,13 @@ SDLTest_RunTest(SDLTest_TestSuiteReference *testSuite, SDLTest_TestCaseReference /* Final log based on test execution result */ if (testCaseResult == TEST_SKIPPED) { /* Test was programatically skipped */ - SDLTest_Log((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Skipped (Programmatically)"); + SDLTest_Log(SDLTEST_FINAL_RESULT_FORMAT, "Test", testCase->name, "Skipped (Programmatically)"); } else if (testCaseResult == TEST_STARTED) { /* Test did not return a TEST_COMPLETED value; assume it failed */ - SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Failed (test started, but did not return TEST_COMPLETED)"); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT, "Test", testCase->name, "Failed (test started, but did not return TEST_COMPLETED)"); } else if (testCaseResult == TEST_ABORTED) { /* Test was aborted early; assume it failed */ - SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Failed (Aborted)"); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT, "Test", testCase->name, "Failed (Aborted)"); } else { SDLTest_LogAssertSummary(); } @@ -326,7 +326,7 @@ void SDLTest_LogTestSuiteSummary(SDLTest_TestSuiteReference *testSuites) testSuite=&testSuites[suiteCounter]; suiteCounter++; SDLTest_Log("Test Suite %i - %s\n", suiteCounter, - (testSuite->name) ? testSuite->name : SDLTest_InvalidNameFormat); + (testSuite->name) ? testSuite->name : SDLTEST_INVALID_NAME_FORMAT); /* Loop over all test cases */ testCounter = 0; @@ -335,8 +335,8 @@ void SDLTest_LogTestSuiteSummary(SDLTest_TestSuiteReference *testSuites) testCase=(SDLTest_TestCaseReference *)testSuite->testCases[testCounter]; testCounter++; SDLTest_Log(" Test Case %i - %s: %s", testCounter, - (testCase->name) ? testCase->name : SDLTest_InvalidNameFormat, - (testCase->description) ? testCase->description : SDLTest_InvalidNameFormat); + (testCase->name) ? testCase->name : SDLTEST_INVALID_NAME_FORMAT, + (testCase->description) ? testCase->description : SDLTEST_INVALID_NAME_FORMAT); } } } @@ -396,7 +396,6 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user Uint32 testPassedCount = 0; Uint32 testSkippedCount = 0; Uint32 countSum = 0; - char *logFormat = (char *)SDLTest_LogSummaryFormat; SDLTest_TestCaseReference **failedTests; /* Sanitize test iterations */ @@ -493,7 +492,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user suiteCounter = 0; while(testSuites[suiteCounter]) { testSuite=(SDLTest_TestSuiteReference *)testSuites[suiteCounter]; - currentSuiteName = (char *)((testSuite->name) ? testSuite->name : SDLTest_InvalidNameFormat); + currentSuiteName = (char *)((testSuite->name) ? testSuite->name : SDLTEST_INVALID_NAME_FORMAT); suiteCounter++; /* Filter suite if flag set and we have a name */ @@ -523,7 +522,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user while(testSuite->testCases[testCounter]) { testCase=(SDLTest_TestCaseReference *)testSuite->testCases[testCounter]; - currentTestName = (char *)((testCase->name) ? testCase->name : SDLTest_InvalidNameFormat); + currentTestName = (char *)((testCase->name) ? testCase->name : SDLTEST_INVALID_NAME_FORMAT); testCounter++; /* Filter tests if flag set and we have a name */ @@ -551,7 +550,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user currentTestName); if (testCase->description != NULL && testCase->description[0] != '\0') { SDLTest_Log("Test Description: '%s'", - (testCase->description) ? testCase->description : SDLTest_InvalidNameFormat); + (testCase->description) ? testCase->description : SDLTEST_INVALID_NAME_FORMAT); } /* Loop over all iterations */ @@ -598,13 +597,13 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user /* Log final test result */ switch (testResult) { case TEST_RESULT_PASSED: - SDLTest_Log((char *)SDLTest_FinalResultFormat, "Test", currentTestName, "Passed"); + SDLTest_Log(SDLTEST_FINAL_RESULT_FORMAT, "Test", currentTestName, "Passed"); break; case TEST_RESULT_FAILED: - SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Test", currentTestName, "Failed"); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT, "Test", currentTestName, "Failed"); break; case TEST_RESULT_NO_ASSERT: - SDLTest_LogError((char *)SDLTest_FinalResultFormat,"Test", currentTestName, "No Asserts"); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT,"Test", currentTestName, "No Asserts"); break; } @@ -628,13 +627,13 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user countSum = testPassedCount + testFailedCount + testSkippedCount; if (testFailedCount == 0) { - SDLTest_Log(logFormat, "Suite", countSum, testPassedCount, testFailedCount, testSkippedCount); - SDLTest_Log((char *)SDLTest_FinalResultFormat, "Suite", currentSuiteName, "Passed"); + SDLTest_Log(SDLTEST_LOG_SUMMARY_FORMAT, "Suite", countSum, testPassedCount, testFailedCount, testSkippedCount); + SDLTest_Log(SDLTEST_FINAL_RESULT_FORMAT, "Suite", currentSuiteName, "Passed"); } else { - SDLTest_LogError(logFormat, "Suite", countSum, testPassedCount, testFailedCount, testSkippedCount); - SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Suite", currentSuiteName, "Failed"); + SDLTest_LogError(SDLTEST_LOG_SUMMARY_FORMAT, "Suite", countSum, testPassedCount, testFailedCount, testSkippedCount); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT, "Suite", currentSuiteName, "Failed"); } } @@ -653,14 +652,14 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user if (totalTestFailedCount == 0) { runResult = 0; - SDLTest_Log(logFormat, "Run", countSum, totalTestPassedCount, totalTestFailedCount, totalTestSkippedCount); - SDLTest_Log((char *)SDLTest_FinalResultFormat, "Run /w seed", runSeed, "Passed"); + SDLTest_Log(SDLTEST_LOG_SUMMARY_FORMAT, "Run", countSum, totalTestPassedCount, totalTestFailedCount, totalTestSkippedCount); + SDLTest_Log(SDLTEST_FINAL_RESULT_FORMAT, "Run /w seed", runSeed, "Passed"); } else { runResult = 1; - SDLTest_LogError(logFormat, "Run", countSum, totalTestPassedCount, totalTestFailedCount, totalTestSkippedCount); - SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Run /w seed", runSeed, "Failed"); + SDLTest_LogError(SDLTEST_LOG_SUMMARY_FORMAT, "Run", countSum, totalTestPassedCount, totalTestFailedCount, totalTestSkippedCount); + SDLTest_LogError(SDLTEST_FINAL_RESULT_FORMAT, "Run /w seed", runSeed, "Failed"); } /* Print repro steps for failed tests */ diff --git a/Engine/lib/sdl/src/test/SDL_test_log.c b/Engine/lib/sdl/src/test/SDL_test_log.c index 097372e7a..a2f857f26 100644 --- a/Engine/lib/sdl/src/test/SDL_test_log.c +++ b/Engine/lib/sdl/src/test/SDL_test_log.c @@ -55,12 +55,11 @@ char *SDLTest_TimestampToString(const time_t timestamp) time_t copy; static char buffer[64]; struct tm *local; - const char *fmt = "%x %X"; SDL_memset(buffer, 0, sizeof(buffer)); copy = timestamp; local = localtime(©); - strftime(buffer, sizeof(buffer), fmt, local); + strftime(buffer, sizeof(buffer), "%x %X", local); return buffer; } diff --git a/Engine/lib/sdl/src/thread/SDL_systhread.h b/Engine/lib/sdl/src/thread/SDL_systhread.h index f13f3e203..05a012536 100644 --- a/Engine/lib/sdl/src/thread/SDL_systhread.h +++ b/Engine/lib/sdl/src/thread/SDL_systhread.h @@ -60,6 +60,11 @@ extern SDL_TLSData *SDL_SYS_GetTLSData(); /* Set the thread local storage for this thread */ extern int SDL_SYS_SetTLSData(SDL_TLSData *data); +/* This is for internal SDL use, so we don't need #ifdefs everywhere. */ +extern SDL_Thread * +SDL_CreateThreadInternal(int (SDLCALL * fn) (void *), const char *name, + const size_t stacksize, void *data); + #endif /* _SDL_systhread_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/thread/SDL_thread.c b/Engine/lib/sdl/src/thread/SDL_thread.c index e66c5819c..ae865790a 100644 --- a/Engine/lib/sdl/src/thread/SDL_thread.c +++ b/Engine/lib/sdl/src/thread/SDL_thread.c @@ -26,6 +26,7 @@ #include "SDL_thread.h" #include "SDL_thread_c.h" #include "SDL_systhread.h" +#include "SDL_hints.h" #include "../SDL_error_c.h" @@ -304,15 +305,15 @@ SDL_RunThread(void *data) #endif #ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD -DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(int (SDLCALL * fn) (void *), - const char *name, void *data, +static SDL_Thread * +SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), + const char *name, const size_t stacksize, void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread) #else -DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(int (SDLCALL * fn) (void *), - const char *name, void *data) +static SDL_Thread * +SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *), + const char *name, const size_t stacksize, void *data) #endif { SDL_Thread *thread; @@ -362,6 +363,8 @@ SDL_CreateThread(int (SDLCALL * fn) (void *), return (NULL); } + thread->stacksize = stacksize; + /* Create the thread and go! */ #ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD ret = SDL_SYS_CreateThread(thread, args, pfnBeginThread, pfnEndThread); @@ -386,6 +389,50 @@ SDL_CreateThread(int (SDLCALL * fn) (void *), return (thread); } +#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD +DECLSPEC SDL_Thread *SDLCALL +SDL_CreateThread(int (SDLCALL * fn) (void *), + const char *name, void *data, + pfnSDL_CurrentBeginThread pfnBeginThread, + pfnSDL_CurrentEndThread pfnEndThread) +#else +DECLSPEC SDL_Thread *SDLCALL +SDL_CreateThread(int (SDLCALL * fn) (void *), + const char *name, void *data) +#endif +{ + /* !!! FIXME: in 2.1, just make stackhint part of the usual API. */ + const char *stackhint = SDL_GetHint(SDL_HINT_THREAD_STACK_SIZE); + size_t stacksize = 0; + + /* If the SDL_HINT_THREAD_STACK_SIZE exists, use it */ + if (stackhint != NULL) { + char *endp = NULL; + const Sint64 hintval = SDL_strtoll(stackhint, &endp, 10); + if ((*stackhint != '\0') && (*endp == '\0')) { /* a valid number? */ + if (hintval > 0) { /* reject bogus values. */ + stacksize = (size_t) hintval; + } + } + } + +#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD + return SDL_CreateThreadWithStackSize(fn, name, stacksize, data, pfnBeginThread, pfnEndThread); +#else + return SDL_CreateThreadWithStackSize(fn, name, stacksize, data); +#endif +} + +SDL_Thread * +SDL_CreateThreadInternal(int (SDLCALL * fn) (void *), const char *name, + const size_t stacksize, void *data) { +#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD + return SDL_CreateThreadWithStackSize(fn, name, stacksize, data, NULL, NULL); +#else + return SDL_CreateThreadWithStackSize(fn, name, stacksize, data); +#endif +} + SDL_threadID SDL_GetThreadID(SDL_Thread * thread) { diff --git a/Engine/lib/sdl/src/thread/SDL_thread_c.h b/Engine/lib/sdl/src/thread/SDL_thread_c.h index a283a0e2c..554325d6d 100644 --- a/Engine/lib/sdl/src/thread/SDL_thread_c.h +++ b/Engine/lib/sdl/src/thread/SDL_thread_c.h @@ -59,6 +59,7 @@ struct SDL_Thread SDL_atomic_t state; /* SDL_THREAD_STATE_* */ SDL_error errbuf; char *name; + size_t stacksize; /* 0 for default, >0 for user-specified stack size. */ void *data; }; diff --git a/Engine/lib/sdl/src/thread/psp/SDL_systhread.c b/Engine/lib/sdl/src/thread/psp/SDL_systhread.c index ab8aff376..c6003b8ed 100644 --- a/Engine/lib/sdl/src/thread/psp/SDL_systhread.c +++ b/Engine/lib/sdl/src/thread/psp/SDL_systhread.c @@ -52,8 +52,8 @@ int SDL_SYS_CreateThread(SDL_Thread *thread, void *args) priority = status.currentPriority; } - thread->handle = sceKernelCreateThread("SDL thread", ThreadEntry, - priority, 0x8000, + thread->handle = sceKernelCreateThread(thread->name, ThreadEntry, + priority, thread->stacksize ? ((int) thread->stacksize) : 0x8000, PSP_THREAD_ATTR_VFPU, NULL); if (thread->handle < 0) { return SDL_SetError("sceKernelCreateThread() failed"); diff --git a/Engine/lib/sdl/src/thread/pthread/SDL_systhread.c b/Engine/lib/sdl/src/thread/pthread/SDL_systhread.c index 22f7bd57b..4958f6fb9 100644 --- a/Engine/lib/sdl/src/thread/pthread/SDL_systhread.c +++ b/Engine/lib/sdl/src/thread/pthread/SDL_systhread.c @@ -45,7 +45,6 @@ #include "SDL_platform.h" #include "SDL_thread.h" -#include "SDL_hints.h" #include "../SDL_thread_c.h" #include "../SDL_systhread.h" #ifdef __ANDROID__ @@ -87,7 +86,6 @@ int SDL_SYS_CreateThread(SDL_Thread * thread, void *args) { pthread_attr_t type; - const char *hint = SDL_GetHint(SDL_HINT_THREAD_STACK_SIZE); /* do this here before any threads exist, so there's no race condition. */ #if defined(__MACOSX__) || defined(__IPHONEOS__) || defined(__LINUX__) @@ -108,12 +106,9 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args) } pthread_attr_setdetachstate(&type, PTHREAD_CREATE_JOINABLE); - /* If the SDL_HINT_THREAD_STACK_SIZE exists and it seems to be a positive number, use it */ - if (hint && hint[0] >= '0' && hint[0] <= '9') { - const size_t stacksize = (size_t) SDL_atoi(hint); - if (stacksize > 0) { - pthread_attr_setstacksize(&type, stacksize); - } + /* Set caller-requested stack size. Otherwise: use the system default. */ + if (thread->stacksize) { + pthread_attr_setstacksize(&type, (size_t) thread->stacksize); } /* Create the thread and go! */ @@ -127,10 +122,10 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args) void SDL_SYS_SetupThread(const char *name) { -#if !defined(__ANDROID__) && !defined(__NACL__) +#if !defined(__NACL__) int i; sigset_t mask; -#endif /* !__ANDROID__ && !__NACL__ */ +#endif /* !__NACL__ */ if (name != NULL) { #if defined(__MACOSX__) || defined(__IPHONEOS__) || defined(__LINUX__) @@ -160,14 +155,14 @@ SDL_SYS_SetupThread(const char *name) } /* NativeClient does not yet support signals.*/ -#if !defined(__ANDROID__) && !defined(__NACL__) +#if !defined(__NACL__) /* Mask asynchronous signals for this thread */ sigemptyset(&mask); for (i = 0; sig_list[i]; ++i) { sigaddset(&mask, sig_list[i]); } pthread_sigmask(SIG_BLOCK, &mask, 0); -#endif /* !__ANDROID__ && !__NACL__ */ +#endif /* !__NACL__ */ #ifdef PTHREAD_CANCEL_ASYNCHRONOUS @@ -204,6 +199,10 @@ SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority) if (setpriority(PRIO_PROCESS, syscall(SYS_gettid), value) < 0) { /* Note that this fails if you're trying to set high priority and you don't have root permission. BUT DON'T RUN AS ROOT! + + You can grant the ability to increase thread priority by + running the following command on your application binary: + sudo setcap 'cap_sys_nice=eip' */ return SDL_SetError("setpriority() failed"); } diff --git a/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread.cpp b/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread.cpp index 219c67e93..6e5ef473e 100644 --- a/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread.cpp +++ b/Engine/lib/sdl/src/thread/stdcpp/SDL_systhread.cpp @@ -48,6 +48,7 @@ int SDL_SYS_CreateThread(SDL_Thread * thread, void *args) { try { + // !!! FIXME: no way to set a thread stack size here. std::thread cpp_thread(RunThread, args); thread->handle = (void *) new std::thread(std::move(cpp_thread)); return 0; diff --git a/Engine/lib/sdl/src/thread/windows/SDL_systhread.c b/Engine/lib/sdl/src/thread/windows/SDL_systhread.c index 308145e30..20a4bd6e2 100644 --- a/Engine/lib/sdl/src/thread/windows/SDL_systhread.c +++ b/Engine/lib/sdl/src/thread/windows/SDL_systhread.c @@ -24,6 +24,7 @@ /* Win32 thread management routines for SDL */ +#include "SDL_hints.h" #include "SDL_thread.h" #include "../SDL_thread_c.h" #include "../SDL_systhread.h" @@ -33,6 +34,10 @@ /* We'll use the C library from this DLL */ #include +#ifndef STACK_SIZE_PARAM_IS_A_RESERVATION +#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 +#endif + /* Cygwin gcc-3 ... MingW64 (even with a i386 host) does this like MSVC. */ #if (defined(__MINGW32__) && (__GNUC__ < 4)) typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned, @@ -121,6 +126,7 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args) #endif /* SDL_PASSED_BEGINTHREAD_ENDTHREAD */ pThreadStartParms pThreadParms = (pThreadStartParms) SDL_malloc(sizeof(tThreadStartParms)); + const DWORD flags = thread->stacksize ? STACK_SIZE_PARAM_IS_A_RESERVATION : 0; if (!pThreadParms) { return SDL_OutOfMemory(); } @@ -129,15 +135,18 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args) /* Also save the real parameters we have to pass to thread function */ pThreadParms->args = args; + /* thread->stacksize == 0 means "system default", same as win32 expects */ if (pfnBeginThread) { unsigned threadid = 0; thread->handle = (SYS_ThreadHandle) - ((size_t) pfnBeginThread(NULL, 0, RunThreadViaBeginThreadEx, - pThreadParms, 0, &threadid)); + ((size_t) pfnBeginThread(NULL, (unsigned int) thread->stacksize, + RunThreadViaBeginThreadEx, + pThreadParms, flags, &threadid)); } else { DWORD threadid = 0; - thread->handle = CreateThread(NULL, 0, RunThreadViaCreateThread, - pThreadParms, 0, &threadid); + thread->handle = CreateThread(NULL, thread->stacksize, + RunThreadViaCreateThread, + pThreadParms, flags, &threadid); } if (thread->handle == NULL) { return SDL_SetError("Not enough resources to create thread"); @@ -145,9 +154,6 @@ SDL_SYS_CreateThread(SDL_Thread * thread, void *args) return 0; } -#if 0 /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */ -#ifdef _MSC_VER -#pragma warning(disable : 4733) #pragma pack(push,8) typedef struct tagTHREADNAME_INFO { @@ -158,48 +164,26 @@ typedef struct tagTHREADNAME_INFO } THREADNAME_INFO; #pragma pack(pop) -static EXCEPTION_DISPOSITION -ignore_exception(void *a, void *b, void *c, void *d) -{ - return ExceptionContinueExecution; -} -#endif -#endif - void SDL_SYS_SetupThread(const char *name) { - if (name != NULL) { - #if 0 /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */ - #if (defined(_MSC_VER) && defined(_M_IX86)) - /* This magic tells the debugger to name a thread if it's listening. - The inline asm sets up SEH (__try/__except) without C runtime - support. See Microsoft Systems Journal, January 1997: - http://www.microsoft.com/msj/0197/exception/exception.aspx */ - INT_PTR handler = (INT_PTR) ignore_exception; + if ((name != NULL) && IsDebuggerPresent()) { THREADNAME_INFO inf; + /* C# and friends will try to catch this Exception, let's avoid it. */ + if (SDL_GetHintBoolean(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, SDL_FALSE)) { + return; + } + + /* This magic tells the debugger to name a thread if it's listening. */ + SDL_zero(inf); inf.dwType = 0x1000; inf.szName = name; inf.dwThreadID = (DWORD) -1; inf.dwFlags = 0; - __asm { /* set up SEH */ - push handler - push fs:[0] - mov fs:[0],esp - } - - /* The program itself should ignore this bogus exception. */ - RaiseException(0x406D1388, 0, sizeof(inf)/sizeof(DWORD), (DWORD*)&inf); - - __asm { /* tear down SEH. */ - mov eax,[esp] - mov fs:[0], eax - add esp, 8 - } - #endif - #endif + /* The debugger catches this, renames the thread, continues on. */ + RaiseException(0x406D1388, 0, sizeof(inf) / sizeof(ULONG), (const ULONG_PTR*) &inf); } } @@ -230,11 +214,7 @@ SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority) void SDL_SYS_WaitThread(SDL_Thread * thread) { -#if __WINRT__ WaitForSingleObjectEx(thread->handle, INFINITE, FALSE); -#else - WaitForSingleObject(thread->handle, INFINITE); -#endif CloseHandle(thread->handle); } diff --git a/Engine/lib/sdl/src/timer/SDL_timer.c b/Engine/lib/sdl/src/timer/SDL_timer.c index 6189ab8b5..abe968e86 100644 --- a/Engine/lib/sdl/src/timer/SDL_timer.c +++ b/Engine/lib/sdl/src/timer/SDL_timer.c @@ -24,7 +24,7 @@ #include "SDL_timer_c.h" #include "SDL_atomic.h" #include "SDL_cpuinfo.h" -#include "SDL_thread.h" +#include "../thread/SDL_systhread.h" /* #define DEBUG_TIMERS */ @@ -35,7 +35,7 @@ typedef struct _SDL_Timer void *param; Uint32 interval; Uint32 scheduled; - volatile SDL_bool canceled; + SDL_atomic_t canceled; struct _SDL_Timer *next; } SDL_Timer; @@ -60,9 +60,9 @@ typedef struct { /* Data used to communicate with the timer thread */ SDL_SpinLock lock; SDL_sem *sem; - SDL_Timer * volatile pending; - SDL_Timer * volatile freelist; - volatile SDL_bool active; + SDL_Timer *pending; + SDL_Timer *freelist; + SDL_atomic_t active; /* List of timers - this is only touched by the timer thread */ SDL_Timer *timers; @@ -138,7 +138,7 @@ SDL_TimerThread(void *_data) freelist_tail = NULL; /* Check to see if we're still running, after maintenance */ - if (!data->active) { + if (!SDL_AtomicGet(&data->active)) { break; } @@ -160,7 +160,7 @@ SDL_TimerThread(void *_data) /* We're going to do something with this timer */ data->timers = current->next; - if (current->canceled) { + if (SDL_AtomicGet(¤t->canceled)) { interval = 0; } else { interval = current->callback(current->interval, current->param); @@ -179,7 +179,7 @@ SDL_TimerThread(void *_data) } freelist_tail = current; - current->canceled = SDL_TRUE; + SDL_AtomicSet(¤t->canceled, 1); } } @@ -207,7 +207,7 @@ SDL_TimerInit(void) { SDL_TimerData *data = &SDL_timer_data; - if (!data->active) { + if (!SDL_AtomicGet(&data->active)) { const char *name = "SDLTimer"; data->timermap_lock = SDL_CreateMutex(); if (!data->timermap_lock) { @@ -220,18 +220,10 @@ SDL_TimerInit(void) return -1; } - data->active = SDL_TRUE; - /* !!! FIXME: this is nasty. */ -#if defined(__WIN32__) && !defined(HAVE_LIBC) -#undef SDL_CreateThread -#if SDL_DYNAMIC_API - data->thread = SDL_CreateThread_REAL(SDL_TimerThread, name, data, NULL, NULL); -#else - data->thread = SDL_CreateThread(SDL_TimerThread, name, data, NULL, NULL); -#endif -#else - data->thread = SDL_CreateThread(SDL_TimerThread, name, data); -#endif + SDL_AtomicSet(&data->active, 1); + + /* Timer threads use a callback into the app, so we can't set a limited stack size here. */ + data->thread = SDL_CreateThreadInternal(SDL_TimerThread, name, 0, data); if (!data->thread) { SDL_TimerQuit(); return -1; @@ -249,9 +241,7 @@ SDL_TimerQuit(void) SDL_Timer *timer; SDL_TimerMap *entry; - if (data->active) { - data->active = SDL_FALSE; - + if (SDL_AtomicCAS(&data->active, 1, 0)) { /* active? Move to inactive. */ /* Shutdown the timer thread */ if (data->thread) { SDL_SemPost(data->sem); @@ -291,21 +281,14 @@ SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param) SDL_Timer *timer; SDL_TimerMap *entry; - if (!data->active) { - int status = 0; - - SDL_AtomicLock(&data->lock); - if (!data->active) { - status = SDL_TimerInit(); - } - SDL_AtomicUnlock(&data->lock); - - if (status < 0) { + SDL_AtomicLock(&data->lock); + if (!SDL_AtomicGet(&data->active)) { + if (SDL_TimerInit() < 0) { + SDL_AtomicUnlock(&data->lock); return 0; } } - SDL_AtomicLock(&data->lock); timer = data->freelist; if (timer) { data->freelist = timer->next; @@ -326,7 +309,7 @@ SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param) timer->param = param; timer->interval = interval; timer->scheduled = SDL_GetTicks() + interval; - timer->canceled = SDL_FALSE; + SDL_AtomicSet(&timer->canceled, 0); entry = (SDL_TimerMap *)SDL_malloc(sizeof(*entry)); if (!entry) { @@ -377,8 +360,8 @@ SDL_RemoveTimer(SDL_TimerID id) SDL_UnlockMutex(data->timermap_lock); if (entry) { - if (!entry->timer->canceled) { - entry->timer->canceled = SDL_TRUE; + if (!SDL_AtomicGet(&entry->timer->canceled)) { + SDL_AtomicSet(&entry->timer->canceled, 1); canceled = SDL_TRUE; } SDL_free(entry); diff --git a/Engine/lib/sdl/src/timer/windows/SDL_systimer.c b/Engine/lib/sdl/src/timer/windows/SDL_systimer.c index abfbcb99a..5c9121a51 100644 --- a/Engine/lib/sdl/src/timer/windows/SDL_systimer.c +++ b/Engine/lib/sdl/src/timer/windows/SDL_systimer.c @@ -107,10 +107,8 @@ SDL_TicksInit(void) void SDL_TicksQuit(void) { - if (!hires_timer_available) { - SDL_DelHintCallback(SDL_HINT_TIMER_RESOLUTION, - SDL_TimerResolutionChanged, NULL); - } + SDL_DelHintCallback(SDL_HINT_TIMER_RESOLUTION, + SDL_TimerResolutionChanged, NULL); SDL_SetSystemTimerResolution(0); /* always release our timer resolution request. */ @@ -189,6 +187,10 @@ SDL_Delay(Uint32 ms) } WaitForSingleObjectEx(mutex, ms, FALSE); #else + if (!ticks_started) { + SDL_TicksInit(); + } + Sleep(ms); #endif } diff --git a/Engine/lib/sdl/src/video/SDL_blit_copy.c b/Engine/lib/sdl/src/video/SDL_blit_copy.c index 7b9a91ffd..674650dd9 100644 --- a/Engine/lib/sdl/src/video/SDL_blit_copy.c +++ b/Engine/lib/sdl/src/video/SDL_blit_copy.c @@ -109,10 +109,20 @@ SDL_BlitCopy(SDL_BlitInfo * info) overlap = (src < (dst + h*dstskip)); } if (overlap) { - while (h--) { - SDL_memmove(dst, src, w); - src += srcskip; - dst += dstskip; + if ( dst < src ) { + while ( h-- ) { + SDL_memmove(dst, src, w); + src += srcskip; + dst += dstskip; + } + } else { + src += ((h-1) * srcskip); + dst += ((h-1) * dstskip); + while ( h-- ) { + SDL_memmove(dst, src, w); + src -= srcskip; + dst -= dstskip; + } } return; } diff --git a/Engine/lib/sdl/src/video/SDL_blit_slow.c b/Engine/lib/sdl/src/video/SDL_blit_slow.c index 3a462f6e2..02ab41de7 100644 --- a/Engine/lib/sdl/src/video/SDL_blit_slow.c +++ b/Engine/lib/sdl/src/video/SDL_blit_slow.c @@ -46,6 +46,8 @@ SDL_Blit_Slow(SDL_BlitInfo * info) SDL_PixelFormat *dst_fmt = info->dst_fmt; int srcbpp = src_fmt->BytesPerPixel; int dstbpp = dst_fmt->BytesPerPixel; + Uint32 rgbmask = ~src_fmt->Amask; + Uint32 ckey = info->colorkey & rgbmask; srcy = 0; posy = 0; @@ -85,7 +87,7 @@ SDL_Blit_Slow(SDL_BlitInfo * info) srcpixel = (srcR << src_fmt->Rshift) | (srcG << src_fmt->Gshift) | (srcB << src_fmt->Bshift); } - if (srcpixel == info->colorkey) { + if ((srcpixel & rgbmask) == ckey) { posx += incx; dst += dstbpp; continue; @@ -127,6 +129,7 @@ SDL_Blit_Slow(SDL_BlitInfo * info) dstR = srcR + ((255 - srcA) * dstR) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255; dstB = srcB + ((255 - srcA) * dstB) / 255; + dstA = srcA + ((255 - srcA) * dstA) / 255; break; case SDL_COPY_ADD: dstR = srcR + dstR; diff --git a/Engine/lib/sdl/src/video/SDL_bmp.c b/Engine/lib/sdl/src/video/SDL_bmp.c index f80f93696..2d9cf240b 100644 --- a/Engine/lib/sdl/src/video/SDL_bmp.c +++ b/Engine/lib/sdl/src/video/SDL_bmp.c @@ -32,6 +32,7 @@ This code currently supports Win32 DIBs in uncompressed 8 and 24 bpp. */ +#include "SDL_hints.h" #include "SDL_video.h" #include "SDL_assert.h" #include "SDL_endian.h" @@ -47,6 +48,11 @@ #define BI_BITFIELDS 3 #endif +/* Logical color space values for BMP files */ +#ifndef LCS_WINDOWS_COLOR_SPACE +/* 0x57696E20 == "Win " */ +#define LCS_WINDOWS_COLOR_SPACE 0x57696E20 +#endif static void CorrectAlphaChannel(SDL_Surface *surface) { @@ -457,6 +463,8 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) int i, pad; SDL_Surface *surface; Uint8 *bits; + SDL_bool save32bit = SDL_FALSE; + SDL_bool saveLegacyBMP = SDL_FALSE; /* The Win32 BMP file header (14 bytes) */ char magic[2] = { 'B', 'M' }; @@ -478,14 +486,24 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) Uint32 biClrUsed; Uint32 biClrImportant; + /* The additional header members from the Win32 BITMAPV4HEADER struct (108 bytes in total) */ + Uint32 bV4RedMask = 0; + Uint32 bV4GreenMask = 0; + Uint32 bV4BlueMask = 0; + Uint32 bV4AlphaMask = 0; + Uint32 bV4CSType = 0; + Sint32 bV4Endpoints[3 * 3] = {0}; + Uint32 bV4GammaRed = 0; + Uint32 bV4GammaGreen = 0; + Uint32 bV4GammaBlue = 0; + /* Make sure we have somewhere to save */ surface = NULL; if (dst) { - SDL_bool save32bit = SDL_FALSE; #ifdef SAVE_32BIT_BMP /* We can save alpha information in a 32-bit BMP */ - if (saveme->map->info.flags & SDL_COPY_COLORKEY || - saveme->format->Amask) { + if (saveme->format->BitsPerPixel >= 8 && (saveme->format->Amask || + saveme->map->info.flags & SDL_COPY_COLORKEY)) { save32bit = SDL_TRUE; } #endif /* SAVE_32BIT_BMP */ @@ -497,7 +515,7 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) SDL_SetError("%d bpp BMP files not supported", saveme->format->BitsPerPixel); } - } else if ((saveme->format->BitsPerPixel == 24) && + } else if ((saveme->format->BitsPerPixel == 24) && !save32bit && #if SDL_BYTEORDER == SDL_LIL_ENDIAN (saveme->format->Rmask == 0x00FF0000) && (saveme->format->Gmask == 0x0000FF00) && @@ -515,13 +533,7 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) /* If the surface has a colorkey or alpha channel we'll save a 32-bit BMP with alpha channel, otherwise save a 24-bit BMP. */ if (save32bit) { - SDL_InitFormat(&format, -#if SDL_BYTEORDER == SDL_LIL_ENDIAN - SDL_PIXELFORMAT_ARGB8888 -#else - SDL_PIXELFORMAT_BGRA8888 -#endif - ); + SDL_InitFormat(&format, SDL_PIXELFORMAT_BGRA32); } else { SDL_InitFormat(&format, SDL_PIXELFORMAT_BGR24); } @@ -537,6 +549,10 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) return -1; } + if (save32bit) { + saveLegacyBMP = SDL_GetHintBoolean(SDL_HINT_BMP_SAVE_LEGACY_FORMAT, SDL_FALSE); + } + if (surface && (SDL_LockSurface(surface) == 0)) { const int bw = surface->w * surface->format->BytesPerPixel; @@ -572,6 +588,21 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) } biClrImportant = 0; + /* Set the BMP info values for the version 4 header */ + if (save32bit && !saveLegacyBMP) { + biSize = 108; + biCompression = BI_BITFIELDS; + /* The BMP format is always little endian, these masks stay the same */ + bV4RedMask = 0x00ff0000; + bV4GreenMask = 0x0000ff00; + bV4BlueMask = 0x000000ff; + bV4AlphaMask = 0xff000000; + bV4CSType = LCS_WINDOWS_COLOR_SPACE; + bV4GammaRed = 0; + bV4GammaGreen = 0; + bV4GammaBlue = 0; + } + /* Write the BMP info values */ SDL_WriteLE32(dst, biSize); SDL_WriteLE32(dst, biWidth); @@ -585,6 +616,21 @@ SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst) SDL_WriteLE32(dst, biClrUsed); SDL_WriteLE32(dst, biClrImportant); + /* Write the BMP info values for the version 4 header */ + if (save32bit && !saveLegacyBMP) { + SDL_WriteLE32(dst, bV4RedMask); + SDL_WriteLE32(dst, bV4GreenMask); + SDL_WriteLE32(dst, bV4BlueMask); + SDL_WriteLE32(dst, bV4AlphaMask); + SDL_WriteLE32(dst, bV4CSType); + for (i = 0; i < 3 * 3; i++) { + SDL_WriteLE32(dst, bV4Endpoints[i]); + } + SDL_WriteLE32(dst, bV4GammaRed); + SDL_WriteLE32(dst, bV4GammaGreen); + SDL_WriteLE32(dst, bV4GammaBlue); + } + /* Write the palette (in BGR color order) */ if (surface->format->palette) { SDL_Color *colors; diff --git a/Engine/lib/sdl/src/video/SDL_egl.c b/Engine/lib/sdl/src/video/SDL_egl.c index bfd4affb9..c90380566 100644 --- a/Engine/lib/sdl/src/video/SDL_egl.c +++ b/Engine/lib/sdl/src/video/SDL_egl.c @@ -161,7 +161,7 @@ int SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_display) { void *dll_handle = NULL, *egl_dll_handle = NULL; /* The naming is counter intuitive, but hey, I just work here -- Gabriel */ - char *path = NULL; + const char *path = NULL; #if SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_WINRT const char *d3dcompiler; #endif @@ -558,7 +558,8 @@ int SDL_EGL_GetSwapInterval(_THIS) { if (!_this->egl_data) { - return SDL_SetError("EGL not initialized"); + SDL_SetError("EGL not initialized"); + return 0; } return _this->egl_data->egl_swapinterval; diff --git a/Engine/lib/sdl/src/video/SDL_surface.c b/Engine/lib/sdl/src/video/SDL_surface.c index dae07f285..9d52e5ca4 100644 --- a/Engine/lib/sdl/src/video/SDL_surface.c +++ b/Engine/lib/sdl/src/video/SDL_surface.c @@ -27,27 +27,20 @@ #include "SDL_pixels_c.h" /* Public routines */ + /* - * Create an empty RGB surface of the appropriate depth + * Create an empty RGB surface of the appropriate depth using the given + * enum SDL_PIXELFORMAT_* format */ SDL_Surface * -SDL_CreateRGBSurface(Uint32 flags, - int width, int height, int depth, - Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask) +SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth, + Uint32 format) { SDL_Surface *surface; - Uint32 format; /* The flags are no longer used, make the compiler happy */ (void)flags; - /* Get the pixel format */ - format = SDL_MasksToPixelFormatEnum(depth, Rmask, Gmask, Bmask, Amask); - if (format == SDL_PIXELFORMAT_UNKNOWN) { - SDL_SetError("Unknown pixel format"); - return NULL; - } - /* Allocate the surface */ surface = (SDL_Surface *) SDL_calloc(1, sizeof(*surface)); if (surface == NULL) { @@ -105,7 +98,7 @@ SDL_CreateRGBSurface(Uint32 flags, } /* By default surface with an alpha mask are set up for blending */ - if (Amask) { + if (surface->format->Amask) { SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND); } @@ -114,6 +107,26 @@ SDL_CreateRGBSurface(Uint32 flags, return surface; } +/* + * Create an empty RGB surface of the appropriate depth + */ +SDL_Surface * +SDL_CreateRGBSurface(Uint32 flags, + int width, int height, int depth, + Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask) +{ + Uint32 format; + + /* Get the pixel format */ + format = SDL_MasksToPixelFormatEnum(depth, Rmask, Gmask, Bmask, Amask); + if (format == SDL_PIXELFORMAT_UNKNOWN) { + SDL_SetError("Unknown pixel format"); + return NULL; + } + + return SDL_CreateRGBSurfaceWithFormat(flags, width, height, depth, format); +} + /* * Create an RGB surface from an existing memory buffer */ @@ -125,8 +138,30 @@ SDL_CreateRGBSurfaceFrom(void *pixels, { SDL_Surface *surface; - surface = - SDL_CreateRGBSurface(0, 0, 0, depth, Rmask, Gmask, Bmask, Amask); + surface = SDL_CreateRGBSurface(0, 0, 0, depth, Rmask, Gmask, Bmask, Amask); + if (surface != NULL) { + surface->flags |= SDL_PREALLOC; + surface->pixels = pixels; + surface->w = width; + surface->h = height; + surface->pitch = pitch; + SDL_SetClipRect(surface, NULL); + } + return surface; +} + +/* + * Create an RGB surface from an existing memory buffer using the given given + * enum SDL_PIXELFORMAT_* format + */ +SDL_Surface * +SDL_CreateRGBSurfaceWithFormatFrom(void *pixels, + int width, int height, int depth, int pitch, + Uint32 format) +{ + SDL_Surface *surface; + + surface = SDL_CreateRGBSurfaceWithFormat(0, 0, 0, depth, format); if (surface != NULL) { surface->flags |= SDL_PREALLOC; surface->pixels = pixels; diff --git a/Engine/lib/sdl/src/video/SDL_sysvideo.h b/Engine/lib/sdl/src/video/SDL_sysvideo.h index 77426c3eb..cd2ed2a7e 100644 --- a/Engine/lib/sdl/src/video/SDL_sysvideo.h +++ b/Engine/lib/sdl/src/video/SDL_sysvideo.h @@ -86,6 +86,8 @@ struct SDL_Window SDL_DisplayMode fullscreen_mode; + float opacity; + float brightness; Uint16 *gamma; Uint16 *saved_gamma; /* (just offset into gamma) */ @@ -95,6 +97,7 @@ struct SDL_Window SDL_bool is_hiding; SDL_bool is_destroying; + SDL_bool is_dropping; /* drag/drop in progress, expecting SDL_SendDropComplete(). */ SDL_WindowShaper *shaper; @@ -175,6 +178,11 @@ struct SDL_VideoDevice */ int (*GetDisplayDPI) (_THIS, SDL_VideoDisplay * display, float * ddpi, float * hdpi, float * vdpi); + /* + * Get the usable bounds of a display (bounds minus menubar or whatever) + */ + int (*GetDisplayUsableBounds) (_THIS, SDL_VideoDisplay * display, SDL_Rect * rect); + /* * Get a list of the available display modes for a display. */ @@ -200,6 +208,10 @@ struct SDL_VideoDevice void (*SetWindowSize) (_THIS, SDL_Window * window); void (*SetWindowMinimumSize) (_THIS, SDL_Window * window); void (*SetWindowMaximumSize) (_THIS, SDL_Window * window); + int (*GetWindowBordersSize) (_THIS, SDL_Window * window, int *top, int *left, int *bottom, int *right); + int (*SetWindowOpacity) (_THIS, SDL_Window * window, float opacity); + int (*SetWindowModalFor) (_THIS, SDL_Window * modal_window, SDL_Window * parent_window); + int (*SetWindowInputFocus) (_THIS, SDL_Window * window); void (*ShowWindow) (_THIS, SDL_Window * window); void (*HideWindow) (_THIS, SDL_Window * window); void (*RaiseWindow) (_THIS, SDL_Window * window); @@ -207,6 +219,7 @@ struct SDL_VideoDevice void (*MinimizeWindow) (_THIS, SDL_Window * window); void (*RestoreWindow) (_THIS, SDL_Window * window); void (*SetWindowBordered) (_THIS, SDL_Window * window, SDL_bool bordered); + void (*SetWindowResizable) (_THIS, SDL_Window * window, SDL_bool resizable); void (*SetWindowFullscreen) (_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen); int (*SetWindowGammaRamp) (_THIS, SDL_Window * window, const Uint16 * ramp); int (*GetWindowGammaRamp) (_THIS, SDL_Window * window, Uint16 * ramp); diff --git a/Engine/lib/sdl/src/video/SDL_video.c b/Engine/lib/sdl/src/video/SDL_video.c index 511b4c087..0a21ef5fc 100644 --- a/Engine/lib/sdl/src/video/SDL_video.c +++ b/Engine/lib/sdl/src/video/SDL_video.c @@ -55,6 +55,10 @@ #undef CreateWindow #endif +#ifdef __EMSCRIPTEN__ +#include +#endif + /* Available video drivers */ static VideoBootStrap *bootstrap[] = { #if SDL_VIDEO_DRIVER_COCOA @@ -177,7 +181,7 @@ ShouldUseTextureFramebuffer() /* See if the user or application wants a specific behavior */ hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION); if (hint) { - if (*hint == '0') { + if (*hint == '0' || SDL_strcasecmp(hint, "false") == 0) { return SDL_FALSE; } else { return SDL_TRUE; @@ -254,6 +258,8 @@ SDL_CreateWindowTexture(SDL_VideoDevice *unused, SDL_Window * window, Uint32 * f /* Check to see if there's a specific driver requested */ if (hint && *hint != '0' && *hint != '1' && + SDL_strcasecmp(hint, "true") != 0 && + SDL_strcasecmp(hint, "false") != 0 && SDL_strcasecmp(hint, "software") != 0) { for (i = 0; i < SDL_GetNumRenderDrivers(); ++i) { SDL_RendererInfo info; @@ -443,10 +449,8 @@ int SDL_VideoInit(const char *driver_name) { SDL_VideoDevice *video; - const char *hint; int index; int i; - SDL_bool allow_screensaver; /* Check to make sure we don't overwrite '_this' */ if (_this != NULL) { @@ -534,13 +538,7 @@ SDL_VideoInit(const char *driver_name) joystick, or passively watching a movie. Things that use SDL but function more like a normal desktop app should explicitly reenable the screensaver. */ - hint = SDL_GetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER); - if (hint) { - allow_screensaver = SDL_atoi(hint) ? SDL_TRUE : SDL_FALSE; - } else { - allow_screensaver = SDL_FALSE; - } - if (!allow_screensaver) { + if (!SDL_GetHintBoolean(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, SDL_FALSE)) { SDL_DisableScreenSaver(); } @@ -684,7 +682,26 @@ SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect) rect->w = display->current_mode.w; rect->h = display->current_mode.h; } - return 0; + return 0; /* !!! FIXME: should this be an error if (rect==NULL) ? */ +} + +int SDL_GetDisplayUsableBounds(int displayIndex, SDL_Rect * rect) +{ + CHECK_DISPLAY_INDEX(displayIndex, -1); + + if (rect) { + SDL_VideoDisplay *display = &_this->displays[displayIndex]; + + if (_this->GetDisplayUsableBounds) { + if (_this->GetDisplayUsableBounds(_this, display, rect) == 0) { + return 0; + } + } + + /* Oh well, just give the entire display bounds. */ + return SDL_GetDisplayBounds(displayIndex, rect); + } + return 0; /* !!! FIXME: should this be an error if (rect==NULL) ? */ } int @@ -700,7 +717,9 @@ SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi) if (_this->GetDisplayDPI(_this, display, ddpi, hdpi, vdpi) == 0) { return 0; } - } + } else { + return SDL_Unsupported(); + } return -1; } @@ -1285,16 +1304,11 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen) } #define CREATE_FLAGS \ - (SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI) + (SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_ALWAYS_ON_TOP | SDL_WINDOW_SKIP_TASKBAR | SDL_WINDOW_POPUP_MENU | SDL_WINDOW_UTILITY | SDL_WINDOW_TOOLTIP) static void SDL_FinishWindowCreation(SDL_Window *window, Uint32 flags) { - window->windowed.x = window->x; - window->windowed.y = window->y; - window->windowed.w = window->w; - window->windowed.h = window->h; - if (flags & SDL_WINDOW_MAXIMIZED) { SDL_MaximizeWindow(window); } @@ -1316,7 +1330,6 @@ SDL_Window * SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags) { SDL_Window *window; - const char *hint; if (!_this) { /* Initialize the video system if needed */ @@ -1325,6 +1338,11 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags) } } + if ( (((flags & SDL_WINDOW_UTILITY) != 0) + ((flags & SDL_WINDOW_TOOLTIP) != 0) + ((flags & SDL_WINDOW_POPUP_MENU) != 0)) > 1 ) { + SDL_SetError("Conflicting window flags specified"); + return NULL; + } + /* Some platforms can't create zero-sized windows */ if (w < 1) { w = 1; @@ -1341,7 +1359,9 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags) /* Some platforms have OpenGL enabled by default */ #if (SDL_VIDEO_OPENGL && __MACOSX__) || __IPHONEOS__ || __ANDROID__ || __NACL__ - flags |= SDL_WINDOW_OPENGL; + if (SDL_strcmp(_this->name, "dummy") != 0) { + flags |= SDL_WINDOW_OPENGL; + } #endif if (flags & SDL_WINDOW_OPENGL) { if (!_this->GL_CreateContext) { @@ -1357,8 +1377,7 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags) * SDL_WINDOW_ALLOW_HIGHDPI flag. */ if (flags & SDL_WINDOW_ALLOW_HIGHDPI) { - hint = SDL_GetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED); - if (hint && SDL_atoi(hint) > 0) { + if (SDL_GetHintBoolean(SDL_HINT_VIDEO_HIGHDPI_DISABLED, SDL_FALSE)) { flags &= ~SDL_WINDOW_ALLOW_HIGHDPI; } } @@ -1389,8 +1408,28 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags) window->y = bounds.y + (bounds.h - h) / 2; } } + window->windowed.x = window->x; + window->windowed.y = window->y; + window->windowed.w = window->w; + window->windowed.h = window->h; + + if (flags & SDL_WINDOW_FULLSCREEN) { + SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); + int displayIndex; + SDL_Rect bounds; + + displayIndex = SDL_GetIndexOfDisplay(display); + SDL_GetDisplayBounds(displayIndex, &bounds); + + window->x = bounds.x; + window->y = bounds.y; + window->w = bounds.w; + window->h = bounds.h; + } + window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN); window->last_fullscreen_flags = window->flags; + window->opacity = 1.0f; window->brightness = 1.0f; window->next = _this->windows; window->is_destroying = SDL_FALSE; @@ -1451,6 +1490,7 @@ SDL_CreateWindowFrom(const void *data) window->flags = SDL_WINDOW_FOREIGN; window->last_fullscreen_flags = window->flags; window->is_destroying = SDL_FALSE; + window->opacity = 1.0f; window->brightness = 1.0f; window->next = _this->windows; if (_this->windows) { @@ -1795,6 +1835,24 @@ SDL_SetWindowBordered(SDL_Window * window, SDL_bool bordered) } } +void +SDL_SetWindowResizable(SDL_Window * window, SDL_bool resizable) +{ + CHECK_WINDOW_MAGIC(window,); + if (!(window->flags & SDL_WINDOW_FULLSCREEN)) { + const int want = (resizable != SDL_FALSE); /* normalize the flag. */ + const int have = ((window->flags & SDL_WINDOW_RESIZABLE) != 0); + if ((want != have) && (_this->SetWindowResizable)) { + if (want) { + window->flags |= SDL_WINDOW_RESIZABLE; + } else { + window->flags &= ~SDL_WINDOW_RESIZABLE; + } + _this->SetWindowResizable(_this, window, (SDL_bool) want); + } + } +} + void SDL_SetWindowSize(SDL_Window * window, int w, int h) { @@ -1883,6 +1941,28 @@ SDL_SetWindowMinimumSize(SDL_Window * window, int min_w, int min_h) } } +int +SDL_GetWindowBordersSize(SDL_Window * window, int *top, int *left, int *bottom, int *right) +{ + int dummy = 0; + + if (!top) { top = &dummy; } + if (!left) { left = &dummy; } + if (!right) { right = &dummy; } + if (!bottom) { bottom = &dummy; } + + /* Always initialize, so applications don't have to care */ + *top = *left = *bottom = *right = 0; + + CHECK_WINDOW_MAGIC(window, -1); + + if (!_this->GetWindowBordersSize) { + return SDL_Unsupported(); + } + + return _this->GetWindowBordersSize(_this, window, top, left, bottom, right); +} + void SDL_GetWindowMinimumSize(SDL_Window * window, int *min_w, int *min_h) { @@ -2144,6 +2224,68 @@ SDL_GetWindowBrightness(SDL_Window * window) return window->brightness; } +int +SDL_SetWindowOpacity(SDL_Window * window, float opacity) +{ + int retval; + CHECK_WINDOW_MAGIC(window, -1); + + if (!_this->SetWindowOpacity) { + return SDL_Unsupported(); + } + + if (opacity < 0.0f) { + opacity = 0.0f; + } else if (opacity > 1.0f) { + opacity = 1.0f; + } + + retval = _this->SetWindowOpacity(_this, window, opacity); + if (retval == 0) { + window->opacity = opacity; + } + + return retval; +} + +int +SDL_GetWindowOpacity(SDL_Window * window, float * out_opacity) +{ + CHECK_WINDOW_MAGIC(window, -1); + + if (out_opacity) { + *out_opacity = window->opacity; + } + + return 0; +} + +int +SDL_SetWindowModalFor(SDL_Window * modal_window, SDL_Window * parent_window) +{ + CHECK_WINDOW_MAGIC(modal_window, -1); + CHECK_WINDOW_MAGIC(parent_window, -1); + + if (!_this->SetWindowModalFor) { + return SDL_Unsupported(); + } + + return _this->SetWindowModalFor(_this, modal_window, parent_window); +} + +int +SDL_SetWindowInputFocus(SDL_Window * window) +{ + CHECK_WINDOW_MAGIC(window, -1); + + if (!_this->SetWindowInputFocus) { + return SDL_Unsupported(); + } + + return _this->SetWindowInputFocus(_this, window); +} + + int SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * red, const Uint16 * green, @@ -2359,8 +2501,6 @@ SDL_OnWindowFocusGained(SDL_Window * window) static SDL_bool ShouldMinimizeOnFocusLoss(SDL_Window * window) { - const char *hint; - if (!(window->flags & SDL_WINDOW_FULLSCREEN) || window->is_destroying) { return SDL_FALSE; } @@ -2371,16 +2511,7 @@ ShouldMinimizeOnFocusLoss(SDL_Window * window) } #endif - hint = SDL_GetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS); - if (hint) { - if (*hint == '0') { - return SDL_FALSE; - } else { - return SDL_TRUE; - } - } - - return SDL_TRUE; + return SDL_GetHintBoolean(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, SDL_TRUE); } void @@ -3596,6 +3727,16 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) int SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window) { +#ifdef __EMSCRIPTEN__ + /* !!! FIXME: propose a browser API for this, get this #ifdef out of here? */ + /* Web browsers don't (currently) have an API for a custom message box + that can block, but for the most common case (SDL_ShowSimpleMessageBox), + we can use the standard Javascript alert() function. */ + EM_ASM_({ + alert(UTF8ToString($0) + "\n\n" + UTF8ToString($1)); + }, title, message); + return 0; +#else SDL_MessageBoxData data; SDL_MessageBoxButtonData button; @@ -3613,20 +3754,13 @@ SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, S button.text = "OK"; return SDL_ShowMessageBox(&data, NULL); +#endif } SDL_bool SDL_ShouldAllowTopmost(void) { - const char *hint = SDL_GetHint(SDL_HINT_ALLOW_TOPMOST); - if (hint) { - if (*hint == '0') { - return SDL_FALSE; - } else { - return SDL_TRUE; - } - } - return SDL_TRUE; + return SDL_GetHintBoolean(SDL_HINT_ALLOW_TOPMOST, SDL_TRUE); } int diff --git a/Engine/lib/sdl/src/video/android/SDL_androidevents.c b/Engine/lib/sdl/src/video/android/SDL_androidevents.c index 326361af0..c3cd4cc1b 100644 --- a/Engine/lib/sdl/src/video/android/SDL_androidevents.c +++ b/Engine/lib/sdl/src/video/android/SDL_androidevents.c @@ -34,11 +34,11 @@ void android_egl_context_backup(); void android_egl_context_restore(); #if SDL_AUDIO_DRIVER_ANDROID -void AndroidAUD_ResumeDevices(void); -void AndroidAUD_PauseDevices(void); +void ANDROIDAUDIO_ResumeDevices(void); +void ANDROIDAUDIO_PauseDevices(void); #else -static void AndroidAUD_ResumeDevices(void) {} -static void AndroidAUD_PauseDevices(void) {} +static void ANDROIDAUDIO_ResumeDevices(void) {} +static void ANDROIDAUDIO_PauseDevices(void) {} #endif void @@ -83,14 +83,14 @@ Android_PumpEvents(_THIS) if (isPaused && !isPausing) { /* Make sure this is the last thing we do before pausing */ android_egl_context_backup(); - AndroidAUD_PauseDevices(); + ANDROIDAUDIO_PauseDevices(); if(SDL_SemWait(Android_ResumeSem) == 0) { #else if (isPaused) { if(SDL_SemTryWait(Android_ResumeSem) == 0) { #endif isPaused = 0; - AndroidAUD_ResumeDevices(); + ANDROIDAUDIO_ResumeDevices(); /* Restore the GL Context from here, as this operation is thread dependent */ if (!SDL_HasEvent(SDL_QUIT)) { android_egl_context_restore(); @@ -113,7 +113,7 @@ Android_PumpEvents(_THIS) #else if(SDL_SemTryWait(Android_PauseSem) == 0) { android_egl_context_backup(); - AndroidAUD_PauseDevices(); + ANDROIDAUDIO_PauseDevices(); isPaused = 1; } #endif diff --git a/Engine/lib/sdl/src/video/android/SDL_androidkeyboard.c b/Engine/lib/sdl/src/video/android/SDL_androidkeyboard.c index dc8951ff9..652e0cca7 100644 --- a/Engine/lib/sdl/src/video/android/SDL_androidkeyboard.c +++ b/Engine/lib/sdl/src/video/android/SDL_androidkeyboard.c @@ -304,18 +304,22 @@ static SDL_Scancode Android_Keycodes[] = { SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NAVIGATE_NEXT */ SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NAVIGATE_IN */ SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NAVIGATE_OUT */ - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, - SDL_SCANCODE_UNKNOWN, + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STEM_PRIMARY */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STEM_1 */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STEM_2 */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STEM_3 */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_DPAD_UP_LEFT */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_DPAD_DOWN_LEFT */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_DPAD_UP_RIGHT */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_DPAD_DOWN_RIGHT */ SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_SKIP_FORWARD */ SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_SKIP_BACKWARD */ SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_STEP_FORWARD */ SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_STEP_BACKWARD */ + SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_SLEEP */ + SDL_SCANCODE_CUT, /* AKEYCODE_CUT */ + SDL_SCANCODE_COPY, /* AKEYCODE_COPY */ + SDL_SCANCODE_PASTE, /* AKEYCODE_PASTE */ }; static SDL_Scancode diff --git a/Engine/lib/sdl/src/video/android/SDL_androidmouse.c b/Engine/lib/sdl/src/video/android/SDL_androidmouse.c index 3e9c0aff5..883fa8d22 100644 --- a/Engine/lib/sdl/src/video/android/SDL_androidmouse.c +++ b/Engine/lib/sdl/src/video/android/SDL_androidmouse.c @@ -32,15 +32,24 @@ #define ACTION_DOWN 0 #define ACTION_UP 1 +#define ACTION_MOVE 2 #define ACTION_HOVER_MOVE 7 #define ACTION_SCROLL 8 #define BUTTON_PRIMARY 1 #define BUTTON_SECONDARY 2 #define BUTTON_TERTIARY 4 +#define BUTTON_BACK 8 +#define BUTTON_FORWARD 16 + +static Uint8 SDLButton; + +void +Android_InitMouse(void) +{ + SDLButton = 0; +} void Android_OnMouse( int androidButton, int action, float x, float y) { - static Uint8 SDLButton; - if (!Android_Window) { return; } @@ -53,6 +62,10 @@ void Android_OnMouse( int androidButton, int action, float x, float y) { SDLButton = SDL_BUTTON_RIGHT; } else if (androidButton == BUTTON_TERTIARY) { SDLButton = SDL_BUTTON_MIDDLE; + } else if (androidButton == BUTTON_FORWARD) { + SDLButton = SDL_BUTTON_X1; + } else if (androidButton == BUTTON_BACK) { + SDLButton = SDL_BUTTON_X2; } SDL_SendMouseMotion(Android_Window, 0, 0, x, y); SDL_SendMouseButton(Android_Window, 0, SDL_PRESSED, SDLButton); @@ -65,6 +78,7 @@ void Android_OnMouse( int androidButton, int action, float x, float y) { SDL_SendMouseButton(Android_Window, 0, SDL_RELEASED, SDLButton); break; + case ACTION_MOVE: case ACTION_HOVER_MOVE: SDL_SendMouseMotion(Android_Window, 0, 0, x, y); break; diff --git a/Engine/lib/sdl/src/video/android/SDL_androidmouse.h b/Engine/lib/sdl/src/video/android/SDL_androidmouse.h index 9b68eed57..a64e06d51 100644 --- a/Engine/lib/sdl/src/video/android/SDL_androidmouse.h +++ b/Engine/lib/sdl/src/video/android/SDL_androidmouse.h @@ -24,6 +24,7 @@ #include "SDL_androidvideo.h" +extern void Android_InitMouse(void); extern void Android_OnMouse( int button, int action, float x, float y); #endif /* _SDL_androidmouse_h */ diff --git a/Engine/lib/sdl/src/video/android/SDL_androidtouch.c b/Engine/lib/sdl/src/video/android/SDL_androidtouch.c index a6e0b896a..0ff11ef57 100644 --- a/Engine/lib/sdl/src/video/android/SDL_androidtouch.c +++ b/Engine/lib/sdl/src/video/android/SDL_androidtouch.c @@ -50,7 +50,7 @@ static void Android_GetWindowCoordinates(float x, float y, *window_y = (int)(y * window_h); } -static volatile SDL_bool separate_mouse_and_touch = SDL_FALSE; +static SDL_bool separate_mouse_and_touch = SDL_FALSE; static void SeparateEventsHintWatcher(void *userdata, const char *name, diff --git a/Engine/lib/sdl/src/video/android/SDL_androidvideo.c b/Engine/lib/sdl/src/video/android/SDL_androidvideo.c index e14b96641..178a3e691 100644 --- a/Engine/lib/sdl/src/video/android/SDL_androidvideo.c +++ b/Engine/lib/sdl/src/video/android/SDL_androidvideo.c @@ -36,6 +36,7 @@ #include "SDL_androidclipboard.h" #include "SDL_androidevents.h" #include "SDL_androidkeyboard.h" +#include "SDL_androidmouse.h" #include "SDL_androidtouch.h" #include "SDL_androidwindow.h" @@ -181,6 +182,8 @@ Android_VideoInit(_THIS) Android_InitTouch(); + Android_InitMouse(); + /* We're done! */ return 0; } @@ -191,7 +194,6 @@ Android_VideoQuit(_THIS) Android_QuitTouch(); } -/* This function gets called before VideoInit() */ void Android_SetScreenResolution(int width, int height, Uint32 format, float rate) { @@ -200,8 +202,33 @@ Android_SetScreenResolution(int width, int height, Uint32 format, float rate) Android_ScreenFormat = format; Android_ScreenRate = rate; + /* + Update the resolution of the desktop mode, so that the window + can be properly resized. The screen resolution change can for + example happen when the Activity enters or exists immersive mode, + which can happen after VideoInit(). + */ + SDL_VideoDevice* device = SDL_GetVideoDevice(); + if (device && device->num_displays > 0) + { + SDL_VideoDisplay* display = &device->displays[0]; + display->desktop_mode.format = Android_ScreenFormat; + display->desktop_mode.w = Android_ScreenWidth; + display->desktop_mode.h = Android_ScreenHeight; + display->desktop_mode.refresh_rate = Android_ScreenRate; + } + if (Android_Window) { SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESIZED, width, height); + + /* Force the current mode to match the resize otherwise the SDL_WINDOWEVENT_RESTORED event + * will fall back to the old mode */ + SDL_VideoDisplay *display = SDL_GetDisplayForWindow(Android_Window); + + display->current_mode.format = format; + display->current_mode.w = width; + display->current_mode.h = height; + display->current_mode.refresh_rate = rate; } } diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoaclipboard.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoaclipboard.m index 015d77106..fd8680925 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoaclipboard.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoaclipboard.m @@ -25,23 +25,13 @@ #include "SDL_cocoavideo.h" #include "../../events/SDL_clipboardevents_c.h" -static NSString * -GetTextFormat(_THIS) -{ - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) { - return NSPasteboardTypeString; - } else { - return NSStringPboardType; - } -} - int Cocoa_SetClipboardText(_THIS, const char *text) { @autoreleasepool { SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; NSPasteboard *pasteboard; - NSString *format = GetTextFormat(_this); + NSString *format = NSPasteboardTypeString; pasteboard = [NSPasteboard generalPasteboard]; data->clipboard_count = [pasteboard declareTypes:[NSArray arrayWithObject:format] owner:nil]; @@ -55,12 +45,12 @@ Cocoa_GetClipboardText(_THIS) { @autoreleasepool { NSPasteboard *pasteboard; - NSString *format = GetTextFormat(_this); + NSString *format = NSPasteboardTypeString; NSString *available; char *text; pasteboard = [NSPasteboard generalPasteboard]; - available = [pasteboard availableTypeFromArray: [NSArray arrayWithObject:format]]; + available = [pasteboard availableTypeFromArray:[NSArray arrayWithObject:format]]; if ([available isEqualToString:format]) { NSString* string; const char *utf8; diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoaevents.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoaevents.m index e0da11fd4..17a3183b7 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoaevents.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoaevents.m @@ -36,6 +36,7 @@ @interface SDLApplication : NSApplication - (void)terminate:(id)sender; +- (void)sendEvent:(NSEvent *)theEvent; @end @@ -47,6 +48,48 @@ SDL_SendQuit(); } +static SDL_bool s_bShouldHandleEventsInSDLApplication = SDL_FALSE; + +static void Cocoa_DispatchEvent(NSEvent *theEvent) +{ + SDL_VideoDevice *_this = SDL_GetVideoDevice(); + + switch ([theEvent type]) { + case NSLeftMouseDown: + case NSOtherMouseDown: + case NSRightMouseDown: + case NSLeftMouseUp: + case NSOtherMouseUp: + case NSRightMouseUp: + case NSLeftMouseDragged: + case NSRightMouseDragged: + case NSOtherMouseDragged: /* usually middle mouse dragged */ + case NSMouseMoved: + case NSScrollWheel: + Cocoa_HandleMouseEvent(_this, theEvent); + break; + case NSKeyDown: + case NSKeyUp: + case NSFlagsChanged: + Cocoa_HandleKeyEvent(_this, theEvent); + break; + default: + break; + } +} + +// Dispatch events here so that we can handle events caught by +// nextEventMatchingMask in SDL, as well as events caught by other +// processes (such as CEF) that are passed down to NSApp. +- (void)sendEvent:(NSEvent *)theEvent +{ + if (s_bShouldHandleEventsInSDLApplication) { + Cocoa_DispatchEvent(theEvent); + } + + [super sendEvent:theEvent]; +} + @end // SDLApplication /* setAppleMenu disappeared from the headers in 10.4 */ @@ -114,28 +157,23 @@ */ for (NSWindow *window in [NSApp orderedWindows]) { if (window != win && [window canBecomeKeyWindow]) { - if ([window respondsToSelector:@selector(isOnActiveSpace)]) { - if (![window isOnActiveSpace]) { - continue; - } + if (![window isOnActiveSpace]) { + continue; } [window makeKeyAndOrderFront:self]; return; } } - /* If a window wasn't found above, iterate through all visible windows - * (including the 'About' window, if it's shown) and make the first one key. - * Note that +[NSWindow windowNumbersWithOptions:] was added in 10.6. + /* If a window wasn't found above, iterate through all visible windows in + * the active Space in z-order (including the 'About' window, if it's shown) + * and make the first one key. */ - if ([NSWindow respondsToSelector:@selector(windowNumbersWithOptions:)]) { - /* Get all visible windows in the active Space, in z-order. */ - for (NSNumber *num in [NSWindow windowNumbersWithOptions:0]) { - NSWindow *window = [NSApp windowWithWindowNumber:[num integerValue]]; - if (window && window != win && [window canBecomeKeyWindow]) { - [window makeKeyAndOrderFront:self]; - return; - } + for (NSNumber *num in [NSWindow windowNumbersWithOptions:0]) { + NSWindow *window = [NSApp windowWithWindowNumber:[num integerValue]]; + if (window && window != win && [window canBecomeKeyWindow]) { + [window makeKeyAndOrderFront:self]; + return; } } } @@ -176,7 +214,7 @@ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename { - return (BOOL)SDL_SendDropFile([filename UTF8String]); + return (BOOL)SDL_SendDropFile(NULL, [filename UTF8String]) && SDL_SendDropComplete(NULL); } @end @@ -291,7 +329,7 @@ CreateApplicationMenus(void) /* Add the fullscreen view toggle menu option, if supported */ - if ([NSApp respondsToSelector:@selector(setPresentationOptions:)]) { + if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) { /* Create the view menu */ viewMenu = [[NSMenu alloc] initWithTitle:@"View"]; @@ -319,18 +357,10 @@ Cocoa_RegisterApp(void) [SDLApplication sharedApplication]; SDL_assert(NSApp != nil); - const char *hint = SDL_GetHint(SDL_HINT_MAC_BACKGROUND_APP); - if (!hint || *hint == '0') { -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 - if ([NSApp respondsToSelector:@selector(setActivationPolicy:)]) { -#endif - [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 - } else { - ProcessSerialNumber psn = {0, kCurrentProcess}; - TransformProcessType(&psn, kProcessTransformToForegroundApplication); - } -#endif + s_bShouldHandleEventsInSDLApplication = SDL_TRUE; + + if (!SDL_GetHintBoolean(SDL_HINT_MAC_BACKGROUND_APP, SDL_FALSE)) { + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; [NSApp activateIgnoringOtherApps:YES]; } @@ -381,29 +411,11 @@ Cocoa_PumpEvents(_THIS) break; } - switch ([event type]) { - case NSLeftMouseDown: - case NSOtherMouseDown: - case NSRightMouseDown: - case NSLeftMouseUp: - case NSOtherMouseUp: - case NSRightMouseUp: - case NSLeftMouseDragged: - case NSRightMouseDragged: - case NSOtherMouseDragged: /* usually middle mouse dragged */ - case NSMouseMoved: - case NSScrollWheel: - Cocoa_HandleMouseEvent(_this, event); - break; - case NSKeyDown: - case NSKeyUp: - case NSFlagsChanged: - Cocoa_HandleKeyEvent(_this, event); - break; - default: - break; + if (!s_bShouldHandleEventsInSDLApplication) { + Cocoa_DispatchEvent(event); } - /* Pass through to NSApp to make sure everything stays in sync */ + + // Pass events down to SDLApplication to be handled in sendEvent: [NSApp sendEvent:event]; } }} diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoakeyboard.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoakeyboard.m index 7f1d2308f..8b2ed91c2 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoakeyboard.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoakeyboard.m @@ -29,6 +29,7 @@ #include "../../events/scancodes_darwin.h" #include +#include /*#define DEBUG_IME NSLog */ #define DEBUG_IME(...) @@ -69,14 +70,6 @@ SDL_SendKeyboardText(str); } -- (void)insertText:(id)insertString -{ - /* This method is part of NSTextInput and not NSTextInputClient, but - * apparently it still might be called in OS X 10.5 and can cause beeps if - * the implementation is missing: http://crbug.com/47890 */ - [self insertText:insertString replacementRange:NSMakeRange(0, 0)]; -} - - (void)doCommandBySelector:(SEL)myselector { /* No need to do anything since we are not using Cocoa @@ -102,7 +95,7 @@ - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange; { - if ([aString isKindOfClass: [NSAttributedString class]]) { + if ([aString isKindOfClass:[NSAttributedString class]]) { aString = [aString string]; } @@ -120,7 +113,7 @@ _markedRange = NSMakeRange(0, [aString length]); SDL_SendEditingText([aString UTF8String], - selectedRange.location, selectedRange.length); + (int) selectedRange.location, (int) selectedRange.length); DEBUG_IME(@"setMarkedText: %@, (%d, %d)", _markedText, selRange.location, selRange.length); @@ -150,10 +143,10 @@ aRange.location, aRange.length, windowHeight, NSStringFromRect(rect)); - if ([[self window] respondsToSelector:@selector(convertRectToScreen:)]) { - rect = [[self window] convertRectToScreen:rect]; + if ([window respondsToSelector:@selector(convertRectToScreen:)]) { + rect = [window convertRectToScreen:rect]; } else { - rect.origin = [[self window] convertBaseToScreen:rect.origin]; + rect.origin = [window convertBaseToScreen:rect.origin]; } return rect; @@ -191,6 +184,116 @@ @end +/*------------------------------------------------------------------------------ +Set up a HID callback to properly detect Caps Lock up/down events. +Derived from: +http://stackoverflow.com/questions/7190852/using-iohidmanager-to-get-modifier-key-events +*/ + +static IOHIDManagerRef s_hidManager = NULL; + +static void +HIDCallback(void *context, IOReturn result, void *sender, IOHIDValueRef value) +{ + if (context != s_hidManager) { + /* An old callback, ignore it (related to bug 2157 below) */ + return; + } + + IOHIDElementRef elem = IOHIDValueGetElement(value); + if (IOHIDElementGetUsagePage(elem) != kHIDPage_KeyboardOrKeypad + || IOHIDElementGetUsage(elem) != kHIDUsage_KeyboardCapsLock) { + return; + } + CFIndex pressed = IOHIDValueGetIntegerValue(value); + SDL_SendKeyboardKey(pressed ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_CAPSLOCK); +} + +static CFDictionaryRef +CreateHIDDeviceMatchingDictionary(UInt32 usagePage, UInt32 usage) +{ + CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault, + 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + if (dict) { + CFNumberRef number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usagePage); + if (number) { + CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsagePageKey), number); + CFRelease(number); + number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage); + if (number) { + CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsageKey), number); + CFRelease(number); + return dict; + } + } + CFRelease(dict); + } + return NULL; +} + +static void +QuitHIDCallback() +{ + if (!s_hidManager) { + return; + } + +#if 0 /* Releasing here causes a crash on Mac OS X 10.10 and earlier, + * so just leak it for now. See bug 2157 for details. + */ + IOHIDManagerUnscheduleFromRunLoop(s_hidManager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + IOHIDManagerRegisterInputValueCallback(s_hidManager, NULL, NULL); + IOHIDManagerClose(s_hidManager, 0); + + CFRelease(s_hidManager); +#endif + s_hidManager = NULL; +} + +static void +InitHIDCallback() +{ + s_hidManager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); + if (!s_hidManager) { + return; + } + CFDictionaryRef keyboard = NULL, keypad = NULL; + CFArrayRef matches = NULL; + keyboard = CreateHIDDeviceMatchingDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard); + if (!keyboard) { + goto fail; + } + keypad = CreateHIDDeviceMatchingDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Keypad); + if (!keypad) { + goto fail; + } + CFDictionaryRef matchesList[] = { keyboard, keypad }; + matches = CFArrayCreate(kCFAllocatorDefault, (const void **)matchesList, 2, NULL); + if (!matches) { + goto fail; + } + IOHIDManagerSetDeviceMatchingMultiple(s_hidManager, matches); + IOHIDManagerRegisterInputValueCallback(s_hidManager, HIDCallback, s_hidManager); + IOHIDManagerScheduleWithRunLoop(s_hidManager, CFRunLoopGetMain(), kCFRunLoopDefaultMode); + if (IOHIDManagerOpen(s_hidManager, kIOHIDOptionsTypeNone) == kIOReturnSuccess) { + goto cleanup; + } + +fail: + QuitHIDCallback(); + +cleanup: + if (matches) { + CFRelease(matches); + } + if (keypad) { + CFRelease(keypad); + } + if (keyboard) { + CFRelease(keyboard); + } +} + /* This is a helper function for HandleModifierSide. This * function reverts back to behavior before the distinction between * sides was made. @@ -328,24 +431,6 @@ ReleaseModifierSide(unsigned int device_independent_mask, } } -/* This is a helper function for DoSidedModifiers. - * This function handles the CapsLock case. - */ -static void -HandleCapsLock(unsigned short scancode, - unsigned int oldMods, unsigned int newMods) -{ - unsigned int oldMask, newMask; - - oldMask = oldMods & NSAlphaShiftKeyMask; - newMask = newMods & NSAlphaShiftKeyMask; - - if (oldMask != newMask) { - SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK); - SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK); - } -} - /* This function will handle the modifier keys and also determine the * correct side of the key. */ @@ -374,9 +459,6 @@ DoSidedModifiers(unsigned short scancode, unsigned int i, bit; - /* Handle CAPSLOCK separately because it doesn't have a left/right side */ - HandleCapsLock(scancode, oldMods, newMods); - /* Iterate through the bits, testing each against the old modifiers */ for (i = 0, bit = NSShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) { unsigned int oldMask, newMask; @@ -498,11 +580,10 @@ Cocoa_InitKeyboard(_THIS) SDL_SetScancodeName(SDL_SCANCODE_RALT, "Right Option"); SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Command"); - /* On pre-10.6, you might have the initial capslock key state wrong. */ - if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_6) { - data->modifierFlags = [NSEvent modifierFlags]; - SDL_ToggleModState(KMOD_CAPS, (data->modifierFlags & NSAlphaShiftKeyMask) != 0); - } + data->modifierFlags = [NSEvent modifierFlags]; + SDL_ToggleModState(KMOD_CAPS, (data->modifierFlags & NSAlphaShiftKeyMask) != 0); + + InitHIDCallback(); } void @@ -628,6 +709,7 @@ Cocoa_HandleKeyEvent(_THIS, NSEvent *event) void Cocoa_QuitKeyboard(_THIS) { + QuitHIDCallback(); } #endif /* SDL_VIDEO_DRIVER_COCOA */ diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.h b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.h index a0a29f501..ce8601cba 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.h +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.h @@ -30,12 +30,14 @@ typedef struct typedef struct { - const void *moderef; + CGDisplayModeRef moderef; } SDL_DisplayModeData; extern void Cocoa_InitModes(_THIS); extern int Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect); +extern int Cocoa_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect); extern void Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display); +extern int Cocoa_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, float * hpdi, float * vdpi); extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode); extern void Cocoa_QuitModes(_THIS); diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.m index 7d98264a7..6ae9decbc 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamodes.m @@ -19,6 +19,7 @@ 3. This notice may not be removed or altered from any source distribution. */ #include "../../SDL_internal.h" +#include "SDL_assert.h" #if SDL_VIDEO_DRIVER_COCOA @@ -55,25 +56,6 @@ Cocoa_ToggleMenuBar(const BOOL show) #endif } - -/* !!! FIXME: clean out the pre-10.6 code when it makes sense to do so. */ -#define FORCE_OLD_API 0 - -#if FORCE_OLD_API -#undef MAC_OS_X_VERSION_MIN_REQUIRED -#define MAC_OS_X_VERSION_MIN_REQUIRED 1050 -#endif - -static BOOL -IS_SNOW_LEOPARD_OR_LATER() -{ -#if FORCE_OLD_API - return NO; -#else - return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5; -#endif -} - static int CG_SetError(const char *prefix, CGDisplayErr result) { @@ -118,65 +100,46 @@ CG_SetError(const char *prefix, CGDisplayErr result) } static SDL_bool -GetDisplayMode(_THIS, const void *moderef, CVDisplayLinkRef link, SDL_DisplayMode *mode) +GetDisplayMode(_THIS, CGDisplayModeRef vidmode, CVDisplayLinkRef link, SDL_DisplayMode *mode) { SDL_DisplayModeData *data; - long width = 0; - long height = 0; - long bpp = 0; - long refreshRate = 0; + int width = 0; + int height = 0; + int bpp = 0; + int refreshRate = 0; + CFStringRef fmt; data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data)); if (!data) { return SDL_FALSE; } - data->moderef = moderef; + data->moderef = vidmode; - if (IS_SNOW_LEOPARD_OR_LATER()) { - CGDisplayModeRef vidmode = (CGDisplayModeRef) moderef; - CFStringRef fmt = CGDisplayModeCopyPixelEncoding(vidmode); - width = (long) CGDisplayModeGetWidth(vidmode); - height = (long) CGDisplayModeGetHeight(vidmode); - refreshRate = (long) (CGDisplayModeGetRefreshRate(vidmode) + 0.5); + fmt = CGDisplayModeCopyPixelEncoding(vidmode); + width = (int) CGDisplayModeGetWidth(vidmode); + height = (int) CGDisplayModeGetHeight(vidmode); + refreshRate = (int) (CGDisplayModeGetRefreshRate(vidmode) + 0.5); - if (CFStringCompare(fmt, CFSTR(IO32BitDirectPixels), - kCFCompareCaseInsensitive) == kCFCompareEqualTo) { - bpp = 32; - } else if (CFStringCompare(fmt, CFSTR(IO16BitDirectPixels), - kCFCompareCaseInsensitive) == kCFCompareEqualTo) { - bpp = 16; - } else if (CFStringCompare(fmt, CFSTR(kIO30BitDirectPixels), - kCFCompareCaseInsensitive) == kCFCompareEqualTo) { - bpp = 30; - } else { - bpp = 0; /* ignore 8-bit and such for now. */ - } - - CFRelease(fmt); + if (CFStringCompare(fmt, CFSTR(IO32BitDirectPixels), + kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + bpp = 32; + } else if (CFStringCompare(fmt, CFSTR(IO16BitDirectPixels), + kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + bpp = 16; + } else if (CFStringCompare(fmt, CFSTR(kIO30BitDirectPixels), + kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + bpp = 30; + } else { + bpp = 0; /* ignore 8-bit and such for now. */ } - #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - if (!IS_SNOW_LEOPARD_OR_LATER()) { - CFNumberRef number; - double refresh; - CFDictionaryRef vidmode = (CFDictionaryRef) moderef; - number = CFDictionaryGetValue(vidmode, kCGDisplayWidth); - CFNumberGetValue(number, kCFNumberLongType, &width); - number = CFDictionaryGetValue(vidmode, kCGDisplayHeight); - CFNumberGetValue(number, kCFNumberLongType, &height); - number = CFDictionaryGetValue(vidmode, kCGDisplayBitsPerPixel); - CFNumberGetValue(number, kCFNumberLongType, &bpp); - number = CFDictionaryGetValue(vidmode, kCGDisplayRefreshRate); - CFNumberGetValue(number, kCFNumberDoubleType, &refresh); - refreshRate = (long) (refresh + 0.5); - } - #endif + CFRelease(fmt); /* CGDisplayModeGetRefreshRate returns 0 for many non-CRT displays. */ if (refreshRate == 0 && link != NULL) { CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(link); if ((time.flags & kCVTimeIsIndefinite) == 0 && time.timeValue != 0) { - refreshRate = (long) ((time.timeScale / (double) time.timeValue) + 0.5); + refreshRate = (int) ((time.timeScale / (double) time.timeValue) + 0.5); } } @@ -203,22 +166,6 @@ GetDisplayMode(_THIS, const void *moderef, CVDisplayLinkRef link, SDL_DisplayMod return SDL_TRUE; } -static void -Cocoa_ReleaseDisplayMode(_THIS, const void *moderef) -{ - if (IS_SNOW_LEOPARD_OR_LATER()) { - CGDisplayModeRelease((CGDisplayModeRef) moderef); /* NULL is ok */ - } -} - -static void -Cocoa_ReleaseDisplayModeList(_THIS, CFArrayRef modelist) -{ - if (IS_SNOW_LEOPARD_OR_LATER()) { - CFRelease(modelist); /* NULL is ok */ - } -} - static const char * Cocoa_GetDisplayName(CGDirectDisplayID displayID) { @@ -261,7 +208,7 @@ Cocoa_InitModes(_THIS) SDL_VideoDisplay display; SDL_DisplayData *displaydata; SDL_DisplayMode mode; - const void *moderef = NULL; + CGDisplayModeRef moderef = NULL; CVDisplayLinkRef link = NULL; if (pass == 0) { @@ -278,15 +225,7 @@ Cocoa_InitModes(_THIS) continue; } - if (IS_SNOW_LEOPARD_OR_LATER()) { - moderef = CGDisplayCopyDisplayMode(displays[i]); - } - - #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - if (!IS_SNOW_LEOPARD_OR_LATER()) { - moderef = CGDisplayCurrentMode(displays[i]); - } - #endif + moderef = CGDisplayCopyDisplayMode(displays[i]); if (!moderef) { continue; @@ -294,7 +233,7 @@ Cocoa_InitModes(_THIS) displaydata = (SDL_DisplayData *) SDL_malloc(sizeof(*displaydata)); if (!displaydata) { - Cocoa_ReleaseDisplayMode(_this, moderef); + CGDisplayModeRelease(moderef); continue; } displaydata->display = displays[i]; @@ -306,7 +245,7 @@ Cocoa_InitModes(_THIS) display.name = (char *)Cocoa_GetDisplayName(displays[i]); if (!GetDisplayMode(_this, moderef, link, &mode)) { CVDisplayLinkRelease(link); - Cocoa_ReleaseDisplayMode(_this, moderef); + CGDisplayModeRelease(moderef); SDL_free(display.name); SDL_free(displaydata); continue; @@ -338,21 +277,70 @@ Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect) return 0; } +int +Cocoa_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect) +{ + SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata; + const CGDirectDisplayID cgdisplay = displaydata->display; + NSArray *screens = [NSScreen screens]; + NSScreen *screen = nil; + + /* !!! FIXME: maybe track the NSScreen in SDL_DisplayData? */ + for (NSScreen *i in screens) { + const CGDirectDisplayID thisDisplay = (CGDirectDisplayID) [[[i deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue]; + if (thisDisplay == cgdisplay) { + screen = i; + break; + } + } + + SDL_assert(screen != nil); /* didn't find it?! */ + if (screen == nil) { + return -1; + } + + const CGRect cgrect = CGDisplayBounds(cgdisplay); + const NSRect frame = [screen visibleFrame]; + + // !!! FIXME: I assume -[NSScreen visibleFrame] is relative to the origin of the screen in question and not the whole desktop. + // !!! FIXME: The math vs CGDisplayBounds might be incorrect if that's not the case, though. Check this. + rect->x = (int)(cgrect.origin.x + frame.origin.x); + rect->y = (int)(cgrect.origin.y + frame.origin.y); + rect->w = (int)frame.size.width; + rect->h = (int)frame.size.height; + + return 0; +} + +int +Cocoa_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, float * hdpi, float * vdpi) +{ + const float MM_IN_INCH = 25.4f; + + SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; + + CGSize displaySize = CGDisplayScreenSize(data->display); + int pixelWidth = (int) CGDisplayPixelsWide(data->display); + int pixelHeight = (int) CGDisplayPixelsHigh(data->display); + + if (ddpi) { + *ddpi = SDL_ComputeDiagonalDPI(pixelWidth, pixelHeight, displaySize.width / MM_IN_INCH, displaySize.height / MM_IN_INCH); + } + if (hdpi) { + *hdpi = pixelWidth * MM_IN_INCH / displaySize.width; + } + if (vdpi) { + *vdpi = pixelHeight * MM_IN_INCH / displaySize.height; + } + + return 0; +} + void Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display) { SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; - CFArrayRef modes = NULL; - - if (IS_SNOW_LEOPARD_OR_LATER()) { - modes = CGDisplayCopyAllDisplayModes(data->display, NULL); - } - - #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - if (!IS_SNOW_LEOPARD_OR_LATER()) { - modes = CGDisplayAvailableModes(data->display); - } - #endif + CFArrayRef modes = CGDisplayCopyAllDisplayModes(data->display, NULL); if (modes) { CVDisplayLinkRef link = NULL; @@ -362,37 +350,19 @@ Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display) CVDisplayLinkCreateWithCGDisplay(data->display, &link); for (i = 0; i < count; i++) { - const void *moderef = CFArrayGetValueAtIndex(modes, i); + CGDisplayModeRef moderef = (CGDisplayModeRef) CFArrayGetValueAtIndex(modes, i); SDL_DisplayMode mode; if (GetDisplayMode(_this, moderef, link, &mode)) { - if (IS_SNOW_LEOPARD_OR_LATER()) { - CGDisplayModeRetain((CGDisplayModeRef) moderef); - } + CGDisplayModeRetain(moderef); SDL_AddDisplayMode(display, &mode); } } CVDisplayLinkRelease(link); - Cocoa_ReleaseDisplayModeList(_this, modes); + CFRelease(modes); } } -static CGError -Cocoa_SwitchMode(_THIS, CGDirectDisplayID display, const void *mode) -{ - if (IS_SNOW_LEOPARD_OR_LATER()) { - return CGDisplaySetDisplayMode(display, (CGDisplayModeRef) mode, NULL); - } - - #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - if (!IS_SNOW_LEOPARD_OR_LATER()) { - return CGDisplaySwitchToMode(display, (CFDictionaryRef) mode); - } - #endif - - return kCGErrorFailure; -} - int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) { @@ -408,7 +378,7 @@ Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) if (data == display->desktop_mode.driverdata) { /* Restoring desktop mode */ - Cocoa_SwitchMode(_this, displaydata->display, data->moderef); + CGDisplaySetDisplayMode(displaydata->display, data->moderef, NULL); if (CGDisplayIsMain(displaydata->display)) { CGReleaseAllDisplays(); @@ -433,7 +403,7 @@ Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) } /* Do the physical switch */ - result = Cocoa_SwitchMode(_this, displaydata->display, data->moderef); + result = CGDisplaySetDisplayMode(displaydata->display, data->moderef, NULL); if (result != kCGErrorSuccess) { CG_SetError("CGDisplaySwitchToMode()", result); goto ERR_NO_SWITCH; @@ -478,11 +448,11 @@ Cocoa_QuitModes(_THIS) } mode = (SDL_DisplayModeData *) display->desktop_mode.driverdata; - Cocoa_ReleaseDisplayMode(_this, mode->moderef); + CGDisplayModeRelease(mode->moderef); for (j = 0; j < display->num_display_modes; j++) { mode = (SDL_DisplayModeData*) display->display_modes[j].driverdata; - Cocoa_ReleaseDisplayMode(_this, mode->moderef); + CGDisplayModeRelease(mode->moderef); } } diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamouse.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamouse.m index c76833123..0a27549ae 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamouse.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamouse.m @@ -226,13 +226,15 @@ Cocoa_WarpMouseGlobal(int x, int y) Cocoa_HandleMouseWarp(point.x, point.y); - /* According to the docs, this was deprecated in 10.6, but it's still - * around. The substitute requires a CGEventSource, but I'm not entirely - * sure how we'd procure the right one for this event. - */ - CGSetLocalEventsSuppressionInterval(0.0); CGWarpMouseCursorPosition(point); - CGSetLocalEventsSuppressionInterval(0.25); + + /* CGWarpMouse causes a short delay by default, which is preventable by + * Calling this directly after. CGSetLocalEventsSuppressionInterval can also + * prevent it, but it's deprecated as of OS X 10.6. + */ + if (!mouse->relative_mode) { + CGAssociateMouseAndMouseCursorPosition(YES); + } /* CGWarpMouseCursorPosition doesn't generate a window event, unlike our * other implementations' APIs. Send what's appropriate. @@ -314,7 +316,7 @@ Cocoa_GetGlobalMouseState(int *x, int *y) for (NSScreen *screen in [NSScreen screens]) { NSRect frame = [screen frame]; - if (NSPointInRect(cocoaLocation, frame)) { + if (NSMouseInRect(cocoaLocation, frame, NO)) { *x = (int) cocoaLocation.x; *y = (int) ((frame.origin.y + frame.size.height) - cocoaLocation.y); break; @@ -396,7 +398,7 @@ Cocoa_HandleMouseEvent(_THIS, NSEvent *event) /* Ignore events that aren't inside the client area (i.e. title bar.) */ if ([event window]) { NSRect windowRect = [[[event window] contentView] frame]; - if (!NSPointInRect([event locationInWindow], windowRect)) { + if (!NSMouseInRect([event locationInWindow], windowRect, NO)) { return; } } @@ -419,8 +421,8 @@ Cocoa_HandleMouseWheel(SDL_Window *window, NSEvent *event) { SDL_Mouse *mouse = SDL_GetMouse(); - float x = -[event deltaX]; - float y = [event deltaY]; + CGFloat x = -[event deltaX]; + CGFloat y = [event deltaY]; SDL_MouseWheelDirection direction = SDL_MOUSEWHEEL_NORMAL; if ([event respondsToSelector:@selector(isDirectionInvertedFromDevice)]) { @@ -430,14 +432,14 @@ Cocoa_HandleMouseWheel(SDL_Window *window, NSEvent *event) } if (x > 0) { - x += 0.9f; + x = SDL_ceil(x); } else if (x < 0) { - x -= 0.9f; + x = SDL_floor(x); } if (y > 0) { - y += 0.9f; + y = SDL_ceil(y); } else if (y < 0) { - y -= 0.9f; + y = SDL_floor(y); } SDL_SendMouseWheel(window, mouse->mouseID, (int)x, (int)y, direction); } diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamousetap.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamousetap.m index ed70f3ca3..48abbca9c 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoamousetap.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoamousetap.m @@ -32,8 +32,8 @@ #if SDL_MAC_NO_SANDBOX #include "SDL_keyboard.h" -#include "SDL_thread.h" #include "SDL_cocoavideo.h" +#include "../../thread/SDL_systhread.h" #include "../../events/SDL_mouse_c.h" @@ -96,7 +96,7 @@ Cocoa_MouseTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event eventLocation = CGEventGetUnflippedLocation(event); windowRect = [nswindow contentRectForFrameRect:[nswindow frame]]; - if (!NSPointInRect(NSPointFromCGPoint(eventLocation), windowRect)) { + if (!NSMouseInRect(NSPointFromCGPoint(eventLocation), windowRect, NO)) { /* This is in CGs global screenspace coordinate system, which has a * flipped Y. @@ -109,15 +109,14 @@ Cocoa_MouseTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event newLocation.x = NSMaxX(windowRect) - 1.0; } - if (eventLocation.y < NSMinY(windowRect)) { + if (eventLocation.y <= NSMinY(windowRect)) { newLocation.y -= (NSMinY(windowRect) - eventLocation.y + 1); - } else if (eventLocation.y >= NSMaxY(windowRect)) { - newLocation.y += (eventLocation.y - NSMaxY(windowRect) + 1); + } else if (eventLocation.y > NSMaxY(windowRect)) { + newLocation.y += (eventLocation.y - NSMaxY(windowRect)); } - CGSetLocalEventsSuppressionInterval(0); CGWarpMouseCursorPosition(newLocation); - CGSetLocalEventsSuppressionInterval(0.25); + CGAssociateMouseAndMouseCursorPosition(YES); if ((CGEventMaskBit(type) & movementEventsMask) == 0) { /* For click events, we just constrain the event to the window, so @@ -203,7 +202,7 @@ Cocoa_InitMouseEventTap(SDL_MouseData* driverdata) tapdata->runloopStartedSemaphore = SDL_CreateSemaphore(0); if (tapdata->runloopStartedSemaphore) { - tapdata->thread = SDL_CreateThread(&Cocoa_MouseTapThread, "Event Tap Loop", tapdata); + tapdata->thread = SDL_CreateThreadInternal(&Cocoa_MouseTapThread, "Event Tap Loop", 512 * 1024, tapdata); if (!tapdata->thread) { SDL_DestroySemaphore(tapdata->runloopStartedSemaphore); } diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoaopengl.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoaopengl.m index aa3609984..645e5ba45 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoaopengl.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoaopengl.m @@ -173,6 +173,8 @@ Cocoa_GL_CreateContext(_THIS, SDL_Window * window) return NULL; } + attr[i++] = NSOpenGLPFAAllowOfflineRenderers; + /* specify a profile if we're on Lion (10.7) or later. */ if (lion_or_later) { NSOpenGLPixelFormatAttribute profile = NSOpenGLProfileVersionLegacy; diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoashape.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoashape.m index cd5d97b70..fc8a2775c 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoashape.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoashape.m @@ -35,9 +35,7 @@ Cocoa_CreateShaper(SDL_Window* window) SDL_WindowData* windata = (SDL_WindowData*)window->driverdata; [windata->nswindow setOpaque:NO]; - if ([windata->nswindow respondsToSelector:@selector(setStyleMask:)]) { - [windata->nswindow setStyleMask:NSBorderlessWindowMask]; - } + [windata->nswindow setStyleMask:NSBorderlessWindowMask]; SDL_WindowShaper* result = result = malloc(sizeof(SDL_WindowShaper)); result->window = window; diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoavideo.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoavideo.m index b8f775ddb..e436e6521 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoavideo.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoavideo.m @@ -73,6 +73,8 @@ Cocoa_CreateDevice(int devindex) device->VideoInit = Cocoa_VideoInit; device->VideoQuit = Cocoa_VideoQuit; device->GetDisplayBounds = Cocoa_GetDisplayBounds; + device->GetDisplayUsableBounds = Cocoa_GetDisplayUsableBounds; + device->GetDisplayDPI = Cocoa_GetDisplayDPI; device->GetDisplayModes = Cocoa_GetDisplayModes; device->SetDisplayMode = Cocoa_SetDisplayMode; device->PumpEvents = Cocoa_PumpEvents; @@ -86,6 +88,7 @@ Cocoa_CreateDevice(int devindex) device->SetWindowSize = Cocoa_SetWindowSize; device->SetWindowMinimumSize = Cocoa_SetWindowMinimumSize; device->SetWindowMaximumSize = Cocoa_SetWindowMaximumSize; + device->SetWindowOpacity = Cocoa_SetWindowOpacity; device->ShowWindow = Cocoa_ShowWindow; device->HideWindow = Cocoa_HideWindow; device->RaiseWindow = Cocoa_RaiseWindow; @@ -93,6 +96,7 @@ Cocoa_CreateDevice(int devindex) device->MinimizeWindow = Cocoa_MinimizeWindow; device->RestoreWindow = Cocoa_RestoreWindow; device->SetWindowBordered = Cocoa_SetWindowBordered; + device->SetWindowResizable = Cocoa_SetWindowResizable; device->SetWindowFullscreen = Cocoa_SetWindowFullscreen; device->SetWindowGammaRamp = Cocoa_SetWindowGammaRamp; device->GetWindowGammaRamp = Cocoa_GetWindowGammaRamp; @@ -146,8 +150,7 @@ Cocoa_VideoInit(_THIS) Cocoa_InitKeyboard(_this); Cocoa_InitMouse(_this); - const char *hint = SDL_GetHint(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES); - data->allow_spaces = ( (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) && (!hint || (*hint != '0')) ); + data->allow_spaces = ((floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) && SDL_GetHintBoolean(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES, SDL_TRUE)); /* The IOPM assertion API can disable the screensaver as of 10.7. */ data->screensaver_use_iopm = floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6; @@ -173,13 +176,7 @@ Cocoa_CreateImage(SDL_Surface * surface) int i; NSImage *img; - converted = SDL_ConvertSurfaceFormat(surface, -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - SDL_PIXELFORMAT_RGBA8888, -#else - SDL_PIXELFORMAT_ABGR8888, -#endif - 0); + converted = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_RGBA32, 0); if (!converted) { return nil; } diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.h b/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.h index 1037badfc..a32de8387 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.h +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.h @@ -125,6 +125,7 @@ extern void Cocoa_SetWindowPosition(_THIS, SDL_Window * window); extern void Cocoa_SetWindowSize(_THIS, SDL_Window * window); extern void Cocoa_SetWindowMinimumSize(_THIS, SDL_Window * window); extern void Cocoa_SetWindowMaximumSize(_THIS, SDL_Window * window); +extern int Cocoa_SetWindowOpacity(_THIS, SDL_Window * window, float opacity); extern void Cocoa_ShowWindow(_THIS, SDL_Window * window); extern void Cocoa_HideWindow(_THIS, SDL_Window * window); extern void Cocoa_RaiseWindow(_THIS, SDL_Window * window); @@ -132,6 +133,7 @@ extern void Cocoa_MaximizeWindow(_THIS, SDL_Window * window); extern void Cocoa_MinimizeWindow(_THIS, SDL_Window * window); extern void Cocoa_RestoreWindow(_THIS, SDL_Window * window); extern void Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered); +extern void Cocoa_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable); extern void Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen); extern int Cocoa_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp); extern int Cocoa_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp); diff --git a/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.m b/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.m index a4da6cb2d..cfad54854 100644 --- a/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.m +++ b/Engine/lib/sdl/src/video/cocoa/SDL_cocoawindow.m @@ -80,20 +80,20 @@ - (void)sendEvent:(NSEvent *)event { - [super sendEvent:event]; + [super sendEvent:event]; - if ([event type] != NSLeftMouseUp) { - return; - } + if ([event type] != NSLeftMouseUp) { + return; + } - id delegate = [self delegate]; - if (![delegate isKindOfClass:[Cocoa_WindowListener class]]) { - return; - } + id delegate = [self delegate]; + if (![delegate isKindOfClass:[Cocoa_WindowListener class]]) { + return; + } - if ([delegate isMoving]) { - [delegate windowDidFinishMoving]; - } + if ([delegate isMoving]) { + [delegate windowDidFinishMoving]; + } } /* We'll respond to selectors by doing nothing so we don't beep. @@ -116,9 +116,12 @@ - (BOOL)performDragOperation:(id )sender { @autoreleasepool { + SDL_VideoDevice *_this = SDL_GetVideoDevice(); NSPasteboard *pasteboard = [sender draggingPasteboard]; NSArray *types = [NSArray arrayWithObject:NSFilenamesPboardType]; NSString *desiredType = [pasteboard availableTypeFromArray:types]; + SDL_Window *sdlwindow = nil; + if (desiredType == nil) { return NO; /* can't accept anything that's being dropped here. */ } @@ -132,13 +135,10 @@ NSArray *array = [pasteboard propertyListForType:@"NSFilenamesPboardType"]; for (NSString *path in array) { - NSURL *fileURL = [[NSURL fileURLWithPath:path] autorelease]; + NSURL *fileURL = [NSURL fileURLWithPath:path]; NSNumber *isAlias = nil; - /* Functionality for resolving URL aliases was added with OS X 10.6. */ - if ([fileURL respondsToSelector:@selector(getResourceValue:forKey:error:)]) { - [fileURL getResourceValue:&isAlias forKey:NSURLIsAliasFileKey error:nil]; - } + [fileURL getResourceValue:&isAlias forKey:NSURLIsAliasFileKey error:nil]; /* If the URL is an alias, resolve it. */ if ([isAlias boolValue]) { @@ -157,11 +157,22 @@ } } - if (!SDL_SendDropFile([[fileURL path] UTF8String])) { + /* !!! FIXME: is there a better way to do this? */ + if (_this) { + for (sdlwindow = _this->windows; sdlwindow; sdlwindow = sdlwindow->next) { + NSWindow *nswindow = ((SDL_WindowData *) sdlwindow->driverdata)->nswindow; + if (nswindow == self) { + break; + } + } + } + + if (!SDL_SendDropFile(sdlwindow, [[fileURL path] UTF8String])) { return NO; } } + SDL_SendDropComplete(sdlwindow); return YES; }} @@ -196,17 +207,17 @@ ScheduleContextUpdates(SDL_WindowData *data) } } +/* !!! FIXME: this should use a hint callback. */ static int GetHintCtrlClickEmulateRightClick() { - const char *hint = SDL_GetHint( SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK ); - return hint != NULL && *hint != '0'; + return SDL_GetHintBoolean(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, SDL_FALSE); } -static unsigned int +static NSUInteger GetWindowStyle(SDL_Window * window) { - unsigned int style; + NSUInteger style = 0; if (window->flags & SDL_WINDOW_FULLSCREEN) { style = NSBorderlessWindowMask; @@ -224,21 +235,17 @@ GetWindowStyle(SDL_Window * window) } static SDL_bool -SetWindowStyle(SDL_Window * window, unsigned int style) +SetWindowStyle(SDL_Window * window, NSUInteger style) { SDL_WindowData *data = (SDL_WindowData *) window->driverdata; NSWindow *nswindow = data->nswindow; - if (![nswindow respondsToSelector: @selector(setStyleMask:)]) { - return SDL_FALSE; - } - /* The view responder chain gets messed with during setStyleMask */ if ([[nswindow contentView] nextResponder] == data->listener) { [[nswindow contentView] setNextResponder:nil]; } - [nswindow performSelector: @selector(setStyleMask:) withObject: (id)(uintptr_t)style]; + [nswindow setStyleMask:style]; /* The view responder chain gets messed with during setStyleMask */ if ([[nswindow contentView] nextResponder] != data->listener) { @@ -302,9 +309,7 @@ SetWindowStyle(SDL_Window * window, unsigned int style) [view setNextResponder:self]; - if ([view respondsToSelector:@selector(setAcceptsTouchEvents:)]) { - [view setAcceptsTouchEvents:YES]; - } + [view setAcceptsTouchEvents:YES]; } - (void)observeValueForKeyPath:(NSString *)keyPath @@ -589,12 +594,9 @@ SetWindowStyle(SDL_Window * window, unsigned int style) [NSMenu setMenuBarVisible:NO]; } - /* On pre-10.6, you might have the capslock key state wrong now because we can't check here. */ - if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_6) { - const unsigned int newflags = [NSEvent modifierFlags] & NSAlphaShiftKeyMask; - _data->videodata->modifierFlags = (_data->videodata->modifierFlags & ~NSAlphaShiftKeyMask) | newflags; - SDL_ToggleModState(KMOD_CAPS, newflags != 0); - } + const unsigned int newflags = [NSEvent modifierFlags] & NSAlphaShiftKeyMask; + _data->videodata->modifierFlags = (_data->videodata->modifierFlags & ~NSAlphaShiftKeyMask) | newflags; + SDL_ToggleModState(KMOD_CAPS, newflags != 0); } - (void)windowDidResignKey:(NSNotification *)aNotification @@ -820,23 +822,18 @@ SetWindowStyle(SDL_Window * window, unsigned int style) - (void)mouseDown:(NSEvent *)theEvent { int button; + int clicks; /* Ignore events that aren't inside the client area (i.e. title bar.) */ if ([theEvent window]) { NSRect windowRect = [[[theEvent window] contentView] frame]; - - /* add one to size, since NSPointInRect is exclusive of the bottom - edges, which mean it misses the top of the window by one pixel - (as the origin is the bottom left). */ - windowRect.size.width += 1; - windowRect.size.height += 1; - - if (!NSPointInRect([theEvent locationInWindow], windowRect)) { + if (!NSMouseInRect([theEvent locationInWindow], windowRect, NO)) { return; } } if ([self processHitTest:theEvent]) { + SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIT_TEST, 0, 0); return; /* dragging, drop event. */ } @@ -858,10 +855,12 @@ SetWindowStyle(SDL_Window * window, unsigned int style) button = SDL_BUTTON_MIDDLE; break; default: - button = [theEvent buttonNumber] + 1; + button = (int) [theEvent buttonNumber] + 1; break; } - SDL_SendMouseButton(_data->window, 0, SDL_PRESSED, button); + + clicks = (int) [theEvent clickCount]; + SDL_SendMouseButtonClicks(_data->window, 0, SDL_PRESSED, button, clicks); } - (void)rightMouseDown:(NSEvent *)theEvent @@ -877,8 +876,10 @@ SetWindowStyle(SDL_Window * window, unsigned int style) - (void)mouseUp:(NSEvent *)theEvent { int button; + int clicks; if ([self processHitTest:theEvent]) { + SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIT_TEST, 0, 0); return; /* stopped dragging, drop event. */ } @@ -898,10 +899,12 @@ SetWindowStyle(SDL_Window * window, unsigned int style) button = SDL_BUTTON_MIDDLE; break; default: - button = [theEvent buttonNumber] + 1; + button = (int) [theEvent buttonNumber] + 1; break; } - SDL_SendMouseButton(_data->window, 0, SDL_RELEASED, button); + + clicks = (int) [theEvent clickCount]; + SDL_SendMouseButtonClicks(_data->window, 0, SDL_RELEASED, button, clicks); } - (void)rightMouseUp:(NSEvent *)theEvent @@ -922,6 +925,7 @@ SetWindowStyle(SDL_Window * window, unsigned int style) int x, y; if ([self processHitTest:theEvent]) { + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_HIT_TEST, 0, 0); return; /* dragging, drop event. */ } @@ -956,13 +960,8 @@ SetWindowStyle(SDL_Window * window, unsigned int style) cgpoint.x = window->x + x; cgpoint.y = window->y + y; - /* According to the docs, this was deprecated in 10.6, but it's still - * around. The substitute requires a CGEventSource, but I'm not entirely - * sure how we'd procure the right one for this event. - */ - CGSetLocalEventsSuppressionInterval(0.0); CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, cgpoint); - CGSetLocalEventsSuppressionInterval(0.25); + CGAssociateMouseAndMouseCursorPosition(YES); Cocoa_HandleMouseWarp(cgpoint.x, cgpoint.y); #endif @@ -1075,6 +1074,7 @@ SetWindowStyle(SDL_Window * window, unsigned int style) - (void)rightMouseDown:(NSEvent *)theEvent; - (BOOL)mouseDownCanMoveWindow; - (void)drawRect:(NSRect)dirtyRect; +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent; @end @implementation SDLView @@ -1114,6 +1114,15 @@ SetWindowStyle(SDL_Window * window, unsigned int style) cursor:[NSCursor invisibleCursor]]; } } + +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent +{ + if (SDL_GetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH)) { + return SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE); + } else { + return SDL_GetHintBoolean("SDL_MAC_MOUSE_FOCUS_CLICKTHROUGH", SDL_FALSE); + } +} @end static int @@ -1157,7 +1166,7 @@ SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created } { - unsigned int style = [nswindow styleMask]; + unsigned long style = [nswindow styleMask]; if (style == NSBorderlessWindowMask) { window->flags |= SDL_WINDOW_BORDERLESS; @@ -1208,7 +1217,7 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window) SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); NSRect rect; SDL_Rect bounds; - unsigned int style; + NSUInteger style; NSArray *screens = [NSScreen screens]; Cocoa_GetDisplayBounds(_this, display, &bounds); @@ -1263,7 +1272,7 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window) } } - [nswindow setContentView: contentView]; + [nswindow setContentView:contentView]; [contentView release]; /* Allow files and folders to be dragged onto the window by users */ @@ -1470,27 +1479,6 @@ Cocoa_RestoreWindow(_THIS, SDL_Window * window) } }} -static NSWindow * -Cocoa_RebuildWindow(SDL_WindowData * data, NSWindow * nswindow, unsigned style) -{ - if (!data->created) { - /* Don't mess with other people's windows... */ - return nswindow; - } - - [data->listener close]; - data->nswindow = [[SDLWindow alloc] initWithContentRect:[[nswindow contentView] frame] styleMask:style backing:NSBackingStoreBuffered defer:NO screen:[nswindow screen]]; - [data->nswindow setContentView:[nswindow contentView]]; - [data->nswindow registerForDraggedTypes:[NSArray arrayWithObject:(NSString *)kUTTypeFileURL]]; - /* See comment in SetupWindowData. */ - [data->nswindow setOneShot:NO]; - [data->listener listen:data]; - - [nswindow close]; - - return data->nswindow; -} - void Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) { @autoreleasepool @@ -1502,6 +1490,20 @@ Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) } }} +void +Cocoa_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable) +{ @autoreleasepool +{ + /* Don't set this if we're in a space! + * The window will get permanently stuck if resizable is false. + * -flibit + */ + SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + Cocoa_WindowListener *listener = data->listener; + if (![listener isInFullscreenSpace]) { + SetWindowStyle(window, GetWindowStyle(window)); + } +}} void Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen) @@ -1532,11 +1534,7 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display rect.origin.y += (screenRect.size.height - rect.size.height); } - if ([nswindow respondsToSelector: @selector(setStyleMask:)]) { - [nswindow performSelector: @selector(setStyleMask:) withObject: (id)NSBorderlessWindowMask]; - } else { - nswindow = Cocoa_RebuildWindow(data, nswindow, NSBorderlessWindowMask); - } + [nswindow setStyleMask:NSBorderlessWindowMask]; } else { rect.origin.x = window->windowed.x; rect.origin.y = window->windowed.y; @@ -1544,16 +1542,12 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display rect.size.height = window->windowed.h; ConvertNSRect([nswindow screen], fullscreen, &rect); - if ([nswindow respondsToSelector: @selector(setStyleMask:)]) { - [nswindow performSelector: @selector(setStyleMask:) withObject: (id)(uintptr_t)GetWindowStyle(window)]; + [nswindow setStyleMask:GetWindowStyle(window)]; - /* Hack to restore window decorations on Mac OS X 10.10 */ - NSRect frameRect = [nswindow frame]; - [nswindow setFrame:NSMakeRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width + 1, frameRect.size.height) display:NO]; - [nswindow setFrame:frameRect display:NO]; - } else { - nswindow = Cocoa_RebuildWindow(data, nswindow, GetWindowStyle(window)); - } + /* Hack to restore window decorations on Mac OS X 10.10 */ + NSRect frameRect = [nswindow frame]; + [nswindow setFrame:NSMakeRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width + 1, frameRect.size.height) display:NO]; + [nswindow setFrame:frameRect display:NO]; } /* The view responder chain gets messed with during setStyleMask */ @@ -1767,6 +1761,14 @@ Cocoa_SetWindowHitTest(SDL_Window * window, SDL_bool enabled) return 0; /* just succeed, the real work is done elsewhere. */ } +int +Cocoa_SetWindowOpacity(_THIS, SDL_Window * window, float opacity) +{ + SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + [data->nswindow setAlphaValue:opacity]; + return 0; +} + #endif /* SDL_VIDEO_DRIVER_COCOA */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_video.c b/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_video.c index 5579759eb..d339dd78e 100644 --- a/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_video.c +++ b/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_video.c @@ -121,6 +121,7 @@ DirectFB_CreateDevice(int devindex) device->SetWindowIcon = DirectFB_SetWindowIcon; device->SetWindowPosition = DirectFB_SetWindowPosition; device->SetWindowSize = DirectFB_SetWindowSize; + device->SetWindowOpacity = DirectFB_SetWindowOpacity; device->ShowWindow = DirectFB_ShowWindow; device->HideWindow = DirectFB_HideWindow; device->RaiseWindow = DirectFB_RaiseWindow; diff --git a/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.c b/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.c index 3b8b45d44..40bbe6aee 100644 --- a/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.c +++ b/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.c @@ -529,4 +529,17 @@ DirectFB_AdjustWindowSurface(SDL_Window * window) return; } +int +DirectFB_SetWindowOpacity(_THIS, SDL_Window * window, float opacity) +{ + const Uint8 alpha = (Uint8) ((unsigned int) (opacity * 255.0f)); + SDL_DFB_WINDOWDATA(window); + SDL_DFB_CHECKERR(windata->dfbwin->SetOpacity(windata->dfbwin, alpha)); + windata->opacity = alpha; + return 0; + +error: + return -1; +} + #endif /* SDL_VIDEO_DRIVER_DIRECTFB */ diff --git a/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.h b/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.h index 658cc8749..4b9970812 100644 --- a/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.h +++ b/Engine/lib/sdl/src/video/directfb/SDL_DirectFB_window.h @@ -75,6 +75,7 @@ extern SDL_bool DirectFB_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info); extern void DirectFB_AdjustWindowSurface(SDL_Window * window); +extern int DirectFB_SetWindowOpacity(_THIS, SDL_Window * window, float opacity); #endif /* _SDL_directfb_window_h */ diff --git a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.c b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.c index 0f915c6f3..a4720e402 100644 --- a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.c +++ b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.c @@ -217,16 +217,16 @@ static const SDL_Scancode emscripten_scancode_table[] = { /* 171 */ SDL_SCANCODE_UNKNOWN, /* 172 */ SDL_SCANCODE_UNKNOWN, /* 173 */ SDL_SCANCODE_MINUS, /*FX*/ - /* 174 */ SDL_SCANCODE_UNKNOWN, - /* 175 */ SDL_SCANCODE_UNKNOWN, - /* 176 */ SDL_SCANCODE_UNKNOWN, - /* 177 */ SDL_SCANCODE_UNKNOWN, + /* 174 */ SDL_SCANCODE_VOLUMEDOWN, /*IE, Chrome*/ + /* 175 */ SDL_SCANCODE_VOLUMEUP, /*IE, Chrome*/ + /* 176 */ SDL_SCANCODE_AUDIONEXT, /*IE, Chrome*/ + /* 177 */ SDL_SCANCODE_AUDIOPREV, /*IE, Chrome*/ /* 178 */ SDL_SCANCODE_UNKNOWN, - /* 179 */ SDL_SCANCODE_UNKNOWN, + /* 179 */ SDL_SCANCODE_AUDIOPLAY, /*IE, Chrome*/ /* 180 */ SDL_SCANCODE_UNKNOWN, - /* 181 */ SDL_SCANCODE_UNKNOWN, - /* 182 */ SDL_SCANCODE_UNKNOWN, - /* 183 */ SDL_SCANCODE_UNKNOWN, + /* 181 */ SDL_SCANCODE_AUDIOMUTE, /*FX*/ + /* 182 */ SDL_SCANCODE_VOLUMEDOWN, /*FX*/ + /* 183 */ SDL_SCANCODE_VOLUMEUP, /*FX*/ /* 184 */ SDL_SCANCODE_UNKNOWN, /* 185 */ SDL_SCANCODE_UNKNOWN, /* 186 */ SDL_SCANCODE_SEMICOLON, /*IE, Chrome, D3E legacy*/ @@ -301,25 +301,34 @@ EM_BOOL Emscripten_HandleMouseMove(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData) { SDL_WindowData *window_data = userData; - int mx = mouseEvent->canvasX, my = mouseEvent->canvasY; + int mx, my; + static double residualx = 0, residualy = 0; EmscriptenPointerlockChangeEvent pointerlock_status; - /* check for pointer lock */ - emscripten_get_pointerlock_status(&pointerlock_status); + /* rescale (in case canvas is being scaled)*/ + double client_w, client_h, xscale, yscale; + emscripten_get_element_css_size(NULL, &client_w, &client_h); + xscale = window_data->window->w / client_w; + yscale = window_data->window->h / client_h; - if (pointerlock_status.isActive) { - mx = mouseEvent->movementX; - my = mouseEvent->movementY; + /* check for pointer lock */ + int isPointerLockSupported = emscripten_get_pointerlock_status(&pointerlock_status); + int isPointerLocked = isPointerLockSupported == EMSCRIPTEN_RESULT_SUCCESS ? pointerlock_status.isActive : SDL_FALSE; + + if (isPointerLocked) { + residualx += mouseEvent->movementX * xscale; + residualy += mouseEvent->movementY * yscale; + /* Let slow sub-pixel motion accumulate. Don't lose it. */ + mx = residualx; + residualx -= mx; + my = residualy; + residualy -= my; + } else { + mx = mouseEvent->canvasX * xscale; + my = mouseEvent->canvasY * yscale; } - /* rescale (in case canvas is being scaled)*/ - double client_w, client_h; - emscripten_get_element_css_size(NULL, &client_w, &client_h); - - mx = mx * (window_data->window->w / (client_w * window_data->pixel_ratio)); - my = my * (window_data->window->h / (client_h * window_data->pixel_ratio)); - - SDL_SendMouseMotion(window_data->window, 0, pointerlock_status.isActive, mx, my); + SDL_SendMouseMotion(window_data->window, 0, isPointerLocked, mx, my); return 0; } @@ -341,16 +350,36 @@ Emscripten_HandleMouseButton(int eventType, const EmscriptenMouseEvent *mouseEve default: return 0; } - SDL_SendMouseButton(window_data->window, 0, eventType == EMSCRIPTEN_EVENT_MOUSEDOWN ? SDL_PRESSED : SDL_RELEASED, sdl_button); - return 1; + + SDL_EventType sdl_event_type = (eventType == EMSCRIPTEN_EVENT_MOUSEDOWN ? SDL_PRESSED : SDL_RELEASED); + SDL_SendMouseButton(window_data->window, 0, sdl_event_type, sdl_button); + return SDL_GetEventState(sdl_event_type) == SDL_ENABLE; } EM_BOOL Emscripten_HandleMouseFocus(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData) { SDL_WindowData *window_data = userData; - SDL_SendWindowEvent(window_data->window, eventType == EMSCRIPTEN_EVENT_MOUSEENTER ? SDL_WINDOWEVENT_ENTER : SDL_WINDOWEVENT_LEAVE, 0, 0); - return 1; + + int mx = mouseEvent->canvasX, my = mouseEvent->canvasY; + EmscriptenPointerlockChangeEvent pointerlock_status; + + /* check for pointer lock */ + int isPointerLockSupported = emscripten_get_pointerlock_status(&pointerlock_status); + int isPointerLocked = isPointerLockSupported == EMSCRIPTEN_RESULT_SUCCESS ? pointerlock_status.isActive : SDL_FALSE; + + if (!isPointerLocked) { + /* rescale (in case canvas is being scaled)*/ + double client_w, client_h; + emscripten_get_element_css_size(NULL, &client_w, &client_h); + + mx = mx * (window_data->window->w / client_w); + my = my * (window_data->window->h / client_h); + SDL_SendMouseMotion(window_data->window, 0, isPointerLocked, mx, my); + } + + SDL_SetMouseFocus(eventType == EMSCRIPTEN_EVENT_MOUSEENTER ? window_data->window : NULL); + return SDL_GetEventState(SDL_WINDOWEVENT) == SDL_ENABLE; } EM_BOOL @@ -358,15 +387,22 @@ Emscripten_HandleWheel(int eventType, const EmscriptenWheelEvent *wheelEvent, vo { SDL_WindowData *window_data = userData; SDL_SendMouseWheel(window_data->window, 0, wheelEvent->deltaX, -wheelEvent->deltaY, SDL_MOUSEWHEEL_NORMAL); - return 1; + return SDL_GetEventState(SDL_MOUSEWHEEL) == SDL_ENABLE; } EM_BOOL Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *wheelEvent, void *userData) { SDL_WindowData *window_data = userData; + /* If the user switches away while keys are pressed (such as + * via Alt+Tab), key release events won't be received. */ + if (eventType == EMSCRIPTEN_EVENT_BLUR) { + SDL_ResetKeyboard(); + } + + SDL_SendWindowEvent(window_data->window, eventType == EMSCRIPTEN_EVENT_FOCUS ? SDL_WINDOWEVENT_FOCUS_GAINED : SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); - return 1; + return SDL_GetEventState(SDL_WINDOWEVENT) == SDL_ENABLE; } EM_BOOL @@ -374,12 +410,16 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo { SDL_WindowData *window_data = userData; int i; + double client_w, client_h; + int preventDefault = 0; SDL_TouchID deviceId = 1; if (SDL_AddTouch(deviceId, "") < 0) { return 0; } + emscripten_get_element_css_size(NULL, &client_w, &client_h); + for (i = 0; i < touchEvent->numTouches; i++) { SDL_FingerID id; float x, y; @@ -388,20 +428,44 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo continue; id = touchEvent->touches[i].identifier; - x = touchEvent->touches[i].canvasX / (float)window_data->windowed_width; - y = touchEvent->touches[i].canvasY / (float)window_data->windowed_height; + x = touchEvent->touches[i].canvasX / client_w; + y = touchEvent->touches[i].canvasY / client_h; - if (eventType == EMSCRIPTEN_EVENT_TOUCHMOVE) { - SDL_SendTouchMotion(deviceId, id, x, y, 1.0f); - } else if (eventType == EMSCRIPTEN_EVENT_TOUCHSTART) { + if (eventType == EMSCRIPTEN_EVENT_TOUCHSTART) { + if (!window_data->finger_touching) { + window_data->finger_touching = SDL_TRUE; + window_data->first_finger = id; + SDL_SendMouseMotion(window_data->window, SDL_TOUCH_MOUSEID, 0, x, y); + SDL_SendMouseButton(window_data->window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT); + } SDL_SendTouch(deviceId, id, SDL_TRUE, x, y, 1.0f); + + if (!preventDefault && SDL_GetEventState(SDL_FINGERDOWN) == SDL_ENABLE) { + preventDefault = 1; + } + } else if (eventType == EMSCRIPTEN_EVENT_TOUCHMOVE) { + if ((window_data->finger_touching) && (window_data->first_finger == id)) { + SDL_SendMouseMotion(window_data->window, SDL_TOUCH_MOUSEID, 0, x, y); + } + SDL_SendTouchMotion(deviceId, id, x, y, 1.0f); + + if (!preventDefault && SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) { + preventDefault = 1; + } } else { + if ((window_data->finger_touching) && (window_data->first_finger == id)) { + SDL_SendMouseButton(window_data->window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT); + window_data->finger_touching = SDL_FALSE; + } SDL_SendTouch(deviceId, id, SDL_FALSE, x, y, 1.0f); + + if (!preventDefault && SDL_GetEventState(SDL_FINGERUP) == SDL_ENABLE) { + preventDefault = 1; + } } } - - return 1; + return preventDefault; } EM_BOOL @@ -431,16 +495,19 @@ Emscripten_HandleKey(int eventType, const EmscriptenKeyboardEvent *keyEvent, voi break; } } - SDL_SendKeyboardKey(eventType == EMSCRIPTEN_EVENT_KEYDOWN ? - SDL_PRESSED : SDL_RELEASED, scancode); + SDL_SendKeyboardKey(eventType == EMSCRIPTEN_EVENT_KEYDOWN ? SDL_PRESSED : SDL_RELEASED, scancode); } } - /* if we prevent keydown, we won't get keypress - * also we need to ALWAYS prevent backspace and tab otherwise chrome takes action and does bad navigation UX + SDL_bool prevent_default = SDL_GetEventState(eventType == EMSCRIPTEN_EVENT_KEYDOWN ? SDL_KEYDOWN : SDL_KEYUP) == SDL_ENABLE; + + /* if TEXTINPUT events are enabled we can't prevent keydown or we won't get keypress + * we need to ALWAYS prevent backspace and tab otherwise chrome takes action and does bad navigation UX */ - return SDL_GetEventState(SDL_TEXTINPUT) != SDL_ENABLE || eventType != EMSCRIPTEN_EVENT_KEYDOWN - || keyEvent->keyCode == 8 /* backspace */ || keyEvent->keyCode == 9 /* tab */; + if (eventType == EMSCRIPTEN_EVENT_KEYDOWN && SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE && keyEvent->keyCode != 8 /* backspace */ && keyEvent->keyCode != 9 /* tab */) + prevent_default = SDL_FALSE; + + return prevent_default; } EM_BOOL @@ -450,65 +517,24 @@ Emscripten_HandleKeyPress(int eventType, const EmscriptenKeyboardEvent *keyEvent if (Emscripten_ConvertUTF32toUTF8(keyEvent->charCode, text)) { SDL_SendKeyboardText(text); } - return 1; + return SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE; } EM_BOOL Emscripten_HandleFullscreenChange(int eventType, const EmscriptenFullscreenChangeEvent *fullscreenChangeEvent, void *userData) { - /*make sure this is actually our element going fullscreen*/ - if(SDL_strcmp(fullscreenChangeEvent->id, "SDLFullscreenElement") != 0) - return 0; - SDL_WindowData *window_data = userData; if(fullscreenChangeEvent->isFullscreen) { - SDL_bool is_desktop_fullscreen; window_data->window->flags |= window_data->requested_fullscreen_mode; - if(!window_data->requested_fullscreen_mode) - window_data->window->flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; /*we didn't reqest fullscreen*/ - window_data->requested_fullscreen_mode = 0; - is_desktop_fullscreen = (window_data->window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP; - - /*update size*/ - if(window_data->window->flags & SDL_WINDOW_RESIZABLE || is_desktop_fullscreen) - { - emscripten_set_canvas_size(fullscreenChangeEvent->screenWidth, fullscreenChangeEvent->screenHeight); - SDL_SendWindowEvent(window_data->window, SDL_WINDOWEVENT_RESIZED, fullscreenChangeEvent->screenWidth, fullscreenChangeEvent->screenHeight); - } - else - { - /*preserve ratio*/ - double w = window_data->window->w; - double h = window_data->window->h; - double factor = SDL_min(fullscreenChangeEvent->screenWidth / w, fullscreenChangeEvent->screenHeight / h); - emscripten_set_element_css_size(NULL, w * factor, h * factor); - } + if(!window_data->requested_fullscreen_mode) + window_data->window->flags |= SDL_WINDOW_FULLSCREEN; /*we didn't reqest fullscreen*/ } else { - EM_ASM({ - //un-reparent canvas (similar to Module.requestFullscreen) - var canvas = Module['canvas']; - if(canvas.parentNode.id == "SDLFullscreenElement") { - var canvasContainer = canvas.parentNode; - canvasContainer.parentNode.insertBefore(canvas, canvasContainer); - canvasContainer.parentNode.removeChild(canvasContainer); - } - }); - double unscaled_w = window_data->windowed_width / window_data->pixel_ratio; - double unscaled_h = window_data->windowed_height / window_data->pixel_ratio; - emscripten_set_canvas_size(window_data->windowed_width, window_data->windowed_height); - - if (!window_data->external_size && window_data->pixel_ratio != 1.0f) { - emscripten_set_element_css_size(NULL, unscaled_w, unscaled_h); - } - - SDL_SendWindowEvent(window_data->window, SDL_WINDOWEVENT_RESIZED, unscaled_w, unscaled_h); - window_data->window->flags &= ~FULLSCREEN_MASK; } @@ -519,17 +545,11 @@ EM_BOOL Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData) { SDL_WindowData *window_data = userData; - if(window_data->window->flags & FULLSCREEN_MASK) - { - SDL_bool is_desktop_fullscreen = (window_data->window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP; - if(window_data->window->flags & SDL_WINDOW_RESIZABLE || is_desktop_fullscreen) - { - emscripten_set_canvas_size(uiEvent->windowInnerWidth * window_data->pixel_ratio, uiEvent->windowInnerHeight * window_data->pixel_ratio); - SDL_SendWindowEvent(window_data->window, SDL_WINDOWEVENT_RESIZED, uiEvent->windowInnerWidth, uiEvent->windowInnerHeight); - } - } - else + /* update pixel ratio */ + window_data->pixel_ratio = emscripten_get_device_pixel_ratio(); + + if(!(window_data->window->flags & FULLSCREEN_MASK)) { /* this will only work if the canvas size is set through css */ if(window_data->window->flags & SDL_WINDOW_RESIZABLE) @@ -555,6 +575,22 @@ Emscripten_HandleResize(int eventType, const EmscriptenUiEvent *uiEvent, void *u return 0; } +EM_BOOL +Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData) +{ + /*this is used during fullscreen changes*/ + SDL_WindowData *window_data = userData; + + if(window_data->fullscreen_resize) + { + double css_w, css_h; + emscripten_get_element_css_size(NULL, &css_w, &css_h); + SDL_SendWindowEvent(window_data->window, SDL_WINDOWEVENT_RESIZED, css_w, css_h); + } + + return 0; +} + EM_BOOL Emscripten_HandleVisibilityChange(int eventType, const EmscriptenVisibilityChangeEvent *visEvent, void *userData) { @@ -570,15 +606,15 @@ Emscripten_RegisterEventHandlers(SDL_WindowData *data) emscripten_set_mousemove_callback("#canvas", data, 0, Emscripten_HandleMouseMove); emscripten_set_mousedown_callback("#canvas", data, 0, Emscripten_HandleMouseButton); - emscripten_set_mouseup_callback("#canvas", data, 0, Emscripten_HandleMouseButton); + emscripten_set_mouseup_callback("#document", data, 0, Emscripten_HandleMouseButton); emscripten_set_mouseenter_callback("#canvas", data, 0, Emscripten_HandleMouseFocus); emscripten_set_mouseleave_callback("#canvas", data, 0, Emscripten_HandleMouseFocus); emscripten_set_wheel_callback("#canvas", data, 0, Emscripten_HandleWheel); - emscripten_set_focus_callback("#canvas", data, 0, Emscripten_HandleFocus); - emscripten_set_blur_callback("#canvas", data, 0, Emscripten_HandleFocus); + emscripten_set_focus_callback("#window", data, 0, Emscripten_HandleFocus); + emscripten_set_blur_callback("#window", data, 0, Emscripten_HandleFocus); emscripten_set_touchstart_callback("#canvas", data, 0, Emscripten_HandleTouch); emscripten_set_touchend_callback("#canvas", data, 0, Emscripten_HandleTouch); @@ -607,15 +643,15 @@ Emscripten_UnregisterEventHandlers(SDL_WindowData *data) emscripten_set_mousemove_callback("#canvas", NULL, 0, NULL); emscripten_set_mousedown_callback("#canvas", NULL, 0, NULL); - emscripten_set_mouseup_callback("#canvas", NULL, 0, NULL); + emscripten_set_mouseup_callback("#document", NULL, 0, NULL); emscripten_set_mouseenter_callback("#canvas", NULL, 0, NULL); emscripten_set_mouseleave_callback("#canvas", NULL, 0, NULL); emscripten_set_wheel_callback("#canvas", NULL, 0, NULL); - emscripten_set_focus_callback("#canvas", NULL, 0, NULL); - emscripten_set_blur_callback("#canvas", NULL, 0, NULL); + emscripten_set_focus_callback("#window", NULL, 0, NULL); + emscripten_set_blur_callback("#window", NULL, 0, NULL); emscripten_set_touchstart_callback("#canvas", NULL, 0, NULL); emscripten_set_touchend_callback("#canvas", NULL, 0, NULL); diff --git a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.h b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.h index d5b65f854..089ff60da 100644 --- a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.h +++ b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenevents.h @@ -30,6 +30,9 @@ Emscripten_RegisterEventHandlers(SDL_WindowData *data); extern void Emscripten_UnregisterEventHandlers(SDL_WindowData *data); + +extern int +Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData); #endif /* _SDL_emscriptenevents_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c index a26e23ae6..8a6a465d9 100644 --- a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c +++ b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c @@ -69,15 +69,25 @@ int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rec /* Send the data to the display */ EM_ASM_INT({ - //TODO: don't create context every update - var ctx = Module['canvas'].getContext('2d'); + var w = $0; + var h = $1; + var pixels = $2; - //library_sdl.js SDL_UnlockSurface - var image = ctx.createImageData($0, $1); - var data = image.data; - var src = $2 >> 2; + if (!Module['SDL2']) Module['SDL2'] = {}; + var SDL2 = Module['SDL2']; + if (SDL2.ctxCanvas !== Module['canvas']) { + SDL2.ctx = Module['createContext'](Module['canvas'], false, true); + SDL2.ctxCanvas = Module['canvas']; + } + if (SDL2.w !== w || SDL2.h !== h || SDL2.imageCtx !== SDL2.ctx) { + SDL2.image = SDL2.ctx.createImageData(w, h); + SDL2.w = w; + SDL2.h = h; + SDL2.imageCtx = SDL2.ctx; + } + var data = SDL2.image.data; + var src = pixels >> 2; var dst = 0; - var isScreen = true; var num; if (typeof CanvasPixelArray !== 'undefined' && data instanceof CanvasPixelArray) { // IE10/IE11: ImageData objects are backed by the deprecated CanvasPixelArray, @@ -90,26 +100,58 @@ int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rec data[dst ] = val & 0xff; data[dst+1] = (val >> 8) & 0xff; data[dst+2] = (val >> 16) & 0xff; - data[dst+3] = isScreen ? 0xff : ((val >> 24) & 0xff); + data[dst+3] = 0xff; src++; dst += 4; } } else { - var data32 = new Uint32Array(data.buffer); + if (SDL2.data32Data !== data) { + SDL2.data32 = new Int32Array(data.buffer); + SDL2.data8 = new Uint8Array(data.buffer); + } + var data32 = SDL2.data32; num = data32.length; - if (isScreen) { - while (dst < num) { - // HEAP32[src++] is an optimization. Instead, we could do {{{ makeGetValue('buffer', 'dst', 'i32') }}}; - data32[dst++] = HEAP32[src++] | 0xff000000; + // logically we need to do + // while (dst < num) { + // data32[dst++] = HEAP32[src++] | 0xff000000 + // } + // the following code is faster though, because + // .set() is almost free - easily 10x faster due to + // native memcpy efficiencies, and the remaining loop + // just stores, not load + store, so it is faster + data32.set(HEAP32.subarray(src, src + num)); + var data8 = SDL2.data8; + var i = 3; + var j = i + 4*num; + if (num % 8 == 0) { + // unrolling gives big speedups + while (i < j) { + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; + data8[i] = 0xff; + i = i + 4 | 0; } - } else { - while (dst < num) { - data32[dst++] = HEAP32[src++]; + } else { + while (i < j) { + data8[i] = 0xff; + i = i + 4 | 0; } } } - ctx.putImageData(image, 0, 0); + SDL2.ctx.putImageData(SDL2.image, 0, 0); return 0; }, surface->w, surface->h, surface->pixels); diff --git a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenmouse.c b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenmouse.c index 2a68dd95c..512ad2220 100644 --- a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenmouse.c +++ b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenmouse.c @@ -58,11 +58,13 @@ Emscripten_CreateDefaultCursor() return cursor; } +/* static SDL_Cursor* Emscripten_CreateCursor(SDL_Surface* sruface, int hot_x, int hot_y) { return Emscripten_CreateDefaultCursor(); } +*/ static SDL_Cursor* Emscripten_CreateSystemCursor(SDL_SystemCursor id) @@ -200,7 +202,9 @@ Emscripten_InitMouse() { SDL_Mouse* mouse = SDL_GetMouse(); +/* mouse->CreateCursor = Emscripten_CreateCursor; +*/ mouse->ShowCursor = Emscripten_ShowCursor; mouse->FreeCursor = Emscripten_FreeCursor; mouse->WarpMouse = Emscripten_WarpMouse; diff --git a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.c b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.c index 302ca8793..847bb4cf8 100644 --- a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.c +++ b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.c @@ -24,6 +24,7 @@ #include "SDL_video.h" #include "SDL_mouse.h" +#include "SDL_hints.h" #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h" #include "../SDL_egl_c.h" @@ -47,6 +48,7 @@ static void Emscripten_SetWindowSize(_THIS, SDL_Window * window); static void Emscripten_DestroyWindow(_THIS, SDL_Window * window); static void Emscripten_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen); static void Emscripten_PumpEvents(_THIS); +static void Emscripten_SetWindowTitle(_THIS, SDL_Window * window); /* Emscripten driver bootstrap functions */ @@ -75,6 +77,12 @@ Emscripten_CreateDevice(int devindex) return (0); } + /* Firefox sends blur event which would otherwise prevent full screen + * when the user clicks to allow full screen. + * See https://bugzilla.mozilla.org/show_bug.cgi?id=1144964 + */ + SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); + /* Set the function pointers */ device->VideoInit = Emscripten_VideoInit; device->VideoQuit = Emscripten_VideoQuit; @@ -84,9 +92,9 @@ Emscripten_CreateDevice(int devindex) device->PumpEvents = Emscripten_PumpEvents; device->CreateWindow = Emscripten_CreateWindow; - /*device->CreateWindowFrom = Emscripten_CreateWindowFrom; + /*device->CreateWindowFrom = Emscripten_CreateWindowFrom;*/ device->SetWindowTitle = Emscripten_SetWindowTitle; - device->SetWindowIcon = Emscripten_SetWindowIcon; + /*device->SetWindowIcon = Emscripten_SetWindowIcon; device->SetWindowPosition = Emscripten_SetWindowPosition;*/ device->SetWindowSize = Emscripten_SetWindowSize; /*device->ShowWindow = Emscripten_ShowWindow; @@ -129,15 +137,17 @@ int Emscripten_VideoInit(_THIS) { SDL_DisplayMode mode; - double css_w, css_h; /* Use a fake 32-bpp desktop mode */ mode.format = SDL_PIXELFORMAT_RGB888; - emscripten_get_element_css_size(NULL, &css_w, &css_h); + mode.w = EM_ASM_INT_V({ + return screen.width; + }); - mode.w = css_w; - mode.h = css_h; + mode.h = EM_ASM_INT_V({ + return screen.height; + }); mode.refresh_rate = 0; mode.driverdata = NULL; @@ -199,7 +209,7 @@ Emscripten_CreateWindow(_THIS, SDL_Window * window) emscripten_get_element_css_size(NULL, &css_w, &css_h); - wdata->external_size = css_w != scaled_w || css_h != scaled_h; + wdata->external_size = SDL_floor(css_w) != scaled_w || SDL_floor(css_h) != scaled_h; if ((window->flags & SDL_WINDOW_RESIZABLE) && wdata->external_size) { /* external css has resized us */ @@ -218,9 +228,6 @@ Emscripten_CreateWindow(_THIS, SDL_Window * window) } } - wdata->windowed_width = scaled_w; - wdata->windowed_height = scaled_h; - if (window->flags & SDL_WINDOW_OPENGL) { if (!_this->egl_data) { if (SDL_GL_LoadLibrary(NULL) < 0) { @@ -255,6 +262,8 @@ static void Emscripten_SetWindowSize(_THIS, SDL_Window * window) if (window->driverdata) { data = (SDL_WindowData *) window->driverdata; + /* update pixel ratio */ + data->pixel_ratio = emscripten_get_device_pixel_ratio(); emscripten_set_canvas_size(window->w * data->pixel_ratio, window->h * data->pixel_ratio); /*scale canvas down*/ @@ -290,30 +299,49 @@ Emscripten_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * di data = (SDL_WindowData *) window->driverdata; if(fullscreen) { + EmscriptenFullscreenStrategy strategy; + SDL_bool is_desktop_fullscreen = (window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP; + int res; + + strategy.scaleMode = is_desktop_fullscreen ? EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH : EMSCRIPTEN_FULLSCREEN_SCALE_ASPECT; + + if(!is_desktop_fullscreen) { + strategy.canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_NONE; + } else if(window->flags & SDL_WINDOW_ALLOW_HIGHDPI) { + strategy.canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_HIDEF; + } else { + strategy.canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_STDDEF; + } + + strategy.filteringMode = EMSCRIPTEN_FULLSCREEN_FILTERING_DEFAULT; + + strategy.canvasResizedCallback = Emscripten_HandleCanvasResize; + strategy.canvasResizedCallbackUserData = data; + data->requested_fullscreen_mode = window->flags & (SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN); - /*unset the fullscreen flags as we're not actually fullscreen yet*/ - window->flags &= ~(SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN); + data->fullscreen_resize = is_desktop_fullscreen; - EM_ASM({ - //reparent canvas (similar to Module.requestFullscreen) - var canvas = Module['canvas']; - if(canvas.parentNode.id != "SDLFullscreenElement") { - var canvasContainer = document.createElement("div"); - canvasContainer.id = "SDLFullscreenElement"; - canvas.parentNode.insertBefore(canvasContainer, canvas); - canvasContainer.appendChild(canvas); - } - }); - - int is_fullscreen; - emscripten_get_canvas_size(&data->windowed_width, &data->windowed_height, &is_fullscreen); - emscripten_request_fullscreen("SDLFullscreenElement", 1); + res = emscripten_request_fullscreen_strategy(NULL, 1, &strategy); + if(res != EMSCRIPTEN_RESULT_SUCCESS && res != EMSCRIPTEN_RESULT_DEFERRED) { + /* unset flags, fullscreen failed */ + window->flags &= ~(SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN); + } } else emscripten_exit_fullscreen(); } } +static void +Emscripten_SetWindowTitle(_THIS, SDL_Window * window) { + EM_ASM_INT({ + if (typeof Module['setWindowTitle'] !== 'undefined') { + Module['setWindowTitle'](Module['Pointer_stringify']($0)); + } + return 0; + }, window->title); +} + #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.h b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.h index e824de34f..7618ab6cc 100644 --- a/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.h +++ b/Engine/lib/sdl/src/video/emscripten/SDL_emscriptenvideo.h @@ -24,6 +24,7 @@ #define _SDL_emscriptenvideo_h #include "../SDL_sysvideo.h" +#include "../../events/SDL_touch_c.h" #include #include @@ -37,14 +38,15 @@ typedef struct SDL_WindowData SDL_Window *window; SDL_Surface *surface; - int windowed_width; - int windowed_height; - float pixel_ratio; SDL_bool external_size; int requested_fullscreen_mode; + SDL_bool fullscreen_resize; + + SDL_bool finger_touching; /* for mapping touch events to mice */ + SDL_FingerID first_finger; } SDL_WindowData; #endif /* _SDL_emscriptenvideo_h */ diff --git a/Engine/lib/sdl/src/video/haiku/SDL_BWin.h b/Engine/lib/sdl/src/video/haiku/SDL_BWin.h index dade664c3..a353e1aca 100644 --- a/Engine/lib/sdl/src/video/haiku/SDL_BWin.h +++ b/Engine/lib/sdl/src/video/haiku/SDL_BWin.h @@ -56,6 +56,7 @@ enum WinCommands { BWIN_RESTORE_WINDOW, BWIN_SET_TITLE, BWIN_SET_BORDERED, + BWIN_SET_RESIZABLE, BWIN_FULLSCREEN }; @@ -336,16 +337,30 @@ class SDL_BWin:public BDirectWindow break; case B_KEY_DOWN: + { + int32 i = 0; + int8 byte; + int8 bytes[4] = { 0, 0, 0, 0 }; + while (i < 4 && msg->FindInt8("byte", i, &byte) == B_OK) { + bytes[i] = byte; + i++; + } + if (msg->FindInt32("key", &key) == B_OK) { + _KeyEvent((SDL_Scancode)key, &bytes[0], i, SDL_PRESSED); + } + } + break; + case B_UNMAPPED_KEY_DOWN: /* modifier keys are unmapped */ if (msg->FindInt32("key", &key) == B_OK) { - _KeyEvent((SDL_Scancode)key, SDL_PRESSED); + _KeyEvent((SDL_Scancode)key, NULL, 0, SDL_PRESSED); } break; case B_KEY_UP: case B_UNMAPPED_KEY_UP: /* modifier keys are unmapped */ if (msg->FindInt32("key", &key) == B_OK) { - _KeyEvent(key, SDL_RELEASED); + _KeyEvent(key, NULL, 0, SDL_RELEASED); } break; @@ -378,6 +393,9 @@ class SDL_BWin:public BDirectWindow case BWIN_SET_BORDERED: _SetBordered(message); break; + case BWIN_SET_RESIZABLE: + _SetResizable(message); + break; case BWIN_SHOW_WINDOW: Show(); break; @@ -508,13 +526,15 @@ private: _PostWindowEvent(msg); } - void _KeyEvent(int32 keyCode, int32 keyState) { + void _KeyEvent(int32 keyCode, const int8 *keyUtf8, const ssize_t & len, int32 keyState) { /* Create a message to pass along to the BeApp thread */ BMessage msg(BAPP_KEY); msg.AddInt32("key-state", keyState); msg.AddInt32("key-scancode", keyCode); + if (keyUtf8 != NULL) { + msg.AddData("key-utf8", B_INT8_TYPE, (const void*)keyUtf8, len); + } be_app->PostMessage(&msg); - /* Apparently SDL only uses the scancode */ } void _RepaintEvent() { @@ -568,6 +588,18 @@ private: SetLook(bEnabled ? B_BORDERED_WINDOW_LOOK : B_NO_BORDER_WINDOW_LOOK); } + void _SetResizable(BMessage *msg) { + bool bEnabled; + if(msg->FindBool("window-resizable", &bEnabled) != B_OK) { + return; + } + if (bEnabled) { + SetFlags(Flags() & ~(B_NOT_RESIZABLE | B_NOT_ZOOMABLE)); + } else { + SetFlags(Flags() | (B_NOT_RESIZABLE | B_NOT_ZOOMABLE)); + } + } + void _Restore() { if(IsMinimized()) { Minimize(false); diff --git a/Engine/lib/sdl/src/video/haiku/SDL_bvideo.cc b/Engine/lib/sdl/src/video/haiku/SDL_bvideo.cc index 8c243b7a0..8986c609c 100644 --- a/Engine/lib/sdl/src/video/haiku/SDL_bvideo.cc +++ b/Engine/lib/sdl/src/video/haiku/SDL_bvideo.cc @@ -81,6 +81,7 @@ BE_CreateDevice(int devindex) device->MinimizeWindow = BE_MinimizeWindow; device->RestoreWindow = BE_RestoreWindow; device->SetWindowBordered = BE_SetWindowBordered; + device->SetWindowResizable = BE_SetWindowResizable; device->SetWindowFullscreen = BE_SetWindowFullscreen; device->SetWindowGammaRamp = BE_SetWindowGammaRamp; device->GetWindowGammaRamp = BE_GetWindowGammaRamp; diff --git a/Engine/lib/sdl/src/video/haiku/SDL_bwindow.cc b/Engine/lib/sdl/src/video/haiku/SDL_bwindow.cc index 287eac965..a35471df5 100644 --- a/Engine/lib/sdl/src/video/haiku/SDL_bwindow.cc +++ b/Engine/lib/sdl/src/video/haiku/SDL_bwindow.cc @@ -145,6 +145,12 @@ void BE_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) { _ToBeWin(window)->PostMessage(&msg); } +void BE_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable) { + BMessage msg(BWIN_SET_RESIZABLE); + msg.AddBool("window-resizable", resizable != SDL_FALSE); + _ToBeWin(window)->PostMessage(&msg); +} + void BE_ShowWindow(_THIS, SDL_Window * window) { BMessage msg(BWIN_SHOW_WINDOW); _ToBeWin(window)->PostMessage(&msg); diff --git a/Engine/lib/sdl/src/video/haiku/SDL_bwindow.h b/Engine/lib/sdl/src/video/haiku/SDL_bwindow.h index f64530ab7..388443dac 100644 --- a/Engine/lib/sdl/src/video/haiku/SDL_bwindow.h +++ b/Engine/lib/sdl/src/video/haiku/SDL_bwindow.h @@ -39,6 +39,7 @@ extern void BE_MaximizeWindow(_THIS, SDL_Window * window); extern void BE_MinimizeWindow(_THIS, SDL_Window * window); extern void BE_RestoreWindow(_THIS, SDL_Window * window); extern void BE_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered); +extern void BE_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable); extern void BE_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen); extern int BE_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp); extern int BE_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp); diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirdyn.c b/Engine/lib/sdl/src/video/mir/SDL_mirdyn.c index f9dfc0395..6bbe53759 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirdyn.c +++ b/Engine/lib/sdl/src/video/mir/SDL_mirdyn.c @@ -84,9 +84,8 @@ MIR_GetSym(const char *fnname, int *pHasModule) /* Define all the function pointers and wrappers... */ #define SDL_MIR_MODULE(modname) int SDL_MIR_HAVE_##modname = 0; #define SDL_MIR_SYM(rc,fn,params) SDL_DYNMIRFN_##fn MIR_##fn = NULL; +#define SDL_MIR_SYM_CONST(type,name) SDL_DYMMIRCONST_##name MIR_##name = NULL; #include "SDL_mirsym.h" -#undef SDL_MIR_MODULE -#undef SDL_MIR_SYM static int mir_load_refcount = 0; @@ -103,9 +102,8 @@ SDL_MIR_UnloadSymbols(void) /* set all the function pointers to NULL. */ #define SDL_MIR_MODULE(modname) SDL_MIR_HAVE_##modname = 0; #define SDL_MIR_SYM(rc,fn,params) MIR_##fn = NULL; +#define SDL_MIR_SYM_CONST(type,name) MIR_##name = NULL; #include "SDL_mirsym.h" -#undef SDL_MIR_MODULE -#undef SDL_MIR_SYM #ifdef SDL_VIDEO_DRIVER_MIR_DYNAMIC @@ -138,16 +136,12 @@ SDL_MIR_LoadSymbols(void) } #define SDL_MIR_MODULE(modname) SDL_MIR_HAVE_##modname = 1; /* default yes */ -#define SDL_MIR_SYM(rc,fn,params) #include "SDL_mirsym.h" -#undef SDL_MIR_MODULE -#undef SDL_MIR_SYM #define SDL_MIR_MODULE(modname) thismod = &SDL_MIR_HAVE_##modname; #define SDL_MIR_SYM(rc,fn,params) MIR_##fn = (SDL_DYNMIRFN_##fn) MIR_GetSym(#fn,thismod); +#define SDL_MIR_SYM_CONST(type,name) MIR_##name = *(SDL_DYMMIRCONST_##name*) MIR_GetSym(#name,thismod); #include "SDL_mirsym.h" -#undef SDL_MIR_MODULE -#undef SDL_MIR_SYM if ((SDL_MIR_HAVE_MIR_CLIENT) && (SDL_MIR_HAVE_XKBCOMMON)) { /* all required symbols loaded. */ @@ -162,9 +156,8 @@ SDL_MIR_LoadSymbols(void) #define SDL_MIR_MODULE(modname) SDL_MIR_HAVE_##modname = 1; /* default yes */ #define SDL_MIR_SYM(rc,fn,params) MIR_##fn = fn; +#define SDL_MIR_SYM_CONST(type,name) MIR_##name = name; #include "SDL_mirsym.h" -#undef SDL_MIR_MODULE -#undef SDL_MIR_SYM #endif } diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirdyn.h b/Engine/lib/sdl/src/video/mir/SDL_mirdyn.h index 48bf489c6..a3638cf05 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirdyn.h +++ b/Engine/lib/sdl/src/video/mir/SDL_mirdyn.h @@ -36,13 +36,13 @@ int SDL_MIR_LoadSymbols(void); void SDL_MIR_UnloadSymbols(void); /* Declare all the function pointers and wrappers... */ -#define SDL_MIR_MODULE(modname) #define SDL_MIR_SYM(rc,fn,params) \ typedef rc (*SDL_DYNMIRFN_##fn) params; \ extern SDL_DYNMIRFN_##fn MIR_##fn; +#define SDL_MIR_SYM_CONST(type, name) \ + typedef type SDL_DYMMIRCONST_##name; \ + extern SDL_DYMMIRCONST_##name MIR_##name; #include "SDL_mirsym.h" -#undef SDL_MIR_MODULE -#undef SDL_MIR_SYM #ifdef __cplusplus } diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirevents.c b/Engine/lib/sdl/src/video/mir/SDL_mirevents.c index 708f8ffde..e36986835 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirevents.c +++ b/Engine/lib/sdl/src/video/mir/SDL_mirevents.c @@ -53,73 +53,79 @@ HandleKeyText(int32_t key_code) } } -static void -CheckKeyboardFocus(SDL_Window* sdl_window) -{ - SDL_Window* keyboard_window = SDL_GetKeyboardFocus(); - - if (keyboard_window != sdl_window) - SDL_SetKeyboardFocus(sdl_window); -} - - /* FIXME Mir still needs to implement its IM API, for now we assume a single key press produces a character. */ static void -HandleKeyEvent(MirKeyEvent const ev, SDL_Window* window) +HandleKeyEvent(MirKeyboardEvent const* key_event, SDL_Window* window) { - uint32_t scancode = SDL_SCANCODE_UNKNOWN; - Uint8 key_state = ev.action == mir_key_action_up ? SDL_RELEASED : SDL_PRESSED; + xkb_keysym_t key_code; + Uint8 key_state; + int event_scancode; + uint32_t sdl_scancode = SDL_SCANCODE_UNKNOWN; - CheckKeyboardFocus(window); + MirKeyboardAction action = MIR_mir_keyboard_event_action(key_event); - if (ev.scan_code < SDL_arraysize(xfree86_scancode_table2)) - scancode = xfree86_scancode_table2[ev.scan_code]; + key_state = SDL_PRESSED; + key_code = MIR_mir_keyboard_event_key_code(key_event); + event_scancode = MIR_mir_keyboard_event_scan_code(key_event); - if (scancode != SDL_SCANCODE_UNKNOWN) - SDL_SendKeyboardKey(key_state, scancode); + if (action == mir_keyboard_action_up) + key_state = SDL_RELEASED; + + if (event_scancode < SDL_arraysize(xfree86_scancode_table2)) + sdl_scancode = xfree86_scancode_table2[event_scancode]; + + if (sdl_scancode != SDL_SCANCODE_UNKNOWN) + SDL_SendKeyboardKey(key_state, sdl_scancode); if (key_state == SDL_PRESSED) - HandleKeyText(ev.key_code); + HandleKeyText(key_code); } static void -HandleMouseButton(SDL_Window* sdl_window, Uint8 state, MirMotionButton button_state) +HandleMouseButton(SDL_Window* sdl_window, Uint8 state, MirPointerEvent const* pointer) { - static uint32_t last_sdl_button; - uint32_t sdl_button; + uint32_t sdl_button = SDL_BUTTON_LEFT; + MirPointerButton button_state = mir_pointer_button_primary; + + static uint32_t old_button_states = 0; + uint32_t new_button_states = MIR_mir_pointer_event_buttons(pointer); + + // XOR on our old button states vs our new states to get the newley pressed/released button + button_state = new_button_states ^ old_button_states; switch (button_state) { - case mir_motion_button_primary: + case mir_pointer_button_primary: sdl_button = SDL_BUTTON_LEFT; break; - case mir_motion_button_secondary: + case mir_pointer_button_secondary: sdl_button = SDL_BUTTON_RIGHT; break; - case mir_motion_button_tertiary: + case mir_pointer_button_tertiary: sdl_button = SDL_BUTTON_MIDDLE; break; - case mir_motion_button_forward: + case mir_pointer_button_forward: sdl_button = SDL_BUTTON_X1; break; - case mir_motion_button_back: + case mir_pointer_button_back: sdl_button = SDL_BUTTON_X2; break; default: - sdl_button = last_sdl_button; break; } - last_sdl_button = sdl_button; + old_button_states = new_button_states; + SDL_SendMouseButton(sdl_window, 0, state, sdl_button); } static void HandleMouseMotion(SDL_Window* sdl_window, int x, int y) { - SDL_SendMouseMotion(sdl_window, 0, 0, x, y); + SDL_Mouse* mouse = SDL_GetMouse(); + SDL_SendMouseMotion(sdl_window, 0, mouse->relative_mode, x, y); } static void @@ -148,71 +154,102 @@ AddTouchDevice(int device_id) } static void -HandleTouchEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_window) +HandleTouchEvent(MirTouchEvent const* touch, int device_id, SDL_Window* sdl_window) { - int device_id = motion.device_id; - int id = motion.pointer_coordinates[cord_index].id; + int i, point_count; + point_count = MIR_mir_touch_event_point_count(touch); - int width = sdl_window->w; - int height = sdl_window->h; - float x = motion.pointer_coordinates[cord_index].x; - float y = motion.pointer_coordinates[cord_index].y; + AddTouchDevice(device_id); - float n_x = x / width; - float n_y = y / height; - float pressure = motion.pointer_coordinates[cord_index].pressure; + for (i = 0; i < point_count; i++) { + int id = MIR_mir_touch_event_id(touch, i); - AddTouchDevice(motion.device_id); + int width = sdl_window->w; + int height = sdl_window->h; - switch (motion.action) { - case mir_motion_action_down: - case mir_motion_action_pointer_down: - HandleTouchPress(device_id, id, SDL_TRUE, n_x, n_y, pressure); - break; - case mir_motion_action_up: - case mir_motion_action_pointer_up: - HandleTouchPress(device_id, id, SDL_FALSE, n_x, n_y, pressure); - break; - case mir_motion_action_hover_move: - case mir_motion_action_move: - HandleTouchMotion(device_id, id, n_x, n_y, pressure); - break; - default: - break; + float x = MIR_mir_touch_event_axis_value(touch, i, mir_touch_axis_x); + float y = MIR_mir_touch_event_axis_value(touch, i, mir_touch_axis_y); + + float n_x = x / width; + float n_y = y / height; + + float pressure = MIR_mir_touch_event_axis_value(touch, i, mir_touch_axis_pressure); + + switch (MIR_mir_touch_event_action(touch, i)) { + case mir_touch_action_up: + HandleTouchPress(device_id, id, SDL_FALSE, n_x, n_y, pressure); + break; + case mir_touch_action_down: + HandleTouchPress(device_id, id, SDL_TRUE, n_x, n_y, pressure); + break; + case mir_touch_action_change: + HandleTouchMotion(device_id, id, n_x, n_y, pressure); + break; + case mir_touch_actions: + break; + } } } static void -HandleMouseEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_window) +HandleMouseEvent(MirPointerEvent const* pointer, SDL_Window* sdl_window) { SDL_SetMouseFocus(sdl_window); - switch (motion.action) { - case mir_motion_action_down: - case mir_motion_action_pointer_down: - HandleMouseButton(sdl_window, SDL_PRESSED, motion.button_state); + switch (MIR_mir_pointer_event_action(pointer)) { + case mir_pointer_action_button_down: + HandleMouseButton(sdl_window, SDL_PRESSED, pointer); break; - case mir_motion_action_up: - case mir_motion_action_pointer_up: - HandleMouseButton(sdl_window, SDL_RELEASED, motion.button_state); + case mir_pointer_action_button_up: + HandleMouseButton(sdl_window, SDL_RELEASED, pointer); break; - case mir_motion_action_hover_move: - case mir_motion_action_move: - HandleMouseMotion(sdl_window, - motion.pointer_coordinates[cord_index].x, - motion.pointer_coordinates[cord_index].y); + case mir_pointer_action_motion: { + int x, y; + int hscroll, vscroll; + SDL_Mouse* mouse = SDL_GetMouse(); + x = MIR_mir_pointer_event_axis_value(pointer, mir_pointer_axis_x); + y = MIR_mir_pointer_event_axis_value(pointer, mir_pointer_axis_y); + + if (mouse) { + if (mouse->relative_mode) { + int relative_x = MIR_mir_pointer_event_axis_value(pointer, mir_pointer_axis_relative_x); + int relative_y = MIR_mir_pointer_event_axis_value(pointer, mir_pointer_axis_relative_y); + HandleMouseMotion(sdl_window, relative_x, relative_y); + } + else if (mouse->x != x || mouse->y != y) { + HandleMouseMotion(sdl_window, x, y); + } + } + + hscroll = MIR_mir_pointer_event_axis_value(pointer, mir_pointer_axis_hscroll); + vscroll = MIR_mir_pointer_event_axis_value(pointer, mir_pointer_axis_vscroll); + if (vscroll != 0 || hscroll != 0) + HandleMouseScroll(sdl_window, hscroll, vscroll); + } break; - case mir_motion_action_outside: + case mir_pointer_action_leave: SDL_SetMouseFocus(NULL); break; - case mir_motion_action_scroll: - HandleMouseScroll(sdl_window, - motion.pointer_coordinates[cord_index].hscroll, - motion.pointer_coordinates[cord_index].vscroll); + case mir_pointer_action_enter: + default: break; - case mir_motion_action_cancel: - case mir_motion_action_hover_enter: - case mir_motion_action_hover_exit: + } +} + +static void +MIR_HandleInput(MirInputEvent const* input_event, SDL_Window* window) +{ + switch (MIR_mir_input_event_get_type(input_event)) { + case (mir_input_event_type_key): + HandleKeyEvent(MIR_mir_input_event_get_keyboard_event(input_event), window); + break; + case (mir_input_event_type_pointer): + HandleMouseEvent(MIR_mir_input_event_get_pointer_event(input_event), window); + break; + case (mir_input_event_type_touch): + HandleTouchEvent(MIR_mir_input_event_get_touch_event(input_event), + MIR_mir_input_event_get_device_id(input_event), + window); break; default: break; @@ -220,32 +257,54 @@ HandleMouseEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_wi } static void -HandleMotionEvent(MirMotionEvent const motion, SDL_Window* sdl_window) +MIR_HandleResize(MirResizeEvent const* resize_event, SDL_Window* window) { - int cord_index; - for (cord_index = 0; cord_index < motion.pointer_count; cord_index++) { - if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) { - HandleTouchEvent(motion, cord_index, sdl_window); + int new_w = MIR_mir_resize_event_get_width (resize_event); + int new_h = MIR_mir_resize_event_get_height(resize_event); + + int old_w = window->w; + int old_h = window->h; + + if (new_w != old_w || new_h != old_h) + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, new_w, new_h); +} + +static void +MIR_HandleSurface(MirSurfaceEvent const* surface_event, SDL_Window* window) +{ + MirSurfaceAttrib attrib = MIR_mir_surface_event_get_attribute(surface_event); + int value = MIR_mir_surface_event_get_attribute_value(surface_event); + + if (attrib == mir_surface_attrib_focus) { + if (value == mir_surface_focused) { + SDL_SetKeyboardFocus(window); } - else { - HandleMouseEvent(motion, cord_index, sdl_window); + else if (value == mir_surface_unfocused) { + SDL_SetKeyboardFocus(NULL); } } } void -MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context) +MIR_HandleEvent(MirSurface* surface, MirEvent const* ev, void* context) { - SDL_Window* window = (SDL_Window*)context; - switch (ev->type) { - case (mir_event_type_key): - HandleKeyEvent(ev->key, window); - break; - case (mir_event_type_motion): - HandleMotionEvent(ev->motion, window); - break; - default: - break; + MirEventType event_type = MIR_mir_event_get_type(ev); + SDL_Window* window = (SDL_Window*)context; + + if (window) { + switch (event_type) { + case (mir_event_type_input): + MIR_HandleInput(MIR_mir_event_get_input_event(ev), window); + break; + case (mir_event_type_resize): + MIR_HandleResize(MIR_mir_event_get_resize_event(ev), window); + break; + case (mir_event_type_surface): + MIR_HandleSurface(MIR_mir_event_get_surface_event(ev), window); + break; + default: + break; + } } } diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirevents.h b/Engine/lib/sdl/src/video/mir/SDL_mirevents.h index 3e0d96625..121c4b365 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirevents.h +++ b/Engine/lib/sdl/src/video/mir/SDL_mirevents.h @@ -29,7 +29,7 @@ #include extern void -MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context); +MIR_HandleEvent(MirSurface* surface, MirEvent const* ev, void* context); #endif /* _SDL_mirevents_h */ diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirframebuffer.c b/Engine/lib/sdl/src/video/mir/SDL_mirframebuffer.c index 53e6056ff..775bc0797 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirframebuffer.c +++ b/Engine/lib/sdl/src/video/mir/SDL_mirframebuffer.c @@ -33,39 +33,18 @@ #include "SDL_mirdyn.h" -static const Uint32 mir_pixel_format_to_sdl_format[] = { - SDL_PIXELFORMAT_UNKNOWN, /* mir_pixel_format_invalid */ - SDL_PIXELFORMAT_ABGR8888, /* mir_pixel_format_abgr_8888 */ - SDL_PIXELFORMAT_BGR888, /* mir_pixel_format_xbgr_8888 */ - SDL_PIXELFORMAT_ARGB8888, /* mir_pixel_format_argb_8888 */ - SDL_PIXELFORMAT_RGB888, /* mir_pixel_format_xrgb_8888 */ - SDL_PIXELFORMAT_BGR24 /* mir_pixel_format_bgr_888 */ -}; - -Uint32 -MIR_GetSDLPixelFormat(MirPixelFormat format) -{ - return mir_pixel_format_to_sdl_format[format]; -} - int MIR_CreateWindowFramebuffer(_THIS, SDL_Window* window, Uint32* format, void** pixels, int* pitch) { MIR_Data* mir_data = _this->driverdata; - MIR_Window* mir_window; - MirSurfaceParameters surfaceparm; mir_data->software = SDL_TRUE; if (MIR_CreateWindow(_this, window) < 0) return SDL_SetError("Failed to created a mir window."); - mir_window = window->driverdata; - - MIR_mir_surface_get_parameters(mir_window->surface, &surfaceparm); - - *format = MIR_GetSDLPixelFormat(surfaceparm.pixel_format); + *format = MIR_GetSDLPixelFormat(mir_data->pixel_format); if (*format == SDL_PIXELFORMAT_UNKNOWN) return SDL_SetError("Unknown pixel format"); @@ -75,12 +54,6 @@ MIR_CreateWindowFramebuffer(_THIS, SDL_Window* window, Uint32* format, if (*pixels == NULL) return SDL_OutOfMemory(); - mir_window->surface = MIR_mir_connection_create_surface_sync(mir_data->connection, &surfaceparm); - if (!MIR_mir_surface_is_valid(mir_window->surface)) { - const char* error = MIR_mir_surface_get_error_message(mir_window->surface); - return SDL_SetError("Failed to created a mir surface: %s", error); - } - return 0; } @@ -91,12 +64,14 @@ MIR_UpdateWindowFramebuffer(_THIS, SDL_Window* window, MIR_Window* mir_window = window->driverdata; MirGraphicsRegion region; + MirBufferStream* bs; int i, j, x, y, w, h, start; int bytes_per_pixel, bytes_per_row, s_stride, d_stride; char* s_dest; char* pixels; - MIR_mir_surface_get_graphics_region(mir_window->surface, ®ion); + bs = MIR_mir_surface_get_buffer_stream(mir_window->surface); + MIR_mir_buffer_stream_get_graphics_region(bs, ®ion); s_dest = region.vaddr; pixels = (char*)window->surface->pixels; @@ -138,13 +113,13 @@ MIR_UpdateWindowFramebuffer(_THIS, SDL_Window* window, bytes_per_row = bytes_per_pixel * w; for (j = 0; j < h; j++) { - memcpy(s_dest, pixels, bytes_per_row); + SDL_memcpy(s_dest, pixels, bytes_per_row); pixels += s_stride; s_dest += d_stride; } } - MIR_mir_surface_swap_buffers_sync(mir_window->surface); + MIR_mir_buffer_stream_swap_buffers_sync(bs); return 0; } diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirmouse.c b/Engine/lib/sdl/src/video/mir/SDL_mirmouse.c index bb8dc6c4e..1a22b28e8 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirmouse.c +++ b/Engine/lib/sdl/src/video/mir/SDL_mirmouse.c @@ -27,13 +27,22 @@ #if SDL_VIDEO_DRIVER_MIR -#include "SDL_mirmouse.h" - #include "../../events/SDL_mouse_c.h" +#include "../SDL_sysvideo.h" #include "SDL_assert.h" #include "SDL_mirdyn.h" +#include "SDL_mirvideo.h" +#include "SDL_mirmouse.h" +#include "SDL_mirwindow.h" + +typedef struct +{ + MirCursorConfiguration* conf; + MirBufferStream* stream; +} MIR_Cursor; + static SDL_Cursor* MIR_CreateDefaultCursor() { @@ -41,6 +50,18 @@ MIR_CreateDefaultCursor() cursor = SDL_calloc(1, sizeof(SDL_Cursor)); if (cursor) { + + MIR_Cursor* mir_cursor = SDL_calloc(1, sizeof(MIR_Cursor)); + if (mir_cursor) { + mir_cursor->conf = NULL; + mir_cursor->stream = NULL; + cursor->driverdata = mir_cursor; + } + else { + SDL_OutOfMemory(); + SDL_free(cursor); + cursor = NULL; + } } else { SDL_OutOfMemory(); @@ -49,58 +70,168 @@ MIR_CreateDefaultCursor() return cursor; } -static SDL_Cursor* -MIR_CreateCursor(SDL_Surface* sruface, int hot_x, int hot_y) +static void +CopySurfacePixelsToMirStream(SDL_Surface* surface, MirBufferStream* stream) { - return MIR_CreateDefaultCursor(); + char* dest, *pixels; + int i, s_w, s_h, r_stride, p_stride, bytes_per_pixel, bytes_per_row; + + MirGraphicsRegion region; + MIR_mir_buffer_stream_get_graphics_region(stream, ®ion); + + s_w = surface->w; + s_h = surface->h; + + bytes_per_pixel = surface->format->BytesPerPixel; + bytes_per_row = bytes_per_pixel * s_w; + + dest = region.vaddr; + pixels = (char*)surface->pixels; + + r_stride = region.stride; + p_stride = surface->pitch; + + for (i = 0; i < s_h; i++) + { + SDL_memcpy(dest, pixels, bytes_per_row); + dest += r_stride; + pixels += p_stride; + } +} + +static SDL_Cursor* +MIR_CreateCursor(SDL_Surface* surface, int hot_x, int hot_y) +{ + MirCursorConfiguration* conf; + MirBufferStream* stream; + + int s_w = surface->w; + int s_h = surface->h; + + MIR_Data* mir_data = (MIR_Data*)SDL_GetVideoDevice()->driverdata; + SDL_Cursor* cursor = MIR_CreateDefaultCursor(); + MIR_Cursor* mir_cursor; + + if (!cursor) { + return NULL; + } + + mir_cursor = (MIR_Cursor*)cursor->driverdata; + + stream = MIR_mir_connection_create_buffer_stream_sync(mir_data->connection, + s_w, s_h, mir_data->pixel_format, + mir_buffer_usage_software); + + conf = MIR_mir_cursor_configuration_from_buffer_stream(stream, hot_x, hot_y); + + CopySurfacePixelsToMirStream(surface, stream); + MIR_mir_buffer_stream_swap_buffers_sync(stream); + + mir_cursor->conf = conf; + mir_cursor->stream = stream; + + return cursor; } static SDL_Cursor* MIR_CreateSystemCursor(SDL_SystemCursor id) { + char const* cursor_name = NULL; + SDL_Cursor* cursor = MIR_CreateDefaultCursor(); + MIR_Cursor* mir_cursor = (MIR_Cursor*)cursor->driverdata; + + if (!cursor) { + return NULL; + } + switch(id) { case SDL_SYSTEM_CURSOR_ARROW: + cursor_name = MIR_mir_arrow_cursor_name; break; case SDL_SYSTEM_CURSOR_IBEAM: + cursor_name = MIR_mir_caret_cursor_name; break; case SDL_SYSTEM_CURSOR_WAIT: + cursor_name = MIR_mir_busy_cursor_name; break; case SDL_SYSTEM_CURSOR_CROSSHAIR: + /* Unsupported */ + cursor_name = MIR_mir_arrow_cursor_name; break; case SDL_SYSTEM_CURSOR_WAITARROW: + cursor_name = MIR_mir_busy_cursor_name; break; case SDL_SYSTEM_CURSOR_SIZENWSE: + cursor_name = MIR_mir_omnidirectional_resize_cursor_name; break; case SDL_SYSTEM_CURSOR_SIZENESW: + cursor_name = MIR_mir_omnidirectional_resize_cursor_name; break; case SDL_SYSTEM_CURSOR_SIZEWE: + cursor_name = MIR_mir_horizontal_resize_cursor_name; break; case SDL_SYSTEM_CURSOR_SIZENS: + cursor_name = MIR_mir_vertical_resize_cursor_name; break; case SDL_SYSTEM_CURSOR_SIZEALL: + cursor_name = MIR_mir_omnidirectional_resize_cursor_name; break; case SDL_SYSTEM_CURSOR_NO: + /* Unsupported */ + cursor_name = MIR_mir_closed_hand_cursor_name; break; case SDL_SYSTEM_CURSOR_HAND: + cursor_name = MIR_mir_open_hand_cursor_name; break; default: SDL_assert(0); return NULL; } - return MIR_CreateDefaultCursor(); + mir_cursor->conf = MIR_mir_cursor_configuration_from_name(cursor_name); + + return cursor; } static void MIR_FreeCursor(SDL_Cursor* cursor) { - if (cursor) - SDL_free(cursor); + if (cursor) { + + if (cursor->driverdata) { + MIR_Cursor* mir_cursor = (MIR_Cursor*)cursor->driverdata; + + if (mir_cursor->conf) + MIR_mir_cursor_configuration_destroy(mir_cursor->conf); + if (mir_cursor->stream) + MIR_mir_buffer_stream_release_sync(mir_cursor->stream); + + SDL_free(mir_cursor); + } + + SDL_free(cursor); + } } static int MIR_ShowCursor(SDL_Cursor* cursor) { + MIR_Data* mir_data = (MIR_Data*)SDL_GetVideoDevice()->driverdata; + MIR_Window* mir_window = mir_data->current_window; + + if (cursor && cursor->driverdata) { + if (mir_window && MIR_mir_surface_is_valid(mir_window->surface)) { + MIR_Cursor* mir_cursor = (MIR_Cursor*)cursor->driverdata; + + if (mir_cursor->conf) { + MIR_mir_surface_configure_cursor(mir_window->surface, mir_cursor->conf); + } + } + } + else if(mir_window && MIR_mir_surface_is_valid(mir_window->surface)) { + MIR_mir_surface_configure_cursor(mir_window->surface, NULL); + } + return 0; } @@ -119,7 +250,7 @@ MIR_WarpMouseGlobal(int x, int y) static int MIR_SetRelativeMouseMode(SDL_bool enabled) { - return SDL_Unsupported(); + return 0; } /* TODO Actually implement the cursor, need to wait for mir support */ diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirsym.h b/Engine/lib/sdl/src/video/mir/SDL_mirsym.h index d0aaf70a3..4f97ed96c 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirsym.h +++ b/Engine/lib/sdl/src/video/mir/SDL_mirsym.h @@ -21,29 +21,122 @@ /* *INDENT-OFF* */ +#ifndef SDL_MIR_MODULE +#define SDL_MIR_MODULE(modname) +#endif + +#ifndef SDL_MIR_SYM +#define SDL_MIR_SYM(rc,fn,params) +#endif + +#ifndef SDL_MIR_SYM_CONST +#define SDL_MIR_SYM_CONST(type, name) +#endif + SDL_MIR_MODULE(MIR_CLIENT) -SDL_MIR_SYM(MirDisplayConfiguration*,mir_connection_create_display_config,(MirConnection *connection)) -SDL_MIR_SYM(MirSurface *,mir_connection_create_surface_sync,(MirConnection *connection, MirSurfaceParameters const *params)) +SDL_MIR_SYM(MirSurface *,mir_surface_create_sync,(MirSurfaceSpec* spec)) +SDL_MIR_SYM(MirEGLNativeWindowType,mir_buffer_stream_get_egl_native_window,(MirBufferStream *surface)) +SDL_MIR_SYM(void,mir_buffer_stream_get_graphics_region,(MirBufferStream *stream, MirGraphicsRegion *graphics_region)) +SDL_MIR_SYM(void,mir_buffer_stream_swap_buffers_sync,(MirBufferStream *stream)) +SDL_MIR_SYM(void,mir_surface_set_event_handler,(MirSurface *surface, mir_surface_event_callback callback, void* context)) +SDL_MIR_SYM(MirSurfaceSpec*,mir_connection_create_spec_for_normal_surface,(MirConnection *connection, int width, int height, MirPixelFormat format)) +SDL_MIR_SYM(MirSurfaceSpec*,mir_connection_create_spec_for_changes,(MirConnection *connection)) +SDL_MIR_SYM(void,mir_surface_spec_set_buffer_usage,(MirSurfaceSpec *spec, MirBufferUsage usage)) +SDL_MIR_SYM(void,mir_surface_spec_set_name,(MirSurfaceSpec *spec, char const *name)) +SDL_MIR_SYM(void,mir_surface_spec_release,(MirSurfaceSpec *spec)) +SDL_MIR_SYM(void,mir_surface_spec_set_width,(MirSurfaceSpec *spec, unsigned width)) +SDL_MIR_SYM(void,mir_surface_spec_set_height,(MirSurfaceSpec *spec, unsigned height)) +SDL_MIR_SYM(void,mir_surface_spec_set_min_width,(MirSurfaceSpec *spec, unsigned min_width)) +SDL_MIR_SYM(void,mir_surface_spec_set_min_height,(MirSurfaceSpec *spec, unsigned min_height)) +SDL_MIR_SYM(void,mir_surface_spec_set_max_width,(MirSurfaceSpec *spec, unsigned max_width)) +SDL_MIR_SYM(void,mir_surface_spec_set_max_height,(MirSurfaceSpec *spec, unsigned max_height)) +SDL_MIR_SYM(void,mir_surface_spec_set_type,(MirSurfaceSpec *spec, MirSurfaceType type)) +SDL_MIR_SYM(void,mir_surface_spec_set_state,(MirSurfaceSpec *spec, MirSurfaceState state)) +SDL_MIR_SYM(void,mir_surface_spec_set_pointer_confinement,(MirSurfaceSpec *spec, MirPointerConfinementState state)) +SDL_MIR_SYM(void,mir_surface_apply_spec,(MirSurface *surface, MirSurfaceSpec *spec)) +SDL_MIR_SYM(void,mir_surface_get_parameters,(MirSurface *surface, MirSurfaceParameters *params)) +SDL_MIR_SYM(MirBufferStream*,mir_surface_get_buffer_stream,(MirSurface *surface)) +SDL_MIR_SYM(MirCursorConfiguration*,mir_cursor_configuration_from_buffer_stream,(MirBufferStream const* stream, int hot_x, int hot_y)) +SDL_MIR_SYM(MirBufferStream*,mir_connection_create_buffer_stream_sync,(MirConnection *connection, int w, int h, MirPixelFormat format, MirBufferUsage usage)) +SDL_MIR_SYM(MirKeyboardAction,mir_keyboard_event_action,(MirKeyboardEvent const *event)) +SDL_MIR_SYM(xkb_keysym_t,mir_keyboard_event_key_code,(MirKeyboardEvent const *event)) +SDL_MIR_SYM(int,mir_keyboard_event_scan_code,(MirKeyboardEvent const *event)) +SDL_MIR_SYM(bool,mir_pointer_event_button_state,(MirPointerEvent const *event, MirPointerButton button)) +SDL_MIR_SYM(MirPointerButtons,mir_pointer_event_buttons,(MirPointerEvent const *event)) +SDL_MIR_SYM(MirInputDeviceId,mir_input_event_get_device_id,(MirInputEvent const* ev)) +SDL_MIR_SYM(MirTouchId,mir_touch_event_id,(MirTouchEvent const *event, size_t touch_index)) +SDL_MIR_SYM(float,mir_touch_event_axis_value,(MirTouchEvent const *event, size_t touch_index, MirTouchAxis axis)) +SDL_MIR_SYM(MirTouchAction,mir_touch_event_action,(MirTouchEvent const *event, size_t touch_index)) +SDL_MIR_SYM(MirPointerAction,mir_pointer_event_action,(MirPointerEvent const *event)) +SDL_MIR_SYM(float,mir_pointer_event_axis_value,(MirPointerEvent const *event, MirPointerAxis)) +SDL_MIR_SYM(MirEventType,mir_event_get_type,(MirEvent const *event)) +SDL_MIR_SYM(MirInputEventType,mir_input_event_get_type,(MirInputEvent const *event)) +SDL_MIR_SYM(MirInputEvent const*,mir_event_get_input_event,(MirEvent const *event)) +SDL_MIR_SYM(MirResizeEvent const*,mir_event_get_resize_event,(MirEvent const *event)) +SDL_MIR_SYM(MirKeyboardEvent const*,mir_input_event_get_keyboard_event,(MirInputEvent const *event)) +SDL_MIR_SYM(MirPointerEvent const*,mir_input_event_get_pointer_event,(MirInputEvent const *event)) +SDL_MIR_SYM(MirTouchEvent const*,mir_input_event_get_touch_event,(MirInputEvent const *event)) +SDL_MIR_SYM(MirSurfaceEvent const*,mir_event_get_surface_event,(MirEvent const *event)) +SDL_MIR_SYM(unsigned int,mir_touch_event_point_count,(MirTouchEvent const *event)) SDL_MIR_SYM(void,mir_connection_get_available_surface_formats,(MirConnection* connection, MirPixelFormat* formats, unsigned const int format_size, unsigned int *num_valid_formats)) SDL_MIR_SYM(MirEGLNativeDisplayType,mir_connection_get_egl_native_display,(MirConnection *connection)) -SDL_MIR_SYM(MirBool,mir_connection_is_valid,(MirConnection *connection)) +SDL_MIR_SYM(bool,mir_connection_is_valid,(MirConnection *connection)) SDL_MIR_SYM(void,mir_connection_release,(MirConnection *connection)) +SDL_MIR_SYM(MirPixelFormat,mir_connection_get_egl_pixel_format,(MirConnection* connection, void* egldisplay, void* eglconfig)) SDL_MIR_SYM(MirConnection *,mir_connect_sync,(char const *server, char const *app_name)) -SDL_MIR_SYM(void,mir_display_config_destroy,(MirDisplayConfiguration* display_configuration)) -SDL_MIR_SYM(MirEGLNativeWindowType,mir_surface_get_egl_native_window,(MirSurface *surface)) SDL_MIR_SYM(char const *,mir_surface_get_error_message,(MirSurface *surface)) -SDL_MIR_SYM(void,mir_surface_get_graphics_region,(MirSurface *surface, MirGraphicsRegion *graphics_region)) -SDL_MIR_SYM(void,mir_surface_get_parameters,(MirSurface *surface, MirSurfaceParameters *parameters)) -SDL_MIR_SYM(MirBool,mir_surface_is_valid,(MirSurface *surface)) +SDL_MIR_SYM(bool,mir_surface_is_valid,(MirSurface *surface)) SDL_MIR_SYM(void,mir_surface_release_sync,(MirSurface *surface)) -SDL_MIR_SYM(void,mir_surface_set_event_handler,(MirSurface *surface, MirEventDelegate const *event_handler)) -SDL_MIR_SYM(MirWaitHandle*,mir_surface_set_type,(MirSurface *surface, MirSurfaceType type)) -SDL_MIR_SYM(MirWaitHandle*,mir_surface_set_state,(MirSurface *surface, MirSurfaceState state)) -SDL_MIR_SYM(void,mir_surface_swap_buffers_sync,(MirSurface *surface)) +SDL_MIR_SYM(void,mir_buffer_stream_release_sync,(MirBufferStream *stream)) +SDL_MIR_SYM(MirCursorConfiguration*,mir_cursor_configuration_from_name,(char const* cursor_name)) +SDL_MIR_SYM(MirWaitHandle*,mir_surface_configure_cursor,(MirSurface* surface, MirCursorConfiguration const* conf)) +SDL_MIR_SYM(void,mir_cursor_configuration_destroy,(MirCursorConfiguration* conf)) +SDL_MIR_SYM(int,mir_resize_event_get_width,(MirResizeEvent const* resize_event)) +SDL_MIR_SYM(int,mir_resize_event_get_height,(MirResizeEvent const* resize_event)) +SDL_MIR_SYM(char const*,mir_connection_get_error_message,(MirConnection* connection)) +SDL_MIR_SYM(MirSurfaceAttrib,mir_surface_event_get_attribute,(MirSurfaceEvent const* surface_event)) +SDL_MIR_SYM(int,mir_surface_event_get_attribute_value,(MirSurfaceEvent const* surface_event)) +SDL_MIR_SYM(void,mir_wait_for,(MirWaitHandle* handle)) +SDL_MIR_SYM(MirDisplayConfig*,mir_connection_create_display_configuration,(MirConnection* connection)) +SDL_MIR_SYM(void,mir_display_config_release,(MirDisplayConfig* config)) +SDL_MIR_SYM(int,mir_display_config_get_num_outputs,(MirDisplayConfig const* config)) +SDL_MIR_SYM(MirOutput*,mir_display_config_get_mutable_output,(MirDisplayConfig* config, size_t index)) +SDL_MIR_SYM(int,mir_output_get_num_modes,(MirOutput const* output)) +SDL_MIR_SYM(MirPixelFormat,mir_output_get_current_pixel_format,(MirOutput const* output)) +SDL_MIR_SYM(int,mir_output_get_position_x,(MirOutput const* output)) +SDL_MIR_SYM(int,mir_output_get_position_y,(MirOutput const* output)) +SDL_MIR_SYM(bool,mir_output_is_enabled,(MirOutput const* output)) +SDL_MIR_SYM(MirOutputConnectionState,mir_output_get_connection_state,(MirOutput const* output)) +SDL_MIR_SYM(size_t,mir_output_get_preferred_mode_index,(MirOutput const* output)) +SDL_MIR_SYM(MirOutputType,mir_output_get_type,(MirOutput const* output)) +SDL_MIR_SYM(char const*,mir_output_type_name,(MirOutputType type)) +SDL_MIR_SYM(void,mir_output_set_current_mode,(MirOutput* output, MirOutputMode const* mode)) +SDL_MIR_SYM(MirOutputMode const*,mir_output_get_mode,(MirOutput const* output, size_t index)) +SDL_MIR_SYM(int,mir_output_mode_get_width,(MirOutputMode const* mode)) +SDL_MIR_SYM(int,mir_output_mode_get_height,(MirOutputMode const* mode)) +SDL_MIR_SYM(double,mir_output_mode_get_refresh_rate,(MirOutputMode const* mode)) +SDL_MIR_SYM(MirOutputGammaSupported,mir_output_is_gamma_supported,(MirOutput const* output)) +SDL_MIR_SYM(uint32_t,mir_output_get_gamma_size,(MirOutput const* output)) +SDL_MIR_SYM(void,mir_output_get_gamma,(MirOutput const* output, uint16_t* red, uint16_t* green, uint16_t* blue, uint32_t size)) +SDL_MIR_SYM(void,mir_output_set_gamma,(MirOutput* output, uint16_t const* red, uint16_t const* green, uint16_t const* blue, uint32_t size)) + +SDL_MIR_SYM_CONST(char const*,mir_omnidirectional_resize_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_busy_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_arrow_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_caret_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_vertical_resize_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_horizontal_resize_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_open_hand_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_closed_hand_cursor_name) +SDL_MIR_SYM_CONST(char const*,mir_disabled_cursor_name) SDL_MIR_MODULE(XKBCOMMON) SDL_MIR_SYM(int,xkb_keysym_to_utf8,(xkb_keysym_t keysym, char *buffer, size_t size)) +#undef SDL_MIR_MODULE +#undef SDL_MIR_SYM +#undef SDL_MIR_SYM_CONST + /* *INDENT-ON* */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirvideo.c b/Engine/lib/sdl/src/video/mir/SDL_mirvideo.c index b6160fd92..6a8f9e482 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirvideo.c +++ b/Engine/lib/sdl/src/video/mir/SDL_mirvideo.c @@ -27,18 +27,37 @@ #if SDL_VIDEO_DRIVER_MIR +#include "SDL_mirwindow.h" #include "SDL_video.h" #include "SDL_mirframebuffer.h" #include "SDL_mirmouse.h" #include "SDL_miropengl.h" #include "SDL_mirvideo.h" -#include "SDL_mirwindow.h" #include "SDL_mirdyn.h" #define MIR_DRIVER_NAME "mir" +static const Uint32 mir_pixel_format_to_sdl_format[] = { + SDL_PIXELFORMAT_UNKNOWN, /* mir_pixel_format_invalid */ + SDL_PIXELFORMAT_ABGR8888, /* mir_pixel_format_abgr_8888 */ + SDL_PIXELFORMAT_BGR888, /* mir_pixel_format_xbgr_8888 */ + SDL_PIXELFORMAT_ARGB8888, /* mir_pixel_format_argb_8888 */ + SDL_PIXELFORMAT_RGB888, /* mir_pixel_format_xrgb_8888 */ + SDL_PIXELFORMAT_BGR24, /* mir_pixel_format_bgr_888 */ + SDL_PIXELFORMAT_RGB24, /* mir_pixel_format_rgb_888 */ + SDL_PIXELFORMAT_RGB565, /* mir_pixel_format_rgb_565 */ + SDL_PIXELFORMAT_RGBA5551, /* mir_pixel_format_rgba_5551 */ + SDL_PIXELFORMAT_RGBA4444 /* mir_pixel_format_rgba_4444 */ +}; + +Uint32 +MIR_GetSDLPixelFormat(MirPixelFormat format) +{ + return mir_pixel_format_to_sdl_format[format]; +} + static int MIR_VideoInit(_THIS); @@ -94,7 +113,7 @@ MIR_DeleteDevice(SDL_VideoDevice* device) SDL_MIR_UnloadSymbols(); } -void +static void MIR_PumpEvents(_THIS) { } @@ -146,29 +165,30 @@ MIR_CreateDevice(int device_index) device->GL_GetProcAddress = MIR_GL_GetProcAddress; /* mirwindow */ - device->CreateWindow = MIR_CreateWindow; - device->DestroyWindow = MIR_DestroyWindow; - device->GetWindowWMInfo = MIR_GetWindowWMInfo; - device->SetWindowFullscreen = MIR_SetWindowFullscreen; - device->MaximizeWindow = MIR_MaximizeWindow; - device->MinimizeWindow = MIR_MinimizeWindow; - device->RestoreWindow = MIR_RestoreWindow; + device->CreateWindow = MIR_CreateWindow; + device->DestroyWindow = MIR_DestroyWindow; + device->GetWindowWMInfo = MIR_GetWindowWMInfo; + device->SetWindowFullscreen = MIR_SetWindowFullscreen; + device->MaximizeWindow = MIR_MaximizeWindow; + device->MinimizeWindow = MIR_MinimizeWindow; + device->RestoreWindow = MIR_RestoreWindow; + device->ShowWindow = MIR_RestoreWindow; + device->HideWindow = MIR_HideWindow; + device->SetWindowSize = MIR_SetWindowSize; + device->SetWindowMinimumSize = MIR_SetWindowMinimumSize; + device->SetWindowMaximumSize = MIR_SetWindowMaximumSize; + device->SetWindowTitle = MIR_SetWindowTitle; + device->SetWindowGrab = MIR_SetWindowGrab; + device->SetWindowGammaRamp = MIR_SetWindowGammaRamp; + device->GetWindowGammaRamp = MIR_GetWindowGammaRamp; device->CreateWindowFrom = NULL; - device->SetWindowTitle = NULL; device->SetWindowIcon = NULL; - device->SetWindowPosition = NULL; - device->SetWindowSize = NULL; - device->SetWindowMinimumSize = NULL; - device->SetWindowMaximumSize = NULL; - device->ShowWindow = NULL; - device->HideWindow = NULL; device->RaiseWindow = NULL; device->SetWindowBordered = NULL; - device->SetWindowGammaRamp = NULL; - device->GetWindowGammaRamp = NULL; - device->SetWindowGrab = NULL; + device->SetWindowResizable = NULL; device->OnWindowEnter = NULL; + device->SetWindowPosition = NULL; /* mirframebuffer */ device->CreateWindowFramebuffer = MIR_CreateWindowFramebuffer; @@ -206,77 +226,88 @@ VideoBootStrap MIR_bootstrap = { MIR_Available, MIR_CreateDevice }; -static void -MIR_SetCurrentDisplayMode(MirDisplayOutput const* out, SDL_VideoDisplay* display) +static SDL_DisplayMode +MIR_ConvertModeToSDLMode(MirOutputMode const* mode, MirPixelFormat format) { - SDL_DisplayMode mode = { - .format = SDL_PIXELFORMAT_RGB888, - .w = out->modes[out->current_mode].horizontal_resolution, - .h = out->modes[out->current_mode].vertical_resolution, - .refresh_rate = out->modes[out->current_mode].refresh_rate, - .driverdata = NULL + SDL_DisplayMode sdl_mode = { + .format = MIR_GetSDLPixelFormat(format), + .w = MIR_mir_output_mode_get_width(mode), + .h = MIR_mir_output_mode_get_height(mode), + .refresh_rate = MIR_mir_output_mode_get_refresh_rate(mode), + .driverdata = NULL }; - display->desktop_mode = mode; - display->current_mode = mode; + return sdl_mode; } static void -MIR_AddAllModesFromDisplay(MirDisplayOutput const* out, SDL_VideoDisplay* display) +MIR_AddModeToDisplay(SDL_VideoDisplay* display, MirOutputMode const* mode, MirPixelFormat format) { - int n_mode; - for (n_mode = 0; n_mode < out->num_modes; ++n_mode) { - SDL_DisplayMode mode = { - .format = SDL_PIXELFORMAT_RGB888, - .w = out->modes[n_mode].horizontal_resolution, - .h = out->modes[n_mode].vertical_resolution, - .refresh_rate = out->modes[n_mode].refresh_rate, - .driverdata = NULL - }; + SDL_DisplayMode sdl_mode = MIR_ConvertModeToSDLMode(mode, format); + SDL_AddDisplayMode(display, &sdl_mode); +} - SDL_AddDisplayMode(display, &mode); +static void +MIR_InitDisplayFromOutput(_THIS, MirOutput* output) +{ + SDL_VideoDisplay display; + int m; + + MirPixelFormat format = MIR_mir_output_get_current_pixel_format(output); + int num_modes = MIR_mir_output_get_num_modes(output); + SDL_DisplayMode current_mode = MIR_ConvertModeToSDLMode(mir_output_get_current_mode(output), format); + + SDL_zero(display); + + // Unfortunate cast, but SDL_AddVideoDisplay will strdup this pointer so its read-only in this case. + display.name = (char*)MIR_mir_output_type_name(MIR_mir_output_get_type(output)); + + for (m = 0; m < num_modes; m++) { + MirOutputMode const* mode = MIR_mir_output_get_mode(output, m); + MIR_AddModeToDisplay(&display, mode, format); } + + display.desktop_mode = current_mode; + display.current_mode = current_mode; + + display.driverdata = output; + SDL_AddVideoDisplay(&display); } static void MIR_InitDisplays(_THIS) { MIR_Data* mir_data = _this->driverdata; + int num_outputs = MIR_mir_display_config_get_num_outputs(mir_data->display_config); int d; - MirDisplayConfiguration* display_config = MIR_mir_connection_create_display_config(mir_data->connection); + for (d = 0; d < num_outputs; d++) { + MirOutput* output = MIR_mir_display_config_get_mutable_output(mir_data->display_config, d); + SDL_bool enabled = MIR_mir_output_is_enabled(output); + MirOutputConnectionState state = MIR_mir_output_get_connection_state(output); - for (d = 0; d < display_config->num_outputs; d++) { - MirDisplayOutput const* out = display_config->outputs + d; - - SDL_VideoDisplay display; - SDL_zero(display); - - if (out->used && - out->connected && - out->num_modes && - out->current_mode < out->num_modes) { - - MIR_SetCurrentDisplayMode(out, &display); - MIR_AddAllModesFromDisplay(out, &display); - - SDL_AddVideoDisplay(&display); + if (enabled && state == mir_output_connection_state_connected) { + MIR_InitDisplayFromOutput(_this, output); } } - - MIR_mir_display_config_destroy(display_config); } -int +static int MIR_VideoInit(_THIS) { MIR_Data* mir_data = _this->driverdata; - mir_data->connection = MIR_mir_connect_sync(NULL, __PRETTY_FUNCTION__); - mir_data->software = SDL_FALSE; + mir_data->connection = MIR_mir_connect_sync(NULL, __PRETTY_FUNCTION__); + mir_data->current_window = NULL; + mir_data->software = SDL_FALSE; + mir_data->pixel_format = mir_pixel_format_invalid; - if (!MIR_mir_connection_is_valid(mir_data->connection)) - return SDL_SetError("Failed to connect to the Mir Server"); + if (!MIR_mir_connection_is_valid(mir_data->connection)) { + return SDL_SetError("Failed to connect to the mir server: %s", + MIR_mir_connection_get_error_message(mir_data->connection)); + } + + mir_data->display_config = MIR_mir_connection_create_display_configuration(mir_data->connection); MIR_InitDisplays(_this); MIR_InitMouse(); @@ -284,11 +315,27 @@ MIR_VideoInit(_THIS) return 0; } -void +static void +MIR_CleanUpDisplayConfig(_THIS) +{ + MIR_Data* mir_data = _this->driverdata; + int i; + + // SDL_VideoQuit frees the display driverdata, we own it not them + for (i = 0; i < _this->num_displays; ++i) { + _this->displays[i].driverdata = NULL; + } + + MIR_mir_display_config_release(mir_data->display_config); +} + +static void MIR_VideoQuit(_THIS) { MIR_Data* mir_data = _this->driverdata; + MIR_CleanUpDisplayConfig(_this); + MIR_FiniMouse(); MIR_GL_DeleteContext(_this, NULL); @@ -303,40 +350,48 @@ MIR_VideoQuit(_THIS) static int MIR_GetDisplayBounds(_THIS, SDL_VideoDisplay* display, SDL_Rect* rect) { - MIR_Data* mir_data = _this->driverdata; - int d; + MirOutput const* output = display->driverdata; - MirDisplayConfiguration* display_config = MIR_mir_connection_create_display_config(mir_data->connection); - - for (d = 0; d < display_config->num_outputs; d++) { - MirDisplayOutput const* out = display_config->outputs + d; - - if (out->used && - out->connected && - out->num_modes && - out->current_mode < out->num_modes) { - - rect->x = out->position_x; - rect->y = out->position_y; - rect->w = out->modes->horizontal_resolution; - rect->h = out->modes->vertical_resolution; - } - } - - MIR_mir_display_config_destroy(display_config); + rect->x = MIR_mir_output_get_position_x(output); + rect->y = MIR_mir_output_get_position_y(output); + rect->w = display->current_mode.w; + rect->h = display->current_mode.h; return 0; } static void -MIR_GetDisplayModes(_THIS, SDL_VideoDisplay* sdl_display) +MIR_GetDisplayModes(_THIS, SDL_VideoDisplay* display) { } static int -MIR_SetDisplayMode(_THIS, SDL_VideoDisplay* sdl_display, SDL_DisplayMode* mode) +MIR_SetDisplayMode(_THIS, SDL_VideoDisplay* display, SDL_DisplayMode* mode) { - return 0; + int m; + MirOutput* output = display->driverdata; + int num_modes = MIR_mir_output_get_num_modes(output); + Uint32 sdl_format = MIR_GetSDLPixelFormat( + MIR_mir_output_get_current_pixel_format(output)); + + for (m = 0; m < num_modes; m++) { + MirOutputMode const* mir_mode = MIR_mir_output_get_mode(output, m); + int width = MIR_mir_output_mode_get_width(mir_mode); + int height = MIR_mir_output_mode_get_height(mir_mode); + double refresh_rate = MIR_mir_output_mode_get_refresh_rate(mir_mode); + + if (mode->format == sdl_format && + mode->w == width && + mode->h == height && + mode->refresh_rate == refresh_rate) { + + // FIXME Currently wont actually *set* anything. Need to wait for applying display changes + MIR_mir_output_set_current_mode(output, mir_mode); + return 0; + } + } + + return -1; } #endif /* SDL_VIDEO_DRIVER_MIR */ diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirvideo.h b/Engine/lib/sdl/src/video/mir/SDL_mirvideo.h index c5ef4758d..71ef4ecc1 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirvideo.h +++ b/Engine/lib/sdl/src/video/mir/SDL_mirvideo.h @@ -29,13 +29,20 @@ #include #include +typedef struct MIR_Window MIR_Window; + typedef struct { - MirConnection* connection; - SDL_bool software; - + MirConnection* connection; + MirDisplayConfig* display_config; + MIR_Window* current_window; + SDL_bool software; + MirPixelFormat pixel_format; } MIR_Data; +extern Uint32 +MIR_GetSDLPixelFormat(MirPixelFormat format); + #endif /* _SDL_mirvideo_h_ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirwindow.c b/Engine/lib/sdl/src/video/mir/SDL_mirwindow.c index 0eb54be01..1bf9016a0 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirwindow.c +++ b/Engine/lib/sdl/src/video/mir/SDL_mirwindow.c @@ -29,6 +29,7 @@ #include "../SDL_egl_c.h" #include "../SDL_sysvideo.h" +#include "../../events/SDL_keyboard_c.h" #include "SDL_mirevents.h" #include "SDL_mirwindow.h" @@ -55,7 +56,7 @@ FindValidPixelFormat(MIR_Data* mir_data) MirPixelFormat formats[pf_size]; MIR_mir_connection_get_available_surface_formats(mir_data->connection, formats, - pf_size, &valid_formats); + pf_size, &valid_formats); for (f = 0; f < valid_formats; f++) { MirPixelFormat cur_pf = formats[f]; @@ -77,21 +78,10 @@ MIR_CreateWindow(_THIS, SDL_Window* window) { MIR_Window* mir_window; MIR_Data* mir_data; + MirPixelFormat pixel_format; + MirBufferUsage buffer_usage; - MirSurfaceParameters surfaceparm = - { - .name = "MirSurface", - .width = window->w, - .height = window->h, - .pixel_format = mir_pixel_format_invalid, - .buffer_usage = mir_buffer_usage_hardware, - .output_id = mir_display_output_id_invalid - }; - - MirEventDelegate delegate = { - MIR_HandleInput, - window - }; + MirSurfaceSpec* spec; mir_window = SDL_calloc(1, sizeof(MIR_Window)); if (!mir_window) @@ -100,9 +90,6 @@ MIR_CreateWindow(_THIS, SDL_Window* window) mir_data = _this->driverdata; window->driverdata = mir_window; - if (mir_data->software) - surfaceparm.buffer_usage = mir_buffer_usage_software; - if (window->x == SDL_WINDOWPOS_UNDEFINED) window->x = 0; @@ -112,20 +99,49 @@ MIR_CreateWindow(_THIS, SDL_Window* window) mir_window->mir_data = mir_data; mir_window->sdl_window = window; - surfaceparm.pixel_format = FindValidPixelFormat(mir_data); - if (surfaceparm.pixel_format == mir_pixel_format_invalid) { + if (window->flags & SDL_WINDOW_OPENGL) { + pixel_format = MIR_mir_connection_get_egl_pixel_format(mir_data->connection, + _this->egl_data->egl_display, + _this->egl_data->egl_config); + } + else { + pixel_format = FindValidPixelFormat(mir_data); + } + + mir_data->pixel_format = pixel_format; + if (pixel_format == mir_pixel_format_invalid) { return SDL_SetError("Failed to find a valid pixel format."); } - mir_window->surface = MIR_mir_connection_create_surface_sync(mir_data->connection, &surfaceparm); + buffer_usage = mir_buffer_usage_hardware; + if (mir_data->software) + buffer_usage = mir_buffer_usage_software; + + spec = MIR_mir_connection_create_spec_for_normal_surface(mir_data->connection, + window->w, + window->h, + pixel_format); + + MIR_mir_surface_spec_set_buffer_usage(spec, buffer_usage); + MIR_mir_surface_spec_set_name(spec, "Mir surface"); + + if (window->flags & SDL_WINDOW_INPUT_FOCUS) + SDL_SetKeyboardFocus(window); + + mir_window->surface = MIR_mir_surface_create_sync(spec); + MIR_mir_surface_set_event_handler(mir_window->surface, MIR_HandleEvent, window); + + MIR_mir_surface_spec_release(spec); + if (!MIR_mir_surface_is_valid(mir_window->surface)) { - const char* error = MIR_mir_surface_get_error_message(mir_window->surface); - return SDL_SetError("Failed to created a mir surface: %s", error); + return SDL_SetError("Failed to created a mir surface: %s", + MIR_mir_surface_get_error_message(mir_window->surface)); } if (window->flags & SDL_WINDOW_OPENGL) { EGLNativeWindowType egl_native_window = - (EGLNativeWindowType)MIR_mir_surface_get_egl_native_window(mir_window->surface); + (EGLNativeWindowType)MIR_mir_buffer_stream_get_egl_native_window( + MIR_mir_surface_get_buffer_stream(mir_window->surface)); mir_window->egl_surface = SDL_EGL_CreateSurface(_this, egl_native_window); @@ -138,7 +154,7 @@ MIR_CreateWindow(_THIS, SDL_Window* window) mir_window->egl_surface = EGL_NO_SURFACE; } - MIR_mir_surface_set_event_handler(mir_window->surface, &delegate); + mir_data->current_window = mir_window; return 0; } @@ -146,13 +162,15 @@ MIR_CreateWindow(_THIS, SDL_Window* window) void MIR_DestroyWindow(_THIS, SDL_Window* window) { - MIR_Data* mir_data = _this->driverdata; + MIR_Data* mir_data = _this->driverdata; MIR_Window* mir_window = window->driverdata; if (mir_data) { SDL_EGL_DestroySurface(_this, mir_window->egl_surface); MIR_mir_surface_release_sync(mir_window->surface); + mir_data->current_window = NULL; + SDL_free(mir_window); } window->driverdata = NULL; @@ -180,49 +198,223 @@ MIR_SetWindowFullscreen(_THIS, SDL_Window* window, SDL_VideoDisplay* display, SDL_bool fullscreen) { + MIR_Data* mir_data = _this->driverdata; MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; + MirSurfaceState state; if (IsSurfaceValid(mir_window) < 0) return; if (fullscreen) { - MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_fullscreen); + state = mir_surface_state_fullscreen; } else { - MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_restored); + state = mir_surface_state_restored; } + + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_state(spec, state); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); } void MIR_MaximizeWindow(_THIS, SDL_Window* window) { + MIR_Data* mir_data = _this->driverdata; MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; if (IsSurfaceValid(mir_window) < 0) return; - MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_maximized); + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_state(spec, mir_surface_state_maximized); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); } void MIR_MinimizeWindow(_THIS, SDL_Window* window) { + MIR_Data* mir_data = _this->driverdata; MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; if (IsSurfaceValid(mir_window) < 0) return; - MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_minimized); + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_state(spec, mir_surface_state_minimized); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); } void MIR_RestoreWindow(_THIS, SDL_Window * window) { + MIR_Data* mir_data = _this->driverdata; MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; if (IsSurfaceValid(mir_window) < 0) return; - MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_restored); + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_state(spec, mir_surface_state_restored); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +void +MIR_HideWindow(_THIS, SDL_Window* window) +{ + MIR_Data* mir_data = _this->driverdata; + MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; + + if (IsSurfaceValid(mir_window) < 0) + return; + + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_state(spec, mir_surface_state_hidden); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +void +MIR_SetWindowSize(_THIS, SDL_Window* window) +{ + MIR_Data* mir_data = _this->driverdata; + MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; + + if (IsSurfaceValid(mir_window) < 0) + return; + + /* You cannot set the x/y of a mir window! So only update w/h */ + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_width (spec, window->w); + MIR_mir_surface_spec_set_height(spec, window->h); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +void +MIR_SetWindowMinimumSize(_THIS, SDL_Window* window) +{ + MIR_Data* mir_data = _this->driverdata; + MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; + + if (IsSurfaceValid(mir_window) < 0) + return; + + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_min_width (spec, window->min_w); + MIR_mir_surface_spec_set_min_height(spec, window->min_h); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +void +MIR_SetWindowMaximumSize(_THIS, SDL_Window* window) +{ + MIR_Data* mir_data = _this->driverdata; + MIR_Window* mir_window = window->driverdata; + MirSurfaceSpec* spec; + + if (IsSurfaceValid(mir_window) < 0) + return; + + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_max_width (spec, window->max_w); + MIR_mir_surface_spec_set_max_height(spec, window->max_h); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +void +MIR_SetWindowTitle(_THIS, SDL_Window* window) +{ + MIR_Data* mir_data = _this->driverdata; + MIR_Window* mir_window = window->driverdata; + char const* title = window->title ? window->title : ""; + MirSurfaceSpec* spec; + + if (IsSurfaceValid(mir_window) < 0) + return; + + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_name(spec, title); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +void +MIR_SetWindowGrab(_THIS, SDL_Window* window, SDL_bool grabbed) +{ + MIR_Data* mir_data = _this->driverdata; + MIR_Window* mir_window = window->driverdata; + MirPointerConfinementState confined = mir_pointer_unconfined; + MirSurfaceSpec* spec; + + if (grabbed) + confined = mir_pointer_confined_to_surface; + + spec = MIR_mir_connection_create_spec_for_changes(mir_data->connection); + MIR_mir_surface_spec_set_pointer_confinement(spec, confined); + + MIR_mir_surface_apply_spec(mir_window->surface, spec); + MIR_mir_surface_spec_release(spec); +} + +int +MIR_SetWindowGammaRamp(_THIS, SDL_Window* window, Uint16 const* ramp) +{ + MirOutput* output = SDL_GetDisplayForWindow(window)->driverdata; + Uint32 ramp_size = 256; + + // FIXME Need to apply the changes to the output, once that public API function is around + if (MIR_mir_output_is_gamma_supported(output) == mir_output_gamma_supported) { + MIR_mir_output_set_gamma(output, + ramp + ramp_size * 0, + ramp + ramp_size * 1, + ramp + ramp_size * 2, + ramp_size); + return 0; + } + + return -1; +} + +int +MIR_GetWindowGammaRamp(_THIS, SDL_Window* window, Uint16* ramp) +{ + MirOutput* output = SDL_GetDisplayForWindow(window)->driverdata; + Uint32 ramp_size = 256; + + if (MIR_mir_output_is_gamma_supported(output) == mir_output_gamma_supported) { + if (MIR_mir_output_get_gamma_size(output) == ramp_size) { + MIR_mir_output_get_gamma(output, + ramp + ramp_size * 0, + ramp + ramp_size * 1, + ramp + ramp_size * 2, + ramp_size); + return 0; + } + } + + return -1; } #endif /* SDL_VIDEO_DRIVER_MIR */ diff --git a/Engine/lib/sdl/src/video/mir/SDL_mirwindow.h b/Engine/lib/sdl/src/video/mir/SDL_mirwindow.h index c21fc9292..c4084aa4e 100644 --- a/Engine/lib/sdl/src/video/mir/SDL_mirwindow.h +++ b/Engine/lib/sdl/src/video/mir/SDL_mirwindow.h @@ -31,13 +31,13 @@ #include "SDL_mirvideo.h" -typedef struct { +struct MIR_Window { SDL_Window* sdl_window; - MIR_Data* mir_data; + MIR_Data* mir_data; MirSurface* surface; - EGLSurface egl_surface; -} MIR_Window; + EGLSurface egl_surface; +}; extern int @@ -60,9 +60,33 @@ MIR_MinimizeWindow(_THIS, SDL_Window* window); extern void MIR_RestoreWindow(_THIS, SDL_Window* window); +extern void +MIR_HideWindow(_THIS, SDL_Window* window); + extern SDL_bool MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info); +extern void +MIR_SetWindowSize(_THIS, SDL_Window* window); + +extern void +MIR_SetWindowMinimumSize(_THIS, SDL_Window* window); + +extern void +MIR_SetWindowMaximumSize(_THIS, SDL_Window* window); + +extern void +MIR_SetWindowTitle(_THIS, SDL_Window* window); + +extern void +MIR_SetWindowGrab(_THIS, SDL_Window* window, SDL_bool grabbed); + +extern int +MIR_SetWindowGammaRamp(_THIS, SDL_Window* window, Uint16 const* ramp); + +extern int +MIR_GetWindowGammaRamp(_THIS, SDL_Window* window, Uint16* ramp); + #endif /* _SDL_mirwindow_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/pandora/SDL_pandora.c b/Engine/lib/sdl/src/video/pandora/SDL_pandora.c index d1c35a705..7afa54306 100644 --- a/Engine/lib/sdl/src/video/pandora/SDL_pandora.c +++ b/Engine/lib/sdl/src/video/pandora/SDL_pandora.c @@ -41,8 +41,6 @@ static NativeWindowType hNativeWnd = 0; /* A handle to the window we will create. */ #endif -static SDL_bool PND_initialized = SDL_FALSE; - static int PND_available(void) { @@ -52,11 +50,11 @@ PND_available(void) static void PND_destroy(SDL_VideoDevice * device) { - SDL_VideoData *phdata = (SDL_VideoData *) device->driverdata; - if (device->driverdata != NULL) { + SDL_free(device->driverdata); device->driverdata = NULL; } + SDL_free(device); } static SDL_VideoDevice * @@ -93,9 +91,8 @@ PND_create() phdata->egl_initialized = SDL_TRUE; - /* Setup amount of available displays and current display */ + /* Setup amount of available displays */ device->num_displays = 0; - device->current_display = 0; /* Set device free function */ device->free = PND_destroy; @@ -204,10 +201,6 @@ PND_createwindow(_THIS, SDL_Window * window) SDL_WindowData *wdata; - uint32_t winargc = 0; - int32_t status; - - /* Allocate window internal data */ wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData)); if (wdata == NULL) { @@ -292,7 +285,7 @@ PND_restorewindow(_THIS, SDL_Window * window) { } void -PND_setwindowgrab(_THIS, SDL_Window * window) +PND_setwindowgrab(_THIS, SDL_Window * window, SDL_bool grabbed) { } void @@ -326,8 +319,6 @@ PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info) int PND_gl_loadlibrary(_THIS, const char *path) { - SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; - /* Check if OpenGL ES library is specified for GF driver */ if (path == NULL) { path = SDL_getenv("SDL_OPENGL_LIBRARY"); @@ -365,7 +356,6 @@ PND_gl_loadlibrary(_THIS, const char *path) void * PND_gl_getprocaddres(_THIS, const char *proc) { - SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; void *function_address; /* Try to get function address through the egl interface */ @@ -409,10 +399,7 @@ PND_gl_createcontext(_THIS, SDL_Window * window) { SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; - SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata; EGLBoolean status; - int32_t gfstatus; EGLint configs; uint32_t attr_pos; EGLint attr_value; @@ -629,12 +616,12 @@ PND_gl_createcontext(_THIS, SDL_Window * window) hNativeWnd = (NativeWindowType)malloc(16*1024); if(!hNativeWnd) - printf( "Error : Wiz framebuffer allocatation failed\n" ); + printf( "Error: Wiz framebuffer allocatation failed\n" ); else - printf( "SDL13: Wiz framebuffer allocated: %X\n", hNativeWnd ); + printf( "SDL: Wiz framebuffer allocated: %X\n", hNativeWnd ); } else { - printf( "SDL13: Wiz framebuffer already allocated: %X\n", hNativeWnd ); + printf( "SDL: Wiz framebuffer already allocated: %X\n", hNativeWnd ); } wdata->gles_surface = @@ -792,9 +779,6 @@ PND_gl_swapwindow(_THIS, SDL_Window * window) { SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; - SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata; - if (phdata->egl_initialized != SDL_TRUE) { SDL_SetError("PND: GLES initialization failed, no OpenGL ES support"); @@ -838,7 +822,7 @@ PND_gl_deletecontext(_THIS, SDL_GLContext context) { free(hNativeWnd); hNativeWnd = 0; - printf( "SDL13: Wiz framebuffer released\n" ); + printf( "SDL: Wiz framebuffer released\n" ); } #endif diff --git a/Engine/lib/sdl/src/video/pandora/SDL_pandora.h b/Engine/lib/sdl/src/video/pandora/SDL_pandora.h index b95cd10b1..859b7ee5d 100644 --- a/Engine/lib/sdl/src/video/pandora/SDL_pandora.h +++ b/Engine/lib/sdl/src/video/pandora/SDL_pandora.h @@ -77,7 +77,7 @@ void PND_raisewindow(_THIS, SDL_Window * window); void PND_maximizewindow(_THIS, SDL_Window * window); void PND_minimizewindow(_THIS, SDL_Window * window); void PND_restorewindow(_THIS, SDL_Window * window); -void PND_setwindowgrab(_THIS, SDL_Window * window); +void PND_setwindowgrab(_THIS, SDL_Window * window, SDL_bool grabbed); void PND_destroywindow(_THIS, SDL_Window * window); /* Window manager function */ diff --git a/Engine/lib/sdl/src/video/psp/SDL_pspevents.c b/Engine/lib/sdl/src/video/psp/SDL_pspevents.c index c1a095dbb..71267272d 100644 --- a/Engine/lib/sdl/src/video/psp/SDL_pspevents.c +++ b/Engine/lib/sdl/src/video/psp/SDL_pspevents.c @@ -31,8 +31,8 @@ #include "../../events/SDL_keyboard_c.h" #include "SDL_pspvideo.h" #include "SDL_pspevents_c.h" -#include "SDL_thread.h" #include "SDL_keyboard.h" +#include "../../thread/SDL_systhread.h" #include #ifdef PSPIRKEYB @@ -264,7 +264,7 @@ void PSP_EventInit(_THIS) return; } running = 1; - if((thread = SDL_CreateThread(EventUpdate, "PSPInputThread",NULL)) == NULL) { + if((thread = SDL_CreateThreadInternal(EventUpdate, "PSPInputThread", 4096, NULL)) == NULL) { SDL_SetError("Can't create input thread\n"); return; } diff --git a/Engine/lib/sdl/src/video/psp/SDL_pspvideo.c b/Engine/lib/sdl/src/video/psp/SDL_pspvideo.c index 955666877..381e4899e 100644 --- a/Engine/lib/sdl/src/video/psp/SDL_pspvideo.c +++ b/Engine/lib/sdl/src/video/psp/SDL_pspvideo.c @@ -92,6 +92,7 @@ PSP_Create() if (gldata == NULL) { SDL_OutOfMemory(); SDL_free(device); + SDL_free(phdata); return NULL; } device->gl_data = gldata; @@ -101,7 +102,7 @@ PSP_Create() phdata->egl_initialized = SDL_TRUE; - /* Setup amount of available displays and current display */ + /* Setup amount of available displays */ device->num_displays = 0; /* Set device free function */ @@ -234,7 +235,7 @@ PSP_CreateWindow(_THIS, SDL_Window * window) int PSP_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) { - return -1; + return SDL_Unsupported(); } void diff --git a/Engine/lib/sdl/src/video/raspberry/SDL_rpimouse.c b/Engine/lib/sdl/src/video/raspberry/SDL_rpimouse.c index 0d1482c04..ae9bdfd5c 100644 --- a/Engine/lib/sdl/src/video/raspberry/SDL_rpimouse.c +++ b/Engine/lib/sdl/src/video/raspberry/SDL_rpimouse.c @@ -24,6 +24,7 @@ #include "SDL_assert.h" #include "SDL_surface.h" +#include "SDL_hints.h" #include "SDL_rpivideo.h" #include "SDL_rpimouse.h" @@ -70,7 +71,16 @@ RPI_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y) SDL_assert(surface->pitch == surface->w * 4); cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(*cursor)); + if (cursor == NULL) { + SDL_OutOfMemory(); + return NULL; + } curdata = (RPI_CursorData *) SDL_calloc(1, sizeof(*curdata)); + if (curdata == NULL) { + SDL_OutOfMemory(); + SDL_free(cursor); + return NULL; + } curdata->hot_x = hot_x; curdata->hot_y = hot_y; @@ -78,17 +88,17 @@ RPI_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y) curdata->h = surface->h; /* This usage is inspired by Wayland/Weston RPI code, how they figured this out is anyone's guess */ - curdata->resource = vc_dispmanx_resource_create( VC_IMAGE_ARGB8888, surface->w | (surface->pitch << 16), surface->h | (surface->h << 16), &dummy ); + curdata->resource = vc_dispmanx_resource_create(VC_IMAGE_ARGB8888, surface->w | (surface->pitch << 16), surface->h | (surface->h << 16), &dummy); SDL_assert(curdata->resource); - vc_dispmanx_rect_set( &dst_rect, 0, 0, curdata->w, curdata->h); + vc_dispmanx_rect_set(&dst_rect, 0, 0, curdata->w, curdata->h); /* A note from Weston: * vc_dispmanx_resource_write_data() ignores ifmt, * rect.x, rect.width, and uses stride only for computing * the size of the transfer as rect.height * stride. * Therefore we can only write rows starting at x=0. */ - ret = vc_dispmanx_resource_write_data( curdata->resource, VC_IMAGE_ARGB8888, surface->pitch, surface->pixels, &dst_rect ); - SDL_assert ( ret == DISPMANX_SUCCESS ); + ret = vc_dispmanx_resource_write_data(curdata->resource, VC_IMAGE_ARGB8888, surface->pitch, surface->pixels, &dst_rect); + SDL_assert (ret == DISPMANX_SUCCESS); cursor->driverdata = curdata; @@ -108,7 +118,9 @@ RPI_ShowCursor(SDL_Cursor * cursor) SDL_VideoDisplay *display; SDL_DisplayData *data; VC_DISPMANX_ALPHA_T alpha = { DISPMANX_FLAGS_ALPHA_FROM_SOURCE /* flags */ , 255 /*opacity 0->255*/, 0 /* mask */ }; - + uint32_t layer = SDL_RPI_MOUSELAYER; + const char *env; + mouse = SDL_GetMouse(); if (mouse == NULL) { return -1; @@ -117,15 +129,15 @@ RPI_ShowCursor(SDL_Cursor * cursor) if (cursor == NULL) { /* FIXME: We hide the current mouse's cursor, what we actually need is *_HideCursor */ - if ( mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) { + if (mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) { curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata; if (curdata->element > DISPMANX_NO_HANDLE) { - update = vc_dispmanx_update_start( 10 ); - SDL_assert( update ); - ret = vc_dispmanx_element_remove( update, curdata->element ); - SDL_assert( ret == DISPMANX_SUCCESS ); - ret = vc_dispmanx_update_submit_sync( update ); - SDL_assert( ret == DISPMANX_SUCCESS ); + update = vc_dispmanx_update_start(10); + SDL_assert(update); + ret = vc_dispmanx_element_remove(update, curdata->element); + SDL_assert(ret == DISPMANX_SUCCESS); + ret = vc_dispmanx_update_submit_sync(update); + SDL_assert(ret == DISPMANX_SUCCESS); curdata->element = DISPMANX_NO_HANDLE; } } @@ -152,25 +164,30 @@ RPI_ShowCursor(SDL_Cursor * cursor) } if (curdata->element == DISPMANX_NO_HANDLE) { - vc_dispmanx_rect_set( &src_rect, 0, 0, curdata->w << 16, curdata->h << 16 ); - vc_dispmanx_rect_set( &dst_rect, 0, 0, curdata->w, curdata->h); + vc_dispmanx_rect_set(&src_rect, 0, 0, curdata->w << 16, curdata->h << 16); + vc_dispmanx_rect_set(&dst_rect, 0, 0, curdata->w, curdata->h); - update = vc_dispmanx_update_start( 10 ); - SDL_assert( update ); + update = vc_dispmanx_update_start(10); + SDL_assert(update); - curdata->element = vc_dispmanx_element_add( update, + env = SDL_GetHint(SDL_HINT_RPI_VIDEO_LAYER); + if (env) { + layer = SDL_atoi(env) + 1; + } + + curdata->element = vc_dispmanx_element_add(update, data->dispman_display, - SDL_RPI_MOUSELAYER, // layer + layer, &dst_rect, curdata->resource, &src_rect, DISPMANX_PROTECTION_NONE, &alpha, DISPMANX_NO_HANDLE, // clamp - VC_IMAGE_ROT0 ); - SDL_assert( curdata->element > DISPMANX_NO_HANDLE); - ret = vc_dispmanx_update_submit_sync( update ); - SDL_assert( ret == DISPMANX_SUCCESS ); + VC_IMAGE_ROT0); + SDL_assert(curdata->element > DISPMANX_NO_HANDLE); + ret = vc_dispmanx_update_submit_sync(update); + SDL_assert(ret == DISPMANX_SUCCESS); } return 0; @@ -189,17 +206,17 @@ RPI_FreeCursor(SDL_Cursor * cursor) if (curdata != NULL) { if (curdata->element != DISPMANX_NO_HANDLE) { - update = vc_dispmanx_update_start( 10 ); - SDL_assert( update ); - ret = vc_dispmanx_element_remove( update, curdata->element ); - SDL_assert( ret == DISPMANX_SUCCESS ); - ret = vc_dispmanx_update_submit_sync( update ); - SDL_assert( ret == DISPMANX_SUCCESS ); + update = vc_dispmanx_update_start(10); + SDL_assert(update); + ret = vc_dispmanx_element_remove(update, curdata->element); + SDL_assert(ret == DISPMANX_SUCCESS); + ret = vc_dispmanx_update_submit_sync(update); + SDL_assert(ret == DISPMANX_SUCCESS); } if (curdata->resource != DISPMANX_NO_HANDLE) { - ret = vc_dispmanx_resource_delete( curdata->resource ); - SDL_assert( ret == DISPMANX_SUCCESS ); + ret = vc_dispmanx_resource_delete(curdata->resource); + SDL_assert(ret == DISPMANX_SUCCESS); } SDL_free(cursor->driverdata); @@ -221,35 +238,54 @@ RPI_WarpMouseGlobal(int x, int y) { RPI_CursorData *curdata; DISPMANX_UPDATE_HANDLE_T update; + int ret; VC_RECT_T dst_rect; + VC_RECT_T src_rect; SDL_Mouse *mouse = SDL_GetMouse(); - if (mouse != NULL && mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) { - curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata; - if (curdata->element != DISPMANX_NO_HANDLE) { - int ret; - update = vc_dispmanx_update_start( 10 ); - SDL_assert( update ); - vc_dispmanx_rect_set( &dst_rect, x, y, curdata->w, curdata->h); - ret = vc_dispmanx_element_change_attributes( - update, - curdata->element, - ELEMENT_CHANGE_DEST_RECT, - 0, - 0, - &dst_rect, - NULL, - DISPMANX_NO_HANDLE, - DISPMANX_NO_ROTATE); - SDL_assert( ret == DISPMANX_SUCCESS ); - /* Submit asynchronously, otherwise the peformance suffers a lot */ - ret = vc_dispmanx_update_submit( update, 0, NULL ); - SDL_assert( ret == DISPMANX_SUCCESS ); - return (ret == DISPMANX_SUCCESS) ? 0 : -1; - } - } + if (mouse == NULL || mouse->cur_cursor == NULL || mouse->cur_cursor->driverdata == NULL) { + return 0; + } - return -1; /* !!! FIXME: this should SDL_SetError() somewhere. */ + curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata; + if (curdata->element == DISPMANX_NO_HANDLE) { + return 0; + } + + update = vc_dispmanx_update_start(10); + if (!update) { + return 0; + } + + src_rect.x = 0; + src_rect.y = 0; + src_rect.width = curdata->w << 16; + src_rect.height = curdata->h << 16; + dst_rect.x = x; + dst_rect.y = y; + dst_rect.width = curdata->w; + dst_rect.height = curdata->h; + + ret = vc_dispmanx_element_change_attributes( + update, + curdata->element, + 0, + 0, + 0, + &dst_rect, + &src_rect, + DISPMANX_NO_HANDLE, + DISPMANX_NO_ROTATE); + if (ret != DISPMANX_SUCCESS) { + return SDL_SetError("vc_dispmanx_element_change_attributes() failed"); + } + + /* Submit asynchronously, otherwise the peformance suffers a lot */ + ret = vc_dispmanx_update_submit(update, 0, NULL); + if (ret != DISPMANX_SUCCESS) { + return SDL_SetError("vc_dispmanx_update_submit() failed"); + } + return 0; } void diff --git a/Engine/lib/sdl/src/video/raspberry/SDL_rpivideo.c b/Engine/lib/sdl/src/video/raspberry/SDL_rpivideo.c index 539c88c9b..67dc77b1c 100644 --- a/Engine/lib/sdl/src/video/raspberry/SDL_rpivideo.c +++ b/Engine/lib/sdl/src/video/raspberry/SDL_rpivideo.c @@ -38,6 +38,7 @@ #include "SDL_events.h" #include "../../events/SDL_mouse_c.h" #include "../../events/SDL_keyboard_c.h" +#include "SDL_hints.h" #ifdef SDL_INPUT_LINUXEV #include "../../core/linux/SDL_evdev.h" @@ -88,7 +89,7 @@ RPI_Create() device->driverdata = phdata; - /* Setup amount of available displays and current display */ + /* Setup amount of available displays */ device->num_displays = 0; /* Set device free function */ @@ -221,6 +222,8 @@ RPI_CreateWindow(_THIS, SDL_Window * window) VC_RECT_T src_rect; VC_DISPMANX_ALPHA_T dispman_alpha; DISPMANX_UPDATE_HANDLE_T dispman_update; + uint32_t layer = SDL_RPI_VIDEOLAYER; + const char *env; /* Disable alpha, otherwise the app looks composed with whatever dispman is showing (X11, console,etc) */ dispman_alpha.flags = DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS; @@ -253,11 +256,25 @@ RPI_CreateWindow(_THIS, SDL_Window * window) src_rect.width = window->w << 16; src_rect.height = window->h << 16; + env = SDL_GetHint(SDL_HINT_RPI_VIDEO_LAYER); + if (env) { + layer = SDL_atoi(env); + } + dispman_update = vc_dispmanx_update_start( 0 ); - wdata->dispman_window.element = vc_dispmanx_element_add ( dispman_update, displaydata->dispman_display, SDL_RPI_VIDEOLAYER /* layer */, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, &dispman_alpha /*alpha*/, 0/*clamp*/, 0/*transform*/); + wdata->dispman_window.element = vc_dispmanx_element_add (dispman_update, + displaydata->dispman_display, + layer /* layer */, + &dst_rect, + 0 /*src*/, + &src_rect, + DISPMANX_PROTECTION_NONE, + &dispman_alpha /*alpha*/, + 0 /*clamp*/, + 0 /*transform*/); wdata->dispman_window.width = window->w; wdata->dispman_window.height = window->h; - vc_dispmanx_update_submit_sync( dispman_update ); + vc_dispmanx_update_submit_sync(dispman_update); if (!_this->egl_data) { if (SDL_GL_LoadLibrary(NULL) < 0) { diff --git a/Engine/lib/sdl/src/video/sdlgenblit.pl b/Engine/lib/sdl/src/video/sdlgenblit.pl old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.h b/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.h index 1879f0b3a..edf09f50f 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.h +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.h @@ -24,8 +24,8 @@ @interface SDLLaunchScreenController : UIViewController - (instancetype)init; +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil; - (void)loadView; -- (NSUInteger)supportedInterfaceOrientations; @end diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.m index 971b438b0..c94c78a41 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitappdelegate.m @@ -76,6 +76,7 @@ SDL_IdleTimerDisabledChanged(void *userdata, const char *name, const char *oldVa [UIApplication sharedApplication].idleTimerDisabled = disable; } +#if !TARGET_OS_TV /* Load a launch image using the old UILaunchImageFile-era naming rules. */ static UIImage * SDL_LoadLaunchImageNamed(NSString *name, int screenh) @@ -114,17 +115,31 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) return image; } +#endif /* !TARGET_OS_TV */ + +@interface SDLLaunchScreenController () + +#if !TARGET_OS_TV +- (NSUInteger)supportedInterfaceOrientations; +#endif + +@end @implementation SDLLaunchScreenController - (instancetype)init +{ + return [self initWithNibName:nil bundle:[NSBundle mainBundle]]; +} + +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { if (!(self = [super initWithNibName:nil bundle:nil])) { return nil; } - NSBundle *bundle = [NSBundle mainBundle]; - NSString *screenname = [bundle objectForInfoDictionaryKey:@"UILaunchStoryboardName"]; + NSString *screenname = nibNameOrNil; + NSBundle *bundle = nibBundleOrNil; BOOL atleastiOS8 = UIKit_IsSystemVersionAtLeast(8.0); /* Launch screens were added in iOS 8. Otherwise we use launch images. */ @@ -141,27 +156,28 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) if (!self.view) { NSArray *launchimages = [bundle objectForInfoDictionaryKey:@"UILaunchImages"]; - UIInterfaceOrientation curorient = [UIApplication sharedApplication].statusBarOrientation; NSString *imagename = nil; UIImage *image = nil; int screenw = (int)([UIScreen mainScreen].bounds.size.width + 0.5); int screenh = (int)([UIScreen mainScreen].bounds.size.height + 0.5); +#if !TARGET_OS_TV + UIInterfaceOrientation curorient = [UIApplication sharedApplication].statusBarOrientation; + /* We always want portrait-oriented size, to match UILaunchImageSize. */ if (screenw > screenh) { int width = screenw; screenw = screenh; screenh = width; } +#endif /* Xcode 5 introduced a dictionary of launch images in Info.plist. */ if (launchimages) { for (NSDictionary *dict in launchimages) { - UIInterfaceOrientationMask orientmask = UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown; - NSString *minversion = dict[@"UILaunchImageMinimumOSVersion"]; - NSString *sizestring = dict[@"UILaunchImageSize"]; - NSString *orientstring = dict[@"UILaunchImageOrientation"]; + NSString *minversion = dict[@"UILaunchImageMinimumOSVersion"]; + NSString *sizestring = dict[@"UILaunchImageSize"]; /* Ignore this image if the current version is too low. */ if (minversion && !UIKit_IsSystemVersionAtLeast(minversion.doubleValue)) { @@ -176,6 +192,10 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) } } +#if !TARGET_OS_TV + UIInterfaceOrientationMask orientmask = UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown; + NSString *orientstring = dict[@"UILaunchImageOrientation"]; + if (orientstring) { if ([orientstring isEqualToString:@"PortraitUpsideDown"]) { orientmask = UIInterfaceOrientationMaskPortraitUpsideDown; @@ -192,6 +212,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) if ((orientmask & (1 << curorient)) == 0) { continue; } +#endif imagename = dict[@"UILaunchImageName"]; } @@ -199,7 +220,9 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) if (imagename) { image = [UIImage imageNamed:imagename]; } - } else { + } +#if !TARGET_OS_TV + else { imagename = [bundle objectForInfoDictionaryKey:@"UILaunchImageFile"]; if (imagename) { @@ -210,11 +233,13 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) image = SDL_LoadLaunchImageNamed(@"Default", screenh); } } +#endif if (image) { UIImageView *view = [[UIImageView alloc] initWithFrame:[UIScreen mainScreen].bounds]; UIImageOrientation imageorient = UIImageOrientationUp; +#if !TARGET_OS_TV /* Bugs observed / workaround tested in iOS 8.3, 7.1, and 6.1. */ if (UIInterfaceOrientationIsLandscape(curorient)) { if (atleastiOS8 && image.size.width < image.size.height) { @@ -238,6 +263,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) } } } +#endif /* Create the properly oriented image. */ view.image = [[UIImage alloc] initWithCGImage:image.CGImage scale:image.scale orientation:imageorient]; @@ -254,6 +280,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) /* Do nothing. */ } +#if !TARGET_OS_TV - (BOOL)shouldAutorotate { /* If YES, the launch image will be incorrectly rotated in some cases. */ @@ -267,6 +294,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) * the ones set here (it will cause an exception in that case.) */ return UIInterfaceOrientationMaskAll; } +#endif /* !TARGET_OS_TV */ @end @@ -333,7 +361,6 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { NSBundle *bundle = [NSBundle mainBundle]; - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; #if SDL_IPHONE_LAUNCHSCREEN /* The normal launch screen is displayed until didFinishLaunching returns, @@ -342,9 +369,32 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) * displayed (e.g. if resources are loaded before SDL_GL_SwapWindow is * called), so we show the launch screen programmatically until the first * time events are pumped. */ - UIViewController *viewcontroller = [[SDLLaunchScreenController alloc] init]; + UIViewController *vc = nil; + NSString *screenname = nil; - if (viewcontroller.view) { + /* tvOS only uses a plain launch image. */ +#if !TARGET_OS_TV + screenname = [bundle objectForInfoDictionaryKey:@"UILaunchStoryboardName"]; + + if (screenname && UIKit_IsSystemVersionAtLeast(8.0)) { + @try { + /* The launch storyboard is actually a nib in some older versions of + * Xcode. We'll try to load it as a storyboard first, as it's more + * modern. */ + UIStoryboard *storyboard = [UIStoryboard storyboardWithName:screenname bundle:bundle]; + vc = [storyboard instantiateInitialViewController]; + } + @catch (NSException *exception) { + /* Do nothing (there's more code to execute below). */ + } + } +#endif + + if (vc == nil) { + vc = [[SDLLaunchScreenController alloc] initWithNibName:screenname bundle:bundle]; + } + + if (vc.view) { launchWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; /* We don't want the launch window immediately hidden when a real SDL @@ -355,7 +405,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) * other windows when possible. */ launchWindow.hidden = NO; - launchWindow.rootViewController = viewcontroller; + launchWindow.rootViewController = vc; } #endif @@ -382,6 +432,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) SDL_SendAppEvent(SDL_APP_LOWMEMORY); } +#if !TARGET_OS_TV - (void)application:(UIApplication *)application didChangeStatusBarOrientation:(UIInterfaceOrientation)oldStatusBarOrientation { BOOL isLandscape = UIInterfaceOrientationIsLandscape(application.statusBarOrientation); @@ -409,6 +460,7 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) } } } +#endif - (void)applicationWillResignActive:(UIApplication*)application { @@ -447,16 +499,34 @@ SDL_LoadLaunchImageNamed(NSString *name, int screenh) } } -- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation +- (void)sendDropFileForURL:(NSURL *)url { NSURL *fileURL = url.filePathURL; if (fileURL != nil) { - SDL_SendDropFile([fileURL.path UTF8String]); + SDL_SendDropFile(NULL, fileURL.path.UTF8String); } else { - SDL_SendDropFile([url.absoluteString UTF8String]); + SDL_SendDropFile(NULL, url.absoluteString.UTF8String); } + SDL_SendDropComplete(NULL); +} + +#if TARGET_OS_TV +/* TODO: Use this on iOS 9+ as well? */ +- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options +{ + /* TODO: Handle options */ + [self sendDropFileForURL:url]; return YES; } +#endif /* TARGET_OS_TV */ + +#if !TARGET_OS_TV +- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation +{ + [self sendDropFileForURL:url]; + return YES; +} +#endif /* !TARGET_OS_TV */ @end diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitclipboard.h b/Engine/lib/sdl/src/video/uikit/SDL_uikitclipboard.h new file mode 100644 index 000000000..7d1c35f99 --- /dev/null +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitclipboard.h @@ -0,0 +1,35 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +#ifndef _SDL_uikitclipboard_h +#define _SDL_uikitclipboard_h + +#include "../SDL_sysvideo.h" + +extern int UIKit_SetClipboardText(_THIS, const char *text); +extern char *UIKit_GetClipboardText(_THIS); +extern SDL_bool UIKit_HasClipboardText(_THIS); + +extern void UIKit_InitClipboard(_THIS); +extern void UIKit_QuitClipboard(_THIS); + +#endif /* _SDL_uikitclipboard_h */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitclipboard.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitclipboard.m new file mode 100644 index 000000000..050d5885f --- /dev/null +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitclipboard.m @@ -0,0 +1,111 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +#include "../../SDL_internal.h" + +#if SDL_VIDEO_DRIVER_UIKIT + +#include "SDL_uikitvideo.h" +#include "../../events/SDL_clipboardevents_c.h" + +#import + +int +UIKit_SetClipboardText(_THIS, const char *text) +{ +#if TARGET_OS_TV + return SDL_SetError("The clipboard is not available on tvOS"); +#else + @autoreleasepool { + [UIPasteboard generalPasteboard].string = @(text); + return 0; + } +#endif +} + +char * +UIKit_GetClipboardText(_THIS) +{ +#if TARGET_OS_TV + return SDL_strdup(""); // Unsupported. +#else + @autoreleasepool { + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + NSString *string = pasteboard.string; + + if (string != nil) { + return SDL_strdup(string.UTF8String); + } else { + return SDL_strdup(""); + } + } +#endif +} + +SDL_bool +UIKit_HasClipboardText(_THIS) +{ + @autoreleasepool { +#if !TARGET_OS_TV + if ([UIPasteboard generalPasteboard].string != nil) { + return SDL_TRUE; + } +#endif + return SDL_FALSE; + } +} + +void +UIKit_InitClipboard(_THIS) +{ +#if !TARGET_OS_TV + @autoreleasepool { + SDL_VideoData *data = (__bridge SDL_VideoData *) _this->driverdata; + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; + + id observer = [center addObserverForName:UIPasteboardChangedNotification + object:nil + queue:nil + usingBlock:^(NSNotification *note) { + SDL_SendClipboardUpdate(); + }]; + + data.pasteboardObserver = observer; + } +#endif +} + +void +UIKit_QuitClipboard(_THIS) +{ + @autoreleasepool { + SDL_VideoData *data = (__bridge SDL_VideoData *) _this->driverdata; + + if (data.pasteboardObserver != nil) { + [[NSNotificationCenter defaultCenter] removeObserver:data.pasteboardObserver]; + } + + data.pasteboardObserver = nil; + } +} + +#endif /* SDL_VIDEO_DRIVER_UIKIT */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitevents.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitevents.m index 1d7044d88..7083e204b 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitevents.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitevents.m @@ -26,6 +26,7 @@ #include "SDL_uikitvideo.h" #include "SDL_uikitevents.h" +#include "SDL_uikitopengles.h" #import @@ -62,6 +63,9 @@ UIKit_PumpEvents(_THIS) do { result = CFRunLoopRunInMode((CFStringRef)UITrackingRunLoopMode, seconds, TRUE); } while(result == kCFRunLoopRunHandledSource); + + /* See the comment in the function definition. */ + UIKit_GL_RestoreCurrentContext(); } #endif /* SDL_VIDEO_DRIVER_UIKIT */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.h b/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.h index 027cf7aa0..b936df616 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.h +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.h @@ -43,6 +43,7 @@ extern int UIKit_InitModes(_THIS); extern void UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display); extern int UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode); extern void UIKit_QuitModes(_THIS); +extern int UIKit_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect); #endif /* _SDL_uikitmodes_h */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.m index 98d031484..cd3b8d08e 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitmodes.m @@ -156,9 +156,12 @@ UIKit_AddDisplay(UIScreen *uiscreen) SDL_bool UIKit_IsDisplayLandscape(UIScreen *uiscreen) { +#if !TARGET_OS_TV if (uiscreen == [UIScreen mainScreen]) { return UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation); - } else { + } else +#endif /* !TARGET_OS_TV */ + { CGSize size = uiscreen.bounds.size; return (size.width > size.height); } @@ -187,6 +190,14 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display) SDL_bool isLandscape = UIKit_IsDisplayLandscape(data.uiscreen); SDL_bool addRotation = (data.uiscreen == [UIScreen mainScreen]); CGFloat scale = data.uiscreen.scale; + NSArray *availableModes = nil; + +#if TARGET_OS_TV + addRotation = SDL_FALSE; + availableModes = @[data.uiscreen.currentMode]; +#else + availableModes = data.uiscreen.availableModes; +#endif #ifdef __IPHONE_8_0 /* The UIScreenMode of an iPhone 6 Plus should be 1080x1920 rather than @@ -196,7 +207,7 @@ UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display) } #endif - for (UIScreenMode *uimode in data.uiscreen.availableModes) { + for (UIScreenMode *uimode in availableModes) { /* The size of a UIScreenMode is in pixels, but we deal exclusively * in points (except in SDL_GL_GetDrawableSize.) */ int w = (int)(uimode.size.width / scale); @@ -219,9 +230,11 @@ UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) { @autoreleasepool { SDL_DisplayData *data = (__bridge SDL_DisplayData *) display->driverdata; - SDL_DisplayModeData *modedata = (__bridge SDL_DisplayModeData *)mode->driverdata; +#if !TARGET_OS_TV + SDL_DisplayModeData *modedata = (__bridge SDL_DisplayModeData *)mode->driverdata; [data.uiscreen setCurrentMode:modedata.uiscreenmode]; +#endif if (data.uiscreen == [UIScreen mainScreen]) { /* [UIApplication setStatusBarOrientation:] no longer works reliably @@ -242,6 +255,36 @@ UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) return 0; } +int +UIKit_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect) +{ + @autoreleasepool { + int displayIndex = (int) (display - _this->displays); + SDL_DisplayData *data = (__bridge SDL_DisplayData *) display->driverdata; + + /* the default function iterates displays to make a fake offset, + as if all the displays were side-by-side, which is fine for iOS. */ + if (SDL_GetDisplayBounds(displayIndex, rect) < 0) { + return -1; + } + + CGRect frame = data.uiscreen.bounds; + +#if !TARGET_OS_TV + if (!UIKit_IsSystemVersionAtLeast(7.0)) { + frame = [data.uiscreen applicationFrame]; + } +#endif + + rect->x += frame.origin.x; + rect->y += frame.origin.y; + rect->w = frame.size.width; + rect->h = frame.size.height; + } + + return 0; +} + void UIKit_QuitModes(_THIS) { diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.h b/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.h index 10697610d..b52e42913 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.h +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.h @@ -33,6 +33,8 @@ extern void UIKit_GL_DeleteContext(_THIS, SDL_GLContext context); extern void *UIKit_GL_GetProcAddress(_THIS, const char *proc); extern int UIKit_GL_LoadLibrary(_THIS, const char *path); +extern void UIKit_GL_RestoreCurrentContext(); + #endif /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.m index a2ea4ab67..461ff9b80 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitopengles.m @@ -140,10 +140,19 @@ UIKit_GL_CreateContext(_THIS, SDL_Window * window) EAGLSharegroup *sharegroup = nil; CGFloat scale = 1.0; int samples = 0; + int major = _this->gl_config.major_version; + int minor = _this->gl_config.minor_version; /* The EAGLRenderingAPI enum values currently map 1:1 to major GLES * versions. */ - EAGLRenderingAPI api = _this->gl_config.major_version; + EAGLRenderingAPI api = major; + + /* iOS currently doesn't support GLES >3.0. iOS 6 also only supports up + * to GLES 2.0. */ + if (major > 3 || (major == 3 && (minor > 0 || !UIKit_IsSystemVersionAtLeast(7.0)))) { + SDL_SetError("OpenGL ES %d.%d context could not be created", major, minor); + return NULL; + } if (_this->gl_config.multisamplebuffers > 0) { samples = _this->gl_config.multisamplesamples; @@ -217,6 +226,24 @@ UIKit_GL_DeleteContext(_THIS, SDL_GLContext context) } } +void +UIKit_GL_RestoreCurrentContext() +{ + @autoreleasepool { + /* Some iOS system functionality (such as Dictation on the on-screen + keyboard) uses its own OpenGL ES context but doesn't restore the + previous one when it's done. This is a workaround to make sure the + expected SDL-created OpenGL ES context is active after the OS is + finished running its own code for the frame. If this isn't done, the + app may crash or have other nasty symptoms when Dictation is used. + */ + EAGLContext *context = (__bridge EAGLContext *) SDL_GL_GetCurrentContext(); + if (context != NULL && [EAGLContext currentContext] != context) { + [EAGLContext setCurrentContext:context]; + } + } +} + #endif /* SDL_VIDEO_DRIVER_UIKIT */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitopenglview.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitopenglview.m index 60c247e6a..aae7ee8f2 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitopenglview.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitopenglview.m @@ -239,7 +239,7 @@ if (msaaRenderbuffer != 0) { glBindRenderbuffer(GL_RENDERBUFFER, msaaRenderbuffer); - glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, GL_RGBA8, backingWidth, backingHeight); + glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, colorBufferFormat, backingWidth, backingHeight); } if (depthRenderbuffer != 0) { diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.h b/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.h index 3fbaf92f1..aafb714d7 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.h +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.h @@ -21,14 +21,25 @@ #ifndef _SDL_uikitvideo_h #define _SDL_uikitvideo_h +#include "../SDL_sysvideo.h" + +#ifdef __OBJC__ + #include -#include "../SDL_sysvideo.h" +@interface SDL_VideoData : NSObject + +@property (nonatomic) id pasteboardObserver; + +@end + +CGRect UIKit_ComputeViewFrame(SDL_Window *window, UIScreen *screen); + +#endif /* __OBJC__ */ void UIKit_SuspendScreenSaver(_THIS); -BOOL UIKit_IsSystemVersionAtLeast(double version); -CGRect UIKit_ComputeViewFrame(SDL_Window *window, UIScreen *screen); +SDL_bool UIKit_IsSystemVersionAtLeast(double version); #endif /* _SDL_uikitvideo_h */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.m index 4f3c7dc43..88d461751 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitvideo.m @@ -36,9 +36,14 @@ #include "SDL_uikitmodes.h" #include "SDL_uikitwindow.h" #include "SDL_uikitopengles.h" +#include "SDL_uikitclipboard.h" #define UIKITVID_DRIVER_NAME "uikit" +@implementation SDL_VideoData + +@end + /* Initialization/Query functions */ static int UIKit_VideoInit(_THIS); static void UIKit_VideoQuit(_THIS); @@ -53,60 +58,75 @@ UIKit_Available(void) static void UIKit_DeleteDevice(SDL_VideoDevice * device) { - SDL_free(device); + @autoreleasepool { + CFRelease(device->driverdata); + SDL_free(device); + } } static SDL_VideoDevice * UIKit_CreateDevice(int devindex) { - SDL_VideoDevice *device; + @autoreleasepool { + SDL_VideoDevice *device; + SDL_VideoData *data; - /* Initialize all variables that we clean on shutdown */ - device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice)); - if (!device) { - SDL_free(device); - SDL_OutOfMemory(); - return (0); + /* Initialize all variables that we clean on shutdown */ + device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice)); + if (device) { + data = [SDL_VideoData new]; + } else { + SDL_free(device); + SDL_OutOfMemory(); + return (0); + } + + device->driverdata = (void *) CFBridgingRetain(data); + + /* Set the function pointers */ + device->VideoInit = UIKit_VideoInit; + device->VideoQuit = UIKit_VideoQuit; + device->GetDisplayModes = UIKit_GetDisplayModes; + device->SetDisplayMode = UIKit_SetDisplayMode; + device->PumpEvents = UIKit_PumpEvents; + device->SuspendScreenSaver = UIKit_SuspendScreenSaver; + device->CreateWindow = UIKit_CreateWindow; + device->SetWindowTitle = UIKit_SetWindowTitle; + device->ShowWindow = UIKit_ShowWindow; + device->HideWindow = UIKit_HideWindow; + device->RaiseWindow = UIKit_RaiseWindow; + device->SetWindowBordered = UIKit_SetWindowBordered; + device->SetWindowFullscreen = UIKit_SetWindowFullscreen; + device->DestroyWindow = UIKit_DestroyWindow; + device->GetWindowWMInfo = UIKit_GetWindowWMInfo; + device->GetDisplayUsableBounds = UIKit_GetDisplayUsableBounds; + + #if SDL_IPHONE_KEYBOARD + device->HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport; + device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard; + device->HideScreenKeyboard = UIKit_HideScreenKeyboard; + device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown; + device->SetTextInputRect = UIKit_SetTextInputRect; + #endif + + device->SetClipboardText = UIKit_SetClipboardText; + device->GetClipboardText = UIKit_GetClipboardText; + device->HasClipboardText = UIKit_HasClipboardText; + + /* OpenGL (ES) functions */ + device->GL_MakeCurrent = UIKit_GL_MakeCurrent; + device->GL_GetDrawableSize = UIKit_GL_GetDrawableSize; + device->GL_SwapWindow = UIKit_GL_SwapWindow; + device->GL_CreateContext = UIKit_GL_CreateContext; + device->GL_DeleteContext = UIKit_GL_DeleteContext; + device->GL_GetProcAddress = UIKit_GL_GetProcAddress; + device->GL_LoadLibrary = UIKit_GL_LoadLibrary; + device->free = UIKit_DeleteDevice; + + device->gl_config.accelerated = 1; + + return device; } - - /* Set the function pointers */ - device->VideoInit = UIKit_VideoInit; - device->VideoQuit = UIKit_VideoQuit; - device->GetDisplayModes = UIKit_GetDisplayModes; - device->SetDisplayMode = UIKit_SetDisplayMode; - device->PumpEvents = UIKit_PumpEvents; - device->SuspendScreenSaver = UIKit_SuspendScreenSaver; - device->CreateWindow = UIKit_CreateWindow; - device->SetWindowTitle = UIKit_SetWindowTitle; - device->ShowWindow = UIKit_ShowWindow; - device->HideWindow = UIKit_HideWindow; - device->RaiseWindow = UIKit_RaiseWindow; - device->SetWindowBordered = UIKit_SetWindowBordered; - device->SetWindowFullscreen = UIKit_SetWindowFullscreen; - device->DestroyWindow = UIKit_DestroyWindow; - device->GetWindowWMInfo = UIKit_GetWindowWMInfo; - -#if SDL_IPHONE_KEYBOARD - device->HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport; - device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard; - device->HideScreenKeyboard = UIKit_HideScreenKeyboard; - device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown; - device->SetTextInputRect = UIKit_SetTextInputRect; -#endif - - /* OpenGL (ES) functions */ - device->GL_MakeCurrent = UIKit_GL_MakeCurrent; - device->GL_GetDrawableSize = UIKit_GL_GetDrawableSize; - device->GL_SwapWindow = UIKit_GL_SwapWindow; - device->GL_CreateContext = UIKit_GL_CreateContext; - device->GL_DeleteContext = UIKit_GL_DeleteContext; - device->GL_GetProcAddress = UIKit_GL_GetProcAddress; - device->GL_LoadLibrary = UIKit_GL_LoadLibrary; - device->free = UIKit_DeleteDevice; - - device->gl_config.accelerated = 1; - - return device; } VideoBootStrap UIKIT_bootstrap = { @@ -138,7 +158,7 @@ UIKit_SuspendScreenSaver(_THIS) @autoreleasepool { /* Ignore ScreenSaver API calls if the idle timer hint has been set. */ /* FIXME: The idle timer hint should be deprecated for SDL 2.1. */ - if (SDL_GetHint(SDL_HINT_IDLE_TIMER_DISABLED) == NULL) { + if (!SDL_GetHintBoolean(SDL_HINT_IDLE_TIMER_DISABLED, SDL_FALSE)) { UIApplication *app = [UIApplication sharedApplication]; /* Prevent the display from dimming and going to sleep. */ @@ -147,7 +167,7 @@ UIKit_SuspendScreenSaver(_THIS) } } -BOOL +SDL_bool UIKit_IsSystemVersionAtLeast(double version) { return [[UIDevice currentDevice].systemVersion doubleValue] >= version; @@ -156,6 +176,7 @@ UIKit_IsSystemVersionAtLeast(double version) CGRect UIKit_ComputeViewFrame(SDL_Window *window, UIScreen *screen) { +#if !TARGET_OS_TV && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0) BOOL hasiOS7 = UIKit_IsSystemVersionAtLeast(7.0); if (hasiOS7 || (window->flags & (SDL_WINDOW_BORDERLESS|SDL_WINDOW_FULLSCREEN))) { @@ -164,6 +185,9 @@ UIKit_ComputeViewFrame(SDL_Window *window, UIScreen *screen) } else { return screen.applicationFrame; } +#else + return screen.bounds; +#endif } /* diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitview.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitview.m index 1ccda98ff..c7d9f51d9 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitview.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitview.m @@ -45,7 +45,9 @@ self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; self.autoresizesSubviews = YES; +#if !TARGET_OS_TV self.multipleTouchEnabled = YES; +#endif touchId = 1; SDL_AddTouch(touchId, ""); @@ -141,12 +143,13 @@ if (!firstFingerDown) { CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO]; + int clicks = (int) touch.tapCount; /* send mouse moved event */ SDL_SendMouseMotion(sdlwindow, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y); /* send mouse down event */ - SDL_SendMouseButton(sdlwindow, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT); + SDL_SendMouseButtonClicks(sdlwindow, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT, clicks); firstFingerDown = touch; } @@ -164,7 +167,8 @@ if (touch == firstFingerDown) { /* send mouse up */ - SDL_SendMouseButton(sdlwindow, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT); + int clicks = (int) touch.tapCount; + SDL_SendMouseButtonClicks(sdlwindow, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT, clicks); firstFingerDown = nil; } @@ -197,6 +201,69 @@ } } +#if TARGET_OS_TV || defined(__IPHONE_9_1) +- (SDL_Scancode)scancodeFromPressType:(UIPressType)presstype +{ + switch (presstype) { + case UIPressTypeUpArrow: + return SDL_SCANCODE_UP; + case UIPressTypeDownArrow: + return SDL_SCANCODE_DOWN; + case UIPressTypeLeftArrow: + return SDL_SCANCODE_LEFT; + case UIPressTypeRightArrow: + return SDL_SCANCODE_RIGHT; + case UIPressTypeSelect: + /* HIG says: "primary button behavior" */ + return SDL_SCANCODE_SELECT; + case UIPressTypeMenu: + /* HIG says: "returns to previous screen" */ + return SDL_SCANCODE_MENU; + case UIPressTypePlayPause: + /* HIG says: "secondary button behavior" */ + return SDL_SCANCODE_PAUSE; + default: + return SDL_SCANCODE_UNKNOWN; + } +} + +- (void)pressesBegan:(NSSet *)presses withEvent:(UIPressesEvent *)event +{ + for (UIPress *press in presses) { + SDL_Scancode scancode = [self scancodeFromPressType:press.type]; + SDL_SendKeyboardKey(SDL_PRESSED, scancode); + } + + [super pressesBegan:presses withEvent:event]; +} + +- (void)pressesEnded:(NSSet *)presses withEvent:(UIPressesEvent *)event +{ + for (UIPress *press in presses) { + SDL_Scancode scancode = [self scancodeFromPressType:press.type]; + SDL_SendKeyboardKey(SDL_RELEASED, scancode); + } + + [super pressesEnded:presses withEvent:event]; +} + +- (void)pressesCancelled:(NSSet *)presses withEvent:(UIPressesEvent *)event +{ + for (UIPress *press in presses) { + SDL_Scancode scancode = [self scancodeFromPressType:press.type]; + SDL_SendKeyboardKey(SDL_RELEASED, scancode); + } + + [super pressesCancelled:presses withEvent:event]; +} + +- (void)pressesChanged:(NSSet *)presses withEvent:(UIPressesEvent *)event +{ + /* This is only called when the force of a press changes. */ + [super pressesChanged:presses withEvent:event]; +} +#endif /* TARGET_OS_TV || defined(__IPHONE_9_1) */ + @end #endif /* SDL_VIDEO_DRIVER_UIKIT */ diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.h b/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.h index c78396802..860852441 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.h +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.h @@ -1,23 +1,24 @@ /* - Simple DirectMedia Layer - Copyright (C) 1997-2016 Sam Lantinga + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - */ + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +#include "../../SDL_internal.h" #import @@ -25,10 +26,17 @@ #include "SDL_touch.h" -#if SDL_IPHONE_KEYBOARD -@interface SDL_uikitviewcontroller : UIViewController +#if TARGET_OS_TV +#import +#define SDLRootViewController GCEventViewController #else -@interface SDL_uikitviewcontroller : UIViewController +#define SDLRootViewController UIViewController +#endif + +#if SDL_IPHONE_KEYBOARD +@interface SDL_uikitviewcontroller : SDLRootViewController +#else +@interface SDL_uikitviewcontroller : SDLRootViewController #endif @property (nonatomic, assign) SDL_Window *window; @@ -46,8 +54,11 @@ - (void)loadView; - (void)viewDidLayoutSubviews; + +#if !TARGET_OS_TV - (NSUInteger)supportedInterfaceOrientations; - (BOOL)prefersStatusBarHidden; +#endif #if SDL_IPHONE_KEYBOARD - (void)showKeyboard; diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.m index 58cdf1ac5..e6e903ee4 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitviewcontroller.m @@ -33,11 +33,23 @@ #include "SDL_uikitvideo.h" #include "SDL_uikitmodes.h" #include "SDL_uikitwindow.h" +#include "SDL_uikitopengles.h" #if SDL_IPHONE_KEYBOARD #include "keyinfotable.h" #endif +#if TARGET_OS_TV +static void +SDL_AppleTVControllerUIHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint) +{ + @autoreleasepool { + SDL_uikitviewcontroller *viewcontroller = (__bridge SDL_uikitviewcontroller *) userdata; + viewcontroller.controllerUserInteractionEnabled = hint && (*hint != '0'); + } +} +#endif + @implementation SDL_uikitviewcontroller { CADisplayLink *displayLink; int animationInterval; @@ -59,6 +71,12 @@ #if SDL_IPHONE_KEYBOARD [self initKeyboard]; #endif + +#if TARGET_OS_TV + SDL_AddHintCallback(SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS, + SDL_AppleTVControllerUIHintChanged, + (__bridge void *) self); +#endif } return self; } @@ -68,6 +86,12 @@ #if SDL_IPHONE_KEYBOARD [self deinitKeyboard]; #endif + +#if TARGET_OS_TV + SDL_DelHintCallback(SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS, + SDL_AppleTVControllerUIHintChanged, + (__bridge void *) self); +#endif } - (void)setAnimationCallback:(int)interval @@ -102,6 +126,9 @@ { /* Don't run the game loop while a messagebox is up */ if (!UIKit_ShowingMessageBox()) { + /* See the comment in the function definition. */ + UIKit_GL_RestoreCurrentContext(); + animationCallback(animationCallbackParam); } } @@ -120,6 +147,7 @@ SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, w, h); } +#if !TARGET_OS_TV - (NSUInteger)supportedInterfaceOrientations { return UIKit_GetSupportedOrientations(window); @@ -134,6 +162,7 @@ { return (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) != 0; } +#endif /* ---- Keyboard related functionality below this line ---- @@ -164,9 +193,11 @@ textField.hidden = YES; keyboardVisible = NO; +#if !TARGET_OS_TV NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; [center addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; [center addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; +#endif } - (void)setView:(UIView *)view @@ -182,9 +213,11 @@ - (void)deinitKeyboard { +#if !TARGET_OS_TV NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; [center removeObserver:self name:UIKeyboardWillShowNotification object:nil]; [center removeObserver:self name:UIKeyboardWillHideNotification object:nil]; +#endif } /* reveal onscreen virtual keyboard */ @@ -205,6 +238,7 @@ - (void)keyboardWillShow:(NSNotification *)notification { +#if !TARGET_OS_TV CGRect kbrect = [[notification userInfo][UIKeyboardFrameBeginUserInfoKey] CGRectValue]; /* The keyboard rect is in the coordinate space of the screen/window, but we @@ -212,10 +246,12 @@ kbrect = [self.view convertRect:kbrect fromView:nil]; [self setKeyboardHeight:(int)kbrect.size.height]; +#endif } - (void)keyboardWillHide:(NSNotification *)notification { + SDL_StopTextInput(); [self setKeyboardHeight:0]; } diff --git a/Engine/lib/sdl/src/video/uikit/SDL_uikitwindow.m b/Engine/lib/sdl/src/video/uikit/SDL_uikitwindow.m index c5f385b8c..35c549b43 100644 --- a/Engine/lib/sdl/src/video/uikit/SDL_uikitwindow.m +++ b/Engine/lib/sdl/src/video/uikit/SDL_uikitwindow.m @@ -99,14 +99,13 @@ static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bo /* only one window on iOS, always shown */ window->flags &= ~SDL_WINDOW_HIDDEN; - if (displaydata.uiscreen == [UIScreen mainScreen]) { - window->flags |= SDL_WINDOW_INPUT_FOCUS; /* always has input focus */ - } else { + if (displaydata.uiscreen != [UIScreen mainScreen]) { window->flags &= ~SDL_WINDOW_RESIZABLE; /* window is NEVER resizable */ window->flags &= ~SDL_WINDOW_INPUT_FOCUS; /* never has input focus */ window->flags |= SDL_WINDOW_BORDERLESS; /* never has a status bar. */ } +#if !TARGET_OS_TV if (displaydata.uiscreen == [UIScreen mainScreen]) { NSUInteger orients = UIKit_GetSupportedOrientations(window); BOOL supportsLandscape = (orients & UIInterfaceOrientationMaskLandscape) != 0; @@ -119,6 +118,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bo height = temp; } } +#endif /* !TARGET_OS_TV */ window->x = 0; window->y = 0; @@ -152,7 +152,6 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) @autoreleasepool { SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); SDL_DisplayData *data = (__bridge SDL_DisplayData *) display->driverdata; - const CGSize origsize = data.uiscreen.currentMode.size; /* SDL currently puts this window at the start of display's linked list. We rely on this. */ SDL_assert(_this->windows == window); @@ -165,6 +164,8 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) /* If monitor has a resolution of 0x0 (hasn't been explicitly set by the * user, so it's in standby), try to force the display to a resolution * that most closely matches the desired window size. */ +#if !TARGET_OS_TV + const CGSize origsize = data.uiscreen.currentMode.size; if ((origsize.width == 0.0f) && (origsize.height == 0.0f)) { if (display->num_display_modes == 0) { _this->GetDisplayModes(_this, display); @@ -197,6 +198,7 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) [UIApplication sharedApplication].statusBarHidden = NO; } } +#endif /* !TARGET_OS_TV */ /* ignore the size user requested, and make a fullscreen window */ /* !!! FIXME: can we have a smaller view? */ @@ -258,6 +260,7 @@ UIKit_UpdateWindowBorder(_THIS, SDL_Window * window) SDL_WindowData *data = (__bridge SDL_WindowData *) window->driverdata; SDL_uikitviewcontroller *viewcontroller = data.viewcontroller; +#if !TARGET_OS_TV if (data.uiwindow.screen == [UIScreen mainScreen]) { if (window->flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS)) { [UIApplication sharedApplication].statusBarHidden = YES; @@ -273,6 +276,7 @@ UIKit_UpdateWindowBorder(_THIS, SDL_Window * window) /* Update the view's frame to account for the status bar change. */ viewcontroller.view.frame = UIKit_ComputeViewFrame(window, data.uiwindow.screen); +#endif /* !TARGET_OS_TV */ #ifdef SDL_IPHONE_KEYBOARD /* Make sure the view is offset correctly when the keyboard is visible. */ @@ -363,6 +367,7 @@ UIKit_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) } } +#if !TARGET_OS_TV NSUInteger UIKit_GetSupportedOrientations(SDL_Window * window) { @@ -428,6 +433,7 @@ UIKit_GetSupportedOrientations(SDL_Window * window) return orientationMask; } +#endif /* !TARGET_OS_TV */ int SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam) diff --git a/Engine/lib/sdl/src/video/vivante/SDL_vivantevideo.c b/Engine/lib/sdl/src/video/vivante/SDL_vivantevideo.c index fe4ea089d..0372de5c3 100644 --- a/Engine/lib/sdl/src/video/vivante/SDL_vivantevideo.c +++ b/Engine/lib/sdl/src/video/vivante/SDL_vivantevideo.c @@ -77,7 +77,7 @@ VIVANTE_Create() device->driverdata = data; - /* Setup amount of available displays and current display */ + /* Setup amount of available displays */ device->num_displays = 0; /* Set device free function */ @@ -366,12 +366,13 @@ VIVANTE_HideWindow(_THIS, SDL_Window * window) SDL_bool VIVANTE_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info) { -/* SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + SDL_DisplayData *displaydata = SDL_GetDisplayDriverData(0); if (info->version.major == SDL_MAJOR_VERSION && info->version.minor == SDL_MINOR_VERSION) { info->subsystem = SDL_SYSWM_VIVANTE; + info->info.vivante.display = displaydata->native_display; info->info.vivante.window = data->native_window; return SDL_TRUE; } else { @@ -379,9 +380,6 @@ VIVANTE_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info) SDL_MAJOR_VERSION, SDL_MINOR_VERSION); return SDL_FALSE; } -*/ - SDL_Unsupported(); - return SDL_FALSE; } /*****************************************************************************/ diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.c b/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.c index bc1d06e46..14674fbe2 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.c +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.c @@ -94,9 +94,6 @@ WAYLAND_GetSym(const char *fnname, int *pHasModule) #define SDL_WAYLAND_SYM(rc,fn,params) SDL_DYNWAYLANDFN_##fn WAYLAND_##fn = NULL; #define SDL_WAYLAND_INTERFACE(iface) const struct wl_interface *WAYLAND_##iface = NULL; #include "SDL_waylandsym.h" -#undef SDL_WAYLAND_MODULE -#undef SDL_WAYLAND_SYM -#undef SDL_WAYLAND_INTERFACE static int wayland_load_refcount = 0; @@ -115,9 +112,6 @@ SDL_WAYLAND_UnloadSymbols(void) #define SDL_WAYLAND_SYM(rc,fn,params) WAYLAND_##fn = NULL; #define SDL_WAYLAND_INTERFACE(iface) WAYLAND_##iface = NULL; #include "SDL_waylandsym.h" -#undef SDL_WAYLAND_MODULE -#undef SDL_WAYLAND_SYM -#undef SDL_WAYLAND_INTERFACE #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC @@ -150,20 +144,12 @@ SDL_WAYLAND_LoadSymbols(void) } #define SDL_WAYLAND_MODULE(modname) SDL_WAYLAND_HAVE_##modname = 1; /* default yes */ -#define SDL_WAYLAND_SYM(rc,fn,params) -#define SDL_WAYLAND_INTERFACE(iface) #include "SDL_waylandsym.h" -#undef SDL_WAYLAND_MODULE -#undef SDL_WAYLAND_SYM -#undef SDL_WAYLAND_INTERFACE #define SDL_WAYLAND_MODULE(modname) thismod = &SDL_WAYLAND_HAVE_##modname; #define SDL_WAYLAND_SYM(rc,fn,params) WAYLAND_##fn = (SDL_DYNWAYLANDFN_##fn) WAYLAND_GetSym(#fn,thismod); #define SDL_WAYLAND_INTERFACE(iface) WAYLAND_##iface = (struct wl_interface *) WAYLAND_GetSym(#iface,thismod); #include "SDL_waylandsym.h" -#undef SDL_WAYLAND_MODULE -#undef SDL_WAYLAND_SYM -#undef SDL_WAYLAND_INTERFACE if (SDL_WAYLAND_HAVE_WAYLAND_CLIENT) { /* all required symbols loaded. */ @@ -180,9 +166,6 @@ SDL_WAYLAND_LoadSymbols(void) #define SDL_WAYLAND_SYM(rc,fn,params) WAYLAND_##fn = fn; #define SDL_WAYLAND_INTERFACE(iface) WAYLAND_##iface = &iface; #include "SDL_waylandsym.h" -#undef SDL_WAYLAND_MODULE -#undef SDL_WAYLAND_SYM -#undef SDL_WAYLAND_INTERFACE #endif } diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.h b/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.h index b3ff9d8e9..f1f652566 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.h +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylanddyn.h @@ -53,10 +53,7 @@ void SDL_WAYLAND_UnloadSymbols(void); extern SDL_DYNWAYLANDFN_##fn WAYLAND_##fn; #define SDL_WAYLAND_INTERFACE(iface) extern const struct wl_interface *WAYLAND_##iface; #include "SDL_waylandsym.h" -#undef SDL_WAYLAND_MODULE -#undef SDL_WAYLAND_SYM -#undef SDL_WAYLAND_INTERFACE - + #ifdef __cplusplus } @@ -79,6 +76,7 @@ void SDL_WAYLAND_UnloadSymbols(void); #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) +#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) #define wl_seat_interface (*WAYLAND_wl_seat_interface) #define wl_surface_interface (*WAYLAND_wl_surface_interface) @@ -96,7 +94,8 @@ void SDL_WAYLAND_UnloadSymbols(void); #endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ -#include "wayland-client.h" +#include "wayland-client-core.h" +#include "wayland-client-protocol.h" #include "wayland-egl.h" #endif /* !defined _SDL_waylanddyn_h */ diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandevents.c b/Engine/lib/sdl/src/video/wayland/SDL_waylandevents.c index 53b0ac907..2443aef7a 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandevents.c +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandevents.c @@ -25,6 +25,7 @@ #include "SDL_stdinc.h" #include "SDL_assert.h" +#include "SDL_log.h" #include "../../events/SDL_sysevents.h" #include "../../events/SDL_events_c.h" @@ -36,11 +37,13 @@ #include "SDL_waylanddyn.h" +#include "pointer-constraints-unstable-v1-client-protocol.h" +#include "relative-pointer-unstable-v1-client-protocol.h" + #include #include #include #include -#include #include #include @@ -49,13 +52,17 @@ struct SDL_WaylandInput { struct wl_seat *seat; struct wl_pointer *pointer; struct wl_keyboard *keyboard; + struct zwp_relative_pointer_v1 *relative_pointer; SDL_WindowData *pointer_focus; SDL_WindowData *keyboard_focus; /* Last motion location */ wl_fixed_t sx_w; wl_fixed_t sy_w; - + + double dx_frac; + double dy_frac; + struct { struct xkb_keymap *keymap; struct xkb_state *state; @@ -171,10 +178,9 @@ ProcessHitTest(struct SDL_WaylandInput *input, uint32_t serial) } static void -pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial, - uint32_t time, uint32_t button, uint32_t state_w) +pointer_handle_button_common(struct SDL_WaylandInput *input, uint32_t serial, + uint32_t time, uint32_t button, uint32_t state_w) { - struct SDL_WaylandInput *input = data; SDL_WindowData *window = input->pointer_focus; enum wl_pointer_button_state state = state_w; uint32_t sdl_button; @@ -183,7 +189,7 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial, switch (button) { case BTN_LEFT: sdl_button = SDL_BUTTON_LEFT; - if (ProcessHitTest(data, serial)) { + if (ProcessHitTest(input, serial)) { return; /* don't pass this event on to app. */ } break; @@ -209,10 +215,18 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial, } static void -pointer_handle_axis(void *data, struct wl_pointer *pointer, - uint32_t time, uint32_t axis, wl_fixed_t value) +pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial, + uint32_t time, uint32_t button, uint32_t state_w) { struct SDL_WaylandInput *input = data; + + pointer_handle_button_common(input, serial, time, button, state_w); +} + +static void +pointer_handle_axis_common(struct SDL_WaylandInput *input, + uint32_t time, uint32_t axis, wl_fixed_t value) +{ SDL_WindowData *window = input->pointer_focus; enum wl_pointer_axis a = axis; int x, y; @@ -235,6 +249,15 @@ pointer_handle_axis(void *data, struct wl_pointer *pointer, } } +static void +pointer_handle_axis(void *data, struct wl_pointer *pointer, + uint32_t time, uint32_t axis, wl_fixed_t value) +{ + struct SDL_WaylandInput *input = data; + + pointer_handle_axis_common(input, time, axis, value); +} + static const struct wl_pointer_listener pointer_listener = { pointer_handle_enter, pointer_handle_leave, @@ -302,9 +325,9 @@ keyboard_handle_enter(void *data, struct wl_keyboard *keyboard, window = wl_surface_get_user_data(surface); - input->keyboard_focus = window; - window->keyboard_device = input; if (window) { + input->keyboard_focus = window; + window->keyboard_device = input; SDL_SetKeyboardFocus(window->sdlwindow); } } @@ -454,6 +477,164 @@ void Wayland_display_destroy_input(SDL_VideoData *d) d->input = NULL; } +void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id) +{ + d->relative_pointer_manager = + wl_registry_bind(d->registry, id, + &zwp_relative_pointer_manager_v1_interface, 1); +} + +void Wayland_display_destroy_relative_pointer_manager(SDL_VideoData *d) +{ + if (d->relative_pointer_manager) + zwp_relative_pointer_manager_v1_destroy(d->relative_pointer_manager); +} + +void Wayland_display_add_pointer_constraints(SDL_VideoData *d, uint32_t id) +{ + d->pointer_constraints = + wl_registry_bind(d->registry, id, + &zwp_pointer_constraints_v1_interface, 1); +} + +void Wayland_display_destroy_pointer_constraints(SDL_VideoData *d) +{ + if (d->pointer_constraints) + zwp_pointer_constraints_v1_destroy(d->pointer_constraints); +} + +static void +relative_pointer_handle_relative_motion(void *data, + struct zwp_relative_pointer_v1 *pointer, + uint32_t time_hi, + uint32_t time_lo, + wl_fixed_t dx_w, + wl_fixed_t dy_w, + wl_fixed_t dx_unaccel_w, + wl_fixed_t dy_unaccel_w) +{ + struct SDL_WaylandInput *input = data; + SDL_VideoData *d = input->display; + SDL_WindowData *window = input->pointer_focus; + double dx_unaccel; + double dy_unaccel; + double dx; + double dy; + + dx_unaccel = wl_fixed_to_double(dx_unaccel_w); + dy_unaccel = wl_fixed_to_double(dy_unaccel_w); + + /* Add left over fraction from last event. */ + dx_unaccel += input->dx_frac; + dy_unaccel += input->dy_frac; + + input->dx_frac = modf(dx_unaccel, &dx); + input->dy_frac = modf(dy_unaccel, &dy); + + if (input->pointer_focus && d->relative_mouse_mode) { + SDL_SendMouseMotion(window->sdlwindow, 0, 1, (int)dx, (int)dy); + } +} + +static const struct zwp_relative_pointer_v1_listener relative_pointer_listener = { + relative_pointer_handle_relative_motion, +}; + +static void +locked_pointer_locked(void *data, + struct zwp_locked_pointer_v1 *locked_pointer) +{ +} + +static void +locked_pointer_unlocked(void *data, + struct zwp_locked_pointer_v1 *locked_pointer) +{ +} + +static const struct zwp_locked_pointer_v1_listener locked_pointer_listener = { + locked_pointer_locked, + locked_pointer_unlocked, +}; + +static void +lock_pointer_to_window(SDL_Window *window, + struct SDL_WaylandInput *input) +{ + SDL_WindowData *w = window->driverdata; + SDL_VideoData *d = input->display; + struct zwp_locked_pointer_v1 *locked_pointer; + + if (w->locked_pointer) + return; + + locked_pointer = + zwp_pointer_constraints_v1_lock_pointer(d->pointer_constraints, + w->surface, + input->pointer, + NULL, + ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT); + zwp_locked_pointer_v1_add_listener(locked_pointer, + &locked_pointer_listener, + window); + + w->locked_pointer = locked_pointer; +} + +int Wayland_input_lock_pointer(struct SDL_WaylandInput *input) +{ + SDL_VideoDevice *vd = SDL_GetVideoDevice(); + SDL_VideoData *d = input->display; + SDL_Window *window; + struct zwp_relative_pointer_v1 *relative_pointer; + + if (!d->relative_pointer_manager) + return -1; + + if (!d->pointer_constraints) + return -1; + + if (!input->relative_pointer) { + relative_pointer = + zwp_relative_pointer_manager_v1_get_relative_pointer( + d->relative_pointer_manager, + input->pointer); + zwp_relative_pointer_v1_add_listener(relative_pointer, + &relative_pointer_listener, + input); + input->relative_pointer = relative_pointer; + } + + for (window = vd->windows; window; window = window->next) + lock_pointer_to_window(window, input); + + d->relative_mouse_mode = 1; + + return 0; +} + +int Wayland_input_unlock_pointer(struct SDL_WaylandInput *input) +{ + SDL_VideoDevice *vd = SDL_GetVideoDevice(); + SDL_VideoData *d = input->display; + SDL_Window *window; + SDL_WindowData *w; + + for (window = vd->windows; window; window = window->next) { + w = window->driverdata; + if (w->locked_pointer) + zwp_locked_pointer_v1_destroy(w->locked_pointer); + w->locked_pointer = NULL; + } + + zwp_relative_pointer_v1_destroy(input->relative_pointer); + input->relative_pointer = NULL; + + d->relative_mouse_mode = 0; + + return 0; +} + #endif /* SDL_VIDEO_DRIVER_WAYLAND */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandevents_c.h b/Engine/lib/sdl/src/video/wayland/SDL_waylandevents_c.h index 62b163bf6..56d12ec27 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandevents_c.h +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandevents_c.h @@ -32,6 +32,15 @@ extern void Wayland_PumpEvents(_THIS); extern void Wayland_display_add_input(SDL_VideoData *d, uint32_t id); extern void Wayland_display_destroy_input(SDL_VideoData *d); +extern void Wayland_display_add_pointer_constraints(SDL_VideoData *d, uint32_t id); +extern void Wayland_display_destroy_pointer_constraints(SDL_VideoData *d); + +extern int Wayland_input_lock_pointer(struct SDL_WaylandInput *input); +extern int Wayland_input_unlock_pointer(struct SDL_WaylandInput *input); + +extern void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id); +extern void Wayland_display_destroy_relative_pointer_manager(SDL_VideoData *d); + #endif /* _SDL_waylandevents_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandmouse.c b/Engine/lib/sdl/src/video/wayland/SDL_waylandmouse.c index b810f7784..8dfc9eea3 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandmouse.c +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandmouse.c @@ -27,7 +27,6 @@ #define _GNU_SOURCE #endif -#include #include #include #include @@ -70,7 +69,6 @@ wayland_create_tmp_file(off_t size) xdg_path = SDL_getenv("XDG_RUNTIME_DIR"); if (!xdg_path) { - errno = ENOENT; return -1; } @@ -116,8 +114,7 @@ create_buffer_from_shm(Wayland_CursorData *d, shm_fd = wayland_create_tmp_file(size); if (shm_fd < 0) { - fprintf(stderr, "creating mouse cursor buffer failed!\n"); - return -1; + return SDL_SetError("Creating mouse cursor buffer failed."); } d->shm_data = mmap(NULL, @@ -128,8 +125,8 @@ create_buffer_from_shm(Wayland_CursorData *d, 0); if (d->shm_data == MAP_FAILED) { d->shm_data = NULL; - fprintf (stderr, "mmap () failed\n"); close (shm_fd); + return SDL_SetError("mmap() failed."); } shm_pool = wl_shm_create_pool(data->shm, shm_fd, size); @@ -159,6 +156,11 @@ Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y) SDL_VideoDevice *vd = SDL_GetVideoDevice (); SDL_VideoData *wd = (SDL_VideoData *) vd->driverdata; Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData)); + if (!data) { + SDL_OutOfMemory(); + free(cursor); + return NULL; + } cursor->driverdata = (void *) data; /* Assume ARGB8888 */ @@ -169,7 +171,7 @@ Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y) if (create_buffer_from_shm (data, surface->w, surface->h, - WL_SHM_FORMAT_XRGB8888) < 0) + WL_SHM_FORMAT_ARGB8888) < 0) { free (cursor->driverdata); free (cursor); @@ -187,6 +189,8 @@ Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y) data->hot_y = hot_y; data->w = surface->w; data->h = surface->h; + } else { + SDL_OutOfMemory(); } return cursor; @@ -200,6 +204,11 @@ CreateCursorFromWlCursor(SDL_VideoData *d, struct wl_cursor *wlcursor) cursor = calloc(1, sizeof (*cursor)); if (cursor) { Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData)); + if (!data) { + SDL_OutOfMemory(); + free(cursor); + return NULL; + } cursor->driverdata = (void *) data; data->buffer = WAYLAND_wl_cursor_image_get_buffer(wlcursor->images[0]); @@ -322,13 +331,13 @@ Wayland_ShowCursor(SDL_Cursor *cursor) { Wayland_CursorData *data = cursor->driverdata; - wl_surface_attach(data->surface, data->buffer, 0, 0); - wl_surface_damage(data->surface, 0, 0, data->w, data->h); - wl_surface_commit(data->surface); wl_pointer_set_cursor (pointer, 0, data->surface, data->hot_x, data->hot_y); + wl_surface_attach(data->surface, data->buffer, 0, 0); + wl_surface_damage(data->surface, 0, 0, data->w, data->h); + wl_surface_commit(data->surface); } else { @@ -356,7 +365,13 @@ Wayland_WarpMouseGlobal(int x, int y) static int Wayland_SetRelativeMouseMode(SDL_bool enabled) { - return SDL_Unsupported(); + SDL_VideoDevice *vd = SDL_GetVideoDevice(); + SDL_VideoData *data = (SDL_VideoData *) vd->driverdata; + + if (enabled) + return Wayland_input_lock_pointer(data->input); + else + return Wayland_input_unlock_pointer(data->input); } void diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandsym.h b/Engine/lib/sdl/src/video/wayland/SDL_waylandsym.h index b093d9db1..aea3cb129 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandsym.h +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandsym.h @@ -21,6 +21,18 @@ /* *INDENT-OFF* */ +#ifndef SDL_WAYLAND_MODULE +#define SDL_WAYLAND_MODULE(modname) +#endif + +#ifndef SDL_WAYLAND_SYM +#define SDL_WAYLAND_SYM(rc,fn,params) +#endif + +#ifndef SDL_WAYLAND_INTERFACE +#define SDL_WAYLAND_INTERFACE(iface) +#endif + SDL_WAYLAND_MODULE(WAYLAND_CLIENT) SDL_WAYLAND_SYM(void, wl_proxy_marshal, (struct wl_proxy *, uint32_t, ...)) SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_create, (struct wl_proxy *, const struct wl_interface *)) @@ -55,6 +67,9 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *)) SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...)) +SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) +SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) + SDL_WAYLAND_INTERFACE(wl_seat_interface) SDL_WAYLAND_INTERFACE(wl_surface_interface) SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) @@ -99,8 +114,10 @@ SDL_WAYLAND_SYM(enum xkb_state_component, xkb_state_update_mask, (struct xkb_sta xkb_layout_index_t latched_layout,\ xkb_layout_index_t locked_layout) ) +#undef SDL_WAYLAND_MODULE +#undef SDL_WAYLAND_SYM +#undef SDL_WAYLAND_INTERFACE /* *INDENT-ON* */ /* vi: set ts=4 sw=4 expandtab: */ -//SDL_WAYLAND_SYM(ret, fn, params) diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.c b/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.c index b47ec29be..554b0ecad 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.c +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.c @@ -35,6 +35,8 @@ #include "SDL_waylandmouse.h" #include "SDL_waylandtouch.h" +#include +#include #include #include @@ -55,6 +57,56 @@ Wayland_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode); static void Wayland_VideoQuit(_THIS); +/* Find out what class name we should use + * Based on src/video/x11/SDL_x11video.c */ +static char * +get_classname() +{ + char *spot; +#if defined(__LINUX__) || defined(__FREEBSD__) + char procfile[1024]; + char linkfile[1024]; + int linksize; +#endif + + /* First allow environment variable override */ + spot = SDL_getenv("SDL_VIDEO_WAYLAND_WMCLASS"); + if (spot) { + return SDL_strdup(spot); + } else { + /* Fallback to the "old" envvar */ + spot = SDL_getenv("SDL_VIDEO_X11_WMCLASS"); + if (spot) { + return SDL_strdup(spot); + } + } + + /* Next look at the application's executable name */ +#if defined(__LINUX__) || defined(__FREEBSD__) +#if defined(__LINUX__) + SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/exe", getpid()); +#elif defined(__FREEBSD__) + SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file", + getpid()); +#else +#error Where can we find the executable name? +#endif + linksize = readlink(procfile, linkfile, sizeof(linkfile) - 1); + if (linksize > 0) { + linkfile[linksize] = '\0'; + spot = SDL_strrchr(linkfile, '/'); + if (spot) { + return SDL_strdup(spot + 1); + } else { + return SDL_strdup(linkfile); + } + } +#endif /* __LINUX__ || __FREEBSD__ */ + + /* Finally use the default we've used forever */ + return SDL_strdup("SDL_App"); +} + /* Wayland driver bootstrap functions */ static int Wayland_Available(void) @@ -117,7 +169,10 @@ Wayland_CreateDevice(int devindex) device->CreateWindow = Wayland_CreateWindow; device->ShowWindow = Wayland_ShowWindow; device->SetWindowFullscreen = Wayland_SetWindowFullscreen; + device->MaximizeWindow = Wayland_MaximizeWindow; + device->RestoreWindow = Wayland_RestoreWindow; device->SetWindowSize = Wayland_SetWindowSize; + device->SetWindowTitle = Wayland_SetWindowTitle; device->DestroyWindow = Wayland_DestroyWindow; device->SetWindowHitTest = Wayland_SetWindowHitTest; @@ -145,7 +200,7 @@ display_handle_geometry(void *data, { SDL_VideoDisplay *display = data; - display->name = strdup(model); + display->name = SDL_strdup(model); display->driverdata = output; } @@ -253,8 +308,10 @@ display_handle_global(void *data, struct wl_registry *registry, uint32_t id, } else if (strcmp(interface, "wl_shm") == 0) { d->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1); d->cursor_theme = WAYLAND_wl_cursor_theme_load(NULL, 32, d->shm); - d->default_cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "left_ptr"); - + } else if (strcmp(interface, "zwp_relative_pointer_manager_v1") == 0) { + Wayland_display_add_relative_pointer_manager(d, id); + } else if (strcmp(interface, "zwp_pointer_constraints_v1") == 0) { + Wayland_display_add_pointer_constraints(d, id); #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH } else if (strcmp(interface, "qt_touch_extension") == 0) { Wayland_touch_create(d, id); @@ -283,6 +340,11 @@ Wayland_VideoInit(_THIS) _this->driverdata = data; + data->xkb_context = WAYLAND_xkb_context_new(0); + if (!data->xkb_context) { + return SDL_SetError("Failed to create XKB context"); + } + data->display = WAYLAND_wl_display_connect(NULL); if (data->display == NULL) { return SDL_SetError("Failed to connect to a Wayland display"); @@ -301,13 +363,11 @@ Wayland_VideoInit(_THIS) // Second roundtrip to receive all output events. WAYLAND_wl_display_roundtrip(data->display); - data->xkb_context = WAYLAND_xkb_context_new(0); - if (!data->xkb_context) { - return SDL_SetError("Failed to create XKB context"); - } - Wayland_InitMouse(); + /* Get the surface class name, usually the name of the application */ + data->classname = get_classname(); + WAYLAND_wl_display_flush(data->display); return 0; @@ -341,6 +401,8 @@ Wayland_VideoQuit(_THIS) } Wayland_display_destroy_input(data); + Wayland_display_destroy_pointer_constraints(data); + Wayland_display_destroy_relative_pointer_manager(data); if (data->xkb_context) { WAYLAND_xkb_context_unref(data->xkb_context); @@ -376,6 +438,7 @@ Wayland_VideoQuit(_THIS) WAYLAND_wl_display_disconnect(data->display); } + SDL_free(data->classname); free(data); _this->driverdata = NULL; } diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.h b/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.h index 8111bf153..ccd7ecf92 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.h +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandvideo.h @@ -42,9 +42,10 @@ typedef struct { struct wl_compositor *compositor; struct wl_shm *shm; struct wl_cursor_theme *cursor_theme; - struct wl_cursor *default_cursor; struct wl_pointer *pointer; struct wl_shell *shell; + struct zwp_relative_pointer_manager_v1 *relative_pointer_manager; + struct zwp_pointer_constraints_v1 *pointer_constraints; EGLDisplay edpy; EGLContext context; @@ -58,6 +59,10 @@ typedef struct { struct qt_surface_extension *surface_extension; struct qt_windowmanager *windowmanager; #endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */ + + char *classname; + + int relative_mouse_mode; } SDL_VideoData; #endif /* _SDL_waylandvideo_h */ diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.c b/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.c index b59759a7c..85fca8de6 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.c +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.c @@ -26,6 +26,7 @@ #include "../SDL_sysvideo.h" #include "../../events/SDL_windowevents_c.h" #include "../SDL_egl_c.h" +#include "SDL_waylandevents_c.h" #include "SDL_waylandwindow.h" #include "SDL_waylandvideo.h" #include "SDL_waylandtouch.h" @@ -46,6 +47,33 @@ handle_configure(void *data, struct wl_shell_surface *shell_surface, SDL_Window *window = wind->sdlwindow; struct wl_region *region; + /* wl_shell_surface spec states that this is a suggestion. + Ignore if less than or greater than max/min size. */ + + if (width == 0 || height == 0) { + return; + } + + if (!(window->flags & SDL_WINDOW_FULLSCREEN)) { + if ((window->flags & SDL_WINDOW_RESIZABLE)) { + if (window->max_w > 0) { + width = SDL_min(width, window->max_w); + } + width = SDL_max(width, window->min_w); + + if (window->max_h > 0) { + height = SDL_min(height, window->max_h); + } + height = SDL_max(height, window->min_h); + } else { + return; + } + } + + if (width == window->w && height == window->h) { + return; + } + window->w = width; window->h = height; WAYLAND_wl_egl_window_resize(wind->egl_window, window->w, window->h, 0, 0); @@ -145,6 +173,26 @@ Wayland_SetWindowFullscreen(_THIS, SDL_Window * window, WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display ); } +void +Wayland_RestoreWindow(_THIS, SDL_Window * window) +{ + SDL_WindowData *wind = window->driverdata; + + wl_shell_surface_set_toplevel(wind->shell_surface); + + WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display ); +} + +void +Wayland_MaximizeWindow(_THIS, SDL_Window * window) +{ + SDL_WindowData *wind = window->driverdata; + + wl_shell_surface_set_maximized(wind->shell_surface, NULL); + + WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display ); +} + int Wayland_CreateWindow(_THIS, SDL_Window *window) { SDL_WindowData *data; @@ -178,6 +226,7 @@ int Wayland_CreateWindow(_THIS, SDL_Window *window) wl_surface_set_user_data(data->surface, data); data->shell_surface = wl_shell_get_shell_surface(c->shell, data->surface); + wl_shell_surface_set_class (data->shell_surface, c->classname); #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH if (c->surface_extension) { data->extended_surface = qt_surface_extension_get_extended_surface( @@ -214,6 +263,10 @@ int Wayland_CreateWindow(_THIS, SDL_Window *window) wl_surface_set_opaque_region(data->surface, region); wl_region_destroy(region); + if (c->relative_mouse_mode) { + Wayland_input_lock_pointer(c->input); + } + WAYLAND_wl_display_flush(c->display); return 0; @@ -233,6 +286,17 @@ void Wayland_SetWindowSize(_THIS, SDL_Window * window) wl_region_destroy(region); } +void Wayland_SetWindowTitle(_THIS, SDL_Window * window) +{ + SDL_WindowData *wind = window->driverdata; + + if (window->title != NULL) { + wl_shell_surface_set_title(wind->shell_surface, window->title); + } + + WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display ); +} + void Wayland_DestroyWindow(_THIS, SDL_Window *window) { SDL_VideoData *data = _this->driverdata; diff --git a/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.h b/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.h index 053b1281f..319a573dc 100644 --- a/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.h +++ b/Engine/lib/sdl/src/video/wayland/SDL_waylandwindow.h @@ -39,6 +39,7 @@ typedef struct { struct wl_egl_window *egl_window; struct SDL_WaylandInput *keyboard_device; EGLSurface egl_surface; + struct zwp_locked_pointer_v1 *locked_pointer; #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH struct qt_extended_surface *extended_surface; @@ -49,8 +50,11 @@ extern void Wayland_ShowWindow(_THIS, SDL_Window *window); extern void Wayland_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * _display, SDL_bool fullscreen); +extern void Wayland_MaximizeWindow(_THIS, SDL_Window * window); +extern void Wayland_RestoreWindow(_THIS, SDL_Window * window); extern int Wayland_CreateWindow(_THIS, SDL_Window *window); extern void Wayland_SetWindowSize(_THIS, SDL_Window * window); +extern void Wayland_SetWindowTitle(_THIS, SDL_Window * window); extern void Wayland_DestroyWindow(_THIS, SDL_Window *window); extern SDL_bool diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowsevents.c b/Engine/lib/sdl/src/video/windows/SDL_windowsevents.c index 61420894f..02768fb68 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowsevents.c +++ b/Engine/lib/sdl/src/video/windows/SDL_windowsevents.c @@ -198,13 +198,26 @@ WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam) return code; } +static SDL_bool +WIN_ShouldIgnoreFocusClick() +{ + return !SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE); +} void WIN_CheckWParamMouseButton(SDL_bool bwParamMousePressed, SDL_bool bSDLMousePressed, SDL_WindowData *data, Uint8 button, SDL_MouseID mouseID) { - if (data->focus_click_pending && button == SDL_BUTTON_LEFT && !bwParamMousePressed) { - data->focus_click_pending = SDL_FALSE; - WIN_UpdateClipCursor(data->window); + if (data->focus_click_pending & SDL_BUTTON(button)) { + /* Ignore the button click for activation */ + if (!bwParamMousePressed) { + data->focus_click_pending &= ~SDL_BUTTON(button); + if (!data->focus_click_pending) { + WIN_UpdateClipCursor(data->window); + } + } + if (WIN_ShouldIgnoreFocusClick()) { + return; + } } if (bwParamMousePressed && !bSDLMousePressed) { @@ -326,17 +339,7 @@ WIN_ConvertUTF32toUTF8(UINT32 codepoint, char * text) static SDL_bool ShouldGenerateWindowCloseOnAltF4(void) { - const char *hint; - - hint = SDL_GetHint(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4); - if (hint) { - if (*hint == '0') { - return SDL_TRUE; - } else { - return SDL_FALSE; - } - } - return SDL_TRUE; + return !SDL_GetHintBoolean(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4, SDL_FALSE); } LRESULT CALLBACK @@ -398,8 +401,24 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) minimized = HIWORD(wParam); if (!minimized && (LOWORD(wParam) != WA_INACTIVE)) { - data->focus_click_pending = (GetAsyncKeyState(VK_LBUTTON) != 0); - + if (LOWORD(wParam) == WA_CLICKACTIVE) { + if (GetAsyncKeyState(VK_LBUTTON)) { + data->focus_click_pending |= SDL_BUTTON_LMASK; + } + if (GetAsyncKeyState(VK_RBUTTON)) { + data->focus_click_pending |= SDL_BUTTON_RMASK; + } + if (GetAsyncKeyState(VK_MBUTTON)) { + data->focus_click_pending |= SDL_BUTTON_MMASK; + } + if (GetAsyncKeyState(VK_XBUTTON1)) { + data->focus_click_pending |= SDL_BUTTON_X1MASK; + } + if (GetAsyncKeyState(VK_XBUTTON2)) { + data->focus_click_pending |= SDL_BUTTON_X2MASK; + } + } + SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0); if (SDL_GetKeyboardFocus() != data->window) { SDL_SetKeyboardFocus(data->window); @@ -423,6 +442,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (SDL_GetKeyboardFocus() == data->window) { SDL_SetKeyboardFocus(NULL); + WIN_ResetDeadKeys(); } ClipCursor(NULL); @@ -737,6 +757,13 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; #endif /* WM_GETMINMAXINFO */ + case WM_WINDOWPOSCHANGING: + + if (data->expected_resize) { + returnCode = 0; + } + break; + case WM_WINDOWPOSCHANGED: { RECT rect; @@ -763,6 +790,9 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) h = rect.bottom - rect.top; SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED, w, h); + + /* Forces a WM_PAINT event */ + InvalidateRect(hwnd, NULL, FALSE); } break; @@ -907,12 +937,13 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (buffer) { if (DragQueryFile(drop, i, buffer, size)) { char *file = WIN_StringToUTF8(buffer); - SDL_SendDropFile(file); + SDL_SendDropFile(data->window, file); SDL_free(file); } SDL_stack_free(buffer); } } + SDL_SendDropComplete(data->window); DragFinish(drop); return 0; } @@ -927,15 +958,17 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) const SDL_Point point = { (int) winpoint.x, (int) winpoint.y }; const SDL_HitTestResult rc = window->hit_test(window, &point, window->hit_test_data); switch (rc) { - case SDL_HITTEST_DRAGGABLE: return HTCAPTION; - case SDL_HITTEST_RESIZE_TOPLEFT: return HTTOPLEFT; - case SDL_HITTEST_RESIZE_TOP: return HTTOP; - case SDL_HITTEST_RESIZE_TOPRIGHT: return HTTOPRIGHT; - case SDL_HITTEST_RESIZE_RIGHT: return HTRIGHT; - case SDL_HITTEST_RESIZE_BOTTOMRIGHT: return HTBOTTOMRIGHT; - case SDL_HITTEST_RESIZE_BOTTOM: return HTBOTTOM; - case SDL_HITTEST_RESIZE_BOTTOMLEFT: return HTBOTTOMLEFT; - case SDL_HITTEST_RESIZE_LEFT: return HTLEFT; + #define POST_HIT_TEST(ret) { SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_HIT_TEST, 0, 0); return ret; } + case SDL_HITTEST_DRAGGABLE: POST_HIT_TEST(HTCAPTION); + case SDL_HITTEST_RESIZE_TOPLEFT: POST_HIT_TEST(HTTOPLEFT); + case SDL_HITTEST_RESIZE_TOP: POST_HIT_TEST(HTTOP); + case SDL_HITTEST_RESIZE_TOPRIGHT: POST_HIT_TEST(HTTOPRIGHT); + case SDL_HITTEST_RESIZE_RIGHT: POST_HIT_TEST(HTRIGHT); + case SDL_HITTEST_RESIZE_BOTTOMRIGHT: POST_HIT_TEST(HTBOTTOMRIGHT); + case SDL_HITTEST_RESIZE_BOTTOM: POST_HIT_TEST(HTBOTTOM); + case SDL_HITTEST_RESIZE_BOTTOMLEFT: POST_HIT_TEST(HTBOTTOMLEFT); + case SDL_HITTEST_RESIZE_LEFT: POST_HIT_TEST(HTLEFT); + #undef POST_HIT_TEST case SDL_HITTEST_NORMAL: return HTCLIENT; } } @@ -1012,7 +1045,8 @@ HINSTANCE SDL_Instance = NULL; int SDL_RegisterApp(char *name, Uint32 style, void *hInst) { - WNDCLASS class; + WNDCLASSEX wcex; + TCHAR path[MAX_PATH]; /* Only do this once... */ if (app_registered) { @@ -1034,19 +1068,24 @@ SDL_RegisterApp(char *name, Uint32 style, void *hInst) } /* Register the application class */ - class.hCursor = NULL; - class.hIcon = - LoadImage(SDL_Instance, SDL_Appname, IMAGE_ICON, 0, 0, - LR_DEFAULTCOLOR); - class.lpszMenuName = NULL; - class.lpszClassName = SDL_Appname; - class.hbrBackground = NULL; - class.hInstance = SDL_Instance; - class.style = SDL_Appstyle; - class.lpfnWndProc = WIN_WindowProc; - class.cbWndExtra = 0; - class.cbClsExtra = 0; - if (!RegisterClass(&class)) { + wcex.cbSize = sizeof(WNDCLASSEX); + wcex.hCursor = NULL; + wcex.hIcon = NULL; + wcex.hIconSm = NULL; + wcex.lpszMenuName = NULL; + wcex.lpszClassName = SDL_Appname; + wcex.style = SDL_Appstyle; + wcex.hbrBackground = NULL; + wcex.lpfnWndProc = WIN_WindowProc; + wcex.hInstance = SDL_Instance; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + + /* Use the first icon as a default icon, like in the Explorer */ + GetModuleFileName(SDL_Instance, path, MAX_PATH); + ExtractIconEx(path, 0, &wcex.hIcon, &wcex.hIconSm, 1); + + if (!RegisterClassEx(&wcex)) { return SDL_SetError("Couldn't register application class"); } @@ -1058,7 +1097,7 @@ SDL_RegisterApp(char *name, Uint32 style, void *hInst) void SDL_UnregisterApp() { - WNDCLASS class; + WNDCLASSEX wcex; /* SDL_RegisterApp might not have been called before */ if (!app_registered) { @@ -1067,8 +1106,10 @@ SDL_UnregisterApp() --app_registered; if (app_registered == 0) { /* Check for any registered window classes. */ - if (GetClassInfo(SDL_Instance, SDL_Appname, &class)) { + if (GetClassInfoEx(SDL_Instance, SDL_Appname, &wcex)) { UnregisterClass(SDL_Appname, SDL_Instance); + if (wcex.hIcon) DestroyIcon(wcex.hIcon); + if (wcex.hIconSm) DestroyIcon(wcex.hIconSm); } SDL_free(SDL_Appname); SDL_Appname = NULL; diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.c b/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.c index d3e16c8bf..8271b0421 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.c +++ b/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.c @@ -157,11 +157,47 @@ WIN_QuitKeyboard(_THIS) #endif } +void +WIN_ResetDeadKeys() +{ + /* + if a deadkey has been typed, but not the next character (which the deadkey might modify), + this tries to undo the effect pressing the deadkey. + see: http://archives.miloush.net/michkap/archive/2006/09/10/748775.html + */ + BYTE keyboardState[256]; + WCHAR buffer[16]; + int keycode, scancode, result, i; + + GetKeyboardState(keyboardState); + + keycode = VK_SPACE; + scancode = MapVirtualKey(keycode, MAPVK_VK_TO_VSC); + if (scancode == 0) { + /* the keyboard doesn't have this key */ + return; + } + + for (i = 0; i < 5; i++) { + result = ToUnicode(keycode, scancode, keyboardState, (LPWSTR)buffer, 16, 0); + if (result > 0) { + /* success */ + return; + } + } +} + void WIN_StartTextInput(_THIS) { #ifndef SDL_DISABLE_WINDOWS_IME - SDL_Window *window = SDL_GetKeyboardFocus(); + SDL_Window *window; +#endif + + WIN_ResetDeadKeys(); + +#ifndef SDL_DISABLE_WINDOWS_IME + window = SDL_GetKeyboardFocus(); if (window) { HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata; @@ -176,7 +212,13 @@ void WIN_StopTextInput(_THIS) { #ifndef SDL_DISABLE_WINDOWS_IME - SDL_Window *window = SDL_GetKeyboardFocus(); + SDL_Window *window; +#endif + + WIN_ResetDeadKeys(); + +#ifndef SDL_DISABLE_WINDOWS_IME + window = SDL_GetKeyboardFocus(); if (window) { HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata; diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.h b/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.h index d330d3871..84654d7b8 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.h +++ b/Engine/lib/sdl/src/video/windows/SDL_windowskeyboard.h @@ -27,6 +27,8 @@ extern void WIN_InitKeyboard(_THIS); extern void WIN_UpdateKeymap(void); extern void WIN_QuitKeyboard(_THIS); +extern void WIN_ResetDeadKeys(void); + extern void WIN_StartTextInput(_THIS); extern void WIN_StopTextInput(_THIS); extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect); diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowsmessagebox.c b/Engine/lib/sdl/src/video/windows/SDL_windowsmessagebox.c index b39df32fc..689e5bbc3 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowsmessagebox.c +++ b/Engine/lib/sdl/src/video/windows/SDL_windowsmessagebox.c @@ -452,9 +452,9 @@ WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) } /* Align the buttons to the right/bottom. */ - x = Size.cx - ButtonWidth - ButtonMargin; + x = Size.cx - (ButtonWidth + ButtonMargin) * messageboxdata->numbuttons; y = Size.cy - ButtonHeight - ButtonMargin; - for (i = 0; i < messageboxdata->numbuttons; ++i) { + for (i = messageboxdata->numbuttons - 1; i >= 0; --i) { SDL_bool isDefault; if (buttons[i].flags & SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT) { @@ -466,7 +466,7 @@ WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) FreeDialogData(dialog); return -1; } - x -= ButtonWidth + ButtonMargin; + x += ButtonWidth + ButtonMargin; } /* FIXME: If we have a parent window, get the Instance and HWND for them */ diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.c b/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.c index 91ed67f87..f172f9a3d 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.c +++ b/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.c @@ -23,6 +23,7 @@ #if SDL_VIDEO_DRIVER_WINDOWS #include "SDL_windowsvideo.h" +#include "../../../include/SDL_assert.h" /* Windows CE compatibility */ #ifndef CDS_FULLSCREEN @@ -69,40 +70,16 @@ WIN_GetMonitorDPI(HMONITOR hMonitor, return TRUE; } -static SDL_bool -WIN_GetDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode) +static void +WIN_UpdateDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode) { SDL_VideoData *vid_data = (SDL_VideoData *) _this->driverdata; - SDL_DisplayModeData *data; - DEVMODE devmode; + SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata; HDC hdc; - devmode.dmSize = sizeof(devmode); - devmode.dmDriverExtra = 0; - if (!EnumDisplaySettings(deviceName, index, &devmode)) { - return SDL_FALSE; - } - - data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data)); - if (!data) { - return SDL_FALSE; - } - data->DeviceMode = devmode; data->DeviceMode.dmFields = (DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS); - data->ScaleX = 1.0f; - data->ScaleY = 1.0f; - data->DiagDPI = 0.0f; - data->HorzDPI = 0.0f; - data->VertDPI = 0.0f; - - /* Fill in the mode information */ - mode->format = SDL_PIXELFORMAT_UNKNOWN; - mode->w = devmode.dmPelsWidth; - mode->h = devmode.dmPelsHeight; - mode->refresh_rate = devmode.dmDisplayFrequency; - mode->driverdata = data; if (index == ENUM_CURRENT_SETTINGS && (hdc = CreateDC(deviceName, NULL, NULL, NULL)) != NULL) { @@ -112,8 +89,8 @@ WIN_GetDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mod int logical_width = GetDeviceCaps( hdc, HORZRES ); int logical_height = GetDeviceCaps( hdc, VERTRES ); - data->ScaleX = (float)logical_width / devmode.dmPelsWidth; - data->ScaleY = (float)logical_height / devmode.dmPelsHeight; + data->ScaleX = (float)logical_width / data->DeviceMode.dmPelsWidth; + data->ScaleY = (float)logical_height / data->DeviceMode.dmPelsHeight; mode->w = logical_width; mode->h = logical_height; @@ -126,8 +103,8 @@ WIN_GetDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mod dpi_data.vid_data = vid_data; dpi_data.mode = mode; dpi_data.mode_data = data; - monitor_rect.left = devmode.dmPosition.x; - monitor_rect.top = devmode.dmPosition.y; + monitor_rect.left = data->DeviceMode.dmPosition.x; + monitor_rect.top = data->DeviceMode.dmPosition.y; monitor_rect.right = monitor_rect.left + 1; monitor_rect.bottom = monitor_rect.top + 1; EnumDisplayMonitors(NULL, &monitor_rect, WIN_GetMonitorDPI, (LPARAM)&dpi_data); @@ -175,10 +152,10 @@ WIN_GetDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mod } else if (bmi->bmiHeader.biBitCount == 4) { mode->format = SDL_PIXELFORMAT_INDEX4LSB; } - } else { + } else if (mode->format == SDL_PIXELFORMAT_UNKNOWN) { /* FIXME: Can we tell what this will be? */ - if ((devmode.dmFields & DM_BITSPERPEL) == DM_BITSPERPEL) { - switch (devmode.dmBitsPerPel) { + if ((data->DeviceMode.dmFields & DM_BITSPERPEL) == DM_BITSPERPEL) { + switch (data->DeviceMode.dmBitsPerPel) { case 32: mode->format = SDL_PIXELFORMAT_RGB888; break; @@ -200,6 +177,42 @@ WIN_GetDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mod } } } +} + +static SDL_bool +WIN_GetDisplayMode(_THIS, LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode) +{ + SDL_DisplayModeData *data; + DEVMODE devmode; + + devmode.dmSize = sizeof(devmode); + devmode.dmDriverExtra = 0; + if (!EnumDisplaySettings(deviceName, index, &devmode)) { + return SDL_FALSE; + } + + data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data)); + if (!data) { + return SDL_FALSE; + } + + mode->driverdata = data; + data->DeviceMode = devmode; + + /* Default basic information */ + data->ScaleX = 1.0f; + data->ScaleY = 1.0f; + data->DiagDPI = 0.0f; + data->HorzDPI = 0.0f; + data->VertDPI = 0.0f; + + mode->format = SDL_PIXELFORMAT_UNKNOWN; + mode->w = data->DeviceMode.dmPelsWidth; + mode->h = data->DeviceMode.dmPelsHeight; + mode->refresh_rate = data->DeviceMode.dmDisplayFrequency; + + /* Fill in the mode information */ + WIN_UpdateDisplayMode(_this, deviceName, index, mode); return SDL_TRUE; } @@ -329,7 +342,44 @@ WIN_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, float * hdpi, *vdpi = data->VertDPI; } - return data->DiagDPI != 0.0f ? 0 : -1; + return data->DiagDPI != 0.0f ? 0 : SDL_SetError("Couldn't get DPI"); +} + +int +WIN_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect) +{ + const SDL_DisplayModeData *data = (const SDL_DisplayModeData *) display->current_mode.driverdata; + const DEVMODE *pDevMode = &data->DeviceMode; + POINT pt = { + /* !!! FIXME: no scale, right? */ + (LONG) (pDevMode->dmPosition.x + (pDevMode->dmPelsWidth / 2)), + (LONG) (pDevMode->dmPosition.y + (pDevMode->dmPelsHeight / 2)) + }; + HMONITOR hmon = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL); + MONITORINFO minfo; + const RECT *work; + BOOL rc = FALSE; + + SDL_assert(hmon != NULL); + + if (hmon != NULL) { + SDL_zero(minfo); + minfo.cbSize = sizeof (MONITORINFO); + rc = GetMonitorInfo(hmon, &minfo); + SDL_assert(rc); + } + + if (!rc) { + return SDL_SetError("Couldn't find monitor data"); + } + + work = &minfo.rcWork; + rect->x = (int)SDL_ceil(work->left * data->ScaleX); + rect->y = (int)SDL_ceil(work->top * data->ScaleY); + rect->w = (int)SDL_ceil((work->right - work->left) * data->ScaleX); + rect->h = (int)SDL_ceil((work->bottom - work->top) * data->ScaleY); + + return 0; } void @@ -366,7 +416,7 @@ WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) LONG status; if (mode->driverdata == display->desktop_mode.driverdata) { - status = ChangeDisplaySettingsEx(displaydata->DeviceName, NULL, NULL, 0, NULL); + status = ChangeDisplaySettingsEx(displaydata->DeviceName, NULL, NULL, CDS_FULLSCREEN, NULL); } else { status = ChangeDisplaySettingsEx(displaydata->DeviceName, &data->DeviceMode, NULL, CDS_FULLSCREEN, NULL); } @@ -389,6 +439,7 @@ WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) return SDL_SetError("ChangeDisplaySettingsEx() failed: %s", reason); } EnumDisplaySettings(displaydata->DeviceName, ENUM_CURRENT_SETTINGS, &data->DeviceMode); + WIN_UpdateDisplayMode(_this, displaydata->DeviceName, ENUM_CURRENT_SETTINGS, mode); return 0; } diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.h b/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.h index e725848b2..6aa293d21 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.h +++ b/Engine/lib/sdl/src/video/windows/SDL_windowsmodes.h @@ -40,6 +40,7 @@ typedef struct extern int WIN_InitModes(_THIS); extern int WIN_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect); +extern int WIN_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect); extern int WIN_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, float * hdpi, float * vdpi); extern void WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display); extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode); diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowsvideo.c b/Engine/lib/sdl/src/video/windows/SDL_windowsvideo.c index 37199805b..21f63a018 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowsvideo.c +++ b/Engine/lib/sdl/src/video/windows/SDL_windowsvideo.c @@ -124,6 +124,7 @@ WIN_CreateDevice(int devindex) device->VideoInit = WIN_VideoInit; device->VideoQuit = WIN_VideoQuit; device->GetDisplayBounds = WIN_GetDisplayBounds; + device->GetDisplayUsableBounds = WIN_GetDisplayUsableBounds; device->GetDisplayDPI = WIN_GetDisplayDPI; device->GetDisplayModes = WIN_GetDisplayModes; device->SetDisplayMode = WIN_SetDisplayMode; @@ -136,6 +137,7 @@ WIN_CreateDevice(int devindex) device->SetWindowIcon = WIN_SetWindowIcon; device->SetWindowPosition = WIN_SetWindowPosition; device->SetWindowSize = WIN_SetWindowSize; + device->SetWindowOpacity = WIN_SetWindowOpacity; device->ShowWindow = WIN_ShowWindow; device->HideWindow = WIN_HideWindow; device->RaiseWindow = WIN_RaiseWindow; @@ -143,6 +145,7 @@ WIN_CreateDevice(int devindex) device->MinimizeWindow = WIN_MinimizeWindow; device->RestoreWindow = WIN_RestoreWindow; device->SetWindowBordered = WIN_SetWindowBordered; + device->SetWindowResizable = WIN_SetWindowResizable; device->SetWindowFullscreen = WIN_SetWindowFullscreen; device->SetWindowGammaRamp = WIN_SetWindowGammaRamp; device->GetWindowGammaRamp = WIN_GetWindowGammaRamp; diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowswindow.c b/Engine/lib/sdl/src/video/windows/SDL_windowswindow.c index 26683a0ed..5ce40e6ba 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowswindow.c +++ b/Engine/lib/sdl/src/video/windows/SDL_windowswindow.c @@ -478,7 +478,8 @@ WIN_HideWindow(_THIS, SDL_Window * window) void WIN_RaiseWindow(_THIS, SDL_Window * window) { - WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOSIZE); + HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; + SetForegroundWindow(hwnd); } void @@ -519,6 +520,22 @@ WIN_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) data->in_border_change = SDL_FALSE; } +void +WIN_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable) +{ + SDL_WindowData *data = (SDL_WindowData *)window->driverdata; + HWND hwnd = data->hwnd; + DWORD style = GetWindowLong(hwnd, GWL_STYLE); + + if (resizable) { + style |= STYLE_RESIZABLE; + } else { + style &= ~STYLE_RESIZABLE; + } + + SetWindowLong(hwnd, GWL_STYLE, style); +} + void WIN_RestoreWindow(_THIS, SDL_Window * window) { @@ -826,6 +843,39 @@ WIN_SetWindowHitTest(SDL_Window *window, SDL_bool enabled) return 0; /* just succeed, the real work is done elsewhere. */ } +int +WIN_SetWindowOpacity(_THIS, SDL_Window * window, float opacity) +{ + const SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + const HWND hwnd = data->hwnd; + const LONG style = GetWindowLong(hwnd, GWL_EXSTYLE); + + SDL_assert(style != 0); + + if (opacity == 1.0f) { + /* want it fully opaque, just mark it unlayered if necessary. */ + if (style & WS_EX_LAYERED) { + if (SetWindowLong(hwnd, GWL_EXSTYLE, style & ~WS_EX_LAYERED) == 0) { + return WIN_SetError("SetWindowLong()"); + } + } + } else { + const BYTE alpha = (BYTE) ((int) (opacity * 255.0f)); + /* want it transparent, mark it layered if necessary. */ + if ((style & WS_EX_LAYERED) == 0) { + if (SetWindowLong(hwnd, GWL_EXSTYLE, style | WS_EX_LAYERED) == 0) { + return WIN_SetError("SetWindowLong()"); + } + } + + if (SetLayeredWindowAttributes(hwnd, 0, alpha, LWA_ALPHA) == 0) { + return WIN_SetError("SetLayeredWindowAttributes()"); + } + } + + return 0; +} + #endif /* SDL_VIDEO_DRIVER_WINDOWS */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/windows/SDL_windowswindow.h b/Engine/lib/sdl/src/video/windows/SDL_windowswindow.h index f91aa0ed2..7d50ba66e 100644 --- a/Engine/lib/sdl/src/video/windows/SDL_windowswindow.h +++ b/Engine/lib/sdl/src/video/windows/SDL_windowswindow.h @@ -41,7 +41,7 @@ typedef struct SDL_bool expected_resize; SDL_bool in_border_change; SDL_bool in_title_click; - SDL_bool focus_click_pending; + Uint8 focus_click_pending; SDL_bool windowed_mode_was_maximized; SDL_bool in_window_deactivation; struct SDL_VideoData *videodata; @@ -56,6 +56,7 @@ extern void WIN_SetWindowTitle(_THIS, SDL_Window * window); extern void WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon); extern void WIN_SetWindowPosition(_THIS, SDL_Window * window); extern void WIN_SetWindowSize(_THIS, SDL_Window * window); +extern int WIN_SetWindowOpacity(_THIS, SDL_Window * window, float opacity); extern void WIN_ShowWindow(_THIS, SDL_Window * window); extern void WIN_HideWindow(_THIS, SDL_Window * window); extern void WIN_RaiseWindow(_THIS, SDL_Window * window); @@ -63,6 +64,7 @@ extern void WIN_MaximizeWindow(_THIS, SDL_Window * window); extern void WIN_MinimizeWindow(_THIS, SDL_Window * window); extern void WIN_RestoreWindow(_THIS, SDL_Window * window); extern void WIN_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered); +extern void WIN_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable); extern void WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen); extern int WIN_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp); extern int WIN_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp); diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtevents.cpp b/Engine/lib/sdl/src/video/winrt/SDL_winrtevents.cpp index e9df726d4..30cf01633 100644 --- a/Engine/lib/sdl/src/video/winrt/SDL_winrtevents.cpp +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtevents.cpp @@ -40,6 +40,7 @@ using Windows::UI::Core::CoreCursor; #include "SDL_system.h" extern "C" { +#include "../../thread/SDL_systhread.h" #include "../SDL_sysvideo.h" #include "../../events/SDL_events_c.h" } @@ -113,7 +114,7 @@ WINRT_CycleXAMLThread() _mutex = SDL_CreateMutex(); _threadState = ThreadState_Running; - _XAMLThread = SDL_CreateThread(WINRT_XAMLThreadMain, "SDL/XAML App Thread", nullptr); + _XAMLThread = SDL_CreateThreadInternal(WINRT_XAMLThreadMain, "SDL/XAML App Thread", 0, nullptr); SDL_LockMutex(_mutex); while (_threadState != ThreadState_Yielding) { diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtevents_c.h b/Engine/lib/sdl/src/video/winrt/SDL_winrtevents_c.h index dc94526bb..05a90a3bf 100644 --- a/Engine/lib/sdl/src/video/winrt/SDL_winrtevents_c.h +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtevents_c.h @@ -67,6 +67,13 @@ extern void WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args); extern void WINRT_ProcessKeyUpEvent(Windows::UI::Core::KeyEventArgs ^args); extern void WINRT_ProcessCharacterReceivedEvent(Windows::UI::Core::CharacterReceivedEventArgs ^args); +#if NTDDI_VERSION >= NTDDI_WIN10 +extern SDL_bool WINRT_HasScreenKeyboardSupport(_THIS); +extern void WINRT_ShowScreenKeyboard(_THIS, SDL_Window *window); +extern void WINRT_HideScreenKeyboard(_THIS, SDL_Window *window); +extern SDL_bool WINRT_IsScreenKeyboardShown(_THIS, SDL_Window *window); +#endif // NTDDI_VERSION >= ... + /* XAML Thread Management */ extern void WINRT_CycleXAMLThread(); diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtgamebar.cpp b/Engine/lib/sdl/src/video/winrt/SDL_winrtgamebar.cpp new file mode 100644 index 000000000..215dfcc83 --- /dev/null +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtgamebar.cpp @@ -0,0 +1,196 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +#include "../../SDL_internal.h" + +#if SDL_VIDEO_DRIVER_WINRT + +/* Windows includes */ +#include +#include +#include + + +/* SDL includes */ +extern "C" { +#include "SDL_mouse.h" +#include "../SDL_sysvideo.h" +} +#include "SDL_winrtvideo_cpp.h" + + +/* Game Bar events can come in off the main thread. Use the following + WinRT CoreDispatcher to deal with them on SDL's thread. +*/ +static Platform::WeakReference WINRT_MainThreadDispatcher; + + +/* Win10's initial SDK (the 10.0.10240.0 release) does not include references + to Game Bar APIs, as the Game Bar was released via Win10 10.0.10586.0. + + Declare its WinRT/COM interface here, to allow compilation with earlier + Windows SDKs. +*/ +MIDL_INTERFACE("1DB9A292-CC78-4173-BE45-B61E67283EA7") +IGameBarStatics_ : public IInspectable +{ +public: + virtual HRESULT STDMETHODCALLTYPE add_VisibilityChanged( + __FIEventHandler_1_IInspectable *handler, + Windows::Foundation::EventRegistrationToken *token) = 0; + + virtual HRESULT STDMETHODCALLTYPE remove_VisibilityChanged( + Windows::Foundation::EventRegistrationToken token) = 0; + + virtual HRESULT STDMETHODCALLTYPE add_IsInputRedirectedChanged( + __FIEventHandler_1_IInspectable *handler, + Windows::Foundation::EventRegistrationToken *token) = 0; + + virtual HRESULT STDMETHODCALLTYPE remove_IsInputRedirectedChanged( + Windows::Foundation::EventRegistrationToken token) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_Visible( + boolean *value) = 0; + + virtual HRESULT STDMETHODCALLTYPE get_IsInputRedirected( + boolean *value) = 0; +}; + +/* Declare the game bar's COM GUID */ +static GUID IID_IGameBarStatics_ = { MAKELONG(0xA292, 0x1DB9), 0xCC78, 0x4173, { 0xBE, 0x45, 0xB6, 0x1E, 0x67, 0x28, 0x3E, 0xA7 } }; + +/* Retrieves a pointer to the game bar, or NULL if it is not available. + If a pointer is returned, it's ->Release() method must be called + after the caller has finished using it. +*/ +static IGameBarStatics_ * +WINRT_GetGameBar() +{ + wchar_t *wClassName = L"Windows.Gaming.UI.GameBar"; + HSTRING hClassName; + IActivationFactory *pActivationFactory = NULL; + IGameBarStatics_ *pGameBar = NULL; + HRESULT hr; + + hr = ::WindowsCreateString(wClassName, (UINT32)wcslen(wClassName), &hClassName); + if (FAILED(hr)) { + goto done; + } + + hr = Windows::Foundation::GetActivationFactory(hClassName, &pActivationFactory); + if (FAILED(hr)) { + goto done; + } + + pActivationFactory->QueryInterface(IID_IGameBarStatics_, (void **) &pGameBar); + +done: + if (pActivationFactory) { + pActivationFactory->Release(); + } + if (hClassName) { + ::WindowsDeleteString(hClassName); + } + return pGameBar; +} + +static void +WINRT_HandleGameBarIsInputRedirected_MainThread() +{ + IGameBarStatics_ *gameBar; + boolean isInputRedirected = 0; + if (!WINRT_MainThreadDispatcher) { + /* The game bar event handler has been deregistered! */ + return; + } + gameBar = WINRT_GetGameBar(); + if (!gameBar) { + /* Shouldn't happen, but just in case... */ + return; + } + if (SUCCEEDED(gameBar->get_IsInputRedirected(&isInputRedirected))) { + if ( ! isInputRedirected) { + /* Input-control is now back to the SDL app. Restore the cursor, + in case Windows does not (it does not in either Win10 + 10.0.10240.0 or 10.0.10586.0, maybe later version(s) too. + */ + SDL_Cursor *cursor = SDL_GetCursor(); + SDL_SetCursor(cursor); + } + } + gameBar->Release(); +} + +static void +WINRT_HandleGameBarIsInputRedirected_NonMainThread(Platform::Object ^ o1, Platform::Object ^o2) +{ + Windows::UI::Core::CoreDispatcher ^dispatcher = WINRT_MainThreadDispatcher.Resolve(); + if (dispatcher) { + dispatcher->RunAsync( + Windows::UI::Core::CoreDispatcherPriority::Normal, + ref new Windows::UI::Core::DispatchedHandler(&WINRT_HandleGameBarIsInputRedirected_MainThread)); + } +} + +void +WINRT_InitGameBar(_THIS) +{ + SDL_VideoData *driverdata = (SDL_VideoData *)_this->driverdata; + IGameBarStatics_ *gameBar = WINRT_GetGameBar(); + if (gameBar) { + /* GameBar.IsInputRedirected events can come in via something other than + the main/SDL thread. + + Get a WinRT 'CoreDispatcher' that can be used to call back into the + SDL thread. + */ + WINRT_MainThreadDispatcher = Windows::UI::Core::CoreWindow::GetForCurrentThread()->Dispatcher; + Windows::Foundation::EventHandler ^handler = \ + ref new Windows::Foundation::EventHandler(&WINRT_HandleGameBarIsInputRedirected_NonMainThread); + __FIEventHandler_1_IInspectable * pHandler = reinterpret_cast<__FIEventHandler_1_IInspectable *>(handler); + gameBar->add_IsInputRedirectedChanged(pHandler, &driverdata->gameBarIsInputRedirectedToken); + gameBar->Release(); + } +} + +void +WINRT_QuitGameBar(_THIS) +{ + SDL_VideoData *driverdata; + IGameBarStatics_ *gameBar; + if (!_this || !_this->driverdata) { + return; + } + gameBar = WINRT_GetGameBar(); + if (!gameBar) { + return; + } + driverdata = (SDL_VideoData *)_this->driverdata; + if (driverdata->gameBarIsInputRedirectedToken.Value) { + gameBar->remove_IsInputRedirectedChanged(driverdata->gameBarIsInputRedirectedToken); + driverdata->gameBarIsInputRedirectedToken.Value = 0; + } + WINRT_MainThreadDispatcher = nullptr; + gameBar->Release(); +} + +#endif /* SDL_VIDEO_DRIVER_WINRT */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/audio/SDL_audiomem.h b/Engine/lib/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h similarity index 74% rename from Engine/lib/sdl/src/audio/SDL_audiomem.h rename to Engine/lib/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h index 091d15c29..afcef37b2 100644 --- a/Engine/lib/sdl/src/audio/SDL_audiomem.h +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h @@ -18,8 +18,18 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "../SDL_internal.h" +#include "SDL_config.h" + +#ifndef _SDL_winrtgamebar_h +#define _SDL_winrtgamebar_h + +#ifdef __cplusplus +/* These are exported as C++ functions, rather than C, to fix a compilation + bug with MSVC 2013, for Windows 8.x builds. */ +extern void WINRT_InitGameBar(_THIS); +extern void WINRT_QuitGameBar(_THIS); +#endif + +#endif /* _SDL_winrtmouse_h */ -#define SDL_AllocAudioMem SDL_malloc -#define SDL_FreeAudioMem SDL_free /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtkeyboard.cpp b/Engine/lib/sdl/src/video/winrt/SDL_winrtkeyboard.cpp index 7477cdeeb..affcae62b 100644 --- a/Engine/lib/sdl/src/video/winrt/SDL_winrtkeyboard.cpp +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtkeyboard.cpp @@ -383,4 +383,48 @@ WINRT_ProcessCharacterReceivedEvent(Windows::UI::Core::CharacterReceivedEventArg } } + +#if NTDDI_VERSION >= NTDDI_WIN10 + +SDL_bool WINRT_HasScreenKeyboardSupport(_THIS) +{ + return SDL_TRUE; +} + +void WINRT_ShowScreenKeyboard(_THIS, SDL_Window *window) +{ + using namespace Windows::UI::ViewManagement; + InputPane ^ inputPane = InputPane::GetForCurrentView(); + if (inputPane) { + inputPane->TryShow(); + } +} + +void WINRT_HideScreenKeyboard(_THIS, SDL_Window *window) +{ + using namespace Windows::UI::ViewManagement; + InputPane ^ inputPane = InputPane::GetForCurrentView(); + if (inputPane) { + inputPane->TryHide(); + } +} + +SDL_bool WINRT_IsScreenKeyboardShown(_THIS, SDL_Window *window) +{ + using namespace Windows::UI::ViewManagement; + InputPane ^ inputPane = InputPane::GetForCurrentView(); + if (inputPane) { + // dludwig@pobox.com: checking inputPane->Visible doesn't seem to detect visibility, + // at least not on the Windows Phone 10.0.10240.0 emulator. Checking + // the size of inputPane->OccludedRect, however, does seem to work. + Windows::Foundation::Rect rect = inputPane->OccludedRect; + if (rect.Width > 0 && rect.Height > 0) { + return SDL_TRUE; + } + } + return SDL_FALSE; +} + +#endif // NTDDI_VERSION >= ... + #endif // SDL_VIDEO_DRIVER_WINRT diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtmouse.cpp b/Engine/lib/sdl/src/video/winrt/SDL_winrtmouse.cpp index d3140a4a4..9997d6ea4 100644 --- a/Engine/lib/sdl/src/video/winrt/SDL_winrtmouse.cpp +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtmouse.cpp @@ -26,6 +26,7 @@ * Windows includes: */ #include +#include using namespace Windows::UI::Core; using Windows::UI::Core::CoreCursor; @@ -116,11 +117,69 @@ WINRT_ShowCursor(SDL_Cursor * cursor) return 0; } + CoreWindow ^ coreWindow = CoreWindow::GetForCurrentThread(); if (cursor) { CoreCursor ^* theCursor = (CoreCursor ^*) cursor->driverdata; - CoreWindow::GetForCurrentThread()->PointerCursor = *theCursor; + coreWindow->PointerCursor = *theCursor; } else { - CoreWindow::GetForCurrentThread()->PointerCursor = nullptr; + // HACK ALERT: TL;DR - Hiding the cursor in WinRT/UWP apps is weird, and + // a Win32-style cursor resource file must be directly included in apps, + // otherwise hiding the cursor will cause mouse-motion data to never be + // received. + // + // Here's the lengthy explanation: + // + // There are two ways to hide a cursor in WinRT/UWP apps. + // Both involve setting the WinRT CoreWindow's (which is somewhat analogous + // to a Win32 HWND) 'PointerCursor' property. + // + // The first way to hide a cursor sets PointerCursor to nullptr. This + // is, arguably, the easiest to implement for an app. It does have an + // unfortunate side-effect: it'll prevent mouse-motion events from being + // sent to the app (via CoreWindow). + // + // The second way to hide a cursor sets PointerCursor to a transparent + // cursor. This allows mouse-motion events to be sent to the app, but is + // more difficult to set up, as: + // 1. WinRT/UWP, while providing a few stock cursors, does not provide + // a completely transparent cursor. + // 2. WinRT/UWP allows apps to provide custom-built cursors, but *ONLY* + // if they are linked directly inside the app, via Win32-style + // cursor resource files. APIs to create cursors at runtime are + // not provided to apps, and attempting to link-to or use Win32 + // cursor-creation APIs could cause an app to fail Windows Store + // certification. + // + // SDL can use either means of hiding the cursor. It provides a Win32-style + // set of cursor resource files in its source distribution, inside + // src/main/winrt/. If those files are linked to an SDL-for-WinRT/UWP app + // (by including them in a MSVC project, for example), SDL will attempt to + // use those, if and when the cursor is hidden via SDL APIs. If those + // files are not linked in, SDL will attempt to hide the cursor via the + // 'set PointerCursor to nullptr' means (which, if you recall, causes + // mouse-motion data to NOT be sent to the app!). + // + // Tech notes: + // - SDL's blank cursor resource uses a resource ID of 5000. + // - SDL's cursor resources consist of the following two files: + // - src/main/winrt/SDL2-WinRTResource_BlankCursor.cur -- cursor pixel data + // - src/main/winrt/SDL2-WinRTResources.rc -- declares the cursor resource, and its ID (of 5000) + // + + const unsigned int win32CursorResourceID = 5000; + CoreCursor ^ blankCursor = ref new CoreCursor(CoreCursorType::Custom, win32CursorResourceID); + + // Set 'PointerCursor' to 'blankCursor' in a way that shouldn't throw + // an exception if the app hasn't loaded that resource. + ABI::Windows::UI::Core::ICoreCursor * iblankCursor = reinterpret_cast(blankCursor); + ABI::Windows::UI::Core::ICoreWindow * icoreWindow = reinterpret_cast(coreWindow); + HRESULT hr = icoreWindow->put_PointerCursor(iblankCursor); + if (FAILED(hr)) { + // The app doesn't contain the cursor resource, or some other error + // occurred. Just use the other, but mouse-motion-preventing, means of + // hiding the cursor. + coreWindow->PointerCursor = nullptr; + } } return 0; } diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo.cpp b/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo.cpp index 9d7c1ccee..9a26705ad 100644 --- a/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo.cpp +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo.cpp @@ -31,6 +31,7 @@ /* Windows includes */ #include #include +#include #include #include using namespace Windows::ApplicationModel::Core; @@ -41,7 +42,8 @@ using namespace Windows::UI::ViewManagement; /* [re]declare Windows GUIDs locally, to limit the amount of external lib(s) SDL has to link to */ -static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48,{ 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; +static const GUID IID_IDisplayRequest = { 0xe5732044, 0xf49f, 0x4b60, { 0x8d, 0xd4, 0x5e, 0x7e, 0x3a, 0x63, 0x2a, 0xc0 } }; +static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; /* SDL includes */ @@ -61,6 +63,7 @@ extern "C" { #include "../../core/winrt/SDL_winrtapp_xaml.h" #include "SDL_winrtvideo_cpp.h" #include "SDL_winrtevents_c.h" +#include "SDL_winrtgamebar_cpp.h" #include "SDL_winrtmouse_c.h" #include "SDL_main.h" #include "SDL_system.h" @@ -82,6 +85,11 @@ static void WINRT_DestroyWindow(_THIS, SDL_Window * window); static SDL_bool WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info); +/* Misc functions */ +static ABI::Windows::System::Display::IDisplayRequest * WINRT_CreateDisplayRequest(_THIS); +extern void WINRT_SuspendScreenSaver(_THIS); + + /* SDL-internal globals: */ SDL_Window * WINRT_GlobalSDLWindow = NULL; @@ -118,18 +126,15 @@ WINRT_CreateDevice(int devindex) device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice)); if (!device) { SDL_OutOfMemory(); - if (device) { - SDL_free(device); - } return (0); } data = (SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData)); if (!data) { SDL_OutOfMemory(); + SDL_free(device); return (0); } - SDL_zerop(data); device->driverdata = data; /* Set the function pointers */ @@ -142,6 +147,15 @@ WINRT_CreateDevice(int devindex) device->SetDisplayMode = WINRT_SetDisplayMode; device->PumpEvents = WINRT_PumpEvents; device->GetWindowWMInfo = WINRT_GetWindowWMInfo; + device->SuspendScreenSaver = WINRT_SuspendScreenSaver; + +#if NTDDI_VERSION >= NTDDI_WIN10 + device->HasScreenKeyboardSupport = WINRT_HasScreenKeyboardSupport; + device->ShowScreenKeyboard = WINRT_ShowScreenKeyboard; + device->HideScreenKeyboard = WINRT_HideScreenKeyboard; + device->IsScreenKeyboardShown = WINRT_IsScreenKeyboardShown; +#endif + #ifdef SDL_VIDEO_OPENGL_EGL device->GL_LoadLibrary = WINRT_GLES_LoadLibrary; device->GL_GetProcAddress = WINRT_GLES_GetProcAddress; @@ -167,12 +181,17 @@ VideoBootStrap WINRT_bootstrap = { int WINRT_VideoInit(_THIS) { + SDL_VideoData * driverdata = (SDL_VideoData *) _this->driverdata; if (WINRT_InitModes(_this) < 0) { return -1; } WINRT_InitMouse(_this); WINRT_InitTouch(_this); - + WINRT_InitGameBar(_this); + if (driverdata) { + /* Initialize screensaver-disabling support */ + driverdata->displayRequest = WINRT_CreateDisplayRequest(_this); + } return 0; } @@ -414,6 +433,12 @@ WINRT_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) void WINRT_VideoQuit(_THIS) { + SDL_VideoData * driverdata = (SDL_VideoData *) _this->driverdata; + if (driverdata && driverdata->displayRequest) { + driverdata->displayRequest->Release(); + driverdata->displayRequest = NULL; + } + WINRT_QuitGameBar(_this); WINRT_QuitMouse(_this); } @@ -483,7 +508,7 @@ WINRT_DetectWindowFlags(SDL_Window * window) // data->coreWindow->PointerPosition is not supported on WinPhone 8.0 latestFlags |= SDL_WINDOW_MOUSE_FOCUS; #else - if (data->coreWindow->Bounds.Contains(data->coreWindow->PointerPosition)) { + if (data->coreWindow->Visible && data->coreWindow->Bounds.Contains(data->coreWindow->PointerPosition)) { latestFlags |= SDL_WINDOW_MOUSE_FOCUS; } #endif @@ -753,6 +778,65 @@ WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) return SDL_FALSE; } +static ABI::Windows::System::Display::IDisplayRequest * +WINRT_CreateDisplayRequest(_THIS) +{ + /* Setup a WinRT DisplayRequest object, usable for enabling/disabling screensaver requests */ + wchar_t *wClassName = L"Windows.System.Display.DisplayRequest"; + HSTRING hClassName; + IActivationFactory *pActivationFactory = NULL; + IInspectable * pDisplayRequestRaw = nullptr; + ABI::Windows::System::Display::IDisplayRequest * pDisplayRequest = nullptr; + HRESULT hr; + + hr = ::WindowsCreateString(wClassName, (UINT32)wcslen(wClassName), &hClassName); + if (FAILED(hr)) { + goto done; + } + + hr = Windows::Foundation::GetActivationFactory(hClassName, &pActivationFactory); + if (FAILED(hr)) { + goto done; + } + + hr = pActivationFactory->ActivateInstance(&pDisplayRequestRaw); + if (FAILED(hr)) { + goto done; + } + + hr = pDisplayRequestRaw->QueryInterface(IID_IDisplayRequest, (void **) &pDisplayRequest); + if (FAILED(hr)) { + goto done; + } + +done: + if (pDisplayRequestRaw) { + pDisplayRequestRaw->Release(); + } + if (pActivationFactory) { + pActivationFactory->Release(); + } + if (hClassName) { + ::WindowsDeleteString(hClassName); + } + + return pDisplayRequest; +} + +void +WINRT_SuspendScreenSaver(_THIS) +{ + SDL_VideoData *driverdata = (SDL_VideoData *)_this->driverdata; + if (driverdata && driverdata->displayRequest) { + ABI::Windows::System::Display::IDisplayRequest * displayRequest = (ABI::Windows::System::Display::IDisplayRequest *) driverdata->displayRequest; + if (_this->suspend_screensaver) { + displayRequest->RequestActive(); + } else { + displayRequest->RequestRelease(); + } + } +} + #endif /* SDL_VIDEO_DRIVER_WINRT */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo_cpp.h b/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo_cpp.h index 26eb008d4..7d5ce13e0 100644 --- a/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo_cpp.h +++ b/Engine/lib/sdl/src/video/winrt/SDL_winrtvideo_cpp.h @@ -46,6 +46,17 @@ typedef struct SDL_VideoData { * passed to eglGetDisplay and eglCreateWindowSurface: */ IUnknown *winrtEglWindow; + + /* Event token(s), for unregistering WinRT event handler(s). + These are just a struct with a 64-bit integer inside them + */ + Windows::Foundation::EventRegistrationToken gameBarIsInputRedirectedToken; + + /* A WinRT DisplayRequest, used for implementing SDL_*ScreenSaver() functions. + * This is really a pointer to a 'ABI::Windows::System::Display::IDisplayRequest *', + * It's casted to 'IUnknown *', to help with building SDL. + */ + IUnknown *displayRequest; } SDL_VideoData; /* The global, WinRT, SDL Window. diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11dyn.c b/Engine/lib/sdl/src/video/x11/SDL_x11dyn.c index 7cbfa3e97..d07fda740 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11dyn.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11dyn.c @@ -106,11 +106,8 @@ X11_GetSym(const char *fnname, int *pHasModule) #endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */ /* Define all the function pointers and wrappers... */ -#define SDL_X11_MODULE(modname) #define SDL_X11_SYM(rc,fn,params,args,ret) SDL_DYNX11FN_##fn X11_##fn = NULL; #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM /* Annoying varargs entry point... */ #ifdef X_HAVE_UTF8_STRING @@ -120,10 +117,7 @@ SDL_DYNX11FN_XGetICValues X11_XGetICValues = NULL; /* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */ #define SDL_X11_MODULE(modname) int SDL_X11_HAVE_##modname = 0; -#define SDL_X11_SYM(rc,fn,params,args,ret) #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM static int x11_load_refcount = 0; @@ -139,8 +133,6 @@ SDL_X11_UnloadSymbols(void) #define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 0; #define SDL_X11_SYM(rc,fn,params,args,ret) X11_##fn = NULL; #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM #ifdef X_HAVE_UTF8_STRING X11_XCreateIC = NULL; @@ -177,16 +169,11 @@ SDL_X11_LoadSymbols(void) } #define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 1; /* default yes */ -#define SDL_X11_SYM(a,fn,x,y,z) #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM #define SDL_X11_MODULE(modname) thismod = &SDL_X11_HAVE_##modname; #define SDL_X11_SYM(a,fn,x,y,z) X11_##fn = (SDL_DYNX11FN_##fn) X11_GetSym(#fn,thismod); #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM #ifdef X_HAVE_UTF8_STRING X11_XCreateIC = (SDL_DYNX11FN_XCreateIC) @@ -209,8 +196,6 @@ SDL_X11_LoadSymbols(void) #define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 1; /* default yes */ #define SDL_X11_SYM(a,fn,x,y,z) X11_##fn = (SDL_DYNX11FN_##fn) fn; #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM #ifdef X_HAVE_UTF8_STRING X11_XCreateIC = XCreateIC; diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11dyn.h b/Engine/lib/sdl/src/video/x11/SDL_x11dyn.h index 136609b85..be1ddaa1c 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11dyn.h +++ b/Engine/lib/sdl/src/video/x11/SDL_x11dyn.h @@ -86,13 +86,10 @@ int SDL_X11_LoadSymbols(void); void SDL_X11_UnloadSymbols(void); /* Declare all the function pointers and wrappers... */ -#define SDL_X11_MODULE(modname) #define SDL_X11_SYM(rc,fn,params,args,ret) \ typedef rc (*SDL_DYNX11FN_##fn) params; \ extern SDL_DYNX11FN_##fn X11_##fn; #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM /* Annoying varargs entry point... */ #ifdef X_HAVE_UTF8_STRING @@ -104,10 +101,7 @@ extern SDL_DYNX11FN_XGetICValues X11_XGetICValues; /* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */ #define SDL_X11_MODULE(modname) extern int SDL_X11_HAVE_##modname; -#define SDL_X11_SYM(rc,fn,params,args,ret) #include "SDL_x11sym.h" -#undef SDL_X11_MODULE -#undef SDL_X11_SYM #ifdef __cplusplus } diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11events.c b/Engine/lib/sdl/src/video/x11/SDL_x11events.c index 208009607..56d2368a0 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11events.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11events.c @@ -35,6 +35,7 @@ #include "../../events/SDL_mouse_c.h" #include "../../events/SDL_touch_c.h" +#include "SDL_hints.h" #include "SDL_timer.h" #include "SDL_syswm.h" @@ -117,7 +118,9 @@ static Atom X11_PickTarget(Display *disp, Atom list[], int list_count) int i; for (i=0; i < list_count && request == None; i++) { name = X11_XGetAtomName(disp, list[i]); - if (strcmp("text/uri-list", name)==0) request = list[i]; + if ((SDL_strcmp("text/uri-list", name) == 0) || (SDL_strcmp("text/plain", name) == 0)) { + request = list[i]; + } X11_XFree(name); } return request; @@ -377,8 +380,8 @@ X11_DispatchFocusIn(_THIS, SDL_WindowData *data) X11_XSetICFocus(data->ic); } #endif -#ifdef SDL_USE_IBUS - SDL_IBus_SetFocus(SDL_TRUE); +#ifdef SDL_USE_IME + SDL_IME_SetFocus(SDL_TRUE); #endif } @@ -400,8 +403,8 @@ X11_DispatchFocusOut(_THIS, SDL_WindowData *data) X11_XUnsetICFocus(data->ic); } #endif -#ifdef SDL_USE_IBUS - SDL_IBus_SetFocus(SDL_FALSE); +#ifdef SDL_USE_IME + SDL_IME_SetFocus(SDL_FALSE); #endif } @@ -512,11 +515,28 @@ ProcessHitTest(_THIS, const SDL_WindowData *data, const XEvent *xev) return SDL_FALSE; } +static void +X11_UpdateUserTime(SDL_WindowData *data, const unsigned long latest) +{ + if (latest && (latest != data->user_time)) { + SDL_VideoData *videodata = data->videodata; + Display *display = videodata->display; + X11_XChangeProperty(display, data->xwindow, videodata->_NET_WM_USER_TIME, + XA_CARDINAL, 32, PropModeReplace, + (const unsigned char *) &latest, 1); +#ifdef DEBUG_XEVENTS + printf("window %p: updating _NET_WM_USER_TIME to %lu\n", data, latest); +#endif + data->user_time = latest; + } +} + + static void X11_DispatchEvent(_THIS) { SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata; - Display *display = videodata->display; + Display *display; SDL_WindowData *data; XEvent xevent; int orig_event_type; @@ -524,6 +544,11 @@ X11_DispatchEvent(_THIS) XClientMessageEvent m; int i; + if (!videodata) { + return; + } + display = videodata->display; + SDL_zero(xevent); /* valgrind fix. --ryan. */ X11_XNextEvent(display, &xevent); @@ -545,15 +570,12 @@ X11_DispatchEvent(_THIS) #endif if (orig_keycode) { /* Make sure dead key press/release events are sent */ - /* Actually, don't do this because it causes double-delivery - of some keys on Ubuntu 14.04 (bug 2526) SDL_Scancode scancode = videodata->key_layout[orig_keycode]; if (orig_event_type == KeyPress) { SDL_SendKeyboardKey(SDL_PRESSED, scancode); } else { SDL_SendKeyboardKey(SDL_RELEASED, scancode); } - */ } return; } @@ -617,6 +639,7 @@ X11_DispatchEvent(_THIS) /* Gaining mouse coverage? */ case EnterNotify:{ + SDL_Mouse *mouse = SDL_GetMouse(); #ifdef DEBUG_XEVENTS printf("window %p: EnterNotify! (%d,%d,%d)\n", data, xevent.xcrossing.x, @@ -629,7 +652,10 @@ X11_DispatchEvent(_THIS) #endif SDL_SetMouseFocus(data->window); - if (!SDL_GetMouse()->relative_mode) { + mouse->last_x = xevent.xcrossing.x; + mouse->last_y = xevent.xcrossing.y; + + if (!mouse->relative_mode) { SDL_SendMouseMotion(data->window, 0, 0, xevent.xcrossing.x, xevent.xcrossing.y); } } @@ -688,6 +714,7 @@ X11_DispatchEvent(_THIS) data->pending_focus = PENDING_FOCUS_IN; data->pending_focus_time = SDL_GetTicks() + PENDING_FOCUS_TIME; } + data->last_focus_event_time = SDL_GetTicks(); } break; @@ -739,11 +766,7 @@ X11_DispatchEvent(_THIS) if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN && keycode) { int min_keycode, max_keycode; X11_XDisplayKeycodes(display, &min_keycode, &max_keycode); -#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM - keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0); -#else - keysym = X11_XKeycodeToKeysym(display, keycode, 0); -#endif + keysym = X11_KeyCodeToSym(_this, keycode, xevent.xkey.state >> 13); fprintf(stderr, "The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n", keycode, keycode - min_keycode, keysym, @@ -756,14 +779,16 @@ X11_DispatchEvent(_THIS) if (data->ic) { X11_Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text), &keysym, &status); + } else { + X11_XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL); } #else X11_XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL); #endif -#ifdef SDL_USE_IBUS +#ifdef SDL_USE_IME if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){ - handled_by_ime = SDL_IBus_ProcessKeyEvent(keysym, keycode); + handled_by_ime = SDL_IME_ProcessKeyEvent(keysym, keycode); } #endif if (!handled_by_ime) { @@ -773,6 +798,7 @@ X11_DispatchEvent(_THIS) } } + X11_UpdateUserTime(data, xevent.xkey.time); } break; @@ -816,36 +842,28 @@ X11_DispatchEvent(_THIS) xevent.xconfigure.x, xevent.xconfigure.y, xevent.xconfigure.width, xevent.xconfigure.height); #endif - long border_left = 0; - long border_top = 0; - if (data->xwindow) { - Atom _net_frame_extents = X11_XInternAtom(display, "_NET_FRAME_EXTENTS", 0); - Atom type; - int format; - unsigned long nitems, bytes_after; - unsigned char *property; - if (X11_XGetWindowProperty(display, data->xwindow, - _net_frame_extents, 0, 16, 0, - XA_CARDINAL, &type, &format, - &nitems, &bytes_after, &property) == Success) { - if (type != None && nitems == 4) - { - border_left = ((long*)property)[0]; - border_top = ((long*)property)[2]; - } - X11_XFree(property); - } + /* Real configure notify events are relative to the parent, synthetic events are absolute. */ + if (!xevent.xconfigure.send_event) { + unsigned int NumChildren; + Window ChildReturn, Root, Parent; + Window * Children; + /* Translate these coodinates back to relative to root */ + X11_XQueryTree(data->videodata->display, xevent.xconfigure.window, &Root, &Parent, &Children, &NumChildren); + X11_XTranslateCoordinates(xevent.xconfigure.display, + Parent, DefaultRootWindow(xevent.xconfigure.display), + xevent.xconfigure.x, xevent.xconfigure.y, + &xevent.xconfigure.x, &xevent.xconfigure.y, + &ChildReturn); } - + if (xevent.xconfigure.x != data->last_xconfigure.x || xevent.xconfigure.y != data->last_xconfigure.y) { SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED, - xevent.xconfigure.x - border_left, - xevent.xconfigure.y - border_top); -#ifdef SDL_USE_IBUS + xevent.xconfigure.x, xevent.xconfigure.y); +#ifdef SDL_USE_IME if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){ - /* Update IBus candidate list position */ - SDL_IBus_UpdateTextRect(NULL); + /* Update IME candidate list position */ + SDL_IME_UpdateTextRect(NULL); } #endif } @@ -959,6 +977,16 @@ X11_DispatchEvent(_THIS) SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0); break; } + else if ((xevent.xclient.message_type == videodata->WM_PROTOCOLS) && + (xevent.xclient.format == 32) && + (xevent.xclient.data.l[0] == videodata->WM_TAKE_FOCUS)) { + +#ifdef DEBUG_XEVENTS + printf("window %p: WM_TAKE_FOCUS\n", data); +#endif + SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_TAKE_FOCUS, 0, 0); + break; + } } break; @@ -975,7 +1003,7 @@ X11_DispatchEvent(_THIS) SDL_Mouse *mouse = SDL_GetMouse(); if(!mouse->relative_mode || mouse->relative_mode_warp) { #ifdef DEBUG_MOTION - printf("window %p: X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y); + printf("window %p: X11 motion: %d,%d\n", data, xevent.xmotion.x, xevent.xmotion.y); #endif SDL_SendMouseMotion(data->window, 0, 0, xevent.xmotion.x, xevent.xmotion.y); @@ -985,12 +1013,17 @@ X11_DispatchEvent(_THIS) case ButtonPress:{ int xticks = 0, yticks = 0; +#ifdef DEBUG_XEVENTS + printf("window %p: ButtonPress (X11 button = %d)\n", data, xevent.xbutton.button); +#endif if (X11_IsWheelEvent(display,&xevent,&xticks, &yticks)) { SDL_SendMouseWheel(data->window, 0, xticks, yticks, SDL_MOUSEWHEEL_NORMAL); } else { + SDL_bool ignore_click = SDL_FALSE; int button = xevent.xbutton.button; if(button == Button1) { if (ProcessHitTest(_this, data, &xevent)) { + SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_HIT_TEST, 0, 0); break; /* don't pass this event on to app. */ } } @@ -999,8 +1032,18 @@ X11_DispatchEvent(_THIS) => subtract (8-SDL_BUTTON_X1) to get value SDL expects */ button -= (8-SDL_BUTTON_X1); } - SDL_SendMouseButton(data->window, 0, SDL_PRESSED, button); + if (data->last_focus_event_time) { + const int X11_FOCUS_CLICK_TIMEOUT = 10; + if (!SDL_TICKS_PASSED(SDL_GetTicks(), data->last_focus_event_time + X11_FOCUS_CLICK_TIMEOUT)) { + ignore_click = !SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE); + } + data->last_focus_event_time = 0; + } + if (!ignore_click) { + SDL_SendMouseButton(data->window, 0, SDL_PRESSED, button); + } } + X11_UpdateUserTime(data, xevent.xbutton.time); } break; @@ -1008,7 +1051,10 @@ X11_DispatchEvent(_THIS) int button = xevent.xbutton.button; /* The X server sends a Release event for each Press for wheels. Ignore them. */ int xticks = 0, yticks = 0; - if (!X11_IsWheelEvent(display,&xevent,&xticks, &yticks)) { +#ifdef DEBUG_XEVENTS + printf("window %p: ButtonRelease (X11 button = %d)\n", data, xevent.xbutton.button); +#endif + if (!X11_IsWheelEvent(display, &xevent, &xticks, &yticks)) { if (button > 7) { /* see explanation at case ButtonPress */ button -= (8-SDL_BUTTON_X1); @@ -1027,7 +1073,7 @@ X11_DispatchEvent(_THIS) char *name = X11_XGetAtomName(display, xevent.xproperty.atom); if (name) { - printf("window %p: PropertyNotify: %s %s\n", data, name, (xevent.xproperty.state == PropertyDelete) ? "deleted" : "changed"); + printf("window %p: PropertyNotify: %s %s time=%lu\n", data, name, (xevent.xproperty.state == PropertyDelete) ? "deleted" : "changed", xevent.xproperty.time); X11_XFree(name); } @@ -1095,6 +1141,17 @@ X11_DispatchEvent(_THIS) } #endif /* DEBUG_XEVENTS */ + /* Take advantage of this moment to make sure user_time has a + valid timestamp from the X server, so if we later try to + raise/restore this window, _NET_ACTIVE_WINDOW can have a + non-zero timestamp, even if there's never been a mouse or + key press to this window so far. Note that we don't try to + set _NET_WM_USER_TIME here, though. That's only for legit + user interaction with the window. */ + if (!data->user_time) { + data->user_time = xevent.xproperty.time; + } + if (xevent.xproperty.atom == data->videodata->_NET_WM_STATE) { /* Get the new state from the window manager. Compositing window managers can alter visibility of windows @@ -1128,6 +1185,24 @@ X11_DispatchEvent(_THIS) right approach, but it seems to work. */ X11_UpdateKeymap(_this); SDL_SendKeymapChangedEvent(); + } else if (xevent.xproperty.atom == videodata->_NET_FRAME_EXTENTS) { + Atom type; + int format; + unsigned long nitems, bytes_after; + unsigned char *property; + if (X11_XGetWindowProperty(display, data->xwindow, videodata->_NET_FRAME_EXTENTS, 0, 16, 0, XA_CARDINAL, &type, &format, &nitems, &bytes_after, &property) == Success) { + if (type != None && nitems == 4) { + data->border_left = (int) ((long*)property)[0]; + data->border_right = (int) ((long*)property)[1]; + data->border_top = (int) ((long*)property)[2]; + data->border_bottom = (int) ((long*)property)[3]; + } + X11_XFree(property); + + #ifdef DEBUG_XEVENTS + printf("New _NET_FRAME_EXTENTS: left=%d right=%d, top=%d, bottom=%d\n", data->border_left, data->border_right, data->border_top, data->border_bottom); + #endif + } } } break; @@ -1182,51 +1257,33 @@ X11_DispatchEvent(_THIS) break; case SelectionNotify: { + Atom target = xevent.xselection.target; #ifdef DEBUG_XEVENTS printf("window %p: SelectionNotify (requestor = %ld, target = %ld)\n", data, xevent.xselection.requestor, xevent.xselection.target); #endif - Atom target = xevent.xselection.target; if (target == data->xdnd_req) { /* read data */ SDL_x11Prop p; X11_ReadProperty(&p, display, data->xwindow, videodata->PRIMARY); if (p.format == 8) { - SDL_bool expect_lf = SDL_FALSE; - char *start = NULL; - char *scan = (char*)p.data; - char *fn; - char *uri; - int length = 0; - while (p.count--) { - if (!expect_lf) { - if (*scan == 0x0D) { - expect_lf = SDL_TRUE; + /* !!! FIXME: don't use strtok here. It's not reentrant and not in SDL_stdinc. */ + char* name = X11_XGetAtomName(display, target); + char *token = strtok((char *) p.data, "\r\n"); + while (token != NULL) { + if (SDL_strcmp("text/plain", name)==0) { + SDL_SendDropText(data->window, token); + } else if (SDL_strcmp("text/uri-list", name)==0) { + char *fn = X11_URIToLocal(token); + if (fn) { + SDL_SendDropFile(data->window, fn); } - if (start == NULL) { - start = scan; - length = 0; - } - length++; - } else { - if (*scan == 0x0A && length > 0) { - uri = SDL_malloc(length--); - SDL_memcpy(uri, start, length); - uri[length] = '\0'; - fn = X11_URIToLocal(uri); - if (fn) { - SDL_SendDropFile(fn); - } - SDL_free(uri); - } - expect_lf = SDL_FALSE; - start = NULL; } - scan++; + token = strtok(NULL, "\r\n"); } + SDL_SendDropComplete(data->window); } - X11_XFree(p.data); /* send reply */ @@ -1350,9 +1407,9 @@ X11_PumpEvents(_THIS) X11_DispatchEvent(_this); } -#ifdef SDL_USE_IBUS +#ifdef SDL_USE_IME if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){ - SDL_IBus_PumpEvents(); + SDL_IME_PumpEvents(); } #endif diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.c b/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.c index 2c3acdadd..b888bff35 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.c @@ -129,9 +129,21 @@ static const struct { { XK_Control_R, SDL_SCANCODE_RCTRL }, { XK_Shift_R, SDL_SCANCODE_RSHIFT }, { XK_Alt_R, SDL_SCANCODE_RALT }, + { XK_ISO_Level3_Shift, SDL_SCANCODE_RALT }, { XK_Meta_R, SDL_SCANCODE_RGUI }, { XK_Super_R, SDL_SCANCODE_RGUI }, { XK_Mode_switch, SDL_SCANCODE_MODE }, + { XK_period, SDL_SCANCODE_PERIOD }, + { XK_comma, SDL_SCANCODE_COMMA }, + { XK_slash, SDL_SCANCODE_SLASH }, + { XK_backslash, SDL_SCANCODE_BACKSLASH }, + { XK_minus, SDL_SCANCODE_MINUS }, + { XK_equal, SDL_SCANCODE_EQUALS }, + { XK_space, SDL_SCANCODE_SPACE }, + { XK_grave, SDL_SCANCODE_GRAVE }, + { XK_apostrophe, SDL_SCANCODE_APOSTROPHE }, + { XK_bracketleft, SDL_SCANCODE_LEFTBRACKET }, + { XK_bracketright, SDL_SCANCODE_RIGHTBRACKET }, }; static const struct @@ -142,31 +154,34 @@ static const struct { darwin_scancode_table, SDL_arraysize(darwin_scancode_table) }, { xfree86_scancode_table, SDL_arraysize(xfree86_scancode_table) }, { xfree86_scancode_table2, SDL_arraysize(xfree86_scancode_table2) }, + { xvnc_scancode_table, SDL_arraysize(xvnc_scancode_table) }, }; /* *INDENT-OFF* */ /* This function only works for keyboards in US QWERTY layout */ static SDL_Scancode -X11_KeyCodeToSDLScancode(Display *display, KeyCode keycode) +X11_KeyCodeToSDLScancode(_THIS, KeyCode keycode) { KeySym keysym; int i; -#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM - keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0); -#else - keysym = X11_XKeycodeToKeysym(display, keycode, 0); -#endif + keysym = X11_KeyCodeToSym(_this, keycode, 0); if (keysym == NoSymbol) { return SDL_SCANCODE_UNKNOWN; } + if (keysym >= XK_a && keysym <= XK_z) { + return SDL_SCANCODE_A + (keysym - XK_a); + } if (keysym >= XK_A && keysym <= XK_Z) { return SDL_SCANCODE_A + (keysym - XK_A); } - if (keysym >= XK_0 && keysym <= XK_9) { - return SDL_SCANCODE_0 + (keysym - XK_0); + if (keysym == XK_0) { + return SDL_SCANCODE_0; + } + if (keysym >= XK_1 && keysym <= XK_9) { + return SDL_SCANCODE_1 + (keysym - XK_1); } for (i = 0; i < SDL_arraysize(KeySymToSDLScancode); ++i) { @@ -178,15 +193,10 @@ X11_KeyCodeToSDLScancode(Display *display, KeyCode keycode) } static Uint32 -X11_KeyCodeToUcs4(Display *display, KeyCode keycode, unsigned char group) +X11_KeyCodeToUcs4(_THIS, KeyCode keycode, unsigned char group) { - KeySym keysym; + KeySym keysym = X11_KeyCodeToSym(_this, keycode, group); -#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM - keysym = X11_XkbKeycodeToKeysym(display, keycode, group, 0); -#else - keysym = X11_XKeycodeToKeysym(display, keycode, 0); -#endif if (keysym == NoSymbol) { return 0; } @@ -194,6 +204,42 @@ X11_KeyCodeToUcs4(Display *display, KeyCode keycode, unsigned char group) return X11_KeySymToUcs4(keysym); } +KeySym +X11_KeyCodeToSym(_THIS, KeyCode keycode, unsigned char group) +{ + SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; + KeySym keysym; + +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + if (data->xkb) { + int num_groups = XkbKeyNumGroups(data->xkb, keycode); + unsigned char info = XkbKeyGroupInfo(data->xkb, keycode); + + if (num_groups && group >= num_groups) { + + int action = XkbOutOfRangeGroupAction(info); + + if (action == XkbRedirectIntoRange) { + if ((group = XkbOutOfRangeGroupNumber(info)) >= num_groups) { + group = 0; + } + } else if (action == XkbClampIntoRange) { + group = num_groups - 1; + } else { + group %= num_groups; + } + } + keysym = X11_XkbKeycodeToKeysym(data->display, keycode, group, 0); + } else { + keysym = X11_XKeycodeToKeysym(data->display, keycode, 0); + } +#else + keysym = X11_XKeycodeToKeysym(data->display, keycode, 0); +#endif + + return keysym; +} + int X11_InitKeyboard(_THIS) { @@ -219,6 +265,16 @@ X11_InitKeyboard(_THIS) X11_XAutoRepeatOn(data->display); +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + { + int xkb_major = XkbMajorVersion; + int xkb_minor = XkbMinorVersion; + if (X11_XkbQueryExtension(data->display, NULL, NULL, NULL, &xkb_major, &xkb_minor)) { + data->xkb = X11_XkbGetMap(data->display, XkbAllClientInfoMask, XkbUseCoreKbd); + } + } +#endif + /* Try to determine which scancodes are being used based on fingerprint */ best_distance = SDL_arraysize(fingerprint) + 1; best_index = -1; @@ -263,16 +319,12 @@ X11_InitKeyboard(_THIS) SDL_GetDefaultKeymap(keymap); for (i = min_keycode; i <= max_keycode; ++i) { KeySym sym; -#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM - sym = X11_XkbKeycodeToKeysym(data->display, i, 0, 0); -#else - sym = X11_XKeycodeToKeysym(data->display, i, 0); -#endif + sym = X11_KeyCodeToSym(_this, (KeyCode) i, 0); if (sym != NoSymbol) { SDL_Scancode scancode; printf("code = %d, sym = 0x%X (%s) ", i - min_keycode, (unsigned int) sym, X11_XKeysymToString(sym)); - scancode = X11_KeyCodeToSDLScancode(data->display, i); + scancode = X11_KeyCodeToSDLScancode(_this, i); data->key_layout[i] = scancode; if (scancode == SDL_SCANCODE_UNKNOWN) { printf("scancode not found\n"); @@ -287,8 +339,8 @@ X11_InitKeyboard(_THIS) SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu"); -#ifdef SDL_USE_IBUS - SDL_IBus_Init(); +#ifdef SDL_USE_IME + SDL_IME_Init(); #endif return 0; @@ -304,10 +356,12 @@ X11_UpdateKeymap(_THIS) unsigned char group = 0; SDL_GetDefaultKeymap(keymap); - + #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM - { + if (data->xkb) { XkbStateRec state; + X11_XkbGetUpdatedMap(data->display, XkbAllClientInfoMask, data->xkb); + if (X11_XkbGetState(data->display, XkbUseCoreKbd, &state) == Success) { group = state.group; } @@ -325,11 +379,11 @@ X11_UpdateKeymap(_THIS) } /* See if there is a UCS keycode for this scancode */ - key = X11_KeyCodeToUcs4(data->display, (KeyCode)i, group); + key = X11_KeyCodeToUcs4(_this, (KeyCode)i, group); if (key) { keymap[scancode] = key; } else { - SDL_Scancode keyScancode = X11_KeyCodeToSDLScancode(data->display, (KeyCode)i); + SDL_Scancode keyScancode = X11_KeyCodeToSDLScancode(_this, (KeyCode)i); switch (keyScancode) { case SDL_SCANCODE_RETURN: @@ -359,22 +413,54 @@ X11_UpdateKeymap(_THIS) void X11_QuitKeyboard(_THIS) { -#ifdef SDL_USE_IBUS - SDL_IBus_Quit(); + SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; + +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + if (data->xkb) { + X11_XkbFreeClientMap(data->xkb, 0, True); + data->xkb = NULL; + } +#endif + +#ifdef SDL_USE_IME + SDL_IME_Quit(); +#endif +} + +static void +X11_ResetXIM(_THIS) +{ +#ifdef X_HAVE_UTF8_STRING + SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata; + int i; + + if (videodata && videodata->windowlist) { + for (i = 0; i < videodata->numwindows; ++i) { + SDL_WindowData *data = videodata->windowlist[i]; + if (data && data->ic) { + /* Clear any partially entered dead keys */ + char *contents = X11_Xutf8ResetIC(data->ic); + if (contents) { + X11_XFree(contents); + } + } + } + } #endif } void X11_StartTextInput(_THIS) { - + X11_ResetXIM(_this); } void X11_StopTextInput(_THIS) { -#ifdef SDL_USE_IBUS - SDL_IBus_Reset(); + X11_ResetXIM(_this); +#ifdef SDL_USE_IME + SDL_IME_Reset(); #endif } @@ -386,8 +472,8 @@ X11_SetTextInputRect(_THIS, SDL_Rect *rect) return; } -#ifdef SDL_USE_IBUS - SDL_IBus_UpdateTextRect(rect); +#ifdef SDL_USE_IME + SDL_IME_UpdateTextRect(rect); #endif } diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.h b/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.h index a1102ed75..6ce3c9cce 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.h +++ b/Engine/lib/sdl/src/video/x11/SDL_x11keyboard.h @@ -29,6 +29,7 @@ extern void X11_QuitKeyboard(_THIS); extern void X11_StartTextInput(_THIS); extern void X11_StopTextInput(_THIS); extern void X11_SetTextInputRect(_THIS, SDL_Rect *rect); +extern KeySym X11_KeyCodeToSym(_THIS, KeyCode, unsigned char group); #endif /* _SDL_x11keyboard_h */ diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11modes.c b/Engine/lib/sdl/src/video/x11/SDL_x11modes.c index 446da2b64..29307b3a6 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11modes.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11modes.c @@ -157,14 +157,12 @@ CheckXinerama(Display * display, int *major, int *minor) { int event_base = 0; int error_base = 0; - const char *env; /* Default the extension not available */ *major = *minor = 0; /* Allow environment override */ - env = SDL_GetHint(SDL_HINT_VIDEO_X11_XINERAMA); - if (env && !SDL_atoi(env)) { + if (!SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_XINERAMA, SDL_TRUE)) { #ifdef X11MODES_DEBUG printf("Xinerama disabled due to hint\n"); #endif @@ -213,22 +211,19 @@ X11_XineramaFailed(Display * d, XErrorEvent * e) static SDL_bool CheckXRandR(Display * display, int *major, int *minor) { - const char *env; - /* Default the extension not available */ *major = *minor = 0; /* Allow environment override */ - env = SDL_GetHint(SDL_HINT_VIDEO_X11_XRANDR); #ifdef XRANDR_DISABLED_BY_DEFAULT - if (!env || !SDL_atoi(env)) { + if (!SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_XRANDR, SDL_FALSE)) { #ifdef X11MODES_DEBUG printf("XRandR disabled by default due to window manager issues\n"); #endif return SDL_FALSE; } #else - if (env && !SDL_atoi(env)) { + if (!SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_XRANDR, SDL_TRUE)) { #ifdef X11MODES_DEBUG printf("XRandR disabled due to hint\n"); #endif @@ -264,8 +259,8 @@ CheckXRandR(Display * display, int *major, int *minor) static int CalculateXRandRRefreshRate(const XRRModeInfo *info) { - return (info->hTotal - && info->vTotal) ? (info->dotClock / (info->hTotal * info->vTotal)) : 0; + return (info->hTotal && info->vTotal) ? + round(((double)info->dotClock / (double)(info->hTotal * info->vTotal))) : 0; } static SDL_bool @@ -342,7 +337,7 @@ SetXRandRDisplayName(Display *dpy, Atom EDID, char *name, const size_t namelen, X11_XFree(props); } - inches = (int)((SDL_sqrt(widthmm * widthmm + heightmm * heightmm) / 25.4f) + 0.5f); + inches = (int)((SDL_sqrtf(widthmm * widthmm + heightmm * heightmm) / 25.4f) + 0.5f); if (*name && inches) { const size_t len = SDL_strlen(name); SDL_snprintf(&name[len], namelen-len, " %d\"", inches); @@ -507,14 +502,11 @@ X11_InitModes_XRandR(_THIS) static SDL_bool CheckVidMode(Display * display, int *major, int *minor) { - const char *env; - /* Default the extension not available */ *major = *minor = 0; /* Allow environment override */ - env = SDL_GetHint(SDL_HINT_VIDEO_X11_XVIDMODE); - if (env && !SDL_atoi(env)) { + if (!SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_XVIDMODE, SDL_TRUE)) { #ifdef X11MODES_DEBUG printf("XVidMode disabled due to hint\n"); #endif @@ -618,6 +610,19 @@ X11_InitModes(_THIS) /* !!! FIXME: eventually remove support for Xinerama and XVidMode (everything below here). */ + /* This is a workaround for some apps (UnrealEngine4, for example) until + we sort out the ramifications of removing XVidMode support outright. + This block should be removed with the XVidMode support. */ + { + if (SDL_GetHintBoolean("SDL_VIDEO_X11_REQUIRE_XRANDR", SDL_FALSE)) { + #if SDL_VIDEO_DRIVER_X11_XRANDR + return SDL_SetError("XRandR support is required but not available"); + #else + return SDL_SetError("XRandR support is required but not built into SDL!"); + #endif + } + } + #if SDL_VIDEO_DRIVER_X11_XINERAMA /* Query Xinerama extention * NOTE: This works with Nvidia Twinview correctly, but you need version 302.17 (released on June 2012) @@ -1056,7 +1061,44 @@ X11_GetDisplayDPI(_THIS, SDL_VideoDisplay * sdl_display, float * ddpi, float * h *vdpi = data->vdpi; } - return data->ddpi != 0.0f ? 0 : -1; + return data->ddpi != 0.0f ? 0 : SDL_SetError("Couldn't get DPI"); +} + +int +X11_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect) +{ + SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; + Display *display = data->display; + Atom _NET_WORKAREA; + int status, real_format; + int retval = -1; + Atom real_type; + unsigned long items_read = 0, items_left = 0; + unsigned char *propdata = NULL; + + if (X11_GetDisplayBounds(_this, sdl_display, rect) < 0) { + return -1; + } + + _NET_WORKAREA = X11_XInternAtom(display, "_NET_WORKAREA", False); + status = X11_XGetWindowProperty(display, DefaultRootWindow(display), + _NET_WORKAREA, 0L, 4L, False, XA_CARDINAL, + &real_type, &real_format, &items_read, + &items_left, &propdata); + if ((status == Success) && (items_read >= 4)) { + const long *p = (long*) propdata; + const SDL_Rect usable = { (int)p[0], (int)p[1], (int)p[2], (int)p[3] }; + retval = 0; + if (!SDL_IntersectRect(rect, &usable, rect)) { + SDL_zerop(rect); + } + } + + if (propdata) { + X11_XFree(propdata); + } + + return retval; } #endif /* SDL_VIDEO_DRIVER_X11 */ diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11modes.h b/Engine/lib/sdl/src/video/x11/SDL_x11modes.h index a68286ab1..4f47f3b5c 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11modes.h +++ b/Engine/lib/sdl/src/video/x11/SDL_x11modes.h @@ -77,6 +77,7 @@ extern int X11_GetVisualInfoFromVisual(Display * display, Visual * visual, extern Uint32 X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo); extern int X11_GetDisplayBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect); +extern int X11_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect); extern int X11_GetDisplayDPI(_THIS, SDL_VideoDisplay * sdl_display, float * ddpi, float * hdpi, float * vdpi); #endif /* _SDL_x11modes_h */ diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11mouse.c b/Engine/lib/sdl/src/video/x11/SDL_x11mouse.c index 245b116ea..e1a16c225 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11mouse.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11mouse.c @@ -366,39 +366,52 @@ X11_CaptureMouse(SDL_Window *window) static Uint32 X11_GetGlobalMouseState(int *x, int *y) { + SDL_VideoData *videodata = (SDL_VideoData *) SDL_GetVideoDevice()->driverdata; Display *display = GetDisplay(); const int num_screens = SDL_GetNumVideoDisplays(); int i; /* !!! FIXME: should we XSync() here first? */ - for (i = 0; i < num_screens; i++) { - SDL_DisplayData *data = (SDL_DisplayData *) SDL_GetDisplayDriverData(i); - if (data != NULL) { - Window root, child; - int rootx, rooty, winx, winy; - unsigned int mask; - if (X11_XQueryPointer(display, RootWindow(display, data->screen), &root, &child, &rootx, &rooty, &winx, &winy, &mask)) { - XWindowAttributes root_attrs; - Uint32 retval = 0; - retval |= (mask & Button1Mask) ? SDL_BUTTON_LMASK : 0; - retval |= (mask & Button2Mask) ? SDL_BUTTON_MMASK : 0; - retval |= (mask & Button3Mask) ? SDL_BUTTON_RMASK : 0; - /* SDL_DisplayData->x,y point to screen origin, and adding them to mouse coordinates relative to root window doesn't do the right thing - * (observed on dual monitor setup with primary display being the rightmost one - mouse was offset to the right). - * - * Adding root position to root-relative coordinates seems to be a better way to get absolute position. */ - X11_XGetWindowAttributes(display, root, &root_attrs); - *x = root_attrs.x + rootx; - *y = root_attrs.y + rooty; - return retval; +#if !SDL_VIDEO_DRIVER_X11_XINPUT2 + videodata->global_mouse_changed = SDL_TRUE; +#endif + + /* check if we have this cached since XInput last saw the mouse move. */ + /* !!! FIXME: can we just calculate this from XInput's events? */ + if (videodata->global_mouse_changed) { + for (i = 0; i < num_screens; i++) { + SDL_DisplayData *data = (SDL_DisplayData *) SDL_GetDisplayDriverData(i); + if (data != NULL) { + Window root, child; + int rootx, rooty, winx, winy; + unsigned int mask; + if (X11_XQueryPointer(display, RootWindow(display, data->screen), &root, &child, &rootx, &rooty, &winx, &winy, &mask)) { + XWindowAttributes root_attrs; + Uint32 buttons = 0; + buttons |= (mask & Button1Mask) ? SDL_BUTTON_LMASK : 0; + buttons |= (mask & Button2Mask) ? SDL_BUTTON_MMASK : 0; + buttons |= (mask & Button3Mask) ? SDL_BUTTON_RMASK : 0; + /* SDL_DisplayData->x,y point to screen origin, and adding them to mouse coordinates relative to root window doesn't do the right thing + * (observed on dual monitor setup with primary display being the rightmost one - mouse was offset to the right). + * + * Adding root position to root-relative coordinates seems to be a better way to get absolute position. */ + X11_XGetWindowAttributes(display, root, &root_attrs); + videodata->global_mouse_position.x = root_attrs.x + rootx; + videodata->global_mouse_position.y = root_attrs.y + rooty; + videodata->global_mouse_buttons = buttons; + videodata->global_mouse_changed = SDL_FALSE; + break; + } } } } - SDL_assert(0 && "The pointer wasn't on any X11 screen?!"); + SDL_assert(!videodata->global_mouse_changed); /* The pointer wasn't on any X11 screen?! */ - return 0; + *x = videodata->global_mouse_position.x; + *y = videodata->global_mouse_position.y; + return videodata->global_mouse_buttons; } diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11opengl.c b/Engine/lib/sdl/src/video/x11/SDL_x11opengl.c index 8b634be3d..abc699dd4 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11opengl.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11opengl.c @@ -695,7 +695,7 @@ X11_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) if (errorCode != Success) { /* uhoh, an X error was thrown! */ return -1; /* the error handler called SDL_SetError() already. */ - } else if (!rc) { /* glxMakeCurrent() failed without throwing an X error */ + } else if (!rc) { /* glXMakeCurrent() failed without throwing an X error */ return SDL_SetError("Unable to make GL context current"); } @@ -703,14 +703,14 @@ X11_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) } /* - 0 is a valid argument to glxSwapInterval(MESA|EXT) and setting it to 0 + 0 is a valid argument to glXSwapInterval(MESA|EXT) and setting it to 0 will undo the effect of a previous call with a value that is greater than zero (or at least that is what the docs say). OTOH, 0 is an invalid - argument to glxSwapIntervalSGI and it returns an error if you call it + argument to glXSwapIntervalSGI and it returns an error if you call it with 0 as an argument. */ -static int swapinterval = -1; +static int swapinterval = 0; int X11_GL_SetSwapInterval(_THIS, int interval) { @@ -742,14 +742,14 @@ X11_GL_SetSwapInterval(_THIS, int interval) } else if (_this->gl_data->glXSwapIntervalMESA) { status = _this->gl_data->glXSwapIntervalMESA(interval); if (status != 0) { - SDL_SetError("glxSwapIntervalMESA failed"); + SDL_SetError("glXSwapIntervalMESA failed"); } else { swapinterval = interval; } } else if (_this->gl_data->glXSwapIntervalSGI) { status = _this->gl_data->glXSwapIntervalSGI(interval); if (status != 0) { - SDL_SetError("glxSwapIntervalSGI failed"); + SDL_SetError("glXSwapIntervalSGI failed"); } else { swapinterval = interval; } diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11sym.h b/Engine/lib/sdl/src/video/x11/SDL_x11sym.h index 3683ac0a5..7290412b7 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11sym.h +++ b/Engine/lib/sdl/src/video/x11/SDL_x11sym.h @@ -21,6 +21,14 @@ /* *INDENT-OFF* */ +#ifndef SDL_X11_MODULE +#define SDL_X11_MODULE(modname) +#endif + +#ifndef SDL_X11_SYM +#define SDL_X11_SYM(rc,fn,params,args,ret) +#endif + SDL_X11_MODULE(BASEXLIB) SDL_X11_SYM(XSizeHints*,XAllocSizeHints,(void),(),return) SDL_X11_SYM(XWMHints*,XAllocWMHints,(void),(),return) @@ -153,6 +161,7 @@ SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),r SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return) SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return) SDL_X11_SYM(void,XRefreshKeyboardMapping,(XMappingEvent *a),(a),) +SDL_X11_SYM(int,XQueryTree,(Display* a,Window b,Window* c,Window* d,Window** e,unsigned int* f),(a,b,c,d,e,f),return) #if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS SDL_X11_SYM(Bool,XGetEventData,(Display* a,XGenericEventCookie* b),(a,b),return) @@ -160,12 +169,16 @@ SDL_X11_SYM(void,XFreeEventData,(Display* a,XGenericEventCookie* b),(a,b),) #endif #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM +SDL_X11_SYM(Bool,XkbQueryExtension,(Display* a,int * b,int * c,int * d,int * e, int *f),(a,b,c,d,e,f),return) #if NeedWidePrototypes SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,unsigned int b,int c,int d),(a,b,c,d),return) #else SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,KeyCode b,int c,int d),(a,b,c,d),return) #endif SDL_X11_SYM(Status,XkbGetState,(Display* a,unsigned int b,XkbStatePtr c),(a,b,c),return) +SDL_X11_SYM(Status,XkbGetUpdatedMap,(Display* a,unsigned int b,XkbDescPtr c),(a,b,c),return) +SDL_X11_SYM(XkbDescPtr,XkbGetMap,(Display* a,unsigned int b,unsigned int c),(a,b,c),return) +SDL_X11_SYM(void,XkbFreeClientMap,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),) #endif #if NeedWidePrototypes @@ -187,6 +200,8 @@ SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d) SDL_X11_SYM(Status,XCloseIM,(XIM a),(a),return) SDL_X11_SYM(void,Xutf8DrawString,(Display *a, Drawable b, XFontSet c, GC d, int e, int f, _Xconst char *g, int h),(a,b,c,d,e,f,g,h),) SDL_X11_SYM(int,Xutf8TextExtents,(XFontSet a, _Xconst char* b, int c, XRectangle* d, XRectangle* e),(a,b,c,d,e),return) +SDL_X11_SYM(char*,XSetLocaleModifiers,(const char *a),(a),return) +SDL_X11_SYM(char*,Xutf8ResetIC,(XIC a),(a),return) #endif #ifndef NO_SHARED_MEMORY @@ -311,6 +326,9 @@ SDL_X11_SYM(Bool,XF86VidModeSwitchToMode,(Display *a,int b,XF86VidModeModeInfo * SDL_X11_SYM(Bool,XF86VidModeLockModeSwitch,(Display *a,int b,int c),(a,b,c),return) #endif +#undef SDL_X11_MODULE +#undef SDL_X11_SYM + /* *INDENT-ON* */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11video.c b/Engine/lib/sdl/src/video/x11/SDL_x11video.c index 01f8ae60f..38b34de34 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11video.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11video.c @@ -39,6 +39,10 @@ #include "SDL_x11opengles.h" #endif +#ifdef X_HAVE_UTF8_STRING +#include +#endif + /* Initialization/Query functions */ static int X11_VideoInit(_THIS); static void X11_VideoQuit(_THIS); @@ -175,6 +179,8 @@ X11_CreateDevice(int devindex) } device->driverdata = data; + data->global_mouse_changed = SDL_TRUE; + /* FIXME: Do we need this? if ( (SDL_strncmp(X11_XDisplayName(display), ":", 1) == 0) || (SDL_strncmp(X11_XDisplayName(display), "unix:", 5) == 0) ) { @@ -216,6 +222,7 @@ X11_CreateDevice(int devindex) device->VideoQuit = X11_VideoQuit; device->GetDisplayModes = X11_GetDisplayModes; device->GetDisplayBounds = X11_GetDisplayBounds; + device->GetDisplayUsableBounds = X11_GetDisplayUsableBounds; device->GetDisplayDPI = X11_GetDisplayDPI; device->SetDisplayMode = X11_SetDisplayMode; device->SuspendScreenSaver = X11_SuspendScreenSaver; @@ -229,6 +236,10 @@ X11_CreateDevice(int devindex) device->SetWindowSize = X11_SetWindowSize; device->SetWindowMinimumSize = X11_SetWindowMinimumSize; device->SetWindowMaximumSize = X11_SetWindowMaximumSize; + device->GetWindowBordersSize = X11_GetWindowBordersSize; + device->SetWindowOpacity = X11_SetWindowOpacity; + device->SetWindowModalFor = X11_SetWindowModalFor; + device->SetWindowInputFocus = X11_SetWindowInputFocus; device->ShowWindow = X11_ShowWindow; device->HideWindow = X11_HideWindow; device->RaiseWindow = X11_RaiseWindow; @@ -236,6 +247,7 @@ X11_CreateDevice(int devindex) device->MinimizeWindow = X11_MinimizeWindow; device->RestoreWindow = X11_RestoreWindow; device->SetWindowBordered = X11_SetWindowBordered; + device->SetWindowResizable = X11_SetWindowResizable; device->SetWindowFullscreen = X11_SetWindowFullscreen; device->SetWindowGammaRamp = X11_SetWindowGammaRamp; device->SetWindowGrab = X11_SetWindowGrab; @@ -278,7 +290,7 @@ X11_CreateDevice(int devindex) device->StartTextInput = X11_StartTextInput; device->StopTextInput = X11_StopTextInput; device->SetTextInputRect = X11_SetTextInputRect; - + device->free = X11_DeleteDevice; return device; @@ -373,11 +385,65 @@ X11_VideoInit(_THIS) /* Get the process PID to be associated to the window */ data->pid = getpid(); + /* I have no idea how random this actually is, or has to be. */ + data->window_group = (XID) (((size_t) data->pid) ^ ((size_t) _this)); + /* Open a connection to the X input manager */ #ifdef X_HAVE_UTF8_STRING if (SDL_X11_HAVE_UTF8) { - data->im = - X11_XOpenIM(data->display, NULL, data->classname, data->classname); + /* Set the locale, and call XSetLocaleModifiers before XOpenIM so that + Compose keys will work correctly. */ + char *prev_locale = setlocale(LC_ALL, NULL); + char *prev_xmods = X11_XSetLocaleModifiers(NULL); + const char *new_xmods = ""; +#if defined(HAVE_IBUS_IBUS_H) || defined(HAVE_FCITX_FRONTEND_H) + const char *env_xmods = SDL_getenv("XMODIFIERS"); +#endif + SDL_bool has_dbus_ime_support = SDL_FALSE; + + if (prev_locale) { + prev_locale = SDL_strdup(prev_locale); + } + + if (prev_xmods) { + prev_xmods = SDL_strdup(prev_xmods); + } + + /* IBus resends some key events that were filtered by XFilterEvents + when it is used via XIM which causes issues. Prevent this by forcing + @im=none if XMODIFIERS contains @im=ibus. IBus can still be used via + the DBus implementation, which also has support for pre-editing. */ +#ifdef HAVE_IBUS_IBUS_H + if (env_xmods && SDL_strstr(env_xmods, "@im=ibus") != NULL) { + has_dbus_ime_support = SDL_TRUE; + } +#endif +#ifdef HAVE_FCITX_FRONTEND_H + if (env_xmods && SDL_strstr(env_xmods, "@im=fcitx") != NULL) { + has_dbus_ime_support = SDL_TRUE; + } +#endif + if (has_dbus_ime_support) { + new_xmods = "@im=none"; + } + + setlocale(LC_ALL, ""); + X11_XSetLocaleModifiers(new_xmods); + + data->im = X11_XOpenIM(data->display, NULL, data->classname, data->classname); + + /* Reset the locale + X locale modifiers back to how they were, + locale first because the X locale modifiers depend on it. */ + setlocale(LC_ALL, prev_locale); + X11_XSetLocaleModifiers(prev_xmods); + + if (prev_locale) { + SDL_free(prev_locale); + } + + if (prev_xmods) { + SDL_free(prev_xmods); + } } #endif @@ -385,19 +451,26 @@ X11_VideoInit(_THIS) #define GET_ATOM(X) data->X = X11_XInternAtom(data->display, #X, False) GET_ATOM(WM_PROTOCOLS); GET_ATOM(WM_DELETE_WINDOW); + GET_ATOM(WM_TAKE_FOCUS); GET_ATOM(_NET_WM_STATE); GET_ATOM(_NET_WM_STATE_HIDDEN); GET_ATOM(_NET_WM_STATE_FOCUSED); GET_ATOM(_NET_WM_STATE_MAXIMIZED_VERT); GET_ATOM(_NET_WM_STATE_MAXIMIZED_HORZ); GET_ATOM(_NET_WM_STATE_FULLSCREEN); + GET_ATOM(_NET_WM_STATE_ABOVE); + GET_ATOM(_NET_WM_STATE_SKIP_TASKBAR); + GET_ATOM(_NET_WM_STATE_SKIP_PAGER); GET_ATOM(_NET_WM_ALLOWED_ACTIONS); GET_ATOM(_NET_WM_ACTION_FULLSCREEN); GET_ATOM(_NET_WM_NAME); GET_ATOM(_NET_WM_ICON_NAME); GET_ATOM(_NET_WM_ICON); GET_ATOM(_NET_WM_PING); + GET_ATOM(_NET_WM_WINDOW_OPACITY); + GET_ATOM(_NET_WM_USER_TIME); GET_ATOM(_NET_ACTIVE_WINDOW); + GET_ATOM(_NET_FRAME_EXTENTS); GET_ATOM(UTF8_STRING); GET_ATOM(PRIMARY); GET_ATOM(XdndEnter); diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11video.h b/Engine/lib/sdl/src/video/x11/SDL_x11video.h index 2083defd2..a3324ff53 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11video.h +++ b/Engine/lib/sdl/src/video/x11/SDL_x11video.h @@ -57,7 +57,7 @@ #endif #include "../../core/linux/SDL_dbus.h" -#include "../../core/linux/SDL_ibus.h" +#include "../../core/linux/SDL_ime.h" #include "SDL_x11dyn.h" @@ -81,6 +81,7 @@ typedef struct SDL_VideoData int numwindows; SDL_WindowData **windowlist; int windowlistlength; + XID window_group; /* This is true for ICCCM2.0-compliant window managers */ SDL_bool net_wm; @@ -88,19 +89,26 @@ typedef struct SDL_VideoData /* Useful atoms */ Atom WM_PROTOCOLS; Atom WM_DELETE_WINDOW; + Atom WM_TAKE_FOCUS; Atom _NET_WM_STATE; Atom _NET_WM_STATE_HIDDEN; Atom _NET_WM_STATE_FOCUSED; Atom _NET_WM_STATE_MAXIMIZED_VERT; Atom _NET_WM_STATE_MAXIMIZED_HORZ; Atom _NET_WM_STATE_FULLSCREEN; + Atom _NET_WM_STATE_ABOVE; + Atom _NET_WM_STATE_SKIP_TASKBAR; + Atom _NET_WM_STATE_SKIP_PAGER; Atom _NET_WM_ALLOWED_ACTIONS; Atom _NET_WM_ACTION_FULLSCREEN; Atom _NET_WM_NAME; Atom _NET_WM_ICON_NAME; Atom _NET_WM_ICON; Atom _NET_WM_PING; + Atom _NET_WM_WINDOW_OPACITY; + Atom _NET_WM_USER_TIME; Atom _NET_ACTIVE_WINDOW; + Atom _NET_FRAME_EXTENTS; Atom UTF8_STRING; Atom PRIMARY; Atom XdndEnter; @@ -117,6 +125,14 @@ typedef struct SDL_VideoData SDL_bool selection_waiting; Uint32 last_mode_change_deadline; + + SDL_bool global_mouse_changed; + SDL_Point global_mouse_position; + Uint32 global_mouse_buttons; + +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + XkbDescPtr xkb; +#endif } SDL_VideoData; extern SDL_bool X11_UseDirectColorVisuals(void); diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11window.c b/Engine/lib/sdl/src/video/x11/SDL_x11window.c index afc802198..668bce225 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11window.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11window.c @@ -130,13 +130,17 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags) { SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata; Display *display = videodata->display; + /* !!! FIXME: just dereference videodata below instead of copying to locals. */ Atom _NET_WM_STATE = videodata->_NET_WM_STATE; /* Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */ Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED; Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT; Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ; Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN; - Atom atoms[5]; + Atom _NET_WM_STATE_ABOVE = videodata->_NET_WM_STATE_ABOVE; + Atom _NET_WM_STATE_SKIP_TASKBAR = videodata->_NET_WM_STATE_SKIP_TASKBAR; + Atom _NET_WM_STATE_SKIP_PAGER = videodata->_NET_WM_STATE_SKIP_PAGER; + Atom atoms[16]; int count = 0; /* The window manager sets this property, we shouldn't set it. @@ -147,6 +151,14 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags) atoms[count++] = _NET_WM_STATE_HIDDEN; } */ + + if (flags & SDL_WINDOW_ALWAYS_ON_TOP) { + atoms[count++] = _NET_WM_STATE_ABOVE; + } + if (flags & SDL_WINDOW_SKIP_TASKBAR) { + atoms[count++] = _NET_WM_STATE_SKIP_TASKBAR; + atoms[count++] = _NET_WM_STATE_SKIP_PAGER; + } if (flags & SDL_WINDOW_INPUT_FOCUS) { atoms[count++] = _NET_WM_STATE_FOCUSED; } @@ -157,6 +169,9 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags) if (flags & SDL_WINDOW_FULLSCREEN) { atoms[count++] = _NET_WM_STATE_FULLSCREEN; } + + SDL_assert(count <= SDL_arraysize(atoms)); + if (count > 0) { X11_XChangeProperty(display, xwindow, _NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *)atoms, count); @@ -206,7 +221,9 @@ X11_GetNetWMState(_THIS, Window xwindow) } if (maximized == 3) { flags |= SDL_WINDOW_MAXIMIZED; - } else if (fullscreen == 1) { + } + + if (fullscreen == 1) { flags |= SDL_WINDOW_FULLSCREEN; } X11_XFree(propertyValue); @@ -355,10 +372,11 @@ X11_CreateWindow(_THIS, SDL_Window * window) XSizeHints *sizehints; XWMHints *wmhints; XClassHint *classhints; - const long _NET_WM_BYPASS_COMPOSITOR_HINT_ON = 1; Atom _NET_WM_BYPASS_COMPOSITOR; Atom _NET_WM_WINDOW_TYPE; - Atom _NET_WM_WINDOW_TYPE_NORMAL; + Atom wintype; + const char *wintype_name = NULL; + int compositor = 1; Atom _NET_WM_PID; Atom XdndAware, xdnd_version = 5; long fevent = 0; @@ -396,7 +414,7 @@ X11_CreateWindow(_THIS, SDL_Window * window) depth = displaydata->depth; } - xattr.override_redirect = False; + xattr.override_redirect = ((window->flags & SDL_WINDOW_TOOLTIP) || (window->flags & SDL_WINDOW_POPUP_MENU)) ? True : False; xattr.background_pixmap = None; xattr.border_pixel = 0; @@ -506,7 +524,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) /* Setup the input hints so we get keyboard input */ wmhints = X11_XAllocWMHints(); wmhints->input = True; - wmhints->flags = InputHint; + wmhints->window_group = data->window_group; + wmhints->flags = InputHint | WindowGroupHint; /* Setup the class hints so we can get an icon (AfterStep) */ classhints = X11_XAllocClassHint(); @@ -521,39 +540,49 @@ X11_CreateWindow(_THIS, SDL_Window * window) X11_XFree(classhints); /* Set the PID related to the window for the given hostname, if possible */ if (data->pid > 0) { + long pid = (long) data->pid; _NET_WM_PID = X11_XInternAtom(display, "_NET_WM_PID", False); X11_XChangeProperty(display, w, _NET_WM_PID, XA_CARDINAL, 32, PropModeReplace, - (unsigned char *)&data->pid, 1); + (unsigned char *) &pid, 1); } /* Set the window manager state */ X11_SetNetWMState(_this, w, window->flags); - /* Let the window manager know we're a "normal" window */ + compositor = 2; /* don't disable compositing except for "normal" windows */ + + if (window->flags & SDL_WINDOW_UTILITY) { + wintype_name = "_NET_WM_WINDOW_TYPE_UTILITY"; + } else if (window->flags & SDL_WINDOW_TOOLTIP) { + wintype_name = "_NET_WM_WINDOW_TYPE_TOOLTIP"; + } else if (window->flags & SDL_WINDOW_POPUP_MENU) { + wintype_name = "_NET_WM_WINDOW_TYPE_POPUP_MENU"; + } else { + wintype_name = "_NET_WM_WINDOW_TYPE_NORMAL"; + compositor = 1; /* disable compositing for "normal" windows */ + } + + /* Let the window manager know what type of window we are. */ _NET_WM_WINDOW_TYPE = X11_XInternAtom(display, "_NET_WM_WINDOW_TYPE", False); - _NET_WM_WINDOW_TYPE_NORMAL = X11_XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False); + wintype = X11_XInternAtom(display, wintype_name, False); X11_XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32, - PropModeReplace, - (unsigned char *)&_NET_WM_WINDOW_TYPE_NORMAL, 1); + PropModeReplace, (unsigned char *)&wintype, 1); _NET_WM_BYPASS_COMPOSITOR = X11_XInternAtom(display, "_NET_WM_BYPASS_COMPOSITOR", False); X11_XChangeProperty(display, w, _NET_WM_BYPASS_COMPOSITOR, XA_CARDINAL, 32, PropModeReplace, - (unsigned char *)&_NET_WM_BYPASS_COMPOSITOR_HINT_ON, 1); + (unsigned char *)&compositor, 1); { - Atom protocols[2]; + Atom protocols[3]; int proto_count = 0; - const char *ping_hint; - protocols[proto_count] = data->WM_DELETE_WINDOW; /* Allow window to be deleted by the WM */ - proto_count++; - - ping_hint = SDL_GetHint(SDL_HINT_VIDEO_X11_NET_WM_PING); + protocols[proto_count++] = data->WM_DELETE_WINDOW; /* Allow window to be deleted by the WM */ + protocols[proto_count++] = data->WM_TAKE_FOCUS; /* Since we will want to set input focus explicitly */ + /* Default to using ping if there is no hint */ - if (!ping_hint || SDL_atoi(ping_hint)) { - protocols[proto_count] = data->_NET_WM_PING; /* Respond so WM knows we're alive */ - proto_count++; + if (SDL_GetHintBoolean(SDL_HINT_VIDEO_X11_NET_WM_PING, SDL_TRUE)) { + protocols[proto_count++] = data->_NET_WM_PING; /* Respond so WM knows we're alive */ } SDL_assert(proto_count <= sizeof(protocols) / sizeof(protocols[0])); @@ -750,7 +779,7 @@ X11_SetWindowPosition(_THIS, SDL_Window * window) SDL_WindowData *data = (SDL_WindowData *) window->driverdata; Display *display = data->videodata->display; - X11_XMoveWindow(display, data->xwindow, window->x, window->y); + X11_XMoveWindow(display, data->xwindow, window->x - data->border_left, window->y - data->border_top); X11_XFlush(display); } @@ -776,7 +805,7 @@ X11_SetWindowMinimumSize(_THIS, SDL_Window * window) /* See comment in X11_SetWindowSize. */ X11_XResizeWindow(display, data->xwindow, window->w, window->h); - X11_XMoveWindow(display, data->xwindow, window->x, window->y); + X11_XMoveWindow(display, data->xwindow, window->x - data->border_left, window->y - data->border_top); X11_XRaiseWindow(display, data->xwindow); } @@ -805,7 +834,7 @@ X11_SetWindowMaximumSize(_THIS, SDL_Window * window) /* See comment in X11_SetWindowSize. */ X11_XResizeWindow(display, data->xwindow, window->w, window->h); - X11_XMoveWindow(display, data->xwindow, window->x, window->y); + X11_XMoveWindow(display, data->xwindow, window->x - data->border_left, window->y - data->border_top); X11_XRaiseWindow(display, data->xwindow); } @@ -854,7 +883,7 @@ X11_SetWindowSize(_THIS, SDL_Window * window) and transitioning from windowed to fullscreen in Unity. */ X11_XResizeWindow(display, data->xwindow, window->w, window->h); - X11_XMoveWindow(display, data->xwindow, window->x, window->y); + X11_XMoveWindow(display, data->xwindow, window->x - data->border_left, window->y - data->border_top); X11_XRaiseWindow(display, data->xwindow); } else { X11_XResizeWindow(display, data->xwindow, window->w, window->h); @@ -863,6 +892,61 @@ X11_SetWindowSize(_THIS, SDL_Window * window) X11_XFlush(display); } +int +X11_GetWindowBordersSize(_THIS, SDL_Window * window, int *top, int *left, int *bottom, int *right) +{ + SDL_WindowData *data = (SDL_WindowData *)window->driverdata; + + *left = data->border_left; + *right = data->border_right; + *top = data->border_top; + *bottom = data->border_bottom; + + return 0; +} + +int +X11_SetWindowOpacity(_THIS, SDL_Window * window, float opacity) +{ + SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + Display *display = data->videodata->display; + Atom _NET_WM_WINDOW_OPACITY = data->videodata->_NET_WM_WINDOW_OPACITY; + + if (opacity == 1.0f) { + X11_XDeleteProperty(display, data->xwindow, _NET_WM_WINDOW_OPACITY); + } else { + const Uint32 FullyOpaque = 0xFFFFFFFF; + const long alpha = (long) ((double)opacity * (double)FullyOpaque); + X11_XChangeProperty(display, data->xwindow, _NET_WM_WINDOW_OPACITY, XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&alpha, 1); + } + + return 0; +} + +int +X11_SetWindowModalFor(_THIS, SDL_Window * modal_window, SDL_Window * parent_window) { + SDL_WindowData *data = (SDL_WindowData *) modal_window->driverdata; + SDL_WindowData *parent_data = (SDL_WindowData *) parent_window->driverdata; + Display *display = data->videodata->display; + + X11_XSetTransientForHint(display, data->xwindow, parent_data->xwindow); + return 0; +} + +int +X11_SetWindowInputFocus(_THIS, SDL_Window * window) +{ + if (X11_IsWindowMapped(_this, window)) { + SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + Display *display = data->videodata->display; + X11_XSetInputFocus(display, data->xwindow, RevertToNone, CurrentTime); + X11_XFlush(display); + return 0; + } + return -1; +} + void X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) { @@ -895,6 +979,44 @@ X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) X11_XCheckIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow); } +void +X11_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable) +{ + SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + Display *display = data->videodata->display; + + XSizeHints *sizehints = X11_XAllocSizeHints(); + long userhints; + + X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints); + + if (resizable) { + /* FIXME: Is there a better way to get max window size from X? -flibit */ + const int maxsize = 0x7FFFFFFF; + sizehints->min_width = window->min_w; + sizehints->min_height = window->min_h; + sizehints->max_width = (window->max_w == 0) ? maxsize : window->max_w; + sizehints->max_height = (window->max_h == 0) ? maxsize : window->max_h; + } else { + sizehints->min_width = window->w; + sizehints->min_height = window->h; + sizehints->max_width = window->w; + sizehints->max_height = window->h; + } + sizehints->flags |= PMinSize | PMaxSize; + + X11_XSetWMNormalHints(display, data->xwindow, sizehints); + + X11_XFree(sizehints); + + /* See comment in X11_SetWindowSize. */ + X11_XResizeWindow(display, data->xwindow, window->w, window->h); + X11_XMoveWindow(display, data->xwindow, window->x - data->border_left, window->y - data->border_top); + X11_XRaiseWindow(display, data->xwindow); + + X11_XFlush(display); +} + void X11_ShowWindow(_THIS, SDL_Window * window) { @@ -946,13 +1068,15 @@ SetWindowActive(_THIS, SDL_Window * window) if (X11_IsWindowMapped(_this, window)) { XEvent e; + /*printf("SDL Window %p: sending _NET_ACTIVE_WINDOW with timestamp %lu\n", window, data->user_time);*/ + SDL_zero(e); e.xany.type = ClientMessage; e.xclient.message_type = _NET_ACTIVE_WINDOW; e.xclient.format = 32; e.xclient.window = data->xwindow; e.xclient.data.l[0] = 1; /* source indication. 1 = application */ - e.xclient.data.l[1] = CurrentTime; + e.xclient.data.l[1] = data->user_time; e.xclient.data.l[2] = 0; X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0, @@ -1038,7 +1162,7 @@ X11_RestoreWindow(_THIS, SDL_Window * window) SetWindowActive(_this, window); } -/* This asks the Window Manager to handle fullscreen for us. Most don't do it right, though. */ +/* This asks the Window Manager to handle fullscreen for us. This is the modern way. */ static void X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _display, SDL_bool fullscreen) { @@ -1083,6 +1207,22 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0, SubstructureNotifyMask | SubstructureRedirectMask, &e); + + /* Fullscreen windows sometimes end up being marked maximized by + window managers. Force it back to how we expect it to be. */ + if (!fullscreen && ((window->flags & SDL_WINDOW_MAXIMIZED) == 0)) { + SDL_zero(e); + e.xany.type = ClientMessage; + e.xclient.message_type = _NET_WM_STATE; + e.xclient.format = 32; + e.xclient.window = data->xwindow; + e.xclient.data.l[0] = _NET_WM_STATE_REMOVE; + e.xclient.data.l[1] = data->videodata->_NET_WM_STATE_MAXIMIZED_VERT; + e.xclient.data.l[2] = data->videodata->_NET_WM_STATE_MAXIMIZED_HORZ; + e.xclient.data.l[3] = 0l; + X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0, + SubstructureNotifyMask | SubstructureRedirectMask, &e); + } } else { Uint32 flags; @@ -1335,7 +1475,6 @@ X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed) Display *display = data->videodata->display; SDL_bool oldstyle_fullscreen; SDL_bool grab_keyboard; - const char *hint; /* ICCCM2.0-compliant window managers can handle fullscreen windows If we're using XVidMode to change resolution we need to confine @@ -1359,8 +1498,7 @@ X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed) X11_XRaiseWindow(display, data->xwindow); /* Now grab the keyboard */ - hint = SDL_GetHint(SDL_HINT_GRAB_KEYBOARD); - if (hint && SDL_atoi(hint)) { + if (SDL_GetHintBoolean(SDL_HINT_GRAB_KEYBOARD, SDL_FALSE)) { grab_keyboard = SDL_TRUE; } else { /* We need to do this with the old style override_redirect diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11window.h b/Engine/lib/sdl/src/video/x11/SDL_x11window.h index efe7ec0f0..50a739dad 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11window.h +++ b/Engine/lib/sdl/src/video/x11/SDL_x11window.h @@ -56,10 +56,16 @@ typedef struct GC gc; XIC ic; SDL_bool created; + int border_left; + int border_right; + int border_top; + int border_bottom; + Uint32 last_focus_event_time; PendingFocusEnum pending_focus; Uint32 pending_focus_time; XConfigureEvent last_xconfigure; struct SDL_VideoData *videodata; + unsigned long user_time; Atom xdnd_req; Window xdnd_source; #if SDL_VIDEO_OPENGL_EGL @@ -78,6 +84,10 @@ extern void X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon); extern void X11_SetWindowPosition(_THIS, SDL_Window * window); extern void X11_SetWindowMinimumSize(_THIS, SDL_Window * window); extern void X11_SetWindowMaximumSize(_THIS, SDL_Window * window); +extern int X11_GetWindowBordersSize(_THIS, SDL_Window * window, int *top, int *left, int *bottom, int *right); +extern int X11_SetWindowOpacity(_THIS, SDL_Window * window, float opacity); +extern int X11_SetWindowModalFor(_THIS, SDL_Window * modal_window, SDL_Window * parent_window); +extern int X11_SetWindowInputFocus(_THIS, SDL_Window * window); extern void X11_SetWindowSize(_THIS, SDL_Window * window); extern void X11_ShowWindow(_THIS, SDL_Window * window); extern void X11_HideWindow(_THIS, SDL_Window * window); @@ -86,6 +96,7 @@ extern void X11_MaximizeWindow(_THIS, SDL_Window * window); extern void X11_MinimizeWindow(_THIS, SDL_Window * window); extern void X11_RestoreWindow(_THIS, SDL_Window * window); extern void X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered); +extern void X11_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable); extern void X11_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen); extern int X11_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp); extern void X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed); diff --git a/Engine/lib/sdl/src/video/x11/SDL_x11xinput2.c b/Engine/lib/sdl/src/video/x11/SDL_x11xinput2.c index 57132fe9e..bed4234f0 100644 --- a/Engine/lib/sdl/src/video/x11/SDL_x11xinput2.c +++ b/Engine/lib/sdl/src/video/x11/SDL_x11xinput2.c @@ -118,6 +118,8 @@ X11_InitXinput2(_THIS) eventmask.mask = mask; XISetMask(mask, XI_RawMotion); + XISetMask(mask, XI_RawButtonPress); + XISetMask(mask, XI_RawButtonRelease); if (X11_XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) { return; @@ -140,6 +142,8 @@ X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie) static Time prev_time = 0; static double prev_rel_coords[2]; + videodata->global_mouse_changed = SDL_TRUE; + if (!mouse->relative_mode || mouse->relative_mode_warp) { return 0; } @@ -158,6 +162,12 @@ X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie) return 1; } break; + + case XI_RawButtonPress: + case XI_RawButtonRelease: + videodata->global_mouse_changed = SDL_TRUE; + break; + #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH case XI_TouchBegin: { const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; diff --git a/Engine/lib/sdl/src/video/x11/edid-parse.c b/Engine/lib/sdl/src/video/x11/edid-parse.c index 2c145e23c..57f225b85 100644 --- a/Engine/lib/sdl/src/video/x11/edid-parse.c +++ b/Engine/lib/sdl/src/video/x11/edid-parse.c @@ -21,6 +21,8 @@ */ /* Author: Soren Sandmann */ +#include "../../SDL_internal.h" +#include "SDL_stdinc.h" #include "edid.h" #include @@ -247,7 +249,7 @@ decode_fraction (int high, int low) high = (high << 2) | low; for (i = 0; i < 10; ++i) - result += get_bit (high, i) * pow (2, i - 10); + result += get_bit (high, i) * SDL_pow (2, i - 10); return result; } diff --git a/Engine/lib/sdl/src/video/x11/imKStoUCS.c b/Engine/lib/sdl/src/video/x11/imKStoUCS.c index e4f086464..40e224243 100644 --- a/Engine/lib/sdl/src/video/x11/imKStoUCS.c +++ b/Engine/lib/sdl/src/video/x11/imKStoUCS.c @@ -1,297 +1,296 @@ -/* Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. +/* +Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett +Copyright © 2009 Red Hat, Inc. +Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates. +All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from the XFree86 -Project. +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. */ + #include "../../SDL_internal.h" #if SDL_VIDEO_DRIVER_X11 - -/* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.4 2003/04/29 11:29:18 pascal Exp $ */ - #include #include "imKStoUCS.h" static unsigned short const keysym_to_unicode_1a1_1ff[] = { - 0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, /* 0x01a0-0x01a7 */ - 0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, /* 0x01a8-0x01af */ - 0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, /* 0x01b0-0x01b7 */ - 0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* 0x01b8-0x01bf */ - 0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000, /* 0x01c0-0x01c7 */ - 0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e, /* 0x01c8-0x01cf */ - 0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000, /* 0x01d0-0x01d7 */ - 0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000, /* 0x01d8-0x01df */ - 0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, /* 0x01e0-0x01e7 */ - 0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, /* 0x01e8-0x01ef */ - 0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, /* 0x01f0-0x01f7 */ - 0x0159, 0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9 /* 0x01f8-0x01ff */ + 0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, /* 0x01a0-0x01a7 */ + 0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, /* 0x01a8-0x01af */ + 0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, /* 0x01b0-0x01b7 */ + 0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* 0x01b8-0x01bf */ + 0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000, /* 0x01c0-0x01c7 */ + 0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e, /* 0x01c8-0x01cf */ + 0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000, /* 0x01d0-0x01d7 */ + 0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000, /* 0x01d8-0x01df */ + 0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, /* 0x01e0-0x01e7 */ + 0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, /* 0x01e8-0x01ef */ + 0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, /* 0x01f0-0x01f7 */ + 0x0159, 0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9 /* 0x01f8-0x01ff */ }; static unsigned short const keysym_to_unicode_2a1_2fe[] = { - 0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, /* 0x02a0-0x02a7 */ - 0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, /* 0x02a8-0x02af */ - 0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, /* 0x02b0-0x02b7 */ - 0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000, /* 0x02b8-0x02bf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000, /* 0x02c0-0x02c7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02c8-0x02cf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000, /* 0x02d0-0x02d7 */ - 0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000, /* 0x02d8-0x02df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, /* 0x02e0-0x02e7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02e8-0x02ef */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, /* 0x02f0-0x02f7 */ - 0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d /* 0x02f8-0x02ff */ + 0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, /* 0x02a0-0x02a7 */ + 0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, /* 0x02a8-0x02af */ + 0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, /* 0x02b0-0x02b7 */ + 0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000, /* 0x02b8-0x02bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000, /* 0x02c0-0x02c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02c8-0x02cf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000, /* 0x02d0-0x02d7 */ + 0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000, /* 0x02d8-0x02df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, /* 0x02e0-0x02e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02e8-0x02ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, /* 0x02f0-0x02f7 */ + 0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d /* 0x02f8-0x02ff */ }; static unsigned short const keysym_to_unicode_3a2_3fe[] = { - 0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, /* 0x03a0-0x03a7 */ - 0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, /* 0x03a8-0x03af */ - 0x0000, 0x0000, 0x0000, 0x0157, 0x0000, 0x0129, 0x013c, 0x0000, /* 0x03b0-0x03b7 */ - 0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b, /* 0x03b8-0x03bf */ - 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e, /* 0x03c0-0x03c7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a, /* 0x03c8-0x03cf */ - 0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03d0-0x03d7 */ - 0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000, /* 0x03d8-0x03df */ - 0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, /* 0x03e0-0x03e7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, /* 0x03e8-0x03ef */ - 0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03f0-0x03f7 */ - 0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b /* 0x03f8-0x03ff */ + 0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, /* 0x03a0-0x03a7 */ + 0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, /* 0x03a8-0x03af */ + 0x0000, 0x0000, 0x0000, 0x0157, 0x0000, 0x0129, 0x013c, 0x0000, /* 0x03b0-0x03b7 */ + 0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b, /* 0x03b8-0x03bf */ + 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e, /* 0x03c0-0x03c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a, /* 0x03c8-0x03cf */ + 0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03d0-0x03d7 */ + 0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000, /* 0x03d8-0x03df */ + 0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, /* 0x03e0-0x03e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, /* 0x03e8-0x03ef */ + 0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03f0-0x03f7 */ + 0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b /* 0x03f8-0x03ff */ }; static unsigned short const keysym_to_unicode_4a1_4df[] = { - 0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1, /* 0x04a0-0x04a7 */ - 0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, /* 0x04a8-0x04af */ - 0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, /* 0x04b0-0x04b7 */ - 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, /* 0x04b8-0x04bf */ - 0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, /* 0x04c0-0x04c7 */ - 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, /* 0x04c8-0x04cf */ - 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, /* 0x04d0-0x04d7 */ - 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c /* 0x04d8-0x04df */ + 0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1, /* 0x04a0-0x04a7 */ + 0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, /* 0x04a8-0x04af */ + 0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, /* 0x04b0-0x04b7 */ + 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, /* 0x04b8-0x04bf */ + 0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, /* 0x04c0-0x04c7 */ + 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, /* 0x04c8-0x04cf */ + 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, /* 0x04d0-0x04d7 */ + 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c /* 0x04d8-0x04df */ }; static unsigned short const keysym_to_unicode_590_5fe[] = { - 0x06f0, 0x06f1, 0x06f2, 0x06f3, 0x06f4, 0x06f5, 0x06f6, 0x06f7, /* 0x0590-0x0597 */ - 0x06f8, 0x06f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0598-0x059f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x066a, 0x0670, 0x0679, /* 0x05a0-0x05a7 */ + 0x06f0, 0x06f1, 0x06f2, 0x06f3, 0x06f4, 0x06f5, 0x06f6, 0x06f7, /* 0x0590-0x0597 */ + 0x06f8, 0x06f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0598-0x059f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x066a, 0x0670, 0x0679, /* 0x05a0-0x05a7 */ - 0x067e, 0x0686, 0x0688, 0x0691, 0x060c, 0x0000, 0x06d4, 0x0000, /* 0x05ac-0x05af */ - 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, /* 0x05b0-0x05b7 */ - 0x0668, 0x0669, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, /* 0x05b8-0x05bf */ - 0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, /* 0x05c0-0x05c7 */ - 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, /* 0x05c8-0x05cf */ - 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, /* 0x05d0-0x05d7 */ - 0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05d8-0x05df */ - 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, /* 0x05e0-0x05e7 */ - 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, /* 0x05e8-0x05ef */ - 0x0650, 0x0651, 0x0652, 0x0653, 0x0654, 0x0655, 0x0698, 0x06a4, /* 0x05f0-0x05f7 */ - 0x06a9, 0x06af, 0x06ba, 0x06be, 0x06cc, 0x06d2, 0x06c1 /* 0x05f8-0x05fe */ + 0x067e, 0x0686, 0x0688, 0x0691, 0x060c, 0x0000, 0x06d4, 0x0000, /* 0x05ac-0x05af */ + 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, /* 0x05b0-0x05b7 */ + 0x0668, 0x0669, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, /* 0x05b8-0x05bf */ + 0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, /* 0x05c0-0x05c7 */ + 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, /* 0x05c8-0x05cf */ + 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, /* 0x05d0-0x05d7 */ + 0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05d8-0x05df */ + 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, /* 0x05e0-0x05e7 */ + 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, /* 0x05e8-0x05ef */ + 0x0650, 0x0651, 0x0652, 0x0653, 0x0654, 0x0655, 0x0698, 0x06a4, /* 0x05f0-0x05f7 */ + 0x06a9, 0x06af, 0x06ba, 0x06be, 0x06cc, 0x06d2, 0x06c1 /* 0x05f8-0x05fe */ }; -static unsigned short const keysym_to_unicode_680_6ff[] = { - 0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2, /* 0x0680-0x0687 */ - 0x04b6, 0x04b8, 0x04ba, 0x0000, 0x04d8, 0x04e2, 0x04e8, 0x04ee, /* 0x0688-0x068f */ - 0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3, /* 0x0690-0x0697 */ - 0x04b7, 0x04b9, 0x04bb, 0x0000, 0x04d9, 0x04e3, 0x04e9, 0x04ef, /* 0x0698-0x069f */ - 0x0000, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x06a0-0x06a7 */ - 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f, /* 0x06a8-0x06af */ - 0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x06b0-0x06b7 */ - 0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f, /* 0x06b8-0x06bf */ - 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0x06c0-0x06c7 */ - 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 0x06c8-0x06cf */ - 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0x06d0-0x06d7 */ - 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 0x06d8-0x06df */ - 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0x06e0-0x06e7 */ - 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 0x06e8-0x06ef */ - 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0x06f0-0x06f7 */ - 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a /* 0x06f8-0x06ff */ +static unsigned short keysym_to_unicode_680_6ff[] = { + 0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2, /* 0x0680-0x0687 */ + 0x04b6, 0x04b8, 0x04ba, 0x0000, 0x04d8, 0x04e2, 0x04e8, 0x04ee, /* 0x0688-0x068f */ + 0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3, /* 0x0690-0x0697 */ + 0x04b7, 0x04b9, 0x04bb, 0x0000, 0x04d9, 0x04e3, 0x04e9, 0x04ef, /* 0x0698-0x069f */ + 0x0000, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x06a0-0x06a7 */ + 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f, /* 0x06a8-0x06af */ + 0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x06b0-0x06b7 */ + 0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f, /* 0x06b8-0x06bf */ + 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0x06c0-0x06c7 */ + 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 0x06c8-0x06cf */ + 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0x06d0-0x06d7 */ + 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 0x06d8-0x06df */ + 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0x06e0-0x06e7 */ + 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 0x06e8-0x06ef */ + 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0x06f0-0x06f7 */ + 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a /* 0x06f8-0x06ff */ }; static unsigned short const keysym_to_unicode_7a1_7f9[] = { - 0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, /* 0x07a0-0x07a7 */ - 0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, /* 0x07a8-0x07af */ - 0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, /* 0x07b0-0x07b7 */ - 0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07b8-0x07bf */ - 0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x07c0-0x07c7 */ - 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, /* 0x07c8-0x07cf */ - 0x03a0, 0x03a1, 0x03a3, 0x0000, 0x03a4, 0x03a5, 0x03a6, 0x03a7, /* 0x07d0-0x07d7 */ - 0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07d8-0x07df */ - 0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, /* 0x07e0-0x07e7 */ - 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, /* 0x07e8-0x07ef */ - 0x03c0, 0x03c1, 0x03c3, 0x03c2, 0x03c4, 0x03c5, 0x03c6, 0x03c7, /* 0x07f0-0x07f7 */ - 0x03c8, 0x03c9 /* 0x07f8-0x07ff */ + 0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, /* 0x07a0-0x07a7 */ + 0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, /* 0x07a8-0x07af */ + 0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, /* 0x07b0-0x07b7 */ + 0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07b8-0x07bf */ + 0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x07c0-0x07c7 */ + 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, /* 0x07c8-0x07cf */ + 0x03a0, 0x03a1, 0x03a3, 0x0000, 0x03a4, 0x03a5, 0x03a6, 0x03a7, /* 0x07d0-0x07d7 */ + 0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07d8-0x07df */ + 0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, /* 0x07e0-0x07e7 */ + 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, /* 0x07e8-0x07ef */ + 0x03c0, 0x03c1, 0x03c3, 0x03c2, 0x03c4, 0x03c5, 0x03c6, 0x03c7, /* 0x07f0-0x07f7 */ + 0x03c8, 0x03c9 /* 0x07f8-0x07ff */ }; static unsigned short const keysym_to_unicode_8a4_8fe[] = { - 0x2320, 0x2321, 0x0000, 0x231c, /* 0x08a0-0x08a7 */ - 0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08a8-0x08af */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08b0-0x08b7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b, /* 0x08b8-0x08bf */ - 0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000, /* 0x08c0-0x08c7 */ - 0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x22a2, 0x0000, /* 0x08c8-0x08cf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, /* 0x08d0-0x08d7 */ - 0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228, /* 0x08d8-0x08df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e0-0x08e7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e8-0x08ef */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, /* 0x08f0-0x08f7 */ - 0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193 /* 0x08f8-0x08ff */ + 0x2320, 0x2321, 0x0000, 0x231c, /* 0x08a0-0x08a7 */ + 0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08a8-0x08af */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08b0-0x08b7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b, /* 0x08b8-0x08bf */ + 0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000, /* 0x08c0-0x08c7 */ + 0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x21d2, 0x0000, /* 0x08c8-0x08cf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, /* 0x08d0-0x08d7 */ + 0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228, /* 0x08d8-0x08df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e0-0x08e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2202, /* 0x08e8-0x08ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, /* 0x08f0-0x08f7 */ + 0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193 /* 0x08f8-0x08ff */ }; static unsigned short const keysym_to_unicode_9df_9f8[] = { - 0x2422, /* 0x09d8-0x09df */ - 0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000, /* 0x09e0-0x09e7 */ - 0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500, /* 0x09e8-0x09ef */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c, /* 0x09f0-0x09f7 */ - 0x2502 /* 0x09f8-0x09ff */ + 0x2422, /* 0x09d8-0x09df */ + 0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000, /* 0x09e0-0x09e7 */ + 0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500, /* 0x09e8-0x09ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c, /* 0x09f0-0x09f7 */ + 0x2502 /* 0x09f8-0x09ff */ }; static unsigned short const keysym_to_unicode_aa1_afe[] = { - 0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, /* 0x0aa0-0x0aa7 */ - 0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, /* 0x0aa8-0x0aaf */ - 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, /* 0x0ab0-0x0ab7 */ - 0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000, /* 0x0ab8-0x0abf */ - 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000, /* 0x0ac0-0x0ac7 */ - 0x0000, 0x2122, 0x2120, 0x0000, 0x25c1, 0x25b7, 0x25cb, 0x25ad, /* 0x0ac8-0x0acf */ - 0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x0000, 0x2032, 0x2033, /* 0x0ad0-0x0ad7 */ - 0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac, /* 0x0ad8-0x0adf */ - 0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa, /* 0x0ae0-0x0ae7 */ - 0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000, /* 0x0ae8-0x0aef */ - 0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642, /* 0x0af0-0x0af7 */ - 0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e /* 0x0af8-0x0aff */ + 0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, /* 0x0aa0-0x0aa7 */ + 0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, /* 0x0aa8-0x0aaf */ + 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, /* 0x0ab0-0x0ab7 */ + 0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000, /* 0x0ab8-0x0abf */ + 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000, /* 0x0ac0-0x0ac7 */ + 0x0000, 0x2122, 0x2120, 0x0000, 0x25c1, 0x25b7, 0x25cb, 0x25ad, /* 0x0ac8-0x0acf */ + 0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x2030, 0x2032, 0x2033, /* 0x0ad0-0x0ad7 */ + 0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac, /* 0x0ad8-0x0adf */ + 0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa, /* 0x0ae0-0x0ae7 */ + 0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000, /* 0x0ae8-0x0aef */ + 0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642, /* 0x0af0-0x0af7 */ + 0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e /* 0x0af8-0x0aff */ }; /* none of the APL keysyms match the Unicode characters */ static unsigned short const keysym_to_unicode_cdf_cfa[] = { - 0x2017, /* 0x0cd8-0x0cdf */ - 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, /* 0x0ce0-0x0ce7 */ - 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, /* 0x0ce8-0x0cef */ - 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, /* 0x0cf0-0x0cf7 */ - 0x05e8, 0x05e9, 0x05ea /* 0x0cf8-0x0cff */ + 0x2017, /* 0x0cd8-0x0cdf */ + 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, /* 0x0ce0-0x0ce7 */ + 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, /* 0x0ce8-0x0cef */ + 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, /* 0x0cf0-0x0cf7 */ + 0x05e8, 0x05e9, 0x05ea /* 0x0cf8-0x0cff */ }; static unsigned short const keysym_to_unicode_da1_df9[] = { - 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, /* 0x0da0-0x0da7 */ - 0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, /* 0x0da8-0x0daf */ - 0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, /* 0x0db0-0x0db7 */ - 0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, /* 0x0db8-0x0dbf */ - 0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, /* 0x0dc0-0x0dc7 */ - 0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, /* 0x0dc8-0x0dcf */ - 0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, /* 0x0dd0-0x0dd7 */ - 0x0e38, 0x0e39, 0x0e3a, 0x0000, 0x0000, 0x0000, 0x0e3e, 0x0e3f, /* 0x0dd8-0x0ddf */ - 0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, /* 0x0de0-0x0de7 */ - 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, /* 0x0de8-0x0def */ - 0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, /* 0x0df0-0x0df7 */ - 0x0e58, 0x0e59 /* 0x0df8-0x0dff */ + 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, /* 0x0da0-0x0da7 */ + 0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, /* 0x0da8-0x0daf */ + 0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, /* 0x0db0-0x0db7 */ + 0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, /* 0x0db8-0x0dbf */ + 0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, /* 0x0dc0-0x0dc7 */ + 0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, /* 0x0dc8-0x0dcf */ + 0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, /* 0x0dd0-0x0dd7 */ + 0x0e38, 0x0e39, 0x0e3a, 0x0000, 0x0000, 0x0000, 0x0e3e, 0x0e3f, /* 0x0dd8-0x0ddf */ + 0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, /* 0x0de0-0x0de7 */ + 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, /* 0x0de8-0x0def */ + 0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, /* 0x0df0-0x0df7 */ + 0x0e58, 0x0e59 /* 0x0df8-0x0dff */ }; static unsigned short const keysym_to_unicode_ea0_eff[] = { - 0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, /* 0x0ea0-0x0ea7 */ - 0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, /* 0x0ea8-0x0eaf */ - 0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b, /* 0x0eb0-0x0eb7 */ - 0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, /* 0x0eb8-0x0ebf */ - 0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, /* 0x0ec0-0x0ec7 */ - 0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, /* 0x0ec8-0x0ecf */ - 0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab, /* 0x0ed0-0x0ed7 */ - 0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, /* 0x0ed8-0x0edf */ - 0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, /* 0x0ee0-0x0ee7 */ - 0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000, /* 0x0ee8-0x0eef */ - 0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000, /* 0x0ef0-0x0ef7 */ - 0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9, /* 0x0ef8-0x0eff */ + 0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, /* 0x0ea0-0x0ea7 */ + 0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, /* 0x0ea8-0x0eaf */ + 0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b, /* 0x0eb0-0x0eb7 */ + 0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, /* 0x0eb8-0x0ebf */ + 0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, /* 0x0ec0-0x0ec7 */ + 0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, /* 0x0ec8-0x0ecf */ + 0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab, /* 0x0ed0-0x0ed7 */ + 0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, /* 0x0ed8-0x0edf */ + 0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, /* 0x0ee0-0x0ee7 */ + 0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000, /* 0x0ee8-0x0eef */ + 0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000, /* 0x0ef0-0x0ef7 */ + 0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9, /* 0x0ef8-0x0eff */ }; -static unsigned short const keysym_to_unicode_12a1_12fe[] = { - 0x1e02, 0x1e03, 0x0000, 0x0000, 0x0000, 0x1e0a, 0x0000, /* 0x12a0-0x12a7 */ - 0x1e80, 0x0000, 0x1e82, 0x1e0b, 0x1ef2, 0x0000, 0x0000, 0x0000, /* 0x12a8-0x12af */ - 0x1e1e, 0x1e1f, 0x0000, 0x0000, 0x1e40, 0x1e41, 0x0000, 0x1e56, /* 0x12b0-0x12b7 */ - 0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61, /* 0x12b8-0x12bf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c0-0x12c7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c8-0x12cf */ - 0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6a, /* 0x12d0-0x12d7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0176, 0x0000, /* 0x12d8-0x12df */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e0-0x12e7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e8-0x12ef */ - 0x0175, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6b, /* 0x12f0-0x12f7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177 /* 0x12f0-0x12ff */ +static unsigned short keysym_to_unicode_12a1_12fe[] = { + 0x1e02, 0x1e03, 0x0000, 0x0000, 0x0000, 0x1e0a, 0x0000, /* 0x12a0-0x12a7 */ + 0x1e80, 0x0000, 0x1e82, 0x1e0b, 0x1ef2, 0x0000, 0x0000, 0x0000, /* 0x12a8-0x12af */ + 0x1e1e, 0x1e1f, 0x0000, 0x0000, 0x1e40, 0x1e41, 0x0000, 0x1e56, /* 0x12b0-0x12b7 */ + 0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61, /* 0x12b8-0x12bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c0-0x12c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c8-0x12cf */ + 0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6a, /* 0x12d0-0x12d7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0176, 0x0000, /* 0x12d8-0x12df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e0-0x12e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e8-0x12ef */ + 0x0175, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6b, /* 0x12f0-0x12f7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177 /* 0x12f0-0x12ff */ }; static unsigned short const keysym_to_unicode_13bc_13be[] = { - 0x0152, 0x0153, 0x0178 /* 0x13b8-0x13bf */ + 0x0152, 0x0153, 0x0178 /* 0x13b8-0x13bf */ }; -static unsigned short const keysym_to_unicode_14a1_14ff[] = { - 0x2741, 0x00a7, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab, /* 0x14a0-0x14a7 */ - 0x2014, 0x002e, 0x055d, 0x002c, 0x2013, 0x058a, 0x2026, 0x055c, /* 0x14a8-0x14af */ - 0x055b, 0x055e, 0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563, /* 0x14b0-0x14b7 */ - 0x0534, 0x0564, 0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567, /* 0x14b8-0x14bf */ - 0x0538, 0x0568, 0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b, /* 0x14c0-0x14c7 */ - 0x053c, 0x056c, 0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f, /* 0x14c8-0x14cf */ - 0x0540, 0x0570, 0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573, /* 0x14d0-0x14d7 */ - 0x0544, 0x0574, 0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577, /* 0x14d8-0x14df */ - 0x0548, 0x0578, 0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b, /* 0x14e0-0x14e7 */ - 0x054c, 0x057c, 0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f, /* 0x14e8-0x14ef */ - 0x0550, 0x0580, 0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583, /* 0x14f0-0x14f7 */ - 0x0554, 0x0584, 0x0555, 0x0585, 0x0556, 0x0586, 0x2019, 0x0027, /* 0x14f8-0x14ff */ +static unsigned short keysym_to_unicode_14a1_14ff[] = { + 0x2741, 0x00a7, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab, /* 0x14a0-0x14a7 */ + 0x2014, 0x002e, 0x055d, 0x002c, 0x2013, 0x058a, 0x2026, 0x055c, /* 0x14a8-0x14af */ + 0x055b, 0x055e, 0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563, /* 0x14b0-0x14b7 */ + 0x0534, 0x0564, 0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567, /* 0x14b8-0x14bf */ + 0x0538, 0x0568, 0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b, /* 0x14c0-0x14c7 */ + 0x053c, 0x056c, 0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f, /* 0x14c8-0x14cf */ + 0x0540, 0x0570, 0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573, /* 0x14d0-0x14d7 */ + 0x0544, 0x0574, 0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577, /* 0x14d8-0x14df */ + 0x0548, 0x0578, 0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b, /* 0x14e0-0x14e7 */ + 0x054c, 0x057c, 0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f, /* 0x14e8-0x14ef */ + 0x0550, 0x0580, 0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583, /* 0x14f0-0x14f7 */ + 0x0554, 0x0584, 0x0555, 0x0585, 0x0556, 0x0586, 0x2019, 0x0027, /* 0x14f8-0x14ff */ }; -static unsigned short const keysym_to_unicode_15d0_15f6[] = { - 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7, /* 0x15d0-0x15d7 */ - 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df, /* 0x15d8-0x15df */ - 0x10e0, 0x10e1, 0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, /* 0x15e0-0x15e7 */ - 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10ef, /* 0x15e8-0x15ef */ - 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6 /* 0x15f0-0x15f7 */ +static unsigned short keysym_to_unicode_15d0_15f6[] = { + 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7, /* 0x15d0-0x15d7 */ + 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df, /* 0x15d8-0x15df */ + 0x10e0, 0x10e1, 0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, /* 0x15e0-0x15e7 */ + 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10ef, /* 0x15e8-0x15ef */ + 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6 /* 0x15f0-0x15f7 */ }; -static unsigned short const keysym_to_unicode_16a0_16f6[] = { - 0x0000, 0x0000, 0xf0a2, 0x1e8a, 0x0000, 0xf0a5, 0x012c, 0xf0a7, /* 0x16a0-0x16a7 */ - 0xf0a8, 0x01b5, 0x01e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x019f, /* 0x16a8-0x16af */ - 0x0000, 0x0000, 0xf0b2, 0x1e8b, 0x01d1, 0xf0b5, 0x012d, 0xf0b7, /* 0x16b0-0x16b7 */ - 0xf0b8, 0x01b6, 0x01e7, 0x0000, 0x0000, 0x01d2, 0x0000, 0x0275, /* 0x16b8-0x16bf */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x018f, 0x0000, /* 0x16c0-0x16c7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16c8-0x16cf */ - 0x0000, 0x1e36, 0xf0d2, 0xf0d3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d0-0x16d7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d8-0x16df */ - 0x0000, 0x1e37, 0xf0e2, 0xf0e3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e0-0x16e7 */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e8-0x16ef */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0259 /* 0x16f0-0x16f6 */ +static unsigned short keysym_to_unicode_16a0_16f6[] = { + 0x0000, 0x0000, 0xf0a2, 0x1e8a, 0x0000, 0xf0a5, 0x012c, 0xf0a7, /* 0x16a0-0x16a7 */ + 0xf0a8, 0x01b5, 0x01e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x019f, /* 0x16a8-0x16af */ + 0x0000, 0x0000, 0xf0b2, 0x1e8b, 0x01d1, 0xf0b5, 0x012d, 0xf0b7, /* 0x16b0-0x16b7 */ + 0xf0b8, 0x01b6, 0x01e7, 0x0000, 0x0000, 0x01d2, 0x0000, 0x0275, /* 0x16b8-0x16bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x018f, 0x0000, /* 0x16c0-0x16c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16c8-0x16cf */ + 0x0000, 0x1e36, 0xf0d2, 0xf0d3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d0-0x16d7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d8-0x16df */ + 0x0000, 0x1e37, 0xf0e2, 0xf0e3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e0-0x16e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e8-0x16ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0259 /* 0x16f0-0x16f6 */ }; static unsigned short const keysym_to_unicode_1e9f_1eff[] = { - 0x0303, - 0x1ea0, 0x1ea1, 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, /* 0x1ea0-0x1ea7 */ - 0x1ea8, 0x1ea9, 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf, /* 0x1ea8-0x1eaf */ - 0x1eb0, 0x1eb1, 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, /* 0x1eb0-0x1eb7 */ - 0x1eb8, 0x1eb9, 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, /* 0x1eb8-0x1ebf */ - 0x1ec0, 0x1ec1, 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, /* 0x1ec0-0x1ec7 */ - 0x1ec8, 0x1ec9, 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, /* 0x1ec8-0x1ecf */ - 0x1ed0, 0x1ed1, 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, /* 0x1ed0-0x1ed7 */ - 0x1ed8, 0x1ed9, 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf, /* 0x1ed8-0x1edf */ - 0x1ee0, 0x1ee1, 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, /* 0x1ee0-0x1ee7 */ - 0x1ee8, 0x1ee9, 0x1eea, 0x1eeb, 0x1eec, 0x1eed, 0x1eee, 0x1eef, /* 0x1ee8-0x1eef */ - 0x1ef0, 0x1ef1, 0x0300, 0x0301, 0x1ef4, 0x1ef5, 0x1ef6, 0x1ef7, /* 0x1ef0-0x1ef7 */ - 0x1ef8, 0x1ef9, 0x01a0, 0x01a1, 0x01af, 0x01b0, 0x0309, 0x0323 /* 0x1ef8-0x1eff */ + 0x0303, + 0x1ea0, 0x1ea1, 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, /* 0x1ea0-0x1ea7 */ + 0x1ea8, 0x1ea9, 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf, /* 0x1ea8-0x1eaf */ + 0x1eb0, 0x1eb1, 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, /* 0x1eb0-0x1eb7 */ + 0x1eb8, 0x1eb9, 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, /* 0x1eb8-0x1ebf */ + 0x1ec0, 0x1ec1, 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, /* 0x1ec0-0x1ec7 */ + 0x1ec8, 0x1ec9, 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, /* 0x1ec8-0x1ecf */ + 0x1ed0, 0x1ed1, 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, /* 0x1ed0-0x1ed7 */ + 0x1ed8, 0x1ed9, 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf, /* 0x1ed8-0x1edf */ + 0x1ee0, 0x1ee1, 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, /* 0x1ee0-0x1ee7 */ + 0x1ee8, 0x1ee9, 0x1eea, 0x1eeb, 0x1eec, 0x1eed, 0x1eee, 0x1eef, /* 0x1ee8-0x1eef */ + 0x1ef0, 0x1ef1, 0x0300, 0x0301, 0x1ef4, 0x1ef5, 0x1ef6, 0x1ef7, /* 0x1ef0-0x1ef7 */ + 0x1ef8, 0x1ef9, 0x01a0, 0x01a1, 0x01af, 0x01b0, 0x0309, 0x0323 /* 0x1ef8-0x1eff */ }; static unsigned short const keysym_to_unicode_20a0_20ac[] = { - 0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, /* 0x20a0-0x20a7 */ - 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac /* 0x20a8-0x20af */ + 0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, /* 0x20a0-0x20a7 */ + 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac /* 0x20a8-0x20af */ }; unsigned int @@ -302,49 +301,50 @@ X11_KeySymToUcs4(KeySym keysym) return (keysym & 0x00ffffff); if (keysym > 0 && keysym < 0x100) - return keysym; + return keysym; else if (keysym > 0x1a0 && keysym < 0x200) - return keysym_to_unicode_1a1_1ff[keysym - 0x1a1]; + return keysym_to_unicode_1a1_1ff[keysym - 0x1a1]; else if (keysym > 0x2a0 && keysym < 0x2ff) - return keysym_to_unicode_2a1_2fe[keysym - 0x2a1]; + return keysym_to_unicode_2a1_2fe[keysym - 0x2a1]; else if (keysym > 0x3a1 && keysym < 0x3ff) - return keysym_to_unicode_3a2_3fe[keysym - 0x3a2]; + return keysym_to_unicode_3a2_3fe[keysym - 0x3a2]; else if (keysym > 0x4a0 && keysym < 0x4e0) - return keysym_to_unicode_4a1_4df[keysym - 0x4a1]; + return keysym_to_unicode_4a1_4df[keysym - 0x4a1]; else if (keysym > 0x589 && keysym < 0x5ff) - return keysym_to_unicode_590_5fe[keysym - 0x590]; + return keysym_to_unicode_590_5fe[keysym - 0x590]; else if (keysym > 0x67f && keysym < 0x700) - return keysym_to_unicode_680_6ff[keysym - 0x680]; + return keysym_to_unicode_680_6ff[keysym - 0x680]; else if (keysym > 0x7a0 && keysym < 0x7fa) - return keysym_to_unicode_7a1_7f9[keysym - 0x7a1]; + return keysym_to_unicode_7a1_7f9[keysym - 0x7a1]; else if (keysym > 0x8a3 && keysym < 0x8ff) - return keysym_to_unicode_8a4_8fe[keysym - 0x8a4]; + return keysym_to_unicode_8a4_8fe[keysym - 0x8a4]; else if (keysym > 0x9de && keysym < 0x9f9) - return keysym_to_unicode_9df_9f8[keysym - 0x9df]; + return keysym_to_unicode_9df_9f8[keysym - 0x9df]; else if (keysym > 0xaa0 && keysym < 0xaff) - return keysym_to_unicode_aa1_afe[keysym - 0xaa1]; + return keysym_to_unicode_aa1_afe[keysym - 0xaa1]; else if (keysym > 0xcde && keysym < 0xcfb) - return keysym_to_unicode_cdf_cfa[keysym - 0xcdf]; + return keysym_to_unicode_cdf_cfa[keysym - 0xcdf]; else if (keysym > 0xda0 && keysym < 0xdfa) - return keysym_to_unicode_da1_df9[keysym - 0xda1]; + return keysym_to_unicode_da1_df9[keysym - 0xda1]; else if (keysym > 0xe9f && keysym < 0xf00) - return keysym_to_unicode_ea0_eff[keysym - 0xea0]; + return keysym_to_unicode_ea0_eff[keysym - 0xea0]; else if (keysym > 0x12a0 && keysym < 0x12ff) - return keysym_to_unicode_12a1_12fe[keysym - 0x12a1]; + return keysym_to_unicode_12a1_12fe[keysym - 0x12a1]; else if (keysym > 0x13bb && keysym < 0x13bf) - return keysym_to_unicode_13bc_13be[keysym - 0x13bc]; + return keysym_to_unicode_13bc_13be[keysym - 0x13bc]; else if (keysym > 0x14a0 && keysym < 0x1500) return keysym_to_unicode_14a1_14ff[keysym - 0x14a1]; else if (keysym > 0x15cf && keysym < 0x15f7) - return keysym_to_unicode_15d0_15f6[keysym - 0x15d0]; + return keysym_to_unicode_15d0_15f6[keysym - 0x15d0]; else if (keysym > 0x169f && keysym < 0x16f7) - return keysym_to_unicode_16a0_16f6[keysym - 0x16a0]; + return keysym_to_unicode_16a0_16f6[keysym - 0x16a0]; else if (keysym > 0x1e9e && keysym < 0x1f00) - return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f]; + return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f]; else if (keysym > 0x209f && keysym < 0x20ad) - return keysym_to_unicode_20a0_20ac[keysym - 0x20a0]; + return keysym_to_unicode_20a0_20ac[keysym - 0x20a0]; else - return 0; + return 0; } #endif /* SDL_VIDEO_DRIVER_X11 */ + diff --git a/Engine/lib/sdl/src/video/x11/imKStoUCS.h b/Engine/lib/sdl/src/video/x11/imKStoUCS.h index cc684c2e3..fe4381d98 100644 --- a/Engine/lib/sdl/src/video/x11/imKStoUCS.h +++ b/Engine/lib/sdl/src/video/x11/imKStoUCS.h @@ -1,29 +1,30 @@ #ifndef _imKStoUCS_h #define _imKStoUCS_h -/* Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. +/* +Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett +Copyright © 2009 Red Hat, Inc. +Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates. +All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from the XFree86 -Project. +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. */ extern unsigned int X11_KeySymToUcs4(KeySym keysym); diff --git a/Engine/lib/sdl/test/Makefile.in b/Engine/lib/sdl/test/Makefile.in index 9a1df774e..68f0d3dab 100644 --- a/Engine/lib/sdl/test/Makefile.in +++ b/Engine/lib/sdl/test/Makefile.in @@ -13,7 +13,10 @@ TARGETS = \ loopwavequeue$(EXE) \ testatomic$(EXE) \ testaudioinfo$(EXE) \ + testaudiocapture$(EXE) \ testautomation$(EXE) \ + testbounds$(EXE) \ + testcustomcursor$(EXE) \ testdraw2$(EXE) \ testdrawchessboard$(EXE) \ testdropfile$(EXE) \ @@ -61,6 +64,7 @@ TARGETS = \ testrendercopyex$(EXE) \ testmessage$(EXE) \ testdisplayinfo$(EXE) \ + testqsort$(EXE) \ controllermap$(EXE) \ all: Makefile $(TARGETS) @@ -110,6 +114,9 @@ testmultiaudio$(EXE): $(srcdir)/testmultiaudio.c testaudiohotplug$(EXE): $(srcdir)/testaudiohotplug.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +testaudiocapture$(EXE): $(srcdir)/testaudiocapture.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + testatomic$(EXE): $(srcdir)/testatomic.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) @@ -270,6 +277,15 @@ testmessage$(EXE): $(srcdir)/testmessage.c testdisplayinfo$(EXE): $(srcdir)/testdisplayinfo.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) +testqsort$(EXE): $(srcdir)/testqsort.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + +testbounds$(EXE): $(srcdir)/testbounds.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + +testcustomcursor$(EXE): $(srcdir)/testcustomcursor.c + $(CC) -o $@ $^ $(CFLAGS) $(LIBS) + controllermap$(EXE): $(srcdir)/controllermap.c $(CC) -o $@ $^ $(CFLAGS) $(LIBS) diff --git a/Engine/lib/sdl/test/autogen.sh b/Engine/lib/sdl/test/autogen.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/test/configure b/Engine/lib/sdl/test/configure old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/test/controllermap.c b/Engine/lib/sdl/test/controllermap.c index 3fb30d68a..d626f9f89 100644 --- a/Engine/lib/sdl/test/controllermap.c +++ b/Engine/lib/sdl/test/controllermap.c @@ -26,12 +26,9 @@ #define SCREEN_HEIGHT 480 #else #define SCREEN_WIDTH 512 -#define SCREEN_HEIGHT 317 +#define SCREEN_HEIGHT 320 #endif -#define MAP_WIDTH 512 -#define MAP_HEIGHT 317 - #define MARKER_BUTTON 1 #define MARKER_AXIS 2 @@ -47,7 +44,7 @@ typedef struct MappingStep SDL_Texture * -LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent) +LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) { SDL_Surface *temp; SDL_Texture *texture; @@ -226,7 +223,7 @@ WatchJoystick(SDL_Joystick * joystick) SDL_RenderCopy(screen, background, NULL, NULL); SDL_SetTextureAlphaMod(marker, alpha); SDL_SetTextureColorMod(marker, 10, 255, 21); - SDL_RenderCopyEx(screen, marker, NULL, &dst, step->angle, NULL, 0); + SDL_RenderCopyEx(screen, marker, NULL, &dst, step->angle, NULL, SDL_FLIP_NONE); SDL_RenderPresent(screen); if (SDL_PollEvent(&event)) { diff --git a/Engine/lib/sdl/test/gcc-fat.sh b/Engine/lib/sdl/test/gcc-fat.sh old mode 100644 new mode 100755 diff --git a/Engine/lib/sdl/test/testatomic.c b/Engine/lib/sdl/test/testatomic.c index 41cc9ab1b..d371ef31f 100644 --- a/Engine/lib/sdl/test/testatomic.c +++ b/Engine/lib/sdl/test/testatomic.c @@ -284,7 +284,7 @@ typedef struct char cache_pad4[SDL_CACHELINE_SIZE-sizeof(SDL_SpinLock)-2*sizeof(SDL_atomic_t)]; #endif - volatile SDL_bool active; + SDL_atomic_t active; /* Only needed for the mutex test */ SDL_mutex *mutex; @@ -305,7 +305,7 @@ static void InitEventQueue(SDL_EventQueue *queue) SDL_AtomicSet(&queue->rwcount, 0); SDL_AtomicSet(&queue->watcher, 0); #endif - queue->active = SDL_TRUE; + SDL_AtomicSet(&queue->active, 1); } static SDL_bool EnqueueEvent_LockFree(SDL_EventQueue *queue, const SDL_Event *event) @@ -538,7 +538,7 @@ static int FIFO_Reader(void* _data) if (DequeueEvent_LockFree(queue, &event)) { WriterData *writer = (WriterData*)event.user.data1; ++data->counters[writer->index]; - } else if (queue->active) { + } else if (SDL_AtomicGet(&queue->active)) { ++data->waits; SDL_Delay(0); } else { @@ -551,7 +551,7 @@ static int FIFO_Reader(void* _data) if (DequeueEvent_Mutex(queue, &event)) { WriterData *writer = (WriterData*)event.user.data1; ++data->counters[writer->index]; - } else if (queue->active) { + } else if (SDL_AtomicGet(&queue->active)) { ++data->waits; SDL_Delay(0); } else { @@ -571,7 +571,7 @@ static int FIFO_Watcher(void* _data) { SDL_EventQueue *queue = (SDL_EventQueue *)_data; - while (queue->active) { + while (SDL_AtomicGet(&queue->active)) { SDL_AtomicLock(&queue->lock); SDL_AtomicIncRef(&queue->watcher); while (SDL_AtomicGet(&queue->rwcount) > 0) { @@ -652,7 +652,7 @@ static void RunFIFOTest(SDL_bool lock_free) } /* Shut down the queue so readers exit */ - queue.active = SDL_FALSE; + SDL_AtomicSet(&queue.active, 0); /* Wait for the readers */ while (SDL_AtomicGet(&readersRunning) > 0) { diff --git a/Engine/lib/sdl/test/testaudiocapture.c b/Engine/lib/sdl/test/testaudiocapture.c new file mode 100644 index 000000000..26321a71c --- /dev/null +++ b/Engine/lib/sdl/test/testaudiocapture.c @@ -0,0 +1,165 @@ +/* + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ +#include "SDL.h" + +#include + +#ifdef __EMSCRIPTEN__ +#include +#endif + +static SDL_Window *window = NULL; +static SDL_Renderer *renderer = NULL; +static SDL_AudioSpec spec; +static SDL_AudioDeviceID devid_in = 0; +static SDL_AudioDeviceID devid_out = 0; + +static void +loop() +{ + SDL_bool please_quit = SDL_FALSE; + SDL_Event e; + + while (SDL_PollEvent(&e)) { + if (e.type == SDL_QUIT) { + please_quit = SDL_TRUE; + } else if (e.type == SDL_KEYDOWN) { + if (e.key.keysym.sym == SDLK_ESCAPE) { + please_quit = SDL_TRUE; + } + } else if (e.type == SDL_MOUSEBUTTONDOWN) { + if (e.button.button == 1) { + SDL_PauseAudioDevice(devid_out, SDL_TRUE); + SDL_PauseAudioDevice(devid_in, SDL_FALSE); + } + } else if (e.type == SDL_MOUSEBUTTONUP) { + if (e.button.button == 1) { + SDL_PauseAudioDevice(devid_in, SDL_TRUE); + SDL_PauseAudioDevice(devid_out, SDL_FALSE); + } + } + } + + if (SDL_GetAudioDeviceStatus(devid_in) == SDL_AUDIO_PLAYING) { + SDL_SetRenderDrawColor(renderer, 0, 255, 0, 255); + } else { + SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255); + } + SDL_RenderClear(renderer); + SDL_RenderPresent(renderer); + + if (please_quit) { + /* stop playing back, quit. */ + SDL_Log("Shutting down.\n"); + SDL_PauseAudioDevice(devid_in, 1); + SDL_CloseAudioDevice(devid_in); + SDL_PauseAudioDevice(devid_out, 1); + SDL_CloseAudioDevice(devid_out); + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(window); + SDL_Quit(); + #ifdef __EMSCRIPTEN__ + emscripten_cancel_main_loop(); + #endif + exit(0); + } + + /* Note that it would be easier to just have a one-line function that + calls SDL_QueueAudio() as a capture device callback, but we're + trying to test the API, so we use SDL_DequeueAudio() here. */ + while (SDL_TRUE) { + Uint8 buf[1024]; + const Uint32 br = SDL_DequeueAudio(devid_in, buf, sizeof (buf)); + SDL_QueueAudio(devid_out, buf, br); + if (br < sizeof (buf)) { + break; + } + } +} + +int +main(int argc, char **argv) +{ + /* (argv[1] == NULL means "open default device.") */ + const char *devname = argv[1]; + SDL_AudioSpec wanted; + int devcount; + int i; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Load the SDL library */ + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s\n", SDL_GetError()); + return (1); + } + + window = SDL_CreateWindow("testaudiocapture", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 320, 240, 0); + renderer = SDL_CreateRenderer(window, -1, 0); + SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); + SDL_RenderClear(renderer); + SDL_RenderPresent(renderer); + + SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver()); + + devcount = SDL_GetNumAudioDevices(SDL_TRUE); + for (i = 0; i < devcount; i++) { + SDL_Log(" Capture device #%d: '%s'\n", i, SDL_GetAudioDeviceName(i, SDL_TRUE)); + } + + SDL_zero(wanted); + wanted.freq = 44100; + wanted.format = AUDIO_F32SYS; + wanted.channels = 1; + wanted.samples = 4096; + wanted.callback = NULL; + + SDL_zero(spec); + + /* DirectSound can fail in some instances if you open the same hardware + for both capture and output and didn't open the output end first, + according to the docs, so if you're doing something like this, always + open your capture devices second in case you land in those bizarre + circumstances. */ + + SDL_Log("Opening default playback device...\n"); + devid_out = SDL_OpenAudioDevice(NULL, SDL_FALSE, &wanted, &spec, SDL_AUDIO_ALLOW_ANY_CHANGE); + if (!devid_out) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open an audio device for playback: %s!\n", SDL_GetError()); + SDL_Quit(); + exit(1); + } + + SDL_Log("Opening capture device %s%s%s...\n", + devname ? "'" : "", + devname ? devname : "[[default]]", + devname ? "'" : ""); + + devid_in = SDL_OpenAudioDevice(argv[1], SDL_TRUE, &spec, &spec, 0); + if (!devid_in) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open an audio device for capture: %s!\n", SDL_GetError()); + SDL_Quit(); + exit(1); + } + + SDL_Log("Ready! Hold down mouse or finger to record!\n"); + +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(loop, 0, 1); +#else + while (1) { loop(); SDL_Delay(16); } +#endif + + return 0; +} + diff --git a/Engine/lib/sdl/test/testaudiohotplug.c b/Engine/lib/sdl/test/testaudiohotplug.c index e13868ec2..73d480505 100644 --- a/Engine/lib/sdl/test/testaudiohotplug.c +++ b/Engine/lib/sdl/test/testaudiohotplug.c @@ -74,6 +74,12 @@ poked(int sig) done = 1; } +static const char* +devtypestr(int iscapture) +{ + return iscapture ? "capture" : "output"; +} + static void iteration() { @@ -82,10 +88,21 @@ iteration() while (SDL_PollEvent(&e)) { if (e.type == SDL_QUIT) { done = 1; + } else if (e.type == SDL_KEYUP) { + if (e.key.keysym.sym == SDLK_ESCAPE) + done = 1; } else if (e.type == SDL_AUDIODEVICEADDED) { - const char *name = SDL_GetAudioDeviceName(e.adevice.which, 0); - SDL_Log("New %s audio device: %s\n", e.adevice.iscapture ? "capture" : "output", name); - if (!e.adevice.iscapture) { + int index = e.adevice.which; + int iscapture = e.adevice.iscapture; + const char *name = SDL_GetAudioDeviceName(index, iscapture); + if (name != NULL) + SDL_Log("New %s audio device at index %u: %s\n", devtypestr(iscapture), (unsigned int) index, name); + else { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Got new %s device at index %u, but failed to get the name: %s\n", + devtypestr(iscapture), (unsigned int) index, SDL_GetError()); + continue; + } + if (!iscapture) { positions[posindex] = 0; spec.userdata = &positions[posindex++]; spec.callback = fillerup; @@ -99,7 +116,7 @@ iteration() } } else if (e.type == SDL_AUDIODEVICEREMOVED) { dev = (SDL_AudioDeviceID) e.adevice.which; - SDL_Log("%s device %u removed.\n", e.adevice.iscapture ? "capture" : "output", (unsigned int) dev); + SDL_Log("%s device %u removed.\n", devtypestr(e.adevice.iscapture), (unsigned int) dev); SDL_CloseAudioDevice(dev); } } @@ -163,6 +180,7 @@ main(int argc, char *argv[]) SDL_Log("%i: %s", i, SDL_GetAudioDriver(i)); } + SDL_Log("Select a driver with the SDL_AUDIODRIVER environment variable.\n"); SDL_Log("Using audio driver: %s\n", SDL_GetCurrentAudioDriver()); #ifdef __EMSCRIPTEN__ @@ -175,6 +193,8 @@ main(int argc, char *argv[]) #endif /* Clean up on signal */ + /* Quit audio first, then free WAV. This prevents access violations in the audio threads. */ + SDL_QuitSubSystem(SDL_INIT_AUDIO); SDL_FreeWAV(sound); SDL_Quit(); return (0); diff --git a/Engine/lib/sdl/test/testaudioinfo.c b/Engine/lib/sdl/test/testaudioinfo.c index 53bf0f5e2..485fd0a38 100644 --- a/Engine/lib/sdl/test/testaudioinfo.c +++ b/Engine/lib/sdl/test/testaudioinfo.c @@ -18,7 +18,7 @@ print_devices(int iscapture) const char *typestr = ((iscapture) ? "capture" : "output"); int n = SDL_GetNumAudioDevices(iscapture); - SDL_Log("%s devices:\n", typestr); + SDL_Log("Found %d %s device%s:\n", n, typestr, n != 1 ? "s" : ""); if (n == -1) SDL_Log(" Driver can't detect specific %s devices.\n\n", typestr); @@ -27,7 +27,11 @@ print_devices(int iscapture) else { int i; for (i = 0; i < n; i++) { - SDL_Log(" %s\n", SDL_GetAudioDeviceName(i, iscapture)); + const char *name = SDL_GetAudioDeviceName(i, iscapture); + if (name != NULL) + SDL_Log(" %d: %s\n", i, name); + else + SDL_Log(" %d Error: %s\n", i, SDL_GetError()); } SDL_Log("\n"); } @@ -55,9 +59,9 @@ main(int argc, char **argv) int i; SDL_Log("Built-in audio drivers:\n"); for (i = 0; i < n; ++i) { - SDL_Log(" %s\n", SDL_GetAudioDriver(i)); + SDL_Log(" %d: %s\n", i, SDL_GetAudioDriver(i)); } - SDL_Log("\n"); + SDL_Log("Select a driver with the SDL_AUDIODRIVER environment variable.\n"); } SDL_Log("Using audio driver: %s\n\n", SDL_GetCurrentAudioDriver()); diff --git a/Engine/lib/sdl/test/testautomation_events.c b/Engine/lib/sdl/test/testautomation_events.c index f9eb5bb9e..a0119bdbe 100644 --- a/Engine/lib/sdl/test/testautomation_events.c +++ b/Engine/lib/sdl/test/testautomation_events.c @@ -87,7 +87,7 @@ events_addDelEventWatch(void *arg) /* Create user event */ event.type = SDL_USEREVENT; - event.user.code = SDLTest_RandomSint32();; + event.user.code = SDLTest_RandomSint32(); event.user.data1 = (void *)&_userdataValue1; event.user.data2 = (void *)&_userdataValue2; @@ -137,7 +137,7 @@ events_addDelEventWatchWithUserdata(void *arg) /* Create user event */ event.type = SDL_USEREVENT; - event.user.code = SDLTest_RandomSint32();; + event.user.code = SDLTest_RandomSint32(); event.user.data1 = (void *)&_userdataValue1; event.user.data2 = (void *)&_userdataValue2; diff --git a/Engine/lib/sdl/test/testautomation_keyboard.c b/Engine/lib/sdl/test/testautomation_keyboard.c index 453832e25..b2c3b9ae1 100644 --- a/Engine/lib/sdl/test/testautomation_keyboard.c +++ b/Engine/lib/sdl/test/testautomation_keyboard.c @@ -401,8 +401,8 @@ keyboard_setTextInputRect(void *arg) SDL_Rect refRect; /* Normal visible refRect, origin inside */ - refRect.x = SDLTest_RandomIntegerInRange(1, 50);; - refRect.y = SDLTest_RandomIntegerInRange(1, 50);; + refRect.x = SDLTest_RandomIntegerInRange(1, 50); + refRect.y = SDLTest_RandomIntegerInRange(1, 50); refRect.w = SDLTest_RandomIntegerInRange(10, 50); refRect.h = SDLTest_RandomIntegerInRange(10, 50); _testSetTextInputRect(refRect); @@ -415,8 +415,8 @@ keyboard_setTextInputRect(void *arg) _testSetTextInputRect(refRect); /* 1Pixel refRect */ - refRect.x = SDLTest_RandomIntegerInRange(10, 50);; - refRect.y = SDLTest_RandomIntegerInRange(10, 50);; + refRect.x = SDLTest_RandomIntegerInRange(10, 50); + refRect.y = SDLTest_RandomIntegerInRange(10, 50); refRect.w = 1; refRect.h = 1; _testSetTextInputRect(refRect); @@ -450,15 +450,15 @@ keyboard_setTextInputRect(void *arg) _testSetTextInputRect(refRect); /* negative refRect */ - refRect.x = SDLTest_RandomIntegerInRange(-200, -100);; - refRect.y = SDLTest_RandomIntegerInRange(-200, -100);; + refRect.x = SDLTest_RandomIntegerInRange(-200, -100); + refRect.y = SDLTest_RandomIntegerInRange(-200, -100); refRect.w = 50; refRect.h = 50; _testSetTextInputRect(refRect); /* oversized refRect */ - refRect.x = SDLTest_RandomIntegerInRange(1, 50);; - refRect.y = SDLTest_RandomIntegerInRange(1, 50);; + refRect.x = SDLTest_RandomIntegerInRange(1, 50); + refRect.y = SDLTest_RandomIntegerInRange(1, 50); refRect.w = 5000; refRect.h = 5000; _testSetTextInputRect(refRect); diff --git a/Engine/lib/sdl/test/testautomation_main.c b/Engine/lib/sdl/test/testautomation_main.c index ef8f19e9e..ae060cdd1 100644 --- a/Engine/lib/sdl/test/testautomation_main.c +++ b/Engine/lib/sdl/test/testautomation_main.c @@ -137,7 +137,7 @@ static const SDLTest_TestCaseReference mainTest3 = static const SDLTest_TestCaseReference mainTest4 = { (SDLTest_TestCaseFp)main_testImpliedJoystickQuit, "main_testImpliedJoystickQuit", "Tests that quit for gamecontroller doesn't quit joystick if you inited it explicitly", TEST_ENABLED}; -/* Sequence of Platform test cases */ +/* Sequence of Main test cases */ static const SDLTest_TestCaseReference *mainTests[] = { &mainTest1, &mainTest2, @@ -146,7 +146,7 @@ static const SDLTest_TestCaseReference *mainTests[] = { NULL }; -/* Platform test suite (global) */ +/* Main test suite (global) */ SDLTest_TestSuiteReference mainTestSuite = { "Main", NULL, diff --git a/Engine/lib/sdl/test/testautomation_sdltest.c b/Engine/lib/sdl/test/testautomation_sdltest.c index ec1da8a50..54cd6e257 100644 --- a/Engine/lib/sdl/test/testautomation_sdltest.c +++ b/Engine/lib/sdl/test/testautomation_sdltest.c @@ -1093,7 +1093,7 @@ sdltest_randomIntegerInRange(void *arg) SDLTest_AssertCheck(min <= result && result <= max, "Validated returned value; expected: [%d,%d], got: %d", min, max, result); /* Range with max at integer limit */ - min = long_min - (Sint32)SDLTest_RandomSint16();; + min = long_min - (Sint32)SDLTest_RandomSint16(); max = long_max; result = SDLTest_RandomIntegerInRange(min, max); SDLTest_AssertPass("Call to SDLTest_RandomIntegerInRange(...,SINT32_MAX)"); diff --git a/Engine/lib/sdl/test/testautomation_stdlib.c b/Engine/lib/sdl/test/testautomation_stdlib.c index 89245fdcb..b541995f5 100644 --- a/Engine/lib/sdl/test/testautomation_stdlib.c +++ b/Engine/lib/sdl/test/testautomation_stdlib.c @@ -253,6 +253,43 @@ stdlib_getsetenv(void *arg) return TEST_COMPLETED; } +/** + * @brief Call to SDL_sscanf + */ +#undef SDL_sscanf +int +stdlib_sscanf(void *arg) +{ + int output; + int result; + int expected_output; + int expected_result; + + expected_output = output = 123; + expected_result = -1; + result = SDL_sscanf("", "%i", &output); + SDLTest_AssertPass("Call to SDL_sscanf(\"\", \"%%i\", &output)"); + SDLTest_AssertCheck(expected_output == output, "Check output, expected: %i, got: %i", expected_output, output); + SDLTest_AssertCheck(expected_result == result, "Check return value, expected: %i, got: %i", expected_result, result); + + expected_output = output = 123; + expected_result = 0; + result = SDL_sscanf("a", "%i", &output); + SDLTest_AssertPass("Call to SDL_sscanf(\"a\", \"%%i\", &output)"); + SDLTest_AssertCheck(expected_output == output, "Check output, expected: %i, got: %i", expected_output, output); + SDLTest_AssertCheck(expected_result == result, "Check return value, expected: %i, got: %i", expected_result, result); + + output = 123; + expected_output = 2; + expected_result = 1; + result = SDL_sscanf("2", "%i", &output); + SDLTest_AssertPass("Call to SDL_sscanf(\"2\", \"%%i\", &output)"); + SDLTest_AssertCheck(expected_output == output, "Check output, expected: %i, got: %i", expected_output, output); + SDLTest_AssertCheck(expected_result == result, "Check return value, expected: %i, got: %i", expected_result, result); + + return TEST_COMPLETED; +} + /* ================= Test References ================== */ /* Standard C routine test cases */ @@ -265,12 +302,15 @@ static const SDLTest_TestCaseReference stdlibTest2 = static const SDLTest_TestCaseReference stdlibTest3 = { (SDLTest_TestCaseFp)stdlib_getsetenv, "stdlib_getsetenv", "Call to SDL_getenv and SDL_setenv", TEST_ENABLED }; +static const SDLTest_TestCaseReference stdlibTest4 = + { (SDLTest_TestCaseFp)stdlib_sscanf, "stdlib_sscanf", "Call to SDL_sscanf", TEST_ENABLED }; + /* Sequence of Standard C routine test cases */ static const SDLTest_TestCaseReference *stdlibTests[] = { - &stdlibTest1, &stdlibTest2, &stdlibTest3, NULL + &stdlibTest1, &stdlibTest2, &stdlibTest3, &stdlibTest4, NULL }; -/* Timer test suite (global) */ +/* Standard C routine test suite (global) */ SDLTest_TestSuiteReference stdlibTestSuite = { "Stdlib", NULL, diff --git a/Engine/lib/sdl/test/testbounds.c b/Engine/lib/sdl/test/testbounds.c new file mode 100644 index 000000000..b410be96c --- /dev/null +++ b/Engine/lib/sdl/test/testbounds.c @@ -0,0 +1,40 @@ +/* + Copyright (C) 1997-2014 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +#include "SDL.h" + +int main(int argc, char **argv) +{ + int total, i; + + if (SDL_Init(SDL_INIT_VIDEO) < 0) { + SDL_Log("SDL_Init(SDL_INIT_VIDEO) failed: %s", SDL_GetError()); + return 1; + } + + total = SDL_GetNumVideoDisplays(); + for (i = 0; i < total; i++) { + SDL_Rect bounds = { -1,-1,-1,-1 }, usable = { -1,-1,-1,-1 }; + SDL_GetDisplayBounds(i, &bounds); + SDL_GetDisplayUsableBounds(i, &usable); + SDL_Log("Display #%d ('%s'): bounds={(%d,%d),%dx%d}, usable={(%d,%d),%dx%d}", + i, SDL_GetDisplayName(i), + bounds.x, bounds.y, bounds.w, bounds.h, + usable.x, usable.y, usable.w, usable.h); + } + + SDL_Quit(); + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ + diff --git a/Engine/lib/sdl/test/testcustomcursor.c b/Engine/lib/sdl/test/testcustomcursor.c new file mode 100644 index 000000000..88b5c322d --- /dev/null +++ b/Engine/lib/sdl/test/testcustomcursor.c @@ -0,0 +1,216 @@ +/* + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +#include +#include + +#ifdef __EMSCRIPTEN__ +#include +#endif + +#include "SDL_test_common.h" + +/* Stolen from the mailing list */ +/* Creates a new mouse cursor from an XPM */ + + +/* XPM */ +static const char *arrow[] = { + /* width height num_colors chars_per_pixel */ + " 32 32 3 1", + /* colors */ + "X c #000000", + ". c #ffffff", + " c None", + /* pixels */ + "X ", + "XX ", + "X.X ", + "X..X ", + "X...X ", + "X....X ", + "X.....X ", + "X......X ", + "X.......X ", + "X........X ", + "X.....XXXXX ", + "X..X..X ", + "X.X X..X ", + "XX X..X ", + "X X..X ", + " X..X ", + " X..X ", + " X..X ", + " XX ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "0,0" +}; + +static SDL_Cursor* +init_color_cursor(const char *file) +{ + SDL_Cursor *cursor = NULL; + SDL_Surface *surface = SDL_LoadBMP(file); + if (surface) { + cursor = SDL_CreateColorCursor(surface, 0, 0); + SDL_FreeSurface(surface); + } + return cursor; +} + +static SDL_Cursor* +init_system_cursor(const char *image[]) +{ + int i, row, col; + Uint8 data[4*32]; + Uint8 mask[4*32]; + int hot_x, hot_y; + + i = -1; + for (row=0; row<32; ++row) { + for (col=0; col<32; ++col) { + if (col % 8) { + data[i] <<= 1; + mask[i] <<= 1; + } else { + ++i; + data[i] = mask[i] = 0; + } + switch (image[4+row][col]) { + case 'X': + data[i] |= 0x01; + mask[i] |= 0x01; + break; + case '.': + mask[i] |= 0x01; + break; + case ' ': + break; + } + } + } + sscanf(image[4+row], "%d,%d", &hot_x, &hot_y); + return SDL_CreateCursor(data, mask, 32, 32, hot_x, hot_y); +} + +static SDLTest_CommonState *state; +int done; +SDL_Cursor *cursor = NULL; + +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void +quit(int rc) +{ + SDLTest_CommonQuit(state); + exit(rc); +} + +void +loop() +{ + int i; + SDL_Event event; + /* Check for events */ + while (SDL_PollEvent(&event)) { + SDLTest_CommonEvent(state, &event, &done); + } + + for (i = 0; i < state->num_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + SDL_RenderClear(renderer); + SDL_RenderPresent(renderer); + } +#ifdef __EMSCRIPTEN__ + if (done) { + emscripten_cancel_main_loop(); + } +#endif +} + +int +main(int argc, char *argv[]) +{ + int i; + const char *color_cursor = NULL; + + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); + + /* Initialize test framework */ + state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO); + if (!state) { + return 1; + } + for (i = 1; i < argc;) { + int consumed; + + consumed = SDLTest_CommonArg(state, i); + if (consumed == 0) { + color_cursor = argv[i]; + break; + } + if (consumed < 0) { + SDL_Log("Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state)); + quit(1); + } + i += consumed; + } + + if (!SDLTest_CommonInit(state)) { + quit(2); + } + + for (i = 0; i < state->num_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF); + SDL_RenderClear(renderer); + } + + if (color_cursor) { + cursor = init_color_cursor(color_cursor); + } else { + cursor = init_system_cursor(arrow); + } + if (!cursor) { + SDL_Log("Error, couldn't create cursor\n"); + quit(2); + } + SDL_SetCursor(cursor); + + /* Main render loop */ + done = 0; +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(loop, 0, 1); +#else + while (!done) { + loop(); + } +#endif + + SDL_FreeCursor(cursor); + quit(0); + + /* keep the compiler happy ... */ + return(0); +} diff --git a/Engine/lib/sdl/test/testdisplayinfo.c b/Engine/lib/sdl/test/testdisplayinfo.c index c228eb6b2..f06722e88 100644 --- a/Engine/lib/sdl/test/testdisplayinfo.c +++ b/Engine/lib/sdl/test/testdisplayinfo.c @@ -51,11 +51,18 @@ main(int argc, char *argv[]) for (dpy = 0; dpy < num_displays; dpy++) { const int num_modes = SDL_GetNumDisplayModes(dpy); SDL_Rect rect = { 0, 0, 0, 0 }; + float ddpi, hdpi, vdpi; int m; SDL_GetDisplayBounds(dpy, &rect); SDL_Log("%d: \"%s\" (%dx%d, (%d, %d)), %d modes.\n", dpy, SDL_GetDisplayName(dpy), rect.w, rect.h, rect.x, rect.y, num_modes); + if (SDL_GetDisplayDPI(dpy, &ddpi, &hdpi, &vdpi) == -1) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, " DPI: failed to query (%s)\n", SDL_GetError()); + } else { + SDL_Log(" DPI: ddpi=%f; hdpi=%f; vdpi=%f\n", ddpi, hdpi, vdpi); + } + if (SDL_GetCurrentDisplayMode(dpy, &mode) == -1) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, " CURRENT: failed to query (%s)\n", SDL_GetError()); } else { diff --git a/Engine/lib/sdl/test/testdrawchessboard.c b/Engine/lib/sdl/test/testdrawchessboard.c index f2a1469d4..af929e9c3 100644 --- a/Engine/lib/sdl/test/testdrawchessboard.c +++ b/Engine/lib/sdl/test/testdrawchessboard.c @@ -100,7 +100,7 @@ main(int argc, char *argv[]) /* Create window and renderer for given surface */ - window = SDL_CreateWindow("Chess Board", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_SHOWN); + window = SDL_CreateWindow("Chess Board", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, 0); if(!window) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Window creation fail : %s\n",SDL_GetError()); diff --git a/Engine/lib/sdl/test/testdropfile.c b/Engine/lib/sdl/test/testdropfile.c index b7f215ee8..b729b2f64 100644 --- a/Engine/lib/sdl/test/testdropfile.c +++ b/Engine/lib/sdl/test/testdropfile.c @@ -77,9 +77,14 @@ main(int argc, char *argv[]) while (SDL_PollEvent(&event)) { SDLTest_CommonEvent(state, &event, &done); - if (event.type == SDL_DROPFILE) { + if (event.type == SDL_DROPBEGIN) { + SDL_Log("Drop beginning on window %u", (unsigned int) event.drop.windowID); + } else if (event.type == SDL_DROPCOMPLETE) { + SDL_Log("Drop complete on window %u", (unsigned int) event.drop.windowID); + } else if ((event.type == SDL_DROPFILE) || (event.type == SDL_DROPTEXT)) { + const char *typestr = (event.type == SDL_DROPFILE) ? "File" : "Text"; char *dropped_filedir = event.drop.file; - SDL_Log("File dropped on window: %s", dropped_filedir); + SDL_Log("%s dropped on window %u: %s", typestr, (unsigned int) event.drop.windowID, dropped_filedir); SDL_free(dropped_filedir); } } diff --git a/Engine/lib/sdl/test/testfilesystem.c b/Engine/lib/sdl/test/testfilesystem.c index abd301c0e..61a6d5a5a 100644 --- a/Engine/lib/sdl/test/testfilesystem.c +++ b/Engine/lib/sdl/test/testfilesystem.c @@ -32,9 +32,8 @@ main(int argc, char *argv[]) if(base_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find base path: %s\n", SDL_GetError()); - return 0; + return 1; } - SDL_Log("base path: '%s'\n", base_path); SDL_free(base_path); @@ -42,7 +41,7 @@ main(int argc, char *argv[]) if(pref_path == NULL){ SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't find pref path: %s\n", SDL_GetError()); - return 0; + return 1; } SDL_Log("pref path: '%s'\n", pref_path); SDL_free(pref_path); diff --git a/Engine/lib/sdl/test/testgamecontroller.c b/Engine/lib/sdl/test/testgamecontroller.c index ec1dfd322..38d2f7708 100644 --- a/Engine/lib/sdl/test/testgamecontroller.c +++ b/Engine/lib/sdl/test/testgamecontroller.c @@ -29,7 +29,7 @@ #define SCREEN_HEIGHT 320 #else #define SCREEN_WIDTH 512 -#define SCREEN_HEIGHT 317 +#define SCREEN_HEIGHT 320 #endif /* This is indexed by SDL_GameControllerButton. */ @@ -67,7 +67,7 @@ SDL_bool done = SDL_FALSE; SDL_Texture *background, *button, *axis; static SDL_Texture * -LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent) +LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) { SDL_Surface *temp = NULL; SDL_Texture *texture = NULL; @@ -129,7 +129,7 @@ loop(void *arg) for (i = 0; i < SDL_CONTROLLER_BUTTON_MAX; ++i) { if (SDL_GameControllerGetButton(gamecontroller, (SDL_GameControllerButton)i) == SDL_PRESSED) { const SDL_Rect dst = { button_positions[i].x, button_positions[i].y, 50, 50 }; - SDL_RenderCopyEx(screen, button, NULL, &dst, 0, NULL, 0); + SDL_RenderCopyEx(screen, button, NULL, &dst, 0, NULL, SDL_FLIP_NONE); } } @@ -139,11 +139,11 @@ loop(void *arg) if (value < -deadzone) { const SDL_Rect dst = { axis_positions[i].x, axis_positions[i].y, 50, 50 }; const double angle = axis_positions[i].angle; - SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, 0); + SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, SDL_FLIP_NONE); } else if (value > deadzone) { const SDL_Rect dst = { axis_positions[i].x, axis_positions[i].y, 50, 50 }; const double angle = axis_positions[i].angle + 180.0; - SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, 0); + SDL_RenderCopyEx(screen, axis, NULL, &dst, angle, NULL, SDL_FLIP_NONE); } } @@ -181,6 +181,8 @@ WatchGameController(SDL_GameController * gamecontroller) window = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, SCREEN_HEIGHT, 0); + SDL_free(title); + title = NULL; if (window == NULL) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); return SDL_FALSE; diff --git a/Engine/lib/sdl/test/testgles.c b/Engine/lib/sdl/test/testgles.c index 291661a09..5be48ac56 100644 --- a/Engine/lib/sdl/test/testgles.c +++ b/Engine/lib/sdl/test/testgles.c @@ -173,7 +173,7 @@ main(int argc, char *argv[]) quit(2); } - context = SDL_calloc(state->num_windows, sizeof(context)); + context = (SDL_GLContext *)SDL_calloc(state->num_windows, sizeof(context)); if (context == NULL) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n"); quit(2); diff --git a/Engine/lib/sdl/test/testgles2.c b/Engine/lib/sdl/test/testgles2.c index af5962ba4..45b3d79a3 100644 --- a/Engine/lib/sdl/test/testgles2.c +++ b/Engine/lib/sdl/test/testgles2.c @@ -546,7 +546,7 @@ main(int argc, char *argv[]) return 0; } - context = SDL_calloc(state->num_windows, sizeof(context)); + context = (SDL_GLContext *)SDL_calloc(state->num_windows, sizeof(context)); if (context == NULL) { SDL_Log("Out of memory!\n"); quit(2); @@ -640,7 +640,7 @@ main(int argc, char *argv[]) } } - datas = SDL_calloc(state->num_windows, sizeof(shader_data)); + datas = (shader_data *)SDL_calloc(state->num_windows, sizeof(shader_data)); /* Set rendering settings for each context */ for (i = 0; i < state->num_windows; ++i) { diff --git a/Engine/lib/sdl/test/testime.c b/Engine/lib/sdl/test/testime.c index d6e7ea1f2..39a40f82f 100644 --- a/Engine/lib/sdl/test/testime.c +++ b/Engine/lib/sdl/test/testime.c @@ -9,7 +9,9 @@ including commercial applications, and to alter it and redistribute it freely. */ -/* A simple program to test the Input Method support in the SDL library (2.0+) */ +/* A simple program to test the Input Method support in the SDL library (2.0+) + If you build without SDL_ttf, you can use the GNU Unifont hex file instead. + Download at http://unifoundry.com/unifont.html */ #include #include @@ -22,19 +24,342 @@ #include "SDL_test_common.h" -#define DEFAULT_PTSIZE 30 -#define DEFAULT_FONT "/System/Library/Fonts/华文细黑.ttf" +#define DEFAULT_PTSIZE 30 +#ifdef HAVE_SDL_TTF +#ifdef __MACOSX__ +#define DEFAULT_FONT "/System/Library/Fonts/华文细黑.ttf" +#elif __WIN32__ +/* Some japanese font present on at least Windows 8.1. */ +#define DEFAULT_FONT "C:\\Windows\\Fonts\\yugothic.ttf" +#else +#define DEFAULT_FONT "NoDefaultFont.ttf" +#endif +#else +#define DEFAULT_FONT "unifont-9.0.02.hex" +#endif #define MAX_TEXT_LENGTH 256 static SDLTest_CommonState *state; static SDL_Rect textRect, markedRect; -static SDL_Color lineColor = {0,0,0,0}; -static SDL_Color backColor = {255,255,255,0}; -static SDL_Color textColor = {0,0,0,0}; +static SDL_Color lineColor = {0,0,0,255}; +static SDL_Color backColor = {255,255,255,255}; +static SDL_Color textColor = {0,0,0,255}; static char text[MAX_TEXT_LENGTH], markedText[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; static int cursor = 0; #ifdef HAVE_SDL_TTF static TTF_Font *font; +#else +#define UNIFONT_MAX_CODEPOINT 0x1ffff +#define UNIFONT_NUM_GLYPHS 0x20000 +/* Using 512x512 textures that are supported everywhere. */ +#define UNIFONT_TEXTURE_WIDTH 512 +#define UNIFONT_GLYPHS_IN_ROW (UNIFONT_TEXTURE_WIDTH / 16) +#define UNIFONT_GLYPHS_IN_TEXTURE (UNIFONT_GLYPHS_IN_ROW * UNIFONT_GLYPHS_IN_ROW) +#define UNIFONT_NUM_TEXTURES ((UNIFONT_NUM_GLYPHS + UNIFONT_GLYPHS_IN_TEXTURE - 1) / UNIFONT_GLYPHS_IN_TEXTURE) +#define UNIFONT_TEXTURE_SIZE (UNIFONT_TEXTURE_WIDTH * UNIFONT_TEXTURE_WIDTH * 4) +#define UNIFONT_TEXTURE_PITCH (UNIFONT_TEXTURE_WIDTH * 4) +#define UNIFONT_DRAW_SCALE 2 +struct UnifontGlyph { + Uint8 width; + Uint8 data[32]; +} *unifontGlyph; +static SDL_Texture **unifontTexture; +static Uint8 unifontTextureLoaded[UNIFONT_NUM_TEXTURES] = {0}; + +/* Unifont loading code start */ + +static Uint8 dehex(char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + else if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + return 255; +} + +static Uint8 dehex2(char c1, char c2) +{ + return (dehex(c1) << 4) | dehex(c2); +} + +static Uint8 validate_hex(const char *cp, size_t len, Uint32 *np) +{ + Uint32 n = 0; + for (; len > 0; cp++, len--) + { + Uint8 c = dehex(*cp); + if (c == 255) + return 0; + n = (n << 4) | c; + } + if (np != NULL) + *np = n; + return 1; +} + +static void unifont_init(const char *fontname) +{ + Uint8 hexBuffer[65]; + Uint32 numGlyphs = 0; + int lineNumber = 1; + size_t bytesRead; + SDL_RWops *hexFile; + const size_t unifontGlyphSize = UNIFONT_NUM_GLYPHS * sizeof(struct UnifontGlyph); + const size_t unifontTextureSize = UNIFONT_NUM_TEXTURES * state->num_windows * sizeof(void *); + + /* Allocate memory for the glyph data so the file can be closed after initialization. */ + unifontGlyph = (struct UnifontGlyph *)SDL_malloc(unifontGlyphSize); + if (unifontGlyph == NULL) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d KiB for glyph data.\n", (int)(unifontGlyphSize + 1023) / 1024); + exit(-1); + } + SDL_memset(unifontGlyph, 0, unifontGlyphSize); + + /* Allocate memory for texture pointers for all renderers. */ + unifontTexture = (SDL_Texture **)SDL_malloc(unifontTextureSize); + if (unifontTexture == NULL) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d KiB for texture pointer data.\n", (int)(unifontTextureSize + 1023) / 1024); + exit(-1); + } + SDL_memset(unifontTexture, 0, unifontTextureSize); + + hexFile = SDL_RWFromFile(fontname, "rb"); + if (hexFile == NULL) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to open font file: %s\n", fontname); + exit(-1); + } + + /* Read all the glyph data into memory to make it accessible later when textures are created. */ + do { + int i, codepointHexSize; + size_t bytesOverread; + Uint8 glyphWidth; + Uint32 codepoint; + + bytesRead = SDL_RWread(hexFile, hexBuffer, 1, 9); + if (numGlyphs > 0 && bytesRead == 0) + break; /* EOF */ + if ((numGlyphs == 0 && bytesRead == 0) || (numGlyphs > 0 && bytesRead < 9)) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unfiont: Unexpected end of hex file.\n"); + exit(-1); + } + + /* Looking for the colon that separates the codepoint and glyph data at position 2, 4, 6 and 8. */ + if (hexBuffer[2] == ':') + codepointHexSize = 2; + else if (hexBuffer[4] == ':') + codepointHexSize = 4; + else if (hexBuffer[6] == ':') + codepointHexSize = 6; + else if (hexBuffer[8] == ':') + codepointHexSize = 8; + else + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Could not find codepoint and glyph data separator symbol in hex file on line %d.\n", lineNumber); + exit(-1); + } + + if (!validate_hex((const char *)hexBuffer, codepointHexSize, &codepoint)) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Malformed hexadecimal number in hex file on line %d.\n", lineNumber); + exit(-1); + } + if (codepoint > UNIFONT_MAX_CODEPOINT) + SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "unifont: Codepoint on line %d exceeded limit of 0x%x.\n", lineNumber, UNIFONT_MAX_CODEPOINT); + + /* If there was glyph data read in the last file read, move it to the front of the buffer. */ + bytesOverread = 8 - codepointHexSize; + if (codepointHexSize < 8) + SDL_memmove(hexBuffer, hexBuffer + codepointHexSize + 1, bytesOverread); + bytesRead = SDL_RWread(hexFile, hexBuffer + bytesOverread, 1, 33 - bytesOverread); + if (bytesRead < (33 - bytesOverread)) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Unexpected end of hex file.\n"); + exit(-1); + } + if (hexBuffer[32] == '\n') + glyphWidth = 8; + else + { + glyphWidth = 16; + bytesRead = SDL_RWread(hexFile, hexBuffer + 33, 1, 32); + if (bytesRead < 32) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Unexpected end of hex file.\n"); + exit(-1); + } + } + + if (!validate_hex((const char *)hexBuffer, glyphWidth * 4, NULL)) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Malformed hexadecimal glyph data in hex file on line %d.\n", lineNumber); + exit(-1); + } + + if (codepoint <= UNIFONT_MAX_CODEPOINT) + { + if (unifontGlyph[codepoint].width > 0) + SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "unifont: Ignoring duplicate codepoint 0x%08x in hex file on line %d.\n", codepoint, lineNumber); + else + { + unifontGlyph[codepoint].width = glyphWidth; + /* Pack the hex data into a more compact form. */ + for (i = 0; i < glyphWidth * 2; i++) + unifontGlyph[codepoint].data[i] = dehex2(hexBuffer[i * 2], hexBuffer[i * 2 + 1]); + numGlyphs++; + } + } + + lineNumber++; + } while (bytesRead > 0); + + SDL_RWclose(hexFile); + SDL_Log("unifont: Loaded %u glyphs.\n", numGlyphs); +} + +static void unifont_make_rgba(Uint8 *src, Uint8 *dst, Uint8 width) +{ + int i, j; + Uint8 *row = dst; + + for (i = 0; i < width * 2; i++) + { + Uint8 data = src[i]; + for (j = 0; j < 8; j++) + { + if (data & 0x80) + { + row[0] = textColor.r; + row[1] = textColor.g; + row[2] = textColor.b; + row[3] = textColor.a; + } + else + { + row[0] = 0; + row[1] = 0; + row[2] = 0; + row[3] = 0; + } + data <<= 1; + row += 4; + } + + if (width == 8 || (width == 16 && i % 2 == 1)) + { + dst += UNIFONT_TEXTURE_PITCH; + row = dst; + } + } +} + +static void unifont_load_texture(Uint32 textureID) +{ + int i; + Uint8 * textureRGBA; + + if (textureID >= UNIFONT_NUM_TEXTURES) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Tried to load out of range texture %u.\n", textureID); + exit(-1); + } + + textureRGBA = (Uint8 *)SDL_malloc(UNIFONT_TEXTURE_SIZE); + if (textureRGBA == NULL) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to allocate %d MiB for a texture.\n", UNIFONT_TEXTURE_SIZE / 1024 / 1024); + exit(-1); + } + SDL_memset(textureRGBA, 0, UNIFONT_TEXTURE_SIZE); + + /* Copy the glyphs into memory in RGBA format. */ + for (i = 0; i < UNIFONT_GLYPHS_IN_TEXTURE; i++) + { + Uint32 codepoint = UNIFONT_GLYPHS_IN_TEXTURE * textureID + i; + if (unifontGlyph[codepoint].width > 0) + { + const Uint32 cInTex = codepoint % UNIFONT_GLYPHS_IN_TEXTURE; + const size_t offset = (cInTex / UNIFONT_GLYPHS_IN_ROW) * UNIFONT_TEXTURE_PITCH * 16 + (cInTex % UNIFONT_GLYPHS_IN_ROW) * 16 * 4; + unifont_make_rgba(unifontGlyph[codepoint].data, textureRGBA + offset, unifontGlyph[codepoint].width); + } + } + + /* Create textures and upload the RGBA data from above. */ + for (i = 0; i < state->num_windows; ++i) + { + SDL_Renderer *renderer = state->renderers[i]; + SDL_Texture *tex = unifontTexture[UNIFONT_NUM_TEXTURES * i + textureID]; + if (state->windows[i] == NULL || renderer == NULL || tex != NULL) + continue; + tex = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, UNIFONT_TEXTURE_WIDTH, UNIFONT_TEXTURE_WIDTH); + if (tex == NULL) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "unifont: Failed to create texture %u for renderer %d.\n", textureID, i); + exit(-1); + } + unifontTexture[UNIFONT_NUM_TEXTURES * i + textureID] = tex; + SDL_SetTextureBlendMode(tex, SDL_BLENDMODE_BLEND); + if (SDL_UpdateTexture(tex, NULL, textureRGBA, UNIFONT_TEXTURE_PITCH) != 0) + { + SDL_Log("unifont error: Failed to update texture %u data for renderer %d.\n", textureID, i); + } + } + + SDL_free(textureRGBA); + unifontTextureLoaded[textureID] = 1; +} + +static Sint32 unifont_draw_glyph(Uint32 codepoint, int rendererID, SDL_Rect *dstrect) +{ + SDL_Texture *texture; + const Uint32 textureID = codepoint / UNIFONT_GLYPHS_IN_TEXTURE; + SDL_Rect srcrect; + srcrect.w = srcrect.h = 16; + if (codepoint > UNIFONT_MAX_CODEPOINT) + return 0; + if (!unifontTextureLoaded[textureID]) + unifont_load_texture(textureID); + texture = unifontTexture[UNIFONT_NUM_TEXTURES * rendererID + textureID]; + if (texture != NULL) + { + const Uint32 cInTex = codepoint % UNIFONT_GLYPHS_IN_TEXTURE; + srcrect.x = cInTex % UNIFONT_GLYPHS_IN_ROW * 16; + srcrect.y = cInTex / UNIFONT_GLYPHS_IN_ROW * 16; + SDL_RenderCopy(state->renderers[rendererID], texture, &srcrect, dstrect); + } + return unifontGlyph[codepoint].width; +} + +static void unifont_cleanup() +{ + int i, j; + for (i = 0; i < state->num_windows; ++i) + { + SDL_Renderer *renderer = state->renderers[i]; + if (state->windows[i] == NULL || renderer == NULL) + continue; + for (j = 0; j < UNIFONT_NUM_TEXTURES; j++) + { + SDL_Texture *tex = unifontTexture[UNIFONT_NUM_TEXTURES * i + j]; + if (tex != NULL) + SDL_DestroyTexture(tex); + } + } + + for (j = 0; j < UNIFONT_NUM_TEXTURES; j++) + unifontTextureLoaded[j] = 0; + + SDL_free(unifontTexture); + SDL_free(unifontGlyph); +} + +/* Unifont code end */ #endif size_t utf8_length(unsigned char c) @@ -78,6 +403,30 @@ char *utf8_advance(char *p, size_t distance) return p; } +Uint32 utf8_decode(char *p, size_t len) +{ + Uint32 codepoint = 0; + size_t i = 0; + if (!len) + return 0; + + for (; i < len; ++i) + { + if (i == 0) + codepoint = (0xff >> len) & *p; + else + { + codepoint <<= 6; + codepoint |= 0x3f & *p; + } + if (!*p) + return 0; + p++; + } + + return codepoint; +} + void usage() { SDL_Log("usage: testime [--font fontfile]\n"); @@ -105,34 +454,61 @@ void CleanupVideo() #ifdef HAVE_SDL_TTF TTF_CloseFont(font); TTF_Quit(); +#else + unifont_cleanup(); #endif } +void _Redraw(int rendererID) { + SDL_Renderer * renderer = state->renderers[rendererID]; + SDL_Rect drawnTextRect, cursorRect, underlineRect; + drawnTextRect = textRect; + drawnTextRect.w = 0; -void _Redraw(SDL_Renderer * renderer) { - int w = 0, h = textRect.h; - SDL_Rect cursorRect, underlineRect; - - SDL_SetRenderDrawColor(renderer, 255,255,255,255); + SDL_SetRenderDrawColor(renderer, backColor.r, backColor.g, backColor.b, backColor.a); SDL_RenderFillRect(renderer,&textRect); -#ifdef HAVE_SDL_TTF if (*text) { +#ifdef HAVE_SDL_TTF SDL_Surface *textSur = TTF_RenderUTF8_Blended(font, text, textColor); - SDL_Rect dest = {textRect.x, textRect.y, textSur->w, textSur->h }; + SDL_Texture *texture; - SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer,textSur); + /* Vertically center text */ + drawnTextRect.y = textRect.y + (textRect.h - textSur->h) / 2; + drawnTextRect.w = textSur->w; + drawnTextRect.h = textSur->h; + + texture = SDL_CreateTextureFromSurface(renderer,textSur); SDL_FreeSurface(textSur); - SDL_RenderCopy(renderer,texture,NULL,&dest); + SDL_RenderCopy(renderer,texture,NULL,&drawnTextRect); SDL_DestroyTexture(texture); - TTF_SizeUTF8(font, text, &w, &h); - } -#endif +#else + char *utext = text; + Uint32 codepoint; + size_t len; + SDL_Rect dstrect; - markedRect.x = textRect.x + w; - markedRect.w = textRect.w - w; + dstrect.x = textRect.x; + dstrect.y = textRect.y + (textRect.h - 16 * UNIFONT_DRAW_SCALE) / 2; + dstrect.w = 16 * UNIFONT_DRAW_SCALE; + dstrect.h = 16 * UNIFONT_DRAW_SCALE; + drawnTextRect.y = dstrect.y; + drawnTextRect.h = dstrect.h; + + while ((codepoint = utf8_decode(utext, len = utf8_length(*utext)))) + { + Sint32 advance = unifont_draw_glyph(codepoint, rendererID, &dstrect) * UNIFONT_DRAW_SCALE; + dstrect.x += advance; + drawnTextRect.w += advance; + utext += len; + } +#endif + } + + markedRect.x = textRect.x + drawnTextRect.w; + markedRect.w = textRect.w - drawnTextRect.w; if (markedRect.w < 0) { /* Stop text input because we cannot hold any more characters */ @@ -144,49 +520,88 @@ void _Redraw(SDL_Renderer * renderer) { SDL_StartTextInput(); } - cursorRect = markedRect; + cursorRect = drawnTextRect; + cursorRect.x += cursorRect.w; cursorRect.w = 2; - cursorRect.h = h; + cursorRect.h = drawnTextRect.h; - SDL_SetRenderDrawColor(renderer, 255,255,255,255); + drawnTextRect.x += drawnTextRect.w; + drawnTextRect.w = 0; + + SDL_SetRenderDrawColor(renderer, backColor.r, backColor.g, backColor.b, backColor.a); SDL_RenderFillRect(renderer,&markedRect); if (markedText[0]) { #ifdef HAVE_SDL_TTF + SDL_Surface *textSur; + SDL_Texture *texture; if (cursor) { char *p = utf8_advance(markedText, cursor); char c = 0; if (!p) - p = &markedText[strlen(markedText)]; + p = &markedText[SDL_strlen(markedText)]; c = *p; *p = 0; - TTF_SizeUTF8(font, markedText, &w, 0); - cursorRect.x += w; + TTF_SizeUTF8(font, markedText, &drawnTextRect.w, NULL); + cursorRect.x += drawnTextRect.w; *p = c; } - SDL_Surface *textSur = TTF_RenderUTF8_Blended(font, markedText, textColor); - SDL_Rect dest = {markedRect.x, markedRect.y, textSur->w, textSur->h }; - TTF_SizeUTF8(font, markedText, &w, &h); - SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer,textSur); + textSur = TTF_RenderUTF8_Blended(font, markedText, textColor); + /* Vertically center text */ + drawnTextRect.y = textRect.y + (textRect.h - textSur->h) / 2; + drawnTextRect.w = textSur->w; + drawnTextRect.h = textSur->h; + + texture = SDL_CreateTextureFromSurface(renderer,textSur); SDL_FreeSurface(textSur); - SDL_RenderCopy(renderer,texture,NULL,&dest); + SDL_RenderCopy(renderer,texture,NULL,&drawnTextRect); SDL_DestroyTexture(texture); +#else + int i = 0; + char *utext = markedText; + Uint32 codepoint; + size_t len; + SDL_Rect dstrect; + + dstrect.x = drawnTextRect.x; + dstrect.y = textRect.y + (textRect.h - 16 * UNIFONT_DRAW_SCALE) / 2; + dstrect.w = 16 * UNIFONT_DRAW_SCALE; + dstrect.h = 16 * UNIFONT_DRAW_SCALE; + drawnTextRect.y = dstrect.y; + drawnTextRect.h = dstrect.h; + + while ((codepoint = utf8_decode(utext, len = utf8_length(*utext)))) + { + Sint32 advance = unifont_draw_glyph(codepoint, rendererID, &dstrect) * UNIFONT_DRAW_SCALE; + dstrect.x += advance; + drawnTextRect.w += advance; + if (i < cursor) + cursorRect.x += advance; + i++; + utext += len; + } #endif - underlineRect = markedRect; - underlineRect.y += (h - 2); - underlineRect.h = 2; - underlineRect.w = w; + if (cursor > 0) + { + cursorRect.y = drawnTextRect.y; + cursorRect.h = drawnTextRect.h; + } - SDL_SetRenderDrawColor(renderer, 0,0,0,0); - SDL_RenderFillRect(renderer,&markedRect); + underlineRect = markedRect; + underlineRect.y = drawnTextRect.y + drawnTextRect.h - 2; + underlineRect.h = 2; + underlineRect.w = drawnTextRect.w; + + SDL_SetRenderDrawColor(renderer, lineColor.r, lineColor.g, lineColor.b, lineColor.a); + SDL_RenderFillRect(renderer, &underlineRect); } - SDL_SetRenderDrawColor(renderer, 0,0,0,0); + SDL_SetRenderDrawColor(renderer, lineColor.r, lineColor.g, lineColor.b, lineColor.a); SDL_RenderFillRect(renderer,&cursorRect); SDL_SetTextInputRect(&markedRect); @@ -201,7 +616,8 @@ void Redraw() { SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0); SDL_RenderClear(renderer); - _Redraw(renderer); + /* Sending in the window id to let the font renderers know which one we're working with. */ + _Redraw(i); SDL_RenderPresent(renderer); } @@ -259,6 +675,8 @@ int main(int argc, char *argv[]) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to find font: %s\n", TTF_GetError()); exit(-1); } +#else + unifont_init(fontname); #endif SDL_Log("Using font: %s\n", fontname); @@ -288,6 +706,8 @@ int main(int argc, char *argv[]) { Redraw(); break; case SDLK_BACKSPACE: + /* Only delete text if not in editing mode. */ + if (!markedText[0]) { size_t textlen = SDL_strlen(text); @@ -354,7 +774,7 @@ int main(int argc, char *argv[]) { SDL_Log("text editing \"%s\", selected range (%d, %d)\n", event.edit.text, event.edit.start, event.edit.length); - strcpy(markedText, event.edit.text); + SDL_strlcpy(markedText, event.edit.text, SDL_TEXTEDITINGEVENT_TEXT_SIZE); cursor = event.edit.start; Redraw(); break; diff --git a/Engine/lib/sdl/test/testlock.c b/Engine/lib/sdl/test/testlock.c index 1106ec3bf..113ba0d4c 100644 --- a/Engine/lib/sdl/test/testlock.c +++ b/Engine/lib/sdl/test/testlock.c @@ -23,7 +23,7 @@ static SDL_mutex *mutex = NULL; static SDL_threadID mainthread; static SDL_Thread *threads[6]; -static volatile int doterminate = 0; +static SDL_atomic_t doterminate; /* * SDL_Quit() shouldn't be used with atexit() directly because @@ -45,7 +45,7 @@ void terminate(int sig) { signal(SIGINT, terminate); - doterminate = 1; + SDL_AtomicSet(&doterminate, 1); } void @@ -54,7 +54,7 @@ closemutex(int sig) SDL_threadID id = SDL_ThreadID(); int i; SDL_Log("Process %lu: Cleaning up...\n", id == mainthread ? 0 : id); - doterminate = 1; + SDL_AtomicSet(&doterminate, 1); for (i = 0; i < 6; ++i) SDL_WaitThread(threads[i], NULL); SDL_DestroyMutex(mutex); @@ -66,7 +66,7 @@ Run(void *data) { if (SDL_ThreadID() == mainthread) signal(SIGTERM, closemutex); - while (!doterminate) { + while (!SDL_AtomicGet(&doterminate)) { SDL_Log("Process %lu ready to work\n", SDL_ThreadID()); if (SDL_LockMutex(mutex) < 0) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't lock mutex: %s", SDL_GetError()); @@ -82,7 +82,7 @@ Run(void *data) /* If this sleep isn't done, then threads may starve */ SDL_Delay(10); } - if (SDL_ThreadID() == mainthread && doterminate) { + if (SDL_ThreadID() == mainthread && SDL_AtomicGet(&doterminate)) { SDL_Log("Process %lu: raising SIGTERM\n", SDL_ThreadID()); raise(SIGTERM); } @@ -105,6 +105,8 @@ main(int argc, char *argv[]) } atexit(SDL_Quit_Wrapper); + SDL_AtomicSet(&doterminate, 0); + if ((mutex = SDL_CreateMutex()) == NULL) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create mutex: %s\n", SDL_GetError()); exit(1); diff --git a/Engine/lib/sdl/test/testmultiaudio.c b/Engine/lib/sdl/test/testmultiaudio.c index 117ef2696..1b07ba9fc 100644 --- a/Engine/lib/sdl/test/testmultiaudio.c +++ b/Engine/lib/sdl/test/testmultiaudio.c @@ -25,7 +25,7 @@ typedef struct { SDL_AudioDeviceID dev; int soundpos; - volatile int done; + SDL_atomic_t done; } callback_data; callback_data cbd[64]; @@ -46,14 +46,14 @@ play_through_once(void *arg, Uint8 * stream, int len) if (len > 0) { stream += cpy; SDL_memset(stream, spec.silence, len); - cbd->done++; + SDL_AtomicSet(&cbd->done, 1); } } void loop() { - if(cbd[0].done) { + if (SDL_AtomicGet(&cbd[0].done)) { #ifdef __EMSCRIPTEN__ emscripten_cancel_main_loop(); #endif @@ -100,8 +100,7 @@ test_multi_audio(int devcount) #ifdef __EMSCRIPTEN__ emscripten_set_main_loop(loop, 0, 1); #else - while (!cbd[0].done) - { + while (!SDL_AtomicGet(&cbd[0].done)) { #ifdef __ANDROID__ /* Empty queue, some application events would prevent pause. */ while (SDL_PollEvent(&event)){} @@ -136,7 +135,7 @@ test_multi_audio(int devcount) while (keep_going) { keep_going = 0; for (i = 0; i < devcount; i++) { - if ((cbd[i].dev) && (!cbd[i].done)) { + if ((cbd[i].dev) && (!SDL_AtomicGet(&cbd[i].done))) { keep_going = 1; } } diff --git a/Engine/lib/sdl/test/testqsort.c b/Engine/lib/sdl/test/testqsort.c new file mode 100644 index 000000000..48659f307 --- /dev/null +++ b/Engine/lib/sdl/test/testqsort.c @@ -0,0 +1,108 @@ +/* + Copyright (C) 1997-2016 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely. +*/ + +#include "SDL_test.h" + +static int +num_compare(const void *_a, const void *_b) +{ + const int a = *((const int *) _a); + const int b = *((const int *) _b); + return (a < b) ? -1 : ((a > b) ? 1 : 0); +} + +static void +test_sort(const char *desc, int *nums, const int arraylen) +{ + int i; + int prev; + + SDL_Log("test: %s arraylen=%d", desc, arraylen); + + SDL_qsort(nums, arraylen, sizeof (nums[0]), num_compare); + + prev = nums[0]; + for (i = 1; i < arraylen; i++) { + const int val = nums[i]; + if (val < prev) { + SDL_Log("sort is broken!"); + return; + } + prev = val; + } +} + +int +main(int argc, char *argv[]) +{ + static int nums[1024 * 100]; + static const int itervals[] = { SDL_arraysize(nums), 12 }; + int iteration; + SDLTest_RandomContext rndctx; + + if (argc > 1) + { + int success; + Uint64 seed = 0; + if (argv[1][0] == '0' && argv[1][1] == 'x') + success = SDL_sscanf(argv[1] + 2, "%llx", &seed); + else + success = SDL_sscanf(argv[1], "%llu", &seed); + if (!success) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Invalid seed. Use a decimal or hexadecimal number.\n"); + return 1; + } + if (seed <= 0xffffffff) + { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Seed must be equal or greater than 0x100000000.\n"); + return 1; + } + SDLTest_RandomInit(&rndctx, (unsigned int)(seed >> 32), (unsigned int)(seed & 0xffffffff)); + } + else + { + SDLTest_RandomInitTime(&rndctx); + } + SDL_Log("Using random seed 0x%08x%08x\n", rndctx.x, rndctx.c); + + for (iteration = 0; iteration < SDL_arraysize(itervals); iteration++) { + const int arraylen = itervals[iteration]; + int i; + + for (i = 0; i < arraylen; i++) { + nums[i] = i; + } + test_sort("already sorted", nums, arraylen); + + for (i = 0; i < arraylen; i++) { + nums[i] = i; + } + nums[arraylen-1] = -1; + test_sort("already sorted except last element", nums, arraylen); + + for (i = 0; i < arraylen; i++) { + nums[i] = (arraylen-1) - i; + } + test_sort("reverse sorted", nums, arraylen); + + for (i = 0; i < arraylen; i++) { + nums[i] = SDLTest_RandomInt(&rndctx); + } + test_sort("random sorted", nums, arraylen); + } + + return 0; +} + +/* vi: set ts=4 sw=4 expandtab: */ + diff --git a/Engine/lib/sdl/test/testrendercopyex.c b/Engine/lib/sdl/test/testrendercopyex.c index 856abf7d0..e34890245 100644 --- a/Engine/lib/sdl/test/testrendercopyex.c +++ b/Engine/lib/sdl/test/testrendercopyex.c @@ -45,7 +45,7 @@ quit(int rc) } SDL_Texture * -LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent) +LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent) { SDL_Surface *temp; SDL_Texture *texture; @@ -126,7 +126,7 @@ Draw(DrawState *s) s->sprite_rect.x = (viewport.w - s->sprite_rect.w) / 2; s->sprite_rect.y = (viewport.h - s->sprite_rect.h) / 2; - SDL_RenderCopyEx(s->renderer, s->sprite, NULL, &s->sprite_rect, (double)s->sprite_rect.w, center, s->scale_direction); + SDL_RenderCopyEx(s->renderer, s->sprite, NULL, &s->sprite_rect, (double)s->sprite_rect.w, center, (SDL_RendererFlip)s->scale_direction); SDL_SetRenderTarget(s->renderer, NULL); SDL_RenderCopy(s->renderer, target, NULL, NULL); diff --git a/Engine/lib/sdl/test/testshape.c b/Engine/lib/sdl/test/testshape.c index 00750a970..476fac21e 100644 --- a/Engine/lib/sdl/test/testshape.c +++ b/Engine/lib/sdl/test/testshape.c @@ -71,6 +71,10 @@ int main(int argc,char** argv) num_pictures = argc - 1; pictures = (LoadedPicture *)SDL_malloc(sizeof(LoadedPicture)*num_pictures); + if (!pictures) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Could not allocate memory."); + exit(1); + } for(i=0;inum_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + SDL_RenderClear(renderer); + SDL_RenderPresent(renderer); + } #ifdef __EMSCRIPTEN__ if (done) { emscripten_cancel_main_loop(); @@ -122,7 +129,6 @@ main(int argc, char *argv[]) if (!state) { return 1; } - state->skip_renderer = SDL_TRUE; for (i = 1; i < argc;) { int consumed; @@ -140,6 +146,12 @@ main(int argc, char *argv[]) quit(2); } + for (i = 0; i < state->num_windows; ++i) { + SDL_Renderer *renderer = state->renderers[i]; + SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF); + SDL_RenderClear(renderer); + } + /* Main render loop */ done = 0; #ifdef __EMSCRIPTEN__ diff --git a/Engine/lib/sdl/test/torturethread.c b/Engine/lib/sdl/test/torturethread.c index 5719a7195..6b98a0a9f 100644 --- a/Engine/lib/sdl/test/torturethread.c +++ b/Engine/lib/sdl/test/torturethread.c @@ -21,7 +21,7 @@ #define NUMTHREADS 10 -static char volatile time_for_threads_to_die[NUMTHREADS]; +static SDL_atomic_t time_for_threads_to_die[NUMTHREADS]; /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ static void @@ -58,7 +58,7 @@ ThreadFunc(void *data) } SDL_Log("Thread '%d' waiting for signal\n", tid); - while (time_for_threads_to_die[tid] != 1) { + while (SDL_AtomicGet(&time_for_threads_to_die[tid]) != 1) { ; /* do nothing */ } @@ -92,7 +92,7 @@ main(int argc, char *argv[]) for (i = 0; i < NUMTHREADS; i++) { char name[64]; SDL_snprintf(name, sizeof (name), "Parent%d", i); - time_for_threads_to_die[i] = 0; + SDL_AtomicSet(&time_for_threads_to_die[i], 0); threads[i] = SDL_CreateThread(ThreadFunc, name, (void*) (uintptr_t) i); if (threads[i] == NULL) { @@ -102,7 +102,7 @@ main(int argc, char *argv[]) } for (i = 0; i < NUMTHREADS; i++) { - time_for_threads_to_die[i] = 1; + SDL_AtomicSet(&time_for_threads_to_die[i], 1); } for (i = 0; i < NUMTHREADS; i++) { diff --git a/Engine/source/T3D/aiPlayer.cpp b/Engine/source/T3D/aiPlayer.cpp index 88b500205..e952c2a8c 100644 --- a/Engine/source/T3D/aiPlayer.cpp +++ b/Engine/source/T3D/aiPlayer.cpp @@ -1043,9 +1043,9 @@ NavMesh *AIPlayer::findNavMesh() const } else { - if(getNavSize() == Small && !m->mSmallCharacters || - getNavSize() == Regular && !m->mRegularCharacters || - getNavSize() == Large && !m->mLargeCharacters) + if((getNavSize() == Small && !m->mSmallCharacters) || + (getNavSize() == Regular && !m->mRegularCharacters) || + (getNavSize() == Large && !m->mLargeCharacters)) continue; } if(!mesh || m->getWorldBox().getVolume() < mesh->getWorldBox().getVolume()) @@ -1317,7 +1317,7 @@ bool AIPlayer::checkInLos(GameBase* target, bool _useMuzzle, bool _checkEnabled) return hit; } -DefineEngineMethod(AIPlayer, checkInLos, bool, (ShapeBase* obj, bool useMuzzle, bool checkEnabled),(NULL, false, false), +DefineEngineMethod(AIPlayer, checkInLos, bool, (ShapeBase* obj, bool useMuzzle, bool checkEnabled),(nullAsType(), false, false), "@brief Check whether an object is in line of sight.\n" "@obj Object to check. (If blank, it will check the current target).\n" "@useMuzzle Use muzzle position. Otherwise use eye position. (defaults to false).\n" @@ -1366,7 +1366,7 @@ bool AIPlayer::checkInFoV(GameBase* target, F32 camFov, bool _checkEnabled) return (dot > mCos(camFov)); } -DefineEngineMethod(AIPlayer, checkInFoV, bool, (ShapeBase* obj, F32 fov, bool checkEnabled), (NULL, 45.0f, false), +DefineEngineMethod(AIPlayer, checkInFoV, bool, (ShapeBase* obj, F32 fov, bool checkEnabled), (nullAsType(), 45.0f, false), "@brief Check whether an object is within a specified veiw cone.\n" "@obj Object to check. (If blank, it will check the current target).\n" "@fov view angle in degrees.(Defaults to 45)\n" @@ -1440,7 +1440,7 @@ F32 AIPlayer::getTargetDistance(GameBase* target, bool _checkEnabled) return (getPosition() - target->getPosition()).len(); } -DefineEngineMethod(AIPlayer, getTargetDistance, F32, (ShapeBase* obj, bool checkEnabled), (NULL, false), +DefineEngineMethod(AIPlayer, getTargetDistance, F32, (ShapeBase* obj, bool checkEnabled), (nullAsType(), false), "@brief The distance to a given object.\n" "@obj Object to check. (If blank, it will check the current target).\n" "@checkEnabled check whether the object can take damage and if so is still alive.(Defaults to false)\n") diff --git a/Engine/source/T3D/camera.cpp b/Engine/source/T3D/camera.cpp index 11914542a..a2acc3838 100644 --- a/Engine/source/T3D/camera.cpp +++ b/Engine/source/T3D/camera.cpp @@ -572,7 +572,7 @@ void Camera::processTick(const Move* move) // process input/determine rotation vector if(virtualMode != StationaryMode && virtualMode != TrackObjectMode && - (!mLocked || virtualMode != OrbitObjectMode && virtualMode != OrbitPointMode)) + (!mLocked || ((virtualMode != OrbitObjectMode) && (virtualMode != OrbitPointMode)))) { if(!strafeMode) { diff --git a/Engine/source/T3D/decal/decalManager.cpp b/Engine/source/T3D/decal/decalManager.cpp index 4b79ab40e..9e4055e7d 100644 --- a/Engine/source/T3D/decal/decalManager.cpp +++ b/Engine/source/T3D/decal/decalManager.cpp @@ -632,9 +632,9 @@ DecalInstance* DecalManager::getClosestDecal( const Point3F &pos ) } } - if ( !collectedInsts.empty() && + if ( (!collectedInsts.empty() && collectedInsts[closestIndex] && - closestDistance < 1.0f || + closestDistance < 1.0f) || worldInstSphere.isContained( pos ) ) return collectedInsts[closestIndex]; else diff --git a/Engine/source/T3D/fx/fxFoliageReplicator.h b/Engine/source/T3D/fx/fxFoliageReplicator.h index e40554454..c9f8a0804 100644 --- a/Engine/source/T3D/fx/fxFoliageReplicator.h +++ b/Engine/source/T3D/fx/fxFoliageReplicator.h @@ -64,16 +64,16 @@ class fxFoliageItem { public: - MatrixF Transform; - F32 Width; - F32 Height; - Box3F FoliageBox; - bool Flipped; + MatrixF Transform; + F32 Width; + F32 Height; + Box3F FoliageBox; + bool Flipped; F32 SwayPhase; F32 SwayTimeRatio; - F32 LightPhase; + F32 LightPhase; F32 LightTimeRatio; - U32 LastFrameSerialID; + U32 LastFrameSerialID; }; //------------------------------------------------------------------------------ @@ -104,9 +104,9 @@ public: Box3F QuadrantBox; fxFoliageQuadrantNode* QuadrantChildNode[4]; Vector RenderList; - // Used in DrawIndexPrimitive call. - U32 startIndex; - U32 primitiveCount; + // Used in DrawIndexPrimitive call. + U32 startIndex; + U32 primitiveCount; }; @@ -152,7 +152,7 @@ protected: void CreateFoliage(void); void DestroyFoliage(void); - void DestroyFoliageItems(); + void DestroyFoliageItems(); void SyncFoliageReplicators(void); @@ -172,11 +172,11 @@ protected: Vector mReplicatedFoliage; fxFoliageRenderList mFrustumRenderSet; - GFXVertexBufferHandle mVertexBuffer; - GFXPrimitiveBufferHandle mPrimBuffer; + GFXVertexBufferHandle mVertexBuffer; + GFXPrimitiveBufferHandle mPrimBuffer; GFXShaderRef mShader; ShaderData* mShaderData; - GBitmap* mAlphaLookup; + GBitmap* mAlphaLookup; MRandomLCG RandomGen; F32 mFadeInGradient; @@ -193,8 +193,8 @@ protected: U32 mNextAllocatedNodeIdx; // Next Allocated Node Index. U32 mBillboardsAcquired; // Billboards Acquired. - // Used for alpha lookup in the pixel shader - GFXTexHandle mAlphaTexture; + // Used for alpha lookup in the pixel shader + GFXTexHandle mAlphaTexture; GFXStateBlockRef mPlacementSB; GFXStateBlockRef mRenderSB; @@ -223,15 +223,15 @@ protected: bool mDirty; - + void SetupShader(); - void SetupBuffers(); + void SetupBuffers(); void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance*); - void renderBuffers(SceneRenderState* state); - void renderArc(const F32 fRadiusX, const F32 fRadiusY); - void renderPlacementArea(const F32 ElapsedTime); - void renderQuad(fxFoliageQuadrantNode* quadNode, const MatrixF& RenderTransform, const bool UseDebug); - void computeAlphaTex(); + void renderBuffers(SceneRenderState* state); + void renderArc(const F32 fRadiusX, const F32 fRadiusY); + void renderPlacementArea(const F32 ElapsedTime); + void renderQuad(fxFoliageQuadrantNode* quadNode, const MatrixF& RenderTransform, const bool UseDebug); + void computeAlphaTex(); public: fxFoliageReplicator(); ~fxFoliageReplicator(); @@ -325,7 +325,7 @@ public: mUseDebugInfo = false; mDebugBoxHeight = 1.0f; mSeed = 1376312589; - mFoliageFile = StringTable->insert(""); + mFoliageFile = StringTable->EmptyString(); mFoliageTexture = GFXTexHandle(); mFoliageCount = 10; mFoliageRetries = 100; diff --git a/Engine/source/T3D/fx/fxShapeReplicator.h b/Engine/source/T3D/fx/fxShapeReplicator.h index 8cd9efa4e..e83f0e113 100644 --- a/Engine/source/T3D/fx/fxShapeReplicator.h +++ b/Engine/source/T3D/fx/fxShapeReplicator.h @@ -153,7 +153,7 @@ public: { // Set Defaults. mSeed = 1376312589; - mShapeFile = StringTable->insert(""); + mShapeFile = StringTable->EmptyString(); mShapeCount = 10; mShapeRetries = 100; mInnerRadiusX = 0; diff --git a/Engine/source/T3D/fx/lightning.cpp b/Engine/source/T3D/fx/lightning.cpp index 125c5891d..027b329e5 100644 --- a/Engine/source/T3D/fx/lightning.cpp +++ b/Engine/source/T3D/fx/lightning.cpp @@ -200,7 +200,7 @@ void LightningStrikeEvent::unpack(NetConnection* con, BitStream* stream) { if(!stream->readFlag()) return; - S32 mClientId = stream->readRangedU32(0, NetConnection::MaxGhostCount); + mClientId = stream->readRangedU32(0, NetConnection::MaxGhostCount); mLightning = NULL; NetObject* pObject = con->resolveGhost(mClientId); if (pObject) @@ -214,10 +214,10 @@ void LightningStrikeEvent::unpack(NetConnection* con, BitStream* stream) // target id S32 mTargetID = stream->readRangedU32(0, NetConnection::MaxGhostCount); - NetObject* pObject = con->resolveGhost(mTargetID); - if( pObject != NULL ) + NetObject* tObject = con->resolveGhost(mTargetID); + if(tObject != NULL ) { - mTarget = dynamic_cast(pObject); + mTarget = dynamic_cast(tObject); } if( bool(mTarget) == false ) { @@ -243,6 +243,7 @@ LightningData::LightningData() dMemset( strikeTextureNames, 0, sizeof( strikeTextureNames ) ); dMemset( strikeTextures, 0, sizeof( strikeTextures ) ); dMemset( thunderSounds, 0, sizeof( thunderSounds ) ); + mNumStrikeTextures = 0; } LightningData::~LightningData() @@ -297,10 +298,14 @@ bool LightningData::preload(bool server, String &errorStr) if( !sfxResolve( &strikeSound, sfxErrorStr ) ) Con::errorf(ConsoleLogEntry::General, "LightningData::preload: Invalid packet: %s", sfxErrorStr.c_str()); + mNumStrikeTextures = 0; for (U32 i = 0; i < MaxTextures; i++) { if (strikeTextureNames[i][0]) + { strikeTextures[i] = GFXTexHandle(strikeTextureNames[i], &GFXDefaultStaticDiffuseProfile, avar("%s() - strikeTextures[%d] (line %d)", __FUNCTION__, i, __LINE__)); + mNumStrikeTextures++; + } } } @@ -317,7 +322,11 @@ void LightningData::packData(BitStream* stream) U32 i; for (i = 0; i < MaxThunders; i++) sfxWrite( stream, thunderSounds[ i ] ); - for (i = 0; i < MaxTextures; i++) { + + stream->writeInt(mNumStrikeTextures, 4); + + for (i = 0; i < MaxTextures; i++) + { stream->writeString(strikeTextureNames[i]); } @@ -331,7 +340,11 @@ void LightningData::unpackData(BitStream* stream) U32 i; for (i = 0; i < MaxThunders; i++) sfxRead( stream, &thunderSounds[ i ] ); - for (i = 0; i < MaxTextures; i++) { + + mNumStrikeTextures = stream->readInt(4); + + for (i = 0; i < MaxTextures; i++) + { strikeTextureNames[i] = stream->readSTString(); } @@ -368,16 +381,16 @@ Lightning::~Lightning() { while( mThunderListHead ) { - Thunder* next = mThunderListHead->next; + Thunder* nextThunder = mThunderListHead->next; delete mThunderListHead; - mThunderListHead = next; + mThunderListHead = nextThunder; } while( mStrikeListHead ) { - Strike* next = mStrikeListHead->next; + Strike* nextStrike = mStrikeListHead->next; delete mStrikeListHead; - mStrikeListHead = next; + mStrikeListHead = nextStrike; } } @@ -478,11 +491,16 @@ void Lightning::renderObject(ObjectRenderInst *ri, SceneRenderState *state, Base desc.setBlend( true, GFXBlendSrcAlpha, GFXBlendOne); desc.setCullMode(GFXCullNone); desc.zWriteEnable = false; - desc.samplersDefined = true; - desc.samplers[0].magFilter = GFXTextureFilterLinear; - desc.samplers[0].minFilter = GFXTextureFilterLinear; - desc.samplers[0].addressModeU = GFXAddressWrap; - desc.samplers[0].addressModeV = GFXAddressWrap; + desc.vertexColorEnable = true; + + if (mDataBlock->mNumStrikeTextures != 0) + { + desc.samplersDefined = true; + desc.samplers[0].magFilter = GFXTextureFilterLinear; + desc.samplers[0].minFilter = GFXTextureFilterLinear; + desc.samplers[0].addressModeU = GFXAddressWrap; + desc.samplers[0].addressModeV = GFXAddressWrap; + } mLightningSB = GFX->createStateBlock(desc); @@ -494,9 +512,16 @@ void Lightning::renderObject(ObjectRenderInst *ri, SceneRenderState *state, Base Strike* walk = mStrikeListHead; while (walk != NULL) { - GFX->setTexture(0, mDataBlock->strikeTextures[0]); + if (mDataBlock->mNumStrikeTextures > 1) + { + GFX->setTexture(0, mDataBlock->strikeTextures[sgLightningRand.randI(0, mDataBlock->mNumStrikeTextures - 1)]); + } + else if (mDataBlock->mNumStrikeTextures > 0) + { + GFX->setTexture(0, mDataBlock->strikeTextures[0]); + } - for( U32 i=0; i<3; i++ ) + for( U32 i=0; ibolt[i].isFading ) { @@ -589,7 +614,7 @@ void Lightning::advanceTime(F32 dt) while (*pWalker != NULL) { Strike* pStrike = *pWalker; - for( U32 i=0; i<3; i++ ) + for( U32 i=0; ibolt[i].update( dt ); } @@ -673,7 +698,7 @@ void Lightning::processEvent(LightningStrikeEvent* pEvent) pStrike->currentAge = 0.0f; pStrike->next = mStrikeListHead; - for( U32 i=0; i<3; i++ ) + for( U32 i=0; ibegin(); itr != pClientGroup->end(); itr++) { @@ -717,6 +743,9 @@ void Lightning::warningFlashes() { LightningStrikeEvent* pEvent = new LightningStrikeEvent; pEvent->mLightning = this; + + pEvent->mStart.x = strikePoint.x; + pEvent->mStart.y = strikePoint.y; nc->postNetEvent(pEvent); } @@ -731,18 +760,19 @@ void Lightning::strikeRandomPoint() Point3F strikePoint( gRandGen.randF( 0.0f, 1.0f ), gRandGen.randF( 0.0f, 1.0f ), 0.0f ); // check if an object is within target range + Point3F worldPosStrikePoint = strikePoint; - strikePoint *= mObjScale; - strikePoint += getPosition(); - strikePoint += Point3F( -mObjScale.x * 0.5f, -mObjScale.y * 0.5f, 0.0f ); + worldPosStrikePoint *= mObjScale; + worldPosStrikePoint += getPosition(); + worldPosStrikePoint += Point3F( -mObjScale.x * 0.5f, -mObjScale.y * 0.5f, 0.0f ); Box3F queryBox; F32 boxWidth = strikeRadius * 2.0f; queryBox.minExtents.set( -boxWidth * 0.5f, -boxWidth * 0.5f, -mObjScale.z * 0.5f ); queryBox.maxExtents.set( boxWidth * 0.5f, boxWidth * 0.5f, mObjScale.z * 0.5f ); - queryBox.minExtents += strikePoint; - queryBox.maxExtents += strikePoint; + queryBox.minExtents += worldPosStrikePoint; + queryBox.maxExtents += worldPosStrikePoint; SimpleQueryList sql; getContainer()->findObjects(queryBox, DAMAGEABLE_TYPEMASK, @@ -837,13 +867,53 @@ void Lightning::strikeRandomPoint() } //-------------------------------------------------------------------------- -void Lightning::strikeObject(ShapeBase*) +void Lightning::strikeObject(ShapeBase* targetObj) { AssertFatal(isServerObject(), "Error, client objects may not initiate lightning!"); - AssertFatal(false, "Lightning::strikeObject is not implemented."); -} + Point3F strikePoint = targetObj->getPosition(); + Point3F objectCenter; + Box3F wb = getWorldBox(); + if (!wb.isContained(strikePoint)) + return; + + Point3F targetRel = strikePoint - getPosition(); + Point3F length(wb.len_x() / 2.0f, wb.len_y() / 2.0f, wb.len_z() / 2.0f); + + Point3F strikePos = targetRel / length; + + bool playerInWarmup = false; + Player *playerObj = dynamic_cast< Player * >(targetObj); + if (playerObj) + { + if (!playerObj->getControllingClient()) + { + playerInWarmup = true; + } + } + + if (!playerInWarmup) + { + applyDamage_callback(targetObj->getWorldSphere().center, VectorF(0.0, 0.0, 1.0), targetObj); + } + + SimGroup* pClientGroup = Sim::getClientGroup(); + for (SimGroup::iterator itr = pClientGroup->begin(); itr != pClientGroup->end(); itr++) { + NetConnection* nc = static_cast(*itr); + if (nc != NULL) + { + LightningStrikeEvent* pEvent = new LightningStrikeEvent; + pEvent->mLightning = this; + + pEvent->mStart.x = strikePoint.x; + pEvent->mStart.y = strikePoint.y; + pEvent->mTarget = targetObj; + + nc->postNetEvent(pEvent); + } + } +} //-------------------------------------------------------------------------- U32 Lightning::packUpdate(NetConnection* con, U32 mask, BitStream* stream) @@ -864,6 +934,7 @@ U32 Lightning::packUpdate(NetConnection* con, U32 mask, BitStream* stream) stream->write(color.red); stream->write(color.green); stream->write(color.blue); + stream->write(color.alpha); stream->write(fadeColor.red); stream->write(fadeColor.green); stream->write(fadeColor.blue); @@ -895,6 +966,7 @@ void Lightning::unpackUpdate(NetConnection* con, BitStream* stream) stream->read(&color.red); stream->read(&color.green); stream->read(&color.blue); + stream->read(&color.alpha); stream->read(&fadeColor.red); stream->read(&fadeColor.green); stream->read(&fadeColor.blue); @@ -930,7 +1002,7 @@ DefineEngineMethod(Lightning, strikeRandomPoint, void, (),, object->strikeRandomPoint(); } -DefineEngineMethod(Lightning, strikeObject, void, (ShapeBase* pSB),, +DefineEngineMethod(Lightning, strikeObject, void, (ShapeBase* pSB), (nullAsType()), "Creates a LightningStrikeEvent which strikes a specific object.\n" "@note This method is currently unimplemented.\n" ) { @@ -1154,7 +1226,7 @@ void LightningBolt::generateMinorNodes() //---------------------------------------------------------------------------- // Recursive algo to create bolts that split off from main bolt //---------------------------------------------------------------------------- -void LightningBolt::createSplit( const Point3F &startPoint, const Point3F &endPoint, U32 depth, F32 width ) +void LightningBolt::createSplit( const Point3F &startingPoint, const Point3F &endingPoint, U32 depth, F32 splitWidth ) { if( depth == 0 ) return; @@ -1163,17 +1235,17 @@ void LightningBolt::createSplit( const Point3F &startPoint, const Point3F &endPo if( chanceToEnd > 0.70f ) return; - if( width < 0.75f ) - width = 0.75f; + if(splitWidth < 0.75f ) + splitWidth = 0.75f; - VectorF diff = endPoint - startPoint; + VectorF diff = endingPoint - startingPoint; F32 length = diff.len(); diff.normalizeSafe(); LightningBolt newBolt; - newBolt.startPoint = startPoint; - newBolt.endPoint = endPoint; - newBolt.width = width; + newBolt.startPoint = startingPoint; + newBolt.endPoint = endingPoint; + newBolt.width = splitWidth; newBolt.numMajorNodes = 3; newBolt.maxMajorAngle = 30.0f; newBolt.numMinorNodes = 3; @@ -1184,13 +1256,13 @@ void LightningBolt::createSplit( const Point3F &startPoint, const Point3F &endPo splitList.pushBack( newBolt ); VectorF newDir1 = MathUtils::randomDir( diff, 10.0f, 45.0f ); - Point3F newEndPoint1 = endPoint + newDir1 * gRandGen.randF( 0.5f, 1.5f ) * length; + Point3F newEndPoint1 = endingPoint + newDir1 * gRandGen.randF( 0.5f, 1.5f ) * length; VectorF newDir2 = MathUtils::randomDir( diff, 10.0f, 45.0f ); - Point3F newEndPoint2 = endPoint + newDir2 * gRandGen.randF( 0.5f, 1.5f ) * length; + Point3F newEndPoint2 = endingPoint + newDir2 * gRandGen.randF( 0.5f, 1.5f ) * length; - createSplit( endPoint, newEndPoint1, depth - 1, width * 0.30f ); - createSplit( endPoint, newEndPoint2, depth - 1, width * 0.30f ); + createSplit(endingPoint, newEndPoint1, depth - 1, splitWidth * 0.30f ); + createSplit(endingPoint, newEndPoint2, depth - 1, splitWidth * 0.30f ); } diff --git a/Engine/source/T3D/fx/lightning.h b/Engine/source/T3D/fx/lightning.h index 20620fca5..ed08bbd82 100644 --- a/Engine/source/T3D/fx/lightning.h +++ b/Engine/source/T3D/fx/lightning.h @@ -47,6 +47,7 @@ class ShapeBase; class LightningStrikeEvent; class SFXTrack; +#define MAX_LIGHTNING 3 // ------------------------------------------------------------------------- class LightningData : public GameBaseData @@ -70,6 +71,7 @@ class LightningData : public GameBaseData GFXTexHandle strikeTextures[MaxTextures]; U32 numThunders; + U32 mNumStrikeTextures; protected: bool onAdd(); @@ -227,7 +229,7 @@ class Lightning : public GameBase void warningFlashes(); void strikeRandomPoint(); - void strikeObject(ShapeBase*); + void strikeObject(ShapeBase* targetObj); void processEvent(LightningStrikeEvent*); DECLARE_CONOBJECT(Lightning); diff --git a/Engine/source/T3D/fx/particleEmitterNode.cpp b/Engine/source/T3D/fx/particleEmitterNode.cpp index bb362417b..e03e5a1a7 100644 --- a/Engine/source/T3D/fx/particleEmitterNode.cpp +++ b/Engine/source/T3D/fx/particleEmitterNode.cpp @@ -395,7 +395,7 @@ void ParticleEmitterNode::setEmitterDataBlock(ParticleEmitterData* data) } -DefineEngineMethod(ParticleEmitterNode, setEmitterDataBlock, void, (ParticleEmitterData* emitterDatablock), (NULL), +DefineEngineMethod(ParticleEmitterNode, setEmitterDataBlock, void, (ParticleEmitterData* emitterDatablock), (nullAsType()), "Assigns the datablock for this emitter node.\n" "@param emitterDatablock ParticleEmitterData datablock to assign\n" "@tsexample\n" diff --git a/Engine/source/T3D/fx/precipitation.cpp b/Engine/source/T3D/fx/precipitation.cpp index 19855e26f..232e8ca72 100644 --- a/Engine/source/T3D/fx/precipitation.cpp +++ b/Engine/source/T3D/fx/precipitation.cpp @@ -129,10 +129,10 @@ PrecipitationData::PrecipitationData() { soundProfile = NULL; - mDropName = StringTable->insert(""); - mDropShaderName = StringTable->insert(""); - mSplashName = StringTable->insert(""); - mSplashShaderName = StringTable->insert(""); + mDropName = StringTable->EmptyString(); + mDropShaderName = StringTable->EmptyString(); + mSplashName = StringTable->EmptyString(); + mSplashShaderName = StringTable->EmptyString(); mDropsPerSide = 4; mSplashesPerSide = 2; diff --git a/Engine/source/T3D/fx/ribbon.cpp b/Engine/source/T3D/fx/ribbon.cpp index 6ebcfc932..ef5276857 100644 --- a/Engine/source/T3D/fx/ribbon.cpp +++ b/Engine/source/T3D/fx/ribbon.cpp @@ -57,7 +57,7 @@ RibbonData::RibbonData() mUseFadeOut = false; mFadeAwayStep = 0.032f; segmentsPerUpdate = 1; - mMatName = StringTable->insert(""); + mMatName = StringTable->EmptyString(); mTileScale = 1.0f; mFixedTexcoords = false; mSegmentSkipAmount = 0; @@ -318,7 +318,7 @@ void Ribbon::processTick(const Move* move) safeDeleteObject(); return; //} - //mSegmentPoints.pop_back(); + //mSegmentPoints.pop_back(); } @@ -456,7 +456,7 @@ void Ribbon::setShaderParams() { F32 length = (F32)mDataBlock->mRibbonLength; Point3F radius(numSegments / length, numSegments, length); MaterialParameters* matParams = mRibbonMat->getMaterialParameters(); - matParams->setSafe( mRadiusSC, radius ); + matParams->setSafe( mRadiusSC, radius ); } //-------------------------------------------------------------------------- diff --git a/Engine/source/T3D/fx/ribbonNode.cpp b/Engine/source/T3D/fx/ribbonNode.cpp index 2582fbe6f..7e73fbc59 100644 --- a/Engine/source/T3D/fx/ribbonNode.cpp +++ b/Engine/source/T3D/fx/ribbonNode.cpp @@ -39,7 +39,6 @@ ConsoleDocClass( RibbonNodeData, ConsoleDocClass( RibbonNode, "" ); - //----------------------------------------------------------------------------- // RibbonNodeData //----------------------------------------------------------------------------- @@ -299,7 +298,7 @@ void RibbonNode::setRibbonDatablock(RibbonData* data) mRibbonDatablock = data; } -DefineEngineMethod(RibbonNode, setRibbonDatablock, void, (RibbonData* ribbonDatablock), (0), +DefineEngineMethod(RibbonNode, setRibbonDatablock, void, (RibbonData* ribbonDatablock), (nullAsType()), "Assigns the datablock for this ribbon node.\n" "@param ribbonDatablock RibbonData datablock to assign\n" "@tsexample\n" diff --git a/Engine/source/T3D/lightFlareData.cpp b/Engine/source/T3D/lightFlareData.cpp index 8ea67cb7a..1eec3a923 100644 --- a/Engine/source/T3D/lightFlareData.cpp +++ b/Engine/source/T3D/lightFlareData.cpp @@ -440,7 +440,7 @@ void LightFlareData::prepRender(SceneRenderState *state, LightFlareState *flareS // We can only skip rendering if the light is not // visible, and it has elapsed the fade out time. if (mIsZero(occlusionFade) || - !lightVisible && visDelta > FadeOutTime) + (!lightVisible && visDelta > FadeOutTime)) return; const RectI &viewport = GFX->getViewport(); diff --git a/Engine/source/T3D/missionMarker.cpp b/Engine/source/T3D/missionMarker.cpp index 3a043b095..1480e2f1f 100644 --- a/Engine/source/T3D/missionMarker.cpp +++ b/Engine/source/T3D/missionMarker.cpp @@ -225,7 +225,7 @@ ConsoleDocClass( WayPoint, WayPoint::WayPoint() { - mName = StringTable->insert(""); + mName = StringTable->EmptyString(); } void WayPoint::setHidden(bool hidden) @@ -256,7 +256,7 @@ void WayPoint::inspectPostApply() { Parent::inspectPostApply(); if(!mName || !mName[0]) - mName = StringTable->insert(""); + mName = StringTable->EmptyString(); setMaskBits(UpdateNameMask|UpdateTeamMask); } @@ -281,7 +281,7 @@ void WayPoint::unpackUpdate(NetConnection * con, BitStream * stream) void WayPoint::initPersistFields() { - addGroup("Misc"); + addGroup("Misc"); addField("markerName", TypeCaseString, Offset(mName, WayPoint), "Unique name representing this waypoint"); endGroup("Misc"); Parent::initPersistFields(); @@ -363,7 +363,7 @@ bool SpawnSphere::onAdd() if (!isGhost()) { - onAdd_callback( getId()); + onAdd_callback( getId()); if (mAutoSpawn) spawnObject(); @@ -527,7 +527,7 @@ ConsoleDocClass( CameraBookmark, CameraBookmark::CameraBookmark() { - mName = StringTable->insert(""); + mName = StringTable->EmptyString(); } bool CameraBookmark::onAdd() @@ -571,7 +571,7 @@ void CameraBookmark::inspectPostApply() { Parent::inspectPostApply(); if(!mName || !mName[0]) - mName = StringTable->insert(""); + mName = StringTable->EmptyString(); setMaskBits(UpdateNameMask); if( isMethod("onInspectPostApply") ) @@ -595,7 +595,7 @@ void CameraBookmark::unpackUpdate(NetConnection * con, BitStream * stream) void CameraBookmark::initPersistFields() { - //addGroup("Misc"); + //addGroup("Misc"); //addField("name", TypeCaseString, Offset(mName, CameraBookmark)); //endGroup("Misc"); diff --git a/Engine/source/T3D/physics/bullet/bt.h b/Engine/source/T3D/physics/bullet/bt.h index 394fdc7de..76b3ee71b 100644 --- a/Engine/source/T3D/physics/bullet/bt.h +++ b/Engine/source/T3D/physics/bullet/bt.h @@ -39,10 +39,4 @@ #include #include -#include -#include -#include -#include - - -#endif // _BULLET_H_ \ No newline at end of file +#endif // _BULLET_H_ diff --git a/Engine/source/T3D/physics/bullet/btBody.cpp b/Engine/source/T3D/physics/bullet/btBody.cpp index f89785854..33d0240a4 100644 --- a/Engine/source/T3D/physics/bullet/btBody.cpp +++ b/Engine/source/T3D/physics/bullet/btBody.cpp @@ -356,6 +356,35 @@ void BtBody::applyImpulse( const Point3F &origin, const Point3F &force ) mActor->activate(); } +void BtBody::applyTorque( const Point3F &torque ) +{ + AssertFatal(mActor, "BtBody::applyTorque - The actor is null!"); + AssertFatal(isDynamic(), "BtBody::applyTorque - This call is only for dynamics!"); + + mActor->applyTorque( btCast(torque) ); + + if (!mActor->isActive()) + mActor->activate(); +} + +void BtBody::applyForce( const Point3F &force ) +{ + AssertFatal(mActor, "BtBody::applyForce - The actor is null!"); + AssertFatal(isDynamic(), "BtBody::applyForce - This call is only for dynamics!"); + + if (mCenterOfMass) + { + Point3F relForce(force); + mCenterOfMass->mulV(relForce); + mActor->applyCentralForce(btCast(relForce)); + } + else + mActor->applyCentralForce(btCast(force)); + + if (!mActor->isActive()) + mActor->activate(); +} + Box3F BtBody::getWorldBounds() { btVector3 min, max; diff --git a/Engine/source/T3D/physics/bullet/btBody.h b/Engine/source/T3D/physics/bullet/btBody.h index 2d138e7e1..84b7dddc0 100644 --- a/Engine/source/T3D/physics/bullet/btBody.h +++ b/Engine/source/T3D/physics/bullet/btBody.h @@ -111,7 +111,8 @@ public: F32 staticFriction ); virtual void applyCorrection( const MatrixF &xfm ); virtual void applyImpulse( const Point3F &origin, const Point3F &force ); - + virtual void applyTorque( const Point3F &torque ); + virtual void applyForce( const Point3F &force ); virtual void findContact(SceneObject **contactObject, VectorF *contactNormal, Vector *outOverlapObjects) const; virtual void moveKinematicTo(const MatrixF &xfm); diff --git a/Engine/source/T3D/physics/bullet/btCollision.cpp b/Engine/source/T3D/physics/bullet/btCollision.cpp index d81bd2c5b..477c1b261 100644 --- a/Engine/source/T3D/physics/bullet/btCollision.cpp +++ b/Engine/source/T3D/physics/bullet/btCollision.cpp @@ -28,6 +28,42 @@ #include "T3D/physics/bullet/bt.h" #include "T3D/physics/bullet/btCasts.h" +class btHeightfieldTerrainShapeCustom : public btHeightfieldTerrainShape +{ + bool* mHoles; + +public: + btHeightfieldTerrainShapeCustom(const bool *holes, + int heightStickWidth, + int heightStickLength, + const void* heightfieldData, + btScalar heightScale, + btScalar minHeight, + btScalar maxHeight, + int upAxis, + PHY_ScalarType heightDataType, + bool flipQuadEdges) : btHeightfieldTerrainShape(heightStickWidth, + heightStickLength, + heightfieldData, + heightScale, + minHeight, + maxHeight, + upAxis, + heightDataType, + flipQuadEdges) + { + mHoles = new bool[heightStickWidth * heightStickLength]; + dMemcpy(mHoles, holes, heightStickWidth * heightStickLength * sizeof(bool)); + } + + virtual ~btHeightfieldTerrainShapeCustom() + { + delete[] mHoles; + } + + virtual void processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const; +}; + BtCollision::BtCollision() : mCompound( NULL ), @@ -170,13 +206,15 @@ bool BtCollision::addHeightfield( const U16 *heights, const F32 minHeight = 0; const F32 maxHeight = 65535 * heightScale; - btHeightfieldTerrainShape *shape = new btHeightfieldTerrainShape( blockSize, blockSize, - (void*)heights, - heightScale, - minHeight, maxHeight, - 2, // Z up! - PHY_SHORT, - false ); + btHeightfieldTerrainShapeCustom* shape = new btHeightfieldTerrainShapeCustom(holes, + blockSize, blockSize, + reinterpret_cast(heights), + heightScale, + 0, 0xFFFF * heightScale, + 2, // Z up! + PHY_SHORT, + false); + shape->setMargin( 0.01f ); shape->setLocalScaling( btVector3( metersPerSample, metersPerSample, 1.0f ) ); shape->setUseDiamondSubdivision( true ); @@ -203,3 +241,116 @@ bool BtCollision::addHeightfield( const U16 *heights, return true; } + +void btHeightfieldTerrainShapeCustom::processAllTriangles(btTriangleCallback* callback, const btVector3& aabbMin, const btVector3& aabbMax) const +{ + // scale down the input aabb's so they are in local (non-scaled) coordinates + btVector3 localAabbMin = aabbMin * btVector3(1.f / m_localScaling[0], 1.f / m_localScaling[1], 1.f / m_localScaling[2]); + btVector3 localAabbMax = aabbMax * btVector3(1.f / m_localScaling[0], 1.f / m_localScaling[1], 1.f / m_localScaling[2]); + + // account for local origin + localAabbMin += m_localOrigin; + localAabbMax += m_localOrigin; + + //quantize the aabbMin and aabbMax, and adjust the start/end ranges + int quantizedAabbMin[3]; + int quantizedAabbMax[3]; + quantizeWithClamp(quantizedAabbMin, localAabbMin, 0); + quantizeWithClamp(quantizedAabbMax, localAabbMax, 1); + + // expand the min/max quantized values + // this is to catch the case where the input aabb falls between grid points! + for (int i = 0; i < 3; ++i) { + quantizedAabbMin[i]--; + quantizedAabbMax[i]++; + } + + int startX = 0; + int endX = m_heightStickWidth - 1; + int startJ = 0; + int endJ = m_heightStickLength - 1; + + switch (m_upAxis) + { + case 0: + { + if (quantizedAabbMin[1] > startX) + startX = quantizedAabbMin[1]; + if (quantizedAabbMax[1] < endX) + endX = quantizedAabbMax[1]; + if (quantizedAabbMin[2] > startJ) + startJ = quantizedAabbMin[2]; + if (quantizedAabbMax[2] < endJ) + endJ = quantizedAabbMax[2]; + break; + } + case 1: + { + if (quantizedAabbMin[0] > startX) + startX = quantizedAabbMin[0]; + if (quantizedAabbMax[0] < endX) + endX = quantizedAabbMax[0]; + if (quantizedAabbMin[2] > startJ) + startJ = quantizedAabbMin[2]; + if (quantizedAabbMax[2] < endJ) + endJ = quantizedAabbMax[2]; + break; + }; + case 2: + { + if (quantizedAabbMin[0] > startX) + startX = quantizedAabbMin[0]; + if (quantizedAabbMax[0] < endX) + endX = quantizedAabbMax[0]; + if (quantizedAabbMin[1] > startJ) + startJ = quantizedAabbMin[1]; + if (quantizedAabbMax[1] < endJ) + endJ = quantizedAabbMax[1]; + break; + } + default: + { + //need to get valid m_upAxis + btAssert(0); + } + } + + for (int j = startJ; j < endJ; j++) + { + for (int x = startX; x < endX; x++) + { + U32 index = (m_heightStickLength - (m_heightStickLength - x - 1)) + (j * m_heightStickWidth); + + if (mHoles && mHoles[getMax((S32)index - 1, 0)]) + continue; + + btVector3 vertices[3]; + if (m_flipQuadEdges || (m_useDiamondSubdivision && !((j + x) & 1)) || (m_useZigzagSubdivision && !(j & 1))) + { + //first triangle + getVertex(x, j, vertices[0]); + getVertex(x, j + 1, vertices[1]); + getVertex(x + 1, j + 1, vertices[2]); + callback->processTriangle(vertices, x, j); + //second triangle + // getVertex(x,j,vertices[0]);//already got this vertex before, thanks to Danny Chapman + getVertex(x + 1, j + 1, vertices[1]); + getVertex(x + 1, j, vertices[2]); + callback->processTriangle(vertices, x, j); + } + else + { + //first triangle + getVertex(x, j, vertices[0]); + getVertex(x, j + 1, vertices[1]); + getVertex(x + 1, j, vertices[2]); + callback->processTriangle(vertices, x, j); + //second triangle + getVertex(x + 1, j, vertices[0]); + //getVertex(x,j+1,vertices[1]); + getVertex(x + 1, j + 1, vertices[2]); + callback->processTriangle(vertices, x, j); + } + } + } +} \ No newline at end of file diff --git a/Engine/source/T3D/physics/bullet/btPlayer.cpp b/Engine/source/T3D/physics/bullet/btPlayer.cpp index 793f6053c..2d412ddb9 100644 --- a/Engine/source/T3D/physics/bullet/btPlayer.cpp +++ b/Engine/source/T3D/physics/bullet/btPlayer.cpp @@ -342,7 +342,7 @@ void BtPlayer::_stepForward( btVector3 *inOutCurrPos, const btVector3 &displacem start.setOrigin( *inOutCurrPos ); end.setOrigin( *inOutCurrPos + disp ); - BtPlayerSweepCallback callback( mGhostObject, disp.length2() > 0.0f ? disp.normalized() : disp ); + BtPlayerSweepCallback callback( mGhostObject, disp.length2() > SIMD_EPSILON ? disp.normalized() : disp ); callback.m_collisionFilterGroup = mGhostObject->getBroadphaseHandle()->m_collisionFilterGroup; callback.m_collisionFilterMask = mGhostObject->getBroadphaseHandle()->m_collisionFilterMask; diff --git a/Engine/source/T3D/physics/bullet/btWorld.cpp b/Engine/source/T3D/physics/bullet/btWorld.cpp index 231b1e3e1..0ad7418b8 100644 --- a/Engine/source/T3D/physics/bullet/btWorld.cpp +++ b/Engine/source/T3D/physics/bullet/btWorld.cpp @@ -33,11 +33,6 @@ #include "console/consoleTypes.h" #include "scene/sceneRenderState.h" #include "T3D/gameBase/gameProcess.h" -#ifdef _WIN32 -#include "BulletMultiThreaded/Win32ThreadSupport.h" -#elif defined (USE_PTHREADS) -#include "BulletMultiThreaded/PosixThreadSupport.h" -#endif BtWorld::BtWorld() : mProcessList( NULL ), @@ -46,8 +41,7 @@ BtWorld::BtWorld() : mTickCount( 0 ), mIsEnabled( false ), mEditorTimeScale( 1.0f ), - mDynamicsWorld( NULL ), - mThreadSupportCollision( NULL ) + mDynamicsWorld( NULL ) { } @@ -59,33 +53,7 @@ bool BtWorld::initWorld( bool isServer, ProcessList *processList ) { // Collision configuration contains default setup for memory, collision setup. mCollisionConfiguration = new btDefaultCollisionConfiguration(); - - // TODO: There is something wrong with multithreading - // and compound convex shapes... so disable it for now. - static const U32 smMaxThreads = 1; - - // Different initialization with threading enabled. - if ( smMaxThreads > 1 ) - { - - // TODO: ifdef assumes smMaxThread is always one at this point. MACOSX support to be decided -#ifdef WIN32 - mThreadSupportCollision = new Win32ThreadSupport( - Win32ThreadSupport::Win32ThreadConstructionInfo( isServer ? "bt_servercol" : "bt_clientcol", - processCollisionTask, - createCollisionLocalStoreMemory, - smMaxThreads ) ); - - mDispatcher = new SpuGatheringCollisionDispatcher( mThreadSupportCollision, - smMaxThreads, - mCollisionConfiguration ); -#endif // WIN32 - } - else - { - mThreadSupportCollision = NULL; - mDispatcher = new btCollisionDispatcher( mCollisionConfiguration ); - } + mDispatcher = new btCollisionDispatcher( mCollisionConfiguration ); btVector3 worldMin( -2000, -2000, -1000 ); btVector3 worldMax( 2000, 2000, 1000 ); @@ -134,7 +102,6 @@ void BtWorld::_destroy() SAFE_DELETE( mSolver ); SAFE_DELETE( mBroadphase ); SAFE_DELETE( mDispatcher ); - SAFE_DELETE( mThreadSupportCollision ); SAFE_DELETE( mCollisionConfiguration ); } @@ -144,20 +111,20 @@ void BtWorld::tickPhysics( U32 elapsedMs ) return; // Did we forget to call getPhysicsResults somewhere? - AssertFatal( !mIsSimulating, "PhysXWorld::tickPhysics() - Already simulating!" ); + AssertFatal( !mIsSimulating, "BtWorld::tickPhysics() - Already simulating!" ); // The elapsed time should be non-zero and // a multiple of TickMs! AssertFatal( elapsedMs != 0 && - ( elapsedMs % TickMs ) == 0 , "PhysXWorld::tickPhysics() - Got bad elapsed time!" ); + ( elapsedMs % TickMs ) == 0 , "BtWorld::tickPhysics() - Got bad elapsed time!" ); PROFILE_SCOPE(BtWorld_TickPhysics); // Convert it to seconds. const F32 elapsedSec = (F32)elapsedMs * 0.001f; - // Simulate... it is recommended to always use Bullet's default fixed timestep/ - mDynamicsWorld->stepSimulation( elapsedSec * mEditorTimeScale ); + // Simulate + mDynamicsWorld->stepSimulation( elapsedSec * mEditorTimeScale, smPhysicsMaxSubSteps, smPhysicsStepTime); mIsSimulating = true; diff --git a/Engine/source/T3D/physics/bullet/btWorld.h b/Engine/source/T3D/physics/bullet/btWorld.h index e859a671a..f625371a3 100644 --- a/Engine/source/T3D/physics/bullet/btWorld.h +++ b/Engine/source/T3D/physics/bullet/btWorld.h @@ -37,7 +37,6 @@ #endif class ProcessList; -class btThreadSupportInterface; class PhysicsBody; @@ -54,7 +53,6 @@ protected: btCollisionDispatcher *mDispatcher; btConstraintSolver *mSolver; btDefaultCollisionConfiguration *mCollisionConfiguration; - btThreadSupportInterface *mThreadSupportCollision; bool mErrorReport; diff --git a/Engine/source/T3D/physics/physicsBody.h b/Engine/source/T3D/physics/physicsBody.h index 8d5a3e05f..28cf95d45 100644 --- a/Engine/source/T3D/physics/physicsBody.h +++ b/Engine/source/T3D/physics/physicsBody.h @@ -114,6 +114,13 @@ public: /// virtual void applyImpulse( const Point3F &origin, const Point3F &force ) = 0; + /// + virtual void applyTorque( const Point3F &torque ) = 0; + + /// + virtual void applyForce( const Point3F &force ) = 0; + + virtual void findContact(SceneObject **contactObject, VectorF *contactNormal, Vector *outOverlapObjects) const = 0; diff --git a/Engine/source/T3D/physics/physicsShape.cpp b/Engine/source/T3D/physics/physicsShape.cpp index 837de018f..627b38a35 100644 --- a/Engine/source/T3D/physics/physicsShape.cpp +++ b/Engine/source/T3D/physics/physicsShape.cpp @@ -857,6 +857,18 @@ void PhysicsShape::applyImpulse( const Point3F &pos, const VectorF &vec ) mPhysicsRep->applyImpulse( pos, vec ); } +void PhysicsShape::applyTorque( const Point3F &torque ) +{ + if (mPhysicsRep && mPhysicsRep->isDynamic()) + mPhysicsRep->applyTorque( torque ); +} + +void PhysicsShape::applyForce( const Point3F &force ) +{ + if (mPhysicsRep && mPhysicsRep->isDynamic()) + mPhysicsRep->applyForce( force ); +} + void PhysicsShape::applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) { if ( !mPhysicsRep || !mPhysicsRep->isDynamic() ) @@ -1179,4 +1191,20 @@ DefineEngineMethod( PhysicsShape, restore, void, (),, "Has no effect if the shape is not destroyed.\n\n") { object->restore(); +} + +DefineEngineMethod( PhysicsShape, applyTorque, void, (Point3F torque), , + "@brief Add a torque to a dynamic physics shape.\n\n" + "@param torque to apply to the dynamic physics shape\n" + "@note This value is ignored on physics shapes that are not dynamic. Wakes up the dynamic physics shape if it is sleeping.\n") +{ + object->applyTorque( torque ); +} + +DefineEngineMethod(PhysicsShape, applyForce, void, (Point3F force), , + "@brief Add a force to a dynamic physics shape.\n\n" + "@param force to apply to the dynamic physics shape\n" + "@note This value is ignored on physics shapes that are not dynamic. Wakes up the dynamic physics shape if it is sleeping.\n") +{ + object->applyForce( force ); } \ No newline at end of file diff --git a/Engine/source/T3D/physics/physicsShape.h b/Engine/source/T3D/physics/physicsShape.h index 65394183e..92092df64 100644 --- a/Engine/source/T3D/physics/physicsShape.h +++ b/Engine/source/T3D/physics/physicsShape.h @@ -246,6 +246,8 @@ public: Point3F getVelocity() const { return mState.linVelocity; } void applyImpulse( const Point3F &pos, const VectorF &vec ); void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ); + void applyTorque( const Point3F &torque ); + void applyForce( const Point3F &force ); void setScale(const VectorF & scale); // GameBase diff --git a/Engine/source/T3D/physics/physicsWorld.cpp b/Engine/source/T3D/physics/physicsWorld.cpp index 7b1f49b3a..65b254885 100644 --- a/Engine/source/T3D/physics/physicsWorld.cpp +++ b/Engine/source/T3D/physics/physicsWorld.cpp @@ -23,6 +23,9 @@ #include "platform/platform.h" #include "T3D/physics/physicsWorld.h" +//Physics timing +F32 PhysicsWorld::smPhysicsStepTime = 1.0f / 60.f; //default 60fps +U32 PhysicsWorld::smPhysicsMaxSubSteps = 4; PhysicsWorld::PhysicsWorld() : mGravity( 0, 0, -20.0f ) // NOTE: This matches the gravity used for player objects. diff --git a/Engine/source/T3D/physics/physicsWorld.h b/Engine/source/T3D/physics/physicsWorld.h index 115c32324..a18cffb98 100644 --- a/Engine/source/T3D/physics/physicsWorld.h +++ b/Engine/source/T3D/physics/physicsWorld.h @@ -111,6 +111,10 @@ public: virtual PhysicsBody* castRay( const Point3F &start, const Point3F &end, U32 bodyTypes = BT_All ) = 0; virtual void explosion( const Point3F &pos, F32 radius, F32 forceMagnitude ) = 0; + + /// Physics timing + static F32 smPhysicsStepTime; + static U32 smPhysicsMaxSubSteps; }; diff --git a/Engine/source/T3D/physics/physx/px.h b/Engine/source/T3D/physics/physx/px.h deleted file mode 100644 index 856035cf7..000000000 --- a/Engine/source/T3D/physics/physx/px.h +++ /dev/null @@ -1,80 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -// -// This PhysX implementation for Torque was originally based on -// the "PhysX in TGEA" resource written by Shannon Scarvaci. -// -// http://www.garagegames.com/index.php?sec=mg&mod=resource&page=view&qid=12711 -// - -#ifndef _PHYSX_H_ -#define _PHYSX_H_ - -/* -#ifndef _TORQUE_TYPES_H_ -# include "platform/types.h" -#endif -*/ - -#include "platform/tmm_off.h" - -#ifdef TORQUE_DEBUG -#include -#endif - -#if defined(TORQUE_OS_MAC) && !defined(__APPLE__) - #define __APPLE__ -#elif defined(TORQUE_OS_LINUX) && !defined(LINUX) - #define LINUX -#elif defined(TORQUE_OS_WIN) && !defined(WIN32) - #define WIN32 -#endif - -#ifndef NX_PHYSICS_NXPHYSICS -#include -#endif -#ifndef NX_FOUNDATION_NXSTREAM -#include -#endif -#ifndef NX_COOKING_H -#include -#endif -#ifndef NX_FOUNDATION_NXUSEROUTPUTSTREAM -#include -#endif -#ifndef NX_PHYSICS_NXBIG -#include "NxExtended.h" -#endif -#include -#include -#include -#include -#include -#include - -/// The single global physx sdk object for this process. -extern NxPhysicsSDK *gPhysicsSDK; - -#include "platform/tmm_on.h" - -#endif // _PHYSX_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxBody.cpp b/Engine/source/T3D/physics/physx/pxBody.cpp deleted file mode 100644 index de889139c..000000000 --- a/Engine/source/T3D/physics/physx/pxBody.cpp +++ /dev/null @@ -1,404 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxBody.h" - -#include "T3D/physics/physX/px.h" -#include "T3D/physics/physX/pxCasts.h" -#include "T3D/physics/physX/pxWorld.h" -#include "T3D/physics/physX/pxCollision.h" - - -PxBody::PxBody() : - mActor( NULL ), - mMaterial( NULL ), - mWorld( NULL ), - mBodyFlags( 0 ), - mIsEnabled( true ) -{ -} - -PxBody::~PxBody() -{ - _releaseActor(); -} - -void PxBody::_releaseActor() -{ - if ( !mActor ) - return; - - // This sucks, but it has to happen if we want - // to avoid write lock errors from PhysX right now. - mWorld->releaseWriteLock(); - - mActor->userData = NULL; - - mWorld->releaseActor( *mActor ); - mActor = NULL; - mBodyFlags = 0; - - if ( mMaterial ) - { - mWorld->releaseMaterial( *mMaterial ); - mMaterial = NULL; - } - - mColShape = NULL; -} - -bool PxBody::init( PhysicsCollision *shape, - F32 mass, - U32 bodyFlags, - SceneObject *obj, - PhysicsWorld *world ) -{ - AssertFatal( obj, "PxBody::init - Got a null scene object!" ); - AssertFatal( world, "PxBody::init - Got a null world!" ); - AssertFatal( dynamic_cast( world ), "PxBody::init - The world is the wrong type!" ); - AssertFatal( shape, "PxBody::init - Got a null collision shape!" ); - AssertFatal( dynamic_cast( shape ), "PxBody::init - The collision shape is the wrong type!" ); - AssertFatal( !((PxCollision*)shape)->getShapes().empty(), "PxBody::init - Got empty collision shape!" ); - - // Cleanup any previous actor. - _releaseActor(); - - mWorld = (PxWorld*)world; - mColShape = (PxCollision*)shape; - mBodyFlags = bodyFlags; - - NxActorDesc actorDesc; - NxBodyDesc bodyDesc; - - const bool isKinematic = mBodyFlags & BF_KINEMATIC; - const bool isTrigger = mBodyFlags & BF_TRIGGER; - const bool isDebris = mBodyFlags & BF_DEBRIS; - - if ( isKinematic ) - { - // Kinematics are dynamics... so they need - // a body description. - actorDesc.body = &bodyDesc; - bodyDesc.mass = getMax( mass, 1.0f ); - bodyDesc.flags |= NX_BF_KINEMATIC; - } - else if ( mass > 0.0f ) - { - // We have mass so its a dynamic. - actorDesc.body = &bodyDesc; - bodyDesc.mass = mass; - } - - if ( isTrigger ) - actorDesc.flags |= NX_AF_DISABLE_RESPONSE; - - // Add all the shapes. - const Vector &shapes = mColShape->getShapes(); - for ( U32 i=0; i < shapes.size(); i++ ) - { - NxShapeDesc *desc = shapes[i]; - - // If this hits then something is broken with - // this descrption... check all the fields to be - // sure their values are correctly filled out. - AssertFatal( desc->isValid(), "PxBody::init - Got invalid shape description!" ); - - if ( isTrigger ) - desc->group = 31; - - if ( isDebris ) - desc->group = 30; - - actorDesc.shapes.push_back( desc ); - } - - // This sucks, but it has to happen if we want - // to avoid write lock errors from PhysX right now. - mWorld->releaseWriteLock(); - - mActor = mWorld->getScene()->createActor( actorDesc ); - mIsEnabled = true; - - if ( isDebris ) - mActor->setDominanceGroup( 31 ); - - mUserData.setObject( obj ); - mUserData.setBody( this ); - mActor->userData = &mUserData; - - return true; -} - -void PxBody::setMaterial( F32 restitution, - F32 friction, - F32 staticFriction ) -{ - AssertFatal( mActor, "PxBody::setMaterial - The actor is null!" ); - - // If the body is dynamic then wake it up as - // it may need to change behavior. - if ( isDynamic() ) - mActor->wakeUp(); - - NxMaterialDesc desc; - desc.restitution = restitution; - desc.dynamicFriction = friction; - desc.staticFriction = staticFriction; - - // If we have a material then just update it as the shapes - // should already have them mapped. - if ( mMaterial ) - { - mMaterial->loadFromDesc( desc ); - return; - } - - // If we got here then create a new material and - // assign it to all our shapes. - mMaterial = mWorld->createMaterial( desc ); - U32 matIndex = mMaterial->getMaterialIndex(); - U32 count = mActor->getNbShapes(); - NxShape*const* shapes = mActor->getShapes(); - for ( U32 i=0; i < count; i++ ) - shapes[i]->setMaterial( matIndex ); -} - -void PxBody::setSleepThreshold( F32 linear, F32 angular ) -{ - AssertFatal( mActor, "PxBody::setSleepThreshold - The actor is null!" ); - - mActor->setSleepLinearVelocity( linear ); - mActor->setSleepAngularVelocity( angular ); -} - -void PxBody::setDamping( F32 linear, F32 angular ) -{ - AssertFatal( mActor, "PxBody::setDamping - The actor is null!" ); - mActor->setLinearDamping( linear ); - mActor->setAngularDamping( angular ); -} - -void PxBody::getState( PhysicsState *outState ) -{ - AssertFatal( mActor, "PxBody::getState - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::getState - This call is only for dynamics!" ); - - // TODO: Fix this to do what we intended... to return - // false so that the caller can early out of the state - // hasn't changed since the last tick. - - outState->position = pxCast( mActor->getGlobalPosition() ); - outState->orientation = pxCast( mActor->getGlobalOrientationQuat() ); - outState->linVelocity = pxCast( mActor->getLinearVelocity() ); - outState->angVelocity = pxCast( mActor->getAngularVelocity() ); - outState->sleeping = mActor->isSleeping(); - outState->momentum = pxCast( mActor->getLinearMomentum() ); -} - -F32 PxBody::getMass() const -{ - AssertFatal( mActor, "PxBody::getCMassPosition - The actor is null!" ); - return mActor->getMass(); -} - -Point3F PxBody::getCMassPosition() const -{ - AssertFatal( mActor, "PxBody::getCMassPosition - The actor is null!" ); - return pxCast( mActor->getCMassGlobalPosition() ); -} - -void PxBody::setLinVelocity( const Point3F &vel ) -{ - AssertFatal( mActor, "PxBody::setLinVelocity - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::setLinVelocity - This call is only for dynamics!" ); - - mActor->setLinearVelocity( pxCast( vel ) ); -} - -void PxBody::setAngVelocity( const Point3F &vel ) -{ - AssertFatal( mActor, "PxBody::setAngVelocity - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::setAngVelocity - This call is only for dynamics!" ); - - mActor->setAngularVelocity( pxCast( vel ) ); -} - -Point3F PxBody::getLinVelocity() const -{ - AssertFatal( mActor, "PxBody::getLinVelocity - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::getLinVelocity - This call is only for dynamics!" ); - - return pxCast( mActor->getLinearVelocity() ); -} - -Point3F PxBody::getAngVelocity() const -{ - AssertFatal( mActor, "PxBody::getAngVelocity - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::getAngVelocity - This call is only for dynamics!" ); - - return pxCast( mActor->getAngularVelocity() ); -} - -void PxBody::setSleeping( bool sleeping ) -{ - AssertFatal( mActor, "PxBody::setSleeping - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::setSleeping - This call is only for dynamics!" ); - - if ( sleeping ) - mActor->putToSleep(); - else - mActor->wakeUp(); -} - -bool PxBody::isDynamic() const -{ - AssertFatal( mActor, "PxBody::isDynamic - The actor is null!" ); - return mActor->isDynamic() && ( mBodyFlags & BF_KINEMATIC ) == 0; -} - -PhysicsWorld* PxBody::getWorld() -{ - return mWorld; -} - -PhysicsCollision* PxBody::getColShape() -{ - return mColShape; -} - -MatrixF& PxBody::getTransform( MatrixF *outMatrix ) -{ - AssertFatal( mActor, "PxBody::getTransform - The actor is null!" ); - - mActor->getGlobalPose().getRowMajor44( *outMatrix ); - - return *outMatrix; -} - -Box3F PxBody::getWorldBounds() -{ - AssertFatal( mActor, "PxBody::getTransform - The actor is null!" ); - - NxBounds3 bounds; - bounds.setEmpty(); - NxBounds3 shapeBounds; - - NxShape *const* pShapeArray = mActor->getShapes(); - U32 shapeCount = mActor->getNbShapes(); - - for ( U32 i = 0; i < shapeCount; i++ ) - { - // Get the shape's bounds. - pShapeArray[i]->getWorldBounds( shapeBounds ); - - // Combine them into the total bounds. - bounds.combine( shapeBounds ); - } - - return pxCast( bounds ); -} - -void PxBody::setSimulationEnabled( bool enabled ) -{ - if ( mIsEnabled == enabled ) - return; - - // This sucks, but it has to happen if we want - // to avoid write lock errors from PhysX right now. - mWorld->releaseWriteLock(); - - if ( enabled ) - { - mIsEnabled = true; - mActor->clearActorFlag( NX_AF_DISABLE_RESPONSE ); - mActor->clearActorFlag( NX_AF_DISABLE_COLLISION ); - - // Don't clear the flag if its supposed to be kinematic. - if ( !(mBodyFlags & BF_KINEMATIC) ) - mActor->clearBodyFlag( NX_BF_KINEMATIC ); - - if ( isDynamic() ) - mActor->wakeUp(); - } - else - { - mIsEnabled = false; - mActor->raiseActorFlag( NX_AF_DISABLE_RESPONSE ); - mActor->raiseActorFlag( NX_AF_DISABLE_COLLISION ); - mActor->raiseBodyFlag( NX_BF_KINEMATIC ); - } - - NxShape *const* shapes = mActor->getShapes(); - for ( S32 i = 0; i < mActor->getNbShapes(); i++ ) - shapes[i]->setFlag( NX_SF_DISABLE_RAYCASTING, !mIsEnabled ); -} - -void PxBody::setTransform( const MatrixF &transform ) -{ - AssertFatal( mActor, "PxBody::setTransform - The actor is null!" ); - - // This sucks, but it has to happen if we want - // to avoid write lock errors from PhysX right now. - mWorld->releaseWriteLock(); - - NxMat34 xfm; - xfm.setRowMajor44( transform ); - mActor->setGlobalPose( xfm ); - - // If its dynamic we have more to do. - if ( mActor->isDynamic() && !mActor->readBodyFlag( NX_BF_KINEMATIC ) ) - { - mActor->setLinearVelocity( NxVec3( 0, 0, 0 ) ); - mActor->setAngularVelocity( NxVec3( 0, 0, 0 ) ); - mActor->wakeUp(); - } -} - -void PxBody::applyCorrection( const MatrixF &transform ) -{ - AssertFatal( mActor, "PxBody::applyCorrection - The actor is null!" ); - AssertFatal( isDynamic(), "PxBody::applyCorrection - This call is only for dynamics!" ); - - // This sucks, but it has to happen if we want - // to avoid write lock errors from PhysX right now. - mWorld->releaseWriteLock(); - - NxMat34 xfm; - xfm.setRowMajor44( transform ); - mActor->setGlobalPose( xfm ); -} - -void PxBody::applyImpulse( const Point3F &origin, const Point3F &force ) -{ - AssertFatal( mActor, "PxBody::applyImpulse - The actor is null!" ); - - // This sucks, but it has to happen if we want - // to avoid write lock errors from PhysX right now. - mWorld->releaseWriteLock(); - - if ( mIsEnabled && isDynamic() ) - mActor->addForceAtPos( pxCast( force ), - pxCast( origin ), - NX_IMPULSE ); -} - diff --git a/Engine/source/T3D/physics/physx/pxBody.h b/Engine/source/T3D/physics/physx/pxBody.h deleted file mode 100644 index 2aeec6e0f..000000000 --- a/Engine/source/T3D/physics/physx/pxBody.h +++ /dev/null @@ -1,114 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _T3D_PHYSICS_PXBODY_H_ -#define _T3D_PHYSICS_PXBODY_H_ - -#ifndef _T3D_PHYSICS_PHYSICSBODY_H_ -#include "T3D/physics/physicsBody.h" -#endif -#ifndef _PHYSICS_PHYSICSUSERDATA_H_ -#include "T3D/physics/physicsUserData.h" -#endif -#ifndef _REFBASE_H_ -#include "core/util/refBase.h" -#endif -#ifndef _MMATRIX_H_ -#include "math/mMatrix.h" -#endif - -class PxWorld; -class NxActor; -class PxCollision; -class NxMaterial; - - -class PxBody : public PhysicsBody -{ -protected: - - /// The physics world we are in. - PxWorld *mWorld; - - /// The physics actor. - NxActor *mActor; - - /// The unshared local material used on all the - /// shapes on this actor. - NxMaterial *mMaterial; - - /// We hold the collision reference as it contains - /// allocated objects that we own and must free. - StrongRefPtr mColShape; - - /// - MatrixF mInternalTransform; - - /// The body flags set at creation time. - U32 mBodyFlags; - - /// Is true if this body is enabled and active - /// in the simulation of the scene. - bool mIsEnabled; - - /// - void _releaseActor(); - -public: - - PxBody(); - virtual ~PxBody(); - - // PhysicsObject - virtual PhysicsWorld* getWorld(); - virtual void setTransform( const MatrixF &xfm ); - virtual MatrixF& getTransform( MatrixF *outMatrix ); - virtual Box3F getWorldBounds(); - virtual void setSimulationEnabled( bool enabled ); - virtual bool isSimulationEnabled() { return mIsEnabled; } - - // PhysicsBody - virtual bool init( PhysicsCollision *shape, - F32 mass, - U32 bodyFlags, - SceneObject *obj, - PhysicsWorld *world ); - virtual bool isDynamic() const; - virtual PhysicsCollision* getColShape(); - virtual void setSleepThreshold( F32 linear, F32 angular ); - virtual void setDamping( F32 linear, F32 angular ); - virtual void getState( PhysicsState *outState ); - virtual F32 getMass() const; - virtual Point3F getCMassPosition() const; - virtual void setLinVelocity( const Point3F &vel ); - virtual void setAngVelocity( const Point3F &vel ); - virtual Point3F getLinVelocity() const; - virtual Point3F getAngVelocity() const; - virtual void setSleeping( bool sleeping ); - virtual void setMaterial( F32 restitution, - F32 friction, - F32 staticFriction ); - virtual void applyCorrection( const MatrixF &xfm ); - virtual void applyImpulse( const Point3F &origin, const Point3F &force ); -}; - -#endif // _T3D_PHYSICS_PXBODY_H_ diff --git a/Engine/source/T3D/physics/physx/pxCasts.h b/Engine/source/T3D/physics/physx/pxCasts.h deleted file mode 100644 index ee9555702..000000000 --- a/Engine/source/T3D/physics/physx/pxCasts.h +++ /dev/null @@ -1,150 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PHYSX_CASTS_H_ -#define _PHYSX_CASTS_H_ - -#ifndef _MPOINT3_H_ -#include "math/mPoint3.h" -#endif -#ifndef _MBOX_H_ -#include "math/mBox.h" -#endif -#ifndef _MQUAT_H_ -#include "math/mQuat.h" -#endif - - -template inline T pxCast( const F &from ); - -//------------------------------------------------------------------------- - -template<> -inline Point3F pxCast( const NxVec3 &vec ) -{ - return Point3F( vec.x, vec.y, vec.z ); -} - -template<> -inline NxVec3 pxCast( const Point3F &point ) -{ - return NxVec3( point.x, point.y, point.z ); -} - -//------------------------------------------------------------------------- - -template<> -inline QuatF pxCast( const NxQuat &quat ) -{ - /// The Torque quat has the opposite winding order. - return QuatF( -quat.x, -quat.y, -quat.z, quat.w ); -} - -template<> -inline NxQuat pxCast( const QuatF &quat ) -{ - /// The Torque quat has the opposite winding order. - NxQuat result; - result.setWXYZ( quat.w, -quat.x, -quat.y, -quat.z ); - return result; -} - -//------------------------------------------------------------------------- - -template<> -inline NxBounds3 pxCast( const Box3F &box ) -{ - NxBounds3 bounds; - bounds.set( box.minExtents.x, - box.minExtents.y, - box.minExtents.z, - box.maxExtents.x, - box.maxExtents.y, - box.maxExtents.z ); - return bounds; -} - -template<> -inline Box3F pxCast( const NxBounds3 &bounds ) -{ - return Box3F( bounds.min.x, - bounds.min.y, - bounds.min.z, - bounds.max.x, - bounds.max.y, - bounds.max.z ); -} - -//------------------------------------------------------------------------- - -template<> -inline NxVec3 pxCast( const NxExtendedVec3 &xvec ) -{ - return NxVec3( xvec.x, xvec.y, xvec.z ); -} - -template<> -inline NxExtendedVec3 pxCast( const NxVec3 &vec ) -{ - return NxExtendedVec3( vec.x, vec.y, vec.z ); -} - -//------------------------------------------------------------------------- - -template<> -inline NxExtendedVec3 pxCast( const Point3F &point ) -{ - return NxExtendedVec3( point.x, point.y, point.z ); -} - -template<> -inline Point3F pxCast( const NxExtendedVec3 &xvec ) -{ - return Point3F( xvec.x, xvec.y, xvec.z ); -} - -//------------------------------------------------------------------------- - -template<> -inline NxBox pxCast( const NxExtendedBounds3 &exBounds ) -{ - NxExtendedVec3 center; - exBounds.getCenter( center ); - NxVec3 extents; - exBounds.getExtents( extents ); - - NxBox box; - box.center.set( center.x, center.y, center.z ); - box.extents = extents; - box.rot.id(); - - return box; -} - -template<> -inline NxExtendedBounds3 pxCast( const NxBox &box ) -{ - AssertFatal( false, "Casting a NxBox to NxExtendedBounds3 is impossible without losing rotation data!" ); - return NxExtendedBounds3(); -} - -#endif // _PHYSX_CASTS_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxCloth.cpp b/Engine/source/T3D/physics/physx/pxCloth.cpp deleted file mode 100644 index 723e71b67..000000000 --- a/Engine/source/T3D/physics/physx/pxCloth.cpp +++ /dev/null @@ -1,923 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxCloth.h" - -#include "console/consoleTypes.h" -#include "scene/sceneManager.h" -#include "scene/sceneRenderState.h" -#include "renderInstance/renderPassManager.h" -#include "lighting/lightQuery.h" -#include "T3D/physics/physicsPlugin.h" -#include "T3D/physics/physx/pxWorld.h" -#include "T3D/physics/physx/pxStream.h" -#include "T3D/physics/physx/pxCasts.h" -#include "gfx/gfxDrawUtil.h" -#include "math/mathIO.h" -#include "core/stream/bitStream.h" -#include "materials/materialManager.h" -#include "materials/baseMatInstance.h" - - -IMPLEMENT_CO_NETOBJECT_V1( PxCloth ); - -ConsoleDocClass( PxCloth, - - "@brief Rectangular patch of cloth simulated by PhysX.\n\n" - - "PxCloth is affected by other objects in the simulation but does not itself " - "affect others, it is essentially a visual effect. Eg, shooting at cloth will " - "disturb it but will not explode the projectile.\n\n" - - "Be careful with the cloth size and resolution because it can easily become " - "performance intensive to simulate. A single piece of cloth that is very " - "large or high resolution is also much more expensive than multiple pieces " - "that add up to the same number of verts.\n\n" - - "Note that most field docs have been copied from their PhysX counterpart.\n\n" - - "@ingroup Physics" -); - -enum PxClothAttachment {}; -DefineBitfieldType( PxClothAttachment ); - -ImplementBitfieldType( PxClothAttachment, - "Soon to be deprecated\n" - "@internal" ) - { 0, "Bottom Right" }, - { 1, "Bottom Left" }, - { 2, "Top Right" }, - { 3, "Top Left" }, - { 4, "Top Center" }, - { 5, "Bottom Center" }, - { 6, "Right Center" }, - { 7, "Left Center" }, - { 8, "Top Edge" }, - { 9, "Bottom Edge" }, - { 10, "Right Edge" }, - { 11, "Left Edge" } -EndImplementBitfieldType; - - -PxCloth::PxCloth() - : mWorld( NULL ), - mScene( NULL ), - mMatInst( NULL ) -{ - mVertexRenderBuffer = NULL; - mIndexRenderBuffer = NULL; - - mMaxVertices = 0; - mMaxIndices = 0; - - mClothMesh = NULL; - mCloth = NULL; - - mPatchVerts.set( 8, 8 ); - mPatchSize.set( 8.0f, 8.0f ); - - mNetFlags.set( Ghostable | ScopeAlways ); - mTypeMask |= StaticObjectType | StaticShapeObjectType; - - mReceiveBuffers.setToDefault(); - - mBendingEnabled = false; - mDampingEnabled = false; - mTriangleCollisionEnabled = false; - mSelfCollisionEnabled = false; - - mDensity = 1.0f; - mThickness = 0.1f; - mFriction = 0.25f; - mBendingStiffness = 0.5f; - mDampingCoefficient = 0.25f; - - mAttachmentMask = 0; -} - -PxCloth::~PxCloth() -{ -} - -bool PxCloth::onAdd() -{ - if ( !Parent::onAdd() ) - return false; - - // Cloth is only created on the client. - if ( isClientObject() ) - { - mWorld = dynamic_cast( PHYSICSMGR->getWorld( "client" ) ); - - if ( !mWorld || !mWorld->getScene() ) - { - Con::errorf( "PxCloth::onAdd() - PhysXWorld not initialized... cloth disabled!" ); - return true; - } - - mScene = mWorld->getScene(); - - mResetXfm = getTransform(); - - _createClothPatch(); - - PhysicsPlugin::getPhysicsResetSignal().notify( this, &PxCloth::onPhysicsReset, 1053.0f ); - } - - // On the server we use the static update - // to setup the bounds of the cloth. - if ( isServerObject() ) - _updateStaticCloth(); - - addToScene(); - - // Also the server object never ticks. - if ( isServerObject() ) - setProcessTick( false ); - - return true; -} - -void PxCloth::onRemove() -{ - SAFE_DELETE( mMatInst ); - - if ( isClientObject() ) - { - _releaseCloth(); - _releaseMesh(); - - PhysicsPlugin::getPhysicsResetSignal().remove( this, &PxCloth::onPhysicsReset ); - } - - removeFromScene(); - - Parent::onRemove(); -} - -void PxCloth::onPhysicsReset( PhysicsResetEvent reset ) -{ - // Store the reset transform for later use. - if ( reset == PhysicsResetEvent_Store ) - mResetXfm = getTransform(); - - // Recreate the cloth at the last reset position. - _recreateCloth( mResetXfm ); -} - -void PxCloth::initPersistFields() -{ - Parent::initPersistFields(); - - addField( "material", TypeMaterialName, Offset( mMaterialName, PxCloth ), - "@brief Name of the material to render.\n\n" ); - - addField( "samples", TypePoint2I, Offset( mPatchVerts, PxCloth ), - "@brief The number of cloth vertices in width and length.\n\n" - "At least two verts should be defined.\n\n"); - - addField( "size", TypePoint2F, Offset( mPatchSize, PxCloth ), - "@brief The width and height of the cloth.\n\n" ); - - addField( "bending", TypeBool, Offset( mBendingEnabled, PxCloth ), - "@brief Enables or disables bending resistance.\n\n" - "Set the bending resistance through PxCloth::bendingStiffness." ); - - addField( "damping", TypeBool, Offset( mDampingEnabled, PxCloth ), - "@brief Enable/disable damping of internal velocities.\n\n" ); - - addField( "triangleCollision", TypeBool, Offset( mTriangleCollisionEnabled, PxCloth ), - "@brief Not supported in current release (according to PhysX docs).\n\n" - "Enables or disables collision detection of cloth triangles against the scene. " - "If not set, only collisions of cloth particles are detected. If set, " - "collisions of cloth triangles are detected as well." ); - - addField( "selfCollision", TypeBool, Offset( mSelfCollisionEnabled, PxCloth ), - "@brief Enables or disables self-collision handling within a single piece of cloth.\n\n" ); - - addField( "density", TypeF32, Offset( mDensity, PxCloth ), - "@brief Density of the cloth (Mass per Area).\n\n" ); - - addField( "thickness", TypeF32, Offset( mThickness, PxCloth ), - "@brief Value representing how thick the cloth is.\n\n" - "The thickness is usually a fraction of the overall extent of the cloth and " - "should not be set to a value greater than that. A good value is the maximal " - "distance between two adjacent cloth particles in their rest pose. Visual " - "artifacts or collision problems may appear if the thickness is too small.\n\n" ); - - addField( "friction", TypeF32, Offset( mFriction, PxCloth ), - "@brief Friction coefficient in the range 0 to 1.\n\n" - "Defines the damping of the velocities of cloth particles that are in contact." ); - - addField( "bendingStiffness", TypeF32, Offset( mBendingStiffness, PxCloth ), - "@brief Bending stiffness of the cloth in the range 0 to 1.\n\n" ); - - addField( "dampingCoefficient", TypeF32, Offset( mDampingCoefficient, PxCloth ), - "@brief Spring damping of the cloth in the range 0 to 1.\n\n" ); - - addField( "attachments", TYPEID< PxClothAttachment >(), Offset( mAttachmentMask, PxCloth ), - "@brief Optional way to specify cloth verts that will be attached to the world position " - "it is created at.\n\n" ); - - // Cloth doesn't support scale. - removeField( "scale" ); -} - -void PxCloth::inspectPostApply() -{ - Parent::inspectPostApply(); - - // Must have at least 2 verts. - mPatchVerts.x = getMax( 2, mPatchVerts.x ); - mPatchVerts.y = getMax( 2, mPatchVerts.y ); - if ( isServerObject() ) - _updateStaticCloth(); - - setMaskBits( TransformMask | MaterialMask | ClothMask ); -} - -U32 PxCloth::packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) -{ - U32 retMask = Parent::packUpdate( conn, mask, stream ); - - if ( stream->writeFlag( mask & TransformMask ) ) - mathWrite( *stream, getTransform() ); - - if ( stream->writeFlag( mask & MaterialMask ) ) - stream->write( mMaterialName ); - - if ( stream->writeFlag( mask & ClothMask ) ) - { - mathWrite( *stream, mPatchVerts ); - mathWrite( *stream, mPatchSize ); - - stream->write( mAttachmentMask ); - - stream->writeFlag( mBendingEnabled ); - stream->writeFlag( mDampingEnabled ); - stream->writeFlag( mTriangleCollisionEnabled ); - stream->writeFlag( mSelfCollisionEnabled ); - stream->write( mThickness ); - stream->write( mFriction ); - stream->write( mBendingStiffness ); - stream->write( mDampingCoefficient ); - - stream->write( mDensity ); - } - - return retMask; -} - -void PxCloth::unpackUpdate( NetConnection *conn, BitStream *stream ) -{ - Parent::unpackUpdate( conn, stream ); - - // TransformMask - if ( stream->readFlag() ) - { - MatrixF mat; - mathRead( *stream, &mat ); - setTransform( mat ); - } - - // MaterialMask - if ( stream->readFlag() ) - { - stream->read( &mMaterialName ); - SAFE_DELETE( mMatInst ); - } - - // ClothMask - if ( stream->readFlag() ) - { - Point2I patchVerts; - Point2F patchSize; - mathRead( *stream, &patchVerts ); - mathRead( *stream, &patchSize ); - - if ( patchVerts != mPatchVerts || - !patchSize.equal( mPatchSize ) ) - { - mPatchVerts = patchVerts; - mPatchSize = patchSize; - _releaseMesh(); - } - - U32 attachMask; - stream->read( &attachMask ); - if ( attachMask != mAttachmentMask ) - { - mAttachmentMask = attachMask; - _releaseCloth(); - } - - mBendingEnabled = stream->readFlag(); - mDampingEnabled = stream->readFlag(); - mTriangleCollisionEnabled = stream->readFlag(); - mSelfCollisionEnabled = stream->readFlag(); - stream->read( &mThickness ); - stream->read( &mFriction ); - stream->read( &mBendingStiffness ); - stream->read( &mDampingCoefficient ); - - F32 density; - stream->read( &density ); - if ( density != mDensity ) - { - mDensity = density; - _releaseCloth(); - } - - if ( isClientObject() && - isProperlyAdded() && - mWorld && - !mCloth ) - { - _createClothPatch(); - } - - _updateClothProperties(); - } -} - -void PxCloth::_recreateCloth( const MatrixF &transform ) -{ - if ( !mWorld ) - return; - - mWorld->getPhysicsResults(); - - Parent::setTransform( transform ); - - _createClothPatch(); -} - -void PxCloth::setTransform( const MatrixF &mat ) -{ - Parent::setTransform( mat ); - setMaskBits( TransformMask ); - - // Only need to do this if we're on the server - // or if we're not currently ticking physics. - if ( !mWorld || !mWorld->isEnabled() ) - _updateStaticCloth(); -} - -void PxCloth::setScale( const VectorF &scale ) -{ - // Cloth doesn't support scale as it has plenty - // of complications... sharing meshes, thickness, - // transform origin, etc. - return; -} - -void PxCloth::prepRenderImage( SceneRenderState *state ) -{ - if ( mIsVBDirty ) - _updateVBIB(); - - // Recreate the material if we need to. - if ( !mMatInst ) - _initMaterial(); - - // If we don't have a material instance after the override then - // we can skip rendering all together. - BaseMatInstance *matInst = state->getOverrideMaterial( mMatInst ); - if ( !matInst ) - return; - - MeshRenderInst *ri = state->getRenderPass()->allocInst(); - - // If we need lights then set them up. - if ( matInst->isForwardLit() ) - { - LightQuery query; - query.init( getWorldSphere() ); - query.getLights( ri->lights, 8 ); - } - - ri->projection = state->getRenderPass()->allocSharedXform(RenderPassManager::Projection); - ri->objectToWorld = &MatrixF::Identity; - - ri->worldToCamera = state->getRenderPass()->allocSharedXform(RenderPassManager::View); - ri->type = RenderPassManager::RIT_Mesh; - - ri->primBuff = &mPrimBuffer; - ri->vertBuff = &mVB; - - ri->matInst = matInst; - ri->prim = state->getRenderPass()->allocPrim(); - ri->prim->type = GFXTriangleList; - ri->prim->minIndex = 0; - ri->prim->startIndex = 0; - ri->prim->numPrimitives = mNumIndices / 3; - - ri->prim->startVertex = 0; - ri->prim->numVertices = mNumVertices; - - ri->defaultKey = matInst->getStateHint(); - ri->defaultKey2 = (U32)ri->vertBuff; - - state->getRenderPass()->addInst( ri ); -} - -void PxCloth::_releaseMesh() -{ - if ( !mClothMesh ) - return; - - _releaseCloth(); - - mWorld->releaseClothMesh( *mClothMesh ); - mClothMesh = NULL; - - delete [] mVertexRenderBuffer; - mVertexRenderBuffer = NULL; - delete [] mIndexRenderBuffer; - mIndexRenderBuffer = NULL; -} - -void PxCloth::_releaseCloth() -{ - if ( !mCloth ) - return; - - mWorld->releaseCloth( *mCloth ); - mCloth = NULL; -} - -void PxCloth::_initClothMesh() -{ - // Make sure we can change the world. - mWorld->releaseWriteLock(); - - _releaseMesh(); - - // Must have at least 2 verts. - mPatchVerts.x = getMax( 2, mPatchVerts.x ); - mPatchVerts.y = getMax( 2, mPatchVerts.y ); - - // Generate a uniform cloth patch, - // w and h are the width and height, - // d is the distance between vertices. - mNumVertices = mPatchVerts.x * mPatchVerts.y; - mNumIndices = (mPatchVerts.x-1) * (mPatchVerts.y-1) * 2; - - NxClothMeshDesc desc; - desc.numVertices = mNumVertices; - desc.numTriangles = mNumIndices; - desc.pointStrideBytes = sizeof(NxVec3); - desc.triangleStrideBytes = 3*sizeof(NxU32); - desc.points = (NxVec3*)dMalloc(sizeof(NxVec3)*desc.numVertices); - desc.triangles = (NxU32*)dMalloc(sizeof(NxU32)*desc.numTriangles*3); - desc.flags = 0; - - U32 i,j; - NxVec3 *p = (NxVec3*)desc.points; - - F32 patchWidth = mPatchSize.x / (F32)( mPatchVerts.x - 1 ); - F32 patchHeight = mPatchSize.y / (F32)( mPatchVerts.y - 1 ); - - for (i = 0; i < mPatchVerts.y; i++) - { - for (j = 0; j < mPatchVerts.x; j++) - { - p->set( patchWidth * j, 0.0f, patchHeight * i ); - p++; - } - } - - NxU32 *id = (NxU32*)desc.triangles; - - for (i = 0; i < mPatchVerts.y-1; i++) - { - for (j = 0; j < mPatchVerts.x-1; j++) - { - NxU32 i0 = i * mPatchVerts.x + j; - NxU32 i1 = i0 + 1; - NxU32 i2 = i0 + mPatchVerts.x; - NxU32 i3 = i2 + 1; - if ( (j+i) % 2 ) - { - *id++ = i0; - *id++ = i2; - *id++ = i1; - *id++ = i1; - *id++ = i2; - *id++ = i3; - } - else - { - *id++ = i0; - *id++ = i2; - *id++ = i3; - *id++ = i0; - *id++ = i3; - *id++ = i1; - } - } - } - - NxCookingInterface *cooker = PxWorld::getCooking(); - cooker->NxInitCooking(); - - // Ok... cook the mesh! - NxCookingParams params; - params.targetPlatform = PLATFORM_PC; - params.skinWidth = 0.01f; - params.hintCollisionSpeed = false; - - cooker->NxSetCookingParams( params ); - - PxMemStream cooked; - - if ( cooker->NxCookClothMesh( desc, cooked ) ) - { - cooked.resetPosition(); - mClothMesh = gPhysicsSDK->createClothMesh( cooked ); - } - - cooker->NxCloseCooking(); - - NxVec3 *ppoints = (NxVec3*)desc.points; - NxU32 *triangs = (NxU32*)desc.triangles; - - dFree( ppoints ); - dFree( triangs ); - - if ( mClothMesh ) - _initReceiveBuffers(); -} - -void PxCloth::_initReceiveBuffers() -{ - // here we setup the buffers through which the SDK returns the dynamic cloth data - // we reserve more memory for vertices than the initial mesh takes - // because tearing creates new vertices - // the SDK only tears cloth as long as there is room in these buffers - - mMaxVertices = 3 * mNumVertices; - mMaxIndices = 3 * mNumIndices; - - // Allocate Render Buffer for Vertices if it hasn't been done before - mVertexRenderBuffer = new GFXVertexPNTT[mMaxVertices]; - mIndexRenderBuffer = new U16[mMaxIndices]; - - mReceiveBuffers.verticesPosBegin = &(mVertexRenderBuffer[0].point); - mReceiveBuffers.verticesNormalBegin = &(mVertexRenderBuffer[0].normal); - mReceiveBuffers.verticesPosByteStride = sizeof(GFXVertexPNTT); - mReceiveBuffers.verticesNormalByteStride = sizeof(GFXVertexPNTT); - mReceiveBuffers.maxVertices = mMaxVertices; - mReceiveBuffers.numVerticesPtr = &mNumVertices; - - // the number of triangles is constant, even if the cloth is torn - mReceiveBuffers.indicesBegin = &mIndexRenderBuffer[0]; - mReceiveBuffers.indicesByteStride = sizeof(NxU16); - mReceiveBuffers.maxIndices = mMaxIndices; - mReceiveBuffers.numIndicesPtr = &mNumIndices; - - // Set up texture coords. - - F32 dx = 1.0f / (F32)(mPatchVerts.x-1); - F32 dy = 1.0f / (F32)(mPatchVerts.y-1); - - F32 *coord = (F32*)&mVertexRenderBuffer[0].texCoord; - for ( U32 i = 0; i < mPatchVerts.y; i++) - { - for ( U32 j = 0; j < mPatchVerts.x; j++) - { - coord[0] = j*dx; - coord[1] = i*-dy; - coord += sizeof( GFXVertexPNTT ) / sizeof( F32 ); - } - } - - // the parent index information would be needed if we used textured cloth - //mReceiveBuffers.parentIndicesBegin = (U32*)malloc(sizeof(U32)*mMaxVertices); - //mReceiveBuffers.parentIndicesByteStride = sizeof(U32); - //mReceiveBuffers.maxParentIndices = mMaxVertices; - //mReceiveBuffers.numParentIndicesPtr = &mNumParentIndices; - - mMeshDirtyFlags = 0; - mReceiveBuffers.dirtyBufferFlagsPtr = &mMeshDirtyFlags; - - // init the buffers in case we want to draw the mesh - // before the SDK as filled in the correct values - - mReceiveBuffers.flags |= NX_MDF_16_BIT_INDICES; -} - -bool PxCloth::_createClothPatch() -{ - // Make sure we have a mesh. - if ( !mClothMesh ) - { - _initClothMesh(); - if ( !mClothMesh ) - return false; - } - - // Make sure we can change the world. - mWorld->releaseWriteLock(); - - _releaseCloth(); - - NxClothDesc desc; - desc.globalPose.setRowMajor44( getTransform() ); - desc.thickness = mThickness; - desc.density = mDensity; - desc.bendingStiffness = mBendingStiffness; - desc.dampingCoefficient = mDampingCoefficient; - desc.friction = mFriction; - - if ( mBendingEnabled ) - desc.flags |= NX_CLF_BENDING; - if ( mDampingEnabled ) - desc.flags |= NX_CLF_DAMPING; - if ( mTriangleCollisionEnabled ) - desc.flags |= NX_CLF_TRIANGLE_COLLISION; - if ( mSelfCollisionEnabled ) - desc.flags |= NX_CLF_SELFCOLLISION; - - desc.clothMesh = mClothMesh; - desc.meshData = mReceiveBuffers; - - if ( !desc.isValid() ) - return false; - - mCloth = mScene->createCloth( desc ); - mIsVBDirty = true; - - _updateStaticCloth(); - _setupAttachments(); - - return true; -} - -void PxCloth::_updateClothProperties() -{ - if ( !mCloth ) - return; - - mCloth->setThickness( mThickness ); - mCloth->setBendingStiffness( mBendingStiffness ); - mCloth->setDampingCoefficient( mDampingCoefficient ); - mCloth->setFriction( mFriction ); - - NxU32 flags = NX_CLF_GRAVITY; // TODO: Expose this? - if ( mBendingEnabled ) - flags |= NX_CLF_BENDING; - if ( mDampingEnabled ) - flags |= NX_CLF_DAMPING; - if ( mTriangleCollisionEnabled ) - flags |= NX_CLF_TRIANGLE_COLLISION; - if ( mSelfCollisionEnabled ) - flags |= NX_CLF_SELFCOLLISION; - mCloth->setFlags( flags ); -} - -void PxCloth::_initMaterial() -{ - SAFE_DELETE( mMatInst ); - - Material *material = NULL; - if (mMaterialName.isNotEmpty() ) - Sim::findObject( mMaterialName, material ); - - if ( material ) - mMatInst = material->createMatInstance(); - else - mMatInst = MATMGR->createMatInstance( "WarningMaterial" ); - - GFXStateBlockDesc desc; - desc.setCullMode( GFXCullNone ); - mMatInst->addStateBlockDesc( desc ); - - mMatInst->init( MATMGR->getDefaultFeatures(), getGFXVertexFormat() ); -} - -void PxCloth::_updateVBIB() -{ - PROFILE_SCOPE( PxCloth_UpdateVBIB ); - - mIsVBDirty = false; - - // Don't set the VB if the vertex count is the same! - if ( mVB.isNull() || mVB->mNumVerts < mNumVertices ) - mVB.set( GFX, mNumVertices, GFXBufferTypeDynamic ); - - GFXVertexPNTT *vert = mVertexRenderBuffer; - GFXVertexPNTT *secondVert = NULL; - - for ( U32 i = 0; i < mNumVertices; i++ ) - { - if ( i % (U32)mPatchSize.x == 0 && i != 0 ) - { - secondVert = vert; - secondVert--; - vert->tangent = -(vert->point - secondVert->point); - } - else - { - secondVert = vert; - secondVert++; - vert->tangent = vert->point - secondVert->point; - } - - vert->tangent.normalize(); - vert++; - } - - GFXVertexPNTT *vpPtr = mVB.lock(); - dMemcpy( vpPtr, mVertexRenderBuffer, sizeof( GFXVertexPNTT ) * mNumVertices ); - mVB.unlock(); - - if ( mPrimBuffer.isNull() || mPrimBuffer->mIndexCount < mNumIndices ) - mPrimBuffer.set( GFX, mNumIndices, 0, GFXBufferTypeDynamic ); - - U16 *pbPtr; - mPrimBuffer.lock( &pbPtr ); - dMemcpy( pbPtr, mIndexRenderBuffer, sizeof( U16 ) * mNumIndices ); - mPrimBuffer.unlock(); -} - -void PxCloth::_updateStaticCloth() -{ - // Setup the unsimulated world bounds. - mObjBox.set( 0, mThickness * -0.5f, 0, - mPatchSize.x, mThickness * 0.5f, mPatchSize.y ); - resetWorldBox(); - - // If we don't have render buffers then we're done. - if ( !mVertexRenderBuffer || !mIndexRenderBuffer ) - return; - - // Make sure the VBs are updated. - mIsVBDirty = true; - - F32 patchWidth = mPatchSize.x / (F32)(mPatchVerts.x-1); - F32 patchHeight = mPatchSize.y / (F32)(mPatchVerts.y-1); - - Point3F normal( 0, 1, 0 ); - getTransform().mulV( normal ); - - GFXVertexPNTT *vert = mVertexRenderBuffer; - - for (U32 y = 0; y < mPatchVerts.y; y++) - { - for (U32 x = 0; x < mPatchVerts.x; x++) - { - vert->point.set( patchWidth * x, 0.0f, patchHeight * y ); - getTransform().mulP( vert->point ); - vert->normal = normal; - vert++; - } - } - - U16 *index = mIndexRenderBuffer; - mNumIndices = (mPatchVerts.x-1) * (mPatchVerts.y-1) * 6; - U16 yOffset = mPatchVerts.x; - - for (U32 y = 0; y < mPatchVerts.y-1; y++) - { - for (U32 x = 0; x < mPatchVerts.x-1; x++) - { - U16 base = x + ( yOffset * y ); - - index[0] = base; - index[1] = base + 1; - index[2] = base + 1 + yOffset; - - index[3] = base + 1 + yOffset; - index[4] = base + yOffset; - index[5] = base; - - index += 6; - } - } -} - -void PxCloth::processTick( const Move *move ) -{ - // Make sure the cloth is created. - if ( !mCloth ) - return; - - // TODO: Remove this hack! - const bool enableWind = Con::getBoolVariable( "$PxCloth::enableWind", false ); - - if ( enableWind ) - { - NxVec3 windVec( 25.0f + NxMath::rand(-5.0f, 5.0f), - NxMath::rand(-5.0f, 5.0f), - NxMath::rand(-5.0f, 5.0f) ); - - mCloth->setWindAcceleration( windVec ); - - // Wake the cloth! - mCloth->wakeUp(); - } - else - mCloth->setWindAcceleration( NxVec3( 0, 0, 0 ) ); - - // Update bounds. - if ( mWorld->getEnabled() ) - { - NxBounds3 box; - mCloth->getWorldBounds( box ); - - Point3F min = pxCast( box.min ); - Point3F max = pxCast( box.max ); - - mWorldBox.set( min, max ); - mObjBox = mWorldBox; - - getWorldTransform().mul( mObjBox ); - } - else - { - mObjBox.set( 0, mThickness * -0.5f, 0, - mPatchSize.x, mThickness * 0.5f, mPatchSize.y ); - } - - resetWorldBox(); - - // Update the VB on the next render. - mIsVBDirty = true; -} - -void PxCloth::interpolateTick( F32 delta ) -{ - // Nothing to do for now! -} - -bool PxCloth::onNewDataBlock( GameBaseData *dptr, bool reload ) -{ - return false; -} - -void PxCloth::_setupAttachments() -{ - if ( !mCloth || !mWorld ) - return; - - // Set up attachments - // Bottom right = bit 0 - // Bottom left = bit 1 - // Top right = bit 2 - // Top left = bit 3 - - if ( mAttachmentMask & BIT( 0 ) ) - mCloth->attachVertexToGlobalPosition( 0, mCloth->getPosition( 0 ) ); - if ( mAttachmentMask & BIT( 1 ) ) - mCloth->attachVertexToGlobalPosition( mPatchVerts.x-1, mCloth->getPosition( mPatchVerts.x-1 ) ); - if ( mAttachmentMask & BIT( 2 ) ) - mCloth->attachVertexToGlobalPosition( mPatchVerts.x * mPatchVerts.y - mPatchVerts.x, mCloth->getPosition( mPatchVerts.x * mPatchVerts.y - mPatchVerts.x ) ); - if ( mAttachmentMask & BIT( 3 ) ) - mCloth->attachVertexToGlobalPosition( mPatchVerts.x * mPatchVerts.y - 1, mCloth->getPosition( mPatchVerts.x * mPatchVerts.y - 1 ) ); - if ( mAttachmentMask & BIT( 4 ) ) - mCloth->attachVertexToGlobalPosition( mPatchVerts.x * mPatchVerts.y - (mPatchVerts.x/2), mCloth->getPosition( mPatchVerts.x * mPatchVerts.y - (mPatchVerts.x/2) ) ); - if ( mAttachmentMask & BIT( 5 ) ) - mCloth->attachVertexToGlobalPosition( (mPatchVerts.x/2), mCloth->getPosition( (mPatchVerts.x/2) ) ); - if ( mAttachmentMask & BIT( 6 ) ) - mCloth->attachVertexToGlobalPosition( mPatchVerts.x * (mPatchVerts.y/2), mCloth->getPosition( mPatchVerts.x * (mPatchVerts.y/2) ) ); - if ( mAttachmentMask & BIT( 7 ) ) - mCloth->attachVertexToGlobalPosition( mPatchVerts.x * (mPatchVerts.y/2) + (mPatchVerts.x-1), mCloth->getPosition( mPatchVerts.x * (mPatchVerts.y/2) + (mPatchVerts.x-1) ) ); - - if ( mAttachmentMask & BIT( 8 ) ) - for ( U32 i = mPatchVerts.x * mPatchVerts.y - mPatchVerts.x; i < mPatchVerts.x * mPatchVerts.y; i++ ) - mCloth->attachVertexToGlobalPosition( i, mCloth->getPosition( i ) ); - - if ( mAttachmentMask & BIT( 9 ) ) - for ( U32 i = 0; i < mPatchVerts.x; i++ ) - mCloth->attachVertexToGlobalPosition( i, mCloth->getPosition( i ) ); - - if ( mAttachmentMask & BIT( 10 ) ) - for ( U32 i = 0; i < mPatchVerts.x * mPatchVerts.y; i+=mPatchVerts.x ) - mCloth->attachVertexToGlobalPosition( i, mCloth->getPosition( i ) ); - - if ( mAttachmentMask & BIT( 11 ) ) - for ( U32 i = mPatchVerts.x-1; i < mPatchVerts.x * mPatchVerts.y; i+=mPatchVerts.x ) - mCloth->attachVertexToGlobalPosition( i, mCloth->getPosition( i ) ); -} \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxCloth.h b/Engine/source/T3D/physics/physx/pxCloth.h deleted file mode 100644 index 5df158861..000000000 --- a/Engine/source/T3D/physics/physx/pxCloth.h +++ /dev/null @@ -1,176 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PXCLOTH_H_ -#define _PXCLOTH_H_ - -#ifndef _GAMEBASE_H_ -#include "T3D/gameBase/gameBase.h" -#endif -#ifndef _GFXPRIMITIVEBUFFER_H_ -#include "gfx/gfxPrimitiveBuffer.h" -#endif -#ifndef _GFXVERTEXBUFFER_H_ -#include "gfx/gfxVertexBuffer.h" -#endif -#ifndef _PHYSX_H_ -#include "T3D/physics/physx/px.h" -#endif -#ifndef _T3D_PHYSICS_PHYSICSPLUGIN_H_ -#include "T3D/physics/physicsPlugin.h" -#endif - -class Material; -class BaseMatInstance; -class PxWorld; -class NxScene; -class NxClothMesh; -class NxCloth; - - -class PxCloth : public GameBase -{ - typedef GameBase Parent; - - enum MaskBits - { - TransformMask = Parent::NextFreeMask << 0, - ClothMask = Parent::NextFreeMask << 1, - MaterialMask = Parent::NextFreeMask << 3, - NextFreeMask = Parent::NextFreeMask << 4 - }; - -public: - - PxCloth(); - virtual ~PxCloth(); - - DECLARE_CONOBJECT( PxCloth ); - - // SimObject - virtual bool onAdd(); - virtual void onRemove(); - static void initPersistFields(); - virtual void inspectPostApply(); - void onPhysicsReset( PhysicsResetEvent reset ); - - // NetObject - virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); - virtual void unpackUpdate( NetConnection *conn, BitStream *stream ); - - // SceneObject - virtual void setTransform( const MatrixF &mat ); - virtual void setScale( const VectorF &scale ); - virtual void prepRenderImage( SceneRenderState *state ); - - // GameBase - virtual bool onNewDataBlock( GameBaseData *dptr, bool reload ); - virtual void processTick( const Move *move ); - virtual void interpolateTick( F32 delta ); - -protected: - - PxWorld *mWorld; - - NxScene *mScene; - - /// Cooked cloth collision mesh. - NxClothMesh *mClothMesh; - - /// The cloth actor used - NxCloth *mCloth; - - NxMeshData mReceiveBuffers; - - bool mBendingEnabled; - bool mDampingEnabled; - bool mTriangleCollisionEnabled; - bool mSelfCollisionEnabled; - - F32 mDensity; - F32 mThickness; - F32 mFriction; - F32 mBendingStiffness; - F32 mStretchingStiffness; - F32 mDampingCoefficient; - F32 mCollisionResponseCoefficient; - F32 mAttachmentResponseCoefficient; - - U32 mAttachmentMask; - - static EnumTable mAttachmentFlagTable; - - String mMaterialName; - SimObjectPtr mMaterial; - BaseMatInstance *mMatInst; - - String lookupName; - - /// The output verts from the PhysX simulation. - GFXVertexPNTT *mVertexRenderBuffer; - - /// The output indices from the PhysX simulation. - U16 *mIndexRenderBuffer; - - U32 mMaxVertices; - U32 mMaxIndices; - - /// The number of indices in the cloth which - /// is updated by the PhysX simulation. - U32 mNumIndices; - - /// The number of verts in the cloth which - /// is updated by the PhysX simulation. - U32 mNumVertices; - - U32 mMeshDirtyFlags; - bool mIsVBDirty; - - GFXPrimitiveBufferHandle mPrimBuffer; - GFXVertexBufferHandle mVB; - - Point2I mPatchVerts; - Point2F mPatchSize; - - MatrixF mResetXfm; - - void _initMaterial(); - - void _releaseMesh(); - void _releaseCloth(); - - bool _createClothPatch(); - - void _recreateCloth( const MatrixF &transform ); - - void _updateClothProperties(); - - void _initClothMesh(); - void _initReceiveBuffers(); - void _setupAttachments(); - - void _updateStaticCloth(); - - void _updateVBIB(); -}; - -#endif // _PXCLOTH_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxCollision.cpp b/Engine/source/T3D/physics/physx/pxCollision.cpp deleted file mode 100644 index b08636d64..000000000 --- a/Engine/source/T3D/physics/physx/pxCollision.cpp +++ /dev/null @@ -1,291 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxCollision.h" - -#include "math/mPoint3.h" -#include "math/mMatrix.h" -#include "T3D/physics/physX/px.h" -#include "T3D/physics/physX/pxCasts.h" -#include "T3D/physics/physX/pxWorld.h" -#include "T3D/physics/physX/pxStream.h" - - -PxCollision::PxCollision() -{ -} - -PxCollision::~PxCollision() -{ - // We may be deleteting SDK data... so make - // sure we have the the scene write lock. - PxWorld::releaseWriteLocks(); - - for ( U32 i=0; i < mColShapes.size(); i++ ) - { - // Check for special types which need cleanup. - NxShapeDesc *desc = mColShapes[i]; - - if ( desc->getType() == NX_SHAPE_CONVEX ) - gPhysicsSDK->releaseConvexMesh( *((NxConvexShapeDesc*)desc)->meshData ); - else if ( desc->getType() == NX_SHAPE_MESH ) - gPhysicsSDK->releaseTriangleMesh( *((NxTriangleMeshShapeDesc*)desc)->meshData ); - else if ( desc->getType() == NX_SHAPE_HEIGHTFIELD ) - gPhysicsSDK->releaseHeightField( *((NxHeightFieldShapeDesc*)desc)->heightField ); - - // Delete the descriptor. - delete desc; - } - - mColShapes.clear(); -} - -void PxCollision::addPlane( const PlaneF &plane ) -{ - NxBoxShapeDesc *desc = new NxBoxShapeDesc; - desc->skinWidth = 0.01f; - desc->dimensions.set( 10000.0f, 10000.0f, 100.0f ); - desc->localPose.t.z = -100.0f; - - // TODO: Fix rotation to match plane normal! - //boxDesc->localPose.M.setColumn( 0, NxVec3( plane.x, plane.y, plane.z ) ); - //boxDesc->localPose.M.setColumn( 1, NxVec3( plane.x, plane.y, plane.z ) ); - //boxDesc->localPose.M.setColumn( 2, NxVec3( plane.x, plane.y, plane.z ) ); - - mColShapes.push_back( desc ); -} - -void PxCollision::addBox( const Point3F &halfWidth, - const MatrixF &localXfm ) -{ - NxBoxShapeDesc *desc = new NxBoxShapeDesc; - desc->skinWidth = 0.01f; - desc->dimensions.set( halfWidth.x, halfWidth.y, halfWidth.z ); - desc->localPose.setRowMajor44( localXfm ); - mColShapes.push_back( desc ); -} - -void PxCollision::addSphere( F32 radius, - const MatrixF &localXfm ) -{ - NxSphereShapeDesc *desc = new NxSphereShapeDesc; - desc->skinWidth = 0.01f; - desc->radius = radius; - desc->localPose.setRowMajor44( localXfm ); - mColShapes.push_back( desc ); -} - -void PxCollision::addCapsule( F32 radius, - F32 height, - const MatrixF &localXfm ) -{ - NxCapsuleShapeDesc *desc = new NxCapsuleShapeDesc; - desc->skinWidth = 0.01f; - desc->radius = radius; - desc->height = height; - desc->localPose.setRowMajor44( localXfm ); - mColShapes.push_back( desc ); -} - -bool PxCollision::addConvex( const Point3F *points, - U32 count, - const MatrixF &localXfm ) -{ - // Mesh cooking requires that both - // scenes not be write locked! - PxWorld::releaseWriteLocks(); - - NxCookingInterface *cooker = PxWorld::getCooking(); - cooker->NxInitCooking(); - - NxConvexMeshDesc meshDesc; - meshDesc.numVertices = count; - meshDesc.pointStrideBytes = sizeof(Point3F); - meshDesc.points = points; - meshDesc.flags = NX_CF_COMPUTE_CONVEX | NX_CF_INFLATE_CONVEX; - - // Cook it! - NxCookingParams params; - #ifdef TORQUE_OS_XENON - params.targetPlatform = PLATFORM_XENON; - #else - params.targetPlatform = PLATFORM_PC; - #endif - params.skinWidth = 0.01f; - params.hintCollisionSpeed = true; - cooker->NxSetCookingParams( params ); - - PxMemStream stream; - bool cooked = cooker->NxCookConvexMesh( meshDesc, stream ); - cooker->NxCloseCooking(); - - if ( !cooked ) - return false; - - stream.resetPosition(); - NxConvexMesh *meshData = gPhysicsSDK->createConvexMesh( stream ); - if ( !meshData ) - return false; - - NxConvexShapeDesc *desc = new NxConvexShapeDesc; - desc->skinWidth = 0.01f; - desc->meshData = meshData; - desc->localPose.setRowMajor44( localXfm ); - mColShapes.push_back( desc ); - - return true; -} - -bool PxCollision::addTriangleMesh( const Point3F *vert, - U32 vertCount, - const U32 *index, - U32 triCount, - const MatrixF &localXfm ) -{ - // Mesh cooking requires that both - // scenes not be write locked! - PxWorld::releaseWriteLocks(); - - NxCookingInterface *cooker = PxWorld::getCooking(); - cooker->NxInitCooking(); - - NxTriangleMeshDesc meshDesc; - meshDesc.numVertices = vertCount; - meshDesc.numTriangles = triCount; - meshDesc.pointStrideBytes = sizeof(Point3F); - meshDesc.triangleStrideBytes = 3*sizeof(U32); - meshDesc.points = vert; - meshDesc.triangles = index; - meshDesc.flags = NX_MF_FLIPNORMALS; - - // Cook it! - NxCookingParams params; - #ifdef TORQUE_OS_XENON - params.targetPlatform = PLATFORM_XENON; - #else - params.targetPlatform = PLATFORM_PC; - #endif - params.skinWidth = 0.01f; - params.hintCollisionSpeed = true; - cooker->NxSetCookingParams( params ); - - PxMemStream stream; - bool cooked = cooker->NxCookTriangleMesh( meshDesc, stream ); - cooker->NxCloseCooking(); - if ( !cooked ) - return false; - - stream.resetPosition(); - NxTriangleMesh *meshData = gPhysicsSDK->createTriangleMesh( stream ); - if ( !meshData ) - return false; - - NxTriangleMeshShapeDesc *desc = new NxTriangleMeshShapeDesc; - desc->skinWidth = 0.01f; - desc->meshData = meshData; - desc->localPose.setRowMajor44( localXfm ); - mColShapes.push_back( desc ); - - return true; -} - -bool PxCollision::addHeightfield( const U16 *heights, - const bool *holes, - U32 blockSize, - F32 metersPerSample, - const MatrixF &localXfm ) -{ - // Since we're creating SDK level data we - // have to have access to all active worlds. - PxWorld::releaseWriteLocks(); - - // Init the heightfield description. - NxHeightFieldDesc heightFieldDesc; - heightFieldDesc.nbColumns = blockSize; - heightFieldDesc.nbRows = blockSize; - heightFieldDesc.thickness = -10.0f; - heightFieldDesc.convexEdgeThreshold = 0; - - // Allocate the samples. - heightFieldDesc.samples = new NxU32[ blockSize * blockSize ]; - heightFieldDesc.sampleStride = sizeof(NxU32); - NxU8 *currentByte = (NxU8*)heightFieldDesc.samples; - - for ( U32 row = 0; row < blockSize; row++ ) - { - const U32 tess = ( row + 1 ) % 2; - - for ( U32 column = 0; column < blockSize; column++ ) - { - NxHeightFieldSample *currentSample = (NxHeightFieldSample*)currentByte; - - U32 index = ( blockSize - row - 1 ) + ( column * blockSize ); - currentSample->height = heights[ index ]; - - if ( holes && holes[ getMax( (S32)index - 1, 0 ) ] ) // row index for holes adjusted so PhysX collision shape better matches rendered terrain - { - currentSample->materialIndex0 = 0; - currentSample->materialIndex1 = 0; - } - else - { - currentSample->materialIndex0 = 1; //materialIds[0]; - currentSample->materialIndex1 = 1; //materialIds[0]; - } - - currentSample->tessFlag = ( column + tess ) % 2; - - currentByte += heightFieldDesc.sampleStride; - } - } - - // Build it. - NxHeightFieldShapeDesc *desc = new NxHeightFieldShapeDesc; - desc->heightField = gPhysicsSDK->createHeightField( heightFieldDesc ); - - // Destroy the temp sample array. - delete [] heightFieldDesc.samples; - - // TerrainBlock uses a 11.5 fixed point height format - // giving it a maximum height range of 0 to 2048. - desc->heightScale = 0.03125f; - - desc->rowScale = metersPerSample; - desc->columnScale = metersPerSample; - desc->materialIndexHighBits = 0; - desc->skinWidth = 0.01f; - - // Use the local pose to align the heightfield - // to what Torque will expect. - NxMat33 rotX; - rotX.rotX( Float_HalfPi ); - NxMat33 rotZ; - rotZ.rotZ( Float_Pi ); - NxMat34 rot; - rot.M.multiply( rotZ, rotX ); - rot.t.set( ( blockSize - 1 ) * metersPerSample, 0, 0 ); - desc->localPose = rot; - - mColShapes.push_back( desc ); - return true; -} diff --git a/Engine/source/T3D/physics/physx/pxCollision.h b/Engine/source/T3D/physics/physx/pxCollision.h deleted file mode 100644 index 54263b792..000000000 --- a/Engine/source/T3D/physics/physx/pxCollision.h +++ /dev/null @@ -1,78 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _T3D_PHYSICS_PXCOLLISION_H_ -#define _T3D_PHYSICS_PXCOLLISION_H_ - -#ifndef _T3D_PHYSICS_PHYSICSCOLLISION_H_ -#include "T3D/physics/physicsCollision.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif - -class NxShapeDesc; - - -class PxCollision : public PhysicsCollision -{ -protected: - - /// The collision representation. - Vector mColShapes; - - /// Helper for adding shapes. - //void _addShape( btCollisionShape *shape, const MatrixF &localXfm ); - -public: - - PxCollision(); - virtual ~PxCollision(); - - /// Return the PhysX shape descriptions. - const Vector& getShapes() const { return mColShapes; } - - // PhysicsCollision - virtual void addPlane( const PlaneF &plane ); - virtual void addBox( const Point3F &halfWidth, - const MatrixF &localXfm ); - virtual void addSphere( F32 radius, - const MatrixF &localXfm ); - virtual void addCapsule( F32 radius, - F32 height, - const MatrixF &localXfm ); - virtual bool addConvex( const Point3F *points, - U32 count, - const MatrixF &localXfm ); - virtual bool addTriangleMesh( const Point3F *vert, - U32 vertCount, - const U32 *index, - U32 triCount, - const MatrixF &localXfm ); - virtual bool addHeightfield( const U16 *heights, - const bool *holes, - U32 blockSize, - F32 metersPerSample, - const MatrixF &localXfm ); -}; - -#endif // _T3D_PHYSICS_PXCOLLISION_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxContactReporter.cpp b/Engine/source/T3D/physics/physx/pxContactReporter.cpp deleted file mode 100644 index 33b1c3dab..000000000 --- a/Engine/source/T3D/physics/physx/pxContactReporter.cpp +++ /dev/null @@ -1,108 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxContactReporter.h" - -#include "T3D/physics/physX/pxCasts.h" -#include "T3D/physics/physicsUserData.h" -#include "T3D/physics/physX/pxMultiActor.h" -#include "platform/profiler.h" - - -PxContactReporter::PxContactReporter() -{ -} - -PxContactReporter::~PxContactReporter() -{ -} - -void PxContactReporter::onContactNotify( NxContactPair &pair, NxU32 events ) -{ - PROFILE_SCOPE( PxContactReporter_OnContactNotify ); - - // For now we only care about start touch events. - if ( !( events & NX_NOTIFY_ON_START_TOUCH ) ) - return; - - // Skip if either actor is deleted. - if ( pair.isDeletedActor[0] || pair.isDeletedActor[1] ) - return; - - NxActor *actor0 = pair.actors[0]; - NxActor *actor1 = pair.actors[1]; - - PhysicsUserData *userData0 = PhysicsUserData::cast( actor0->userData ); - PhysicsUserData *userData1 = PhysicsUserData::cast( actor1->userData ); - - // Early out if we don't have user data or signals to notify. - if ( ( !userData0 || userData0->getContactSignal().isEmpty() ) && - ( !userData1 || userData1->getContactSignal().isEmpty() ) ) - return; - - // Get an average contact point. - U32 points = 0; - NxVec3 hitPoint( 0.0f ); - NxContactStreamIterator iter( pair.stream ); - while( iter.goNextPair() ) - { - while( iter.goNextPatch() ) - { - while( iter.goNextPoint() ) - { - hitPoint += iter.getPoint(); - ++points; - } - } - } - hitPoint /= (F32)points; - - if ( userData0 ) - userData0->getContactSignal().trigger( userData0, - userData1, - pxCast( hitPoint ), - pxCast( pair.sumNormalForce ) ); - - if ( userData1 ) - userData1->getContactSignal().trigger( userData1, - userData0, - pxCast( hitPoint ), - pxCast( -pair.sumNormalForce ) ); -} - -bool PxUserNotify::onJointBreak( NxReal breakingForce, NxJoint &brokenJoint ) -{ - PROFILE_SCOPE( PxUserNotify_OnJointBreak ); - - PxUserData *userData = PxUserData::getData( brokenJoint ); - - if ( userData ) - userData->getOnJointBreakSignal().trigger( breakingForce, brokenJoint ); - - // NOTE: Returning true here will tell the - // PhysX SDK to delete the joint, which will - // cause MANY problems if any of the user app's - // objects still hold references to it. - - return false; -} \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxFluid.cpp b/Engine/source/T3D/physics/physx/pxFluid.cpp deleted file mode 100644 index efe5d453b..000000000 --- a/Engine/source/T3D/physics/physx/pxFluid.cpp +++ /dev/null @@ -1,310 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physx/pxFluid.h" - -#include "console/consoleTypes.h" -#include "scene/sceneRenderState.h" -#include "renderInstance/renderPassManager.h" -#include "T3D/physics/physicsPlugin.h" -#include "T3D/physics/physx/pxWorld.h" -#include "T3D/physics/physx/pxCasts.h" -#include "gfx/gfxDrawUtil.h" -#include "math/mathIO.h" -#include "core/stream/bitStream.h" - - -IMPLEMENT_CO_NETOBJECT_V1( PxFluid ); - -ConsoleDocClass( PxFluid, - "@brief Experimental and unfinished Torque wrapper class for NxFluid.\n\n" - "@internal\n" -); - -PxFluid::PxFluid() - : mWorld( NULL ), - mScene( NULL ), - mParticles( NULL ), - mFluid( NULL ), - mEmitter( NULL ), - mParticleCount( 0 ) -{ - mNetFlags.set( Ghostable | ScopeAlways ); - mTypeMask |= StaticObjectType | StaticShapeObjectType; -} - -PxFluid::~PxFluid() -{ - -} - -bool PxFluid::onAdd() -{ - if ( !Parent::onAdd() ) - return false; - - mWorld = dynamic_cast( PHYSICSMGR->getWorld( isServerObject() ? "server" : "client" ) ); - - if ( !mWorld || !mWorld->getScene() ) - { - Con::errorf( "PxMultiActor::onAdd() - PhysXWorld not initialized!" ); - return false; - } - - mScene = mWorld->getScene(); - - if ( isClientObject() ) - _createFluid(); - - Point3F halfScale = Point3F::One * 0.5f; - mObjBox.minExtents = -halfScale; - mObjBox.maxExtents = halfScale; - resetWorldBox(); - - addToScene(); - - return true; -} - -void PxFluid::onRemove() -{ - if ( isClientObject() ) - _destroyFluid(); - - removeFromScene(); - - Parent::onRemove(); -} - -void PxFluid::initPersistFields() -{ - Parent::initPersistFields(); -} - -void PxFluid::inspectPostApply() -{ - Parent::inspectPostApply(); - - setMaskBits( UpdateMask ); -} - -U32 PxFluid::packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) -{ - U32 retMask = Parent::packUpdate( conn, mask, stream ); - - if ( stream->writeFlag( mask & UpdateMask ) ) - { - mathWrite( *stream, getTransform() ); - mathWrite( *stream, getScale() ); - - stream->write( mEmitter ? mEmitter->getRate() : 0 ); - } - - stream->writeFlag( isProperlyAdded() && mask & ResetMask ); - - return retMask; -} - -void PxFluid::unpackUpdate( NetConnection *conn, BitStream *stream ) -{ - Parent::unpackUpdate( conn, stream ); - - // UpdateMask - if ( stream->readFlag() ) - { - MatrixF mat; - mathRead( *stream, &mat ); - Point3F scale; - mathRead( *stream, &scale ); - - setScale( scale ); - setTransform( mat ); - - F32 rate; - stream->read( &rate ); - setRate( rate ); - } - - // ResetMask - if ( stream->readFlag() ) - resetParticles(); -} - -void PxFluid::setTransform( const MatrixF &mat ) -{ - Parent::setTransform( mat ); - - if ( mEmitter ) - { - NxMat34 nxMat; - nxMat.setRowMajor44( mat ); - mEmitter->setGlobalPose( nxMat ); - } -} - -void PxFluid::setScale( const VectorF &scale ) -{ - Point3F lastScale = getScale(); - - Point3F halfScale = Point3F::One * 0.5f; - mObjBox.minExtents = -halfScale; - mObjBox.maxExtents = halfScale; - resetWorldBox(); - - Parent::setScale( scale ); - - if ( lastScale != getScale() && - mEmitter ) - { - _destroyFluid(); - _createFluid(); - } -} - -void PxFluid::prepRenderImage( SceneRenderState *state ) -{ - if ( !state->isDiffusePass() ) - return; - - ObjectRenderInst *ri = state->getRenderPass()->allocInst(); - ri->renderDelegate.bind( this, &PxFluid::renderObject ); - ri->type = RenderPassManager::RIT_Object; - state->getRenderPass()->addInst( ri ); -} - -void PxFluid::resetParticles() -{ - if ( mEmitter ) - mEmitter->resetEmission( MAX_PARTICLES ); - setMaskBits( ResetMask ); -} - -void PxFluid::setRate( F32 rate ) -{ - if ( mEmitter ) - mEmitter->setRate( rate ); - setMaskBits( UpdateMask ); -} - -void PxFluid::renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ) -{ - GFXStateBlockDesc desc; - desc.setBlend( true ); - desc.setZReadWrite( true, false ); - - for ( U32 i = 0; i < mParticleCount; i++ ) - { - FluidParticle &particle = mParticles[i]; - Point3F pnt = pxCast( particle.position ); - - Box3F box( 0.2f ); - box.minExtents += pnt; - box.maxExtents += pnt; - - GFX->getDrawUtil()->drawCube( desc, box, ColorI::BLUE ); - } -} - -void PxFluid::_createFluid() -{ - /* - // Set structure to pass particles, and receive them after every simulation step - NxParticleData particleData; - particleData.numParticlesPtr = &mParticleCount; - particleData.bufferPos = &mParticles[0].position.x; - particleData.bufferPosByteStride = sizeof(FluidParticle); - particleData.bufferVel = &mParticles[0].velocity.x; - particleData.bufferVelByteStride = sizeof(FluidParticle); - particleData.bufferLife = &mParticles[0].lifetime; - particleData.bufferLifeByteStride = sizeof(FluidParticle); - - // Create a fluid descriptor - NxFluidDesc fluidDesc; - fluidDesc.kernelRadiusMultiplier = 2.3f; - fluidDesc.restParticlesPerMeter = 10.0f; - fluidDesc.stiffness = 200.0f; - fluidDesc.viscosity = 22.0f; - fluidDesc.restDensity = 1000.0f; - fluidDesc.damping = 0.0f; - fluidDesc.simulationMethod = NX_F_SPH; - fluidDesc.initialParticleData = particleData; - fluidDesc.particlesWriteData = particleData; - */ - - NxFluidDesc fluidDesc; - fluidDesc.setToDefault(); - fluidDesc.simulationMethod = NX_F_SPH; - fluidDesc.maxParticles = MAX_PARTICLES; - fluidDesc.restParticlesPerMeter = 50; - fluidDesc.stiffness = 1; - fluidDesc.viscosity = 6; - fluidDesc.flags = NX_FF_VISUALIZATION|NX_FF_ENABLED; - - mParticles = new FluidParticle[MAX_PARTICLES]; - dMemset( mParticles, 0, sizeof(FluidParticle) * MAX_PARTICLES ); - - NxParticleData &particleData = fluidDesc.particlesWriteData; - - particleData.numParticlesPtr = &mParticleCount; - particleData.bufferPos = &mParticles[0].position.x; - particleData.bufferPosByteStride = sizeof(FluidParticle); - particleData.bufferVel = &mParticles[0].velocity.x; - particleData.bufferVelByteStride = sizeof(FluidParticle); - particleData.bufferLife = &mParticles[0].lifetime; - particleData.bufferLifeByteStride = sizeof(FluidParticle); - - mFluid = mScene->createFluid( fluidDesc ); - - - //Create Emitter. - NxFluidEmitterDesc emitterDesc; - emitterDesc.setToDefault(); - emitterDesc.dimensionX = getScale().x; - emitterDesc.dimensionY = getScale().y; - emitterDesc.relPose.setColumnMajor44( getTransform() ); - emitterDesc.rate = 5.0f; - emitterDesc.randomAngle = 0.1f; - emitterDesc.fluidVelocityMagnitude = 6.5f; - emitterDesc.maxParticles = 0; - emitterDesc.particleLifetime = 4.0f; - emitterDesc.type = NX_FE_CONSTANT_FLOW_RATE; - emitterDesc.shape = NX_FE_ELLIPSE; - mEmitter = mFluid->createEmitter(emitterDesc); -} - -void PxFluid::_destroyFluid() -{ - delete[] mParticles; - mScene->releaseFluid( *mFluid ); - mEmitter = NULL; -} - -ConsoleMethod( PxFluid, resetParticles, void, 2, 2, "" ) -{ - object->resetParticles(); -} - -ConsoleMethod( PxFluid, setRate, void, 2, 2, "" ) -{ - object->setRate( dAtof(argv[2]) ); -} \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxFluid.h b/Engine/source/T3D/physics/physx/pxFluid.h deleted file mode 100644 index ae7fe4f3c..000000000 --- a/Engine/source/T3D/physics/physx/pxFluid.h +++ /dev/null @@ -1,107 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PXFLUID_H_ -#define _PXFLUID_H_ - -#ifndef _SCENEOBJECT_H_ -#include "scene/sceneObject.h" -#endif -#ifndef _PHYSX_H_ -#include "T3D/physics/physx/px.h" -#endif - -class BaseMatInstance; -class PxWorld; -class NxScene; - - -class PxFluid : public SceneObject -{ - typedef SceneObject Parent; - -protected: - - enum NetMasks - { - UpdateMask = Parent::NextFreeMask, - ResetMask = Parent::NextFreeMask << 1, - NextFreeMask = Parent::NextFreeMask << 2 - }; - - struct FluidParticle - { - NxVec3 position; - NxVec3 velocity; - NxReal density; - NxReal lifetime; - NxU32 id; - NxVec3 collisionNormal; - }; - - #define MAX_PARTICLES 100 - -public: - - PxFluid(); - virtual ~PxFluid(); - - DECLARE_CONOBJECT( PxFluid ); - - // SimObject - virtual bool onAdd(); - virtual void onRemove(); - static void initPersistFields(); - virtual void inspectPostApply(); - - // NetObject - virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); - virtual void unpackUpdate( NetConnection *conn, BitStream *stream ); - - // SceneObject - virtual void setTransform( const MatrixF &mat ); - virtual void setScale( const VectorF &scale ); - virtual void prepRenderImage( SceneRenderState *state ); - - void resetParticles(); - void setRate( F32 rate ); - -protected: - - void renderObject( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ); - - void _createFluid(); - void _destroyFluid(); - -protected: - - PxWorld *mWorld; - NxScene *mScene; - - FluidParticle *mParticles; - //NxParticleData *mParticleData; - NxFluid *mFluid; - U32 mParticleCount; - NxFluidEmitter *mEmitter; -}; - -#endif // _PXFLUID_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxMaterial.cpp b/Engine/source/T3D/physics/physx/pxMaterial.cpp deleted file mode 100644 index 9a5656394..000000000 --- a/Engine/source/T3D/physics/physx/pxMaterial.cpp +++ /dev/null @@ -1,150 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/px.h" - -#include "T3D/physics/physX/pxMaterial.h" - -#include "T3D/physics/physX/pxWorld.h" -#include "T3D/physics/physicsPlugin.h" -#include "console/consoleTypes.h" -#include "core/stream/bitStream.h" - - -IMPLEMENT_CO_DATABLOCK_V1( PxMaterial ); - -ConsoleDocClass( PxMaterial, - - "@brief Defines a PhysX material assignable to a PxMaterial.\n\n" - - "When two actors collide, the collision behavior that results depends on the material properties " - "of the actors' surfaces. For example, the surface properties determine if the actors will or will " - "not bounce, or if they will slide or stick. Currently, the only special feature supported by materials " - "is anisotropic friction, but according to Nvidia, other effects such as moving surfaces and more types " - "of friction are slotted for future release.\n\n" - - "For more information, refer to Nvidia's PhysX docs.\n\n" - - "@ingroup Physics" -); - -PxMaterial::PxMaterial() -: mNxMat( NULL ), - mNxMatId( -1 ), - restitution( 0.0f ), - staticFriction( 0.1f ), - dynamicFriction( 0.95f ), - mServer( false ) -{ -} - -PxMaterial::~PxMaterial() -{ -} - -void PxMaterial::consoleInit() -{ - Parent::consoleInit(); -} - -void PxMaterial::initPersistFields() -{ - Parent::initPersistFields(); - - addGroup("PxMaterial"); - - addField( "restitution", TypeF32, Offset( restitution, PxMaterial ), - "@brief Coeffecient of a bounce applied to the shape in response to a collision.\n\n" - "A value of 0 makes the object bounce as little as possible, while higher values up to 1.0 result in more bounce.\n\n" - "@note Values close to or above 1.0 may cause stability problems and/or increasing energy."); - addField( "staticFriction", TypeF32, Offset( staticFriction, PxMaterial ), - "@brief Coefficient of static %friction to be applied.\n\n" - "Static %friction determines the force needed to start moving an at-rest object in contact with a surface. " - "If the force applied onto shape cannot overcome the force of static %friction, the shape will remain at rest. " - "A higher coefficient will require a larger force to start motion. " - "@note This value should be larger than 0.\n\n"); - addField( "dynamicFriction", TypeF32, Offset( dynamicFriction, PxMaterial ), - "@brief Coefficient of dynamic %friction to be applied.\n\n" - "Dynamic %friction reduces the velocity of a moving object while it is in contact with a surface. " - "A higher coefficient will result in a larger reduction in velocity. " - "A shape's dynamicFriction should be equal to or larger than 0.\n\n"); - - endGroup("PxMaterial"); -} - -void PxMaterial::onStaticModified( const char *slotName, const char *newValue ) -{ - if ( isProperlyAdded() && mNxMat != NULL ) - { - mNxMat->setRestitution( restitution ); - mNxMat->setStaticFriction( staticFriction ); - mNxMat->setDynamicFriction( dynamicFriction ); - } -} - -bool PxMaterial::preload( bool server, String &errorBuffer ) -{ - mServer = server; - - PxWorld *world = dynamic_cast( PHYSICSMGR->getWorld( server ? "server" : "client" ) ); - - if ( !world ) - { - // TODO: Error... in error buffer? - return false; - } - - NxMaterialDesc material; - material.restitution = restitution; - material.staticFriction = staticFriction; - material.dynamicFriction = dynamicFriction; - - mNxMat = world->createMaterial( material ); - mNxMatId = mNxMat->getMaterialIndex(); - - if ( mNxMatId == -1 ) - { - errorBuffer = "PxMaterial::preload() - unable to create material!"; - return false; - } - - return Parent::preload( server, errorBuffer ); -} - -void PxMaterial::packData( BitStream* stream ) -{ - Parent::packData( stream ); - - stream->write( restitution ); - stream->write( staticFriction ); - stream->write( dynamicFriction ); -} - -void PxMaterial::unpackData( BitStream* stream ) -{ - Parent::unpackData( stream ); - - stream->read( &restitution ); - stream->read( &staticFriction ); - stream->read( &dynamicFriction ); -} diff --git a/Engine/source/T3D/physics/physx/pxMaterial.h b/Engine/source/T3D/physics/physx/pxMaterial.h deleted file mode 100644 index b1e0dd7f0..000000000 --- a/Engine/source/T3D/physics/physx/pxMaterial.h +++ /dev/null @@ -1,69 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PHYSX_MATERIAL_H -#define _PHYSX_MATERIAL_H - -#ifndef _SIMBASE_H_ -#include "console/simBase.h" -#endif -#ifndef _DYNAMIC_CONSOLETYPES_H_ -#include "console/dynamicTypes.h" -#endif - -class NxMaterial; - -class PxMaterial : public SimDataBlock -{ - typedef SimDataBlock Parent; - -protected: - - F32 restitution; - F32 staticFriction; - F32 dynamicFriction; - - NxMaterial *mNxMat; - S32 mNxMatId; - - bool mServer; - -public: - - DECLARE_CONOBJECT( PxMaterial ); - - PxMaterial(); - ~PxMaterial(); - - static void consoleInit(); - static void initPersistFields(); - virtual void onStaticModified( const char *slotName, const char *newValue ); - - bool preload( bool server, String &errorBuffer ); - virtual void packData( BitStream* stream ); - virtual void unpackData( BitStream* stream ); - - S32 getMaterialId() const { return mNxMatId; } - -}; - -#endif // _PHYSX_MATERIAL_H \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxMultiActor.cpp b/Engine/source/T3D/physics/physx/pxMultiActor.cpp deleted file mode 100644 index 6abdcdaad..000000000 --- a/Engine/source/T3D/physics/physx/pxMultiActor.cpp +++ /dev/null @@ -1,2651 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxMultiActor.h" - -#include "console/consoleTypes.h" -#include "core/stream/fileStream.h" -#include "core/stream/bitStream.h" -#include "core/resourceManager.h" -#include "core/strings/stringUnit.h" -#include "sim/netConnection.h" -#include "math/mathIO.h" -#include "math/mathUtils.h" -#include "gfx/gfxTransformSaver.h" -#include "gfx/gfxDrawUtil.h" -#include "gfx/primBuilder.h" -#include "collision/collision.h" -#include "collision/abstractPolyList.h" -#include "ts/tsShapeInstance.h" -#include "ts/tsPartInstance.h" -#include "lighting/lightManager.h" -#include "scene/sceneManager.h" -#include "scene/sceneRenderState.h" -#include "scene/sceneObjectLightingPlugin.h" -#include "T3D/objectTypes.h" -#include "T3D/containerQuery.h" -#include "T3D/fx/particleEmitter.h" -#include "T3D/debris.h" -#include "renderInstance/renderPassManager.h" -#include "gui/worldEditor/editor.h" // For gEditingMission -#include "T3D/physics/physX/px.h" -#include "T3D/physics/physX/pxWorld.h" -#include "T3D/physics/physX/pxMaterial.h" -#include "T3D/physics/physX/pxCasts.h" -#include "T3D/physics/physx/pxUtils.h" -#include "sfx/sfxSystem.h" - -#include -#include -#include - - -class PxMultiActor_Notify : public NXU_userNotify -{ -protected: - - Vector mActors; - - Vector mShapes; - - Vector mJoints; - - const NxMat34 mTransform; - - const Point3F mScale; - - F32 mMassScale; - - NxCompartment *mCompartment; - - PxMaterial *mMaterial; - - Vector *mActorUserProperties; - - Vector *mJointUserProperties; - -public: - - void NXU_notifyJoint( NxJoint *joint, const char *userProperties ) - { - if ( mJointUserProperties ) - mJointUserProperties->push_back( userProperties ); - mJoints.push_back( joint ); - } - - bool NXU_preNotifyJoint( NxJointDesc &joint, const char *userProperties ) - { - joint.localAnchor[0].x *= mScale.x; - joint.localAnchor[0].y *= mScale.y; - joint.localAnchor[0].z *= mScale.z; - - joint.localAnchor[1].x *= mScale.x; - joint.localAnchor[1].y *= mScale.y; - joint.localAnchor[1].z *= mScale.z; - - // The PhysX exporter from 3dsMax doesn't allow creation - // of fixed joints. It also doesn't seem to export the - // joint names! So look for joints which all all the - // motion axes are locked... make those fixed joints. - if ( joint.getType() == NX_JOINT_D6 ) - { - NxD6JointDesc *d6Joint = static_cast( &joint ); - - if ( d6Joint->xMotion == NX_D6JOINT_MOTION_LOCKED && - d6Joint->yMotion == NX_D6JOINT_MOTION_LOCKED && - d6Joint->zMotion == NX_D6JOINT_MOTION_LOCKED && - d6Joint->swing1Motion == NX_D6JOINT_MOTION_LOCKED && - d6Joint->swing2Motion == NX_D6JOINT_MOTION_LOCKED && - d6Joint->twistMotion == NX_D6JOINT_MOTION_LOCKED ) - { - // Ok... build a new fixed joint. - NxFixedJointDesc fixed; - fixed.actor[0] = joint.actor[0]; - fixed.actor[1] = joint.actor[1]; - fixed.localNormal[0] = joint.localNormal[0]; - fixed.localNormal[1] = joint.localNormal[1]; - fixed.localAxis[0] = joint.localAxis[0]; - fixed.localAxis[1] = joint.localAxis[1]; - fixed.localAnchor[0] = joint.localAnchor[0]; - fixed.localAnchor[1] = joint.localAnchor[1]; - fixed.maxForce = joint.maxForce; - fixed.maxTorque = joint.maxTorque; - fixed.name = joint.name; - fixed.userData = joint.userData; - fixed.jointFlags = joint.jointFlags; - - // What scene are we adding this to? - NxActor *actor = fixed.actor[0] ? fixed.actor[0] : fixed.actor[1]; - NxScene &scene = actor->getScene(); - - NxJoint* theJoint = scene.createJoint( fixed ); - mJoints.push_back( theJoint ); - if ( mJointUserProperties ) - mJointUserProperties->push_back( userProperties ); - - // Don't generate this joint. - return false; - } - } - - return true; - } - - void NXU_notifyActor( NxActor *actor, const char *userProperties ) - { - mActors.push_back( actor ); - - // Save the shapes. - for ( U32 i=0; i < actor->getNbShapes(); i++ ) - mShapes.push_back( actor->getShapes()[i] ); - - mActorUserProperties->push_back( userProperties ); - }; - - bool NXU_preNotifyMaterial( NxMaterialDesc &t, const char *userProperties ) - { - // Don't generate materials if we have one defined! - return !mMaterial; - } - - bool NXU_preNotifyActor( NxActorDesc &actor, const char *userProperties ) - { - // Set the right compartment. - actor.compartment = mCompartment; - - if ( actor.shapes.size() == 0 ) - Con::warnf( "PxMultiActor_Notify::NXU_preNotifyActor, got an actor (%s) with no shapes, was this intentional?", actor.name ); - - // For every shape, cast to its particular type - // and apply the scale to size, mass and localPosition. - for( S32 i = 0; i < actor.shapes.size(); i++ ) - { - // If we have material then set it. - if ( mMaterial ) - actor.shapes[i]->materialIndex = mMaterial->getMaterialId(); - - switch( actor.shapes[i]->getType() ) - { - case NX_SHAPE_BOX: - { - NxBoxShapeDesc *boxDesc = (NxBoxShapeDesc*)actor.shapes[i]; - - boxDesc->mass *= mMassScale; - - boxDesc->dimensions.x *= mScale.x; - boxDesc->dimensions.y *= mScale.y; - boxDesc->dimensions.z *= mScale.z; - - boxDesc->localPose.t.x *= mScale.x; - boxDesc->localPose.t.y *= mScale.y; - boxDesc->localPose.t.z *= mScale.z; - break; - } - - case NX_SHAPE_SPHERE: - { - NxSphereShapeDesc *sphereDesc = (NxSphereShapeDesc*)actor.shapes[i]; - - sphereDesc->mass *= mMassScale; - - // TODO: Spheres do not work with non-uniform - // scales very well... how do we fix this? - sphereDesc->radius *= mScale.x; - - sphereDesc->localPose.t.x *= mScale.x; - sphereDesc->localPose.t.y *= mScale.y; - sphereDesc->localPose.t.z *= mScale.z; - break; - } - - case NX_SHAPE_CAPSULE: - { - NxCapsuleShapeDesc *capsuleDesc = (NxCapsuleShapeDesc*)actor.shapes[i]; - - capsuleDesc->mass *= mMassScale; - - // TODO: Capsules do not work with non-uniform - // scales very well... how do we fix this? - capsuleDesc->radius *= mScale.x; - capsuleDesc->height *= mScale.y; - - capsuleDesc->localPose.t.x *= mScale.x; - capsuleDesc->localPose.t.y *= mScale.y; - capsuleDesc->localPose.t.z *= mScale.z; - break; - } - - default: - { - static String lookup[] = - { - "PLANE", - "SPHERE", - "BOX", - "CAPSULE", - "WHEEL", - "CONVEX", - "MESH", - "HEIGHTFIELD" - }; - - Con::warnf( "PxMultiActor_Notify::NXU_preNotifyActor, unsupported shape type (%s), on Actor (%s)", lookup[actor.shapes[i]->getType()].c_str(), actor.name ); - - delete actor.shapes[i]; - actor.shapes.erase( actor.shapes.begin() + i ); - --i; - break; - } - } - } - - NxBodyDesc *body = const_cast( actor.body ); - if ( body ) - { - // Must scale all of these parameters, else there will be odd results! - body->mass *= mMassScale; - body->massLocalPose.t.multiply( mMassScale, body->massLocalPose.t ); - body->massSpaceInertia.multiply( mMassScale, body->massSpaceInertia ); - - // Ragdoll damping! - //body->sleepDamping = 1.7f; - //body->linearDamping = 0.4f; - //body->angularDamping = 0.08f; - //body->wakeUpCounter = 0.3f; - } - - return true; - }; - -public: - - PxMultiActor_Notify( NxCompartment *compartment, - PxMaterial *material, - const NxMat34& mat, - const Point3F& scale, - Vector *actorProps = NULL, - Vector *jointProps = NULL ) - : mCompartment( compartment ), - mMaterial( material ), - mScale( scale ), - mTransform( mat ), - mActorUserProperties( actorProps ), - mJointUserProperties( jointProps ) - { - const F32 unit = VectorF( 1.0f, 1.0f, 1.0f ).len(); - mMassScale = mScale.len() / unit; - } - - virtual ~PxMultiActor_Notify() - { - } - - const Vector& getActors() { return mActors; } - const Vector& getShapes() { return mShapes; } - const Vector& getJoints() { return mJoints; } -}; - -ConsoleDocClass( PxMultiActorData, - - "@brief Defines the properties of a type of PxMultiActor.\n\n" - - "Usually it is prefered to use PhysicsShape rather than PxMultiActor because " - "a PhysicsShape is not PhysX specific and can be much easier to setup.\n\n" - - "For more information, refer to Nvidia's PhysX docs.\n\n" - - "@ingroup Physics" -); - -IMPLEMENT_CO_DATABLOCK_V1(PxMultiActorData); - -PxMultiActorData::PxMultiActorData() - : material( NULL ), - collection( NULL ), - waterDragScale( 1.0f ), - buoyancyDensity( 1.0f ), - angularDrag( 0.0f ), - linearDrag( 0.0f ), - clientOnly( false ), - singlePlayerOnly( false ), - shapeName( StringTable->insert( "" ) ), - physXStream( StringTable->insert( "" ) ), - breakForce( 0.0f ) -{ - for ( S32 i = 0; i < MaxCorrectionNodes; i++ ) - correctionNodeNames[i] = StringTable->insert( "" ); - - for ( S32 i = 0; i < MaxCorrectionNodes; i++ ) - correctionNodes[i] = -1; - - for ( S32 i = 0; i < NumMountPoints; i++ ) - { - mountNodeNames[i] = StringTable->insert( "" ); - mountPointNode[i] = -1; - } -} - -PxMultiActorData::~PxMultiActorData() -{ - if ( collection ) - NXU::releaseCollection( collection ); -} - -void PxMultiActorData::initPersistFields() -{ - Parent::initPersistFields(); - - addGroup("Media"); - addField( "shapeName", TypeFilename, Offset( shapeName, PxMultiActorData ), - "@brief Path to the .DAE or .DTS file to render.\n\n"); - endGroup("Media"); - - // PhysX collision properties. - addGroup( "Physics" ); - - addField( "physXStream", TypeFilename, Offset( physXStream, PxMultiActorData ), - "@brief .XML file containing data such as actors, shapes, and joints.\n\n" - "These files can be created using a free PhysX plugin for 3DS Max.\n\n"); - addField( "material", TYPEID< PxMaterial >(), Offset( material, PxMultiActorData ), - "@brief An optional PxMaterial to be used for the PxMultiActor.\n\n" - "Defines properties such as friction and restitution. " - "Unrelated to the material used for rendering. The physXStream will contain " - "defined materials that can be customized in 3DS Max. " - "To override the material for all physics shapes in the physXStream, specify a material here.\n\n"); - - addField( "noCorrection", TypeBool, Offset( noCorrection, PxMultiActorData ), - "@hide" ); - - UTF8 buff[256]; - for ( S32 i=0; i < MaxCorrectionNodes; i++ ) - { - //dSprintf( buff, sizeof(buff), "correctionNode%d", i ); - addField( buff, TypeString, Offset( correctionNodeNames[i], PxMultiActorData ), "@hide" ); - } - - for ( S32 i=0; i < NumMountPoints; i++ ) - { - //dSprintf( buff, sizeof(buff), "mountNode%d", i ); - addField( buff, TypeString, Offset( mountNodeNames[i], PxMultiActorData ), "@hide" ); - } - - addField( "angularDrag", TypeF32, Offset( angularDrag, PxMultiActorData ), - "@brief Value used to help calculate rotational drag force while submerged in water.\n\n"); - addField( "linearDrag", TypeF32, Offset( linearDrag, PxMultiActorData ), - "@brief Value used to help calculate linear drag force while submerged in water.\n\n"); - addField( "waterDragScale", TypeF32, Offset( waterDragScale, PxMultiActorData ), - "@brief Scale to apply to linear and angular dampening while submerged in water.\n\n "); - addField( "buoyancyDensity", TypeF32, Offset( buoyancyDensity, PxMultiActorData ), - "@brief The density used to calculate buoyant forces.\n\n" - "The result of the calculated buoyancy is relative to the density of the WaterObject the PxMultiActor is within.\n\n" - "@note This value is necessary because Torque 3D does its own buoyancy simulation. It is not handled by PhysX." - "@see WaterObject::density"); - - endGroup( "Physics" ); - - addField( "clientOnly", TypeBool, Offset( clientOnly, PxMultiActorData ), - "@hide"); - addField( "singlePlayerOnly", TypeBool, Offset( singlePlayerOnly, PxMultiActorData ), - "@hide"); - addField( "breakForce", TypeF32, Offset( breakForce, PxMultiActorData ), - "@brief Force required to break an actor.\n\n" - "This value does not apply to joints. " - "If an actor is associated with a joint it will break whenever the joint does. " - "This allows an actor \"not\" associated with a joint to also be breakable.\n\n"); -} - -void PxMultiActorData::packData(BitStream* stream) -{ - Parent::packData(stream); - - stream->writeString( shapeName ); - stream->writeString( physXStream ); - - if( stream->writeFlag( material ) ) - stream->writeRangedU32( packed ? SimObjectId( material ) : material->getId(), - DataBlockObjectIdFirst, DataBlockObjectIdLast ); - - if ( !stream->writeFlag( noCorrection ) ) - { - // Write the correction node indices for the client. - for ( S32 i = 0; i < MaxCorrectionNodes; i++ ) - stream->write( correctionNodes[i] ); - } - - for ( S32 i = 0; i < NumMountPoints; i++ ) - stream->write( mountPointNode[i] ); - - stream->write( waterDragScale ); - stream->write( buoyancyDensity ); - stream->write( angularDrag ); - stream->write( linearDrag ); - - stream->writeFlag( clientOnly ); - stream->writeFlag( singlePlayerOnly ); - stream->write( breakForce ); -} - -void PxMultiActorData::unpackData(BitStream* stream) -{ - Parent::unpackData(stream); - - shapeName = stream->readSTString(); - physXStream = stream->readSTString(); - - if( stream->readFlag() ) - material = (PxMaterial*)stream->readRangedU32( DataBlockObjectIdFirst, DataBlockObjectIdLast ); - - noCorrection = stream->readFlag(); - if ( !noCorrection ) - { - for ( S32 i = 0; i < MaxCorrectionNodes; i++ ) - stream->read( &correctionNodes[i] ); - } - - for ( S32 i = 0; i < NumMountPoints; i++ ) - stream->read( &mountPointNode[i] ); - - stream->read( &waterDragScale ); - stream->read( &buoyancyDensity ); - stream->read( &angularDrag ); - stream->read( &linearDrag ); - - clientOnly = stream->readFlag(); - singlePlayerOnly = stream->readFlag(); - stream->read( &breakForce ); -} - -bool PxMultiActorData::preload( bool server, String &errorBuffer ) -{ - if ( !Parent::preload( server, errorBuffer ) ) - return false; - - // If the stream is null, exit. - if ( !physXStream || !physXStream[0] ) - { - errorBuffer = "PxMultiActorData::preload: physXStream is unset!"; - return false; - } - - // Set up our buffer for the binary stream filename path. - UTF8 binPhysXStream[260] = { 0 }; - const UTF8* ext = dStrrchr( physXStream, '.' ); - - // Copy the xml stream path except for the extension. - if ( ext ) - dStrncpy( binPhysXStream, physXStream, getMin( 260, ext - physXStream ) ); - else - dStrncpy( binPhysXStream, physXStream, 260 ); - - // Concatenate the binary extension. - dStrcat( binPhysXStream, ".nxb" ); - - // Get the modified times of the two files. - FileTime xmlTime = {0}, binTime = {0}; - Platform::getFileTimes( physXStream, NULL, &xmlTime ); - Platform::getFileTimes( binPhysXStream, NULL, &binTime ); - - // If the binary is newer... load that. - if ( Platform::compareFileTimes( binTime, xmlTime ) >= 0 ) - _loadCollection( binPhysXStream, true ); - - // If the binary failed... then load the xml. - if ( !collection ) - { - _loadCollection( physXStream, false ); - - // If loaded... resave the xml in binary format - // for quicker subsequent loads. - if ( collection ) - NXU::saveCollection( collection, binPhysXStream, NXU::FT_BINARY ); - } - - // If it still isn't loaded then we've failed! - if ( !collection ) - { - errorBuffer = String::ToString( "PxMultiActorDatas::preload: could not load '%s'!", physXStream ); - return false; - } - - if (!shapeName || shapeName[0] == '\0') - { - errorBuffer = "PxMultiActorDatas::preload: no shape name!"; - return false; - } - - shape = ResourceManager::get().load( shapeName ); - - if (bool(shape) == false) - { - errorBuffer = String::ToString( "PxMultiActorData::preload: unable to load shape: %s", shapeName ); - return false; - } - - // Find the client side material. - if ( !server && material ) - Sim::findObject( SimObjectId(material), material ); - - // Get the ignore node indexes from the names. - for ( S32 i = 0; i < MaxCorrectionNodes; i++ ) - { - if( !correctionNodeNames[i] || !correctionNodeNames[i][0] ) - continue; - - correctionNodes[i] = shape->findNode( correctionNodeNames[i] ); - } - - // Resolve mount point node indexes - for ( S32 i = 0; i < NumMountPoints; i++) - { - char fullName[256]; - - if ( !mountNodeNames[i] || !mountNodeNames[i][0] ) - { - dSprintf(fullName,sizeof(fullName),"mount%d",i); - mountPointNode[i] = shape->findNode(fullName); - } - else - mountPointNode[i] = shape->findNode(mountNodeNames[i]); - } - - // Register for file change notification to reload the collection - if ( server ) - Torque::FS::AddChangeNotification( physXStream, this, &PxMultiActorData::_onFileChanged ); - - return true; -} - -void PxMultiActorData::_onFileChanged( const Torque::Path &path ) -{ - reload(); -} - -void PxMultiActorData::reload() -{ - bool result = _loadCollection( physXStream, false ); - - if ( !result ) - Con::errorf( "PxMultiActorData::reload(), _loadCollection failed..." ); - - // Inform MultiActors who use this datablock to reload. - mReloadSignal.trigger(); -} - -bool PxMultiActorData::_loadCollection( const UTF8 *path, bool isBinary ) -{ - if ( collection ) - { - NXU::releaseCollection( collection ); - collection = NULL; - } - - FileStream fs; - if ( !fs.open( path, Torque::FS::File::Read ) ) - return false; - - // Load the data into memory. - U32 size = fs.getStreamSize(); - FrameTemp buff( size ); - fs.read( size, buff ); - - // If the stream didn't read anything, there's a problem. - if ( size <= 0 ) - return false; - - // Ok... try to load it. - collection = NXU::loadCollection( path, - isBinary ? NXU::FT_BINARY : NXU::FT_XML, - buff, - size ); - - return collection != NULL; -} - - -bool PxMultiActorData::createActors( NxScene *scene, - NxCompartment *compartment, - const NxMat34 *nxMat, - const Point3F& scale, - Vector *outActors, - Vector *outShapes, - Vector *outJoints, - Vector *outActorUserProperties, - Vector *outJointUserProperties ) -{ - if ( !scene ) - { - Con::errorf( "PxMultiActorData::createActor() - returned null NxScene" ); - return NULL; - } - - PxMultiActor_Notify pxNotify( compartment, material, *nxMat, scale, outActorUserProperties, outJointUserProperties ); - - NXU::instantiateCollection( collection, *gPhysicsSDK, scene, nxMat, &pxNotify ); - - *outActors = pxNotify.getActors(); - *outJoints = pxNotify.getJoints(); - if ( outShapes ) - *outShapes = pxNotify.getShapes(); - - if ( outActors->empty() ) - { - Con::errorf( "PxMultiActorData::createActors() - NXUStream notifier returned empty actors or joints!" ); - return false; - } - - return true; -} - -ConsoleDocClass( PxMultiActor, - - "@brief Represents a destructible physical object simulated using PhysX.\n\n" - - "Usually it is prefered to use PhysicsShape and not PxMultiActor because " - "it is not PhysX specific and much easier to setup.\n" - - "@see PxMultiActorData.\n" - "@ingroup Physics" -); - -IMPLEMENT_CO_NETOBJECT_V1(PxMultiActor); - -PxMultiActor::PxMultiActor() - : mShapeInstance( NULL ), - mRootActor( NULL ), - mWorld( NULL ), - mStartImpulse( 0, 0, 0 ), - mResetXfm( true ), - mActorScale( 0, 0, 0 ), - mDebugRender( false ), - mIsDummy( false ), - mBroken( false ), - mDataBlock( NULL ) -{ - mNetFlags.set( Ghostable | ScopeAlways ); - - mTypeMask |= StaticObjectType | StaticShapeObjectType; - - //mUserData.setObject( this ); -} - -void PxMultiActor::initPersistFields() -{ - Parent::initPersistFields(); - - /* - // We're overloading these fields from SceneObject - // in order to force it to go thru setTransform! - removeField( "position" ); - removeField( "rotation" ); - removeField( "scale" ); - - addGroup( "Transform" ); - - addProtectedField( "position", TypeMatrixPosition, 0, - &PxMultiActor::_setPositionField, - &PxMultiActor::_getPositionField, - "" ); - - addProtectedField( "rotation", TypeMatrixRotation, 0, - &PxMultiActor::_setRotationField, - &PxMultiActor::_getRotationField, - "" ); - - addField( "scale", TypePoint3F, Offset( mObjScale, PxMultiActor ) ); - - endGroup( "Transform" ); - */ - - //addGroup("Physics"); - // addField( "AngularDrag", TypeF32, ) - //endGroup("Physics"); - - addGroup( "Debug" ); - addField( "debugRender", TypeBool, Offset( mDebugRender, PxMultiActor ), "@hide"); - addField( "broken", TypeBool, Offset( mBroken, PxMultiActor ), "@hide"); - endGroup( "Debug" ); - - //addGroup("Collision"); - //endGroup("Collision"); -} - -bool PxMultiActor::onAdd() -{ - PROFILE_SCOPE( PxMultiActor_OnAdd ); - - if (!Parent::onAdd() || !mDataBlock ) - return false; - - mIsDummy = isClientObject() && PHYSICSMGR->isSinglePlayer(); //&& mDataBlock->singlePlayerOnly; - - mShapeInstance = new TSShapeInstance( mDataBlock->shape, isClientObject() ); - - mObjBox = mDataBlock->shape->bounds; - resetWorldBox(); - - addToScene(); - - String worldName = isServerObject() ? "server" : "client"; - - // SinglePlayer objects only have server-side physics representations. - if ( mIsDummy ) - worldName = "server"; - - mWorld = dynamic_cast( PHYSICSMGR->getWorld( worldName ) ); - if ( !mWorld || !mWorld->getScene() ) - { - Con::errorf( "PxMultiActor::onAdd() - PhysXWorld not initialized!" ); - return false; - } - - applyWarp( getTransform(), true, false ); - mResetXfm = getTransform(); - - if ( !_createActors( getTransform() ) ) - { - Con::errorf( "PxMultiActor::onAdd(), _createActors failed" ); - return false; - } - - if ( !mIsDummy ) - mDataBlock->mReloadSignal.notify( this, &PxMultiActor::onFileNotify ); - - // If the editor is on... let it know! - //if ( gEditingMission ) - //onEditorEnable(); // TODO: Fix this up. - - PhysicsPlugin::getPhysicsResetSignal().notify( this, &PxMultiActor::onPhysicsReset, 1050.0f ); - - setAllBroken( false ); - - if ( isServerObject() ) - scriptOnAdd(); - - return true; -} - - -void PxMultiActor::onRemove() -{ - removeFromScene(); - - _destroyActors(); - mWorld = NULL; - - SAFE_DELETE( mShapeInstance ); - - PhysicsPlugin::getPhysicsResetSignal().remove( this, &PxMultiActor::onPhysicsReset ); - - if ( !mIsDummy && mDataBlock ) - mDataBlock->mReloadSignal.remove( this, &PxMultiActor::onFileNotify ); - - Parent::onRemove(); -} - -void PxMultiActor::_destroyActors() -{ - // Dummies don't have physics objects. - if ( mIsDummy || !mWorld ) - return; - - mWorld->releaseWriteLock(); - - // Clear the root actor. - mRootActor = NULL; - - // Clear the relative transforms. - //mRelXfms.clear(); - - // The shapes are owned by the actors, so - // we just need to clear them. - mShapes.clear(); - - // Release the joints first. - for( S32 i = 0; i < mJoints.size(); i++ ) - { - NxJoint *joint = mJoints[i]; - - if ( !joint ) - continue; - - // We allocate per joint userData and we must free it. - PxUserData *jointData = PxUserData::getData( *joint ); - if ( jointData ) - delete jointData; - - mWorld->releaseJoint( *joint ); - } - mJoints.clear(); - - // Now release the actors. - for( S32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - - PxUserData *actorData = PxUserData::getData( *actor ); - if ( actorData ) - delete actorData; - - if ( actor ) - mWorld->releaseActor( *actor ); - } - mActors.clear(); -} - -bool PxMultiActor::_createActors( const MatrixF &xfm ) -{ - if ( mIsDummy ) - { - // Dummies don't have physics objects, but - // they do handle actor deltas. - - PxMultiActor *serverObj = static_cast( mServerObject.getObject() ); - mActorDeltas.setSize( serverObj->mActors.size() ); - dMemset( mActorDeltas.address(), 0, mActorDeltas.memSize() ); - - return true; - } - - NxMat34 nxMat; - nxMat.setRowMajor44( xfm ); - - // Store the scale for comparison in setScale(). - mActorScale = getScale(); - - // Release the write lock so we can create actors. - mWorld->releaseWriteLock(); - - Vector actorUserProperties; - Vector jointUserProperties; - bool created = mDataBlock->createActors( mWorld->getScene(), - NULL, - &nxMat, - mActorScale, - &mActors, - &mShapes, - &mJoints, - &actorUserProperties, - &jointUserProperties ); - - // Debug output... - //for ( U32 i = 0; i < mJoints.size(); i++ ) - // Con::printf( "Joint0 name: '%s'", mJoints[i]->getName() ); - //for ( U32 i = 0; i < actorUserProperties.size(); i++ ) - //Con::printf( "actor%i UserProperties: '%s'", i, actorUserProperties[i].c_str() ); - //for ( U32 i = 0; i < jointUserProperties.size(); i++ ) - // Con::printf( "joint%i UserProperties: '%s'", i, jointUserProperties[i].c_str() ); - - if ( !created ) - { - Con::errorf( "PxMultiActor::_createActors() - failed!" ); - return false; - } - - // Make the first actor the root actor by default, but - // if we have a kinematic actor then use that. - mRootActor = mActors[0]; - for ( S32 i = 0; i < mActors.size(); i++ ) - { - if ( mActors[i]->readBodyFlag( NX_BF_KINEMATIC ) ) - { - mRootActor = mActors[i]; - break; - } - } - - mDelta.pos = mDelta.lastPos = getPosition(); - mDelta.rot = mDelta.lastRot = getTransform(); - - bool *usedActors = new bool[mActors.size()]; - dMemset( usedActors, 0, sizeof(bool) * mActors.size() ); - - TSShape *shape = mShapeInstance->getShape(); - - // Should already be done when actors are destroyed. - mMappedActors.clear(); - Vector mappedActorProperties; - - // Remap the actors to the shape instance's bone indices. - for( S32 i = 0; i < mShapeInstance->mNodeTransforms.size(); i++ ) - { - if ( !shape ) - break; - - UTF8 comparisonName[260] = { 0 }; - NxActor *actor = NULL; - NxActor *pushActor = NULL; - String actorProperties; - - S32 nodeNameIdx = shape->nodes[i].nameIndex; - const UTF8 *nodeName = shape->getName( nodeNameIdx ); - - S32 dl = -1; - dStrcpy( comparisonName, String::GetTrailingNumber( nodeName, dl ) ); //, ext - nodeName ); - dSprintf( comparisonName, sizeof( comparisonName ), "%s_pxactor", comparisonName ); - - //String test( nodeName ); - //AssertFatal( test.find("gableone",0,String::NoCase) == String::NPos, "found it" ); - - // If we find an actor that corresponds to this node we will - // push it back into the remappedActors vector, otherwise - // we will push back NULL. - for ( S32 j = 0; j < mActors.size(); j++ ) - { - actor = mActors[j]; - const UTF8 *actorName = actor->getName(); - - if ( dStricmp( comparisonName, actorName ) == 0 ) - { - pushActor = actor; - actorProperties = actorUserProperties[j]; - usedActors[j] = true; - break; - } - } - - mMappedActors.push_back( pushActor ); - mappedActorProperties.push_back( actorProperties ); - if ( !pushActor ) - dl = -1; - mMappedActorDL.push_back( dl ); - - // Increase the sleep tolerance. - if ( pushActor ) - { - //pushActor->raiseBodyFlag( NX_BF_ENERGY_SLEEP_TEST ); - //pushActor->setSleepEnergyThreshold( 2 ); - //pushActor->userData = NULL; - } - } - - // Delete any unused/orphaned actors. - for ( S32 i = 0; i < mActors.size(); i++ ) - { - if ( usedActors[i] ) - continue; - - NxActor *actor = mActors[i]; - - Con::errorf( "PxMultiActor::_createActors() - Orphan NxActor - '%s'!", actor->getName() ); - - if ( actor == mRootActor ) - { - Con::errorf( "PxMultiActor::_createActors() - root actor (%s) was orphan, cannot continue.", actor->getName() ); - return false; - } - - // Remove references to shapes of the deleted actor. - for ( S32 i = 0; i < mShapes.size(); i++ ) - { - if ( &(mShapes[i]->getActor()) == actor ) - { - mShapes.erase_fast(i); - i--; - } - } - - mWorld->releaseActor( *actor ); - } - - // Done with this helper. - delete [] usedActors; - - // Repopulate mActors with one entry per real actor we own. - mActors.clear(); - mMappedToActorIndex.clear(); - actorUserProperties.clear(); - for ( S32 i = 0; i < mMappedActors.size(); i++ ) - { - S32 index = -1; - if ( mMappedActors[i] ) - { - index = mActors.push_back_unique( mMappedActors[i] ); - while ( index >= actorUserProperties.size() ) - actorUserProperties.push_back( String::EmptyString ); - actorUserProperties[index] = mappedActorProperties[i]; - } - mMappedToActorIndex.push_back( index ); - } - - if ( mActors.size() == 0 ) - { - Con::errorf( "PxMultiActor::_createActors, got zero actors! Were all actors orphans?" ); - return false; - } - - // Initialize the actor deltas. - mActorDeltas.setSize( mActors.size() ); - dMemset( mActorDeltas.address(), 0, mActorDeltas.memSize() ); - - // Assign user data for actors. - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - if ( !actor ) - continue; - - actor->userData = _createActorUserData( actor, actorUserProperties[i] ); - } - - //NxActor *actor1; - //NxActor *actor2; - //PxUserData *pUserData; - - // Allocate user data for joints. - for ( U32 i = 0; i < mJoints.size(); i++ ) - { - NxJoint *joint = mJoints[i]; - if ( !joint ) - continue; - - joint->userData = _createJointUserData( joint, jointUserProperties[i] ); - - /* - // Set actors attached to joints as not-pushable (by the player). - joint->getActors( &actor1, &actor2 ); - if ( actor1 ) - { - pUserData = PxUserData::getData( *actor1 ); - if ( pUserData ) - pUserData->mCanPush = false; - } - if ( actor2 ) - { - pUserData = PxUserData::getData( *actor2 ); - if ( pUserData ) - pUserData->mCanPush = false; - } - */ - } - - // Set actors and meshes to the unbroken state. - setAllBroken( false ); - - return true; -} - -PxUserData* PxMultiActor::_createActorUserData( NxActor *actor, String &userProperties ) -{ - PxUserData *actorData = new PxUserData(); - actorData->setObject( this ); - - // We use this for saving relative xfms for 'broken' actors. - NxMat34 actorPose = actor->getGlobalPose(); - NxMat34 actorSpaceXfm; - actorPose.getInverse( actorSpaceXfm ); - - const String actorName( actor->getName() ); - - static const String showStr( "PxBrokenShow" ); - static const String hideStr( "PxBrokenHide" ); - - // 3DSMax saves out double newlines, replace them with one. - userProperties.replace( "\r\n", "\n" ); - - U32 propertyCount = StringUnit::getUnitCount( userProperties, "\n" ); - for ( U32 i = 0; i < propertyCount; i++ ) - { - String propertyStr = StringUnit::getUnit( userProperties, i, "\n" ); - U32 wordCount = StringUnit::getUnitCount( propertyStr, "=" ); - - if ( wordCount == 0 ) - { - // We sometimes get empty lines between properties, - // which doesn't break anything. - continue; - } - - if ( wordCount != 2 ) - { - Con::warnf( "PxMultiActor::_createActorUserData, malformed UserProperty string (%s) for actor (%s)", propertyStr.c_str(), actorName.c_str() ); - continue; - } - - String propertyName = StringUnit::getUnit( propertyStr, 0, "=" ); - String propertyValue = StringUnit::getUnit( propertyStr, 1, "=" ); - - Vector *dstVector = NULL; - if ( propertyName.equal( showStr, String::NoCase ) ) - dstVector = &actorData->mBrokenActors; - else if ( propertyName.equal( hideStr, String::NoCase ) ) - dstVector = &actorData->mUnbrokenActors; - - if ( !dstVector ) - continue; - - U32 valueCount = StringUnit::getUnitCount( propertyValue, "," ); - for ( U32 j = 0; j < valueCount; j++ ) - { - String val = StringUnit::getUnit( propertyValue, j, "," ); - - NxActor *pActor = _findActor( val ); - if ( !pActor ) - Con::warnf( "PxMultiActor::_createActorUserData, actor (%s) was not found when parsing UserProperties for actor (%s)", val.c_str(), actorName.c_str() ); - else - { - dstVector->push_back( pActor ); - - if ( dstVector == &actorData->mBrokenActors ) - { - NxMat34 relXfm = pActor->getGlobalPose(); - relXfm.multiply( relXfm, actorSpaceXfm ); - actorData->mRelXfm.push_back( relXfm ); - } - } - } - } - - // Only add a contact signal to this actor if - // we have objects we can break. - if ( actorData->mBrokenActors.size() > 0 && - mDataBlock->breakForce > 0.0f ) - { - actor->setContactReportFlags( NX_NOTIFY_ON_START_TOUCH_FORCE_THRESHOLD | NX_NOTIFY_FORCES ); - actor->setContactReportThreshold( mDataBlock->breakForce ); - actorData->getContactSignal().notify( this, &PxMultiActor::_onContact ); - } - - return actorData; -} - -PxUserData* PxMultiActor::_createJointUserData( NxJoint *joint, String &userProperties ) -{ - PxUserData *jointData = new PxUserData(); - jointData->setObject( this ); - - // We use this for saving relative xfms for 'broken' actors. - NxActor *actor0; - NxActor *actor1; - joint->getActors( &actor0, &actor1 ); - NxMat34 actorPose = actor0->getGlobalPose(); - NxMat34 actorSpaceXfm; - actorPose.getInverse( actorSpaceXfm ); - - // The PxMultiActor will live longer than the joint - // so this notify shouldn't ever need to be removed. Although if someone - // other than this multiactor were to register for this notify and their - // lifetime could be shorter, then 'they' might have to. - jointData->getOnJointBreakSignal().notify( this, &PxMultiActor::_onJointBreak ); - - // JCFHACK: put this in userProperties too. - Sim::findObject( "JointBreakEmitter", jointData->mParticleEmitterData ); - - String showStr( "PxBrokenShow" ); - String hideStr( "PxBrokenHide" ); - - // Max saves out double newlines, replace them with one. - userProperties.replace( "\r\n", "\n" ); - - U32 propertyCount = StringUnit::getUnitCount( userProperties, "\n" ); - for ( U32 i = 0; i < propertyCount; i++ ) - { - String propertyStr = StringUnit::getUnit( userProperties, i, "\n" ); - U32 wordCount = StringUnit::getUnitCount( propertyStr, "=" ); - - if ( wordCount == 0 ) - { - // We sometimes get empty lines between properties, - // which doesn't break anything. - continue; - } - - if ( wordCount != 2 ) - { - Con::warnf( "PxMultiActor::_createJointUserData, malformed UserProperty string (%s) for joint (%s)", propertyStr.c_str(), joint->getName() ); - continue; - } - - String propertyName = StringUnit::getUnit( propertyStr, 0, "=" ); - String propertyValue = StringUnit::getUnit( propertyStr, 1, "=" ); - - Vector *dstVector = NULL; - if ( propertyName.equal( showStr, String::NoCase ) ) - dstVector = &jointData->mBrokenActors; - else if ( propertyName.equal( hideStr, String::NoCase ) ) - dstVector = &jointData->mUnbrokenActors; - - if ( !dstVector ) - continue; - - U32 valueCount = StringUnit::getUnitCount( propertyValue, "," ); - for ( U32 j = 0; j < valueCount; j++ ) - { - String val = StringUnit::getUnit( propertyValue, j, "," ); - - NxActor *pActor = _findActor( val ); - if ( !pActor ) - Con::warnf( "PxMultiActor::_createJointUserData, actor (%s) was not found when parsing UserProperties for joint (%s)", val.c_str(), joint->getName() ); - else - { - dstVector->push_back( pActor ); - - if ( dstVector == &jointData->mBrokenActors ) - { - NxMat34 relXfm = pActor->getGlobalPose(); - relXfm.multiply( relXfm, actorSpaceXfm ); - jointData->mRelXfm.push_back( relXfm ); - } - } - } - } - - return jointData; -} - -NxActor* PxMultiActor::_findActor( const String &actorName ) const -{ - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - if ( !actor ) - continue; - - if ( dStricmp( actor->getName(), actorName ) == 0 ) - return actor; - } - - return NULL; -} - -String PxMultiActor::_getMeshName( const NxActor *actor ) const -{ - String meshName = actor->getName(); - meshName.replace( "_pxactor", "" ); - //meshName = StringUnit::getUnit( meshName, 0, "_" ); - return meshName; -} - -bool PxMultiActor::onNewDataBlock( GameBaseData *dptr, bool reload ) -{ - mDataBlock = dynamic_cast(dptr); - - if ( !mDataBlock || !Parent::onNewDataBlock( dptr, reload ) ) - return false; - - // JCF: if we supported it, we would recalculate the value of mIsDummy now, - // but that would really hose everything since an object that was a dummy - // wouldn't have any actors and would need to create them, etc... - - scriptOnNewDataBlock(); - - return true; -} - -void PxMultiActor::inspectPostApply() -{ - // Make sure we call the parent... else - // we won't get transform and scale updates! - Parent::inspectPostApply(); - - //setMaskBits( LightMask ); - setMaskBits( UpdateMask ); -} - -void PxMultiActor::onStaticModified( const char *slotName, const char *newValue ) -{ - if ( isProperlyAdded() && dStricmp( slotName, "broken" ) == 0 ) - setAllBroken( dAtob(newValue) ); -} - -void PxMultiActor::onDeleteNotify( SimObject *obj ) -{ - Parent::onDeleteNotify(obj); - if ( obj == mMount.object ) - unmount(); -} - -void PxMultiActor::onFileNotify() -{ - // Destroy the existing actors and recreate them... - - mWorld->getPhysicsResults(); - _destroyActors(); - _createActors( mResetXfm ); -} - -void PxMultiActor::onPhysicsReset( PhysicsResetEvent reset ) -{ - // Dummies don't create or destroy actors, they just reuse the - // server object's ones. - if ( mIsDummy ) - return; - - // Store the reset transform for later use. - if ( reset == PhysicsResetEvent_Store ) - { - mRootActor->getGlobalPose().getRowMajor44( mResetXfm ); - } - else if ( reset == PhysicsResetEvent_Restore ) - { - // Destroy the existing actors and recreate them to - // ensure they are in the proper mission startup state. - mWorld->getPhysicsResults(); - - _destroyActors(); - _createActors( mResetXfm ); - } - - for ( U32 i = 0; i < mActors.size(); i++ ) - { - if ( !mActors[i] ) - continue; - - mActors[i]->wakeUp(); - } -} - -void PxMultiActor::prepRenderImage( SceneRenderState *state ) -{ - PROFILE_SCOPE( PxMultiActor_PrepRenderImage ); - - if ( !mShapeInstance ) - return; - - Point3F cameraOffset; - getTransform().getColumn(3,&cameraOffset); - cameraOffset -= state->getDiffuseCameraPosition(); - F32 dist = cameraOffset.len(); - if ( dist < 0.01f ) - dist = 0.01f; - - F32 invScale = (1.0f/getMax(getMax(mObjScale.x,mObjScale.y),mObjScale.z)); - - S32 dl = mShapeInstance->setDetailFromDistance( state, dist * invScale ); - if ( dl < 0 ) - return; - - GFXTransformSaver saver; - - // Set up our TS render state here. - TSRenderState rdata; - rdata.setSceneState( state ); - - // We might have some forward lit materials - // so pass down a query to gather lights. - LightQuery query; - query.init( getWorldSphere() ); - rdata.setLightQuery( &query ); - - MatrixF mat = getRenderTransform(); - mat.scale( getScale() ); - GFX->setWorldMatrix( mat ); - - if ( mDebugRender || Con::getBoolVariable( "$PxDebug::render", false ) ) - { - ObjectRenderInst *ri = state->getRenderPass()->allocInst(); - ri->renderDelegate.bind( this, &PxMultiActor::_debugRender ); - ri->type = RenderPassManager::RIT_Object; - state->getRenderPass()->addInst( ri ); - } - else - mShapeInstance->render( rdata ); -} - -void PxMultiActor::_debugRender( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ) -{ - if ( mShapeInstance ) - { - GFXTransformSaver saver; - - MatrixF mat = getRenderTransform(); - mat.scale( mObjScale ); - GFX->multWorld( mat ); - - //mShapeInstance->renderDebugNodes(); - } - - Vector *actors = &mActors; - if ( mIsDummy ) - { - PxMultiActor *serverObj = static_cast( mServerObject.getObject() ); - if ( serverObj ) - actors = &serverObj->mActors; - } - - if ( !actors ) - return; - - for ( U32 i = 0; i < actors->size(); i++ ) - { - NxActor *pActor = (*actors)[i]; - if ( !pActor ) - continue; - - PxUtils::drawActor( pActor ); - } -} - -void PxMultiActor::_onJointBreak( NxReal breakForce, NxJoint &brokenJoint ) -{ - // Dummies do not have physics objects - // and shouldn't receive this callback. - if ( mIsDummy ) - return; - - NxActor *actor0 = NULL; - NxActor *actor1 = NULL; - brokenJoint.getActors( &actor0, &actor1 ); - NxMat34 parentPose = actor0->getGlobalPose(); - - Point3F jointPos = pxCast( brokenJoint.getGlobalAnchor() ); - - PxUserData *jointData = PxUserData::getData( brokenJoint ); - setBroken( parentPose, NxVec3( 0.0f ), jointData, true ); - - // NOTE: We do not NULL the joint in the list, - // or release it here, as we allow it to be released - // by the _destroyActors function on a reset or destruction - // of the PxMultiActor. -} - -void PxMultiActor::_onContact( PhysicsUserData *us, - PhysicsUserData *them, - const Point3F &hitPoint, - const Point3F &hitForce ) -{ - PxUserData *data = (PxUserData*)us; - if ( data && - !data->mIsBroken && - hitForce.len() > mDataBlock->breakForce ) - setAllBroken( true ); -} - -U32 PxMultiActor::packUpdate(NetConnection *con, U32 mask, BitStream *stream) -{ - U32 retMask = Parent::packUpdate(con, mask, stream); - - stream->writeFlag( mDebugRender ); - - stream->writeFlag( mask & SleepMask ); - - if ( stream->writeFlag( mask & WarpMask ) ) - { - stream->writeAffineTransform( getTransform() ); - } - else if ( stream->writeFlag( mask & MoveMask ) ) - { - /* - stream->writeAffineTransform( getTransform() ); - - NxActor *actor = mActors[ mDataBlock->correctionNodes[0] ]; - - const NxVec3& linVel = actor->getLinearVelocity(); - stream->write( linVel.x ); - stream->write( linVel.y ); - stream->write( linVel.z ); - */ - } - - // This internally uses the mask passed to it. - if ( mLightPlugin ) - retMask |= mLightPlugin->packUpdate( this, LightMask, con, mask, stream ); - - return retMask; -} - - -void PxMultiActor::unpackUpdate(NetConnection *con, BitStream *stream) -{ - Parent::unpackUpdate(con, stream); - - mDebugRender = stream->readFlag(); - - if ( stream->readFlag() ) // SleepMask - { - for ( S32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - - if ( !actor ) - continue; - - if ( actor ) - actor->putToSleep(); - } - } - - if ( stream->readFlag() ) // WarpMask - { - // If we set a warp mask, - // we need to instantly move - // the actor to the new position - // without applying any corrections. - MatrixF mat; - stream->readAffineTransform( &mat ); - - applyWarp( mat, true, false ); - } - else if ( stream->readFlag() ) // MoveMask - { - /* - MatrixF mat; - stream->readAffineTransform( &mat ); - - NxVec3 linVel, angVel; - stream->read( &linVel.x ); - stream->read( &linVel.y ); - stream->read( &linVel.z ); - - applyCorrection( mat, linVel, angVel ); - */ - } -/* - if ( stream->readFlag() ) // ImpulseMask - { - // TODO : Set up correction nodes. - - NxVec3 linVel; - stream->read( &linVel.x ); - stream->read( &linVel.y ); - stream->read( &linVel.z ); - - NxActor *actor = mActors[ mDataBlock->correctionNodes[0] ]; - - if ( actor ) - { - mWorld->releaseWriteLock(); - actor->setLinearVelocity( linVel ); - mStartImpulse.zero(); - } - else - mStartImpulse.set( linVel.x, linVel.y, linVel.z ); - } -*/ - if ( mLightPlugin ) - mLightPlugin->unpackUpdate( this, con, stream ); -} - -void PxMultiActor::setScale( const VectorF& scale ) -{ - if ( scale == getScale() ) - return; - - // This is so that the level - // designer can change the scale - // of a PhysXSingleActor in the editor - // and have the PhysX representation updated properly. - - // First we call the parent's setScale - // so that the ScaleMask can be set. - Parent::setScale( scale ); - - // Check to see if the scale has really changed. - if ( !isProperlyAdded() || mActorScale.equal( scale ) ) - return; - - // Recreate the physics actors. - _destroyActors(); - _createActors( getTransform() ); -} - -void PxMultiActor::applyWarp( const MatrixF& newMat, bool interpRender, bool sweep ) -{ - // Do we have actors to move? - if ( mRootActor ) - { - // Get ready to change the physics state. - mWorld->releaseWriteLock(); - - /// Convert the new transform to nx. - NxMat34 destXfm; - destXfm.setRowMajor44( newMat ); - - // Get the inverse of the root actor transform - // so we can move all the actors relative to it. - NxMat34 rootInverseXfm; - mRootActor->getGlobalPose().getInverse( rootInverseXfm ); - - // Offset all the actors. - MatrixF tMat; - NxMat34 newXfm, relXfm; - for ( S32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - if ( !actor ) - continue; - - const bool isKinematic = actor->readBodyFlag( NX_BF_KINEMATIC ); - - // Stop any velocity on it. - if ( !isKinematic ) - { - actor->setAngularVelocity( NxVec3( 0.0f ) ); - actor->setLinearVelocity( NxVec3( 0.0f ) ); - } - - // Get the transform relative to the current root. - relXfm.multiply( actor->getGlobalPose(), rootInverseXfm ); - - /* - if ( sweep ) - { - actor->getGl obalPose().getRowMajor44( mResetPos[i] ); - sweepTest( &newMat ); - } - */ - - // - newXfm.multiply( relXfm, destXfm ); - //if ( isKinematic ) - //actor->moveGlobalPose( newXfm ); - //else - actor->setGlobalPose( newXfm ); - - // Reset the delta. - Delta &delta = mActorDeltas[i]; - delta.pos = pxCast( newXfm.t ); - newXfm.getRowMajor44( tMat ); - delta.rot.set( tMat ); - - if ( !interpRender ) - { - mActorDeltas[i].lastPos = mActorDeltas[i].pos; - mActorDeltas[i].lastRot = mActorDeltas[i].rot; - } - } - } - - Parent::setTransform( newMat ); - - mDelta.pos = newMat.getPosition(); - mDelta.rot = newMat; - - if ( !interpRender ) - { - mDelta.lastPos = mDelta.pos; - mDelta.lastRot = mDelta.rot; - } -} - -/* -bool PxMultiActor::_setPositionField( void *obj, const char *data ) -{ - PxMultiActor *object = reinterpret_cast( obj ); - - MatrixF transform( object->getTransform() ); - Con::setData( TypeMatrixPosition, &transform, 0, 1, &data ); - - object->setTransform( transform ); - - return false; -} - -const char* PxMultiActor::_getPositionField( void *obj, const char *data ) -{ - PxMultiActor *object = reinterpret_cast( obj ); - return Con::getData( TypeMatrixPosition, - &object->mObjToWorld, - 0 ); -} - -bool PxMultiActor::_setRotationField( void *obj, const char *data ) -{ - PxMultiActor *object = reinterpret_cast( obj ); - - MatrixF transform( object->getTransform() ); - Con::setData( TypeMatrixRotation, &transform, 0, 1, &data ); - - object->setTransform( transform ); - - return false; -} - -const char* PxMultiActor::_getRotationField( void *obj, const char *data ) -{ - PxMultiActor *object = reinterpret_cast( obj ); - return Con::getData( TypeMatrixRotation, - &object->mObjToWorld, - 0 ); -} -*/ - -void PxMultiActor::setTransform( const MatrixF& mat ) -{ - applyWarp( mat, false, true ); - setMaskBits( WarpMask ); -} - -void PxMultiActor::mountObject( SceneObject *obj, U32 node ) -{ - if (obj->getObjectMount()) - obj->unmount(); - - obj->mountObject( this, (node >= 0 && node < PxMultiActorData::NumMountPoints) ? node: 0 ); -} - - -void PxMultiActor::unmountObject( SceneObject *obj ) -{ - obj->unmountObject( this ); -} - -bool PxMultiActor::_getNodeTransform( U32 nodeIdx, MatrixF *outXfm ) -{ - if ( !mShapeInstance ) - return false; - - PxMultiActor *actorOwner = this; - if ( mIsDummy ) - { - actorOwner = static_cast( mServerObject.getObject() ); - if ( !actorOwner ) - return false; - } - - TSShape *shape = mShapeInstance->getShape(); - String nodeName = shape->getNodeName( nodeIdx ); - - NxActor *pActor = NULL; - UTF8 comparisonName[260] = { 0 }; - S32 dummy = -1; - - // Convert the passed node name to a valid actor name. - dStrcpy( comparisonName, String::GetTrailingNumber( nodeName, dummy ) ); - dSprintf( comparisonName, sizeof( comparisonName ), "%s_pxactor", comparisonName ); - - // If we have an actor with that name, we are done. - pActor = actorOwner->_findActor( comparisonName ); - if ( pActor ) - { - pActor->getGlobalPose().getRowMajor44( *outXfm ); - return true; - } - - // Check if the parent node has an actor... - - S32 parentIdx = shape->nodes[nodeIdx].parentIndex; - if ( parentIdx == -1 ) - return false; - - const String &parentName = shape->getNodeName( parentIdx ); - dStrcpy( comparisonName, String::GetTrailingNumber( parentName, dummy ) ); - dSprintf( comparisonName, sizeof( comparisonName ), "%s_pxactor", comparisonName ); - - pActor = actorOwner->_findActor( comparisonName ); - if ( !pActor ) - return false; - - MatrixF actorMat; - pActor->getGlobalPose().getRowMajor44( actorMat ); - - MatrixF nmat; - QuatF q; - TSTransform::setMatrix( shape->defaultRotations[nodeIdx].getQuatF(&q),shape->defaultTranslations[nodeIdx],&nmat); - *outXfm->mul( actorMat, nmat ); - - return true; -} - -void PxMultiActor::getMountTransform(U32 mountPoint,MatrixF* mat) -{ - // Returns mount point to world space transform - if (mountPoint < PxMultiActorData::NumMountPoints) { - S32 ni = mDataBlock->mountPointNode[mountPoint]; - if (ni != -1) { - if ( _getNodeTransform( ni, mat ) ) - return; - } - } - *mat = mObjToWorld; -} - -void PxMultiActor::getRenderMountTransform(U32 mountPoint,MatrixF* mat) -{ - // Returns mount point to world space transform - if (mountPoint < PxMultiActorData::NumMountPoints) { - S32 ni = mDataBlock->mountPointNode[mountPoint]; - if (ni != -1) { - if ( _getNodeTransform( ni, mat ) ) - return; - } - } - *mat = getRenderTransform(); -} - -void PxMultiActor::processTick( const Move *move ) -{ - PROFILE_SCOPE( PxMultiActor_ProcessTick ); - - // Set the last pos/rot to the - // values of the previous tick for interpolateTick. - mDelta.lastPos = mDelta.pos; - mDelta.lastRot = mDelta.rot; - - /* - NxActor *corrActor = mActors[ mDataBlock->correctionNodes[0] ]; - - if ( corrActor->isSleeping() || corrActor->readBodyFlag( NX_BF_FROZEN ) ) - { - if ( !mSleepingLastTick ) - setMaskBits( WarpMask | SleepMask ); - - mSleepingLastTick = true; - - // HACK! Refactor sleeping so that we don't - // sleep when only one correction actor does. - _updateBounds(); - - return; - } - - mSleepingLastTick = false; - */ - - MatrixF mat; - Vector *actors; - - if ( mIsDummy ) - { - PxMultiActor *serverObj = static_cast( mServerObject.getObject() ); - if ( !serverObj ) - return; - - mat = serverObj->getTransform(); - actors = &serverObj->mActors; - } - else - { - // Container buoyancy & drag - _updateContainerForces(); - - // Save the transform from the root actor. - mRootActor->getGlobalPose().getRowMajor44( mat ); - actors = &mActors; - } - - // Update the transform and the root delta. - Parent::setTransform( mat ); - mDelta.pos = mat.getPosition(); - mDelta.rot.set( mat ); - - // On the client we update the individual - // actor deltas as well for interpolation. - if ( isClientObject() ) - { - PROFILE_SCOPE( PxMultiActor_ProcessTick_UpdateDeltas ); - - for ( U32 i = 0; i < mActorDeltas.size(); i++ ) - { - if ( !(*actors)[i] ) - continue; - - Delta &delta = mActorDeltas[i]; - - // Store the last position. - delta.lastPos = delta.pos; - delta.lastRot = delta.rot; - - // Get the new position. - (*actors)[i]->getGlobalPose().getRowMajor44( (NxF32*)mat ); - - // Calculate the delta between the current - // global pose and the last global pose. - delta.pos = mat.getPosition(); - delta.rot.set( mat ); - } - } - - // Update the bounding box to match the physics. - _updateBounds(); - - // Set the MoveMask so this will be updated to the client. - //setMaskBits( MoveMask ); -} - -void PxMultiActor::interpolateTick( F32 delta ) -{ - PROFILE_SCOPE( PxMultiActor_InterpolateTick ); - - Point3F interpPos; - QuatF interpRot; - { - // Interpolate the position based on the delta. - interpPos.interpolate( mDelta.pos, mDelta.lastPos, delta ); - - // Interpolate the rotation based on the delta. - interpRot.interpolate( mDelta.rot, mDelta.lastRot, delta ); - - // Set up the interpolated transform. - MatrixF interpMat; - interpRot.setMatrix( &interpMat ); - interpMat.setPosition( interpPos ); - - Parent::setRenderTransform( interpMat ); - } - - PxMultiActor *srcObj = NULL; - if ( mIsDummy ) - srcObj = static_cast( mServerObject.getObject() ); - else - srcObj = this; - - // JCF: to disable applying NxActor positions to the renderable mesh - // you can uncomment this line. - //srcObj = NULL; - if ( mShapeInstance && srcObj != NULL ) - { - mShapeInstance->animate(); - getDynamicXfms( srcObj, delta ); - } -} - -/* -void PxMultiActor::sweepTest( MatrixF *mat ) -{ - NxVec3 nxCurrPos = getPosition(); - - // If the position is zero, - // the parent hasn't been updated yet - // and we don't even need to do the sweep test. - // This is a fix for a problem that was happening - // where on the add of the PhysXSingleActor, it would - // set the position to a very small value because it would be getting a hit - // even though the current position was 0. - if ( nxCurrPos.isZero() ) - return; - - // Set up the flags and the query structure. - NxU32 flags = NX_SF_STATICS | NX_SF_DYNAMICS; - - NxSweepQueryHit sweepResult; - dMemset( &sweepResult, 0, sizeof( sweepResult ) ); - - NxVec3 nxNewPos = mat->getPosition(); - - // Get the velocity which will be our sweep direction and distance. - NxVec3 nxDir = nxNewPos - nxCurrPos; - if ( nxDir.isZero() ) - return; - - NxActor *corrActor = mActors[ mDataBlock->correctionNodes[0] ]; - - // Get the scene and do the sweep. - corrActor->wakeUp(); - corrActor->linearSweep( nxDir, flags, NULL, 1, &sweepResult, NULL ); - - if ( sweepResult.hitShape && sweepResult.t < nxDir.magnitude() ) - { - nxDir.normalize(); - nxDir *= sweepResult.t; - nxCurrPos += nxDir; - - mat->setPosition( Point3F( nxCurrPos.x, nxCurrPos.y, nxCurrPos.z ) ); - } -} -*/ - -/* -void PxMultiActor::applyCorrection( const MatrixF& mat, const NxVec3& linVel, const NxVec3& angVel ) -{ - // Sometimes the actor hasn't been - // created yet during the call from unpackUpdate. - NxActor *corrActor = mActors[ mDataBlock->correctionNodes[0] ]; - - if ( !corrActor || mForceSleep ) - return; - - NxVec3 newPos = mat.getPosition(); - NxVec3 currPos = getPosition(); - - NxVec3 offset = newPos - currPos; - - // If the difference isn't large enough, - // just set the new transform, no correction. - if ( offset.magnitude() > 0.3f ) - { - // If we're going to set the linear or angular velocity, - // we do it before we add a corrective force, since it would be overwritten otherwise. - NxVec3 currLinVel, currAngVel; - currLinVel = corrActor->getLinearVelocity(); - currAngVel = corrActor->getAngularVelocity(); - - // Scale the corrective force by half, - // otherwise it will over correct and oscillate. - NxVec3 massCent = corrActor->getCMassGlobalPosition(); - corrActor->addForceAtPos( offset, massCent, NX_SMOOTH_VELOCITY_CHANGE ); - - // If the linear velocity is divergent enough, change to server linear velocity. - if ( (linVel - currLinVel).magnitude() > 0.3f ) - corrActor->setLinearVelocity( linVel ); - // Same for angular. - if ( (angVel - currAngVel).magnitude() > 0.3f ) - corrActor->setAngularVelocity( angVel ); - } - - Parent::setTransform( mat ); -} -*/ - -void PxMultiActor::_updateBounds() -{ - PROFILE_SCOPE( PxMultiActor_UpdateBounds ); - - if ( mIsDummy ) - { - PxMultiActor *serverObj = static_cast( mServerObject.getObject() ); - if ( !serverObj ) - return; - - mWorldBox = serverObj->getWorldBox(); - mWorldSphere = serverObj->getWorldSphere(); - mObjBox = serverObj->getObjBox(); - mRenderWorldBox = serverObj->getRenderWorldBox(); - mRenderWorldSphere = mWorldSphere; - - return; - } - - NxBounds3 bounds; - bounds.setEmpty(); - - NxBounds3 shapeBounds; - - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *pActor = mActors[i]; - - if ( !pActor || pActor->readActorFlag( NX_AF_DISABLE_COLLISION ) ) - continue; - - NxShape *const* pShapeArray = pActor->getShapes(); - U32 shapeCount = pActor->getNbShapes(); - for ( U32 i = 0; i < shapeCount; i++ ) - { - // Get the shape's bounds. - pShapeArray[i]->getWorldBounds( shapeBounds ); - - // Combine them into the total bounds. - bounds.combine( shapeBounds ); - } - } - - mWorldBox = pxCast( bounds ); - - mWorldBox.getCenter(&mWorldSphere.center); - mWorldSphere.radius = (mWorldBox.maxExtents - mWorldSphere.center).len(); - - mObjBox = mWorldBox; - mWorldToObj.mul(mObjBox); - - mRenderWorldBox = mWorldBox; - mRenderWorldSphere = mWorldSphere; -} - -void PxMultiActor::getDynamicXfms( PxMultiActor *srcObj, F32 dt ) -{ - PROFILE_SCOPE( PxMultiActor_getDynamicXfms ); - - Vector *torqueXfms = &mShapeInstance->mNodeTransforms; - const MatrixF &objectXfm = getRenderWorldTransform(); - - AssertFatal( torqueXfms->size() == srcObj->mMappedActors.size(), "The two skeletons are different!" ); - - TSShape *shape = mShapeInstance->getShape(); - - // TODO: We're currently preparing deltas and getting - // dynamic xforms even if the object isn't visible. - // we should probably try to delay all this until - // we're about to render. - // - /* - // TODO: Set up deltas! - if ( mCurrPos.empty() || mCurrRot.empty() ) - _prepareDeltas(); - */ - - MatrixF globalXfm; - MatrixF mat, tmp; - QuatF newRot; - Point3F newPos; - - S32 dl = mShapeInstance->getCurrentDetail(); - if ( dl < 0 ) - return; - - const String &detailName = shape->getName( shape->details[dl].nameIndex ); - S32 detailSize = -1; - String::GetTrailingNumber( detailName, detailSize ); - - for( S32 i = 0; i < srcObj->mMappedActors.size(); i++ ) - { - NxActor *actor = srcObj->mMappedActors[i]; - - if ( !actor || actor->readBodyFlag( NX_BF_KINEMATIC ) ) - continue; - - // see if the node at this index is part of the - // currently visible detail level. - if ( srcObj->mMappedActorDL[i] != detailSize ) - continue; - - // Get the right actor delta structure. - U32 index = srcObj->mMappedToActorIndex[i]; - const Delta &delta = mActorDeltas[index]; - - // Do the interpolation. - newRot.interpolate( delta.rot, delta.lastRot, dt ); - newRot.setMatrix( &globalXfm ); - newPos.interpolate( delta.pos, delta.lastPos, dt ); - globalXfm.setPosition( newPos ); - - (*torqueXfms)[i].mul( objectXfm, globalXfm ); - } -} - -void PxMultiActor::applyImpulse( const Point3F &pos, const VectorF &vec ) -{ - // TODO : Implement this based on correction nodes. - /* - if ( !mWorld || !mActor ) - return; - - mWorld->releaseWriteLock(); - - NxVec3 linVel = mActor->getLinearVelocity(); - NxVec3 nxVel( vel.x, vel.y, vel.z ); - - mActor->setLinearVelocity(linVel + nxVel); - */ - - // JCF: something more complex is required to apply forces / breakage - // on only individual actors, and we don't have enough data to do that - // within this method. - - if ( vec.len() > mDataBlock->breakForce ) - setAllBroken( true ); - - NxVec3 nxvec = pxCast( vec ); - NxVec3 nxpos = pxCast( pos ); - - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - if ( actor->isDynamic() && - !actor->readBodyFlag( NX_BF_KINEMATIC ) && - !actor->readActorFlag( NX_AF_DISABLE_COLLISION ) ) - { - actor->addForceAtPos( nxvec, nxpos, NX_IMPULSE ); - } - } - - //setMaskBits( ImpulseMask ); -} - -void PxMultiActor::applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ) -{ - mWorld->releaseWriteLock(); - - // Find all currently enabled actors hit by the impulse radius... - Vector hitActors; - NxVec3 nxorigin = pxCast(origin); - NxSphere impulseSphere( nxorigin, radius ); - - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *pActor = mActors[i]; - - if ( pActor->readActorFlag( NX_AF_DISABLE_COLLISION ) || - !pActor->isDynamic() || - pActor->readBodyFlag( NX_BF_KINEMATIC ) ) - continue; - - U32 numShapes = pActor->getNbShapes(); - NxShape *const* pShapeArray = pActor->getShapes(); - - for ( U32 j = 0; j < numShapes; j++ ) - { - const NxShape *pShape = pShapeArray[j]; - - if ( pShape->checkOverlapSphere( impulseSphere ) ) - { - hitActors.push_back( pActor ); - break; - } - } - } - - // Apply forces to hit actors, but swap out for broken - // actors first if appropriate... - for ( U32 i = 0; i < hitActors.size(); i++ ) - { - NxActor *pActor = hitActors[i]; - - PxUserData *pUserData = PxUserData::getData( *pActor ); - - // TODO: We should calculate the real force accounting - // for falloff before we break things with it. - - // If we have enough force, and this is an actor that - // can be 'broken' by impacts, break it now. - if ( pUserData && - //pUserData->mCanPush && - pUserData->mBrokenActors.size() > 0 && - magnitude > mDataBlock->breakForce ) - { - setBroken( pActor->getGlobalPose(), - pActor->getLinearVelocity(), - pUserData, - true ); - - // apply force that would have been applied to this actor - // to the broken actors we just enabled. - - for ( U32 j = 0; j < pUserData->mBrokenActors.size(); j++ ) - { - NxActor *pBrokenActor = pUserData->mBrokenActors[j]; - _applyActorRadialForce( pBrokenActor, nxorigin, radius, magnitude ); - } - } - else - { - // Apply force to the actor. - _applyActorRadialForce( pActor, nxorigin, radius, magnitude ); - } - } -} - -void PxMultiActor::_applyActorRadialForce( NxActor *inActor, const NxVec3 &origin, F32 radius, F32 magnitude ) -{ - // TODO: We're not getting a good torque force - // out of explosions because we're not picking - // the nearest point on the actor to the origin - // of the radial force. - - NxVec3 force = inActor->getCMassGlobalPosition() - origin; - NxF32 dist = force.magnitude(); - force.normalize(); - - if ( dist == 0.0f ) - force *= magnitude; - else - force *= mClampF( radius / dist, 0.0f, 1.0f ) * magnitude; - - // HACK: Make the position we push the force thru between the - // actor pos and its center of mass. This gives us some - // rotational force as well as make the covered structure - // explode better. - NxVec3 forcePos = ( inActor->getGlobalPosition() + inActor->getCMassGlobalPosition() ) / 2.0f; - inActor->addForceAtPos( force, forcePos, NX_VELOCITY_CHANGE ); -} - -void PxMultiActor::_updateContainerForces() -{ - if ( !mWorld->getEnabled() ) - return; - - PROFILE_SCOPE( PxMultiActor_updateContainerForces ); - - // Update container drag and buoyancy properties ( for each Actor ) - - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *pActor = mActors[i]; - - if ( !pActor || - pActor->readBodyFlag(NX_BF_KINEMATIC) || - pActor->readActorFlag(NX_AF_DISABLE_COLLISION) ) - continue; - - // Get world bounds of this actor ( the combination of all shape bounds ) - NxShape *const* shapes = pActor->getShapes(); - NxBounds3 bounds; - bounds.setEmpty(); - NxBounds3 shapeBounds; - - for ( U32 i = 0; i < pActor->getNbShapes(); i++ ) - { - NxShape *pShape = shapes[i]; - pShape->getWorldBounds(shapeBounds); - - bounds.combine( shapeBounds ); - } - - Box3F boundsBox = pxCast(bounds); - - ContainerQueryInfo info; - info.box = boundsBox; - info.mass = pActor->getMass(); - - // Find and retreive physics info from intersecting WaterObject(s) - mContainer->findObjects( boundsBox, WaterObjectType|PhysicalZoneObjectType, findRouter, &info ); - - // Calculate buoyancy and drag - F32 angDrag = mDataBlock->angularDrag; - F32 linDrag = mDataBlock->linearDrag; - F32 buoyancy = 0.0f; - - if ( true ) //info.waterCoverage >= 0.1f) - { - F32 waterDragScale = info.waterViscosity * mDataBlock->waterDragScale; - F32 powCoverage = mPow( info.waterCoverage, 0.25f ); - - if ( info.waterCoverage > 0.0f ) - { - //angDrag = mBuildAngDrag * waterDragScale; - //linDrag = mBuildLinDrag * waterDragScale; - angDrag = mLerp( angDrag, angDrag * waterDragScale, powCoverage ); - linDrag = mLerp( linDrag, linDrag * waterDragScale, powCoverage ); - } - - buoyancy = ( info.waterDensity / mDataBlock->buoyancyDensity ) * mPow( info.waterCoverage, 2.0f ); - } - - // Apply drag (dampening) - pActor->setLinearDamping( linDrag ); - pActor->setAngularDamping( angDrag ); - - // Apply buoyancy force - if ( buoyancy != 0 ) - { - // A little hackery to prevent oscillation - // Based on this blog post: - // (http://reinot.blogspot.com/2005/11/oh-yes-they-float-georgie-they-all.html) - // JCF: disabled! - NxVec3 gravity; - mWorld->getScene()->getGravity(gravity); - //NxVec3 velocity = pActor->getLinearVelocity(); - - NxVec3 buoyancyForce = buoyancy * -gravity * TickSec * pActor->getMass(); - //F32 currHeight = getPosition().z; - //const F32 C = 2.0f; - //const F32 M = 0.1f; - - //if ( currHeight + velocity.z * TickSec * C > info.waterHeight ) - // buoyancyForce *= M; - - pActor->addForceAtPos( buoyancyForce, pActor->getCMassGlobalPosition(), NX_IMPULSE ); - } - - // Apply physical zone forces - if ( info.appliedForce.len() > 0.001f ) - pActor->addForceAtPos( pxCast(info.appliedForce), pActor->getCMassGlobalPosition(), NX_IMPULSE ); - } -} - -/* -ConsoleMethod( PxMultiActor, applyImpulse, void, 3, 3, "applyImpulse - takes a velocity vector to apply") -{ - VectorF vec; - dSscanf( argv[2],"%g %g %g", - &vec.x,&vec.y,&vec.z ); - - object->applyImpulse( vec ); -} -*/ - -void PxMultiActor::setAllBroken( bool isBroken ) -{ - PROFILE_SCOPE( PxMultiActor_SetAllBroken ); - - if ( mIsDummy ) - { - PxMultiActor *serverObj = static_cast( mServerObject.getObject() ); - serverObj->setAllBroken( isBroken ); - return; - } - - mWorld->releaseWriteLock(); - - NxActor *actor0 = NULL; - NxActor *actor1 = NULL; - NxMat34 parentPose; - - for ( U32 i = 0; i < mJoints.size(); i++ ) - { - NxJoint *joint = mJoints[i]; - if ( !joint ) - continue; - - PxUserData *jointData = PxUserData::getData( *joint ); - if ( !jointData ) - continue; - - joint->getActors( &actor0, &actor1 ); - parentPose = actor0->getGlobalPose(); - - setBroken( parentPose, NxVec3(0.0f), jointData, isBroken ); - } - - for ( U32 i = 0; i < mActors.size(); i++ ) - { - NxActor *actor = mActors[i]; - if ( !actor ) - continue; - - PxUserData *actorData = PxUserData::getData( *actor ); - if ( !actorData ) - continue; - - setBroken( actor->getGlobalPose(), - actor->getLinearVelocity(), - actorData, - isBroken ); - } -} - -void PxMultiActor::setBroken( const NxMat34 &parentPose, - const NxVec3 &parentVel, - PxUserData *userData, - bool isBroken ) -{ - PROFILE_SCOPE( PxMultiActor_SetBroken ); - - // TODO: This function is highly inefficent and - // way too complex to follow... the hacked single - // player mode doesn't help. - - // Be careful not to set something broken twice. - if ( isBroken && - userData->mIsBroken == isBroken ) - return; - - userData->mIsBroken = isBroken; - - Vector *hideActors = NULL; - Vector *showActors = NULL; - - if ( isBroken ) - { - hideActors = &userData->mUnbrokenActors; - showActors = &userData->mBrokenActors; - } - else - { - hideActors = &userData->mBrokenActors; - showActors = &userData->mUnbrokenActors; - } - - NxActor *pActor = NULL; - MatrixF tMat; - for ( U32 i = 0; i < hideActors->size(); i++ ) - { - pActor = (*hideActors)[i]; - - pActor->raiseActorFlag( NX_AF_DISABLE_COLLISION ); - pActor->raiseBodyFlag( NX_BF_KINEMATIC ); - pActor->putToSleep(); - - NxShape *const* pShapeArray = pActor->getShapes(); - U32 shapeCount = pActor->getNbShapes(); - for ( U32 i = 0; i < shapeCount; i++ ) - pShapeArray[i]->setFlag( NX_SF_DISABLE_RAYCASTING, true ); - - setMeshHidden( _getMeshName( pActor ), true ); - } - - // Get the client side delta array. - Vector *actorDeltas = NULL; - if ( isClientObject() ) - actorDeltas = &mActorDeltas; - else if ( isServerObject() && PHYSICSMGR->isSinglePlayer() ) - { - PxMultiActor *clientObj = static_cast( getClientObject() ); - if ( clientObj ) - actorDeltas = &clientObj->mActorDeltas; - } - U32 index; - - for ( U32 i = 0; i < showActors->size(); i++ ) - { - pActor = (*showActors)[i]; - - if ( showActors == &userData->mBrokenActors ) - { - NxMat34 pose; - pose.multiply( parentPose, userData->mRelXfm[i] ); - pActor->setGlobalPose( pose ); - - if ( actorDeltas ) - { - for ( U32 j=0; j < mMappedActors.size(); j++ ) - { - if ( mMappedActors[j] == pActor ) - { - index = mMappedToActorIndex[j]; - - // Reset the delta. - Delta &delta = (*actorDeltas)[index]; - delta.pos = pxCast( pose.t ); - pose.getRowMajor44( tMat ); - delta.rot.set( tMat ); - delta.lastPos = delta.pos; - delta.lastRot = delta.rot; - - break; - } - } - } - } - - pActor->clearActorFlag( NX_AF_DISABLE_COLLISION ); - pActor->clearBodyFlag( NX_BF_KINEMATIC ); - pActor->setLinearVelocity( parentVel ); - pActor->wakeUp(); - - NxShape *const* pShapeArray = pActor->getShapes(); - U32 shapeCount = pActor->getNbShapes(); - for ( U32 i = 0; i < shapeCount; i++ ) - pShapeArray[i]->setFlag( NX_SF_DISABLE_RAYCASTING, false ); - - setMeshHidden( _getMeshName(pActor), false ); - } -} - -void PxMultiActor::setAllHidden( bool hide ) -{ - for ( U32 i = 0; i < mShapeInstance->mMeshObjects.size(); i++ ) - mShapeInstance->setMeshForceHidden( i, hide ); -} - -ConsoleMethod( PxMultiActor, setAllHidden, void, 3, 3, "( bool )" - "@brief Hides or unhides all meshes contained in the PxMultiActor.\n\n" - "Hidden meshes will not be rendered.") -{ - object->setAllHidden( dAtob(argv[2]) ); -} - -void PxMultiActor::setMeshHidden( String namePrefix, bool hidden ) -{ - if ( isServerObject() && PHYSICSMGR->isSinglePlayer() ) - { - PxMultiActor *clientObj = static_cast( getClientObject() ); - if ( clientObj ) - clientObj->setMeshHidden( namePrefix, hidden ); - } - - for ( U32 i = 0; i < mShapeInstance->mMeshObjects.size(); i++ ) - { - String meshName = mShapeInstance->getShape()->getMeshName( i ); - - if ( meshName.find( namePrefix ) != String::NPos ) - { - mShapeInstance->setMeshForceHidden( i, hidden ); - return; - } - } - - Con::warnf( "PxMultiActor::setMeshHidden - could not find mesh containing substring (%s)", namePrefix.c_str() ); -} - -ConsoleMethod( PxMultiActor, setBroken, void, 3, 3, "( bool )" - "@brief Sets the PxMultiActor to a broken or unbroken state.\n\n") -{ - object->setAllBroken( dAtob( argv[2] ) ); -} - -void PxMultiActorData::dumpModel() -{ - TSShapeInstance *inst = new TSShapeInstance( shape, true ); - - String path = Platform::getMainDotCsDir(); - path += "/model.dump"; - - FileStream *st; - if((st = FileStream::createAndOpen( path, Torque::FS::File::Write )) != NULL) - { - if ( inst ) - inst->dump( *st ); - else - Con::errorf( "PxMultiActor::dumpModel, no ShapeInstance." ); - - delete st; - } - else - Con::errorf( "PxMultiActor::dumpModel, error opening dump file." ); -} - -ConsoleMethod( PxMultiActorData, dumpModel, void, 2, 2, - "@brief Dumps model hierarchy and details to a file.\n\n" - "The file will be created as \'model.dump\' in the game folder. " - "If model.dump already exists, it will be overwritten.\n\n") -{ - object->dumpModel(); -} - -ConsoleMethod( PxMultiActor, setMeshHidden, void, 4, 4, "(string meshName, bool isHidden)" - "@brief Prevents the provided mesh from being rendered.\n\n") -{ - object->setMeshHidden( argv[2], dAtob( argv[3] ) ); -} - -void PxMultiActor::listMeshes( const String &state ) const -{ - if ( mShapeInstance ) - mShapeInstance->listMeshes( state ); -} - -ConsoleMethod( PxMultiActor, listMeshes, void, 3, 3, "(enum Hidden/Shown/All)" - "@brief Lists all meshes of the provided type in the console window.\n\n" - "@param All Lists all of the %PxMultiActor's meshes.\n" - "@param Hidden Lists all of the %PxMultiActor's hidden meshes.\n" - "@param Shown Lists all of the %PxMultiActor's visible meshes.\n") -{ - object->listMeshes( argv[2] ); -}; - -ConsoleMethod( PxMultiActorData, reload, void, 2, 2, "" - "@brief Reloads all data used for the PxMultiActorData.\n\n" - "If the reload sucessfully completes, all PxMultiActor's will be notified.\n\n") -{ - object->reload(); -} diff --git a/Engine/source/T3D/physics/physx/pxMultiActor.h b/Engine/source/T3D/physics/physx/pxMultiActor.h deleted file mode 100644 index 891ca4ac8..000000000 --- a/Engine/source/T3D/physics/physx/pxMultiActor.h +++ /dev/null @@ -1,398 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PXMULTIACTOR_H -#define _PXMULTIACTOR_H - -#ifndef _GAMEBASE_H_ -#include "T3D/gameBase/gameBase.h" -#endif -#ifndef __RESOURCE_H__ -#include "core/resource.h" -#endif -#ifndef _T3D_PHYSICS_PHYSICSPLUGIN_H_ -#include "T3D/physics/physicsPlugin.h" -#endif -#ifndef _PHYSX_H_ -#include "T3D/physics/physx/px.h" -#endif -#ifndef _STRINGUNIT_H_ -#include "core/strings/stringUnit.h" -#endif -#ifndef _PHYSICS_PHYSICSUSERDATA_H_ -#include "T3D/physics/physicsUserData.h" -#endif -#ifndef _TSSHAPE_H_ -#include "ts/tsShape.h" -#endif - - -class TSShapeInstance; -class BaseMatInstance; -class PxMultiActor; -class PxWorld; -class PxMaterial; -class NxScene; -class NxActor; -class NxShape; -class NxCompartment; -class NxJoint; -class NxMat34; -class NxVec3; -class ParticleEmitterData; - - -namespace NXU -{ - class NxuPhysicsCollection; -} - - -class PxUserData : public PhysicsUserData -{ -public: - - /// The constructor. - PxUserData() - : PhysicsUserData(), - mIsBroken( false ), - mParticleEmitterData( NULL ) - { - } - - static PxUserData* getData( const NxActor &actor ) - { - PxUserData *result = (PxUserData*)actor.userData; - - AssertFatal( !result || typeid( *result ) == typeid( PxUserData ), - "PxUserData::getData - The pointer is the wrong type!" ); - - return result; - } - - static PxUserData* getData( const NxJoint &joint ) - { - PxUserData *result = (PxUserData*)joint.userData; - - AssertFatal( !result || typeid( *result ) == typeid( PxUserData ), - "PxUserData::getData - The pointer is the wrong type!" ); - - return result; - } - - typedef Signal JointBreakSignal; - - JointBreakSignal& getOnJointBreakSignal() { return mOnJointBreakSignal; } - - // Breakable stuff... - Vector mUnbrokenActors; - Vector mBrokenActors; - Vector mRelXfm; - ParticleEmitterData *mParticleEmitterData; - bool mIsBroken; - JointBreakSignal mOnJointBreakSignal; -}; - - -class ParticleEmitterData; - -class PxMultiActorData : public GameBaseData -{ - typedef GameBaseData Parent; - -public: - - PxMultiActorData(); - virtual ~PxMultiActorData(); - - DECLARE_CONOBJECT(PxMultiActorData); - - static void initPersistFields(); - - void packData(BitStream* stream); - void unpackData(BitStream* stream); - - bool preload( bool server, String &errorBuffer ); - //bool onAdd(); - - void allocPrimBuffer( S32 overrideSize = -1 ); - - bool _loadCollection( const UTF8 *path, bool isBinary ); - - void _onFileChanged( const Torque::Path &path ); - - void reload(); - - void dumpModel(); - - Signal mReloadSignal; - -public: - - // Rendering - StringTableEntry shapeName; - Resource shape; - - PxMaterial *material; - - /// Filename to load the physics actor from. - StringTableEntry physXStream; - - enum - { - NumMountPoints = 32, - MaxCorrectionNodes = 2 - }; - - StringTableEntry correctionNodeNames[MaxCorrectionNodes]; - StringTableEntry mountNodeNames[NumMountPoints]; - S32 correctionNodes[MaxCorrectionNodes]; - S32 mountPointNode[NumMountPoints]; ///< Node index of mountPoint - - /// If true no network corrections will - /// be done during gameplay. - bool noCorrection; - - /// Physics collection that holds the actor - /// and all associated shapes and data. - NXU::NxuPhysicsCollection *collection; - - bool createActors( NxScene *scene, - NxCompartment *compartment, - const NxMat34 *nxMat, - const Point3F& scale, - Vector *outActors, - Vector *outShapes, - Vector *outJoints, - Vector *outActorUserProperties, - Vector *outJointUserProperties ); - - /// Angular and Linear Drag (dampening) is scaled by this when in water. - F32 waterDragScale; - - /// The density of this object (for purposes of buoyancy calculation only). - F32 buoyancyDensity; - - F32 angularDrag; - F32 linearDrag; - - /// If this flag is set to true, - /// the physics actors will only be - /// created on the client, and the server - /// object is only responsible for ghosting. - /// Objects with this flag set will never stop - /// the physics player from moving through them. - bool clientOnly; - - bool singlePlayerOnly; - - /// When applyImpulse is passed a force of this magnitude or greater - /// any actors hit by the force vector that have broken versions - /// will become 'broken'. - F32 breakForce; -}; - - -class PxMultiActor : public GameBase -{ - typedef GameBase Parent; - - enum MaskBits - { - MoveMask = Parent::NextFreeMask << 0, - WarpMask = Parent::NextFreeMask << 1, - LightMask = Parent::NextFreeMask << 2, - SleepMask = Parent::NextFreeMask << 3, - ForceSleepMask = Parent::NextFreeMask << 4, - ImpulseMask = Parent::NextFreeMask << 5, - UpdateMask = Parent::NextFreeMask << 6, - MountedMask = Parent::NextFreeMask << 7, - NextFreeMask = Parent::NextFreeMask << 8 - }; - -public: - - PxMultiActor(); - - DECLARE_CONOBJECT( PxMultiActor ); - static void initPersistFields(); - - // SimObject - bool onAdd(); - void onRemove(); - void inspectPostApply(); - void onPhysicsReset( PhysicsResetEvent reset ); - void onStaticModified( const char *slotName, const char *newValue ); - void onDeleteNotify( SimObject *obj ); - - // NetObject - U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ); - void unpackUpdate( NetConnection *conn, BitStream *stream ); - - // SceneObject - void prepRenderImage( SceneRenderState *state ); - void setScale( const VectorF &scale ); - void setTransform( const MatrixF &mat ); - virtual void mountObject( SceneObject *obj, U32 node ); - virtual void unmountObject( SceneObject *obj ); - virtual void getMountTransform( U32 mountPoint, MatrixF *mat ); - virtual void getRenderMountTransform( U32 index, MatrixF *mat ); - - // GameBase - virtual bool onNewDataBlock( GameBaseData *dptr, bool reload ); - virtual void processTick( const Move *move ); - virtual void interpolateTick( F32 delta ); - virtual void applyImpulse( const Point3F &pos, const VectorF &vec ); - virtual void applyRadialImpulse( const Point3F &origin, F32 radius, F32 magnitude ); - - /// PxMultiActor - /// @{ - - /// Set visibility of all broken/unbroken meshes to match this state. - void setAllBroken( bool isBroken ); - - /// Sets up actors and meshes associated with the passed joint to reflect - /// the desired state. - void setBroken( const NxMat34 &parentPose, - const NxVec3 &parentVel, - PxUserData *userData, - bool isBroken ); - - /// - void setMeshHidden( String namePrefix, bool hidden ); - - void setAllHidden( bool hide ); - - void listMeshes( const String &state ) const; - - void _onJointBreak( NxReal breakForce, NxJoint &brokenJoint ); - - void _onContact( PhysicsUserData *us, - PhysicsUserData *them, - const Point3F &hitPoint, - const Point3F &hitForce ); - - void applyWarp( const MatrixF& mat, bool interpRender, bool sweep ); - - void getDynamicXfms( PxMultiActor *srcObj, F32 dt ); - - /// @} - -protected: - - /// This creates the physics objects. - bool _createActors( const MatrixF &xfm ); - - /// Creates a PxUserData for a joint and parses userProperties into it. - PxUserData* _createJointUserData( NxJoint *joint, String &userProperties ); - - /// Creates a PxUserData and parses userProperties into it. - PxUserData* _createActorUserData( NxActor *actor, String &userProperties ); - - /// Called to cleanup the physics objects. - void _destroyActors(); - - NxActor* _findActor( const String &actorName ) const; - - /// Get the corresponding meshName for a given actor. - String _getMeshName( const NxActor *actor ) const; - - /// - void _updateBounds(); - - void _updateContainerForces(); - - void _debugRender( ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance *overrideMat ); - - void onFileNotify(); - - void _applyActorRadialForce( NxActor *inActor, const NxVec3 &origin, F32 radius, F32 magnitude ); - - void _updateDeltas( bool clearDelta ); - - bool _getNodeTransform( U32 nodeIdx, MatrixF *outXfm ); - -protected: - - PxMultiActorData *mDataBlock; - - PxWorld *mWorld; - - Vector mActors; - Vector mMappedActors; - Vector mMappedToActorIndex; - Vector mMappedActorDL; - Vector mJoints; - Vector mShapes; - - /// This is the root actor whose transform is the - /// transform of this SceneObject. - NxActor *mRootActor; - - TSShapeInstance *mShapeInstance; - Resource mDebrisShape; - - struct Delta - { - Point3F pos; - Point3F lastPos; - QuatF rot; - QuatF lastRot; - }; - - Delta mDelta; - - Vector mActorDeltas; - - /// The transform of this actor when it was first - /// created. It is used to reset the physics state - /// when the editor is enabled. - MatrixF mResetXfm; - - - /// The userdata object assigned to all actors - /// and joints of this multi-actor. - //PxUserData mUserData; - - /// - //Vector mRelXfms; - - /// This is the scale the actors were built at and - /// is used to decide if we need to recreate them. - VectorF mActorScale; - //F32 mBuildAngDrag; - //F32 mBuildLinDrag; - - VectorF mStartImpulse; - - bool mDebugRender; - - /// A helper set to true if is a client object and - /// is a singlePlayerOnly object. - bool mIsDummy; - - /// Helper for - bool mBroken; -}; - -#endif // _PXMULTIACTOR_H - diff --git a/Engine/source/T3D/physics/physx/pxPlayer.cpp b/Engine/source/T3D/physics/physx/pxPlayer.cpp deleted file mode 100644 index cf4ca9038..000000000 --- a/Engine/source/T3D/physics/physx/pxPlayer.cpp +++ /dev/null @@ -1,428 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxPlayer.h" - -#include "T3D/physics/physicsPlugin.h" -#include "T3D/physics/physX/pxWorld.h" -#include "T3D/physics/physX/pxCasts.h" -#include "collision/collision.h" -//#include "gfx/gfxDrawUtil.h" -//#include "sim/netConnection.h" - - -PxPlayer::PxPlayer() - : PhysicsPlayer(), - mController( NULL ), - mWorld( NULL ), - mObject( NULL ), - mSkinWidth( 0.1f ), - mOriginOffset( 0.0f ) -{ - PHYSICSMGR->getPhysicsResetSignal().notify( this, &PxPlayer::_onPhysicsReset ); -} - -PxPlayer::~PxPlayer() -{ - _releaseController(); - PHYSICSMGR->getPhysicsResetSignal().remove( this, &PxPlayer::_onPhysicsReset ); -} - -void PxPlayer::_releaseController() -{ - if ( mController ) - { - mController->getActor()->userData = NULL; - mWorld->getStaticChangedSignal().remove( this, &PxPlayer::_onStaticChanged ); - mWorld->releaseController( *mController ); - mController = NULL; - } -} - -void PxPlayer::init( const char *type, - const Point3F &size, - F32 runSurfaceCos, - F32 stepHeight, - SceneObject *obj, - PhysicsWorld *world ) -{ - AssertFatal( obj, "PxPlayer::init - Got a null scene object!" ); - AssertFatal( world, "PxPlayer::init - Got a null world!" ); - AssertFatal( dynamic_cast( world ), "PxPlayer::init - The world is the wrong type!" ); - - // Cleanup any previous controller. - _releaseController(); - - mObject = obj; - mWorld = (PxWorld*)world; - mOriginOffset = size.z * 0.5f; - - //if ( dStricmp( type, "Capsule" ) == 0 ) - { - NxCapsuleControllerDesc desc; - desc.skinWidth = 0.05f; // Expose? - desc.radius = getMax( size.x, size.y ) * 0.5f; - desc.radius -= desc.skinWidth; - desc.height = size.z - ( desc.radius * 2.0f ); - desc.height -= desc.skinWidth * 2.0f; - - desc.climbingMode = CLIMB_CONSTRAINED; - desc.position.set( 0, 0, 0 ); - desc.upDirection = NX_Z; - desc.callback = this; // TODO: Fix this as well! - desc.slopeLimit = runSurfaceCos; - desc.stepOffset = stepHeight; - mController = mWorld->createController( desc ); - } - //else - { - //mColShape = new btBoxShape( btVector3( 0.5f, 0.5f, 1.0f ) ); - //mOriginOffset = 1.0f; - } - - mWorld->getStaticChangedSignal().notify( this, &PxPlayer::_onStaticChanged ); - - // Put the kinematic actor on group 29. - NxActor *kineActor = mController->getActor(); - kineActor->setGroup( 29 ); - NxShape *const *shapes = kineActor->getShapes(); - for ( U32 i=0; i < kineActor->getNbShapes(); i++ ) - shapes[i]->setGroup( 29 ); - - mUserData.setObject( obj ); - kineActor->userData = &mUserData; -} - -void PxPlayer::_onStaticChanged() -{ - mController->reportSceneChanged(); -} - -void PxPlayer::_onPhysicsReset( PhysicsResetEvent reset ) -{ - // The PhysX controller will crash out if it doesn't clear its - // list of static elements when they are deleted. By calling this - // on physics events we clear the cache and we don't get crashes. - // - // This all depends on not doing moves and sweeps when the - // simulation is paused... we need to stop operating. - - if ( mController ) - mController->reportSceneChanged(); -} - -Point3F PxPlayer::move( const VectorF &disp, CollisionList &outCol ) -{ - AssertFatal( mController, "PxPlayer::move - The controller is null!" ); - - // Return the last position if the simulation is stopped. - // - // See PxPlayer::_onPhysicsReset - if ( !mWorld->isEnabled() ) - { - Point3F newPos = pxCast( mController->getDebugPosition() ); - newPos.z -= mOriginOffset; - //outCol->point = newPos; - //outCol->normal.set( 0, 0, 1 ); - return newPos; - } - - mWorld->releaseWriteLock(); - - mCollisionList = &outCol; - - // PhysX 2.8.4 checks up an up displacement and if found will assume - // the player is flying and remove the step offset. If we have a small - // z displacement here, zero it out. - NxVec3 dispNx( disp.x, disp.y, disp.z ); - if (mIsZero(disp.z)) - dispNx.z = 0.0f; - - NxU32 activeGroups = 0xFFFFFFFF; - activeGroups &= ~( 1<<31 ); // Skip activeGroup for triggers ( 31 ) - activeGroups &= ~( 1<<30 ); // Skip activeGroup for debris / non interactive dynamics ( 30 ) - - NxU32 collisionFlags = NXCC_COLLISION_SIDES | NXCC_COLLISION_DOWN | NXCC_COLLISION_UP; - - mController->move( dispNx, activeGroups, 0.0001f, collisionFlags ); - - Point3F newPos = pxCast( mController->getDebugPosition() ); - newPos.z -= mOriginOffset; - - mCollisionList = NULL; - - return newPos; -} - -NxControllerAction PxPlayer::onShapeHit( const NxControllerShapeHit& hit ) -{ - if (!mCollisionList || mCollisionList->getCount() >= CollisionList::MaxCollisions) - return NX_ACTION_NONE; - - NxActor *actor = &hit.shape->getActor(); - PhysicsUserData *userData = PhysicsUserData::cast( actor->userData ); - - if ( actor->readActorFlag( NX_AF_DISABLE_RESPONSE ) ) - return NX_ACTION_NONE; - - // Fill out the Collision - // structure for use later. - Collision &col = mCollisionList->increment(); - dMemset( &col, 0, sizeof( col ) ); - - col.normal = pxCast( hit.worldNormal ); - col.point.set( hit.worldPos.x, hit.worldPos.y, hit.worldPos.z ); - col.distance = hit.length; - if ( userData ) - col.object = userData->getObject(); - - // If the collision direction is sideways then modify the collision normal - // to remove any z component. This takes care of any sideways collisions - // with the round bottom of the capsule when it comes to the Player class - // velocity calculations. We want all sideways collisions to be treated - // as if they hit the side of a cylinder. - if (mIsZero(hit.dir.z)) - { - if (col.normal.z > 0.0f) - { - // This will only remove the z component of the collision normal - // for the bottom of the character controller, which would hit during - // a step. We'll leave the top hemisphere of the character's capsule - // alone as bumping one's head is an entirely different story. This - // helps with low doorways. - col.normal.z = 0.0f; - col.normal.normalizeSafe(); - } - } - else - { - // PhysX doesn't perform callbacks in its upwards collision check so if - // this isn't a sideways collision then it must be a downwards one. In this - // case we want to have the collision normal only point in the opposite direction. - // i.e. up If we include the sideways part of the normal then the Player class - // velocity calculations using this normal will affect the player's forwards - // momentum. This is especially noticable on stairs as the rounded bottom of - // the capsule slides up the corner of a stair. - col.normal.set(0.0f, 0.0f, 1.0f); - } - - /* - if ( userData && - userData->mCanPush && - actor->isDynamic() && - !actor->readBodyFlag( NX_BF_KINEMATIC ) && - !mDummyMove ) - { - NxActor *ctrlActor = mController->getActor(); - - // So the object is neither - // a static or a kinematic, - // meaning we need to figure out - // if we have enough force to push it. - - // Get the hit object's force - // and scale it by the amount - // that it's acceleration is going - // against our acceleration. - const Point3F &hitObjLinVel = pxCast( actor->getLinearVelocity() ); - - F32 hitObjMass = actor->getMass(); - - VectorF hitObjDeltaVel = hitObjLinVel * TickSec; - VectorF hitObjAccel = hitObjDeltaVel / TickSec; - - VectorF controllerLinVel = pxCast( controllerActor->getLinearVelocity() ); - VectorF controllerDeltaVel = controllerLinVel * TickSec; - VectorF controllerAccel = controllerDeltaVel / TickSec; - - Point3F hitObjForce = (hitObjMass * hitObjAccel); - Point3F playerForce = (controllerActor->getMass() * controllerAccel); - - VectorF normalizedObjVel( hitObjLinVel ); - normalizedObjVel.normalizeSafe(); - - VectorF normalizedPlayerVel( pxCast( controllerActor->getLinearVelocity() ) ); - normalizedPlayerVel.normalizeSafe(); - - F32 forceDot = mDot( normalizedObjVel, normalizedPlayerVel ); - - hitObjForce *= forceDot; - - playerForce = playerForce - hitObjForce; - - if ( playerForce.x > 0.0f || playerForce.y > 0.0f || playerForce.z > 0.0f ) - actor->addForceAtPos( NxVec3( playerForce.x, playerForce.y, playerForce.z ), actor->getCMassGlobalPosition() ); - - //Con::printf( "onShapeHit: %f %f %f", playerForce.x, playerForce.y, playerForce.z ); - } - */ - - return NX_ACTION_PUSH; -} - -NxControllerAction PxPlayer::onControllerHit( const NxControllersHit& hit ) -{ - if (!mCollisionList || mCollisionList->getCount() >= CollisionList::MaxCollisions) - return NX_ACTION_NONE; - - NxActor *actor = hit.other->getActor(); - PhysicsUserData *userData = PhysicsUserData::cast( actor->userData ); - - if ( actor->readActorFlag( NX_AF_DISABLE_RESPONSE ) ) - return NX_ACTION_NONE; - - // For controller-to-controller hit we don't have an actual hit point, so all - // we can do is set the hit object. - Collision &col = mCollisionList->increment(); - dMemset( &col, 0, sizeof( col ) ); - if ( userData ) - col.object = userData->getObject(); - - return NX_ACTION_NONE; -} - -void PxPlayer::findContact( SceneObject **contactObject, - VectorF *contactNormal, - Vector *outOverlapObjects ) const -{ - AssertFatal( mController, "PxPlayer::findContact - The controller is null!" ); - - // See PxPlayer::_onPhysicsReset - if ( !mWorld->isEnabled() ) - return; - - // Calculate the sweep motion... - F32 halfCapSize = mOriginOffset; - F32 halfSmallCapSize = halfCapSize * 0.8f; - F32 diff = halfCapSize - halfSmallCapSize; - - const F32 mSkinWidth = 0.1f; - - F32 offsetDist = diff + mSkinWidth + 0.01f; - NxVec3 motion(0,0,-offsetDist); - - /* - // Construct the capsule... - F32 radius = mCapsuleController->getRadius(); - F32 halfHeight = mCapsuleController->getHeight() * 0.5f; - - NxCapsule capsule; - capsule.p0 = capsule.p1 = pxCast( mCapsuleController->getDebugPosition() ); - capsule.p0.z -= halfHeight; - capsule.p1.z += halfHeight; - capsule.radius = radius; - */ - - NxSweepQueryHit sweepHit; - NxU32 hitCount = mController->getActor()->linearSweep( motion, NX_SF_STATICS | NX_SF_DYNAMICS, NULL, 1, &sweepHit, NULL ); - - if ( hitCount > 0 ) - { - PhysicsUserData *data = PhysicsUserData::cast( sweepHit.hitShape->getActor().userData ); - if ( data ) - { - *contactObject = data->getObject(); - *contactNormal = pxCast( sweepHit.normal ); - } - } - - // Check for overlapped objects ( triggers ) - - if ( !outOverlapObjects ) - return; - - NxCapsuleShape *shape = reinterpret_cast( mController->getActor()->getShapes()[0] ); - NxCapsule worldCapsule; - shape->getWorldCapsule( worldCapsule ); - - // Test only against activeGroup with triggers ( 31 ). - NxU32 activeGroups = 1 << 31; - - NxShape *shapes[10]; - - hitCount = mWorld->getScene()->overlapCapsuleShapes( worldCapsule, NX_ALL_SHAPES, 10, shapes, NULL, activeGroups ); - - for ( S32 i = 0; i < hitCount; i++ ) - { - PhysicsUserData *data = PhysicsUserData::cast( shapes[i]->getActor().userData ); - if ( data ) - outOverlapObjects->push_back( data->getObject() ); - } -} - -void PxPlayer::enableCollision() -{ - AssertFatal( mController, "PxPlayer::enableCollision - The controller is null!" ); - - mWorld->releaseWriteLock(); - mController->setCollision( true ); -} - -void PxPlayer::disableCollision() -{ - AssertFatal( mController, "PxPlayer::disableCollision - The controller is null!" ); - - mWorld->releaseWriteLock(); - mController->setCollision( false ); -} - -PhysicsWorld* PxPlayer::getWorld() -{ - return mWorld; -} - -void PxPlayer::setTransform( const MatrixF &transform ) -{ - AssertFatal( mController, "PxPlayer::setTransform - The controller is null!" ); - - mWorld->releaseWriteLock(); - - Point3F newPos = transform.getPosition(); - newPos.z += mOriginOffset; - - const Point3F &curPos = pxCast(mController->getDebugPosition()); - - if ( !(newPos - curPos ).isZero() ) - mController->setPosition( pxCast(newPos) ); -} - -MatrixF& PxPlayer::getTransform( MatrixF *outMatrix ) -{ - AssertFatal( mController, "PxPlayer::getTransform - The controller is null!" ); - - Point3F newPos = pxCast( mController->getDebugPosition() ); - newPos.z -= mOriginOffset; - outMatrix->setPosition( newPos ); - - return *outMatrix; -} - -void PxPlayer::setScale( const Point3F &scale ) -{ -} - -Box3F PxPlayer::getWorldBounds() -{ - Con::warnf( "PxPlayer::getWorldBounds - not implemented" ); - return Box3F::Invalid; -} \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxPlayer.h b/Engine/source/T3D/physics/physx/pxPlayer.h deleted file mode 100644 index 419ddcc2b..000000000 --- a/Engine/source/T3D/physics/physx/pxPlayer.h +++ /dev/null @@ -1,106 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PXPLAYER_H -#define _PXPLAYER_H - -#ifndef _PHYSX_H_ -#include "T3D/physics/physX/px.h" -#endif -#ifndef _T3D_PHYSICS_PHYSICSPLAYER_H_ -#include "T3D/physics/physicsPlayer.h" -#endif -#ifndef _T3D_PHYSICSCOMMON_H_ -#include "T3D/physics/physicsCommon.h" -#endif - - -class PxWorld; -class NxController; - - -class PxPlayer : public PhysicsPlayer, public NxUserControllerHitReport -{ -protected: - - NxController *mController; - - F32 mSkinWidth; - - PxWorld *mWorld; - - SceneObject *mObject; - - /// Used to get collision info out of the - /// NxUserControllerHitReport callbacks. - CollisionList *mCollisionList; - - /// - F32 mOriginOffset; - - /// - F32 mStepHeight; - - /// - void _releaseController(); - - // NxUserControllerHitReport - virtual NxControllerAction onShapeHit( const NxControllerShapeHit& hit ); - virtual NxControllerAction onControllerHit( const NxControllersHit& hit ); - - void _findContact( SceneObject **contactObject, VectorF *contactNormal ) const; - - void _onPhysicsReset( PhysicsResetEvent reset ); - - void _onStaticChanged(); - -public: - - PxPlayer(); - virtual ~PxPlayer(); - - // PhysicsObject - virtual PhysicsWorld* getWorld(); - virtual void setTransform( const MatrixF &transform ); - virtual MatrixF& getTransform( MatrixF *outMatrix ); - virtual void setScale( const Point3F &scale ); - virtual Box3F getWorldBounds(); - virtual void setSimulationEnabled( bool enabled ) {} - virtual bool isSimulationEnabled() { return true; } - - // PhysicsPlayer - virtual void init( const char *type, - const Point3F &size, - F32 runSurfaceCos, - F32 stepHeight, - SceneObject *obj, - PhysicsWorld *world ); - virtual Point3F move( const VectorF &displacement, CollisionList &outCol ); - virtual void findContact( SceneObject **contactObject, VectorF *contactNormal, Vector *outOverlapObjects ) const; - virtual bool testSpacials( const Point3F &nPos, const Point3F &nSize ) const { return true; } - virtual void setSpacials( const Point3F &nPos, const Point3F &nSize ) {} - virtual void enableCollision(); - virtual void disableCollision(); -}; - - -#endif // _PXPLAYER_H \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxPlugin.cpp b/Engine/source/T3D/physics/physx/pxPlugin.cpp deleted file mode 100644 index bb3352983..000000000 --- a/Engine/source/T3D/physics/physx/pxPlugin.cpp +++ /dev/null @@ -1,297 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "console/consoleTypes.h" -#include "T3D/physics/physX/pxPlugin.h" - -#include "T3D/physics/physicsShape.h" -#include "T3D/physics/physX/pxWorld.h" -#include "T3D/physics/physX/pxBody.h" -#include "T3D/physics/physX/pxPlayer.h" -#include "T3D/physics/physX/pxCollision.h" -#include "T3D/gameBase/gameProcess.h" -#include "core/util/tNamedFactory.h" - - -extern bool gPhysXLogWarnings; - -AFTER_MODULE_INIT( Sim ) -{ - NamedFactory::add( "PhysX", &PxPlugin::create ); - - #if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON) - NamedFactory::add( "default", &PxPlugin::create ); - #endif - - Con::addVariable( "$PhysXLogWarnings", TypeBool, &gPhysXLogWarnings, - "@brief Output PhysX warnings to the console.\n\n" - "@ingroup Physics\n"); -} - - -PhysicsPlugin* PxPlugin::create() -{ - // Only create the plugin if it hasn't been set up AND - // the PhysX world is successfully initialized. - bool success = PxWorld::restartSDK( false ); - if ( success ) - return new PxPlugin(); - - return NULL; -} - -PxPlugin::PxPlugin() -{ -} - -PxPlugin::~PxPlugin() -{ -} - -void PxPlugin::destroyPlugin() -{ - // Cleanup any worlds that are still kicking. - Map::Iterator iter = mPhysicsWorldLookup.begin(); - for ( ; iter != mPhysicsWorldLookup.end(); iter++ ) - { - iter->value->destroyWorld(); - delete iter->value; - } - mPhysicsWorldLookup.clear(); - - PxWorld::restartSDK( true ); - - delete this; -} - -void PxPlugin::reset() -{ - // First delete all the cleanup objects. - if ( getPhysicsCleanup() ) - getPhysicsCleanup()->deleteAllObjects(); - - getPhysicsResetSignal().trigger( PhysicsResetEvent_Restore ); - - // Now let each world reset itself. - Map::Iterator iter = mPhysicsWorldLookup.begin(); - for ( ; iter != mPhysicsWorldLookup.end(); iter++ ) - iter->value->reset(); -} - -PhysicsCollision* PxPlugin::createCollision() -{ - return new PxCollision(); -} - -PhysicsBody* PxPlugin::createBody() -{ - return new PxBody(); -} - -PhysicsPlayer* PxPlugin::createPlayer() -{ - return new PxPlayer(); -} - -bool PxPlugin::isSimulationEnabled() const -{ - bool ret = false; - PxWorld *world = static_cast( getWorld( smClientWorldName ) ); - if ( world ) - { - ret = world->getEnabled(); - return ret; - } - - world = static_cast( getWorld( smServerWorldName ) ); - if ( world ) - { - ret = world->getEnabled(); - return ret; - } - - return ret; -} - -void PxPlugin::enableSimulation( const String &worldName, bool enable ) -{ - PxWorld *world = static_cast( getWorld( worldName ) ); - if ( world ) - world->setEnabled( enable ); -} - -void PxPlugin::setTimeScale( const F32 timeScale ) -{ - // Grab both the client and - // server worlds and set their time - // scales to the passed value. - PxWorld *world = static_cast( getWorld( smClientWorldName ) ); - if ( world ) - world->setEditorTimeScale( timeScale ); - - world = static_cast( getWorld( smServerWorldName ) ); - if ( world ) - world->setEditorTimeScale( timeScale ); -} - -const F32 PxPlugin::getTimeScale() const -{ - // Grab both the client and - // server worlds and call - // setEnabled( true ) on them. - PxWorld *world = static_cast( getWorld( smClientWorldName ) ); - if ( !world ) - { - world = static_cast( getWorld( smServerWorldName ) ); - if ( !world ) - return 0.0f; - } - - return world->getEditorTimeScale(); -} - -bool PxPlugin::createWorld( const String &worldName ) -{ - Map::Iterator iter = mPhysicsWorldLookup.find( worldName ); - PhysicsWorld *world = NULL; - - iter != mPhysicsWorldLookup.end() ? world = (*iter).value : world = NULL; - - if ( world ) - { - Con::errorf( "PxPlugin::createWorld - %s world already exists!", worldName.c_str() ); - return false; - } - - world = new PxWorld(); - - if ( worldName.equal( smClientWorldName, String::NoCase ) ) - world->initWorld( false, ClientProcessList::get() ); - else - world->initWorld( true, ServerProcessList::get() ); - - mPhysicsWorldLookup.insert( worldName, world ); - - return world != NULL; -} - -void PxPlugin::destroyWorld( const String &worldName ) -{ - Map::Iterator iter = mPhysicsWorldLookup.find( worldName ); - if ( iter == mPhysicsWorldLookup.end() ) - return; - - PhysicsWorld *world = (*iter).value; - world->destroyWorld(); - delete world; - - mPhysicsWorldLookup.erase( iter ); -} - -PhysicsWorld* PxPlugin::getWorld( const String &worldName ) const -{ - if ( mPhysicsWorldLookup.isEmpty() ) - return NULL; - - Map::ConstIterator iter = mPhysicsWorldLookup.find( worldName ); - - return iter != mPhysicsWorldLookup.end() ? (*iter).value : NULL; -} - -PhysicsWorld* PxPlugin::getWorld() const -{ - if ( mPhysicsWorldLookup.size() == 0 ) - return NULL; - - Map::ConstIterator iter = mPhysicsWorldLookup.begin(); - return iter->value; -} - -U32 PxPlugin::getWorldCount() const -{ - return mPhysicsWorldLookup.size(); -} - -void PxPlugin::_onDebugDrawEnabled( bool enabled ) -{ - if ( !enabled ) - gPhysicsSDK->setParameter( NX_VISUALIZATION_SCALE, 0.0f ); -} - -ConsoleFunction( physXRemoteDebuggerConnect, bool, 1, 3, "" ) -{ - if ( !gPhysicsSDK ) - { - Con::errorf( "PhysX SDK not initialized!" ); - return false; - } - - NxRemoteDebugger *debugger = gPhysicsSDK->getFoundationSDK().getRemoteDebugger(); - - if ( debugger->isConnected() ) - { - Con::errorf( "RemoteDebugger already connected... call disconnect first!" ); - return false; - } - - const UTF8 *host = "localhost"; - U32 port = 5425; - - if ( argc >= 2 ) - host = argv[1]; - if ( argc >= 3 ) - port = dAtoi( argv[2] ); - - // Before we connect we need to have write access - // to both the client and server worlds. - PxWorld::releaseWriteLocks(); - - // Connect! - debugger->connect( host, port ); - if ( !debugger->isConnected() ) - { - Con::errorf( "RemoteDebugger failed to connect!" ); - return false; - } - - Con::printf( "RemoteDebugger connected to %s at port %u!", host, port ); - return true; -} - -ConsoleFunction( physXRemoteDebuggerDisconnect, void, 1, 1, "" ) -{ - if ( !gPhysicsSDK ) - { - Con::errorf( "PhysX SDK not initialized!" ); - return; - } - - NxRemoteDebugger *debugger = gPhysicsSDK->getFoundationSDK().getRemoteDebugger(); - - if ( debugger->isConnected() ) - { - debugger->flush(); - debugger->disconnect(); - Con::printf( "RemoteDebugger disconnected!" ); - } -} diff --git a/Engine/source/T3D/physics/physx/pxPlugin.h b/Engine/source/T3D/physics/physx/pxPlugin.h deleted file mode 100644 index c32c1162c..000000000 --- a/Engine/source/T3D/physics/physx/pxPlugin.h +++ /dev/null @@ -1,59 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _T3D_PHYSICS_PXPLUGIN_H_ -#define _T3D_PHYSICS_PXPLUGIN_H_ - -#ifndef _T3D_PHYSICS_PHYSICSPLUGIN_H_ -#include "T3D/physics/physicsPlugin.h" -#endif - - -class PxPlugin : public PhysicsPlugin -{ -public: - - PxPlugin(); - ~PxPlugin(); - - /// Create function for factory. - static PhysicsPlugin* create(); - - // PhysicsPlugin - virtual void destroyPlugin(); - virtual void reset(); - virtual PhysicsCollision* createCollision(); - virtual PhysicsBody* createBody(); - virtual PhysicsPlayer* createPlayer(); - virtual bool isSimulationEnabled() const; - virtual void enableSimulation( const String &worldName, bool enable ); - virtual void setTimeScale( const F32 timeScale ); - virtual const F32 getTimeScale() const; - virtual bool createWorld( const String &worldName ); - virtual void destroyWorld( const String &worldName ); - virtual PhysicsWorld* getWorld( const String &worldName ) const; - virtual PhysicsWorld* getWorld() const; - virtual U32 getWorldCount() const; - virtual void _onDebugDrawEnabled( bool enabled ); -}; - -#endif // _T3D_PHYSICS_PXPLUGIN_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxStream.cpp b/Engine/source/T3D/physics/physx/pxStream.cpp deleted file mode 100644 index 6c7565ee6..000000000 --- a/Engine/source/T3D/physics/physx/pxStream.cpp +++ /dev/null @@ -1,174 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxStream.h" - -#include "console/console.h" -#include "console/consoleTypes.h" -#include "core/strings/stringFunctions.h" - - -PxMemStream::PxMemStream() - : mMemStream( 1024 ) -{ -} - -PxMemStream::~PxMemStream() -{ -} - -void PxMemStream::resetPosition() -{ - mMemStream.setPosition( 0 ); -} - -NxU8 PxMemStream::readByte() const -{ - NxU8 out; - mMemStream.read( &out ); - return out; -} - -NxU16 PxMemStream::readWord() const -{ - NxU16 out; - mMemStream.read( &out ); - return out; -} - -NxU32 PxMemStream::readDword() const -{ - NxU32 out; - mMemStream.read( &out ); - return out; -} - -float PxMemStream::readFloat() const -{ - float out; - mMemStream.read( &out ); - return out; -} - -double PxMemStream::readDouble() const -{ - double out; - mMemStream.read( &out ); - return out; -} - -void PxMemStream::readBuffer( void *buffer, NxU32 size ) const -{ - mMemStream.read( size, buffer ); -} - -NxStream& PxMemStream::storeByte( NxU8 b ) -{ - mMemStream.write( b ); - return *this; -} - -NxStream& PxMemStream::storeWord( NxU16 w ) -{ - mMemStream.write( w ); - return *this; -} - -NxStream& PxMemStream::storeDword( NxU32 d ) -{ - mMemStream.write( d ); - return *this; -} - -NxStream& PxMemStream::storeFloat( NxReal f ) -{ - mMemStream.write( f ); - return *this; -} - -NxStream& PxMemStream::storeDouble( NxF64 f ) -{ - mMemStream.write( f ); - return *this; -} - -NxStream& PxMemStream::storeBuffer( const void *buffer, NxU32 size ) -{ - mMemStream.write( size, buffer ); - return *this; -} - - -bool gPhysXLogWarnings = false; - -PxConsoleStream::PxConsoleStream() -{ -} - -PxConsoleStream::~PxConsoleStream() -{ -} - -void PxConsoleStream::reportError( NxErrorCode code, const char *message, const char* file, int line ) -{ - #ifdef TORQUE_DEBUG - - // If we're in debug mode and the error code is serious then - // pop up a message box to make sure we see it. - if ( code < NXE_DB_INFO ) - { - UTF8 info[1024]; - dSprintf( info, 1024, "File: %s\nLine: %d\n%s", file, line, message ); - Platform::AlertOK( "PhysX Error", info ); - } - - #endif - - // In all other cases we just dump the message to the console. - if ( code == NXE_DB_WARNING ) - { - if ( gPhysXLogWarnings ) - Con::printf( "PhysX Warning:\n %s(%d) : %s\n", file, line, message ); - } - else - Con::printf( "PhysX Error:\n %s(%d) : %s\n", file, line, message ); -} - -NxAssertResponse PxConsoleStream::reportAssertViolation (const char *message, const char *file,int line) -{ - // Assert if we're in debug mode... - bool triggerBreak = false; - #ifdef TORQUE_DEBUG - triggerBreak = PlatformAssert::processAssert( PlatformAssert::Fatal, file, line, message ); - #endif - - // In all other cases we just dump the message to the console. - Con::errorf( "PhysX Assert:\n %s(%d) : %s\n", file, line, message ); - - return triggerBreak ? NX_AR_BREAKPOINT : NX_AR_CONTINUE; -} - -void PxConsoleStream::print( const char *message ) -{ - Con::printf( "PhysX Says: %s\n", message ); -} diff --git a/Engine/source/T3D/physics/physx/pxStream.h b/Engine/source/T3D/physics/physx/pxStream.h deleted file mode 100644 index 8dc875fa3..000000000 --- a/Engine/source/T3D/physics/physx/pxStream.h +++ /dev/null @@ -1,78 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _T3D_PHYSICS_PXSTREAM_H_ -#define _T3D_PHYSICS_PXSTREAM_H_ - -#ifndef _PHYSX_H_ -#include "T3D/physics/physX/px.h" -#endif -#ifndef _MEMSTREAM_H_ -#include "core/stream/memStream.h" -#endif - - -class PxMemStream : public NxStream -{ -public: - - PxMemStream(); - virtual ~PxMemStream(); - - void resetPosition(); - - // NxStream - NxU8 readByte() const; - NxU16 readWord() const; - NxU32 readDword() const; - float readFloat() const; - double readDouble() const; - void readBuffer( void *buffer, NxU32 size ) const; - NxStream& storeByte( NxU8 b ); - NxStream& storeWord( NxU16 w ); - NxStream& storeDword( NxU32 d ); - NxStream& storeFloat( NxReal f ); - NxStream& storeDouble( NxF64 f ); - NxStream& storeBuffer( const void* buffer, NxU32 size ); - -protected: - - mutable MemStream mMemStream; -}; - - -class PxConsoleStream : public NxUserOutputStream -{ -protected: - - // NxUserOutputStream - void reportError( NxErrorCode code, const char *message, const char* file, int line ); - NxAssertResponse reportAssertViolation( const char *message, const char *file, int line ); - void print( const char *message ); - -public: - - PxConsoleStream(); - ~PxConsoleStream(); -}; - -#endif // _T3D_PHYSICS_PXSTREAM_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxUtils.cpp b/Engine/source/T3D/physics/physx/pxUtils.cpp deleted file mode 100644 index 05671806f..000000000 --- a/Engine/source/T3D/physics/physx/pxUtils.cpp +++ /dev/null @@ -1,109 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physx/pxUtils.h" - -#include "gfx/gfxTransformSaver.h" -#include "gfx/gfxDrawUtil.h" -#include "math/mMatrix.h" -#include "math/mPoint3.h" -#include "T3D/physics/physX/px.h" -#include "T3D/physics/physX/pxCasts.h" - -namespace PxUtils { - -void drawActor( NxActor *inActor ) -{ - GFXDrawUtil *drawer = GFX->getDrawUtil(); - //drawer->setZRead( false ); - - // Determine alpha we render shapes with. - const U8 enabledAlpha = 255; - const U8 disabledAlpha = 100; - U8 renderAlpha = inActor->readActorFlag( NX_AF_DISABLE_COLLISION ) ? disabledAlpha : enabledAlpha; - - // Determine color we render actors and shapes with. - ColorI actorColor( 0, 0, 255, 200 ); - ColorI shapeColor = ( inActor->isSleeping() ? ColorI( 0, 0, 255, renderAlpha ) : ColorI( 255, 0, 255, renderAlpha ) ); - - MatrixF actorMat(true); - inActor->getGlobalPose().getRowMajor44( actorMat ); - - GFXStateBlockDesc desc; - desc.setBlend( true ); - desc.setZReadWrite( true, false ); - desc.setCullMode( GFXCullNone ); - - // Draw an xfm gizmo for the actor's globalPose... - //drawer->drawTransform( desc, actorMat, Point3F::One, actorColor ); - - // Loop through and render all the actor's shapes.... - - NxShape *const*pShapeArray = inActor->getShapes(); - U32 numShapes = inActor->getNbShapes(); - - for ( U32 i = 0; i < numShapes; i++ ) - { - const NxShape *shape = pShapeArray[i]; - - Point3F shapePos = pxCast( shape->getGlobalPosition() ); - MatrixF shapeMat(true); - shape->getGlobalPose().getRowMajor44(shapeMat); - shapeMat.setPosition( Point3F::Zero ); - - switch ( shape->getType() ) - { - case NX_SHAPE_SPHERE: - { - NxSphereShape *sphere = (NxSphereShape*)shape; - drawer->drawSphere( desc, sphere->getRadius(), shapePos, shapeColor ); - - break; - } - case NX_SHAPE_BOX: - { - NxBoxShape *box = (NxBoxShape*)shape; - Point3F size = pxCast( box->getDimensions() ); - drawer->drawCube( desc, size*2, shapePos, shapeColor, &shapeMat ); - break; - } - case NX_SHAPE_CAPSULE: - { - shapeMat.mul( MatrixF( EulerF( mDegToRad(90.0f), mDegToRad(90.0f), 0 ) ) ); - - NxCapsuleShape *capsule = (NxCapsuleShape*)shape; - drawer->drawCapsule( desc, shapePos, capsule->getRadius(), capsule->getHeight(), shapeColor, &shapeMat ); - - break; - } - default: - { - break; - } - } - } - - //drawer->clearZDefined(); -} - -} // namespace PxUtils \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxUtils.h b/Engine/source/T3D/physics/physx/pxUtils.h deleted file mode 100644 index 1c1d9873b..000000000 --- a/Engine/source/T3D/physics/physx/pxUtils.h +++ /dev/null @@ -1,38 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PXUTILS_H_ -#define _PXUTILS_H_ - - -class NxActor; - - -namespace PxUtils { - - /// Debug render an actor, loops through all shapes - /// and translates primitive types into drawUtil calls. - void drawActor( NxActor *inActor ); - -} // namespace PxUtils - -#endif // _PXUTILS_H_ \ No newline at end of file diff --git a/Engine/source/T3D/physics/physx/pxWorld.cpp b/Engine/source/T3D/physics/physx/pxWorld.cpp deleted file mode 100644 index 0ec3d7fea..000000000 --- a/Engine/source/T3D/physics/physx/pxWorld.cpp +++ /dev/null @@ -1,876 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#include "platform/platform.h" -#include "T3D/physics/physX/pxWorld.h" - -#include "T3D/physics/physX/px.h" -#include "T3D/physics/physX/pxPlugin.h" -#include "T3D/physics/physX/pxMaterial.h" -#include "T3D/physics/physX/pxContactReporter.h" -#include "T3D/physics/physX/pxStream.h" -#include "T3D/physics/physX/pxCasts.h" -#include "T3D/physics/physicsUserData.h" - -#include "core/stream/bitStream.h" -#include "platform/profiler.h" -#include "sim/netConnection.h" -#include "console/console.h" -#include "console/consoleTypes.h" -#include "core/util/safeDelete.h" -#include "T3D/tsstatic.h" -#include "T3D/gameBase/gameProcess.h" -#include "gfx/sim/debugDraw.h" -#include "gfx/primBuilder.h" - -#include - - -static const F32 PhysicsStepTime = (F32)TickMs / 1000.0f; -static const U32 PhysicsMaxIterations = 8; -static const F32 PhysicsMaxTimeStep = PhysicsStepTime / 2.0f; - -NxPhysicsSDK *gPhysicsSDK = NULL; -NxCookingInterface *PxWorld::smCooking = NULL; -PxConsoleStream *PxWorld::smConsoleStream = NULL; - - -PxWorld::PxWorld() : - mScene( NULL ), - mConactReporter( NULL ), - mProcessList( NULL ), - mIsSimulating( false ), - mErrorReport( false ), - mTickCount( 0 ), - mIsEnabled( false ), - mEditorTimeScale( 1.0f ) -{ - if ( !CCTAllocator::mAllocator ) - CCTAllocator::mAllocator = new NxUserAllocatorDefault(); - mControllerManager = new CharacterControllerManager( CCTAllocator::mAllocator ); -} - -PxWorld::~PxWorld() -{ - delete mControllerManager; -} - -NxCookingInterface* PxWorld::getCooking() -{ - if ( !smCooking ) - smCooking = NxGetCookingLib( NX_PHYSICS_SDK_VERSION ); - - return smCooking; -} - -bool PxWorld::_init( bool isServer, ProcessList *processList ) -{ - if ( !gPhysicsSDK ) - { - Con::errorf( "PhysXWorld::init - PhysXSDK not initialized!" ); - return false; - } - - // Create the scene description. - NxSceneDesc sceneDesc; - sceneDesc.userData = this; - - // Set up default gravity. - sceneDesc.gravity.set( mGravity.x, mGravity.y, mGravity.z ); - - // The master scene is always on the CPU and is used - // mostly for static shapes. - sceneDesc.simType = NX_SIMULATION_SW; // [9/28/2009 Pat] Why is this software? Should be software server, hardware client? - - // Threading... seems to improve performance. - // - // TODO: I was getting random crashes in debug when doing - // edit and continue... lets see if i still get them with - // the threading disabled. - // - sceneDesc.flags |= NX_SF_ENABLE_MULTITHREAD | NX_SF_DISABLE_SCENE_MUTEX; - sceneDesc.threadMask = 0xfffffffe; - sceneDesc.internalThreadCount = PHYSICSMGR->getThreadCount(); - - // Create the scene. - mScene = gPhysicsSDK->createScene(sceneDesc); - if ( !mScene ) - { - Con::errorf( "PhysXWorld - %s world createScene returned a null scene!", isServer ? "Server" : "Client" ); - return false; - } - - /* - // Make note of what we've created. - String simType = sceneDesc.simType == NX_SIMULATION_SW ? "software" : "hardware"; - String clientOrServer = this == isServer ? "server" : "client"; - Con::printf( "PhysXWorld::init() - Created %s %s simulation!", - clientOrServer.c_str(), - simType.c_str() ); - */ - - mScene->setTiming( PhysicsMaxTimeStep, PhysicsMaxIterations, NX_TIMESTEP_FIXED ); - - // TODO: Add dummy actor with scene name! - - // Set the global contact reporter. - - mConactReporter = new PxContactReporter(); - mScene->setUserContactReport( mConactReporter ); - - // Set the global PxUserNotify - - mUserNotify = new PxUserNotify(); - mScene->setUserNotify( mUserNotify ); - - // Now create the dynamic rigid body compartment which - // can reside on the hardware when hardware is present. - /* - NxCompartmentDesc compartmentDesc; - compartmentDesc.type = NX_SCT_RIGIDBODY; - compartmentDesc.deviceCode = NX_DC_PPU_AUTO_ASSIGN; - mRigidCompartment = mScene->createCompartment( compartmentDesc ); - if ( !mRigidCompartment ) - { - Con::errorf( "PhysXWorld - Creation of rigid body compartment failed!" ); - return false; - } - */ - - // Hook up the tick processing signals for advancing physics. - // - // First an overview of how physics and the game ticks - // interact with each other. - // - // In Torque you normally tick the server and then the client - // approximately every 32ms. So before the game tick we call - // getPhysicsResults() to get the new physics state and call - // tickPhysics() when the game tick is done to start processing - // the next physics state. This means PhysX is happily doing - // physics in a separate thread while we're doing rendering, - // sound, input, networking, etc. - // - // Because your frame rate is rarely perfectly even you can - // get cases where you may tick the server or the client - // several times in a row. This happens most often in debug - // mode, but can also happen in release. - // - // The simple implementation is to do a getPhysicsResults() and - // tickPhysics() for each tick. But this very bad! It forces - // immediate results from PhysX which blocks the primary thread - // and further slows down processing. It leads to slower and - // slower frame rates as the simulation is never able to catch - // up to the current tick. - // - // The trick is processing physics once for backlogged ticks - // with the total of the elapsed tick time. This is a huge - // performance gain and keeps you from blocking on PhysX. - // - // This does have a side effect that when it occurs you'll get - // ticks where the physics state hasn't advanced, but this beats - // single digit frame rates. - // - AssertFatal( processList, "PxWorld::init() - We need a process list to create the world!" ); - mProcessList = processList; - mProcessList->preTickSignal().notify( this, &PxWorld::getPhysicsResults ); - mProcessList->postTickSignal().notify( this, &PxWorld::tickPhysics, 1000.0f ); - - // Setup the default material. - NxMaterial *dmat = mScene->getMaterialFromIndex( 0 ); - dmat->setRestitution( 0.2f ); - dmat->setStaticFriction( 0.6f ); - dmat->setDynamicFriction( 0.4f ); - - // Setup dominance groups. - - // Group 31 is for debris and other objects which can be pushed but cannot push back. - // Group 0 is for everything else. - - NxConstraintDominance debrisDominance( 0.0f, 1.0f ); - mScene->setDominanceGroupPair( 0, 31, debrisDominance ); - - return true; -} - -void PxWorld::_destroy() -{ - // Make sure the simulation is stopped! - getPhysicsResults(); - _releaseQueues(); - - #ifdef TORQUE_DEBUG - - U32 actorCount = mScene->getNbActors(); - U32 jointCount = mScene->getNbJoints(); - - if ( actorCount != 0 || jointCount != 0 ) - { - // Dump the names of any actors or joints that - // were not released before the destruction of - // this scene. - - for ( U32 i=0; i < actorCount; i++ ) - { - const NxActor *actor = mScene->getActors()[i]; - Con::errorf( "Orphan NxActor - '%s'!", actor->getName() ); - } - - mScene->resetJointIterator(); - for ( ;; ) - { - const NxJoint *joint = mScene->getNextJoint(); - if ( !joint ) - break; - - Con::errorf( "Orphan NxJoint - '%s'!", joint->getName() ); - } - - AssertFatal( false, "PhysXWorld::_destroy() - Some actors and/or joints were not released!" ); - } - - #endif // TORQUE_DEBUG - - //NxCloseCooking(); - - // Release the tick processing signals. - if ( mProcessList ) - { - mProcessList->preTickSignal().remove( this, &PxWorld::getPhysicsResults ); - mProcessList->postTickSignal().remove( this, &PxWorld::tickPhysics ); - mProcessList = NULL; - } - - // Destroy the scene. - if ( mScene ) - { - // Delete the contact reporter. - mScene->setUserContactReport( NULL ); - SAFE_DELETE( mConactReporter ); - - // First shut down threads... this makes it - // safe to release the scene. - mScene->shutdownWorkerThreads(); - - // Release the scene. - gPhysicsSDK->releaseScene( *mScene ); - mScene = NULL; - } - - // Try to restart the sdk if we can. - //restartSDK(); -} - -bool PxWorld::restartSDK( bool destroyOnly, PxWorld *clientWorld, PxWorld *serverWorld ) -{ - // If either the client or the server still exist - // then we cannot reset the SDK. - if ( clientWorld || serverWorld ) - return false; - - // Destroy the existing SDK. - if ( gPhysicsSDK ) - { - NXU::releasePersistentMemory(); - gPhysicsSDK->release(); - gPhysicsSDK = NULL; - smCooking = NULL; - SAFE_DELETE( smConsoleStream ); - } - - // If we're not supposed to restart... return. - if ( destroyOnly ) - return true; - - smConsoleStream = new PxConsoleStream(); - - NxPhysicsSDKDesc sdkDesc; - sdkDesc.flags |= NX_SDKF_NO_HARDWARE; // [9/28/2009 Pat] Why is this disabled? - - NxSDKCreateError error; - gPhysicsSDK = NxCreatePhysicsSDK( NX_PHYSICS_SDK_VERSION, - NULL, - smConsoleStream, - sdkDesc, - &error ); - if ( !gPhysicsSDK ) - { - Con::errorf( "PhysX failed to initialize! Error code: %d", error ); - Platform::messageBox( Con::getVariable( "$appName" ), - avar("PhysX could not be started!\r\n" - "Please be sure you have the latest version of PhysX installed.\r\n" - "Error Code: %d", error), - MBOk, MIStop ); - Platform::forceShutdown( -1 ); - - // We shouldn't get here, but this shuts up - // source diagnostic tools. - return false; - } - - // Set the default skin width for all actors. - gPhysicsSDK->setParameter( NX_SKIN_WIDTH, 0.01f ); - - return true; -} - -void PxWorld::tickPhysics( U32 elapsedMs ) -{ - if ( !mScene || !mIsEnabled ) - return; - - // Did we forget to call getPhysicsResults somewhere? - AssertFatal( !mIsSimulating, "PhysXWorld::tickPhysics() - Already simulating!" ); - - // The elapsed time should be non-zero and - // a multiple of TickMs! - AssertFatal( elapsedMs != 0 && - ( elapsedMs % TickMs ) == 0 , "PhysXWorld::tickPhysics() - Got bad elapsed time!" ); - - PROFILE_SCOPE(PxWorld_TickPhysics); - - // Convert it to seconds. - const F32 elapsedSec = (F32)elapsedMs * 0.001f; - - // For some reason this gets reset all the time - // and it must be called before the simulate. - mScene->setFilterOps( NX_FILTEROP_OR, - NX_FILTEROP_OR, - NX_FILTEROP_AND ); - mScene->setFilterBool( false ); - NxGroupsMask zeroMask; - zeroMask.bits0=zeroMask.bits1=zeroMask.bits2=zeroMask.bits3=0; - mScene->setFilterConstant0( zeroMask ); - mScene->setFilterConstant1( zeroMask ); - - mScene->simulate( elapsedSec * mEditorTimeScale ); - mScene->flushStream(); - mIsSimulating = true; - - //Con::printf( "%s PhysXWorld::tickPhysics!", this == smClientWorld ? "Client" : "Server" ); -} - -void PxWorld::releaseWriteLocks() -{ - PxWorld *world = dynamic_cast( PHYSICSMGR->getWorld( "server" ) ); - - if ( world ) - world->releaseWriteLock(); - - world = dynamic_cast( PHYSICSMGR->getWorld( "client" ) ); - - if ( world ) - world->releaseWriteLock(); -} - -void PxWorld::releaseWriteLock() -{ - if ( !mScene || !mIsSimulating ) - return; - - PROFILE_SCOPE(PxWorld_ReleaseWriteLock); - - // We use checkResults here to release the write lock - // but we do not change the simulation flag or increment - // the tick count... we may have gotten results, but the - // simulation hasn't really ticked! - mScene->checkResults( NX_RIGID_BODY_FINISHED, true ); - AssertFatal( mScene->isWritable(), "PhysXWorld::releaseWriteLock() - We should have been writable now!" ); -} - -void PxWorld::getPhysicsResults() -{ - if ( !mScene || !mIsSimulating ) - return; - - PROFILE_SCOPE(PxWorld_GetPhysicsResults); - - // Get results from scene. - mScene->fetchResults( NX_RIGID_BODY_FINISHED, true ); - mIsSimulating = false; - mTickCount++; - - // Release any joints/actors that were waiting - // for the scene to become writable. - _releaseQueues(); - - //Con::printf( "%s PhysXWorld::getPhysicsResults!", this == smClientWorld ? "Client" : "Server" ); -} - -NxMaterial* PxWorld::createMaterial( NxMaterialDesc &material ) -{ - if ( !mScene ) - return NULL; - - // We need the writelock to create a material! - releaseWriteLock(); - - NxMaterial *mat = mScene->createMaterial( material ); - if ( !mat ) - return NULL; - - return mat; -} - -NxController* PxWorld::createController( NxControllerDesc &desc ) -{ - if ( !mScene ) - return NULL; - - // We need the writelock! - releaseWriteLock(); - - return mControllerManager->createController( mScene, desc ); -} - -void PxWorld::releaseActor( NxActor &actor ) -{ - AssertFatal( &actor.getScene() == mScene, "PhysXWorld::releaseActor() - Bad scene!" ); - - // Clear the userdata. - actor.userData = NULL; - - // actors are one of the few objects that are stable removing this way in physx 2.8 - if (mScene->isWritable() ) - { - mScene->releaseActor( actor ); - } - else - { - mReleaseActorQueue.push_back( &actor ); - } -} - -void PxWorld::releaseMaterial( NxMaterial &mat ) -{ - AssertFatal( &mat.getScene() == mScene, "PhysXWorld::releaseMaterial() - Bad scene!" ); - - // If the scene is not simulating then we have the - // write lock and can safely delete it now. - if ( !mIsSimulating ) - mScene->releaseMaterial( mat ); - else - mReleaseMaterialQueue.push_back( &mat ); -} - -void PxWorld::releaseHeightField( NxHeightField &heightfield ) -{ - // Always delay releasing a heightfield, for whatever reason, - // it causes lots of deadlock asserts if we do it here, even if - // the scene "says" its writable. - // - // Actually this is probably because a heightfield is owned by the "sdk" and - // not an individual scene so if either the client "or" server scene are - // simulating it asserts, thats just my theory. - - mReleaseHeightFieldQueue.push_back( &heightfield ); -} - -void PxWorld::releaseJoint( NxJoint &joint ) -{ - AssertFatal( &joint.getScene() == mScene, "PhysXWorld::releaseJoint() - Bad scene!" ); - - AssertFatal( !mReleaseJointQueue.contains( &joint ), - "PhysXWorld::releaseJoint() - Joint already exists in the release queue!" ); - - // Clear the userdata. - joint.userData = NULL; - - // If the scene is not simulating then we have the - // write lock and can safely delete it now. - if ( !mIsSimulating ) - mScene->releaseJoint( joint ); - else - mReleaseJointQueue.push_back( &joint ); -} - -void PxWorld::releaseCloth( NxCloth &cloth ) -{ - AssertFatal( &cloth.getScene() == mScene, "PhysXWorld::releaseCloth() - Bad scene!" ); - - // Clear the userdata. - cloth.userData = NULL; - - // If the scene is not simulating then we have the - // write lock and can safely delete it now. - if ( !mIsSimulating ) - mScene->releaseCloth( cloth ); - else - mReleaseClothQueue.push_back( &cloth ); -} - -void PxWorld::releaseFluid( NxFluid &fluid ) -{ - AssertFatal( &fluid.getScene() == mScene, "PhysXWorld::releaseFluid() - Bad scene!" ); - - // Clear the userdata. - fluid.userData = NULL; - - // If the scene is not simulating then we have the - // write lock and can safely delete it now. - if ( !mIsSimulating ) - mScene->releaseFluid( fluid ); - else - mReleaseFluidQueue.push_back( &fluid ); -} - -void PxWorld::releaseClothMesh( NxClothMesh &clothMesh ) -{ - // We need the writelock to release. - releaseWriteLock(); - - gPhysicsSDK->releaseClothMesh( clothMesh ); -} - -void PxWorld::releaseController( NxController &controller ) -{ - // TODO: This isn't safe to do with actors and - // joints, so we probably need a queue like we - // do for them. - - // We need the writelock to release. - releaseWriteLock(); - - mControllerManager->releaseController( controller ); -} - -void PxWorld::_releaseQueues() -{ - AssertFatal( mScene, "PhysXWorld::_releaseQueues() - The scene is null!" ); - - // We release joints still pending in the queue - // first as they depend on the actors. - for ( S32 i = 0; i < mReleaseJointQueue.size(); i++ ) - { - NxJoint *currJoint = mReleaseJointQueue[i]; - mScene->releaseJoint( *currJoint ); - } - - // All the joints should be released, clear the queue. - mReleaseJointQueue.clear(); - - // Now release any actors still pending in the queue. - bool staticChanged = false; - for ( S32 i = 0; i < mReleaseActorQueue.size(); i++ ) - { - NxActor *currActor = mReleaseActorQueue[i]; - staticChanged |= !currActor->isDynamic(); - mScene->releaseActor( *currActor ); - } - - // All the actors should be released, clear the queue. - mReleaseActorQueue.clear(); - - // Now release any materials still pending in the queue. - for ( S32 i = 0; i < mReleaseMaterialQueue.size(); i++ ) - { - NxMaterial *currMat = mReleaseMaterialQueue[i]; - mScene->releaseMaterial( *currMat ); - } - - // All the materials should be released, clear the queue. - mReleaseMaterialQueue.clear(); - - // Now release any cloth still pending in the queue. - for ( S32 i = 0; i < mReleaseClothQueue.size(); i++ ) - { - NxCloth *currCloth = mReleaseClothQueue[i]; - mScene->releaseCloth( *currCloth ); - } - - // All the actors should be released, clear the queue. - mReleaseClothQueue.clear(); - - // Release heightfields that don't still have references. - for ( S32 i = 0; i < mReleaseHeightFieldQueue.size(); i++ ) - { - NxHeightField *currHeightfield = mReleaseHeightFieldQueue[i]; - - if ( currHeightfield->getReferenceCount() == 0 ) - { - gPhysicsSDK->releaseHeightField( *currHeightfield ); - mReleaseHeightFieldQueue.erase_fast( i ); - i--; - } - } - - // Clear fluid queue - for ( S32 i = 0; i < mReleaseFluidQueue.size(); i++ ) - { - NxFluid *currFluid = mReleaseFluidQueue[i]; - mScene->releaseFluid( *currFluid ); - } - mReleaseFluidQueue.clear(); - - if ( staticChanged ) - mStaticChangedSignal.trigger(); -} - -void PxWorld::setEnabled( bool enabled ) -{ - mIsEnabled = enabled; - - if ( !mIsEnabled ) - getPhysicsResults(); -} - -bool PxWorld::initWorld( bool isServer, ProcessList *processList ) -{ - /* This stuff is handled outside. - PxWorld* world = PxWorld::getWorld( isServer ); - if ( world ) - { - Con::errorf( "PhysXWorld::initWorld - %s world already exists!", isServer ? "Server" : "Client" ); - return false; - } - */ - - if ( !_init( isServer, processList ) ) - return false; - - return true; -} - -void PxWorld::destroyWorld() -{ - //PxWorld* world = PxWorld::getWorld( serverWorld ); - /* - if ( !world ) - { - Con::errorf( "PhysXWorld::destroyWorld - %s world already destroyed!", serverWorld ? "Server" : "Client" ); - return; - } - */ - //world->_destroy(); - //delete world; - - _destroy(); -} - -bool PxWorld::castRay( const Point3F &startPnt, const Point3F &endPnt, RayInfo *ri, const Point3F &impulse ) -{ - NxRay worldRay; - worldRay.orig = pxCast( startPnt ); - worldRay.dir = pxCast( endPnt - startPnt ); - NxF32 maxDist = worldRay.dir.magnitude(); - worldRay.dir.normalize(); - - U32 groups = 0xffffffff; - groups &= ~( 1<<31 ); // No trigger shapes! - - NxRaycastHit hitInfo; - NxShape *hitShape = mScene->raycastClosestShape( worldRay, NX_ALL_SHAPES, hitInfo, groups, maxDist ); - - if ( !hitShape ) - return false; - - //if ( hitShape->userData != NULL ) - // return false; - - NxActor &actor = hitShape->getActor(); - PhysicsUserData *userData = PhysicsUserData::cast( actor.userData ); - - if ( ri ) - { - ri->object = ( userData != NULL ) ? userData->getObject() : NULL; - - // If we were passed a RayInfo, we can only return true signifying a collision - // if we hit an object that actually has a torque object associated with it. - // - // In some ways this could be considered an error, either a physx object - // has raycast-collision enabled that shouldn't or someone did not set - // an object in this actor's userData. - // - if ( ri->object == NULL ) - return false; - - ri->distance = hitInfo.distance; - ri->normal = pxCast( hitInfo.worldNormal ); - ri->point = pxCast( hitInfo.worldImpact ); - ri->t = maxDist / hitInfo.distance; - } - - if ( impulse.isZero() || - !actor.isDynamic() || - actor.readBodyFlag( NX_BF_KINEMATIC ) ) - return true; - - NxVec3 force = pxCast( impulse );//worldRay.dir * forceAmt; - actor.addForceAtPos( force, hitInfo.worldImpact, NX_IMPULSE ); - - return true; -} - -PhysicsBody* PxWorld::castRay( const Point3F &start, const Point3F &end, U32 bodyTypes ) -{ - NxRay worldRay; - worldRay.orig = pxCast( start ); - worldRay.dir = pxCast( end - start ); - F32 maxDist = worldRay.dir.normalize(); - - U32 groups = 0xFFFFFFFF; - if ( !( bodyTypes & BT_Player ) ) - groups &= ~( 1<<29 ); - - // TODO: For now always skip triggers and debris, - // but we should consider how game specifc this API - // should be in the future. - groups &= ~( 1<<31 ); // triggers - groups &= ~( 1<<30 ); // debris - - U32 shapesType = 0; - if ( bodyTypes & BT_Static ) - shapesType |= NX_STATIC_SHAPES; - if ( bodyTypes & BT_Dynamic ) - shapesType |= NX_DYNAMIC_SHAPES; - - NxRaycastHit hitInfo; - NxShape *hitShape = mScene->raycastClosestShape( worldRay, (NxShapesType)shapesType, hitInfo, groups, maxDist ); - if ( !hitShape ) - return NULL; - - NxActor &actor = hitShape->getActor(); - PhysicsUserData *userData = PhysicsUserData::cast( actor.userData ); - if ( !userData ) - return NULL; - - return userData->getBody(); -} - -void PxWorld::explosion( const Point3F &pos, F32 radius, F32 forceMagnitude ) -{ - // Find Actors at the position within the radius - // and apply force to them. - - NxVec3 nxPos = pxCast( pos ); - NxShape **shapes = (NxShape**)NxAlloca(10*sizeof(NxShape*)); - NxSphere worldSphere( nxPos, radius ); - - NxU32 numHits = mScene->overlapSphereShapes( worldSphere, NX_ALL_SHAPES, 10, shapes, NULL ); - - for ( NxU32 i = 0; i < numHits; i++ ) - { - NxActor &actor = shapes[i]->getActor(); - - bool dynamic = actor.isDynamic(); - - if ( !dynamic ) - continue; - - bool kinematic = actor.readBodyFlag( NX_BF_KINEMATIC ); - - if ( kinematic ) - continue; - - NxVec3 force = actor.getGlobalPosition() - nxPos; - force.normalize(); - force *= forceMagnitude; - - actor.addForceAtPos( force, nxPos, NX_IMPULSE, true ); - } -} - -static ColorI getDebugColor( NxU32 packed ) -{ - ColorI col; - col.blue = (packed)&0xff; - col.green = (packed>>8)&0xff; - col.red = (packed>>16)&0xff; - col.alpha = 255; - - return col; -} - -void PxWorld::onDebugDraw( const SceneRenderState *state ) -{ - if ( !mScene ) - return; - - // We need the write lock to be able to request - // the NxDebugRenderable object. - releaseWriteLock(); - - // TODO: We need to expose the different types of visualization - // options to script and add a GUI for toggling them! - - gPhysicsSDK->setParameter( NX_VISUALIZATION_SCALE, 1.0f ); - //gPhysicsSDK->setParameter( NX_VISUALIZE_BODY_MASS_AXES, 0.0f ); - gPhysicsSDK->setParameter( NX_VISUALIZE_BODY_AXES, 1.0f ); - gPhysicsSDK->setParameter( NX_VISUALIZE_COLLISION_SHAPES, 1.0f ); - - const NxDebugRenderable *data = mScene->getDebugRenderable(); - if ( !data ) - return; - - // Render points - { - NxU32 numPoints = data->getNbPoints(); - const NxDebugPoint *points = data->getPoints(); - - PrimBuild::begin( GFXPointList, numPoints ); - - while ( numPoints-- ) - { - PrimBuild::color( getDebugColor(points->color) ); - PrimBuild::vertex3fv( &points->p.x ); - points++; - } - - PrimBuild::end(); - } - - // Render lines - { - NxU32 numLines = data->getNbLines(); - const NxDebugLine *lines = data->getLines(); - - PrimBuild::begin( GFXLineList, numLines * 2 ); - - while ( numLines-- ) - { - PrimBuild::color( getDebugColor( lines->color ) ); - PrimBuild::vertex3fv( &lines->p0.x ); - PrimBuild::vertex3fv( &lines->p1.x ); - lines++; - } - - PrimBuild::end(); - } - - // Render triangles - { - NxU32 numTris = data->getNbTriangles(); - const NxDebugTriangle *triangles = data->getTriangles(); - - PrimBuild::begin( GFXTriangleList, numTris * 3 ); - - while ( numTris-- ) - { - PrimBuild::color( getDebugColor( triangles->color ) ); - PrimBuild::vertex3fv( &triangles->p0.x ); - PrimBuild::vertex3fv( &triangles->p1.x ); - PrimBuild::vertex3fv( &triangles->p2.x ); - triangles++; - } - - PrimBuild::end(); - } -} diff --git a/Engine/source/T3D/physics/physx/pxWorld.h b/Engine/source/T3D/physics/physx/pxWorld.h deleted file mode 100644 index d9d570336..000000000 --- a/Engine/source/T3D/physics/physx/pxWorld.h +++ /dev/null @@ -1,193 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _PHYSX_WORLD_H_ -#define _PHYSX_WORLD_H_ - -#ifndef _T3D_PHYSICS_PHYSICSWORLD_H_ -#include "T3D/physics/physicsWorld.h" -#endif -#ifndef _MMATH_H_ -#include "math/mMath.h" -#endif -#ifndef _PHYSX_H_ -#include "T3D/physics/physX/px.h" -#endif -#ifndef _TVECTOR_H_ -#include "core/util/tVector.h" -#endif - -class PxContactReporter; -class PxUserNotify; -class NxController; -class NxControllerDesc; -class ShapeBase; -class TSStatic; -class SceneObject; -class ProcessList; -class GameBase; -class CharacterControllerManager; -class PxConsoleStream; - - -class PxWorld : public PhysicsWorld -{ -protected: - - F32 mEditorTimeScale; - - Vector mReleaseClothQueue; - Vector mReleaseJointQueue; - Vector mReleaseActorQueue; - Vector mReleaseMaterialQueue; - Vector mReleaseHeightFieldQueue; - Vector mReleaseFluidQueue; - //Vector> mReleaseColQueue; - - Vector mCatchupQueue; - - PxContactReporter *mConactReporter; - - PxUserNotify *mUserNotify; - - NxScene *mScene; - - CharacterControllerManager *mControllerManager; - - bool mErrorReport; - - bool mIsEnabled; - - bool mIsSimulating; - - U32 mTickCount; - - ProcessList *mProcessList; - - bool _init( bool isServer, ProcessList *processList ); - - void _destroy(); - - void _releaseQueues(); - - void _updateScheduledStatics(); - - /// The mesh cooking interface which is loaded on first use. - /// @see getCooking - static NxCookingInterface *smCooking; - - /// The console stream for PhysX error reporting. - static PxConsoleStream *smConsoleStream; - -public: - - // PhysicWorld - virtual bool initWorld( bool isServer, ProcessList *processList ); - virtual void destroyWorld(); - virtual bool castRay( const Point3F &startPnt, const Point3F &endPnt, RayInfo *ri, const Point3F &impulse ); - virtual PhysicsBody* castRay( const Point3F &start, const Point3F &end, U32 bodyTypes = BT_All ); - virtual void explosion( const Point3F &pos, F32 radius, F32 forceMagnitude ); - virtual void onDebugDraw( const SceneRenderState *state ); - virtual void reset() {} - virtual bool isEnabled() const { return mIsEnabled; } - - /// @name Static Methods - /// @{ - - static bool restartSDK( bool destroyOnly = false, PxWorld *clientWorld = NULL, PxWorld *serverWorld = NULL ); - - static void releaseWriteLocks(); - - /// @} - - PxWorld(); - virtual ~PxWorld(); - -public: - - NxScene* getScene() { return mScene; } - - /// Returns the cooking interface. Will only return NULL - /// in the case of a missing or bad PhysX install. - static NxCookingInterface* getCooking(); - - U32 getTick() { return mTickCount; } - - void tickPhysics( U32 elapsedMs ); - - void getPhysicsResults(); - - //void enableCatchupMode( GameBase *obj ); - - bool isWritable() const { return !mIsSimulating; /* mScene->isWritable(); */ } - - void releaseWriteLock(); - - void setEnabled( bool enabled ); - bool getEnabled() const { return mIsEnabled; } - - NxMaterial* createMaterial( NxMaterialDesc &material ); - - /// - /// @see releaseController - NxController* createController( NxControllerDesc &desc ); - - //U16 setMaterial(NxMaterialDesc &material, U16 id); - - // NOTE: This is all a mess, but its a side effect of how - // PhysX works. Many objects cannot be deleted without write - // access to the scene. Worse some objects cannot be deleted - // until their owner objects are deleted first. - // - // For these reasons we have these methods to register objects to be - // released after the Scene has been ticked. - // - // Since there is no common base to PhysX objects we're stuck with - // this list of release methods. - // - - void releaseActor( NxActor &actor ); - - void releaseMaterial( NxMaterial &mat ); - - void releaseJoint( NxJoint &joint ); - - void releaseCloth( NxCloth &cloth ); - - void releaseClothMesh( NxClothMesh &clothMesh ); - - void releaseController( NxController &controller ); - - void releaseHeightField( NxHeightField &heightfield ); - - void releaseFluid( NxFluid &fluid ); - - //void releaseCol( PxCollision *col ); - - /// Returns the contact reporter for this scene. - PxContactReporter* getContactReporter() { return mConactReporter; } - - void setEditorTimeScale( F32 timeScale ) { mEditorTimeScale = timeScale; } - const F32 getEditorTimeScale() const { return mEditorTimeScale; } -}; - -#endif // _PHYSX_WORLD_H_ diff --git a/Engine/source/T3D/physics/physx3/px3Body.cpp b/Engine/source/T3D/physics/physx3/px3Body.cpp index 877e80af3..2d5fb46f7 100644 --- a/Engine/source/T3D/physics/physx3/px3Body.cpp +++ b/Engine/source/T3D/physics/physx3/px3Body.cpp @@ -417,6 +417,26 @@ void Px3Body::applyImpulse( const Point3F &origin, const Point3F &force ) } +void Px3Body::applyTorque( const Point3F &torque ) +{ + AssertFatal(mActor, "Px3Body::applyImpulse - The actor is null!"); + + mWorld->releaseWriteLock(); + physx::PxRigidDynamic *actor = mActor->is(); + if (mIsEnabled && isDynamic()) + actor->addTorque( px3Cast(torque), physx::PxForceMode::eFORCE, true); +} + +void Px3Body::applyForce( const Point3F &force ) +{ + AssertFatal(mActor, "Px3Body::applyTorque - The actor is null!"); + + mWorld->releaseWriteLock(); + physx::PxRigidDynamic *actor = mActor->is(); + if (mIsEnabled && isDynamic()) + actor->addForce( px3Cast(force), physx::PxForceMode::eFORCE, true); +} + void Px3Body::findContact(SceneObject **contactObject, VectorF *contactNormal, Vector *outOverlapObjects) const diff --git a/Engine/source/T3D/physics/physx3/px3Body.h b/Engine/source/T3D/physics/physx3/px3Body.h index 29b90f343..7873293bc 100644 --- a/Engine/source/T3D/physics/physx3/px3Body.h +++ b/Engine/source/T3D/physics/physx3/px3Body.h @@ -117,7 +117,8 @@ public: F32 staticFriction ); virtual void applyCorrection( const MatrixF &xfm ); virtual void applyImpulse( const Point3F &origin, const Point3F &force ); - + virtual void applyTorque( const Point3F &torque ); + virtual void applyForce( const Point3F &force ); virtual void findContact(SceneObject **contactObject, VectorF *contactNormal, Vector *outOverlapObjects) const; virtual void moveKinematicTo(const MatrixF &xfm); diff --git a/Engine/source/T3D/physics/physx3/px3World.cpp b/Engine/source/T3D/physics/physx3/px3World.cpp index ca5be2302..026d77832 100644 --- a/Engine/source/T3D/physics/physx3/px3World.cpp +++ b/Engine/source/T3D/physics/physx3/px3World.cpp @@ -50,9 +50,6 @@ physx::PxDefaultCpuDispatcher* Px3World::smCpuDispatcher=NULL; Px3ConsoleStream* Px3World::smErrorCallback = NULL; physx::PxVisualDebuggerConnection* Px3World::smPvdConnection=NULL; physx::PxDefaultAllocator Px3World::smMemoryAlloc; -//Physics timing -F32 Px3World::smPhysicsStepTime = 1.0f/(F32)TickMs; -U32 Px3World::smPhysicsMaxIterations = 4; Px3World::Px3World(): mScene( NULL ), mProcessList( NULL ), @@ -63,7 +60,8 @@ Px3World::Px3World(): mScene( NULL ), mEditorTimeScale( 1.0f ), mAccumulator( 0 ), mControllerManager(NULL), - mIsSceneLocked(false) + mIsSceneLocked(false), + mRenderBuffer(NULL) { } @@ -76,12 +74,6 @@ physx::PxCooking *Px3World::getCooking() return smCooking; } -void Px3World::setTiming(F32 stepTime,U32 maxIterations) -{ - smPhysicsStepTime = stepTime; - smPhysicsMaxIterations = maxIterations; -} - bool Px3World::restartSDK( bool destroyOnly, Px3World *clientWorld, Px3World *serverWorld) { // If either the client or the server still exist @@ -177,6 +169,8 @@ void Px3World::destroyWorld() { getPhysicsResults(); + mRenderBuffer = NULL; + // Release the tick processing signals. if ( mProcessList ) { @@ -223,13 +217,14 @@ bool Px3World::initWorld( bool isServer, ProcessList *processList ) sceneDesc.cpuDispatcher = smCpuDispatcher; Con::printf("PhysX3 using Cpu: %d workers", smCpuDispatcher->getWorkerCount()); } - sceneDesc.flags |= physx::PxSceneFlag::eENABLE_CCD; sceneDesc.flags |= physx::PxSceneFlag::eENABLE_ACTIVETRANSFORMS; sceneDesc.filterShader = physx::PxDefaultSimulationFilterShader; mScene = gPhysics3SDK->createScene(sceneDesc); + //cache renderbuffer for use with debug drawing + mRenderBuffer = const_cast(&mScene->getRenderBuffer()); physx::PxDominanceGroupPair debrisDominance( 0.0f, 1.0f ); mScene->setDominanceGroupPair(0,31,debrisDominance); @@ -246,20 +241,20 @@ bool Px3World::initWorld( bool isServer, ProcessList *processList ) // Most of this borrowed from bullet physics library, see btDiscreteDynamicsWorld.cpp bool Px3World::_simulate(const F32 dt) { - int numSimulationSubSteps = 0; + S32 numSimulationSubSteps = 0; //fixed timestep with interpolation mAccumulator += dt; if (mAccumulator >= smPhysicsStepTime) { - numSimulationSubSteps = int(mAccumulator / smPhysicsStepTime); + numSimulationSubSteps = S32(mAccumulator / smPhysicsStepTime); mAccumulator -= numSimulationSubSteps * smPhysicsStepTime; } if (numSimulationSubSteps) { //clamp the number of substeps, to prevent simulation grinding spiralling down to a halt - int clampedSimulationSteps = (numSimulationSubSteps > smPhysicsMaxIterations)? smPhysicsMaxIterations : numSimulationSubSteps; + S32 clampedSimulationSteps = (numSimulationSubSteps > smPhysicsMaxSubSteps)? smPhysicsMaxSubSteps : numSimulationSubSteps; - for (int i=0;ifetchResults(true); mScene->simulate(smPhysicsStepTime); @@ -548,22 +543,17 @@ static ColorI getDebugColor( physx::PxU32 packed ) void Px3World::onDebugDraw( const SceneRenderState *state ) { - if ( !mScene ) + if ( !mScene || !mRenderBuffer ) return; mScene->setVisualizationParameter(physx::PxVisualizationParameter::eSCALE,1.0f); mScene->setVisualizationParameter(physx::PxVisualizationParameter::eBODY_AXES,1.0f); mScene->setVisualizationParameter(physx::PxVisualizationParameter::eCOLLISION_SHAPES,1.0f); - const physx::PxRenderBuffer *renderBuffer = &mScene->getRenderBuffer(); - - if(!renderBuffer) - return; - // Render points { - physx::PxU32 numPoints = renderBuffer->getNbPoints(); - const physx::PxDebugPoint *points = renderBuffer->getPoints(); + physx::PxU32 numPoints = mRenderBuffer->getNbPoints(); + const physx::PxDebugPoint *points = mRenderBuffer->getPoints(); PrimBuild::begin( GFXPointList, numPoints ); @@ -579,8 +569,8 @@ void Px3World::onDebugDraw( const SceneRenderState *state ) // Render lines { - physx::PxU32 numLines = renderBuffer->getNbLines(); - const physx::PxDebugLine *lines = renderBuffer->getLines(); + physx::PxU32 numLines = mRenderBuffer->getNbLines(); + const physx::PxDebugLine *lines = mRenderBuffer->getLines(); PrimBuild::begin( GFXLineList, numLines * 2 ); @@ -598,8 +588,8 @@ void Px3World::onDebugDraw( const SceneRenderState *state ) // Render triangles { - physx::PxU32 numTris = renderBuffer->getNbTriangles(); - const physx::PxDebugTriangle *triangles = renderBuffer->getTriangles(); + physx::PxU32 numTris = mRenderBuffer->getNbTriangles(); + const physx::PxDebugTriangle *triangles = mRenderBuffer->getTriangles(); PrimBuild::begin( GFXTriangleList, numTris * 3 ); @@ -618,8 +608,3 @@ void Px3World::onDebugDraw( const SceneRenderState *state ) } } -//set simulation timing via script -DefineEngineFunction( physx3SetSimulationTiming, void, ( F32 stepTime, U32 maxSteps ),, "Set simulation timing of the PhysX 3 plugin" ) -{ - Px3World::setTiming(stepTime,maxSteps); -} diff --git a/Engine/source/T3D/physics/physx3/px3World.h b/Engine/source/T3D/physics/physx3/px3World.h index 9556aac4b..72e67ddb9 100644 --- a/Engine/source/T3D/physics/physx3/px3World.h +++ b/Engine/source/T3D/physics/physx3/px3World.h @@ -61,6 +61,7 @@ protected: ProcessList *mProcessList; F32 mEditorTimeScale; bool mErrorReport; + physx::PxRenderBuffer *mRenderBuffer; physx::PxControllerManager* mControllerManager; static Px3ConsoleStream *smErrorCallback; static physx::PxDefaultAllocator smMemoryAlloc; @@ -69,8 +70,6 @@ protected: static physx::PxProfileZoneManager* smProfileZoneManager; static physx::PxDefaultCpuDispatcher* smCpuDispatcher; static physx::PxVisualDebuggerConnection* smPvdConnection; - static F32 smPhysicsStepTime; - static U32 smPhysicsMaxIterations; F32 mAccumulator; bool _simulate(const F32 dt); @@ -103,7 +102,6 @@ public: static bool restartSDK( bool destroyOnly = false, Px3World *clientWorld = NULL, Px3World *serverWorld = NULL ); static void releaseWriteLocks(); static physx::PxCooking *getCooking(); - static void setTiming(F32 stepTime,U32 maxIterations); static void lockScenes(); static void unlockScenes(); }; diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp index 0730d6bf0..916a64c39 100644 --- a/Engine/source/T3D/player.cpp +++ b/Engine/source/T3D/player.cpp @@ -257,15 +257,15 @@ PlayerData::PlayerData() firstPersonShadows = false; // Used for third person image rendering - imageAnimPrefix = StringTable->insert(""); + imageAnimPrefix = StringTable->EmptyString(); allowImageStateAnimation = false; // Used for first person image rendering - imageAnimPrefixFP = StringTable->insert(""); + imageAnimPrefixFP = StringTable->EmptyString(); for (U32 i=0; iinsert(""); + shapeNameFP[i] = StringTable->EmptyString(); mCRCFP[i] = 0; mValidShapeFP[i] = false; } @@ -418,7 +418,7 @@ PlayerData::PlayerData() jumpTowardsNormal = true; - physicsPlayerType = StringTable->insert(""); + physicsPlayerType = StringTable->EmptyString(); dMemset( actionList, 0, sizeof(actionList) ); } @@ -3930,9 +3930,9 @@ void Player::updateActionThread() if (mMountPending) mMountPending = (isMounted() ? 0 : (mMountPending - 1)); - if (mActionAnimation.action == PlayerData::NullAnimation || - ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd)) && - !mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0) + if ((mActionAnimation.action == PlayerData::NullAnimation) || + ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) && + (!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0))) { //The scripting language will get a call back when a script animation has finished... // example: When the chat menu animations are done playing... @@ -6652,7 +6652,7 @@ DefineEngineMethod( Player, setActionThread, bool, ( const char* name, bool hold "@tsexample\n" "// Place the player in a sitting position after being mounted\n" "%player.setActionThread( \"sitting\", true, true );\n" - "@endtsexample\n") + "@endtsexample\n") { return object->setActionThread( name, hold, true, fsp); } @@ -6700,11 +6700,11 @@ DefineEngineMethod( Player, clearControlObject, void, (),, "Returns control to the player. This internally calls " "Player::setControlObject(0).\n" "@tsexample\n" - "%player.clearControlObject();\n" + "%player.clearControlObject();\n" "echo(%player.getControlObject()); //<-- Returns 0, player assumes control\n" "%player.setControlObject(%vehicle);\n" "echo(%player.getControlObject()); //<-- Returns %vehicle, player controls the vehicle now.\n" - "@endtsexample\n" + "@endtsexample\n" "@note If the player does not have a control object, the player will receive all moves " "from its GameConnection. If you're looking to remove control from the player itself " "(i.e. stop sending moves to the player) use GameConnection::setControlObject() to transfer " @@ -6762,63 +6762,63 @@ void Player::consoleInit() "@brief Determines if the player is rendered or not.\n\n" "Used on the client side to disable the rendering of all Player objects. This is " "mainly for the tools or debugging.\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::renderMyItems",TypeBool, &sRenderMyItems, "@brief Determines if mounted shapes are rendered or not.\n\n" "Used on the client side to disable the rendering of all Player mounted objects. This is " "mainly used for the tools or debugging.\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::renderCollision", TypeBool, &sRenderPlayerCollision, "@brief Determines if the player's collision mesh should be rendered.\n\n" "This is mainly used for the tools and debugging.\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::minWarpTicks",TypeF32,&sMinWarpTicks, "@brief Fraction of tick at which instant warp occures on the client.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::maxWarpTicks",TypeS32,&sMaxWarpTicks, "@brief When a warp needs to occur due to the client being too far off from the server, this is the " "maximum number of ticks we'll allow the client to warp to catch up.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::maxPredictionTicks",TypeS32,&sMaxPredictionTicks, "@brief Maximum number of ticks to predict on the client from the last known move obtained from the server.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::maxImpulseVelocity", TypeF32, &sMaxImpulseVelocity, "@brief The maximum velocity allowed due to a single impulse.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); // Move triggers Con::addVariable("$player::jumpTrigger", TypeS32, &sJumpTrigger, "@brief The move trigger index used for player jumping.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::crouchTrigger", TypeS32, &sCrouchTrigger, "@brief The move trigger index used for player crouching.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::proneTrigger", TypeS32, &sProneTrigger, "@brief The move trigger index used for player prone pose.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::sprintTrigger", TypeS32, &sSprintTrigger, "@brief The move trigger index used for player sprinting.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::imageTrigger0", TypeS32, &sImageTrigger0, "@brief The move trigger index used to trigger mounted image 0.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::imageTrigger1", TypeS32, &sImageTrigger1, "@brief The move trigger index used to trigger mounted image 1 or alternate fire " "on mounted image 0.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::jumpJetTrigger", TypeS32, &sJumpJetTrigger, "@brief The move trigger index used for player jump jetting.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); Con::addVariable("$player::vehicleDismountTrigger", TypeS32, &sVehicleDismountTrigger, "@brief The move trigger index used to dismount player.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); // ExtendedMove support Con::addVariable("$player::extendedMoveHeadPosRotIndex", TypeS32, &smExtendedMoveHeadPosRotIndex, "@brief The ExtendedMove position/rotation index used for head movements.\n\n" - "@ingroup GameObjects\n"); + "@ingroup GameObjects\n"); } //-------------------------------------------------------------------------- diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp index 41b657dad..1a119933e 100644 --- a/Engine/source/T3D/shapeBase.cpp +++ b/Engine/source/T3D/shapeBase.cpp @@ -152,13 +152,13 @@ ShapeBaseData::ShapeBaseData() shadowMaxVisibleDistance( 80.0f ), shadowProjectionDistance( 10.0f ), shadowSphereAdjust( 1.0f ), - shapeName( StringTable->insert("") ), - cloakTexName( StringTable->insert("") ), + shapeName( StringTable->EmptyString() ), + cloakTexName( StringTable->EmptyString() ), cubeDescId( 0 ), reflectorDesc( NULL ), debris( NULL ), debrisID( 0 ), - debrisShapeName( StringTable->insert("") ), + debrisShapeName( StringTable->EmptyString() ), explosion( NULL ), explosionID( 0 ), underwaterExplosion( NULL ), @@ -447,12 +447,12 @@ bool ShapeBaseData::_setMass( void* object, const char* index, const char* data { ShapeBaseData* shape = reinterpret_cast< ShapeBaseData* >( object ); - F32 mass = dAtof(data); + F32 mass = dAtof(data); - if (mass <= 0) - mass = 0.01f; + if (mass <= 0) + mass = 0.01f; - shape->mass = mass; + shape->mass = mass; return false; } @@ -936,8 +936,8 @@ ShapeBase::ShapeBase() mScriptThread[i].thread = 0; mScriptThread[i].state = Thread::Stop; mScriptThread[i].atEnd = false; - mScriptThread[i].timescale = 1.f; - mScriptThread[i].position = -1.f; + mScriptThread[i].timescale = 1.f; + mScriptThread[i].position = -1.f; } for (i = 0; i < MaxTriggerKeys; i++) @@ -1043,7 +1043,7 @@ bool ShapeBase::onAdd() } /* - if(mDataBlock->cloakTexName != StringTable->insert("")) + if(mDataBlock->cloakTexName != StringTable->EmptyString()) mCloakTexture = TextureHandle(mDataBlock->cloakTexName, MeshTexture, false); */ // Accumulation and environment mapping @@ -1513,8 +1513,8 @@ void ShapeBase::onCameraScopeQuery(NetConnection *cr, CameraScopeQuery * query) eyeTransform.getColumn(1, &query->orientation); // Get the visible distance. - if (getSceneManager() != NULL) - query->visibleDistance = getSceneManager()->getVisibleDistance(); + if (getSceneManager() != NULL) + query->visibleDistance = getSceneManager()->getVisibleDistance(); Parent::onCameraScopeQuery( cr, query ); } @@ -2155,18 +2155,18 @@ void ShapeBase::updateAudioPos() const char *ShapeBase::getThreadSequenceName( U32 slot ) { - Thread& st = mScriptThread[slot]; - if ( st.sequence == -1 ) - { - // Invalid Animation. - return ""; - } + Thread& st = mScriptThread[slot]; + if ( st.sequence == -1 ) + { + // Invalid Animation. + return ""; + } - // Name Index - const U32 nameIndex = getShape()->sequences[st.sequence].nameIndex; + // Name Index + const U32 nameIndex = getShape()->sequences[st.sequence].nameIndex; - // Return Name. - return getShape()->getName( nameIndex ); + // Return Name. + return getShape()->getName( nameIndex ); } bool ShapeBase::setThreadSequence(U32 slot, S32 seq, bool reset) @@ -2201,39 +2201,39 @@ bool ShapeBase::setThreadSequence(U32 slot, S32 seq, bool reset) void ShapeBase::updateThread(Thread& st) { - switch (st.state) - { - case Thread::Stop: - { - mShapeInstance->setTimeScale( st.thread, 1.f ); - mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f ); - } // Drop through to pause state + switch (st.state) + { + case Thread::Stop: + { + mShapeInstance->setTimeScale( st.thread, 1.f ); + mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f ); + } // Drop through to pause state - case Thread::Pause: - { - mShapeInstance->setTimeScale( st.thread, 0.f ); - } break; + case Thread::Pause: + { + mShapeInstance->setTimeScale( st.thread, 0.f ); + } break; - case Thread::Play: - { - if (st.atEnd) - { - mShapeInstance->setTimeScale(st.thread,1); - mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f ); - mShapeInstance->setTimeScale(st.thread,0); + case Thread::Play: + { + if (st.atEnd) + { + mShapeInstance->setTimeScale(st.thread,1); + mShapeInstance->setPos( st.thread, ( st.timescale > 0.f ) ? 1.0f : 0.0f ); + mShapeInstance->setTimeScale(st.thread,0); st.state = Thread::Stop; - } - else - { - if ( st.position != -1.f ) - { - mShapeInstance->setTimeScale( st.thread, 1.f ); - mShapeInstance->setPos( st.thread, st.position ); - } + } + else + { + if ( st.position != -1.f ) + { + mShapeInstance->setTimeScale( st.thread, 1.f ); + mShapeInstance->setPos( st.thread, st.position ); + } - mShapeInstance->setTimeScale(st.thread, st.timescale ); - } - } break; + mShapeInstance->setTimeScale(st.thread, st.timescale ); + } + } break; case Thread::Destroy: { @@ -2245,7 +2245,7 @@ void ShapeBase::updateThread(Thread& st) st.thread = 0; } } break; - } + } } bool ShapeBase::stopThread(U32 slot) @@ -2298,50 +2298,50 @@ bool ShapeBase::playThread(U32 slot) bool ShapeBase::setThreadPosition( U32 slot, F32 pos ) { - Thread& st = mScriptThread[slot]; - if (st.sequence != -1) - { - setMaskBits(ThreadMaskN << slot); - st.position = pos; - st.atEnd = false; - updateThread(st); + Thread& st = mScriptThread[slot]; + if (st.sequence != -1) + { + setMaskBits(ThreadMaskN << slot); + st.position = pos; + st.atEnd = false; + updateThread(st); - return true; - } - return false; + return true; + } + return false; } bool ShapeBase::setThreadDir(U32 slot,bool forward) { - Thread& st = mScriptThread[slot]; - if (st.sequence != -1) - { - if ( ( st.timescale >= 0.f ) != forward ) - { - setMaskBits(ThreadMaskN << slot); - st.timescale *= -1.f ; - st.atEnd = false; - updateThread(st); - } - return true; - } - return false; + Thread& st = mScriptThread[slot]; + if (st.sequence != -1) + { + if ( ( st.timescale >= 0.f ) != forward ) + { + setMaskBits(ThreadMaskN << slot); + st.timescale *= -1.f ; + st.atEnd = false; + updateThread(st); + } + return true; + } + return false; } bool ShapeBase::setThreadTimeScale( U32 slot, F32 timeScale ) { - Thread& st = mScriptThread[slot]; - if (st.sequence != -1) - { - if (st.timescale != timeScale) - { - setMaskBits(ThreadMaskN << slot); - st.timescale = timeScale; - updateThread(st); - } - return true; - } - return false; + Thread& st = mScriptThread[slot]; + if (st.sequence != -1) + { + if (st.timescale != timeScale) + { + setMaskBits(ThreadMaskN << slot); + st.timescale = timeScale; + updateThread(st); + } + return true; + } + return false; } void ShapeBase::advanceThreads(F32 dt) @@ -2350,7 +2350,7 @@ void ShapeBase::advanceThreads(F32 dt) Thread& st = mScriptThread[i]; if (st.thread) { if (!mShapeInstance->getShape()->sequences[st.sequence].isCyclic() && !st.atEnd && - ( ( st.timescale > 0.f )? mShapeInstance->getPos(st.thread) >= 1.0: + ( ( st.timescale > 0.f )? mShapeInstance->getPos(st.thread) >= 1.0: mShapeInstance->getPos(st.thread) <= 0)) { st.atEnd = true; updateThread(st); @@ -4434,7 +4434,7 @@ DefineEngineMethod( ShapeBase, isEnabled, bool, (),, DefineEngineMethod(ShapeBase, blowUp, void, (),, "@brief Explodes an object into pieces.") { - object->blowUp(); + object->blowUp(); } DefineEngineMethod( ShapeBase, applyDamage, void, ( F32 amount ),, @@ -4738,22 +4738,22 @@ void ShapeBase::consoleInit() "@see ShapeBase::setDamageFlash()\n" "@see ShapeBase::getDamageFlash()\n" "@note Relies on the flash postFx.\n" - "@ingroup gameObjects\n"); + "@ingroup gameObjects\n"); Con::addVariable("SB::WODec", TypeF32, &sWhiteoutDec, "Speed to reduce the whiteout effect per tick.\n\n" "@see ShapeBase::setWhiteOut()\n" "@see ShapeBase::getWhiteOut" "@note Relies on the flash postFx.\n" - "@ingroup gameObjects\n"); + "@ingroup gameObjects\n"); Con::addVariable("SB::FullCorrectionDistance", TypeF32, &sFullCorrectionDistance, "@brief Distance at which a weapon's muzzle vector is fully corrected to match where the player is looking.\n\n" "When a weapon image has correctMuzzleVector set and the Player is in 1st person, the muzzle vector from the " "weapon is modified to match where the player is looking. Beyond the FullCorrectionDistance the muzzle vector " "is always corrected. Between FullCorrectionDistance and the player, the weapon's muzzle vector is adjusted so that " "the closer the aim point is to the player, the closer the muzzle vector is to the true (non-corrected) one.\n" - "@ingroup gameObjects\n"); + "@ingroup gameObjects\n"); Con::addVariable("SB::CloakSpeed", TypeF32, &sCloakSpeed, "@brief Time to cloak, in seconds.\n\n" - "@ingroup gameObjects\n"); + "@ingroup gameObjects\n"); } void ShapeBase::_updateHiddenMeshes() @@ -4874,17 +4874,17 @@ DefineEngineMethod( ShapeBase, getTargetName, const char*, ( S32 index ),, "@see getTargetCount()\n") { - ShapeBase *obj = dynamic_cast< ShapeBase* > ( object ); - if(obj) - { - // Try to use the client object (so we get the reskinned targets in the Material Editor) - if ((ShapeBase*)obj->getClientObject()) - obj = (ShapeBase*)obj->getClientObject(); + ShapeBase *obj = dynamic_cast< ShapeBase* > ( object ); + if(obj) + { + // Try to use the client object (so we get the reskinned targets in the Material Editor) + if ((ShapeBase*)obj->getClientObject()) + obj = (ShapeBase*)obj->getClientObject(); - return obj->getShapeInstance()->getTargetName(index); - } + return obj->getShapeInstance()->getTargetName(index); + } - return ""; + return ""; } DefineEngineMethod( ShapeBase, getTargetCount, S32, (),, @@ -4903,7 +4903,7 @@ DefineEngineMethod( ShapeBase, getTargetCount, S32, (),, if (obj->getShapeInstance() != NULL) return obj->getShapeInstance()->getTargetCount(); - } + } return -1; } @@ -4980,11 +4980,11 @@ DefineEngineMethod( ShapeBase, getModelFile, const char *, (),, "@return the shape filename\n\n" ) { - GameBaseData * datablock = object->getDataBlock(); - if( !datablock ) - return String::EmptyString; + GameBaseData * datablock = object->getDataBlock(); + if( !datablock ) + return String::EmptyString; - const char *fieldName = StringTable->insert( String("shapeFile") ); + const char *fieldName = StringTable->insert( String("shapeFile") ); return datablock->getDataField( fieldName, NULL ); } diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp index e19132206..1a0af325a 100644 --- a/Engine/source/T3D/shapeImage.cpp +++ b/Engine/source/T3D/shapeImage.cpp @@ -189,7 +189,7 @@ ShapeBaseImageData::ShapeBaseImageData() lightRadius = 10.f; lightBrightness = 1.0f; - shapeName = ""; + shapeName = "core/art/shapes/noshape.dts"; shapeNameFP = ""; imageAnimPrefix = ""; imageAnimPrefixFP = ""; @@ -2638,7 +2638,7 @@ void ShapeBase::setImageState(U32 imageSlot, U32 newState,bool force) F32 randomPos = Platform::getRandom(); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.animThread[i] && image.state->sequence[i] != -1 && image.state->flashSequence[i]) { @@ -2779,7 +2779,7 @@ void ShapeBase::setImageState(U32 imageSlot, U32 newState,bool force) updateAnimThread(imageSlot, imageShapeIndex, lastState); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; // Start spin thread @@ -2834,7 +2834,7 @@ void ShapeBase::updateAnimThread(U32 imageSlot, S32 imageShapeIndex, ShapeBaseIm F32 randomPos = Platform::getRandom(); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.animThread[i] && stateData.sequence[i] != -1) @@ -3076,7 +3076,7 @@ TICKAGAIN: U32 imageShapeIndex = getImageShapeIndex(image); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.spinThread[i]) @@ -3131,7 +3131,7 @@ void ShapeBase::updateImageAnimation(U32 imageSlot, F32 dt) // Advance animation threads for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.ambientThread[i]) diff --git a/Engine/source/T3D/staticShape.cpp b/Engine/source/T3D/staticShape.cpp index d3cef2525..c48a96aa1 100644 --- a/Engine/source/T3D/staticShape.cpp +++ b/Engine/source/T3D/staticShape.cpp @@ -251,14 +251,14 @@ void StaticShape::onUnmount(SceneObject*,S32) U32 StaticShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bstream) { - U32 retMask = Parent::packUpdate(connection, mask, bstream); - if (bstream->writeFlag(mask & PositionMask | ExtendedInfoMask)) + U32 retMask = Parent::packUpdate(connection,mask,bstream); + if (bstream->writeFlag(mask & (PositionMask | ExtendedInfoMask))) { // Write the transform (do _not_ use writeAffineTransform. Since this is a static // object, the transform must be RIGHT THE *&)*$&^ ON or it will goof up the // synchronization between the client and the server. - mathWrite(*bstream, mObjToWorld); + mathWrite(*bstream,mObjToWorld); mathWrite(*bstream, mObjScale); } @@ -275,11 +275,11 @@ U32 StaticShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bstr void StaticShape::unpackUpdate(NetConnection *connection, BitStream *bstream) { - Parent::unpackUpdate(connection, bstream); + Parent::unpackUpdate(connection,bstream); if (bstream->readFlag()) { MatrixF mat; - mathRead(*bstream, &mat); + mathRead(*bstream,&mat); Parent::setTransform(mat); Parent::setRenderTransform(mat); @@ -302,7 +302,7 @@ void StaticShape::unpackUpdate(NetConnection *connection, BitStream *bstream) // This appears to be legacy T2 stuff // Marked internal, as this is flagged to be deleted // [8/1/2010 mperry] -DefineConsoleMethod(StaticShape, setPoweredState, void, (bool isPowered), , "(bool isPowered)" +DefineConsoleMethod( StaticShape, setPoweredState, void, (bool isPowered), , "(bool isPowered)" "@internal") { if(!object->isServerObject()) @@ -310,7 +310,7 @@ DefineConsoleMethod(StaticShape, setPoweredState, void, (bool isPowered), , "(bo object->setPowered(isPowered); } -DefineConsoleMethod(StaticShape, getPoweredState, bool, (), , "@internal") +DefineConsoleMethod( StaticShape, getPoweredState, bool, (), , "@internal") { if(!object->isServerObject()) return(false); diff --git a/Engine/source/T3D/tsStatic.cpp b/Engine/source/T3D/tsStatic.cpp index db9e89412..c38284a29 100644 --- a/Engine/source/T3D/tsStatic.cpp +++ b/Engine/source/T3D/tsStatic.cpp @@ -1256,7 +1256,7 @@ DefineEngineMethod( TSStatic, getTargetCount, S32,(),, // This method is able to change materials per map to with others. The material that is being replaced is being mapped to // unmapped_mat as a part of this transition -DefineEngineMethod( TSStatic, changeMaterial, void, ( const char* mapTo, Material* oldMat, Material* newMat ),("",NULL,NULL), +DefineEngineMethod( TSStatic, changeMaterial, void, ( const char* mapTo, Material* oldMat, Material* newMat ),("",nullAsType(),nullAsType()), "@brief Change one of the materials on the shape.\n\n" "This method changes materials per mapTo with others. The material that " @@ -1323,4 +1323,4 @@ DefineEngineMethod( TSStatic, getModelFile, const char *, (),, ) { return object->getShapeFileName(); -} \ No newline at end of file +} diff --git a/Engine/source/T3D/turret/aiTurretShape.cpp b/Engine/source/T3D/turret/aiTurretShape.cpp index 688cf8fb6..030526f0a 100644 --- a/Engine/source/T3D/turret/aiTurretShape.cpp +++ b/Engine/source/T3D/turret/aiTurretShape.cpp @@ -1163,7 +1163,7 @@ U32 AITurretShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bs U32 retMask = Parent::packUpdate(connection,mask,bstream); // Indicate that the transform has changed to update the scan box - bstream->writeFlag(mask & PositionMask | ExtendedInfoMask); + bstream->writeFlag(mask & (PositionMask | ExtendedInfoMask)); // Handle any state changes that need to be passed along if (bstream->writeFlag(mask & TurretStateMask)) diff --git a/Engine/source/T3D/vehicles/guiSpeedometer.cpp b/Engine/source/T3D/vehicles/guiSpeedometer.cpp index efd30ef27..b43f65951 100644 --- a/Engine/source/T3D/vehicles/guiSpeedometer.cpp +++ b/Engine/source/T3D/vehicles/guiSpeedometer.cpp @@ -19,11 +19,11 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- - #include "gui/controls/guiBitmapCtrl.h" #include "console/consoleTypes.h" #include "T3D/gameBase/gameConnection.h" #include "T3D/vehicles/vehicle.h" +#include "T3D/player.h" #include "gfx/primBuilder.h" //----------------------------------------------------------------------------- @@ -147,42 +147,57 @@ void GuiSpeedometerHud::initPersistFields() //----------------------------------------------------------------------------- /** Gui onRender method. - Renders a health bar with filled background and border. + Renders an analog speedometer needle over a specified bitmap background. */ void GuiSpeedometerHud::onRender(Point2I offset, const RectI &updateRect) { - // Must have a connection and player control object + // Must have a connection GameConnection* conn = GameConnection::getConnectionToServer(); if (!conn) return; - Vehicle* control = dynamic_cast(conn->getControlObject()); - if (!control) - return; + + // Requires either a vehicle control object or a vehicle-mounted player + Vehicle* vehicle = dynamic_cast(conn->getControlObject()); + if(!vehicle){ + Player * player = dynamic_cast(conn->getControlObject()); + if(!player) return; + if (!player->isMounted()) return; + vehicle = dynamic_cast(player->getObjectMount()); + if(!vehicle) return; + } Parent::onRender(offset,updateRect); // Use the vehicle's velocity as its speed... - mSpeed = control->getVelocity().len(); + mSpeed = vehicle->getVelocity().len(); if (mSpeed > mMaxSpeed) mSpeed = mMaxSpeed; - // Render the needle - GFX->pushWorldMatrix(); + // Calculate center point if necessary and roll in offsets Point2F center = mCenter; if (mIsZero(center.x) && mIsZero(center.y)) { center.x = getExtent().x / 2.0f; center.y = getExtent().y / 2.0f; } - MatrixF newMat(1); + F32 fillOffset = GFX->getFillConventionOffset(); // Find the fill offset + Point2F viewCenter(offset.x + fillOffset + center.x, offset.y + fillOffset + center.y); - newMat.setPosition(Point3F(getLeft() + center.x, getTop() + center.y, 0.0f)); - - F32 rotation = mMinAngle + (mMaxAngle - mMinAngle) * (mSpeed / mMaxSpeed); - AngAxisF newRot(Point3F(0.0f,0.0f,-1.0f), rotation); - - newRot.setMatrix(&newMat); + // Handle rotation calculations + F32 rotation, spinAngle; + rotation = mMinAngle + (mMaxAngle - mMinAngle) * (mSpeed / mMaxSpeed); + spinAngle = mDegToRad(rotation); + MatrixF rotMatrix(EulerF(0.0, 0.0, spinAngle)); + // Set up the needle vertex list + Point3F vertList[5]; + vertList[0].set(+mNeedleLength,-mNeedleWidth,0); + vertList[1].set(+mNeedleLength,+mNeedleWidth,0); + vertList[2].set(-mTailLength ,+mNeedleWidth,0); + vertList[3].set(-mTailLength ,-mNeedleWidth,0); + vertList[4].set(+mNeedleLength,-mNeedleWidth,0); //// Get back to the start! + + // Create a GFXStateBlock description if one has not been set. if (mBlendSB.isNull()) { GFXStateBlockDesc desc; @@ -191,22 +206,15 @@ void GuiSpeedometerHud::onRender(Point2I offset, const RectI &updateRect) desc.samplers[0].textureColorOp = GFXTOPDisable; mBlendSB = GFX->createStateBlock(desc); } - GFX->setStateBlock(mBlendSB); - GFX->setTexture(0, NULL); - PrimBuild::begin(GFXLineStrip, 5); + // Render the needle PrimBuild::color4f(mColor.red, mColor.green, mColor.blue, mColor.alpha); - - PrimBuild::vertex2f(+mNeedleLength,-mNeedleWidth); - PrimBuild::vertex2f(+mNeedleLength,+mNeedleWidth); - PrimBuild::vertex2f(-mTailLength ,+mNeedleWidth); - PrimBuild::vertex2f(-mTailLength ,-mNeedleWidth); - - //// Get back to the start! - PrimBuild::vertex2f(+mNeedleLength,-mNeedleWidth); - + PrimBuild::begin(GFXLineStrip, 5); + for(int k=0; k<5; k++){ + rotMatrix.mulP(vertList[k]); + PrimBuild::vertex2f(vertList[k].x + viewCenter.x, vertList[k].y + viewCenter.y); + } PrimBuild::end(); } - diff --git a/Engine/source/app/badWordFilter.cpp b/Engine/source/app/badWordFilter.cpp index 7f1dd51a6..e267f5032 100644 --- a/Engine/source/app/badWordFilter.cpp +++ b/Engine/source/app/badWordFilter.cpp @@ -254,7 +254,7 @@ DefineEngineFunction(addBadWord, bool, (const char* badWord),, return gBadWordFilter->addBadWord(badWord); } -DefineEngineFunction(filterString, const char *, (const char* baseString, const char* replacementChars), (NULL, NULL), +DefineEngineFunction(filterString, const char *, (const char* baseString, const char* replacementChars), (nullAsType(), nullAsType()), "@brief Replaces the characters in a string with designated text\n\n" "Uses the bad word filter to determine which characters within the string will be replaced.\n\n" diff --git a/Engine/source/console/CMDscan.cpp b/Engine/source/console/CMDscan.cpp index 98f31fa3c..6aedd587f 100644 --- a/Engine/source/console/CMDscan.cpp +++ b/Engine/source/console/CMDscan.cpp @@ -774,9 +774,9 @@ YY_MALLOC_DECL YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; #line 105 "CMDscan.l" @@ -823,7 +823,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { yy_last_accepting_state = yy_current_state; @@ -1048,7 +1048,7 @@ case 37: YY_RULE_SETUP #line 143 "CMDscan.l" { /* this comment stops syntax highlighting from getting messed up when editing the lexer in TextPad */ - register int c = 0, l; + int c = 0, l; for ( ; ; ) { l = c; @@ -1430,9 +1430,9 @@ case YY_STATE_EOF(INITIAL): static int yy_get_next_buffer() { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; - register int number_to_move, i; + char *dest = yy_current_buffer->yy_ch_buf; + char *source = yytext_ptr; + int number_to_move, i; int ret_val; if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) @@ -1560,14 +1560,14 @@ static int yy_get_next_buffer() static yy_state_type yy_get_previous_state() { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = yy_start; for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { yy_last_accepting_state = yy_current_state; @@ -1599,10 +1599,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state ) yy_state_type yy_current_state; #endif { - register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + int yy_is_jam; + char *yy_cp = yy_c_buf_p; - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { yy_last_accepting_state = yy_current_state; @@ -1623,14 +1623,14 @@ yy_state_type yy_current_state; #ifndef YY_NO_UNPUT #ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) +static void yyunput( int c, char *yy_bp ) #else static void yyunput( c, yy_bp ) int c; -register char *yy_bp; +char *yy_bp; #endif { - register char *yy_cp = yy_c_buf_p; + char *yy_cp = yy_c_buf_p; /* undo effects of setting up yytext */ *yy_cp = yy_hold_char; @@ -1638,10 +1638,10 @@ register char *yy_bp; if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ + int number_to_move = yy_n_chars + 2; + char *dest = &yy_current_buffer->yy_ch_buf[ yy_current_buffer->yy_buf_size + 2]; - register char *source = + char *source = &yy_current_buffer->yy_ch_buf[number_to_move]; while ( source > yy_current_buffer->yy_ch_buf ) @@ -2095,7 +2095,7 @@ yyconst char *s2; int n; #endif { - register int i; + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } diff --git a/Engine/source/console/CMDscan.l b/Engine/source/console/CMDscan.l index 4464fb5f4..d9b92b6d2 100644 --- a/Engine/source/console/CMDscan.l +++ b/Engine/source/console/CMDscan.l @@ -141,7 +141,7 @@ HEXDIGIT [a-fA-F0-9] "SPC" { CMDlval.i = MakeToken< int >( ' ', lineIndex ); return '@'; } "@" { CMDlval.i = MakeToken< int >( 0, lineIndex ); return '@'; } "/*" { /* this comment stops syntax highlighting from getting messed up when editing the lexer in TextPad */ - register int c = 0, l; + int c = 0, l; for ( ; ; ) { l = c; diff --git a/Engine/source/console/SimXMLDocument.cpp b/Engine/source/console/SimXMLDocument.cpp index 840f36ca8..b2960105b 100644 --- a/Engine/source/console/SimXMLDocument.cpp +++ b/Engine/source/console/SimXMLDocument.cpp @@ -49,40 +49,40 @@ ConsoleDocClass( SimXMLDocument, "// Thanks to Rex Hiebert for this example\n" "// Given the following XML\n" "\n" - "\n" - " \n" - " Triangle\n" - " Square\n" - " Circle\n" - "
\n" - " \n" - " Pyramid\n" - " Cube\n" - " Sphere\n" - "
\n" - "\n\n" + "\n" + " \n" + " Triangle\n" + " Square\n" + " Circle\n" + "
\n" + " \n" + " Pyramid\n" + " Cube\n" + " Sphere\n" + "
\n" + "\n\n" "// Using SimXMLDocument by itself\n" "function readXmlExample(%filename)\n" - "{\n" - " %xml = new SimXMLDocument() {};\n" - " %xml.loadFile(%filename);\n\n" - " %xml.pushChildElement(\"DataTables\");\n" - " %xml.pushFirstChildElement(\"table\");\n" - " while(true)\n" - " {\n" - " echo(\"TABLE:\" SPC %xml.attribute(\"tableName\"));\n" - " %xml.pushFirstChildElement(\"rec\");\n" - " while (true)\n" - " {\n" - " %id = %xml.attribute(\"id\");\n" - " %desc = %xml.getData();\n" - " echo(\" Shape\" SPC %id SPC %desc);\n" - " if (!%xml.nextSiblingElement(\"rec\")) break;\n" - " }\n" - " %xml.popElement();\n" - " if (!%xml.nextSiblingElement(\"table\")) break;\n" - " }\n" - "}\n\n" + "{\n" + " %xml = new SimXMLDocument() {};\n" + " %xml.loadFile(%filename);\n\n" + " %xml.pushChildElement(\"DataTables\");\n" + " %xml.pushFirstChildElement(\"table\");\n" + " while(true)\n" + " {\n" + " echo(\"TABLE:\" SPC %xml.attribute(\"tableName\"));\n" + " %xml.pushFirstChildElement(\"rec\");\n" + " while (true)\n" + " {\n" + " %id = %xml.attribute(\"id\");\n" + " %desc = %xml.getData();\n" + " echo(\" Shape\" SPC %id SPC %desc);\n" + " if (!%xml.nextSiblingElement(\"rec\")) break;\n" + " }\n" + " %xml.popElement();\n" + " if (!%xml.nextSiblingElement(\"table\")) break;\n" + " }\n" + "}\n\n" "// Thanks to Scott Peal for this example\n" "// Using FileObject in conjunction with SimXMLDocument\n" @@ -90,45 +90,45 @@ ConsoleDocClass( SimXMLDocument, "// \n" "// \n" "// \n" - "function getModelsInCatagory()\n" - "{\n" - " %file = \"./Catalog.xml\";\n" - " %fo = new FileObject();\n" - " %text = \"\";\n\n" - " if(%fo.openForRead(%file))\n" - " {\n" - " while(!%fo.isEOF())\n" - " {\n" - " %text = %text @ %fo.readLine();\n" - " if (!%fo.isEOF()) %text = %text @ \"\\n\";\n" - " }\n" - " }\n" - " else\n" - " {\n" - " echo(\"Unable to locate the file: \" @ %file);\n" - " }\n\n" - " %fo.delete();\n\n" - " %xml = new SimXMLDocument() {};\n" - " %xml.parse(%text);\n" - " // \"Get\" inside of the root element, \"Models\".\n" - " %xml.pushChildElement(0);\n\n" - " // \"Get\" into the first child element\n" - " if (%xml.pushFirstChildElement(\"Model\"))\n" - " {\n" - " while (true)\n" - " {\n" - " // \n" - " // Here, i read the element's attributes.\n" - " // You might want to save these values in an array or call the %xml.getElementValue()\n" - " // if you have a different XML structure.\n\n" - " %catagory = %xml.attribute(\"catagory\");\n" - " %name = %xml.attribute(\"name\");\n" - " %path = %xml.attribute(\"path\");\n\n" - " // now, read the next \"Model\"\n" - " if (!%xml.nextSiblingElement(\"Model\")) break;\n" - " }\n" - " }\n" - "}\n" + "function getModelsInCatagory()\n" + "{\n" + " %file = \"./Catalog.xml\";\n" + " %fo = new FileObject();\n" + " %text = \"\";\n\n" + " if(%fo.openForRead(%file))\n" + " {\n" + " while(!%fo.isEOF())\n" + " {\n" + " %text = %text @ %fo.readLine();\n" + " if (!%fo.isEOF()) %text = %text @ \"\\n\";\n" + " }\n" + " }\n" + " else\n" + " {\n" + " echo(\"Unable to locate the file: \" @ %file);\n" + " }\n\n" + " %fo.delete();\n\n" + " %xml = new SimXMLDocument() {};\n" + " %xml.parse(%text);\n" + " // \"Get\" inside of the root element, \"Models\".\n" + " %xml.pushChildElement(0);\n\n" + " // \"Get\" into the first child element\n" + " if (%xml.pushFirstChildElement(\"Model\"))\n" + " {\n" + " while (true)\n" + " {\n" + " // \n" + " // Here, i read the element's attributes.\n" + " // You might want to save these values in an array or call the %xml.getElementValue()\n" + " // if you have a different XML structure.\n\n" + " %catagory = %xml.attribute(\"catagory\");\n" + " %name = %xml.attribute(\"name\");\n" + " %path = %xml.attribute(\"path\");\n\n" + " // now, read the next \"Model\"\n" + " if (!%xml.nextSiblingElement(\"Model\")) break;\n" + " }\n" + " }\n" + "}\n" "@endtsexample\n\n" "@note SimXMLDocument is a wrapper around TinyXml, a standard XML library. If you're familiar " @@ -504,13 +504,13 @@ const char* SimXMLDocument::elementValue() { if(m_paNode.empty()) { - return StringTable->insert(""); + return StringTable->EmptyString(); } const S32 iLastElement = m_paNode.size() - 1; TiXmlElement* pNode = m_paNode[iLastElement]; if(!pNode) { - return StringTable->insert(""); + return StringTable->EmptyString(); } return pNode->Value(); @@ -545,18 +545,18 @@ const char* SimXMLDocument::attribute(const char* rAttribute) { if(m_paNode.empty()) { - return StringTable->insert(""); + return StringTable->EmptyString(); } const S32 iLastElement = m_paNode.size() - 1; TiXmlElement* pNode = m_paNode[iLastElement]; if(!pNode) { - return StringTable->insert(""); + return StringTable->EmptyString(); } if(!pNode->Attribute(rAttribute)) { - return StringTable->insert(""); + return StringTable->EmptyString(); } return pNode->Attribute(rAttribute); @@ -629,20 +629,20 @@ const char* SimXMLDocument::firstAttribute() // Get the current element if(m_paNode.empty()) { - return StringTable->insert(""); + return StringTable->EmptyString(); } const S32 iLastElement = m_paNode.size() - 1; TiXmlElement* pNode = m_paNode[iLastElement]; if(!pNode) { - return StringTable->insert(""); + return StringTable->EmptyString(); } // Gets its first attribute, if any m_CurrentAttribute = pNode->FirstAttribute(); if(!m_CurrentAttribute) { - return StringTable->insert(""); + return StringTable->EmptyString(); } return m_CurrentAttribute->Name(); @@ -666,20 +666,20 @@ const char* SimXMLDocument::lastAttribute() // Get the current element if(m_paNode.empty()) { - return StringTable->insert(""); + return StringTable->EmptyString(); } const S32 iLastElement = m_paNode.size() - 1; TiXmlElement* pNode = m_paNode[iLastElement]; if(!pNode) { - return StringTable->insert(""); + return StringTable->EmptyString(); } // Gets its last attribute, if any m_CurrentAttribute = pNode->LastAttribute(); if(!m_CurrentAttribute) { - return StringTable->insert(""); + return StringTable->EmptyString(); } return m_CurrentAttribute->Name(); @@ -703,14 +703,14 @@ const char* SimXMLDocument::nextAttribute() { if(!m_CurrentAttribute) { - return StringTable->insert(""); + return StringTable->EmptyString(); } // Gets its next attribute, if any m_CurrentAttribute = m_CurrentAttribute->Next(); if(!m_CurrentAttribute) { - return StringTable->insert(""); + return StringTable->EmptyString(); } return m_CurrentAttribute->Name(); @@ -734,14 +734,14 @@ const char* SimXMLDocument::prevAttribute() { if(!m_CurrentAttribute) { - return StringTable->insert(""); + return StringTable->EmptyString(); } // Gets its next attribute, if any m_CurrentAttribute = m_CurrentAttribute->Previous(); if(!m_CurrentAttribute) { - return StringTable->insert(""); + return StringTable->EmptyString(); } return m_CurrentAttribute->Name(); diff --git a/Engine/source/console/astAlloc.cpp b/Engine/source/console/astAlloc.cpp index 19809a1e2..fb69f49d5 100644 --- a/Engine/source/console/astAlloc.cpp +++ b/Engine/source/console/astAlloc.cpp @@ -411,7 +411,7 @@ ObjectDeclNode *ObjectDeclNode::alloc( S32 lineNumber, ExprNode *classNameExpr, if(parentObject) ret->parentObject = parentObject; else - ret->parentObject = StringTable->insert(""); + ret->parentObject = StringTable->EmptyString(); return ret; } diff --git a/Engine/source/console/cmdgram.cpp b/Engine/source/console/cmdgram.cpp index c7aeaa095..064394aaa 100644 --- a/Engine/source/console/cmdgram.cpp +++ b/Engine/source/console/cmdgram.cpp @@ -1288,9 +1288,9 @@ __yy_memcpy (from, to, count) char *to; int count; { - register char *f = from; - register char *t = to; - register int i = count; + char *f = from; + char *t = to; + int i = count; while (i-- > 0) *t++ = *f++; @@ -1303,9 +1303,9 @@ __yy_memcpy (from, to, count) static void __yy_memcpy (char *from, char *to, int count) { - register char *f = from; - register char *t = to; - register int i = count; + char *f = from; + char *t = to; + int i = count; while (i-- > 0) *t++ = *f++; @@ -1333,10 +1333,10 @@ int yyparse(YYPARSE_PARAM) YYPARSE_PARAM_DECL { - register int yystate; - register int yyn; - register short *yyssp; - register YYSTYPE *yyvsp; + int yystate; + int yyn; + short *yyssp; + YYSTYPE *yyvsp; int yyerrstatus; /* number of tokens to shift before error messages enabled */ int yychar1 = 0; /* lookahead token as an internal (translated) token number */ diff --git a/Engine/source/console/codeBlock.cpp b/Engine/source/console/codeBlock.cpp index 1559f41d8..192b50f0f 100644 --- a/Engine/source/console/codeBlock.cpp +++ b/Engine/source/console/codeBlock.cpp @@ -435,7 +435,7 @@ bool CodeBlock::read(StringTableEntry fileName, Stream &st) if(offset < globalSize) ste = StringTable->insert(globalStrings + offset); else - ste = StringTable->insert(""); + ste = StringTable->EmptyString(); U32 count; st.read(&count); while(count--) @@ -455,8 +455,8 @@ bool CodeBlock::read(StringTableEntry fileName, Stream &st) bool CodeBlock::compile(const char *codeFileName, StringTableEntry fileName, const char *inScript, bool overrideNoDso) { - AssertFatal(Con::isMainThread(), "Compiling code on a secondary thread"); - + AssertFatal(Con::isMainThread(), "Compiling code on a secondary thread"); + // This will return true, but return value is ignored char *script; chompUTF8BOM( inScript, &script ); @@ -572,8 +572,8 @@ bool CodeBlock::compile(const char *codeFileName, StringTableEntry fileName, con ConsoleValueRef CodeBlock::compileExec(StringTableEntry fileName, const char *inString, bool noCalls, S32 setFrame) { - AssertFatal(Con::isMainThread(), "Compiling code on a secondary thread"); - + AssertFatal(Con::isMainThread(), "Compiling code on a secondary thread"); + // Check for a UTF8 script file char *string; chompUTF8BOM( inString, &string ); diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index c1219dc86..f2d56c843 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.h @@ -95,8 +95,8 @@ struct ConsoleLogEntry Script, GUI, Network, - GGConnect, - NUM_TYPE + GGConnect, + NUM_TYPE } mType; /// Indicates the actual log entry. @@ -897,34 +897,28 @@ template struct _EngineConsoleExecCallbackHelper; namespace Con { - /// @name Console Execution - executef - /// { - /// - /// Implements a script function thunk which automatically converts parameters to relevant console types. - /// Can be used as follows: - /// - Con::executef("functionName", ...); - /// - Con::executef(mySimObject, "functionName", ...); - /// - /// NOTE: if you get a rather cryptic template error coming through here, most likely you are trying to - /// convert a parameter which EngineMarshallType does not have a specialization for. - /// Another problem can occur if you do not include "console/simBase.h" and "console/engineAPI.h" - /// since _EngineConsoleExecCallbackHelper and SimConsoleThreadExecCallback are required. - /// - /// @see _EngineConsoleExecCallbackHelper - /// - template ConsoleValueRef executef(A a) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(); } - template ConsoleValueRef executef(A a, B b) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b); } - template ConsoleValueRef executef(A a, B b, C c) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c); } - template ConsoleValueRef executef(A a, B b, C c, D d) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f, G g) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f, g); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f, G g, H h) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f, g, h); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f, G g, H h, I i) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f, g, h, i); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f, g, h, i, j); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f, g, h, i, j, k); } - template ConsoleValueRef executef(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l) { _EngineConsoleExecCallbackHelper callback( a ); return callback.template call(b, c, d, e, f, g, h, i, j, k, l); } - /// } + /// @name Console Execution - executef + /// { + /// + /// Implements a script function thunk which automatically converts parameters to relevant console types. + /// Can be used as follows: + /// - Con::executef("functionName", ...); + /// - Con::executef(mySimObject, "functionName", ...); + /// + /// NOTE: if you get a rather cryptic template error coming through here, most likely you are trying to + /// convert a parameter which EngineMarshallType does not have a specialization for. + /// Another problem can occur if you do not include "console/simBase.h" and "console/engineAPI.h" + /// since _EngineConsoleExecCallbackHelper and SimConsoleThreadExecCallback are required. + /// + /// @see _EngineConsoleExecCallbackHelper + /// + template + ConsoleValueRef executef(R r, ArgTs ...argTs) + { + _EngineConsoleExecCallbackHelper callback( r ); + return callback.template call(argTs...); + } + /// } }; extern void expandEscape(char *dest, const char *src); @@ -1149,19 +1143,19 @@ class ConsoleStackFrameSaver { public: - bool mSaved; + bool mSaved; - ConsoleStackFrameSaver() : mSaved(false) - { - } + ConsoleStackFrameSaver() : mSaved(false) + { + } - ~ConsoleStackFrameSaver() - { - restore(); - } + ~ConsoleStackFrameSaver() + { + restore(); + } - void save(); - void restore(); + void save(); + void restore(); }; diff --git a/Engine/source/console/consoleTypes.h b/Engine/source/console/consoleTypes.h index 8080a8830..1285a213d 100644 --- a/Engine/source/console/consoleTypes.h +++ b/Engine/source/console/consoleTypes.h @@ -39,6 +39,7 @@ #include "console/engineStructs.h" #endif +template inline const T nullAsType(){ return nullptr; } /// @file /// Legacy TS-based console type definitions. diff --git a/Engine/source/console/engineAPI.h b/Engine/source/console/engineAPI.h index c2b940f01..049cce54d 100644 --- a/Engine/source/console/engineAPI.h +++ b/Engine/source/console/engineAPI.h @@ -23,6 +23,9 @@ #ifndef _ENGINEAPI_H_ #define _ENGINEAPI_H_ +#include +#include + #ifndef _CONSOLETYPES_H_ #include "console/consoleTypes.h" #endif @@ -333,953 +336,19 @@ struct EngineUnmarshallData< ConsoleValueRef > /// @{ // Helper type to factor out commonalities between function and method trampolines. -template< typename T > -struct _EngineTrampoline -{ + + +template struct _EngineTrampoline { struct Args {}; }; -template< typename R, typename A > -struct _EngineTrampoline< R( A ) > +template< typename R, typename ...ArgTs > +struct _EngineTrampoline< R( ArgTs ... ) > { - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - }; + typedef std::tuple Args; + std::tuple argT; }; -template< typename R, typename A, typename B > -struct _EngineTrampoline< R( A, B ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C > -struct _EngineTrampoline< R( A, B, C ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D > -struct _EngineTrampoline< R( A, B, C, D ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineTrampoline< R( A, B, C, D, E ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineTrampoline< R( A, B, C, D, E, F ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineTrampoline< R( A, B, C, D, E, F, G ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< G >::ValueType g() const - { - return EngineTypeTraits< G >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< G >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineTrampoline< R( A, B, C, D, E, F, G, H ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< G >::ValueType g() const - { - return EngineTypeTraits< G >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< G >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< H >::ValueType h() const - { - return EngineTypeTraits< H >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< H >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineTrampoline< R( A, B, C, D, E, F, G, H, I ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< G >::ValueType g() const - { - return EngineTypeTraits< G >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< G >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< H >::ValueType h() const - { - return EngineTypeTraits< H >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< H >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< I >::ValueType i() const - { - return EngineTypeTraits< I >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< I >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineTrampoline< R( A, B, C, D, E, F, G, H, I, J ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< J >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< G >::ValueType g() const - { - return EngineTypeTraits< G >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< G >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< H >::ValueType h() const - { - return EngineTypeTraits< H >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< H >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< I >::ValueType i() const - { - return EngineTypeTraits< I >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< I >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< J >::ValueType j() const - { - return EngineTypeTraits< J >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< J >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineTrampoline< R( A, B, C, D, E, F, G, H, I, J, K ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< J >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< K >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< G >::ValueType g() const - { - return EngineTypeTraits< G >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< G >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< H >::ValueType h() const - { - return EngineTypeTraits< H >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< H >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< I >::ValueType i() const - { - return EngineTypeTraits< I >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< I >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< J >::ValueType j() const - { - return EngineTypeTraits< J >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< J >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< K >::ValueType k() const - { - return EngineTypeTraits< K >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< K >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< J >::ArgumentValueType ) ] ) ) ); - } - }; -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineTrampoline< R( A, B, C, D, E, F, G, H, I, J, K, L ) > -{ - struct Args - { - char data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< J >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< K >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< L >::ArgumentValueType ) ]; - - typename EngineTypeTraits< A >::ValueType a() const - { - return EngineTypeTraits< A >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< A >::ArgumentValueType* > - ( &data[ 0 ] ) ) ); - } - - typename EngineTypeTraits< B >::ValueType b() const - { - return EngineTypeTraits< B >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< B >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< C >::ValueType c() const - { - return EngineTypeTraits< C >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< C >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< D >::ValueType d() const - { - return EngineTypeTraits< D >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< D >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< E >::ValueType e() const - { - return EngineTypeTraits< E >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< E >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< F >::ValueType f() const - { - return EngineTypeTraits< F >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< F >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< G >::ValueType g() const - { - return EngineTypeTraits< G >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< G >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< H >::ValueType h() const - { - return EngineTypeTraits< H >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< H >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< I >::ValueType i() const - { - return EngineTypeTraits< I >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< I >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< J >::ValueType j() const - { - return EngineTypeTraits< J >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< J >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< K >::ValueType k() const - { - return EngineTypeTraits< K >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< K >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< J >::ArgumentValueType ) ] ) ) ); - } - - typename EngineTypeTraits< L >::ValueType l() const - { - return EngineTypeTraits< L >::ArgumentToValue( - *( reinterpret_cast< const typename EngineTypeTraits< L >::ArgumentValueType* > - ( &data[ sizeof( typename EngineTypeTraits< A >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< B >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< C >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< D >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< E >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< F >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< G >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< H >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< I >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< J >::ArgumentValueType ) + - sizeof( typename EngineTypeTraits< K >::ArgumentValueType ) ] ) ) ); - } - }; -}; - - template< typename T > struct _EngineFunctionTrampolineBase : public _EngineTrampoline< T > { @@ -1290,125 +359,30 @@ struct _EngineFunctionTrampolineBase : public _EngineTrampoline< T > template< typename T > struct _EngineFunctionTrampoline {}; -template< typename R > -struct _EngineFunctionTrampoline< R() > : public _EngineFunctionTrampolineBase< R() > +template< typename R, typename ...ArgTs > +struct _EngineFunctionTrampoline< R(ArgTs...) > : public _EngineFunctionTrampolineBase< R(ArgTs...) > { - static R jmp( R ( *fn )(), const typename _EngineFunctionTrampolineBase< R() >::Args& args ) +private: + using Super = _EngineFunctionTrampolineBase< R(ArgTs...) >; + using ArgsType = typename Super::Args; + + template struct Seq {}; + template struct Gens : Gens {}; + template struct Gens<0, I...>{ typedef Seq type; }; + + template + static R dispatchHelper(typename Super::FunctionType fn, const ArgsType& args, Seq) { + return R( fn(std::get(args) ...) ); + } + + using SeqType = typename Gens::type; +public: + static R jmp(typename Super::FunctionType fn, const ArgsType& args ) { - return R( fn() ); + return dispatchHelper(fn, args, SeqType()); } }; - -template< typename R, typename A > -struct _EngineFunctionTrampoline< R( A ) > : public _EngineFunctionTrampolineBase< R( A ) > -{ - static R jmp( R ( *fn )( A ), const typename _EngineFunctionTrampolineBase< R( A ) >::Args& args ) - { - return R( fn( args.a() ) ); - } -}; - -template< typename R, typename A, typename B > -struct _EngineFunctionTrampoline< R( A, B ) > : public _EngineFunctionTrampolineBase< R( A, B ) > -{ - static R jmp( R ( *fn )( A, B ), const typename _EngineFunctionTrampolineBase< R( A, B ) >::Args& args ) - { - return R( fn( args.a(), args.b() ) ); - } -}; - -template< typename R, typename A, typename B, typename C > -struct _EngineFunctionTrampoline< R( A, B, C ) > : public _EngineFunctionTrampolineBase< R( A, B, C ) > -{ - static R jmp( R ( *fn )( A, B, C ), const typename _EngineFunctionTrampolineBase< R( A, B, C ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D > -struct _EngineFunctionTrampoline< R( A, B, C, D ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D ) > -{ - static R jmp( R ( *fn )( A, B, C, D ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineFunctionTrampoline< R( A, B, C, D, E ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F, G ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F, G ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F, G, H ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F, G, H ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F, G, H, I ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F, G, H, I ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F, G, H, I, J ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F, G, H, I, J ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i(), args.j() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F, G, H, I, J, K ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F, G, H, I, J, K ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i(), args.j(), args.k() ) ); - } -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineFunctionTrampoline< R( A, B, C, D, E, F, G, H, I, J, K, L ) > : public _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K, L ) > -{ - static R jmp( R ( *fn )( A, B, C, D, E, F, G, H, I, J, K, L ), const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K, L ) >::Args& args ) - { - return R( fn( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i(), args.j(), args.k(), args.l() ) ); - } -}; - - // Trampolines for engine methods template< typename T > @@ -1417,165 +391,34 @@ struct _EngineMethodTrampolineBase : public _EngineTrampoline< T > {}; template< typename Frame, typename T > struct _EngineMethodTrampoline {}; -template< typename Frame, typename R > -struct _EngineMethodTrampoline< Frame, R() > : public _EngineMethodTrampolineBase< R() > +template< typename Frame, typename R, typename ...ArgTs > +struct _EngineMethodTrampoline< Frame, R(ArgTs ...) > : public _EngineMethodTrampolineBase< R(ArgTs ...) > { - typedef R( FunctionType )( typename Frame::ObjectType* ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R() >::Args& args ) + using FunctionType = R( typename Frame::ObjectType*, ArgTs ...); +private: + using Super = _EngineMethodTrampolineBase< R(ArgTs ...) >; + using ArgsType = typename _EngineFunctionTrampolineBase< R(ArgTs ...) >::Args; + + template struct Seq {}; + template struct Gens : Gens {}; + template struct Gens<0, I...>{ typedef Seq type; }; + + template + static R dispatchHelper(Frame f, const ArgsType& args, Seq) { + return R( f._exec(std::get(args) ...) ); + } + + using SeqType = typename Gens::type; +public: + static R jmp( typename Frame::ObjectType* object, const ArgsType& args ) { + Frame f; f.object = object; - return R( f._exec() ); + return dispatchHelper(f, args, SeqType()); } }; - -template< typename Frame, typename R, typename A > -struct _EngineMethodTrampoline< Frame, R( A ) > : public _EngineMethodTrampolineBase< R( A ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B > -struct _EngineMethodTrampoline< Frame, R( A, B ) > : public _EngineMethodTrampolineBase< R( A, B ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C > -struct _EngineMethodTrampoline< Frame, R( A, B, C ) > : public _EngineMethodTrampolineBase< R( A, B, C ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D ) > : public _EngineMethodTrampolineBase< R( A, B, C, D ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F, G ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F, G ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F, G ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F, G, H ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F, G, H ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F, G, H ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F, G, H, I ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F, G, H, I ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F, G, H, I, J ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F, G, H, I, J ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i(), args.j() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F, G, H, I, J, K ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J, K ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i(), args.j(), args.k() ) ); - } -}; - -template< typename Frame, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineMethodTrampoline< Frame, R( A, B, C, D, E, F, G, H, I, J, K, L ) > : public _EngineMethodTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K, L ) > -{ - typedef R( FunctionType )( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J, K, L ); - static R jmp( typename Frame::ObjectType* object, const typename _EngineFunctionTrampolineBase< R( A, B, C, D, E, F, G, H, I, J, K, L ) >::Args& args ) - { - Frame f; - f.object = object; - return R( f._exec( args.a(), args.b(), args.c(), args.d(), args.e(), args.f(), args.g(), args.h(), args.i(), args.j(), args.k(), args.l() ) ); - } -}; - - - /// @} @@ -1594,6 +437,7 @@ inline const char* _EngineConsoleThunkReturnValue( const T& value ) { return EngineMarshallData( value ); } + inline bool _EngineConsoleThunkReturnValue( bool value ) { return value; @@ -1671,81 +515,11 @@ struct _EngineConsoleThunkType< void > struct _EngineConsoleThunkCountArgs { - template< typename A > - U32 operator ()( A a ) - { - return 1; + template U32 operator()(ArgTs... args){ + return sizeof...(ArgTs); } - - template< typename A, typename B > - U32 operator ()( A a, B b ) - { - return 2; - } - - template< typename A, typename B, typename C > - U32 operator ()( A a, B b, C c ) - { - return 3; - } - - template< typename A, typename B, typename C, typename D > - U32 operator ()( A a, B b, C c, D d ) - { - return 4; - } - - template< typename A, typename B, typename C, typename D, typename E > - U32 operator ()( A a, B b, C c, D d, E e ) - { - return 5; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F > - U32 operator ()( A a, B b, C c, D d, E e, F f ) - { - return 6; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G > - U32 operator ()( A a, B b, C c, D d, E e, F f, G g ) - { - return 7; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > - U32 operator ()( A a, B b, C c, D d, E e, F f, G g, H h ) - { - return 8; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > - U32 operator ()( A a, B b, C c, D d, E e, F f, G g, H h, I i ) - { - return 9; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > - U32 operator ()( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) - { - return 10; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > - U32 operator ()( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) - { - return 11; - } - - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > - U32 operator ()( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - { - return 12; - } - - operator U32() const - { + operator U32() const{ // FIXME: WHAT IS THIS?? I'm pretty sure it's incorrect, and it's the version that is invoked by all the macros return 0; } }; @@ -1754,801 +528,114 @@ struct _EngineConsoleThunkCountArgs // Encapsulation of a legacy console function invocation. +namespace engineAPI{ + namespace detail{ + template + struct ThunkHelpers { + using SelfType = ThunkHelpers; + using FunctionType = R(*)(ArgTs...); + template using MethodType = R(Frame::*)(ArgTs ...) const; + template using IthArgType = typename std::tuple_element >::type; + + template struct Seq {}; + template struct Gens : Gens {}; + template struct Gens<0, I...>{ typedef Seq type; }; + + typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; + static const S32 NUM_ARGS = sizeof...(ArgTs) + startArgc; + + template + static IthArgType getRealArgValue(S32 argc, ConsoleValueRef *argv, const _EngineFunctionDefaultArguments< void(RealArgTs...) >& defaultArgs) + { + if((startArgc + index) < argc) + { + return EngineUnmarshallData< IthArgType >()( argv[ startArgc + index ] ); + } else { + return std::get(defaultArgs.mArgs); + } + } + + template + static R dispatchHelper(S32 argc, ConsoleValueRef *argv, FunctionType fn, const _EngineFunctionDefaultArguments< void(ArgTs...) >& defaultArgs, Seq){ + return fn(SelfType::getRealArgValue(argc, argv, defaultArgs) ...); + } + + template + static R dispatchHelper(S32 argc, ConsoleValueRef *argv, MethodType fn, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, ArgTs...) >& defaultArgs, Seq){ + return (frame->*fn)(SelfType::getRealArgValue(argc, argv, defaultArgs) ...); + } + + using SeqType = typename Gens::type; + }; + + template struct MarshallHelpers { + template static void marshallEach(S32 &argc, ArgVT *argv, const ArgTs& ...args){} + template static void marshallEach(S32 &argc, ArgVT *argv, const H& head, const Tail& ...tail){ + argv[argc++] = EngineMarshallData(head); + marshallEach(argc, argv, tail...); + } + }; + + template<> struct MarshallHelpers { + template static void marshallEach(S32 &argc, ConsoleValueRef *argv, const ArgTs& ...args){} + template static void marshallEach(S32 &argc, ConsoleValueRef *argv, const H& head, const Tail& ...tail){ + EngineMarshallData(head, argc, argv); + marshallEach(argc, argv, tail...); + } + }; + } +} template< S32 startArgc, typename T > struct _EngineConsoleThunk {}; -template< S32 startArgc, typename R > -struct _EngineConsoleThunk< startArgc, R() > +template< S32 startArgc, typename R, typename ...ArgTs > +struct _EngineConsoleThunk< startArgc, R(ArgTs...) > { - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 0; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )(), const _EngineFunctionDefaultArguments< void() >& ) +private: + using Helper = engineAPI::detail::ThunkHelpers; + using SeqType = typename Helper::SeqType; +public: + typedef typename Helper::FunctionType FunctionType; + typedef typename Helper::ReturnType ReturnType; + template using MethodType = typename Helper::template MethodType; + static const S32 NUM_ARGS = Helper::NUM_ARGS; + + static ReturnType thunk( S32 argc, ConsoleValueRef *argv, FunctionType fn, const _EngineFunctionDefaultArguments< void(ArgTs...) >& defaultArgs) { - return _EngineConsoleThunkReturnValue( fn() ); + return _EngineConsoleThunkReturnValue( Helper::dispatchHelper(argc, argv, fn, defaultArgs, SeqType())); } template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )() const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType* ) >& ) + static ReturnType thunk( S32 argc, ConsoleValueRef *argv, MethodType fn, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, ArgTs...) >& defaultArgs) { - return _EngineConsoleThunkReturnValue( ( frame->*fn )() ); + return _EngineConsoleThunkReturnValue( Helper::dispatchHelper(argc, argv, fn, frame, defaultArgs, SeqType())); } }; -template< S32 startArgc > -struct _EngineConsoleThunk< startArgc, void() > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 0; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )(), const _EngineFunctionDefaultArguments< void() >& ) +// Have to do a partial specialization for void-returning functions :( +template +struct _EngineConsoleThunk { +private: + using Helper = engineAPI::detail::ThunkHelpers; + using SeqType = typename Helper::SeqType; +public: + typedef typename Helper::FunctionType FunctionType; + typedef typename Helper::ReturnType ReturnType; + template using MethodType = typename Helper::template MethodType; + static const S32 NUM_ARGS = Helper::NUM_ARGS; + + static void thunk( S32 argc, ConsoleValueRef *argv, FunctionType fn, const _EngineFunctionDefaultArguments< void(ArgTs...) >& defaultArgs) { - fn(); + Helper::dispatchHelper(argc, argv, fn, defaultArgs, SeqType()); } template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )() const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType* ) >& ) + static void thunk( S32 argc, ConsoleValueRef *argv, MethodType fn, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, ArgTs...) >& defaultArgs) { - return ( frame->*fn )(); + Helper::dispatchHelper(argc, argv, fn, frame, defaultArgs, SeqType()); } }; - -template< S32 startArgc, typename R, typename A > -struct _EngineConsoleThunk< startArgc, R( A ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 1 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A ), const _EngineFunctionDefaultArguments< void( A ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - - return _EngineConsoleThunkReturnValue( fn( a ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a ) ); - } -}; - -template< S32 startArgc, typename A > -struct _EngineConsoleThunk< startArgc, void( A ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 1 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A ), const _EngineFunctionDefaultArguments< void( A ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - - fn( a ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - - ( frame->*fn )( a ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B > -struct _EngineConsoleThunk< startArgc, R( A, B ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 2 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B ), const _EngineFunctionDefaultArguments< void( A, B ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b ) ); - } -}; - -template< S32 startArgc, typename A, typename B > -struct _EngineConsoleThunk< startArgc, void( A, B ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 2 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B ), const _EngineFunctionDefaultArguments< void( A, B ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - - fn( a, b ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - - ( frame->*fn )( a, b ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C > -struct _EngineConsoleThunk< startArgc, R( A, B, C ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 3 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C ), const _EngineFunctionDefaultArguments< void( A, B, C ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C > -struct _EngineConsoleThunk< startArgc, void( A, B, C ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 3 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C ), const _EngineFunctionDefaultArguments< void( A, B, C ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - - fn( a, b, c ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - - ( frame->*fn )( a, b, c ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 4 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D ), const _EngineFunctionDefaultArguments< void( A, B, C, D ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 4 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D ), const _EngineFunctionDefaultArguments< void( A, B, C, D ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - - fn( a, b, c, d ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - - ( frame->*fn )( a, b, c, d ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 5 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 5 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - - fn( a, b, c, d, e ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - - ( frame->*fn )( a, b, c, d, e ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 6 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 6 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - - fn( a, b, c, d, e, f ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - - ( frame->*fn )( a, b, c, d, e, f ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F, G ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 7 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F, G ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f, g ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F, G ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f, g ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F, G ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 7 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F, G ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - - fn( a, b, c, d, e, f, g ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F, G ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - - ( frame->*fn )( a, b, c, d, e, f, g ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F, G, H ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 8 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F, G, H ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f, g, h ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F, G, H ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f, g, h ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F, G, H ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 8 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F, G, H ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - - fn( a, b, c, d, e, f, g, h ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F, G, H ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - - ( frame->*fn )( a, b, c, d, e, f, g, h ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F, G, H, I ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 9 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F, G, H, I ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f, g, h, i ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F, G, H, I ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f, g, h, i ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F, G, H, I ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 9 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F, G, H, I ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - - fn( a, b, c, d, e, f, g, h, i ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F, G, H, I ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - - ( frame->*fn )( a, b, c, d, e, f, g, h, i ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F, G, H, I, J ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 10 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F, G, H, I, J ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.j ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f, g, h, i, j ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F, G, H, I, J ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.k ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f, g, h, i, j ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F, G, H, I, J ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 10 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F, G, H, I, J ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.j ) ); - - fn( a, b, c, d, e, f, g, h, i, j ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F, G, H, I, J ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.k ) ); - - ( frame->*fn )( a, b, c, d, e, f, g, h, i, j ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F, G, H, I, J, K ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 11 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F, G, H, I, J, K ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J, K ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.j ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.k ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f, g, h, i, j, k ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F, G, H, I, J, K ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J, K ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.k ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.l ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f, g, h, i, j, k ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F, G, H, I, J, K ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 11 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F, G, H, I, J, K ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J, K ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.j ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.k ) ); - - fn( a, b, c, d, e, f, g, h, i, j, k ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F, G, H, I, J, K ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J, K ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.k ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.l ) ); - - ( frame->*fn )( a, b, c, d, e, f, g, h, i, j, k ); - } -}; - - -template< S32 startArgc, typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineConsoleThunk< startArgc, R( A, B, C, D, E, F, G, H, I, J, K, L ) > -{ - typedef typename _EngineConsoleThunkType< R >::ReturnType ReturnType; - static const S32 NUM_ARGS = 12 + startArgc; - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( *fn )( A, B, C, D, E, F, G, H, I, J, K, L ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J, K, L ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.j ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.k ) ); - L l = ( startArgc + 11 < argc ? EngineUnmarshallData< L >()( argv[ startArgc + 11 ] ) : L( defaultArgs.l ) ); - - return _EngineConsoleThunkReturnValue( fn( a, b, c, d, e, f, g, h, i, j, k, l ) ); - } - template< typename Frame > - static ReturnType thunk( S32 argc, ConsoleValueRef *argv, R ( Frame::*fn )( A, B, C, D, E, F, G, H, I, J, K, L ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J, K, L ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.k ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.l ) ); - L l = ( startArgc + 11 < argc ? EngineUnmarshallData< L >()( argv[ startArgc + 11 ] ) : L( defaultArgs.l ) ); - - return _EngineConsoleThunkReturnValue( ( frame->*fn )( a, b, c, d, e, f, g, h, i, j, k, l ) ); - } -}; - -template< S32 startArgc, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineConsoleThunk< startArgc, void( A, B, C, D, E, F, G, H, I, J, K, L ) > -{ - typedef void ReturnType; - static const S32 NUM_ARGS = 12 + startArgc; - static void thunk( S32 argc, ConsoleValueRef *argv, void ( *fn )( A, B, C, D, E, F, G, H, I, J, K, L ), const _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J, K, L ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.a ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.b ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.c ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.d ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.e ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.f ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.g ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.h ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.i ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.j ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.k ) ); - L l = ( startArgc + 11 < argc ? EngineUnmarshallData< L >()( argv[ startArgc + 11 ] ) : L( defaultArgs.l ) ); - - fn( a, b, c, d, e, f, g, h, i, j, k, l ); - } - template< typename Frame > - static void thunk( S32 argc, ConsoleValueRef *argv, void ( Frame::*fn )( A, B, C, D, E, F, G, H, I, J, K, L ) const, Frame* frame, const _EngineFunctionDefaultArguments< void( typename Frame::ObjectType*, A, B, C, D, E, F, G, H, I, J, K, L ) >& defaultArgs ) - { - A a = ( startArgc + 0 < argc ? EngineUnmarshallData< A >()( argv[ startArgc + 0 ] ) : A( defaultArgs.b ) ); - B b = ( startArgc + 1 < argc ? EngineUnmarshallData< B >()( argv[ startArgc + 1 ] ) : B( defaultArgs.c ) ); - C c = ( startArgc + 2 < argc ? EngineUnmarshallData< C >()( argv[ startArgc + 2 ] ) : C( defaultArgs.d ) ); - D d = ( startArgc + 3 < argc ? EngineUnmarshallData< D >()( argv[ startArgc + 3 ] ) : D( defaultArgs.e ) ); - E e = ( startArgc + 4 < argc ? EngineUnmarshallData< E >()( argv[ startArgc + 4 ] ) : E( defaultArgs.f ) ); - F f = ( startArgc + 5 < argc ? EngineUnmarshallData< F >()( argv[ startArgc + 5 ] ) : F( defaultArgs.g ) ); - G g = ( startArgc + 6 < argc ? EngineUnmarshallData< G >()( argv[ startArgc + 6 ] ) : G( defaultArgs.h ) ); - H h = ( startArgc + 7 < argc ? EngineUnmarshallData< H >()( argv[ startArgc + 7 ] ) : H( defaultArgs.i ) ); - I i = ( startArgc + 8 < argc ? EngineUnmarshallData< I >()( argv[ startArgc + 8 ] ) : I( defaultArgs.j ) ); - J j = ( startArgc + 9 < argc ? EngineUnmarshallData< J >()( argv[ startArgc + 9 ] ) : J( defaultArgs.k ) ); - K k = ( startArgc + 10 < argc ? EngineUnmarshallData< K >()( argv[ startArgc + 10 ] ) : K( defaultArgs.l ) ); - L l = ( startArgc + 11 < argc ? EngineUnmarshallData< L >()( argv[ startArgc + 11 ] ) : L( defaultArgs.l ) ); - - ( frame->*fn )( a, b, c, d, e, f, g, h, i, j, k, l ); - } -}; - - - /// @} /// @name API Definition Macros @@ -3057,98 +1144,13 @@ struct _EngineCallbackHelper : mThis( pThis ), mFn( fn ) {} - template< typename R > - R call() const + template< typename R, typename ...ArgTs > + R call(ArgTs ...args) const { - typedef R( FunctionType )( EngineObject* ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis ) ); + typedef R( FunctionType )( EngineObject*, ArgTs... ); + return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, args... ) ); } - - template< typename R, typename A > - R call( A a ) const - { - typedef R( FunctionType )( EngineObject*, A ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a ) ); - } - - template< typename R, typename A, typename B > - R call( A a, B b ) const - { - typedef R( FunctionType )( EngineObject*, A, B ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b ) ); - } - - template< typename R, typename A, typename B, typename C > - R call( A a, B b, C c ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c ) ); - } - - template< typename R, typename A, typename B, typename C, typename D > - R call( A a, B b, C c, D d ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E > - R call( A a, B b, C c, D d, E e ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > - R call( A a, B b, C c, D d, E e, F f ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > - R call( A a, B b, C c, D d, E e, F f, G g ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F, G ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f, g ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > - R call( A a, B b, C c, D d, E e, F f, G g, H h ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F, G, H ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f, g, h ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F, G, H, I ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f, g, h, i ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F, G, H, I, J ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f, g, h, i, j ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F, G, H, I, J, K ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f, g, h, i, j, k ) ); - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) const - { - typedef R( FunctionType )( EngineObject*, A, B, C, D, E, F, G, H, I, J, K, L ); - return R( reinterpret_cast< FunctionType* >( const_cast(mFn) )( mThis, a, b, c, d, e, f, g, h, i, j, k, l ) ); - } - }; @@ -3179,6 +1181,8 @@ public: // Base helper for console callbacks struct _EngineConsoleCallbackHelper : public _BaseEngineConsoleCallbackHelper { +private: + using Helper = engineAPI::detail::MarshallHelpers; public: _EngineConsoleCallbackHelper( StringTableEntry callbackName, SimObject* pThis ) @@ -3187,493 +1191,29 @@ public: mArgc = mInitialArgc = pThis ? 2 : 1 ; mCallbackName = callbackName; } - - template< typename R > - R call() - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - - template< typename R, typename A > - R call( A a ) + template< typename R, typename ...ArgTs > + R call(ArgTs ...args) { if (Con::isMainThread()) { ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+1, mArgv); + CSTK.reserveValues(mArgc + sizeof...(ArgTs), mArgv); mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - + + Helper::marshallEach(mArgc, mArgv, args...); + return R( EngineUnmarshallData< R >()( _exec() ) ); } else { SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+1, NULL, false, &cb); + SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc + sizeof...(ArgTs), NULL, false, &cb); evt->populateArgs(mArgv); mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B > - R call( A a, B b ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+2, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+2, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C > - R call( A a, B b, C c ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+3, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+3, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D > - R call( A a, B b, C c, D d ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+4, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+4, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E > - R call( A a, B b, C c, D d, E e ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+5, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+5, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > - R call( A a, B b, C c, D d, E e, F f ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+6, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+6, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > - R call( A a, B b, C c, D d, E e, F f, G g ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+7, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+7, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > - R call( A a, B b, C c, D d, E e, F f, G g, H h ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+8, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+8, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+9, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+9, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+10, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+10, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+11, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+11, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+12, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - EngineMarshallData( l, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+12, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - EngineMarshallData( l, mArgc, mArgv ); - + + Helper::marshallEach(mArgc, mArgv, args...); + Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); @@ -3686,6 +1226,8 @@ public: // Override for when first parameter is presumably a SimObject*, in which case A will be absorbed as the callback template struct _EngineConsoleExecCallbackHelper : public _BaseEngineConsoleCallbackHelper { +private: + using Helper = engineAPI::detail::MarshallHelpers; public: _EngineConsoleExecCallbackHelper( SimObject* pThis ) @@ -3696,457 +1238,41 @@ public: } - template< typename R, typename A > - R call( A a ) + template< typename R, typename SCB, typename ...ArgTs > + R call( SCB simCB , ArgTs ...args ) { if (Con::isMainThread()) { ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+0, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); + CSTK.reserveValues(mArgc+sizeof...(ArgTs), mArgv); + mArgv[ 0 ].value->setStackStringValue(simCB); - + Helper::marshallEach(mArgc, mArgv, args...); return R( EngineUnmarshallData< R >()( _exec() ) ); } else { SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+0, NULL, true, &cb); + SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+sizeof...(ArgTs), NULL, true, &cb); evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - + mArgv[ 0 ].value->setStackStringValue(simCB); + + Helper::marshallEach(mArgc, mArgv, args...); Sim::postEvent(mThis, evt, Sim::getCurrentTime()); return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); } } - - template< typename R, typename A, typename B > - R call( A a, B b ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+1, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+1, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C > - R call( A a, B b, C c ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+2, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+2, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D > - R call( A a, B b, C c, D d ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+3, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+3, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E > - R call( A a, B b, C c, D d, E e ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+4, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+4, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > - R call( A a, B b, C c, D d, E e, F f ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+5, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+5, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > - R call( A a, B b, C c, D d, E e, F f, G g ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+6, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+6, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > - R call( A a, B b, C c, D d, E e, F f, G g, H h ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+7, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+7, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+8, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+8, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+9, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+9, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+10, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+10, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+11, mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - EngineMarshallData( l, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+11, NULL, true, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(a); - - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - EngineMarshallData( l, mArgc, mArgv ); - - Sim::postEvent(mThis, evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - }; // Override for when first parameter is const char* template<> struct _EngineConsoleExecCallbackHelper : public _BaseEngineConsoleCallbackHelper { +private: + using Helper = engineAPI::detail::MarshallHelpers; +public: _EngineConsoleExecCallbackHelper( const char *callbackName ) { mThis = NULL; @@ -4154,501 +1280,35 @@ template<> struct _EngineConsoleExecCallbackHelper : public _BaseEn mCallbackName = StringTable->insert(callbackName); } - template< typename R > - R call() + template< typename R, typename ...ArgTs > + R call(ArgTs ...args) { if (Con::isMainThread()) { ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc, mArgv); + CSTK.reserveValues(mArgc+sizeof...(ArgTs), mArgv); mArgv[ 0 ].value->setStackStringValue(mCallbackName); + + Helper::marshallEach(mArgc, mArgv, args...); + return R( EngineUnmarshallData< R >()( _exec() ) ); } else { SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc, NULL, false, &cb); + SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+sizeof...(ArgTs), NULL, false, &cb); evt->populateArgs(mArgv); mArgv[ 0 ].value->setStackStringValue(mCallbackName); + + Helper::marshallEach(mArgc, mArgv, args...); Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); } - } - - - - template< typename R, typename A > - R call( A a ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+1, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+1, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B > - R call( A a, B b ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+2, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+2, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C > - R call( A a, B b, C c ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+3, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+3, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D > - R call( A a, B b, C c, D d ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+4, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+4, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E > - R call( A a, B b, C c, D d, E e ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+5, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+5, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > - R call( A a, B b, C c, D d, E e, F f ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+6, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+6, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > - R call( A a, B b, C c, D d, E e, F f, G g ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+7, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+7, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > - R call( A a, B b, C c, D d, E e, F f, G g, H h ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+8, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+8, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+9, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+9, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+10, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+10, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+11, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+11, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - - template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > - R call( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - { - if (Con::isMainThread()) - { - ConsoleStackFrameSaver sav; sav.save(); - CSTK.reserveValues(mArgc+12, mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - EngineMarshallData( l, mArgc, mArgv ); - - return R( EngineUnmarshallData< R >()( _exec() ) ); - } - else - { - SimConsoleThreadExecCallback cb; - SimConsoleThreadExecEvent *evt = new SimConsoleThreadExecEvent(mArgc+12, NULL, false, &cb); - evt->populateArgs(mArgv); - mArgv[ 0 ].value->setStackStringValue(mCallbackName); - - EngineMarshallData( a, mArgc, mArgv ); - EngineMarshallData( b, mArgc, mArgv ); - EngineMarshallData( c, mArgc, mArgv ); - EngineMarshallData( d, mArgc, mArgv ); - EngineMarshallData( e, mArgc, mArgv ); - EngineMarshallData( f, mArgc, mArgv ); - EngineMarshallData( g, mArgc, mArgv ); - EngineMarshallData( h, mArgc, mArgv ); - EngineMarshallData( i, mArgc, mArgv ); - EngineMarshallData( j, mArgc, mArgv ); - EngineMarshallData( k, mArgc, mArgv ); - EngineMarshallData( l, mArgc, mArgv ); - - Sim::postEvent((SimObject*)Sim::getRootGroup(), evt, Sim::getCurrentTime()); - - return R( EngineUnmarshallData< R >()( cb.waitForResult() ) ); - } - } - + } }; // Re-enable some VC warnings we disabled for this file. #pragma warning( pop ) // 4510 and 4610 -#endif // !_ENGINEAPI_H_ \ No newline at end of file +#endif // !_ENGINEAPI_H_ diff --git a/Engine/source/console/engineFunctions.h b/Engine/source/console/engineFunctions.h index dedefcf35..cbe5b1971 100644 --- a/Engine/source/console/engineFunctions.h +++ b/Engine/source/console/engineFunctions.h @@ -23,6 +23,8 @@ #ifndef _ENGINEFUNCTIONS_H_ #define _ENGINEFUNCTIONS_H_ +#include + #ifndef _ENGINEEXPORTS_H_ #include "console/engineExports.h" #endif @@ -87,693 +89,38 @@ struct EngineFunctionDefaultArguments // Structure encapsulating default arguments to an engine API function. template< typename T > struct _EngineFunctionDefaultArguments {}; -template<> -struct _EngineFunctionDefaultArguments< void() > : public EngineFunctionDefaultArguments -{ - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } -}; -template< typename A > -struct _EngineFunctionDefaultArguments< void( A ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( A a ) - : a( a ) - { mNumDefaultArgs = 1; } -}; -template< typename A, typename B > -struct _EngineFunctionDefaultArguments< void( A, B ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( B b ) - : b( b ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( A a, B b ) - : a( a ), - b( b ) - { mNumDefaultArgs = 2; } -}; -template< typename A, typename B, typename C > -struct _EngineFunctionDefaultArguments< void( A, B, C ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( C c ) - : c( c ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( B b, C c ) - : b( b ), - c( c ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( A a, B b, C c ) - : a( a ), - b( b ), - c( c ) - { mNumDefaultArgs = 3; } -}; -template< typename A, typename B, typename C, typename D > -struct _EngineFunctionDefaultArguments< void( A, B, C, D ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( D d ) - : d( d ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( C c, D d ) - : c( c ), - d( d ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( B b, C c, D d ) - : b( b ), - c( c ), - d( d ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d ) - : a( a ), - b( b ), - c( c ), - d( d ) - { mNumDefaultArgs = 4; } -}; -template< typename A, typename B, typename C, typename D, typename E > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( E e ) - : e( e ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( D d, E e ) - : d( d ), - e( e ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( C c, D d, E e ) - : c( c ), - d( d ), - e( e ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e ) - : b( b ), - c( c ), - d( d ), - e( e ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ) - { mNumDefaultArgs = 5; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( F f ) - : f( f ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( E e, F f ) - : e( e ), - f( f ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( D d, E e, F f ) - : d( d ), - e( e ), - f( f ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f ) - : c( c ), - d( d ), - e( e ), - f( f ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ) - { mNumDefaultArgs = 6; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - typename EngineTypeTraits< G >::DefaultArgumentValueStoreType g; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( G g ) - : g( g ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( F f, G g ) - : f( f ), - g( g ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( E e, F f, G g ) - : e( e ), - f( f ), - g( g ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( D d, E e, F f, G g ) - : d( d ), - e( e ), - f( f ), - g( g ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f, G g ) - : c( c ), - d( d ), - e( e ), - f( f ), - g( g ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f, G g ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ) - { mNumDefaultArgs = 6; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f, G g ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ) - { mNumDefaultArgs = 7; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - typename EngineTypeTraits< G >::DefaultArgumentValueStoreType g; - typename EngineTypeTraits< H >::DefaultArgumentValueStoreType h; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( H h ) - : h( h ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( G g, H h ) - : g( g ), - h( h ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( F f, G g, H h ) - : f( f ), - g( g ), - h( h ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( E e, F f, G g, H h ) - : e( e ), - f( f ), - g( g ), - h( h ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( D d, E e, F f, G g, H h ) - : d( d ), - e( e ), - f( f ), - g( g ), - h( h ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f, G g, H h ) - : c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ) - { mNumDefaultArgs = 6; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f, G g, H h ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ) - { mNumDefaultArgs = 7; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f, G g, H h ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ) - { mNumDefaultArgs = 8; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - typename EngineTypeTraits< G >::DefaultArgumentValueStoreType g; - typename EngineTypeTraits< H >::DefaultArgumentValueStoreType h; - typename EngineTypeTraits< I >::DefaultArgumentValueStoreType i; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( I i ) - : i( i ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( H h, I i ) - : h( h ), - i( i ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( G g, H h, I i ) - : g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( F f, G g, H h, I i ) - : f( f ), - g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( E e, F f, G g, H h, I i ) - : e( e ), - f( f ), - g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( D d, E e, F f, G g, H h, I i ) - : d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 6; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f, G g, H h, I i ) - : c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 7; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f, G g, H h, I i ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 8; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f, G g, H h, I i ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ) - { mNumDefaultArgs = 9; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - typename EngineTypeTraits< G >::DefaultArgumentValueStoreType g; - typename EngineTypeTraits< H >::DefaultArgumentValueStoreType h; - typename EngineTypeTraits< I >::DefaultArgumentValueStoreType i; - typename EngineTypeTraits< J >::DefaultArgumentValueStoreType j; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( J j ) - : j( j ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( I i, J j ) - : i( i ), - j( j ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( H h, I i, J j ) - : h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( G g, H h, I i, J j ) - : g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( F f, G g, H h, I i, J j ) - : f( f ), - g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( E e, F f, G g, H h, I i, J j ) - : e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 6; } - _EngineFunctionDefaultArguments( D d, E e, F f, G g, H h, I i, J j ) - : d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 7; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f, G g, H h, I i, J j ) - : c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 8; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f, G g, H h, I i, J j ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 9; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ) - { mNumDefaultArgs = 10; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J, K ) > : public EngineFunctionDefaultArguments -{ - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - typename EngineTypeTraits< G >::DefaultArgumentValueStoreType g; - typename EngineTypeTraits< H >::DefaultArgumentValueStoreType h; - typename EngineTypeTraits< I >::DefaultArgumentValueStoreType i; - typename EngineTypeTraits< J >::DefaultArgumentValueStoreType j; - typename EngineTypeTraits< K >::DefaultArgumentValueStoreType k; - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( K k ) - : k( k ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( J j, K k ) - : j( j ), - k( k ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( I i, J j, K k ) - : i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( H h, I i, J j, K k ) - : h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( G g, H h, I i, J j, K k ) - : g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( F f, G g, H h, I i, J j, K k ) - : f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 6; } - _EngineFunctionDefaultArguments( E e, F f, G g, H h, I i, J j, K k ) - : e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 7; } - _EngineFunctionDefaultArguments( D d, E e, F f, G g, H h, I i, J j, K k ) - : d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 8; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f, G g, H h, I i, J j, K k ) - : c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 9; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 10; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ) - { mNumDefaultArgs = 11; } -}; -template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineFunctionDefaultArguments< void( A, B, C, D, E, F, G, H, I, J, K, L ) > : public EngineFunctionDefaultArguments +template +struct _EngineFunctionDefaultArguments< void(ArgTs...) > : public EngineFunctionDefaultArguments { - typename EngineTypeTraits< A >::DefaultArgumentValueStoreType a; - typename EngineTypeTraits< B >::DefaultArgumentValueStoreType b; - typename EngineTypeTraits< C >::DefaultArgumentValueStoreType c; - typename EngineTypeTraits< D >::DefaultArgumentValueStoreType d; - typename EngineTypeTraits< E >::DefaultArgumentValueStoreType e; - typename EngineTypeTraits< F >::DefaultArgumentValueStoreType f; - typename EngineTypeTraits< G >::DefaultArgumentValueStoreType g; - typename EngineTypeTraits< H >::DefaultArgumentValueStoreType h; - typename EngineTypeTraits< I >::DefaultArgumentValueStoreType i; - typename EngineTypeTraits< J >::DefaultArgumentValueStoreType j; - typename EngineTypeTraits< K >::DefaultArgumentValueStoreType k; - typename EngineTypeTraits< L >::DefaultArgumentValueStoreType l; - - _EngineFunctionDefaultArguments() - { mNumDefaultArgs = 0; } - _EngineFunctionDefaultArguments( L l ) - : l( l ) - { mNumDefaultArgs = 1; } - _EngineFunctionDefaultArguments( K k, L l ) - : k( k ), - l( l ) - { mNumDefaultArgs = 2; } - _EngineFunctionDefaultArguments( J j, K k, L l ) - : j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 3; } - _EngineFunctionDefaultArguments( I i, J j, K k, L l ) - : i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 4; } - _EngineFunctionDefaultArguments( H h, I i, J j, K k, L l ) - : h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 5; } - _EngineFunctionDefaultArguments( G g, H h, I i, J j, K k, L l ) - : g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 6; } - _EngineFunctionDefaultArguments( F f, G g, H h, I i, J j, K k, L l ) - : f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 7; } - _EngineFunctionDefaultArguments( E e, F f, G g, H h, I i, J j, K k, L l ) - : e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 8; } - _EngineFunctionDefaultArguments( D d, E e, F f, G g, H h, I i, J j, K k, L l ) - : d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 9; } - _EngineFunctionDefaultArguments( C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - : c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 10; } - _EngineFunctionDefaultArguments( B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - : b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 11; } - _EngineFunctionDefaultArguments( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l ) - : a( a ), - b( b ), - c( c ), - d( d ), - e( e ), - f( f ), - g( g ), - h( h ), - i( i ), - j( j ), - k( k ), - l( l ) - { mNumDefaultArgs = 12; } + template using DefVST = typename EngineTypeTraits::DefaultArgumentValueStoreType; + std::tuple ...> mArgs; +private: + using SelfType = _EngineFunctionDefaultArguments< void(ArgTs...) >; + + template struct Seq {}; + template struct Gens : Gens {}; + + template struct Gens<0, I...>{ typedef Seq type; }; + + template + static void copyHelper(std::tuple ...> &args, std::tuple ...> &defaultArgs, Seq) { + std::tie(std::get(args)...) = defaultArgs; + } + + template using MaybeSelfEnabled = typename std::enable_if::type; + + template static MaybeSelfEnabled tailInit(TailTs ...tail) { + std::tuple...> argsT; + std::tuple...> tailT = std::make_tuple(tail...); + SelfType::copyHelper(argsT, tailT, typename Gens::type()); + return argsT; + }; + +public: + template _EngineFunctionDefaultArguments(TailTs ...tail) + : EngineFunctionDefaultArguments({sizeof...(TailTs)}), mArgs(SelfType::tailInit(tail...)) + {} }; #pragma pack( pop ) diff --git a/Engine/source/console/enginePrimitives.h b/Engine/source/console/enginePrimitives.h index 72f1899e7..7f0b37670 100644 --- a/Engine/source/console/enginePrimitives.h +++ b/Engine/source/console/enginePrimitives.h @@ -41,6 +41,8 @@ DECLARE_PRIMITIVE_R(S32); DECLARE_PRIMITIVE_R(U32); DECLARE_PRIMITIVE_R(F32); DECLARE_PRIMITIVE_R(F64); +DECLARE_PRIMITIVE_R(U64); +DECLARE_PRIMITIVE_R(S64); DECLARE_PRIMITIVE_R(void*); diff --git a/Engine/source/console/engineTypeInfo.h b/Engine/source/console/engineTypeInfo.h index 52d713e9e..7a9f7122c 100644 --- a/Engine/source/console/engineTypeInfo.h +++ b/Engine/source/console/engineTypeInfo.h @@ -648,395 +648,33 @@ template< typename T > const EngineFunctionTypeInfo< T > _EngineFunctionTypeTrai // Function Argument Type Infos. //-------------------------------------------------------------------------- -template< typename R > -struct _EngineArgumentTypeTable< R() > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 0; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; -#ifdef TORQUE_COMPILER_GCC - static const EngineTypeInfo* const ARGS[ 0 ]; + +#ifdef TORQUE_COMILER_GCC +#define ARGS_SIZE_SAFE(wanted) (wanted) #else - static const EngineTypeInfo* const ARGS[ 1 ]; +#define ARGS_SIZE_SAFE(wanted) (((wanted) < 1) ? 1 : (wanted)) #endif - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R > const EngineTypeInfo* const _EngineArgumentTypeTable< R() >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -#ifdef TORQUE_COMPILER_GCC -template< typename R > const EngineTypeInfo* const _EngineArgumentTypeTable< R() >::ARGS[ 0 ] = {}; -#else -template< typename R > const EngineTypeInfo* const _EngineArgumentTypeTable< R() >::ARGS[ 1 ] = {}; -#endif -template< typename R > -struct _EngineArgumentTypeTable< R( ... ) > : public _EngineArgumentTypeTable< R() > +template< typename R, typename ...ArgTs > +struct _EngineArgumentTypeTable< R( ArgTs ... ) > : public EngineArgumentTypeTable { - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A > -struct _EngineArgumentTypeTable< R( A ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 1; + static const U32 NUM_ARGUMENTS = sizeof...(ArgTs); static const bool VARIADIC = false; static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 1 ]; + static const EngineTypeInfo* const ARGS[ ARGS_SIZE_SAFE(sizeof...(ArgTs)) ]; _EngineArgumentTypeTable() : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} }; -template< typename R, typename A > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A ) >::ARGS[ 1 ] = +template< typename R, typename ...ArgTs > +const EngineTypeInfo* const _EngineArgumentTypeTable< R( ArgTs ... ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); +template< typename R, typename ...ArgTs > +const EngineTypeInfo* const _EngineArgumentTypeTable< R( ArgTs ... ) >::ARGS[ ARGS_SIZE_SAFE(sizeof...(ArgTs)) ] = { - TYPE< typename EngineTypeTraits< A >::Type >() + TYPE< typename EngineTypeTraits< ArgTs >::Type >() ... }; -template< typename R, typename A > -struct _EngineArgumentTypeTable< R( A, ... ) > : public _EngineArgumentTypeTable< R( A ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B > -struct _EngineArgumentTypeTable< R( A, B ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 2; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 2 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B ) >::ARGS[ 2 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >() -}; -template< typename R, typename A, typename B > -struct _EngineArgumentTypeTable< R( A, B, ... ) > : public _EngineArgumentTypeTable< R( A, B ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C > -struct _EngineArgumentTypeTable< R( A, B, C ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 3; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 3 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C ) >::ARGS[ 3 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >() -}; -template< typename R, typename A, typename B, typename C > -struct _EngineArgumentTypeTable< R( A, B, C, ... ) > : public _EngineArgumentTypeTable< R( A, B, C ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D > -struct _EngineArgumentTypeTable< R( A, B, C, D ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 4; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 4 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D ) >::ARGS[ 4 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D > -struct _EngineArgumentTypeTable< R( A, B, C, D, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineArgumentTypeTable< R( A, B, C, D, E ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 5; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 5 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E ) >::ARGS[ 5 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 6; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 6 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F ) >::ARGS[ 6 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 7; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 7 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G ) >::ARGS[ 7 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >(), - TYPE< typename EngineTypeTraits< G >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F, G ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 8; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 8 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H ) >::ARGS[ 8 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >(), - TYPE< typename EngineTypeTraits< G >::Type >(), - TYPE< typename EngineTypeTraits< H >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 9; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 9 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I ) >::ARGS[ 9 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >(), - TYPE< typename EngineTypeTraits< G >::Type >(), - TYPE< typename EngineTypeTraits< H >::Type >(), - TYPE< typename EngineTypeTraits< I >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 10; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 10 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J ) >::ARGS[ 10 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >(), - TYPE< typename EngineTypeTraits< G >::Type >(), - TYPE< typename EngineTypeTraits< H >::Type >(), - TYPE< typename EngineTypeTraits< I >::Type >(), - TYPE< typename EngineTypeTraits< J >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 11; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 11 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K ) >::ARGS[ 11 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >(), - TYPE< typename EngineTypeTraits< G >::Type >(), - TYPE< typename EngineTypeTraits< H >::Type >(), - TYPE< typename EngineTypeTraits< I >::Type >(), - TYPE< typename EngineTypeTraits< J >::Type >(), - TYPE< typename EngineTypeTraits< K >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K ) > -{ - static const bool VARIADIC = true; - _EngineArgumentTypeTable() {} -}; - -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K, L ) > : public EngineArgumentTypeTable -{ - static const U32 NUM_ARGUMENTS = 12; - static const bool VARIADIC = false; - static const EngineTypeInfo* const RETURN; - static const EngineTypeInfo* const ARGS[ 12 ]; - - _EngineArgumentTypeTable() - : EngineArgumentTypeTable( TYPE< typename EngineTypeTraits< R >::Type >(), NUM_ARGUMENTS, ARGS ) {} -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K, L ) >::RETURN = TYPE< typename EngineTypeTraits< R >::Type >(); -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -const EngineTypeInfo* const _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K, L ) >::ARGS[ 12 ] = -{ - TYPE< typename EngineTypeTraits< A >::Type >(), - TYPE< typename EngineTypeTraits< B >::Type >(), - TYPE< typename EngineTypeTraits< C >::Type >(), - TYPE< typename EngineTypeTraits< D >::Type >(), - TYPE< typename EngineTypeTraits< E >::Type >(), - TYPE< typename EngineTypeTraits< F >::Type >(), - TYPE< typename EngineTypeTraits< G >::Type >(), - TYPE< typename EngineTypeTraits< H >::Type >(), - TYPE< typename EngineTypeTraits< I >::Type >(), - TYPE< typename EngineTypeTraits< J >::Type >(), - TYPE< typename EngineTypeTraits< K >::Type >(), - TYPE< typename EngineTypeTraits< L >::Type >() -}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K, L, ... ) > : public _EngineArgumentTypeTable< R( A, B, C, D, E, F, G, H, I, J, K, L ) > +template< typename R, typename ... ArgTs > +struct _EngineArgumentTypeTable< R( ArgTs ..., ... ) > : public _EngineArgumentTypeTable< R( ArgTs ... ) > { static const bool VARIADIC = true; _EngineArgumentTypeTable() {} diff --git a/Engine/source/console/engineTypes.h b/Engine/source/console/engineTypes.h index 65e81e5d6..321e39686 100644 --- a/Engine/source/console/engineTypes.h +++ b/Engine/source/console/engineTypes.h @@ -284,58 +284,10 @@ template< typename T > const EngineTypeInfo* const _EngineFunctionTypeTraits< T // are not guaranteed to be any meaningful value or base types to the engine type system. #define T( x ) typename EngineTypeTraits< x >::ValueType -template< typename R > -struct _EngineTypeTraits< R() > : public _EngineFunctionTypeTraits< T( R )() > {}; -template< typename R > -struct _EngineTypeTraits< R( ... ) > : public _EngineFunctionTypeTraits< T( R )( ... ) > {}; -template< typename R, typename A > -struct _EngineTypeTraits< R( A ) > : public _EngineFunctionTypeTraits< T( R )( T( A ) ) > {}; -template< typename R, typename A > -struct _EngineTypeTraits< R( A, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), ... ) > {}; -template< typename R, typename A, typename B > -struct _EngineTypeTraits< R( A, B ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ) ) > {}; -template< typename R, typename A, typename B > -struct _EngineTypeTraits< R( A, B, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), ... ) > {}; -template< typename R, typename A, typename B, typename C > -struct _EngineTypeTraits< R( A, B, C ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ) ) > {}; -template< typename R, typename A, typename B, typename C > -struct _EngineTypeTraits< R( A, B, C, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D > -struct _EngineTypeTraits< R( A, B, C, D ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D > -struct _EngineTypeTraits< R( A, B, C, D, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineTypeTraits< R( A, B, C, D, E ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E > -struct _EngineTypeTraits< R( A, B, C, D, E, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineTypeTraits< R( A, B, C, D, E, F ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F > -struct _EngineTypeTraits< R( A, B, C, D, E, F, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, J ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), T( J ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, J, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), T( J ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, J, K ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), T( J ), T( K ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, J, K, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), T( J ), T( K ), ... ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, J, K, L ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), T( J ), T( K ), T( L ) ) > {}; -template< typename R, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L > -struct _EngineTypeTraits< R( A, B, C, D, E, F, G, H, I, J, K, L, ... ) > : public _EngineFunctionTypeTraits< T( R )( T( A ), T( B ), T( C ), T( D ), T( E ), T( F ), T( G ), T( H ), T( I ), T( J ), T( K ), T( L ), ... ) > {}; +template +struct _EngineTypeTraits< R(ArgTs ...) > : public _EngineFunctionTypeTraits {}; +template +struct _EngineTypeTraits< R(ArgTs ..., ...) > : public _EngineFunctionTypeTraits {}; #undef T diff --git a/Engine/source/console/fieldBrushObject.cpp b/Engine/source/console/fieldBrushObject.cpp index d0eaf541c..407a57cb3 100644 --- a/Engine/source/console/fieldBrushObject.cpp +++ b/Engine/source/console/fieldBrushObject.cpp @@ -41,8 +41,8 @@ ConsoleDocClass( FieldBrushObject, FieldBrushObject::FieldBrushObject() { // Reset Description. - mDescription = StringTable->insert(""); - mSortName = StringTable->insert(""); + mDescription = StringTable->EmptyString(); + mSortName = StringTable->EmptyString(); } @@ -109,15 +109,15 @@ void FieldBrushObject::destroyFields() static char replacebuf[1024]; static char* suppressSpaces(const char* in_pname) { - U32 i = 0; - char chr; - do - { - chr = in_pname[i]; - replacebuf[i++] = (chr != 32) ? chr : '_'; - } while(chr); + U32 i = 0; + char chr; + do + { + chr = in_pname[i]; + replacebuf[i++] = (chr != 32) ? chr : '_'; + } while(chr); - return replacebuf; + return replacebuf; } //----------------------------------------------------------------------------- @@ -125,7 +125,7 @@ static char* suppressSpaces(const char* in_pname) //----------------------------------------------------------------------------- DefineConsoleMethod(FieldBrushObject, queryGroups, const char*, (const char* simObjName), , "(simObject) Query available static-field groups for selected object./\n" "@param simObject Object to query static-field groups on.\n" - "@return Space-seperated static-field group list.") + "@return Space-seperated static-field group list.") { // Fetch selected object. SimObject* pSimObject = dynamic_cast( Sim::findObject( simObjName ) ); @@ -194,7 +194,7 @@ DefineConsoleMethod(FieldBrushObject, queryGroups, const char*, (const char* sim DefineConsoleMethod(FieldBrushObject, queryFields, const char*, (const char* simObjName, const char* groupList), (""), "(simObject, [groupList]) Query available static-fields for selected object./\n" "@param simObject Object to query static-fields on.\n" "@param groupList groups to filter static-fields against.\n" - "@return Space-seperated static-field list.") + "@return Space-seperated static-field list.") { // Fetch selected object. SimObject* pSimObject = dynamic_cast( Sim::findObject( simObjName ) ); @@ -369,7 +369,7 @@ DefineConsoleMethod(FieldBrushObject, queryFields, const char*, (const char* sim DefineConsoleMethod(FieldBrushObject, copyFields, void, (const char* simObjName, const char* pFieldList), (""), "(simObject, [fieldList]) Copy selected static-fields for selected object./\n" "@param simObject Object to copy static-fields from.\n" "@param fieldList fields to filter static-fields against.\n" - "@return No return value.") + "@return No return value.") { // Fetch selected object. SimObject* pSimObject = dynamic_cast( Sim::findObject( simObjName ) ); @@ -502,7 +502,7 @@ void FieldBrushObject::copyFields( SimObject* pSimObject, const char* fieldList //----------------------------------------------------------------------------- DefineConsoleMethod(FieldBrushObject, pasteFields, void, (const char* simObjName), , "(simObject) Paste copied static-fields to selected object./\n" "@param simObject Object to paste static-fields to.\n" - "@return No return value.") + "@return No return value.") { // Fetch selected object. SimObject* pSimObject = dynamic_cast( Sim::findObject( simObjName ) ); diff --git a/Engine/source/console/fileSystemFunctions.cpp b/Engine/source/console/fileSystemFunctions.cpp index d5ee048ca..d8531ff7c 100644 --- a/Engine/source/console/fileSystemFunctions.cpp +++ b/Engine/source/console/fileSystemFunctions.cpp @@ -210,7 +210,7 @@ DefineEngineFunction( findNextFile, String, ( const char* pattern ), ( "" ), //----------------------------------------------------------------------------- DefineEngineFunction( getFileCount, S32, ( const char* pattern, bool recurse ), ( "", true ), - "@brief Returns the number of files in the directory tree that match the given patterns\n\n" + "@brief Returns the number of files in the directory tree that match the given patterns\n\n" "This function differs from getFileCountMultiExpr() in that it supports a single search " "pattern being passed in.\n\n" @@ -246,7 +246,7 @@ DefineEngineFunction( getFileCount, S32, ( const char* pattern, bool recurse ), //----------------------------------------------------------------------------- DefineEngineFunction(findFirstFileMultiExpr, String, ( const char* pattern, bool recurse ), ( "", true), - "@brief Returns the first file in the directory system matching the given patterns.\n\n" + "@brief Returns the first file in the directory system matching the given patterns.\n\n" "Use the corresponding findNextFileMultiExpr() to step through " "the results. If you're only interested in the number of files returned by the " @@ -259,10 +259,10 @@ DefineEngineFunction(findFirstFileMultiExpr, String, ( const char* pattern, bool "call to findFirstFile() and findFirstFileMultiExpr() initiates a new search and renders " "a previous search invalid.\n\n" - "@param pattern The path and file name pattern to match against, such as *.cs. Separate " + "@param pattern The path and file name pattern to match against, such as *.cs. Separate " "multiple patterns with TABs. For example: \"*.cs\" TAB \"*.dso\"\n" - "@param recurse If true, the search will exhaustively recurse into subdirectories " - "of the given path and match the given filename patterns.\n" + "@param recurse If true, the search will exhaustively recurse into subdirectories " + "of the given path and match the given filename patterns.\n" "@return String of the first matching file path, or an empty string if no matching " "files were found.\n\n" @@ -280,7 +280,7 @@ DefineEngineFunction(findFirstFileMultiExpr, String, ( const char* pattern, bool "@see findNextFileMultiExpr()" "@see getFileCountMultiExpr()" "@see findFirstFile()" - "@ingroup FileSearches") + "@ingroup FileSearches") { S32 numResults = buildFileList(pattern, recurse, true); @@ -302,7 +302,7 @@ DefineEngineFunction(findFirstFileMultiExpr, String, ( const char* pattern, bool DefineEngineFunction(findNextFileMultiExpr, String, ( const char* pattern ), (""), "@brief Returns the next file matching a search begun in findFirstFileMultiExpr().\n\n" - "@param pattern The path and file name pattern to match against. This is optional " + "@param pattern The path and file name pattern to match against. This is optional " "and may be left out as it is not used by the code. It is here for legacy reasons.\n" "@return String of the next matching file path, or an empty string if no matching " "files were found.\n\n" @@ -319,7 +319,7 @@ DefineEngineFunction(findNextFileMultiExpr, String, ( const char* pattern ), ("" "@endtsexample\n\n" "@see findFirstFileMultiExpr()" - "@ingroup FileSearches") + "@ingroup FileSearches") { if ( sgFindFilesPos + 1 > sgFindFilesResults.size() ) return String(); @@ -328,16 +328,16 @@ DefineEngineFunction(findNextFileMultiExpr, String, ( const char* pattern ), ("" } DefineEngineFunction(getFileCountMultiExpr, S32, ( const char* pattern, bool recurse ), ( "", true), - "@brief Returns the number of files in the directory tree that match the given patterns\n\n" + "@brief Returns the number of files in the directory tree that match the given patterns\n\n" "If you're interested in a list of files that match the given patterns and not just " "the number of files, use findFirstFileMultiExpr() and findNextFileMultiExpr().\n\n" - "@param pattern The path and file name pattern to match against, such as *.cs. Separate " + "@param pattern The path and file name pattern to match against, such as *.cs. Separate " "multiple patterns with TABs. For example: \"*.cs\" TAB \"*.dso\"\n" - "@param recurse If true, the search will exhaustively recurse into subdirectories " - "of the given path and match the given filename pattern.\n" - "@return Number of files located using the patterns\n\n" + "@param recurse If true, the search will exhaustively recurse into subdirectories " + "of the given path and match the given filename pattern.\n" + "@return Number of files located using the patterns\n\n" "@tsexample\n" "// Count all DTS or Collada models\n" @@ -347,7 +347,7 @@ DefineEngineFunction(getFileCountMultiExpr, S32, ( const char* pattern, bool rec "@see findFirstFileMultiExpr()" "@see findNextFileMultiExpr()" - "@ingroup FileSearches") + "@ingroup FileSearches") { S32 numResults = buildFileList(pattern, recurse, true); @@ -399,14 +399,14 @@ DefineEngineFunction(isFile, bool, ( const char* fileName ),, } DefineEngineFunction( IsDirectory, bool, ( const char* directory ),, - "@brief Determines if a specified directory exists or not\n\n" + "@brief Determines if a specified directory exists or not\n\n" - "@param directory String containing path in the form of \"foo/bar\"\n" + "@param directory String containing path in the form of \"foo/bar\"\n" "@return Returns true if the directory was found.\n" - "@note Do not include a trailing slash '/'.\n" + "@note Do not include a trailing slash '/'.\n" - "@ingroup FileSystem") + "@ingroup FileSystem") { String dir(Torque::Path::CleanSeparators(directory)); Con::expandScriptFilename(sgScriptFilenameBuffer, sizeof(sgScriptFilenameBuffer), dir.c_str()); @@ -416,12 +416,12 @@ DefineEngineFunction( IsDirectory, bool, ( const char* directory ),, } DefineEngineFunction(isWriteableFileName, bool, ( const char* fileName ),, - "@brief Determines if a file name can be written to using File I/O\n\n" + "@brief Determines if a file name can be written to using File I/O\n\n" - "@param fileName Name and path of file to check\n" - "@return Returns true if the file can be written to.\n" + "@param fileName Name and path of file to check\n" + "@return Returns true if the file can be written to.\n" - "@ingroup FileSystem") + "@ingroup FileSystem") { String filename(Torque::Path::CleanSeparators(fileName)); Con::expandScriptFilename(sgScriptFilenameBuffer, sizeof(sgScriptFilenameBuffer), filename.c_str()); @@ -434,32 +434,32 @@ DefineEngineFunction(isWriteableFileName, bool, ( const char* fileName ),, } DefineEngineFunction(startFileChangeNotifications, void, (),, - "@brief Start watching resources for file changes\n\n" + "@brief Start watching resources for file changes\n\n" "Typically this is called during initializeCore().\n\n" "@see stopFileChangeNotifications()\n" - "@ingroup FileSystem") + "@ingroup FileSystem") { Torque::FS::StartFileChangeNotifications(); } DefineEngineFunction(stopFileChangeNotifications, void, (),, - "@brief Stop watching resources for file changes\n\n" + "@brief Stop watching resources for file changes\n\n" "Typically this is called during shutdownCore().\n\n" "@see startFileChangeNotifications()\n" - "@ingroup FileSystem") + "@ingroup FileSystem") { Torque::FS::StopFileChangeNotifications(); } DefineEngineFunction(getDirectoryList, String, ( const char* path, S32 depth ), ( "", 0 ), - "@brief Gathers a list of directories starting at the given path.\n\n" + "@brief Gathers a list of directories starting at the given path.\n\n" - "@param path String containing the path of the directory\n" - "@param depth Depth of search, as in how many subdirectories to parse through\n" - "@return Tab delimited string containing list of directories found during search, \"\" if no files were found\n" + "@param path String containing the path of the directory\n" + "@param depth Depth of search, as in how many subdirectories to parse through\n" + "@return Tab delimited string containing list of directories found during search, \"\" if no files were found\n" - "@ingroup FileSystem") + "@ingroup FileSystem") { // Grab the full path. char fullpath[1024]; @@ -508,23 +508,23 @@ DefineEngineFunction(getDirectoryList, String, ( const char* path, S32 depth ), } DefineEngineFunction(fileSize, S32, ( const char* fileName ),, - "@brief Determines the size of a file on disk\n\n" + "@brief Determines the size of a file on disk\n\n" - "@param fileName Name and path of the file to check\n" - "@return Returns filesize in bytes, or -1 if no file\n" + "@param fileName Name and path of the file to check\n" + "@return Returns filesize in bytes, or -1 if no file\n" - "@ingroup FileSystem") + "@ingroup FileSystem") { Con::expandScriptFilename(sgScriptFilenameBuffer, sizeof(sgScriptFilenameBuffer), fileName); return Platform::getFileSize( sgScriptFilenameBuffer ); } DefineEngineFunction( fileModifiedTime, String, ( const char* fileName ),, - "@brief Returns a platform specific formatted string with the last modified time for the file.\n\n" + "@brief Returns a platform specific formatted string with the last modified time for the file.\n\n" - "@param fileName Name and path of file to check\n" - "@return Formatted string (OS specific) containing modified time, \"9/3/2010 12:33:47 PM\" for example\n" - "@ingroup FileSystem") + "@param fileName Name and path of file to check\n" + "@return Formatted string (OS specific) containing modified time, \"9/3/2010 12:33:47 PM\" for example\n" + "@ingroup FileSystem") { Con::expandScriptFilename(sgScriptFilenameBuffer, sizeof(sgScriptFilenameBuffer), fileName); @@ -566,12 +566,12 @@ DefineEngineFunction( fileCreatedTime, String, ( const char* fileName ),, } DefineEngineFunction(fileDelete, bool, ( const char* path ),, - "@brief Delete a file from the hard drive\n\n" + "@brief Delete a file from the hard drive\n\n" - "@param path Name and path of the file to delete\n" - "@note THERE IS NO RECOVERY FROM THIS. Deleted file is gone for good.\n" - "@return True if file was successfully deleted\n" - "@ingroup FileSystem") + "@param path Name and path of the file to delete\n" + "@note THERE IS NO RECOVERY FROM THIS. Deleted file is gone for good.\n" + "@return True if file was successfully deleted\n" + "@ingroup FileSystem") { static char fileName[1024]; static char sandboxFileName[1024]; @@ -586,11 +586,11 @@ DefineEngineFunction(fileDelete, bool, ( const char* path ),, //---------------------------------------------------------------- DefineEngineFunction(fileExt, String, ( const char* fileName ),, - "@brief Get the extension of a file\n\n" + "@brief Get the extension of a file\n\n" - "@param fileName Name and path of file\n" - "@return String containing the extension, such as \".exe\" or \".cs\"\n" - "@ingroup FileSystem") + "@param fileName Name and path of file\n" + "@return String containing the extension, such as \".exe\" or \".cs\"\n" + "@ingroup FileSystem") { const char *ret = dStrrchr(fileName, '.'); if(ret) @@ -626,11 +626,11 @@ DefineEngineFunction(fileBase, String, ( const char* fileName ),, } DefineEngineFunction(fileName, String, ( const char* fileName ),, - "@brief Get only the file name of a path and file name string (removes path)\n\n" + "@brief Get only the file name of a path and file name string (removes path)\n\n" - "@param fileName Name and path of file to check\n" - "@return String containing the file name, minus the path\n" - "@ingroup FileSystem") + "@param fileName Name and path of file to check\n" + "@return String containing the file name, minus the path\n" + "@ingroup FileSystem") { S32 pathLen = dStrlen( fileName ); FrameTemp szPathCopy( pathLen + 1); @@ -649,11 +649,11 @@ DefineEngineFunction(fileName, String, ( const char* fileName ),, } DefineEngineFunction(filePath, String, ( const char* fileName ),, - "@brief Get the path of a file (removes name and extension)\n\n" + "@brief Get the path of a file (removes name and extension)\n\n" - "@param fileName Name and path of file to check\n" - "@return String containing the path, minus name and extension\n" - "@ingroup FileSystem") + "@param fileName Name and path of file to check\n" + "@return String containing the path, minus name and extension\n" + "@ingroup FileSystem") { S32 pathLen = dStrlen( fileName ); FrameTemp szPathCopy( pathLen + 1); @@ -672,10 +672,10 @@ DefineEngineFunction(filePath, String, ( const char* fileName ),, } DefineEngineFunction(getWorkingDirectory, String, (),, - "@brief Reports the current directory\n\n" + "@brief Reports the current directory\n\n" - "@return String containing full file path of working directory\n" - "@ingroup FileSystem") + "@return String containing full file path of working directory\n" + "@ingroup FileSystem") { return Platform::getCurrentDirectory(); } @@ -687,13 +687,13 @@ DefineEngineFunction(getWorkingDirectory, String, (),, // are not currently built with TORQUE_TOOLS defined. DefineEngineFunction(makeFullPath, String, ( const char* path, const char* cwd ), ( "", ""), - "@brief Converts a relative file path to a full path\n\n" + "@brief Converts a relative file path to a full path\n\n" - "For example, \"./console.log\" becomes \"C:/Torque/t3d/examples/FPS Example/game/console.log\"\n" - "@param path Name of file or path to check\n" + "For example, \"./console.log\" becomes \"C:/Torque/t3d/examples/FPS Example/game/console.log\"\n" + "@param path Name of file or path to check\n" "@param cwd Optional current working directory from which to build the full path.\n" - "@return String containing non-relative directory of path\n" - "@ingroup FileSystem") + "@return String containing non-relative directory of path\n" + "@ingroup FileSystem") { static const U32 bufSize = 512; char *buf = Con::getReturnBuffer(bufSize); @@ -702,25 +702,25 @@ DefineEngineFunction(makeFullPath, String, ( const char* path, const char* cwd ) } DefineEngineFunction(makeRelativePath, String, ( const char* path, const char* to ), ( "", ""), - "@brief Turns a full or local path to a relative one\n\n" + "@brief Turns a full or local path to a relative one\n\n" "For example, \"./game/art\" becomes \"game/art\"\n" "@param path Full path (may include a file) to convert\n" "@param to Optional base path used for the conversion. If not supplied the current " "working directory is used.\n" - "@returns String containing relative path\n" - "@ingroup FileSystem") + "@returns String containing relative path\n" + "@ingroup FileSystem") { return Platform::makeRelativePathName( path, dStrlen(to) > 1 ? to : NULL ); } DefineEngineFunction(pathConcat, String, ( const char* path, const char* file), ( "", ""), - "@brief Combines two separate strings containing a file path and file name together into a single string\n\n" + "@brief Combines two separate strings containing a file path and file name together into a single string\n\n" - "@param path String containing file path\n" - "@param file String containing file name\n" - "@return String containing concatenated file name and path\n" - "@ingroup FileSystem") + "@param path String containing file path\n" + "@param file String containing file name\n" + "@return String containing concatenated file name and path\n" + "@ingroup FileSystem") { static const U32 bufSize = 1024; char *buf = Con::getReturnBuffer(bufSize); @@ -731,10 +731,10 @@ DefineEngineFunction(pathConcat, String, ( const char* path, const char* file), //----------------------------------------------------------------------------- DefineEngineFunction(getExecutableName, String, (),, - "@brief Gets the name of the game's executable\n\n" + "@brief Gets the name of the game's executable\n\n" - "@return String containing this game's executable name\n" - "@ingroup FileSystem") + "@return String containing this game's executable name\n" + "@ingroup FileSystem") { return Platform::getExecutableName(); } diff --git a/Engine/source/console/persistenceManager.cpp b/Engine/source/console/persistenceManager.cpp index 322626801..c4af549ed 100644 --- a/Engine/source/console/persistenceManager.cpp +++ b/Engine/source/console/persistenceManager.cpp @@ -34,22 +34,22 @@ IMPLEMENT_CONOBJECT(PersistenceManager); ConsoleDocClass( PersistenceManager, - "@brief this class manages updating SimObjects in the file they were " - "created in non-destructively (mostly aimed at datablocks and materials).\n\n" + "@brief this class manages updating SimObjects in the file they were " + "created in non-destructively (mostly aimed at datablocks and materials).\n\n" - "Basic scripting interface:\n\n" - " - Creation: new PersistenceManager(FooManager);\n" - " - Flag objects as dirty: FooManager.setDirty();\n" - " - Remove objects from dirty list: FooManager.removeDirty();\n" - " - List all currently dirty objects: FooManager.listDirty();\n" - " - Check to see if an object is dirty: FooManager.isDirty();\n" - " - Save dirty objects to their files: FooManager.saveDirty();\n\n" - "@note Dirty objects don't update their files until saveDirty() is " - "called so you can change their properties after you flag them as dirty\n\n" - "@note Currently only used by editors, not intended for actual game development\n\n" - "@ingroup Console\n" - "@ingroup Editors\n" - "@internal"); + "Basic scripting interface:\n\n" + " - Creation: new PersistenceManager(FooManager);\n" + " - Flag objects as dirty: FooManager.setDirty();\n" + " - Remove objects from dirty list: FooManager.removeDirty();\n" + " - List all currently dirty objects: FooManager.listDirty();\n" + " - Check to see if an object is dirty: FooManager.isDirty();\n" + " - Save dirty objects to their files: FooManager.saveDirty();\n\n" + "@note Dirty objects don't update their files until saveDirty() is " + "called so you can change their properties after you flag them as dirty\n\n" + "@note Currently only used by editors, not intended for actual game development\n\n" + "@ingroup Console\n" + "@ingroup Editors\n" + "@internal"); PersistenceManager::PersistenceManager() { @@ -328,7 +328,7 @@ void PersistenceManager::parseObject() if (mParser.tokenICmp(")")) { - mCurrentObject->name = StringTable->insert(""); + mCurrentObject->name = StringTable->EmptyString(); mCurrentObject->nameLine = mParser.getCurrentLine(); mCurrentObject->namePosition = mParser.getTokenLineOffset(); @@ -890,7 +890,7 @@ PersistenceManager::ParsedObject* PersistenceManager::findParsedObject(SimObject { const ParsedProperty &prop = testObj->properties[j]; - if ( dStrcmp( prop.name, "internalName" ) == 0 && + if ( dStrcmp( prop.name, "internalName" ) == 0 && dStrcmp( prop.value, object->getInternalName() ) == 0 ) return testObj; else if ( dStrcmp(prop.name, "internalName") == 0) @@ -2037,24 +2037,24 @@ bool PersistenceManager::saveDirtyObject(SimObject* object) const char *name = object->getName(); if (name) { - Con::errorf("PersistenceManager::saveDirtyObject(): Unable to open %s to save %s %s (%d)", - dirtyObject.fileName, object->getClassName(), name, object->getId()); - } - else - { - Con::errorf("PersistenceManager::saveDirtyObject(): Unable to open %s to save %s (%d)", - dirtyObject.fileName, object->getClassName(), object->getId()); - } + Con::errorf("PersistenceManager::saveDirtyObject(): Unable to open %s to save %s %s (%d)", + dirtyObject.fileName, object->getClassName(), name, object->getId()); + } + else + { + Con::errorf("PersistenceManager::saveDirtyObject(): Unable to open %s to save %s (%d)", + dirtyObject.fileName, object->getClassName(), object->getId()); + } - return false; - } + return false; + } // if the file exists then lets update and save - if(mCurrentFile) - { - updateObject(object); + if(mCurrentFile) + { + updateObject(object); saveDirtyFile(); - } + } break; } @@ -2230,7 +2230,7 @@ DefineConsoleMethod( PersistenceManager, removeDirty, void, ( const char * objNa "Remove a SimObject from the dirty list.") { SimObject *dirtyObject = NULL; - if (dStrcmp( objName,"")!=0) + if (dStrcmp( objName,"")!=0) { if (!Sim::findObject(objName, dirtyObject)) { diff --git a/Engine/source/console/scriptFilename.cpp b/Engine/source/console/scriptFilename.cpp index 60c81f200..7a72756af 100644 --- a/Engine/source/console/scriptFilename.cpp +++ b/Engine/source/console/scriptFilename.cpp @@ -343,10 +343,10 @@ bool collapseScriptFilename(char *filename, U32 size, const char *src) //----------------------------------------------------------------------------- ConsoleFunction(expandFilename, const char*, 2, 2, "(string filename)" - "@brief Grabs the full path of a specified file\n\n" - "@param filename Name of the local file to locate\n" - "@return String containing the full filepath on disk\n" - "@ingroup FileSystem") + "@brief Grabs the full path of a specified file\n\n" + "@param filename Name of the local file to locate\n" + "@return String containing the full filepath on disk\n" + "@ingroup FileSystem") { TORQUE_UNUSED(argc); static const U32 bufSize = 1024; @@ -356,9 +356,9 @@ ConsoleFunction(expandFilename, const char*, 2, 2, "(string filename)" } ConsoleFunction(expandOldFilename, const char*, 2, 2, "(string filename)" - "@brief Retrofits a filepath that uses old Torque style\n\n" - "@return String containing filepath with new formatting\n" - "@ingroup FileSystem") + "@brief Retrofits a filepath that uses old Torque style\n\n" + "@return String containing filepath with new formatting\n" + "@ingroup FileSystem") { TORQUE_UNUSED(argc); static const U32 bufSize = 1024; @@ -372,7 +372,7 @@ ConsoleFunction(expandOldFilename, const char*, 2, 2, "(string filename)" //----------------------------------------------------------------------------- ConsoleToolFunction(collapseFilename, const char*, 2, 2, "(string filename)" - "@internal Editor use only") + "@internal Editor use only") { TORQUE_UNUSED(argc); static const U32 bufSize = 1024; @@ -382,7 +382,7 @@ ConsoleToolFunction(collapseFilename, const char*, 2, 2, "(string filename)" } ConsoleToolFunction(setScriptPathExpando, void, 3, 4, "(string expando, string path[, bool toolsOnly])" - "@internal Editor use only") + "@internal Editor use only") { if(argc == 4) Con::setScriptPathExpando(argv[1], argv[2], dAtob(argv[3])); @@ -391,13 +391,13 @@ ConsoleToolFunction(setScriptPathExpando, void, 3, 4, "(string expando, string p } ConsoleToolFunction(removeScriptPathExpando, void, 2, 2, "(string expando)" - "@internal Editor use only") + "@internal Editor use only") { Con::removeScriptPathExpando(argv[1]); } ConsoleToolFunction(isScriptPathExpando, bool, 2, 2, "(string expando)" - "@internal Editor use only") + "@internal Editor use only") { return Con::isScriptPathExpando(argv[1]); } diff --git a/Engine/source/console/scriptObjects.cpp b/Engine/source/console/scriptObjects.cpp index e5916fb64..6218e4e3d 100644 --- a/Engine/source/console/scriptObjects.cpp +++ b/Engine/source/console/scriptObjects.cpp @@ -53,13 +53,13 @@ ConsoleDocClass( ScriptObject, ); IMPLEMENT_CALLBACK( ScriptObject, onAdd, void, ( SimObjectId ID ), ( ID ), - "Called when this ScriptObject is added to the system.\n" - "@param ID Unique object ID assigned when created (%this in script).\n" + "Called when this ScriptObject is added to the system.\n" + "@param ID Unique object ID assigned when created (%this in script).\n" ); IMPLEMENT_CALLBACK( ScriptObject, onRemove, void, ( SimObjectId ID ), ( ID ), - "Called when this ScriptObject is removed from the system.\n" - "@param ID Unique object ID assigned when created (%this in script).\n" + "Called when this ScriptObject is removed from the system.\n" + "@param ID Unique object ID assigned when created (%this in script).\n" ); ScriptObject::ScriptObject() @@ -105,18 +105,18 @@ ConsoleDocClass( ScriptTickObject, ); IMPLEMENT_CALLBACK( ScriptTickObject, onInterpolateTick, void, ( F32 delta ), ( delta ), - "This is called every frame, but only if the object is set to process ticks.\n" - "@param delta The time delta for this frame.\n" + "This is called every frame, but only if the object is set to process ticks.\n" + "@param delta The time delta for this frame.\n" ); IMPLEMENT_CALLBACK( ScriptTickObject, onProcessTick, void, (), (), - "Called once every 32ms if this object is set to process ticks.\n" + "Called once every 32ms if this object is set to process ticks.\n" ); IMPLEMENT_CALLBACK( ScriptTickObject, onAdvanceTime, void, ( F32 timeDelta ), ( timeDelta ), - "This is called every frame regardless if the object is set to process ticks, but only " + "This is called every frame regardless if the object is set to process ticks, but only " "if the callOnAdvanceTime property is set to true.\n" - "@param timeDelta The time delta for this frame.\n" + "@param timeDelta The time delta for this frame.\n" "@see callOnAdvanceTime\n" ); @@ -188,37 +188,37 @@ DefineEngineMethod( ScriptTickObject, isProcessingTicks, bool, ( ),, IMPLEMENT_CONOBJECT(ScriptGroup); ConsoleDocClass( ScriptGroup, - "@brief Essentially a SimGroup, but with onAdd and onRemove script callbacks.\n\n" + "@brief Essentially a SimGroup, but with onAdd and onRemove script callbacks.\n\n" - "@tsexample\n" - "// First container, SimGroup containing a ScriptGroup\n" - "new SimGroup(Scenes)\n" - "{\n" - " // Subcontainer, ScriptGroup containing variables\n" - " // related to a cut scene and a starting WayPoint\n" - " new ScriptGroup(WelcomeScene)\n" - " {\n" - " class = \"Scene\";\n" - " pathName = \"Pathx\";\n" - " description = \"A small orc village set in the Hardesty mountains. This town and its surroundings will be used to illustrate some the Torque Game Engine\'s features.\";\n" - " pathTime = \"0\";\n" - " title = \"Welcome to Orc Town\";\n\n" - " new WayPoint(start)\n" - " {\n" - " position = \"163.873 -103.82 208.354\";\n" - " rotation = \"0.136165 -0.0544916 0.989186 44.0527\";\n" - " scale = \"1 1 1\";\n" - " dataBlock = \"WayPointMarker\";\n" - " team = \"0\";\n" - " };\n" - " };\n" - "};\n" - "@endtsexample\n\n" + "@tsexample\n" + "// First container, SimGroup containing a ScriptGroup\n" + "new SimGroup(Scenes)\n" + "{\n" + " // Subcontainer, ScriptGroup containing variables\n" + " // related to a cut scene and a starting WayPoint\n" + " new ScriptGroup(WelcomeScene)\n" + " {\n" + " class = \"Scene\";\n" + " pathName = \"Pathx\";\n" + " description = \"A small orc village set in the Hardesty mountains. This town and its surroundings will be used to illustrate some the Torque Game Engine\'s features.\";\n" + " pathTime = \"0\";\n" + " title = \"Welcome to Orc Town\";\n\n" + " new WayPoint(start)\n" + " {\n" + " position = \"163.873 -103.82 208.354\";\n" + " rotation = \"0.136165 -0.0544916 0.989186 44.0527\";\n" + " scale = \"1 1 1\";\n" + " dataBlock = \"WayPointMarker\";\n" + " team = \"0\";\n" + " };\n" + " };\n" + "};\n" + "@endtsexample\n\n" - "@see SimGroup\n" + "@see SimGroup\n" - "@ingroup Console\n" - "@ingroup Scripting" + "@ingroup Console\n" + "@ingroup Scripting" ); ScriptGroup::ScriptGroup() @@ -226,13 +226,13 @@ ScriptGroup::ScriptGroup() } IMPLEMENT_CALLBACK( ScriptGroup, onAdd, void, ( SimObjectId ID ), ( ID ), - "Called when this ScriptGroup is added to the system.\n" - "@param ID Unique object ID assigned when created (%this in script).\n" + "Called when this ScriptGroup is added to the system.\n" + "@param ID Unique object ID assigned when created (%this in script).\n" ); IMPLEMENT_CALLBACK( ScriptGroup, onRemove, void, ( SimObjectId ID ), ( ID ), - "Called when this ScriptObject is removed from the system.\n" - "@param ID Unique object ID assigned when created (%this in script).\n" + "Called when this ScriptObject is removed from the system.\n" + "@param ID Unique object ID assigned when created (%this in script).\n" ); bool ScriptGroup::onAdd() @@ -248,7 +248,7 @@ bool ScriptGroup::onAdd() void ScriptGroup::onRemove() { // Call onRemove in script! - onRemove_callback(getId()); + onRemove_callback(getId()); Parent::onRemove(); } diff --git a/Engine/source/console/sim.cpp b/Engine/source/console/sim.cpp index e0465050f..0ea902b5c 100644 --- a/Engine/source/console/sim.cpp +++ b/Engine/source/console/sim.cpp @@ -139,7 +139,7 @@ DefineConsoleFunction( spawnObject, S32, ( const char * spawnClass , const char * spawnProperties , const char * spawnScript ),("","","","") ,"spawnObject(class [, dataBlock, name, properties, script])" - "@hide") + "@hide") { SimObject* spawnObject = Sim::spawnObject(spawnClass, spawnDataBlock, spawnName, spawnProperties, spawnScript); @@ -203,12 +203,12 @@ ConsoleFunction(schedule, S32, 4, 0, "schedule(time, refobject|0, command, nextNameObject; - obj->nextNameObject = (SimObject*)-1; + obj->nextNameObject = (SimObject*)-1; hashEntryCount--; Mutex::unlockMutex(mutex); @@ -164,7 +164,7 @@ void SimNameDictionary::remove(SimObject* obj) root.erase(name); #endif Mutex::unlockMutex(mutex); -} +} //---------------------------------------------------------------------------- @@ -279,7 +279,7 @@ void SimManagerNameDictionary::remove(SimObject* obj) if(*walk == obj) { *walk = obj->nextManagerNameObject; - obj->nextManagerNameObject = (SimObject*)-1; + obj->nextManagerNameObject = (SimObject*)-1; hashEntryCount--; Mutex::unlockMutex(mutex); @@ -293,7 +293,7 @@ void SimManagerNameDictionary::remove(SimObject* obj) root.erase(name); #endif Mutex::unlockMutex(mutex); -} +} //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- diff --git a/Engine/source/console/simDictionary.h b/Engine/source/console/simDictionary.h index bbfb0f385..1247d504e 100644 --- a/Engine/source/console/simDictionary.h +++ b/Engine/source/console/simDictionary.h @@ -61,7 +61,7 @@ struct StringTableEntryEq } }; -typedef std::unordered_map StringDictDef; +typedef std::unordered_map StringDictDef; typedef std::unordered_map SimObjectIdDictDef; #endif diff --git a/Engine/source/console/simEvents.cpp b/Engine/source/console/simEvents.cpp index bc1e1789c..ab87f5f0b 100644 --- a/Engine/source/console/simEvents.cpp +++ b/Engine/source/console/simEvents.cpp @@ -39,10 +39,10 @@ SimConsoleEvent::SimConsoleEvent(S32 argc, ConsoleValueRef *argv, bool onObject) mArgv[i].value = new ConsoleValue(); mArgv[i].value->type = ConsoleValue::TypeInternalString; mArgv[i].value->init(); - if (argv) - { - mArgv[i].value->setStringValue((const char*)argv[i]); - } + if (argv) + { + mArgv[i].value->setStringValue((const char*)argv[i]); + } } } diff --git a/Engine/source/console/simManager.cpp b/Engine/source/console/simManager.cpp index a216c09b6..06027cdfe 100644 --- a/Engine/source/console/simManager.cpp +++ b/Engine/source/console/simManager.cpp @@ -93,7 +93,7 @@ static void shutdownEventQueue() U32 postEvent(SimObject *destObject, SimEvent* event,U32 time) { - AssertFatal(time == -1 || time >= getCurrentTime(), + AssertFatal(time == -1 || time >= getCurrentTime(), "Sim::postEvent() - Event time must be greater than or equal to the current time." ); AssertFatal(destObject, "Sim::postEvent() - Destination object for event doesn't exist."); @@ -256,7 +256,7 @@ void advanceToTime(SimTime targetTime) event->process(obj); delete event; } - gCurrentTime = targetTime; + gCurrentTime = targetTime; Mutex::unlockMutex(gEventQueueMutex); } @@ -393,7 +393,7 @@ SimObject* findObject(const char* name) SimObject* findObject(SimObjectId id) { - return gIdDictionary->find(id); + return gIdDictionary->find(id); } SimObject *spawnObject(String spawnClass, String spawnDataBlock, String spawnName, @@ -600,7 +600,7 @@ SimDataBlockGroup::SimDataBlockGroup() S32 QSORT_CALLBACK SimDataBlockGroup::compareModifiedKey(const void* a,const void* b) { - const SimDataBlock* dba = *((const SimDataBlock**)a); + const SimDataBlock* dba = *((const SimDataBlock**)a); const SimDataBlock* dbb = *((const SimDataBlock**)b); return dba->getModifiedKey() - dbb->getModifiedKey(); @@ -612,6 +612,6 @@ void SimDataBlockGroup::sort() if(mLastModifiedKey != SimDataBlock::getNextModifiedKey()) { mLastModifiedKey = SimDataBlock::getNextModifiedKey(); - dQsort(objectList.address(),objectList.size(),sizeof(SimObject *),compareModifiedKey); + dQsort(objectList.address(),objectList.size(),sizeof(SimObject *),compareModifiedKey); } } diff --git a/Engine/source/console/simObject.cpp b/Engine/source/console/simObject.cpp index b07bc6840..73a1ffa3d 100644 --- a/Engine/source/console/simObject.cpp +++ b/Engine/source/console/simObject.cpp @@ -81,7 +81,7 @@ SimObject::SimObject() mFlags.set( ModStaticFields | ModDynamicFields ); mFieldDictionary = NULL; - mCanSaveFieldDictionary = true; + mCanSaveFieldDictionary = true; mClassName = NULL; mSuperClassName = NULL; @@ -592,7 +592,7 @@ void SimObject::setDeclarationLine(U32 lineNumber) bool SimObject::registerObject() { AssertFatal( !mFlags.test( Added ), "reigsterObject - Object already registered!"); - mFlags.clear(Deleted | Removed); + mFlags.clear(Deleted | Removed); if(smForceId) { @@ -609,11 +609,11 @@ bool SimObject::registerObject() AssertFatal(Sim::gIdDictionary && Sim::gNameDictionary, "SimObject::registerObject - tried to register an object before Sim::init()!"); - Sim::gIdDictionary->insert(this); + Sim::gIdDictionary->insert(this); Sim::gNameDictionary->insert(this); - // Notify object + // Notify object bool ret = onAdd(); if(!ret) @@ -661,10 +661,10 @@ void SimObject::deleteObject() void SimObject::_destroySelf() { - AssertFatal( !isDeleted(), "SimObject::destroySelf - Object has already been deleted" ); - AssertFatal( !isRemoved(), "SimObject::destroySelf - Object in the process of being removed" ); + AssertFatal( !isDeleted(), "SimObject::destroySelf - Object has already been deleted" ); + AssertFatal( !isRemoved(), "SimObject::destroySelf - Object in the process of being removed" ); - mFlags.set( Deleted ); + mFlags.set( Deleted ); if( mFlags.test( Added ) ) unregisterObject(); @@ -1308,7 +1308,7 @@ void SimObject::dumpClassHierarchy() while(pRep) { Con::warnf("%s ->", pRep->getClassName()); - pRep = pRep->getParentClass(); + pRep = pRep->getParentClass(); } } @@ -1376,7 +1376,7 @@ bool SimObject::isChildOfGroup(SimGroup* pGroup) if(pGroup == dynamic_cast(this)) return true; - SimGroup* temp = mGroup; + SimGroup* temp = mGroup; while(temp) { if(temp == pGroup) @@ -2884,7 +2884,7 @@ DefineConsoleMethod( SimObject, isMemberOfClass, bool, ( const char* className ) return true; } - pRep = pRep->getParentClass(); + pRep = pRep->getParentClass(); } return false; diff --git a/Engine/source/console/simObject.h b/Engine/source/console/simObject.h index 8a38e8675..6cba1beff 100644 --- a/Engine/source/console/simObject.h +++ b/Engine/source/console/simObject.h @@ -826,7 +826,7 @@ class SimObject: public ConsoleObject, public TamlCallbacks virtual bool readObject(Stream *stream); /// Set whether fields created at runtime should be saved. Default is true. - void setCanSaveDynamicFields( bool bCanSave ) { mCanSaveFieldDictionary = bCanSave; } + void setCanSaveDynamicFields( bool bCanSave ) { mCanSaveFieldDictionary = bCanSave; } /// Get whether fields created at runtime should be saved. Default is true. bool getCanSaveDynamicFields( ) { return mCanSaveFieldDictionary;} diff --git a/Engine/source/console/simObjectMemento.cpp b/Engine/source/console/simObjectMemento.cpp index 839ae0846..ef2e8f732 100644 --- a/Engine/source/console/simObjectMemento.cpp +++ b/Engine/source/console/simObjectMemento.cpp @@ -30,7 +30,7 @@ SimObjectMemento::SimObjectMemento() : mState( NULL ), - mIsDatablock( false ) + mIsDatablock( false ) { } @@ -45,16 +45,16 @@ void SimObjectMemento::save( SimObject *object ) dFree( mState ); mObjectName = String::EmptyString; - // Use a stream to save the state. + // Use a stream to save the state. MemStream stream( 256 ); U32 writeFlags = 0; - SimDataBlock* db = dynamic_cast(object); - if( !db ) - stream.write( sizeof( "return " ) - 1, "return " ); - else + SimDataBlock* db = dynamic_cast(object); + if( !db ) + stream.write( sizeof( "return " ) - 1, "return " ); + else { - mIsDatablock = true; + mIsDatablock = true; // Cull the datablock name from the output so that // we can easily replace it in case the datablock's name @@ -64,7 +64,7 @@ void SimObjectMemento::save( SimObject *object ) writeFlags |= SimObject::NoName; } - + object->write( stream, 0, writeFlags ); stream.write( (UTF8)0 ); @@ -82,9 +82,9 @@ SimObject *SimObjectMemento::restore() const // TODO: We could potentially make this faster by // caching the CodeBlock generated from the string - SimObject* object; - if( !mIsDatablock ) - { + SimObject* object; + if( !mIsDatablock ) + { // Set the redefine behavior to automatically giving // the new objects unique names. This will restore the // old names if they are still available or give reasonable @@ -95,22 +95,22 @@ SimObject *SimObjectMemento::restore() const // Read the object. - const UTF8* result = Con::evaluate( mState ); + const UTF8* result = Con::evaluate( mState ); // Restore the redefine behavior. Con::setVariable( "$Con::redefineBehavior", oldRedefineBehavior ); - if ( !result || !result[ 0 ] ) - return NULL; + if ( !result || !result[ 0 ] ) + return NULL; // Look up the object. - U32 objectId = dAtoi( result ); - object = Sim::findObject( objectId ); - } - else - { + U32 objectId = dAtoi( result ); + object = Sim::findObject( objectId ); + } + else + { String objectName = mObjectName; // For datablocks, it's getting a little complicated. Datablock definitions cannot be used @@ -140,16 +140,16 @@ SimObject *SimObjectMemento::restore() const dStrcpy( &tempBuffer[ numCharsToLeftParen + uniqueNameLen ], &mState[ numCharsToLeftParen ] ); } - Con::evaluate( tempBuffer ); + Con::evaluate( tempBuffer ); if( tempBuffer != mState ) dFree( tempBuffer ); if( objectName == String::EmptyString ) - return NULL; + return NULL; - object = Sim::findObject( objectName ); - } + object = Sim::findObject( objectName ); + } return object; } diff --git a/Engine/source/console/simObjectMemento.h b/Engine/source/console/simObjectMemento.h index 8fc029726..45b8a9e4d 100644 --- a/Engine/source/console/simObjectMemento.h +++ b/Engine/source/console/simObjectMemento.h @@ -42,7 +42,7 @@ protected: /// The captured object's name. String mObjectName; - bool mIsDatablock; + bool mIsDatablock; public: diff --git a/Engine/source/console/simPersistSet.cpp b/Engine/source/console/simPersistSet.cpp index 1fe272478..2dea6416e 100644 --- a/Engine/source/console/simPersistSet.cpp +++ b/Engine/source/console/simPersistSet.cpp @@ -29,13 +29,13 @@ IMPLEMENT_CONOBJECT( SimPersistSet ); ConsoleDocClass( SimPersistSet, - "@brief A SimSet that can be safely persisted.\n\n" - "Uses SimPersistIDs to reference objects in the set " - "while persisted on disk. This allows the set to resolve " - "its references no matter whether they are loaded before or " - "after the set is created.\n\n" - "Not intended for game development, for editors or internal use only.\n\n " - "@internal"); + "@brief A SimSet that can be safely persisted.\n\n" + "Uses SimPersistIDs to reference objects in the set " + "while persisted on disk. This allows the set to resolve " + "its references no matter whether they are loaded before or " + "after the set is created.\n\n" + "Not intended for game development, for editors or internal use only.\n\n " + "@internal"); //----------------------------------------------------------------------------- diff --git a/Engine/source/console/simSerialize.cpp b/Engine/source/console/simSerialize.cpp index e3f64be4c..6a7a84b17 100644 --- a/Engine/source/console/simSerialize.cpp +++ b/Engine/source/console/simSerialize.cpp @@ -213,18 +213,18 @@ SimObject *loadObjectStream(Stream *stream) //----------------------------------------------------------------------------- DefineEngineFunction(saveObject, bool, ( SimObject *object, const char *filename ),, - "@brief Serialize the object to a file.\n\n" - "@param object The object to serialize.\n" - "@param filename The file name and path.\n" - "@ingroup Console\n") + "@brief Serialize the object to a file.\n\n" + "@param object The object to serialize.\n" + "@param filename The file name and path.\n" + "@ingroup Console\n") { return object && Sim::saveObject(object, filename); } DefineEngineFunction(loadObject, SimObject*, ( const char *filename ),, - "@brief Loads a serialized object from a file.\n\n" - "@param Name and path to text file containing the object\n" - "@ingroup Console\n") + "@brief Loads a serialized object from a file.\n\n" + "@param Name and path to text file containing the object\n" + "@ingroup Console\n") { return Sim::loadObjectStream(filename); } diff --git a/Engine/source/console/stringStack.cpp b/Engine/source/console/stringStack.cpp index 45fd83740..681de2898 100644 --- a/Engine/source/console/stringStack.cpp +++ b/Engine/source/console/stringStack.cpp @@ -121,7 +121,7 @@ bool ConsoleValueStack::reserveValues(U32 count, ConsoleValueRef *outValues) //Con::printf("[%i]CSTK reserveValues %i", mStackPos, count); for (U32 i=0; isetTelnetParameters(port, consolePass, listenPass, remoteEcho); + TelConsole->setTelnetParameters(port, consolePass, listenPass, remoteEcho); } static void telnetCallback(U32 level, const char *consoleLine) { TORQUE_UNUSED(level); if (TelConsole) - TelConsole->processConsoleLine(consoleLine); + TelConsole->processConsoleLine(consoleLine); } TelnetConsole::TelnetConsole() @@ -121,9 +121,9 @@ void TelnetConsole::setTelnetParameters(S32 port, const char *telnetPassword, co mAcceptPort = port; if(mAcceptPort != -1 && mAcceptPort != 0) { - NetAddress address; - Net::getIdealListenAddress(&address); - address.port = mAcceptPort; + NetAddress address; + Net::getIdealListenAddress(&address); + address.port = mAcceptPort; mAcceptSocket = Net::openSocket(); Net::bindAddress(address, mAcceptSocket); diff --git a/Engine/source/console/telnetDebugger.cpp b/Engine/source/console/telnetDebugger.cpp index 8f95aaf9f..7db6e9710 100644 --- a/Engine/source/console/telnetDebugger.cpp +++ b/Engine/source/console/telnetDebugger.cpp @@ -115,8 +115,8 @@ MODULE_END; DefineConsoleFunction( dbgSetParameters, void, (S32 port, const char * password, bool waitForClient ), (false), "( int port, string password, bool waitForClient )" "Open a debug server port on the specified port, requiring the specified password, " - "and optionally waiting for the debug client to connect.\n" - "@internal Primarily used for Torsion and other debugging tools") + "and optionally waiting for the debug client to connect.\n" + "@internal Primarily used for Torsion and other debugging tools") { if (TelDebugger) { @@ -126,17 +126,17 @@ DefineConsoleFunction( dbgSetParameters, void, (S32 port, const char * password, DefineConsoleFunction( dbgIsConnected, bool, (), , "()" "Returns true if a script debugging client is connected else return false.\n" - "@internal Primarily used for Torsion and other debugging tools") + "@internal Primarily used for Torsion and other debugging tools") { return TelDebugger && TelDebugger->isConnected(); } DefineConsoleFunction( dbgDisconnect, void, (), , "()" "Forcibly disconnects any attached script debugging client.\n" - "@internal Primarily used for Torsion and other debugging tools") + "@internal Primarily used for Torsion and other debugging tools") { if (TelDebugger) - TelDebugger->disconnect(); + TelDebugger->disconnect(); } static void debuggerConsumer(U32 level, const char *line) @@ -244,9 +244,9 @@ void TelnetDebugger::setDebugParameters(S32 port, const char *password, bool wai mAcceptPort = port; if(mAcceptPort != -1 && mAcceptPort != 0) { - NetAddress address; - Net::getIdealListenAddress(&address); - address.port = mAcceptPort; + NetAddress address; + Net::getIdealListenAddress(&address); + address.port = mAcceptPort; mAcceptSocket = Net::openSocket(); Net::bindAddress(address, mAcceptSocket); @@ -588,7 +588,7 @@ void TelnetDebugger::addAllBreakpoints(CodeBlock *code) // TODO: This assumes that the OS file names are case // insensitive... Torque needs a dFilenameCmp() function. if( dStricmp( cur->fileName, code->name ) == 0 ) - { + { cur->code = code; // Find the fist breakline starting from and @@ -741,7 +741,7 @@ void TelnetDebugger::removeBreakpoint(const char *fileName, S32 line) { Breakpoint *brk = *bp; *bp = brk->next; - if ( brk->code ) + if ( brk->code ) brk->code->clearBreakpoint(brk->lineNumber); dFree(brk->testExpression); delete brk; @@ -754,7 +754,7 @@ void TelnetDebugger::removeAllBreakpoints() while(walk) { Breakpoint *temp = walk->next; - if ( walk->code ) + if ( walk->code ) walk->code->clearBreakpoint(walk->lineNumber); dFree(walk->testExpression); delete walk; @@ -792,10 +792,10 @@ void TelnetDebugger::setBreakOnNextStatement( bool enabled ) for(CodeBlock *walk = CodeBlock::getCodeBlockList(); walk; walk = walk->nextFile) walk->clearAllBreaks(); for(Breakpoint *w = mBreakpoints; w; w = w->next) - { - if ( w->code ) + { + if ( w->code ) w->code->setBreakpoint(w->lineNumber); - } + } mBreakOnNextStatement = false; } } @@ -848,7 +848,7 @@ void TelnetDebugger::debugStepOut() setBreakOnNextStatement( false ); mStackPopBreakIndex = gEvalState.getStackDepth() - 1; if ( mStackPopBreakIndex == 0 ) - mStackPopBreakIndex = -1; + mStackPopBreakIndex = -1; mProgramPaused = false; send("RUNNING\r\n"); } diff --git a/Engine/source/console/typeValidators.cpp b/Engine/source/console/typeValidators.cpp index 11249daf7..6b2ea7475 100644 --- a/Engine/source/console/typeValidators.cpp +++ b/Engine/source/console/typeValidators.cpp @@ -49,42 +49,42 @@ void TypeValidator::consoleError(SimObject *object, const char *format, ...) void FRangeValidator::validateType(SimObject *object, void *typePtr) { - F32 *v = (F32 *) typePtr; - if(*v < minV || *v > maxV) - { - consoleError(object, "Must be between %g and %g", minV, maxV); - if(*v < minV) - *v = minV; - else if(*v > maxV) - *v = maxV; - } + F32 *v = (F32 *) typePtr; + if(*v < minV || *v > maxV) + { + consoleError(object, "Must be between %g and %g", minV, maxV); + if(*v < minV) + *v = minV; + else if(*v > maxV) + *v = maxV; + } } void IRangeValidator::validateType(SimObject *object, void *typePtr) { - S32 *v = (S32 *) typePtr; - if(*v < minV || *v > maxV) - { - consoleError(object, "Must be between %d and %d", minV, maxV); - if(*v < minV) - *v = minV; - else if(*v > maxV) - *v = maxV; - } + S32 *v = (S32 *) typePtr; + if(*v < minV || *v > maxV) + { + consoleError(object, "Must be between %d and %d", minV, maxV); + if(*v < minV) + *v = minV; + else if(*v > maxV) + *v = maxV; + } } void IRangeValidatorScaled::validateType(SimObject *object, void *typePtr) { - S32 *v = (S32 *) typePtr; - *v /= factor; - if(*v < minV || *v > maxV) - { - consoleError(object, "Scaled value must be between %d and %d", minV, maxV); - if(*v < minV) - *v = minV; - else if(*v > maxV) - *v = maxV; - } + S32 *v = (S32 *) typePtr; + *v /= factor; + if(*v < minV || *v > maxV) + { + consoleError(object, "Scaled value must be between %d and %d", minV, maxV); + if(*v < minV) + *v = minV; + else if(*v > maxV) + *v = maxV; + } } void Point3NormalizeValidator::validateType(SimObject *object, void *typePtr) diff --git a/Engine/source/core/color.h b/Engine/source/core/color.h index aaf4f16e7..e429ac962 100644 --- a/Engine/source/core/color.h +++ b/Engine/source/core/color.h @@ -34,6 +34,9 @@ #include "console/engineAPI.h" #endif +const F32 gGamma = 2.2f; +const F32 gOneOverGamma = 1.f / 2.2f; + class ColorI; @@ -104,8 +107,10 @@ class ColorF (alpha >= 0.0f && alpha <= 1.0f); } void clamp(); - ColorF toLinear() const; - ColorF toGamma() const; + ColorF toLinear(); + ColorF toGamma(); + //calculate luminance, make sure color is linear first + F32 luminance(); static const ColorF ZERO; static const ColorF ONE; @@ -209,6 +214,9 @@ class ColorI operator const U8*() const { return &red; } + ColorI toLinear(); + ColorI toGamma(); + static const ColorI ZERO; static const ColorI ONE; static const ColorI WHITE; @@ -465,14 +473,32 @@ inline void ColorF::clamp() alpha = 0.0f; } -inline ColorF ColorF::toLinear() const +inline ColorF ColorF::toGamma() { - return ColorF(mPow(red, 2.2f), mPow(green, 2.2f), mPow(blue, 2.2f), alpha); + ColorF color; + color.red = mPow(red,gOneOverGamma); + color.green = mPow(green, gOneOverGamma); + color.blue = mPow(blue, gOneOverGamma); + color.alpha = alpha; + return color; } -inline ColorF ColorF::toGamma() const +inline ColorF ColorF::toLinear() { - return ColorF(mPow(red, 1.0f / 2.2f), mPow(green, 1.0f / 2.2f), mPow(blue, 1.0f / 2.2f), alpha); + ColorF color; + color.red = mPow(red,gGamma); + color.green = mPow(green, gGamma); + color.blue = mPow(blue, gGamma); + color.alpha = alpha; + return color; +} + +inline F32 ColorF::luminance() +{ + // ITU BT.709 + //return red * 0.2126f + green * 0.7152f + blue * 0.0722f; + // ITU BT.601 + return red * 0.3f + green * 0.59f + blue * 0.11f; } //------------------------------------------------------------------------------ @@ -945,6 +971,18 @@ inline String ColorI::getHex() const return result; } +inline ColorI ColorI::toGamma() +{ + ColorF color = (ColorF)*this; + return (ColorI)color.toGamma(); +} + +inline ColorI ColorI::toLinear() +{ + ColorF color = (ColorF)*this; + return (ColorI)color.toLinear(); +} + //-------------------------------------- INLINE CONVERSION OPERATORS inline ColorF::operator ColorI() const { diff --git a/Engine/source/core/strings/unicode.cpp b/Engine/source/core/strings/unicode.cpp index 64acee244..109327fe1 100644 --- a/Engine/source/core/strings/unicode.cpp +++ b/Engine/source/core/strings/unicode.cpp @@ -481,7 +481,7 @@ U32 oneUTF32toUTF8(const UTF32 codepoint, UTF8 *threeByteCodeunitBuf) // Process the 1st byte. filter based on the # of expected bytes. mask = sgByteMask8LUT[bytecount]; marker = ( ~mask << 1 ); - threeByteCodeunitBuf[0] = marker | working & mask; + threeByteCodeunitBuf[0] = marker | (working & mask); PROFILE_END(); return bytecount; diff --git a/Engine/source/core/tagDictionary.cpp b/Engine/source/core/tagDictionary.cpp index 5e988605d..aae76a832 100644 --- a/Engine/source/core/tagDictionary.cpp +++ b/Engine/source/core/tagDictionary.cpp @@ -290,7 +290,7 @@ bool TagDictionary::match(const char* pattern, const char* str) return !*str; case '*': - return match(pattern+1, str) || *str && match(pattern, str+1); + return match(pattern+1, str) || (*str && match(pattern, str+1)); case '?': return *str && match(pattern+1, str+1); diff --git a/Engine/source/environment/river.cpp b/Engine/source/environment/river.cpp index e6898a921..2ac9f2b97 100644 --- a/Engine/source/environment/river.cpp +++ b/Engine/source/environment/river.cpp @@ -77,12 +77,12 @@ ConsoleDocClass( River, #define NODE_RADIUS 15.0f static U32 gIdxArray[6][2][3] = { - { { 0, 4, 5 }, { 0, 5, 1 }, }, // Top Face - { { 2, 6, 4 }, { 2, 4, 0 }, }, // Left Face - { { 1, 5, 7 }, { 1, 7, 3 }, }, // Right Face - { { 2, 3, 7 }, { 2, 7, 6 }, }, // Bottom Face - { { 0, 1, 3 }, { 0, 3, 2 }, }, // Front Face - { { 4, 6, 7 }, { 4, 7, 5 }, }, // Back Face + { { 0, 4, 5 }, { 0, 5, 1 }, }, // Top Face + { { 2, 6, 4 }, { 2, 4, 0 }, }, // Left Face + { { 1, 5, 7 }, { 1, 7, 3 }, }, // Right Face + { { 2, 3, 7 }, { 2, 7, 6 }, }, // Bottom Face + { { 0, 1, 3 }, { 0, 3, 2 }, }, // Front Face + { { 4, 6, 7 }, { 4, 7, 5 }, }, // Back Face }; struct RiverHitSegment @@ -93,10 +93,10 @@ struct RiverHitSegment static S32 QSORT_CALLBACK compareHitSegments(const void* a,const void* b) { - const RiverHitSegment *fa = (RiverHitSegment*)a; - const RiverHitSegment *fb = (RiverHitSegment*)b; + const RiverHitSegment *fa = (RiverHitSegment*)a; + const RiverHitSegment *fb = (RiverHitSegment*)b; - return mSign(fb->t - fa->t); + return mSign(fb->t - fa->t); } static Point3F sSegmentPointComparePoints[4]; @@ -655,17 +655,17 @@ void River::consoleInit() Parent::consoleInit(); Con::addVariable( "$River::EditorOpen", TypeBool, &River::smEditorOpen, "For editor use.\n" - "@ingroup Editors\n" ); + "@ingroup Editors\n" ); Con::addVariable( "$River::showWalls", TypeBool, &River::smShowWalls, "For editor use.\n" - "@ingroup Editors\n" ); + "@ingroup Editors\n" ); Con::addVariable( "$River::showNodes", TypeBool, &River::smShowNodes, "For editor use.\n" - "@ingroup Editors\n"); + "@ingroup Editors\n"); Con::addVariable( "$River::showSpline", TypeBool, &River::smShowSpline, "For editor use.\n" - "@ingroup Editors\n" ); + "@ingroup Editors\n" ); Con::addVariable( "$River::showRiver", TypeBool, &River::smShowRiver, "For editor use.\n" - "@ingroup Editors\n" ); - Con::addVariable( "$River::showWireframe", TypeBool, &River::smWireframe, "For editor use.\n" - "@ingroup Editors\n"); + "@ingroup Editors\n" ); + Con::addVariable( "$River::showWireframe", TypeBool, &River::smWireframe, "For editor use.\n" + "@ingroup Editors\n"); } bool River::addNodeFromField( void *object, const char *index, const char *data ) @@ -816,7 +816,7 @@ void River::innerRender( SceneRenderState *state ) _makeRenderBatches( camPosition ); - if ( !River::smShowRiver ) + if ( !River::smShowRiver ) return; // If no material... we're done. @@ -851,7 +851,7 @@ void River::innerRender( SceneRenderState *state ) U32 vertCount = ( endVert - startVert ) + 1; U32 idxCount = ( endIdx - startIdx ) + 1; U32 triangleCount = idxCount / 3; - + AssertFatal( startVert < mLowVertCount, "River, bad draw call!" ); AssertFatal( startVert + vertCount <= mLowVertCount, "River, bad draw call!" ); AssertFatal( triangleCount <= mLowTriangleCount, "River, bad draw call!" ); @@ -962,7 +962,7 @@ U32 River::packUpdate(NetConnection * con, U32 mask, BitStream * stream) stream->write( mSegmentsPerBatch ); stream->write( mDepthScale ); stream->write( mMaxDivisionSize ); - stream->write( mColumnCount ); + stream->write( mColumnCount ); stream->write( mFlowMagnitude ); stream->write( mLodDistance ); @@ -1045,7 +1045,7 @@ void River::unpackUpdate(NetConnection * con, BitStream * stream) // RiverMask if(stream->readFlag()) { - MatrixF ObjectMatrix; + MatrixF ObjectMatrix; stream->readAffineTransform(&ObjectMatrix); Parent::setTransform(ObjectMatrix); @@ -1053,7 +1053,7 @@ void River::unpackUpdate(NetConnection * con, BitStream * stream) stream->read( &mSegmentsPerBatch ); stream->read( &mDepthScale ); stream->read( &mMaxDivisionSize ); - stream->read( &mColumnCount ); + stream->read( &mColumnCount ); stream->read( &mFlowMagnitude ); stream->read( &mLodDistance ); @@ -1198,56 +1198,56 @@ void River::setScale( const VectorF &scale ) bool River::castRay(const Point3F &s, const Point3F &e, RayInfo* info) { - Point3F start = s; - Point3F end = e; - mObjToWorld.mulP(start); - mObjToWorld.mulP(end); + Point3F start = s; + Point3F end = e; + mObjToWorld.mulP(start); + mObjToWorld.mulP(end); - F32 out = 1.0f; // The output fraction/percentage along the line defined by s and e - VectorF norm(0.0f, 0.0f, 0.0f); // The normal of the face intersected + F32 out = 1.0f; // The output fraction/percentage along the line defined by s and e + VectorF norm(0.0f, 0.0f, 0.0f); // The normal of the face intersected - Vector hitSegments; + Vector hitSegments; - for ( U32 i = 0; i < mSegments.size(); i++ ) - { - const RiverSegment &segment = mSegments[i]; + for ( U32 i = 0; i < mSegments.size(); i++ ) + { + const RiverSegment &segment = mSegments[i]; - F32 t; - VectorF n; + F32 t; + VectorF n; - if ( segment.worldbounds.collideLine( start, end, &t, &n ) ) - { - hitSegments.increment(); - hitSegments.last().t = t; - hitSegments.last().idx = i; - } - } + if ( segment.worldbounds.collideLine( start, end, &t, &n ) ) + { + hitSegments.increment(); + hitSegments.last().t = t; + hitSegments.last().idx = i; + } + } - dQsort( hitSegments.address(), hitSegments.size(), sizeof(RiverHitSegment), compareHitSegments ); + dQsort( hitSegments.address(), hitSegments.size(), sizeof(RiverHitSegment), compareHitSegments ); U32 idx0, idx1, idx2; F32 t; - for ( U32 i = 0; i < hitSegments.size(); i++ ) - { - U32 segIdx = hitSegments[i].idx; - const RiverSegment &segment = mSegments[segIdx]; + for ( U32 i = 0; i < hitSegments.size(); i++ ) + { + U32 segIdx = hitSegments[i].idx; + const RiverSegment &segment = mSegments[segIdx]; - // Each segment has 6 faces - for ( U32 j = 0; j < 6; j++ ) - { - if ( j == 4 && segIdx != 0 ) - continue; + // Each segment has 6 faces + for ( U32 j = 0; j < 6; j++ ) + { + if ( j == 4 && segIdx != 0 ) + continue; - if ( j == 5 && segIdx != mSegments.size() - 1 ) - continue; + if ( j == 5 && segIdx != mSegments.size() - 1 ) + continue; - // Each face has 2 triangles - for ( U32 k = 0; k < 2; k++ ) - { - idx0 = gIdxArray[j][k][0]; - idx1 = gIdxArray[j][k][1]; - idx2 = gIdxArray[j][k][2]; + // Each face has 2 triangles + for ( U32 k = 0; k < 2; k++ ) + { + idx0 = gIdxArray[j][k][0]; + idx1 = gIdxArray[j][k][1]; + idx2 = gIdxArray[j][k][2]; const Point3F &v0 = segment[idx0]; const Point3F &v1 = segment[idx1]; @@ -1257,40 +1257,40 @@ bool River::castRay(const Point3F &s, const Point3F &e, RayInfo* info) v2, v1, v0, NULL, &t ) ) - continue; + continue; - if ( t >= 0.0f && t < 1.0f && t < out ) - { - out = t; + if ( t >= 0.0f && t < 1.0f && t < out ) + { + out = t; // optimize this, can be calculated easily within // the collision test norm = PlaneF( v0, v1, v2 ); - } - } - } + } + } + } - if (out >= 0.0f && out < 1.0f) - break; - } + if (out >= 0.0f && out < 1.0f) + break; + } - if (out >= 0.0f && out < 1.0f) - { - info->t = out; - info->normal = norm; - info->point.interpolate(start, end, out); - info->face = -1; - info->object = this; + if (out >= 0.0f && out < 1.0f) + { + info->t = out; + info->normal = norm; + info->point.interpolate(start, end, out); + info->face = -1; + info->object = this; - return true; - } + return true; + } - return false; + return false; } bool River::collideBox(const Point3F &start, const Point3F &end, RayInfo* info) { - return false; + return false; } bool River::buildPolyList( PolyListContext context, AbstractPolyList* polyList, const Box3F& box, const SphereF& sphere ) @@ -1656,8 +1656,8 @@ void River::_generateVerts() // These will depend on the level of subdivision per segment // calculated below. mHighVertCount = 0; - mHighTriangleCount = 0; - + mHighTriangleCount = 0; + // Calculate the number of row/column subdivisions per each // RiverSegment. @@ -1671,18 +1671,18 @@ void River::_generateVerts() mColumnCount = mCeil( greatestWidth / mMaxDivisionSize ); - for ( U32 i = 0; i < mSegments.size(); i++ ) - { + for ( U32 i = 0; i < mSegments.size(); i++ ) + { RiverSegment &segment = mSegments[i]; const RiverSlice *slice = segment.slice0; - const RiverSlice *nextSlice = segment.slice1; + const RiverSlice *nextSlice = segment.slice1; - // Calculate the size of divisions in the forward direction ( p00 -> p01 ) - F32 segLength = (nextSlice->p1 - slice->p1).len(); + // Calculate the size of divisions in the forward direction ( p00 -> p01 ) + F32 segLength = (nextSlice->p1 - slice->p1).len(); - // A division count of one is actually NO subdivision, - // the segment corners are the only verts in this segment. - U32 numRows = 1; + // A division count of one is actually NO subdivision, + // the segment corners are the only verts in this segment. + U32 numRows = 1; if ( segLength > 0.0f ) numRows = mCeil( segLength / mMaxDivisionSize ); @@ -1693,33 +1693,33 @@ void River::_generateVerts() // column data member we initialize all segments in the river to // the same (River::mColumnCount) - // Calculate the size of divisions in the right direction ( p00 -> p10 ) - // F32 segWidth = ( ( p11 - p01 ).len() + ( p10 - p00 ).len() ) * 0.5f; + // Calculate the size of divisions in the right direction ( p00 -> p10 ) + // F32 segWidth = ( ( p11 - p01 ).len() + ( p10 - p00 ).len() ) * 0.5f; - // U32 numColumns = 5; - //F32 columnSize = segWidth / numColumns; + // U32 numColumns = 5; + //F32 columnSize = segWidth / numColumns; - //while ( columnSize > mMaxDivisionSize ) - //{ - // numColumns++; - // columnSize = segWidth / numColumns; - //} - + //while ( columnSize > mMaxDivisionSize ) + //{ + // numColumns++; + // columnSize = segWidth / numColumns; + //} + // Save the calculated numb of columns / rows for this segment. segment.columns = mColumnCount; segment.rows = numRows; - + // Save the corresponding number of verts/prims segment.numVerts = ( 1 + mColumnCount ) * ( 1 + numRows ); segment.numTriangles = mColumnCount * numRows * 2; - mHighVertCount += segment.numVerts; - mHighTriangleCount += segment.numTriangles; - } + mHighVertCount += segment.numVerts; + mHighTriangleCount += segment.numTriangles; + } // Number of low detail verts/prims. - mLowVertCount = mSlices.size() * 2; - mLowTriangleCount = mSegments.size() * 2; + mLowVertCount = mSlices.size() * 2; + mLowTriangleCount = mSegments.size() * 2; // Allocate the low detail VertexBuffer, // this will stay in memory and will never need to change. @@ -1728,8 +1728,8 @@ void River::_generateVerts() GFXWaterVertex *lowVertPtr = mVB_low.lock(); U32 vertCounter = 0; - // The texCoord.y value start/end for a segment - // as we loop through them. + // The texCoord.y value start/end for a segment + // as we loop through them. F32 textCoordV = 0; // @@ -1760,7 +1760,7 @@ void River::_generateVerts() { // Increment the textCoordV for the next slice. F32 segLen = ( mSlices[i+1].p1 - slice.p1 ).len(); - textCoordV += segLen; + textCoordV += segLen; } } @@ -1771,8 +1771,8 @@ void River::_generateVerts() // // Create the low-detail prim buffer(s) - // - mPB_low.set( GFX, mLowTriangleCount * 3, mLowTriangleCount, GFXBufferTypeStatic ); + // + mPB_low.set( GFX, mLowTriangleCount * 3, mLowTriangleCount, GFXBufferTypeStatic ); U16 *lowIdxBuff; mPB_low.lock(&lowIdxBuff); @@ -1784,13 +1784,13 @@ void River::_generateVerts() U32 offset = 0; // Fill the low-detail PrimitiveBuffer - for ( U32 i = 0; i < mSegments.size(); i++ ) - { + for ( U32 i = 0; i < mSegments.size(); i++ ) + { //const RiverSegment &segment = mSegments[i]; - + // Two triangles formed by the corner points of this segment // into the the low detail primitive buffer. - p00 = offset; + p00 = offset; p01 = p00 + 2; p11 = p01 + 1; p10 = p00 + 1; @@ -2158,8 +2158,8 @@ void River::_makeRenderBatches( const Point3F &cameraPos ) F32 dist = getMin( dist0, dist1 ); highDetail = ( dist < lodDistSquared ); - if ( highDetail && lastDetail == 0 || - !highDetail && lastDetail == 1 ) + if ( (highDetail && lastDetail == 0) || + (!highDetail && lastDetail == 1) ) { // We hit a segment with a different lod than the previous. // Save what we have so far... diff --git a/Engine/source/forest/editor/forestSelectionTool.cpp b/Engine/source/forest/editor/forestSelectionTool.cpp index a01c6cf86..3d3e9d022 100644 --- a/Engine/source/forest/editor/forestSelectionTool.cpp +++ b/Engine/source/forest/editor/forestSelectionTool.cpp @@ -197,6 +197,9 @@ void ForestSelectionTool::_selectItem( const ForestItem &item ) void ForestSelectionTool::deleteSelection() { + if (!mEditor) + return; + ForestDeleteUndoAction *action = new ForestDeleteUndoAction( mForest->getData(), mEditor ); for ( U32 i=0; i < mSelection.size(); i++ ) diff --git a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.cpp b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.cpp index 14c37c63a..cb843d353 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.cpp @@ -47,12 +47,27 @@ void GFXD3D11CardProfiler::init() mCardDescription = adapter.description; mChipSet = adapter.chipSet; - mVersionString = adapter.driverVersion; + mVersionString = _getFeatureLevelStr(); mVideoMemory = adapter.vram; } Parent::init(); } +String GFXD3D11CardProfiler::_getFeatureLevelStr() +{ + switch (D3D11->getFeatureLevel()) + { + case D3D_FEATURE_LEVEL_11_0: + return String("Feature level 11.0"); + case D3D_FEATURE_LEVEL_10_1: + return String("Feature level 10.1"); + case D3D_FEATURE_LEVEL_10_0: + return String("Feature level 10.0"); + default: + return String("Unknown feature level"); + } +} + void GFXD3D11CardProfiler::setupCardCapabilities() { setCapability("maxTextureWidth", D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION); diff --git a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h index c26432928..4a7ea9645 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h +++ b/Engine/source/gfx/D3D11/gfxD3D11CardProfiler.h @@ -41,6 +41,7 @@ protected: void setupCardCapabilities(); bool _queryCardCap(const String &query, U32 &foundResult); bool _queryFormat(const GFXFormat fmt, const GFXTextureProfile *profile, bool &inOutAutogenMips); + String _getFeatureLevelStr(); }; #endif diff --git a/Engine/source/gfx/D3D11/gfxD3D11Device.cpp b/Engine/source/gfx/D3D11/gfxD3D11Device.cpp index a71e9c932..fd2e2e58b 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Device.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11Device.cpp @@ -37,6 +37,7 @@ #include "windowManager/platformWindow.h" #include "gfx/D3D11/screenshotD3D11.h" #include "materials/shaderData.h" +#include //ok now stressing out folks, this is just for debug events(D3DPER) :) #ifdef TORQUE_DEBUG #include "d3d11sdklayers.h" @@ -53,6 +54,133 @@ GFXDevice *GFXD3D11Device::createInstance(U32 adapterIndex) return dev; } +class GFXPCD3D11RegisterDevice +{ +public: + GFXPCD3D11RegisterDevice() + { + GFXInit::getRegisterDeviceSignal().notify(&GFXD3D11Device::enumerateAdapters); + } +}; + +static GFXPCD3D11RegisterDevice pPCD3D11RegisterDevice; + +//----------------------------------------------------------------------------- +/// Parse command line arguments for window creation +//----------------------------------------------------------------------------- +static void sgPCD3D11DeviceHandleCommandLine(S32 argc, const char **argv) +{ + // useful to pass parameters by command line for d3d (e.g. -dx9 -dx11) + for (U32 i = 1; i < argc; i++) + { + argv[i]; + } +} + +// Register the command line parsing hook +static ProcessRegisterCommandLine sgCommandLine(sgPCD3D11DeviceHandleCommandLine); + +GFXD3D11Device::GFXD3D11Device(U32 index) +{ + mDeviceSwizzle32 = &Swizzles::bgra; + GFXVertexColor::setSwizzle(mDeviceSwizzle32); + + mDeviceSwizzle24 = &Swizzles::bgr; + + mAdapterIndex = index; + mD3DDevice = NULL; + mVolatileVB = NULL; + + mCurrentPB = NULL; + mDynamicPB = NULL; + + mLastVertShader = NULL; + mLastPixShader = NULL; + + mCanCurrentlyRender = false; + mTextureManager = NULL; + mCurrentStateBlock = NULL; + mResourceListHead = NULL; + + mPixVersion = 0.0; + + mVertexShaderTarget = String::EmptyString; + mPixelShaderTarget = String::EmptyString; + mShaderModel = String::EmptyString; + + mDrawInstancesCount = 0; + + mCardProfiler = NULL; + + mDeviceDepthStencil = NULL; + mDeviceBackbuffer = NULL; + mDeviceBackBufferView = NULL; + mDeviceDepthStencilView = NULL; + + mCreateFenceType = -1; // Unknown, test on first allocate + + mCurrentConstBuffer = NULL; + + mOcclusionQuerySupported = false; + + mDebugLayers = false; + + for (U32 i = 0; i < GS_COUNT; ++i) + mModelViewProjSC[i] = NULL; + + // Set up the Enum translation tables + GFXD3D11EnumTranslate::init(); +} + +GFXD3D11Device::~GFXD3D11Device() +{ + // Release our refcount on the current stateblock object + mCurrentStateBlock = NULL; + + releaseDefaultPoolResources(); + + mD3DDeviceContext->ClearState(); + mD3DDeviceContext->Flush(); + + // Free the sampler states + SamplerMap::Iterator sampIter = mSamplersMap.begin(); + for (; sampIter != mSamplersMap.end(); ++sampIter) + SAFE_RELEASE(sampIter->value); + + // Free the vertex declarations. + VertexDeclMap::Iterator iter = mVertexDecls.begin(); + for (; iter != mVertexDecls.end(); iter++) + delete iter->value; + + // Forcibly clean up the pools + mVolatileVBList.setSize(0); + mDynamicPB = NULL; + + // And release our D3D resources. + SAFE_RELEASE(mDeviceDepthStencilView); + SAFE_RELEASE(mDeviceBackBufferView); + SAFE_RELEASE(mDeviceDepthStencil); + SAFE_RELEASE(mDeviceBackbuffer); + SAFE_RELEASE(mD3DDeviceContext); + + SAFE_DELETE(mCardProfiler); + SAFE_DELETE(gScreenShot); + +#ifdef TORQUE_DEBUG + if (mDebugLayers) + { + ID3D11Debug *pDebug = NULL; + mD3DDevice->QueryInterface(IID_PPV_ARGS(&pDebug)); + AssertFatal(pDebug, "~GFXD3D11Device- Failed to get debug layer"); + pDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL); + SAFE_RELEASE(pDebug); + } +#endif + + SAFE_RELEASE(mSwapChain); + SAFE_RELEASE(mD3DDevice); +} + GFXFormat GFXD3D11Device::selectSupportedFormat(GFXTextureProfile *profile, const Vector &formats, bool texture, bool mustblend, bool mustfilter) { U32 features = 0; @@ -186,10 +314,47 @@ void GFXD3D11Device::enumerateAdapters(Vector &adapterList) toAdd->mAvailableModes.push_back(vmAdd); } + //Check adapater can handle feature level 10 + D3D_FEATURE_LEVEL deviceFeature; + ID3D11Device *pTmpDevice = nullptr; + // Create temp Direct3D11 device. + bool suitable = true; + UINT createDeviceFlags = D3D11_CREATE_DEVICE_SINGLETHREADED | D3D11_CREATE_DEVICE_BGRA_SUPPORT; + hr = D3D11CreateDevice(EnumAdapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, createDeviceFlags, NULL, 0, D3D11_SDK_VERSION, &pTmpDevice, &deviceFeature, NULL); + + if (FAILED(hr)) + suitable = false; + + if (deviceFeature < D3D_FEATURE_LEVEL_10_0) + suitable = false; + + //double check we support required bgra format for LEVEL_10_0 & LEVEL_10_1 + if (deviceFeature == D3D_FEATURE_LEVEL_10_0 || deviceFeature == D3D_FEATURE_LEVEL_10_1) + { + U32 formatSupported = 0; + pTmpDevice->CheckFormatSupport(DXGI_FORMAT_B8G8R8A8_UNORM, &formatSupported); + U32 flagsRequired = D3D11_FORMAT_SUPPORT_RENDER_TARGET | D3D11_FORMAT_SUPPORT_DISPLAY; + if (!(formatSupported && flagsRequired)) + { + Con::printf("DXGI adapter: %s does not support BGRA", Description.c_str()); + suitable = false; + } + } + delete[] displayModes; + SAFE_RELEASE(pTmpDevice); SAFE_RELEASE(pOutput); SAFE_RELEASE(EnumAdapter); - adapterList.push_back(toAdd); + + if (suitable) + { + adapterList.push_back(toAdd); + } + else + { + Con::printf("DXGI adapter: %s does not support D3D11 feature level 10 or better", Description.c_str()); + delete toAdd; + } } SAFE_RELEASE(DXGIFactory); @@ -261,16 +426,11 @@ void GFXD3D11Device::enumerateVideoModes() SAFE_RELEASE(DXGIFactory); } -IDXGISwapChain* GFXD3D11Device::getSwapChain() -{ - return mSwapChain; -} - void GFXD3D11Device::init(const GFXVideoMode &mode, PlatformWindow *window) { AssertFatal(window, "GFXD3D11Device::init - must specify a window!"); - - HWND winHwnd = (HWND)window->getSystemWindow( PlatformWindow::WindowSystem_Windows ); + HWND hwnd = (HWND)window->getSystemWindow(PlatformWindow::WindowSystem_Windows); + SetFocus(hwnd);//ensure window has focus UINT createDeviceFlags = D3D11_CREATE_DEVICE_SINGLETHREADED | D3D11_CREATE_DEVICE_BGRA_SUPPORT; #ifdef TORQUE_DEBUG @@ -278,66 +438,77 @@ void GFXD3D11Device::init(const GFXVideoMode &mode, PlatformWindow *window) mDebugLayers = true; #endif - DXGI_SWAP_CHAIN_DESC d3dpp = setupPresentParams(mode, winHwnd); - - D3D_FEATURE_LEVEL deviceFeature; D3D_DRIVER_TYPE driverType = D3D_DRIVER_TYPE_HARDWARE;// use D3D_DRIVER_TYPE_REFERENCE for reference device - // create a device, device context and swap chain using the information in the d3dpp struct - HRESULT hres = D3D11CreateDeviceAndSwapChain(NULL, - driverType, - NULL, - createDeviceFlags, - NULL, - 0, - D3D11_SDK_VERSION, - &d3dpp, - &mSwapChain, - &mD3DDevice, - &deviceFeature, - &mD3DDeviceContext); + // create a device & device context + HRESULT hres = D3D11CreateDevice(NULL, + driverType, + NULL, + createDeviceFlags, + NULL, + 0, + D3D11_SDK_VERSION, + &mD3DDevice, + &mFeatureLevel, + &mD3DDeviceContext); if(FAILED(hres)) { #ifdef TORQUE_DEBUG - //try again without debug device layer enabled - createDeviceFlags &= ~D3D11_CREATE_DEVICE_DEBUG; - HRESULT hres = D3D11CreateDeviceAndSwapChain(NULL, driverType,NULL,createDeviceFlags,NULL, 0, - D3D11_SDK_VERSION, - &d3dpp, - &mSwapChain, - &mD3DDevice, - &deviceFeature, - &mD3DDeviceContext); - //if we failed again than we definitely have a problem - if (FAILED(hres)) - AssertFatal(false, "GFXD3D11Device::init - D3D11CreateDeviceAndSwapChain failed!"); + //try again without debug device layer enabled + createDeviceFlags &= ~D3D11_CREATE_DEVICE_DEBUG; + hres = D3D11CreateDevice(NULL, + driverType, + NULL, + createDeviceFlags, + NULL, + 0, + D3D11_SDK_VERSION, + &mD3DDevice, + &mFeatureLevel, + &mD3DDeviceContext); + //if we failed again than we definitely have a problem + if (FAILED(hres)) + AssertFatal(false, "GFXD3D11Device::init - D3D11CreateDeviceAndSwapChain failed!"); - Con::warnf("GFXD3D11Device::init - Debug layers not detected!"); - mDebugLayers = false; + Con::warnf("GFXD3D11Device::init - Debug layers not detected!"); + mDebugLayers = false; #else - AssertFatal(false, "GFXD3D11Device::init - D3D11CreateDeviceAndSwapChain failed!"); + AssertFatal(false, "GFXD3D11Device::init - D3D11CreateDeviceAndSwapChain failed!"); #endif } - //set the fullscreen state here if we need to - if(mode.fullScreen) - { - hres = mSwapChain->SetFullscreenState(TRUE, NULL); - if(FAILED(hres)) - { - AssertFatal(false, "GFXD3D11Device::init- Failed to set fullscreen state!"); - } - } +#ifdef TORQUE_DEBUG + _suppressDebugMessages(); +#endif mTextureManager = new GFXD3D11TextureManager(); // Now reacquire all the resources we trashed earlier reacquireDefaultPoolResources(); - //TODO implement feature levels? - if (deviceFeature >= D3D_FEATURE_LEVEL_11_0) + //set vert/pixel shader targets + switch (mFeatureLevel) + { + case D3D_FEATURE_LEVEL_11_0: + mVertexShaderTarget = "vs_5_0"; + mPixelShaderTarget = "ps_5_0"; mPixVersion = 5.0f; - else - AssertFatal(false, "GFXD3D11Device::init - We don't support anything below feature level 11."); + mShaderModel = "50"; + break; + case D3D_FEATURE_LEVEL_10_1: + mVertexShaderTarget = "vs_4_1"; + mPixelShaderTarget = "ps_4_1"; + mPixVersion = 4.1f; + mShaderModel = "41"; + break; + case D3D_FEATURE_LEVEL_10_0: + mVertexShaderTarget = "vs_4_0"; + mPixelShaderTarget = "ps_4_0"; + mPixVersion = 4.0f; + mShaderModel = "40"; + break; + default: + AssertFatal(false, "GFXD3D11Device::init - We don't support this feature level"); + } D3D11_QUERY_DESC queryDesc; queryDesc.Query = D3D11_QUERY_OCCLUSION; @@ -355,68 +526,6 @@ void GFXD3D11Device::init(const GFXVideoMode &mode, PlatformWindow *window) mCardProfiler = new GFXD3D11CardProfiler(); mCardProfiler->init(); - D3D11_TEXTURE2D_DESC desc; - desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; - desc.CPUAccessFlags = 0; - desc.Format = GFXD3D11TextureFormat[GFXFormatD24S8]; - desc.MipLevels = 1; - desc.ArraySize = 1; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.Width = mode.resolution.x; - desc.Height = mode.resolution.y; - desc.SampleDesc.Count =1; - desc.SampleDesc.Quality =0; - desc.MiscFlags = 0; - - HRESULT hr = mD3DDevice->CreateTexture2D(&desc, NULL, &mDeviceDepthStencil); - if(FAILED(hr)) - { - AssertFatal(false, "GFXD3D11Device::init - couldn't create device's depth-stencil surface."); - } - - D3D11_DEPTH_STENCIL_VIEW_DESC depthDesc; - depthDesc.Format = GFXD3D11TextureFormat[GFXFormatD24S8]; - depthDesc.Flags =0 ; - depthDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; - depthDesc.Texture2D.MipSlice = 0; - - hr = mD3DDevice->CreateDepthStencilView(mDeviceDepthStencil, &depthDesc, &mDeviceDepthStencilView); - - if(FAILED(hr)) - { - AssertFatal(false, "GFXD3D11Device::init - couldn't create depth stencil view"); - } - - hr = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&mDeviceBackbuffer); - if(FAILED(hr)) - AssertFatal(false, "GFXD3D11Device::init - coudln't retrieve backbuffer ref"); - - //create back buffer view - D3D11_RENDER_TARGET_VIEW_DESC RTDesc; - - RTDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - RTDesc.Texture2D.MipSlice = 0; - RTDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; - - hr = mD3DDevice->CreateRenderTargetView(mDeviceBackbuffer, &RTDesc, &mDeviceBackBufferView); - - if(FAILED(hr)) - AssertFatal(false, "GFXD3D11Device::init - couldn't create back buffer target view"); - -#ifdef TORQUE_DEBUG - String backBufferName = "MainBackBuffer"; - String depthSteniclName = "MainDepthStencil"; - String backBuffViewName = "MainBackBuffView"; - String depthStencViewName = "MainDepthView"; - mDeviceBackbuffer->SetPrivateData(WKPDID_D3DDebugObjectName, backBufferName.size(), backBufferName.c_str()); - mDeviceDepthStencil->SetPrivateData(WKPDID_D3DDebugObjectName, depthSteniclName.size(), depthSteniclName.c_str()); - mDeviceDepthStencilView->SetPrivateData(WKPDID_D3DDebugObjectName, depthStencViewName.size(), depthStencViewName.c_str()); - mDeviceBackBufferView->SetPrivateData(WKPDID_D3DDebugObjectName, backBuffViewName.size(), backBuffViewName.c_str()); - - _suppressDebugMessages(); - -#endif - gScreenShot = new ScreenShotD3D11; mInitialized = true; @@ -466,14 +575,35 @@ GFXWindowTarget * GFXD3D11Device::allocWindowTarget(PlatformWindow *window) { AssertFatal(window,"GFXD3D11Device::allocWindowTarget - no window provided!"); - // Allocate the device. - init(window->getVideoMode(), window); - // Set up a new window target... GFXD3D11WindowTarget *gdwt = new GFXD3D11WindowTarget(); gdwt->mWindow = window; gdwt->mSize = window->getClientExtent(); - gdwt->initPresentationParams(); + + if (!mInitialized) + { + gdwt->mSecondaryWindow = false; + // Allocate the device. + init(window->getVideoMode(), window); + gdwt->initPresentationParams(); + gdwt->createSwapChain(); + gdwt->createBuffersAndViews(); + + mSwapChain = gdwt->getSwapChain(); + mDeviceBackbuffer = gdwt->getBackBuffer(); + mDeviceDepthStencil = gdwt->getDepthStencil(); + mDeviceBackBufferView = gdwt->getBackBufferView(); + mDeviceDepthStencilView = gdwt->getDepthStencilView(); + + } + else //additional window/s + { + gdwt->mSecondaryWindow = true; + gdwt->initPresentationParams(); + gdwt->createSwapChain(); + gdwt->createBuffersAndViews(); + } + gdwt->registerResourceWithDevice(this); return gdwt; @@ -487,13 +617,15 @@ GFXTextureTarget* GFXD3D11Device::allocRenderToTextureTarget() return targ; } -void GFXD3D11Device::reset(DXGI_SWAP_CHAIN_DESC &d3dpp) +void GFXD3D11Device::beginReset() { if (!mD3DDevice) return; mInitialized = false; + releaseDefaultPoolResources(); + // Clean up some commonly dangling state. This helps prevents issues with // items that are destroyed by the texture manager callbacks and recreated // later, but still left bound. @@ -504,239 +636,30 @@ void GFXD3D11Device::reset(DXGI_SWAP_CHAIN_DESC &d3dpp) mD3DDeviceContext->ClearState(); - DXGI_MODE_DESC displayModes; - displayModes.Format = d3dpp.BufferDesc.Format; - displayModes.Height = d3dpp.BufferDesc.Height; - displayModes.Width = d3dpp.BufferDesc.Width; - displayModes.RefreshRate = d3dpp.BufferDesc.RefreshRate; - displayModes.Scaling = d3dpp.BufferDesc.Scaling; - displayModes.ScanlineOrdering = d3dpp.BufferDesc.ScanlineOrdering; - - HRESULT hr; - if (!d3dpp.Windowed) - { - hr = mSwapChain->ResizeTarget(&displayModes); - - if (FAILED(hr)) - { - AssertFatal(false, "D3D11Device::reset - failed to resize target!"); - } - } - - // First release all the stuff we allocated from D3DPOOL_DEFAULT - releaseDefaultPoolResources(); - - //release the backbuffer, depthstencil, and their views - SAFE_RELEASE(mDeviceBackBufferView); - SAFE_RELEASE(mDeviceBackbuffer); + //release old buffers and views SAFE_RELEASE(mDeviceDepthStencilView); + SAFE_RELEASE(mDeviceBackBufferView); SAFE_RELEASE(mDeviceDepthStencil); + SAFE_RELEASE(mDeviceBackbuffer); +} - hr = mSwapChain->ResizeBuffers(d3dpp.BufferCount, d3dpp.BufferDesc.Width, d3dpp.BufferDesc.Height, d3dpp.BufferDesc.Format, d3dpp.Windowed ? 0 : DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); - - if (FAILED(hr)) - { - AssertFatal(false, "D3D11Device::reset - failed to resize back buffer!"); - } - - //recreate backbuffer view. depth stencil view and texture - D3D11_TEXTURE2D_DESC desc; - desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; - desc.CPUAccessFlags = 0; - desc.Format = GFXD3D11TextureFormat[GFXFormatD24S8]; - desc.MipLevels = 1; - desc.ArraySize = 1; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.Width = d3dpp.BufferDesc.Width; - desc.Height = d3dpp.BufferDesc.Height; - desc.SampleDesc.Count = 1; - desc.SampleDesc.Quality = 0; - desc.MiscFlags = 0; - - hr = mD3DDevice->CreateTexture2D(&desc, NULL, &mDeviceDepthStencil); - if (FAILED(hr)) - { - AssertFatal(false, "GFXD3D11Device::reset - couldn't create device's depth-stencil surface."); - } - - D3D11_DEPTH_STENCIL_VIEW_DESC depthDesc; - depthDesc.Format = GFXD3D11TextureFormat[GFXFormatD24S8]; - depthDesc.Flags = 0; - depthDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; - depthDesc.Texture2D.MipSlice = 0; - - hr = mD3DDevice->CreateDepthStencilView(mDeviceDepthStencil, &depthDesc, &mDeviceDepthStencilView); - - if (FAILED(hr)) - { - AssertFatal(false, "GFXD3D11Device::reset - couldn't create depth stencil view"); - } - - hr = mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&mDeviceBackbuffer); - if (FAILED(hr)) - AssertFatal(false, "GFXD3D11Device::reset - coudln't retrieve backbuffer ref"); - - //create back buffer view - D3D11_RENDER_TARGET_VIEW_DESC RTDesc; - - RTDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - RTDesc.Texture2D.MipSlice = 0; - RTDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; - - hr = mD3DDevice->CreateRenderTargetView(mDeviceBackbuffer, &RTDesc, &mDeviceBackBufferView); - - if (FAILED(hr)) - AssertFatal(false, "GFXD3D11Device::reset - couldn't create back buffer target view"); +void GFXD3D11Device::endReset(GFXD3D11WindowTarget *windowTarget) +{ + //grab new references + mDeviceBackbuffer = windowTarget->getBackBuffer(); + mDeviceDepthStencil = windowTarget->getDepthStencil(); + mDeviceBackBufferView = windowTarget->getBackBufferView(); + mDeviceDepthStencilView = windowTarget->getDepthStencilView(); mD3DDeviceContext->OMSetRenderTargets(1, &mDeviceBackBufferView, mDeviceDepthStencilView); - hr = mSwapChain->SetFullscreenState(!d3dpp.Windowed, NULL); - - if (FAILED(hr)) - { - AssertFatal(false, "D3D11Device::reset - failed to change screen states!"); - } - - //Microsoft recommend this, see DXGI documentation - if (!d3dpp.Windowed) - { - displayModes.RefreshRate.Numerator = 0; - displayModes.RefreshRate.Denominator = 0; - hr = mSwapChain->ResizeTarget(&displayModes); - - if (FAILED(hr)) - { - AssertFatal(false, "D3D11Device::reset - failed to resize target!"); - } - } - - mInitialized = true; - - // Now re aquire all the resources we trashed earlier + // Now reacquire all the resources we trashed earlier reacquireDefaultPoolResources(); - + mInitialized = true; // Mark everything dirty and flush to card, for sanity. updateStates(true); } -class GFXPCD3D11RegisterDevice -{ -public: - GFXPCD3D11RegisterDevice() - { - GFXInit::getRegisterDeviceSignal().notify(&GFXD3D11Device::enumerateAdapters); - } -}; - -static GFXPCD3D11RegisterDevice pPCD3D11RegisterDevice; - -//----------------------------------------------------------------------------- -/// Parse command line arguments for window creation -//----------------------------------------------------------------------------- -static void sgPCD3D11DeviceHandleCommandLine(S32 argc, const char **argv) -{ - // useful to pass parameters by command line for d3d (e.g. -dx9 -dx11) - for (U32 i = 1; i < argc; i++) - { - argv[i]; - } -} - -// Register the command line parsing hook -static ProcessRegisterCommandLine sgCommandLine( sgPCD3D11DeviceHandleCommandLine ); - -GFXD3D11Device::GFXD3D11Device(U32 index) -{ - mDeviceSwizzle32 = &Swizzles::bgra; - GFXVertexColor::setSwizzle( mDeviceSwizzle32 ); - - mDeviceSwizzle24 = &Swizzles::bgr; - - mAdapterIndex = index; - mD3DDevice = NULL; - mVolatileVB = NULL; - - mCurrentPB = NULL; - mDynamicPB = NULL; - - mLastVertShader = NULL; - mLastPixShader = NULL; - - mCanCurrentlyRender = false; - mTextureManager = NULL; - mCurrentStateBlock = NULL; - mResourceListHead = NULL; - - mPixVersion = 0.0; - - mDrawInstancesCount = 0; - - mCardProfiler = NULL; - - mDeviceDepthStencil = NULL; - mDeviceBackbuffer = NULL; - mDeviceBackBufferView = NULL; - mDeviceDepthStencilView = NULL; - - mCreateFenceType = -1; // Unknown, test on first allocate - - mCurrentConstBuffer = NULL; - - mOcclusionQuerySupported = false; - - mDebugLayers = false; - - for(U32 i = 0; i < GS_COUNT; ++i) - mModelViewProjSC[i] = NULL; - - // Set up the Enum translation tables - GFXD3D11EnumTranslate::init(); -} - -GFXD3D11Device::~GFXD3D11Device() -{ - // Release our refcount on the current stateblock object - mCurrentStateBlock = NULL; - - releaseDefaultPoolResources(); - - mD3DDeviceContext->ClearState(); - mD3DDeviceContext->Flush(); - - // Free the vertex declarations. - VertexDeclMap::Iterator iter = mVertexDecls.begin(); - for ( ; iter != mVertexDecls.end(); iter++ ) - delete iter->value; - - // Forcibly clean up the pools - mVolatileVBList.setSize(0); - mDynamicPB = NULL; - - // And release our D3D resources. - SAFE_RELEASE(mDeviceDepthStencilView); - SAFE_RELEASE(mDeviceBackBufferView); - SAFE_RELEASE(mDeviceDepthStencil); - SAFE_RELEASE(mDeviceBackbuffer); - SAFE_RELEASE(mD3DDeviceContext); - - SAFE_DELETE(mCardProfiler); - SAFE_DELETE(gScreenShot); - -#ifdef TORQUE_DEBUG - if (mDebugLayers) - { - ID3D11Debug *pDebug = NULL; - mD3DDevice->QueryInterface(IID_PPV_ARGS(&pDebug)); - AssertFatal(pDebug, "~GFXD3D11Device- Failed to get debug layer"); - pDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL); - SAFE_RELEASE(pDebug); - } -#endif - - SAFE_RELEASE(mSwapChain); - SAFE_RELEASE(mD3DDevice); -} - void GFXD3D11Device::setupGenericShaders(GenericShaderType type) { AssertFatal(type != GSTargetRestore, ""); //not used @@ -744,11 +667,12 @@ void GFXD3D11Device::setupGenericShaders(GenericShaderType type) if(mGenericShader[GSColor] == NULL) { ShaderData *shaderData; - + //shader model 4.0 is enough for the generic shaders + const char* shaderModel = "4.0"; shaderData = new ShaderData(); shaderData->setField("DXVertexShaderFile", "shaders/common/fixedFunction/colorV.hlsl"); shaderData->setField("DXPixelShaderFile", "shaders/common/fixedFunction/colorP.hlsl"); - shaderData->setField("pixVersion", "5.0"); + shaderData->setField("pixVersion", shaderModel); shaderData->registerObject(); mGenericShader[GSColor] = shaderData->getShader(); mGenericShaderBuffer[GSColor] = mGenericShader[GSColor]->allocConstBuffer(); @@ -758,7 +682,7 @@ void GFXD3D11Device::setupGenericShaders(GenericShaderType type) shaderData = new ShaderData(); shaderData->setField("DXVertexShaderFile", "shaders/common/fixedFunction/modColorTextureV.hlsl"); shaderData->setField("DXPixelShaderFile", "shaders/common/fixedFunction/modColorTextureP.hlsl"); - shaderData->setField("pixVersion", "5.0"); + shaderData->setField("pixVersion", shaderModel); shaderData->registerObject(); mGenericShader[GSModColorTexture] = shaderData->getShader(); mGenericShaderBuffer[GSModColorTexture] = mGenericShader[GSModColorTexture]->allocConstBuffer(); @@ -768,7 +692,7 @@ void GFXD3D11Device::setupGenericShaders(GenericShaderType type) shaderData = new ShaderData(); shaderData->setField("DXVertexShaderFile", "shaders/common/fixedFunction/addColorTextureV.hlsl"); shaderData->setField("DXPixelShaderFile", "shaders/common/fixedFunction/addColorTextureP.hlsl"); - shaderData->setField("pixVersion", "5.0"); + shaderData->setField("pixVersion", shaderModel); shaderData->registerObject(); mGenericShader[GSAddColorTexture] = shaderData->getShader(); mGenericShaderBuffer[GSAddColorTexture] = mGenericShader[GSAddColorTexture]->allocConstBuffer(); @@ -778,7 +702,7 @@ void GFXD3D11Device::setupGenericShaders(GenericShaderType type) shaderData = new ShaderData(); shaderData->setField("DXVertexShaderFile", "shaders/common/fixedFunction/textureV.hlsl"); shaderData->setField("DXPixelShaderFile", "shaders/common/fixedFunction/textureP.hlsl"); - shaderData->setField("pixVersion", "5.0"); + shaderData->setField("pixVersion", shaderModel); shaderData->registerObject(); mGenericShader[GSTexture] = shaderData->getShader(); mGenericShaderBuffer[GSTexture] = mGenericShader[GSTexture]->allocConstBuffer(); @@ -1759,4 +1683,32 @@ GFXCubemap * GFXD3D11Device::createCubemap() GFXD3D11Cubemap* cube = new GFXD3D11Cubemap(); cube->registerResourceWithDevice(this); return cube; +} + +//------------------------------------------------------------------------------ +void GFXD3D11Device::enterDebugEvent(ColorI color, const char *name) +{ + // BJGFIX + WCHAR eventName[260]; + MultiByteToWideChar(CP_ACP, 0, name, -1, eventName, 260); + + D3DPERF_BeginEvent(D3DCOLOR_ARGB(color.alpha, color.red, color.green, color.blue), + (LPCWSTR)&eventName); +} + +//------------------------------------------------------------------------------ +void GFXD3D11Device::leaveDebugEvent() +{ + D3DPERF_EndEvent(); +} + +//------------------------------------------------------------------------------ +void GFXD3D11Device::setDebugMarker(ColorI color, const char *name) +{ + // BJGFIX + WCHAR eventName[260]; + MultiByteToWideChar(CP_ACP, 0, name, -1, eventName, 260); + + D3DPERF_SetMarker(D3DCOLOR_ARGB(color.alpha, color.red, color.green, color.blue), + (LPCWSTR)&eventName); } \ No newline at end of file diff --git a/Engine/source/gfx/D3D11/gfxD3D11Device.h b/Engine/source/gfx/D3D11/gfxD3D11Device.h index 8640c8b68..2936ac2af 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Device.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Device.h @@ -49,6 +49,10 @@ class D3D11OculusTexture; class GFXD3D11Device : public GFXDevice { +public: + typedef Map SamplerMap; +private: + friend class GFXResource; friend class GFXD3D11PrimitiveBuffer; friend class GFXD3D11VertexBuffer; @@ -66,9 +70,9 @@ class GFXD3D11Device : public GFXDevice virtual GFXWindowTarget *allocWindowTarget(PlatformWindow *window); virtual GFXTextureTarget *allocRenderToTextureTarget(); - virtual void enterDebugEvent(ColorI color, const char *name){}; - virtual void leaveDebugEvent(){}; - virtual void setDebugMarker(ColorI color, const char *name){}; + virtual void enterDebugEvent(ColorI color, const char *name); + virtual void leaveDebugEvent(); + virtual void setDebugMarker(ColorI color, const char *name); protected: @@ -98,6 +102,9 @@ protected: typedef Map VertexDeclMap; VertexDeclMap mVertexDecls; + /// Used to lookup sampler state for a given hash key + SamplerMap mSamplersMap; + ID3D11RenderTargetView* mDeviceBackBufferView; ID3D11DepthStencilView* mDeviceDepthStencilView; @@ -129,6 +136,13 @@ protected: F32 mPixVersion; + D3D_FEATURE_LEVEL mFeatureLevel; + // Shader Model targers + String mVertexShaderTarget; + String mPixelShaderTarget; + // String for use with shader macros in the form of shader model version * 10 + String mShaderModel; + bool mDebugLayers; DXGI_SAMPLE_DESC mMultisampleDesc; @@ -146,7 +160,6 @@ protected: virtual GFXD3D11VertexBuffer* findVBPool( const GFXVertexFormat *vertexFormat, U32 numVertsNeeded ); virtual GFXD3D11VertexBuffer* createVBPool( const GFXVertexFormat *vertexFormat, U32 vertSize ); - IDXGISwapChain* getSwapChain(); // State overrides // { @@ -197,8 +210,6 @@ public: static void enumerateAdapters( Vector &adapterList ); - GFXTextureObject* createRenderSurface( U32 width, U32 height, GFXFormat format, U32 mipLevel ); - ID3D11DepthStencilView* getDepthStencilView() { return mDeviceDepthStencilView; } ID3D11RenderTargetView* getRenderTargetView() { return mDeviceBackBufferView; } ID3D11Texture2D* getBackBufferTexture() { return mDeviceBackbuffer; } @@ -281,7 +292,8 @@ public: ID3D11Device* getDevice(){ return mD3DDevice; } /// Reset - void reset( DXGI_SWAP_CHAIN_DESC &d3dpp ); + void beginReset(); + void endReset(GFXD3D11WindowTarget *windowTarget); virtual void setupGenericShaders( GenericShaderType type = GSColor ); @@ -294,6 +306,17 @@ public: // Default multisample parameters DXGI_SAMPLE_DESC getMultisampleType() const { return mMultisampleDesc; } + + // Get feature level this gfx device supports + D3D_FEATURE_LEVEL getFeatureLevel() const { return mFeatureLevel; } + // Shader Model targers + const String &getVertexShaderTarget() const { return mVertexShaderTarget; } + const String &getPixelShaderTarget() const { return mPixelShaderTarget; } + const String &getShaderModel() const { return mShaderModel; } + + // grab the sampler map + const SamplerMap &getSamplersMap() const { return mSamplersMap; } + SamplerMap &getSamplersMap() { return mSamplersMap; } }; #endif diff --git a/Engine/source/gfx/D3D11/gfxD3D11Shader.cpp b/Engine/source/gfx/D3D11/gfxD3D11Shader.cpp index 519c4645a..054e19bc6 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Shader.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11Shader.cpp @@ -206,7 +206,6 @@ bool GFXD3D11ConstBufferLayout::setMatrix(const ParamDesc& pd, const GFXShaderCo } else if (pd.constType == GFXSCT_Float4x3) { - F32 buffer[4 * 4]; const U32 csize = 48; // Loop through and copy @@ -791,9 +790,8 @@ bool GFXD3D11Shader::_init() d3dMacros[i+smGlobalMacros.size()].Definition = mMacros[i].value.c_str(); } - //TODO support D3D_FEATURE_LEVEL properly with shaders instead of hard coding at hlsl 5 d3dMacros[macroCount - 2].Name = "TORQUE_SM"; - d3dMacros[macroCount - 2].Definition = "50"; + d3dMacros[macroCount - 2].Definition = D3D11->getShaderModel().c_str(); memset(&d3dMacros[macroCount - 1], 0, sizeof(D3D_SHADER_MACRO)); @@ -811,18 +809,21 @@ bool GFXD3D11Shader::_init() mSamplerDescriptions.clear(); mShaderConsts.clear(); + String vertTarget = D3D11->getVertexShaderTarget(); + String pixTarget = D3D11->getPixelShaderTarget(); + if ( !Con::getBoolVariable( "$shaders::forceLoadCSF", false ) ) { - if (!mVertexFile.isEmpty() && !_compileShader( mVertexFile, "vs_5_0", d3dMacros, mVertexConstBufferLayout, mSamplerDescriptions ) ) + if (!mVertexFile.isEmpty() && !_compileShader( mVertexFile, vertTarget, d3dMacros, mVertexConstBufferLayout, mSamplerDescriptions ) ) return false; - if (!mPixelFile.isEmpty() && !_compileShader( mPixelFile, "ps_5_0", d3dMacros, mPixelConstBufferLayout, mSamplerDescriptions ) ) + if (!mPixelFile.isEmpty() && !_compileShader( mPixelFile, pixTarget, d3dMacros, mPixelConstBufferLayout, mSamplerDescriptions ) ) return false; } else { - if ( !_loadCompiledOutput( mVertexFile, "vs_5_0", mVertexConstBufferLayout, mSamplerDescriptions ) ) + if ( !_loadCompiledOutput( mVertexFile, vertTarget, mVertexConstBufferLayout, mSamplerDescriptions ) ) { if ( smLogErrors ) Con::errorf( "GFXD3D11Shader::init - Unable to load precompiled vertex shader for '%s'.", mVertexFile.getFullPath().c_str() ); @@ -830,7 +831,7 @@ bool GFXD3D11Shader::_init() return false; } - if ( !_loadCompiledOutput( mPixelFile, "ps_5_0", mPixelConstBufferLayout, mSamplerDescriptions ) ) + if ( !_loadCompiledOutput( mPixelFile, pixTarget, mPixelConstBufferLayout, mSamplerDescriptions ) ) { if ( smLogErrors ) Con::errorf( "GFXD3D11Shader::init - Unable to load precompiled pixel shader for '%s'.", mPixelFile.getFullPath().c_str() ); @@ -1053,20 +1054,20 @@ bool GFXD3D11Shader::_compileShader( const Torque::Path &filePath, return result; } -void GFXD3D11Shader::_getShaderConstants( ID3D11ShaderReflection *table, +void GFXD3D11Shader::_getShaderConstants( ID3D11ShaderReflection *pTable, GenericConstBufferLayout *bufferLayoutIn, Vector &samplerDescriptions ) { PROFILE_SCOPE( GFXD3D11Shader_GetShaderConstants ); - AssertFatal(table, "NULL constant table not allowed, is this an assembly shader?"); + AssertFatal(pTable, "NULL constant table not allowed, is this an assembly shader?"); GFXD3D11ConstBufferLayout *bufferLayout = (GFXD3D11ConstBufferLayout*)bufferLayoutIn; Vector &subBuffers = bufferLayout->getSubBufferDesc(); subBuffers.clear(); D3D11_SHADER_DESC tableDesc; - HRESULT hr = table->GetDesc(&tableDesc); + HRESULT hr = pTable->GetDesc(&tableDesc); if (FAILED(hr)) { AssertFatal(false, "Shader Reflection table unable to be created"); @@ -1076,7 +1077,7 @@ void GFXD3D11Shader::_getShaderConstants( ID3D11ShaderReflection *table, U32 bufferOffset = 0; for (U32 i = 0; i < tableDesc.ConstantBuffers; i++) { - ID3D11ShaderReflectionConstantBuffer* constantBuffer = table->GetConstantBufferByIndex(i); + ID3D11ShaderReflectionConstantBuffer* constantBuffer = pTable->GetConstantBufferByIndex(i); D3D11_SHADER_BUFFER_DESC constantBufferDesc; if (constantBuffer->GetDesc(&constantBufferDesc) == S_OK) @@ -1161,7 +1162,7 @@ void GFXD3D11Shader::_getShaderConstants( ID3D11ShaderReflection *table, { GFXShaderConstDesc desc; D3D11_SHADER_INPUT_BIND_DESC bindDesc; - table->GetResourceBindingDesc(i, &bindDesc); + pTable->GetResourceBindingDesc(i, &bindDesc); switch (bindDesc.Type) { diff --git a/Engine/source/gfx/D3D11/gfxD3D11Shader.h b/Engine/source/gfx/D3D11/gfxD3D11Shader.h index 2e4074a8f..fc4cac62c 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Shader.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Shader.h @@ -434,7 +434,7 @@ protected: GenericConstBufferLayout *bufferLayout, Vector &samplerDescriptions ); - void _getShaderConstants( ID3D11ShaderReflection* table, + void _getShaderConstants( ID3D11ShaderReflection* pTable, GenericConstBufferLayout *bufferLayout, Vector &samplerDescriptions ); diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp index fb5f43936..9686f12e2 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp @@ -23,130 +23,172 @@ #include "gfx/gfxDevice.h" #include "gfx/D3D11/gfxD3D11StateBlock.h" #include "gfx/D3D11/gfxD3D11EnumTranslate.h" +#include "core/crc.h" + +namespace DictHash +{ + inline U32 hash(const GFXSamplerStateDesc &data) + { + return CRC::calculateCRC(&data, sizeof(GFXSamplerStateDesc));; + } +} GFXD3D11StateBlock::GFXD3D11StateBlock(const GFXStateBlockDesc& desc) { - AssertFatal(D3D11DEVICE, "Invalid D3DDevice!"); - - mDesc = desc; - mCachedHashValue = desc.getHashValue(); + AssertFatal(D3D11DEVICE, "Invalid D3DDevice!"); + PROFILE_SCOPE(GFXD3D11StateBlock_CreateStateBlock); - // Color writes - mColorMask = 0; - mColorMask |= (mDesc.colorWriteRed ? D3D11_COLOR_WRITE_ENABLE_RED : 0); - mColorMask |= (mDesc.colorWriteGreen ? D3D11_COLOR_WRITE_ENABLE_GREEN : 0); - mColorMask |= (mDesc.colorWriteBlue ? D3D11_COLOR_WRITE_ENABLE_BLUE : 0); - mColorMask |= (mDesc.colorWriteAlpha ? D3D11_COLOR_WRITE_ENABLE_ALPHA : 0); + mDesc = desc; + mCachedHashValue = desc.getHashValue(); - mBlendState = NULL; - for (U32 i = 0; i < GFX->getNumSamplers(); i++) - { - mSamplerStates[i] = NULL; - } + // Color writes + mColorMask = 0; + mColorMask |= (mDesc.colorWriteRed ? D3D11_COLOR_WRITE_ENABLE_RED : 0); + mColorMask |= (mDesc.colorWriteGreen ? D3D11_COLOR_WRITE_ENABLE_GREEN : 0); + mColorMask |= (mDesc.colorWriteBlue ? D3D11_COLOR_WRITE_ENABLE_BLUE : 0); + mColorMask |= (mDesc.colorWriteAlpha ? D3D11_COLOR_WRITE_ENABLE_ALPHA : 0); + + mBlendState = NULL; + for (U32 i = 0; i < 16; i++) + { + mSamplerStates[i] = NULL; + } mDepthStencilState = NULL; mRasterizerState = NULL; - mBlendDesc.AlphaToCoverageEnable = false; - mBlendDesc.IndependentBlendEnable = false; + ZeroMemory(&mBlendDesc, sizeof(D3D11_BLEND_DESC)); + mBlendDesc.AlphaToCoverageEnable = false; + mBlendDesc.IndependentBlendEnable = mDesc.separateAlphaBlendEnable; - mBlendDesc.RenderTarget[0].BlendEnable = mDesc.blendEnable; - mBlendDesc.RenderTarget[0].BlendOp = GFXD3D11BlendOp[mDesc.blendOp]; - mBlendDesc.RenderTarget[0].BlendOpAlpha = GFXD3D11BlendOp[mDesc.separateAlphaBlendOp]; - mBlendDesc.RenderTarget[0].DestBlend = GFXD3D11Blend[mDesc.blendDest]; - mBlendDesc.RenderTarget[0].DestBlendAlpha = GFXD3D11Blend[mDesc.separateAlphaBlendDest]; - mBlendDesc.RenderTarget[0].SrcBlend = GFXD3D11Blend[mDesc.blendSrc]; - mBlendDesc.RenderTarget[0].SrcBlendAlpha = GFXD3D11Blend[mDesc.separateAlphaBlendSrc]; - mBlendDesc.RenderTarget[0].RenderTargetWriteMask = mColorMask; + mBlendDesc.RenderTarget[0].BlendEnable = mDesc.blendEnable; + mBlendDesc.RenderTarget[0].BlendOp = GFXD3D11BlendOp[mDesc.blendOp]; + mBlendDesc.RenderTarget[0].BlendOpAlpha = GFXD3D11BlendOp[mDesc.separateAlphaBlendOp]; + mBlendDesc.RenderTarget[0].DestBlend = GFXD3D11Blend[mDesc.blendDest]; + mBlendDesc.RenderTarget[0].DestBlendAlpha = GFXD3D11Blend[mDesc.separateAlphaBlendDest]; + mBlendDesc.RenderTarget[0].SrcBlend = GFXD3D11Blend[mDesc.blendSrc]; + mBlendDesc.RenderTarget[0].SrcBlendAlpha = GFXD3D11Blend[mDesc.separateAlphaBlendSrc]; + mBlendDesc.RenderTarget[0].RenderTargetWriteMask = mColorMask; - HRESULT hr = D3D11DEVICE->CreateBlendState(&mBlendDesc, &mBlendState); + HRESULT hr = D3D11DEVICE->CreateBlendState(&mBlendDesc, &mBlendState); - if(FAILED(hr)) - { - AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateBlendState call failure."); - } + if (FAILED(hr)) + { + AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateBlendState call failure."); + } - mDepthStencilDesc.DepthWriteMask = mDesc.zWriteEnable ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO; - mDepthStencilDesc.DepthEnable = mDesc.zEnable; - mDepthStencilDesc.DepthFunc = GFXD3D11CmpFunc[mDesc.zFunc]; - mDepthStencilDesc.StencilWriteMask = mDesc.stencilWriteMask; - mDepthStencilDesc.StencilReadMask = mDesc.stencilMask; - mDepthStencilDesc.StencilEnable = mDesc.stencilEnable; + ZeroMemory(&mDepthStencilDesc, sizeof(D3D11_DEPTH_STENCIL_DESC)); + mDepthStencilDesc.DepthWriteMask = mDesc.zWriteEnable ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO; + mDepthStencilDesc.DepthEnable = mDesc.zEnable; + mDepthStencilDesc.DepthFunc = GFXD3D11CmpFunc[mDesc.zFunc]; + mDepthStencilDesc.StencilWriteMask = mDesc.stencilWriteMask; + mDepthStencilDesc.StencilReadMask = mDesc.stencilMask; + mDepthStencilDesc.StencilEnable = mDesc.stencilEnable; - mDepthStencilDesc.FrontFace.StencilFunc = GFXD3D11CmpFunc[mDesc.stencilFunc]; - mDepthStencilDesc.FrontFace.StencilFailOp = GFXD3D11StencilOp[mDesc.stencilFailOp]; - mDepthStencilDesc.FrontFace.StencilDepthFailOp = GFXD3D11StencilOp[mDesc.stencilZFailOp]; - mDepthStencilDesc.FrontFace.StencilPassOp = GFXD3D11StencilOp[mDesc.stencilPassOp]; - mDepthStencilDesc.BackFace = mDepthStencilDesc.FrontFace; + mDepthStencilDesc.FrontFace.StencilFunc = GFXD3D11CmpFunc[mDesc.stencilFunc]; + mDepthStencilDesc.FrontFace.StencilFailOp = GFXD3D11StencilOp[mDesc.stencilFailOp]; + mDepthStencilDesc.FrontFace.StencilDepthFailOp = GFXD3D11StencilOp[mDesc.stencilZFailOp]; + mDepthStencilDesc.FrontFace.StencilPassOp = GFXD3D11StencilOp[mDesc.stencilPassOp]; - hr = D3D11DEVICE->CreateDepthStencilState(&mDepthStencilDesc, &mDepthStencilState); + if (mDesc.stencilEnable) + mDepthStencilDesc.BackFace = mDepthStencilDesc.FrontFace; + else + { + mDepthStencilDesc.BackFace.StencilFunc = GFXD3D11CmpFunc[GFXCmpAlways]; + mDepthStencilDesc.BackFace.StencilFailOp = GFXD3D11StencilOp[GFXStencilOpKeep]; + mDepthStencilDesc.BackFace.StencilDepthFailOp = GFXD3D11StencilOp[GFXStencilOpKeep]; + mDepthStencilDesc.BackFace.StencilPassOp = GFXD3D11StencilOp[GFXStencilOpKeep]; + } - if(FAILED(hr)) - { - AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateDepthStencilState call failure."); - } + hr = D3D11DEVICE->CreateDepthStencilState(&mDepthStencilDesc, &mDepthStencilState); - mRasterizerDesc.CullMode = GFXD3D11CullMode[mDesc.cullMode]; - mRasterizerDesc.FillMode = GFXD3D11FillMode[mDesc.fillMode]; - mRasterizerDesc.DepthBias = mDesc.zBias; - mRasterizerDesc.SlopeScaledDepthBias = mDesc.zSlopeBias; - mRasterizerDesc.AntialiasedLineEnable = FALSE; - mRasterizerDesc.MultisampleEnable = FALSE; - mRasterizerDesc.ScissorEnable = FALSE; - mRasterizerDesc.DepthClipEnable = TRUE; - mRasterizerDesc.FrontCounterClockwise = FALSE; - mRasterizerDesc.DepthBiasClamp = D3D11_DEFAULT_DEPTH_BIAS_CLAMP; + if (FAILED(hr)) + { + AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateDepthStencilState call failure."); + } - hr = D3D11DEVICE->CreateRasterizerState(&mRasterizerDesc, &mRasterizerState); + ZeroMemory(&mRasterizerDesc, sizeof(D3D11_RASTERIZER_DESC)); + mRasterizerDesc.CullMode = GFXD3D11CullMode[mDesc.cullMode]; + mRasterizerDesc.FillMode = GFXD3D11FillMode[mDesc.fillMode]; + mRasterizerDesc.DepthBias = mDesc.zBias; + mRasterizerDesc.SlopeScaledDepthBias = mDesc.zSlopeBias; + mRasterizerDesc.AntialiasedLineEnable = FALSE; + mRasterizerDesc.MultisampleEnable = FALSE; + mRasterizerDesc.ScissorEnable = FALSE; + mRasterizerDesc.FrontCounterClockwise = FALSE; + mRasterizerDesc.DepthBiasClamp = D3D11_DEFAULT_DEPTH_BIAS_CLAMP; - if(FAILED(hr)) - { - AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateDepthStencilState call failure."); - } + if (mDesc.zEnable) + mRasterizerDesc.DepthClipEnable = true; + else + mRasterizerDesc.DepthClipEnable = false; - for ( U32 i = 0; i < GFX->getNumSamplers(); i++ ) - { - mSamplerDesc[i].AddressU = GFXD3D11TextureAddress[mDesc.samplers[i].addressModeU]; - mSamplerDesc[i].AddressV = GFXD3D11TextureAddress[mDesc.samplers[i].addressModeV]; - mSamplerDesc[i].AddressW = GFXD3D11TextureAddress[mDesc.samplers[i].addressModeW]; - mSamplerDesc[i].MaxAnisotropy = mDesc.samplers[i].maxAnisotropy; + hr = D3D11DEVICE->CreateRasterizerState(&mRasterizerDesc, &mRasterizerState); - mSamplerDesc[i].MipLODBias = mDesc.samplers[i].mipLODBias; - mSamplerDesc[i].MinLOD = 0; - mSamplerDesc[i].MaxLOD = FLT_MAX; + if (FAILED(hr)) + { + AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateDepthStencilState call failure."); + } - if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; - else - mSamplerDesc[i].Filter = D3D11_FILTER_ANISOTROPIC; - - mSamplerDesc[i].BorderColor[0] = 1.0f; - mSamplerDesc[i].BorderColor[1] = 1.0f; - mSamplerDesc[i].BorderColor[2] = 1.0f; - mSamplerDesc[i].BorderColor[3] = 1.0f; - mSamplerDesc[i].ComparisonFunc = D3D11_COMPARISON_NEVER; + ZeroMemory(&mSamplerDesc, sizeof(D3D11_SAMPLER_DESC) * 16); - hr = D3D11DEVICE->CreateSamplerState(&mSamplerDesc[i], &mSamplerStates[i]); + GFXD3D11Device::SamplerMap &dx11SamplerMap = D3D11->getSamplersMap(); - if(FAILED(hr)) - { - AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateSamplerState call failure."); - } - } + for (U32 i = 0; i < GFX->getNumSamplers(); i++) + { + GFXSamplerStateDesc &gfxSamplerState = mDesc.samplers[i]; + U32 hash = DictHash::hash(gfxSamplerState); + GFXD3D11Device::SamplerMap::Iterator itr = dx11SamplerMap.find(hash); + + if (itr == dx11SamplerMap.end()) + { + mSamplerDesc[i].AddressU = GFXD3D11TextureAddress[gfxSamplerState.addressModeU]; + mSamplerDesc[i].AddressV = GFXD3D11TextureAddress[gfxSamplerState.addressModeV]; + mSamplerDesc[i].AddressW = GFXD3D11TextureAddress[gfxSamplerState.addressModeW]; + mSamplerDesc[i].MaxAnisotropy = gfxSamplerState.maxAnisotropy; + + mSamplerDesc[i].MipLODBias = gfxSamplerState.mipLODBias; + mSamplerDesc[i].MinLOD = 0; + mSamplerDesc[i].MaxLOD = FLT_MAX; + + if (gfxSamplerState.magFilter == GFXTextureFilterPoint && gfxSamplerState.minFilter == GFXTextureFilterPoint && gfxSamplerState.mipFilter == GFXTextureFilterPoint) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + else if (gfxSamplerState.magFilter == GFXTextureFilterPoint && gfxSamplerState.minFilter == GFXTextureFilterPoint && gfxSamplerState.mipFilter == GFXTextureFilterLinear) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR; + else if (gfxSamplerState.magFilter == GFXTextureFilterLinear && gfxSamplerState.minFilter == GFXTextureFilterPoint && gfxSamplerState.mipFilter == GFXTextureFilterPoint) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT; + else if (gfxSamplerState.magFilter == GFXTextureFilterLinear && gfxSamplerState.minFilter == GFXTextureFilterPoint && gfxSamplerState.mipFilter == GFXTextureFilterLinear) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR; + else if (gfxSamplerState.magFilter == GFXTextureFilterPoint && gfxSamplerState.minFilter == GFXTextureFilterLinear && gfxSamplerState.mipFilter == GFXTextureFilterPoint) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT; + else if (gfxSamplerState.magFilter == GFXTextureFilterPoint && gfxSamplerState.minFilter == GFXTextureFilterLinear && gfxSamplerState.mipFilter == GFXTextureFilterLinear) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR; + else if (gfxSamplerState.magFilter == GFXTextureFilterLinear && gfxSamplerState.minFilter == GFXTextureFilterLinear && gfxSamplerState.mipFilter == GFXTextureFilterPoint) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT; + else if (gfxSamplerState.magFilter == GFXTextureFilterLinear && gfxSamplerState.minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) + mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + else + mSamplerDesc[i].Filter = D3D11_FILTER_ANISOTROPIC; + + mSamplerDesc[i].BorderColor[0] = 1.0f; + mSamplerDesc[i].BorderColor[1] = 1.0f; + mSamplerDesc[i].BorderColor[2] = 1.0f; + mSamplerDesc[i].BorderColor[3] = 1.0f; + + hr = D3D11DEVICE->CreateSamplerState(&mSamplerDesc[i], &mSamplerStates[i]); + if (FAILED(hr)) + { + AssertFatal(false, "GFXD3D11StateBlock::GFXD3D11StateBlock - CreateSamplerState call failure."); + } + + // add sampler state to the map + dx11SamplerMap.insert(hash, mSamplerStates[i]); + } + else + { + mSamplerStates[i] = itr->value; + } + } } GFXD3D11StateBlock::~GFXD3D11StateBlock() @@ -155,10 +197,9 @@ GFXD3D11StateBlock::~GFXD3D11StateBlock() SAFE_RELEASE(mRasterizerState); SAFE_RELEASE(mDepthStencilState); - //Use TEXTURE_STAGE_COUNT here, not safe to rely on GFX pointer - for (U32 i = 0; i < TEXTURE_STAGE_COUNT; ++i) + for (U32 i = 0; i < 16; ++i) { - SAFE_RELEASE(mSamplerStates[i]); + mSamplerStates[i] = NULL; } } @@ -171,115 +212,57 @@ U32 GFXD3D11StateBlock::getHashValue() const /// Returns a GFXStateBlockDesc that this block represents const GFXStateBlockDesc& GFXD3D11StateBlock::getDesc() const { - return mDesc; + return mDesc; } /// Called by D3D11 device to active this state block. /// @param oldState The current state, used to make sure we don't set redundant states on the device. Pass NULL to reset all states. void GFXD3D11StateBlock::activate(GFXD3D11StateBlock* oldState) { - PROFILE_SCOPE( GFXD3D11StateBlock_Activate ); + PROFILE_SCOPE(GFXD3D11StateBlock_Activate); - ID3D11DeviceContext* pDevCxt = D3D11DEVICECONTEXT; + if (!oldState || (mBlendState != oldState->mBlendState)) + { + F32 blendFactor[] = { 1.0f, 1.0f, 1.0f, 1.0f }; + D3D11DEVICECONTEXT->OMSetBlendState(mBlendState, blendFactor, 0xFFFFFFFF); + } - mBlendDesc.AlphaToCoverageEnable = false; - mBlendDesc.IndependentBlendEnable = mDesc.separateAlphaBlendEnable; + if (!oldState || (mDepthStencilState != oldState->mDepthStencilState)) + D3D11DEVICECONTEXT->OMSetDepthStencilState(mDepthStencilState, mDesc.stencilRef); - mBlendDesc.RenderTarget[0].BlendEnable = mDesc.blendEnable; - mBlendDesc.RenderTarget[0].BlendOp = GFXD3D11BlendOp[mDesc.blendOp]; - mBlendDesc.RenderTarget[0].BlendOpAlpha = GFXD3D11BlendOp[mDesc.separateAlphaBlendOp]; - mBlendDesc.RenderTarget[0].DestBlend = GFXD3D11Blend[mDesc.blendDest]; - mBlendDesc.RenderTarget[0].DestBlendAlpha = GFXD3D11Blend[mDesc.separateAlphaBlendDest]; - mBlendDesc.RenderTarget[0].SrcBlend = GFXD3D11Blend[mDesc.blendSrc]; - mBlendDesc.RenderTarget[0].SrcBlendAlpha = GFXD3D11Blend[mDesc.separateAlphaBlendSrc]; - mBlendDesc.RenderTarget[0].RenderTargetWriteMask = mColorMask; - - float blendFactor[] = { 1.0f, 1.0f, 1.0f, 1.0f }; - - pDevCxt->OMSetBlendState(mBlendState, blendFactor, 0xFFFFFFFF); - - mDepthStencilDesc.DepthWriteMask = mDesc.zWriteEnable ? D3D11_DEPTH_WRITE_MASK_ALL : D3D11_DEPTH_WRITE_MASK_ZERO; - mDepthStencilDesc.DepthEnable = mDesc.zEnable; - mDepthStencilDesc.DepthFunc = GFXD3D11CmpFunc[mDesc.zFunc]; - mDepthStencilDesc.StencilWriteMask = mDesc.stencilWriteMask; - mDepthStencilDesc.StencilReadMask = mDesc.stencilMask; - mDepthStencilDesc.StencilEnable = mDesc.stencilEnable; - - mDepthStencilDesc.FrontFace.StencilFunc = GFXD3D11CmpFunc[mDesc.stencilFunc]; - mDepthStencilDesc.FrontFace.StencilFailOp = GFXD3D11StencilOp[mDesc.stencilFailOp]; - mDepthStencilDesc.FrontFace.StencilDepthFailOp = GFXD3D11StencilOp[mDesc.stencilZFailOp]; - mDepthStencilDesc.FrontFace.StencilPassOp = GFXD3D11StencilOp[mDesc.stencilPassOp]; - - if (mDesc.stencilEnable) - mDepthStencilDesc.BackFace = mDepthStencilDesc.FrontFace; - else - { - mDepthStencilDesc.BackFace.StencilFunc = GFXD3D11CmpFunc[GFXCmpAlways]; - mDepthStencilDesc.BackFace.StencilFailOp = GFXD3D11StencilOp[GFXStencilOpKeep]; - mDepthStencilDesc.BackFace.StencilDepthFailOp = GFXD3D11StencilOp[GFXStencilOpKeep]; - mDepthStencilDesc.BackFace.StencilPassOp = GFXD3D11StencilOp[GFXStencilOpKeep]; - } - - pDevCxt->OMSetDepthStencilState(mDepthStencilState, mDesc.stencilRef); - - mRasterizerDesc.CullMode = GFXD3D11CullMode[mDesc.cullMode]; - mRasterizerDesc.FillMode = GFXD3D11FillMode[mDesc.fillMode]; - mRasterizerDesc.DepthBias = mDesc.zBias; - mRasterizerDesc.SlopeScaledDepthBias = mDesc.zSlopeBias; - mRasterizerDesc.AntialiasedLineEnable = FALSE; - mRasterizerDesc.MultisampleEnable = FALSE; - mRasterizerDesc.ScissorEnable = FALSE; - - if (mDesc.zEnable) - mRasterizerDesc.DepthClipEnable = true; - else - mRasterizerDesc.DepthClipEnable = false; - - mRasterizerDesc.FrontCounterClockwise = FALSE; - mRasterizerDesc.DepthBiasClamp = 0.0f; - - pDevCxt->RSSetState(mRasterizerState); + if (!oldState || (mRasterizerState != oldState->mRasterizerState)) + D3D11DEVICECONTEXT->RSSetState(mRasterizerState); + U32 numSamplersChanged = 0; U32 numSamplers = GFX->getNumSamplers(); - for (U32 i = 0; i < numSamplers; i++) - { - mSamplerDesc[i].AddressU = GFXD3D11TextureAddress[mDesc.samplers[i].addressModeU]; - mSamplerDesc[i].AddressV = GFXD3D11TextureAddress[mDesc.samplers[i].addressModeV]; - mSamplerDesc[i].AddressW = GFXD3D11TextureAddress[mDesc.samplers[i].addressModeW]; - mSamplerDesc[i].MaxAnisotropy = mDesc.samplers[i].maxAnisotropy; + U32 samplerUpdateStartSlot = 0; - mSamplerDesc[i].MipLODBias = mDesc.samplers[i].mipLODBias; - mSamplerDesc[i].MinLOD = 0; - mSamplerDesc[i].MaxLOD = FLT_MAX; - - if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterPoint && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterPoint && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterPoint) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT; - else if(mDesc.samplers[i].magFilter == GFXTextureFilterLinear && mDesc.samplers[i].minFilter == GFXTextureFilterLinear && mDesc.samplers[i].mipFilter == GFXTextureFilterLinear) - mSamplerDesc[i].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; - else - mSamplerDesc[i].Filter = D3D11_FILTER_ANISOTROPIC; + //figure out which range of samplers changed. + for (U32 samplerSlot = 0; samplerSlot < numSamplers; samplerSlot++) + { + + if (oldState && (oldState->mSamplerStates[samplerSlot] == mSamplerStates[samplerSlot])) + { + //only change the update start slot when there hasn't been any samplers changed so far + if (numSamplersChanged == 0) { + samplerUpdateStartSlot++; + } + + continue; + } + + numSamplersChanged = (samplerSlot - samplerUpdateStartSlot) + 1; + } - mSamplerDesc[i].BorderColor[0] = 0.0f; - mSamplerDesc[i].BorderColor[1] = 0.0f; - mSamplerDesc[i].BorderColor[2] = 0.0f; - mSamplerDesc[i].BorderColor[3] = 0.0f; - mSamplerDesc[i].ComparisonFunc = D3D11_COMPARISON_NEVER; - } - //TODO samplers for vertex shader // Set all the samplers with one call - //pDevCxt->VSSetSamplers(0, numSamplers, &mSamplerStates[0]); - pDevCxt->PSSetSamplers(0, numSamplers, &mSamplerStates[0]); + //D3D11DEVICECONTEXT->VSSetSamplers(0, numSamplers, &mSamplerStates[0]); + + if (numSamplersChanged > 0) + D3D11DEVICECONTEXT->PSSetSamplers(samplerUpdateStartSlot, numSamplersChanged, &mSamplerStates[samplerUpdateStartSlot]); } + + + + + diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h index 6e55b962f..d6988dead 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h +++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.h @@ -26,6 +26,11 @@ #include "gfx/D3D11/gfxD3D11Device.h" #include "gfx/gfxStateBlock.h" +namespace DictHash +{ + U32 hash(const GFXSamplerStateDesc &data); +} + class GFXD3D11StateBlock : public GFXStateBlock { public: diff --git a/Engine/source/gfx/D3D11/gfxD3D11Target.cpp b/Engine/source/gfx/D3D11/gfxD3D11Target.cpp index 2260ff841..33c5d9ef2 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Target.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11Target.cpp @@ -314,21 +314,34 @@ void GFXD3D11TextureTarget::resurrect() GFXD3D11WindowTarget::GFXD3D11WindowTarget() { - mWindow = NULL; - mBackbuffer = NULL; + mWindow = NULL; + mBackBuffer = NULL; + mDepthStencilView = NULL; + mDepthStencil = NULL; + mBackBufferView = NULL; + mSecondaryWindow = false; } GFXD3D11WindowTarget::~GFXD3D11WindowTarget() { - SAFE_RELEASE(mBackbuffer); + SAFE_RELEASE(mDepthStencilView) + SAFE_RELEASE(mDepthStencil); + SAFE_RELEASE(mBackBufferView); + SAFE_RELEASE(mBackBuffer); + SAFE_RELEASE(mSwapChain); } void GFXD3D11WindowTarget::initPresentationParams() { // Get some video mode related info. - GFXVideoMode vm = mWindow->getVideoMode(); - Win32Window* win = static_cast(mWindow); - HWND hwnd = win->getHWND(); + const GFXVideoMode &vm = mWindow->getVideoMode(); + HWND hwnd = (HWND)mWindow->getSystemWindow(PlatformWindow::WindowSystem_Windows); + + // Do some validation... + if (vm.fullScreen && mSecondaryWindow) + { + AssertFatal(false, "GFXD3D11WindowTarget::initPresentationParams - Cannot go fullscreen with secondary window!"); + } mPresentationParams = D3D11->setupPresentParams(vm, hwnd); } @@ -347,40 +360,178 @@ GFXFormat GFXD3D11WindowTarget::getFormat() bool GFXD3D11WindowTarget::present() { - return (D3D11->getSwapChain()->Present(!D3D11->smDisableVSync, 0) == S_OK); + return (mSwapChain->Present(!D3D11->smDisableVSync, 0) == S_OK); } -void GFXD3D11WindowTarget::setImplicitSwapChain() +void GFXD3D11WindowTarget::createSwapChain() { - if (!mBackbuffer) - D3D11->mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&mBackbuffer); + //create dxgi factory & swapchain + IDXGIFactory1* DXGIFactory; + HRESULT hr = CreateDXGIFactory1(__uuidof(IDXGIFactory1), reinterpret_cast(&DXGIFactory)); + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::createSwapChain - couldn't create dxgi factory."); + + hr = DXGIFactory->CreateSwapChain(D3D11DEVICE, &mPresentationParams, &mSwapChain); + + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::createSwapChain - couldn't create swap chain."); + + SAFE_RELEASE(DXGIFactory); +} + +void GFXD3D11WindowTarget::createBuffersAndViews() +{ + //release old if they exist + SAFE_RELEASE(mDepthStencilView); + SAFE_RELEASE(mDepthStencil); + SAFE_RELEASE(mBackBufferView); + SAFE_RELEASE(mBackBuffer); + + //grab video mode + const GFXVideoMode &vm = mWindow->getVideoMode(); + //create depth/stencil + D3D11_TEXTURE2D_DESC desc; + desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + desc.CPUAccessFlags = 0; + desc.Format = GFXD3D11TextureFormat[GFXFormatD24S8]; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.Width = vm.resolution.x; + desc.Height = vm.resolution.y; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.MiscFlags = 0; + + HRESULT hr = D3D11DEVICE->CreateTexture2D(&desc, NULL, &mDepthStencil); + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::createBuffersAndViews - couldn't create device's depth-stencil surface."); + + D3D11_DEPTH_STENCIL_VIEW_DESC depthDesc; + depthDesc.Format = GFXD3D11TextureFormat[GFXFormatD24S8]; + depthDesc.Flags = 0; + depthDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; + depthDesc.Texture2D.MipSlice = 0; + + hr = D3D11DEVICE->CreateDepthStencilView(mDepthStencil, &depthDesc, &mDepthStencilView); + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::createBuffersAndViews - couldn't create depth stencil view"); + + setBackBuffer(); + + //create back buffer view + D3D11_RENDER_TARGET_VIEW_DESC RTDesc; + RTDesc.Format = GFXD3D11TextureFormat[GFXFormatR8G8B8A8]; + RTDesc.Texture2D.MipSlice = 0; + RTDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + + hr = D3D11DEVICE->CreateRenderTargetView(mBackBuffer, &RTDesc, &mBackBufferView); + + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::createBuffersAndViews - couldn't create back buffer target view"); + + //debug names +#ifdef TORQUE_DEBUG + if (!mSecondaryWindow) + { + String backBufferName = "MainBackBuffer"; + String depthSteniclName = "MainDepthStencil"; + String backBuffViewName = "MainBackBuffView"; + String depthStencViewName = "MainDepthView"; + mBackBuffer->SetPrivateData(WKPDID_D3DDebugObjectName, backBufferName.size(), backBufferName.c_str()); + mDepthStencil->SetPrivateData(WKPDID_D3DDebugObjectName, depthSteniclName.size(), depthSteniclName.c_str()); + mDepthStencilView->SetPrivateData(WKPDID_D3DDebugObjectName, depthStencViewName.size(), depthStencViewName.c_str()); + mBackBufferView->SetPrivateData(WKPDID_D3DDebugObjectName, backBuffViewName.size(), backBuffViewName.c_str()); + } +#endif } void GFXD3D11WindowTarget::resetMode() { + HRESULT hr; + if (mSwapChain) + { + // The current video settings. + DXGI_SWAP_CHAIN_DESC desc; + hr = mSwapChain->GetDesc(&desc); + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::resetMode - failed to get swap chain description!"); + + bool fullscreen = !desc.Windowed; + Point2I backbufferSize(desc.BufferDesc.Width, desc.BufferDesc.Height); + + // The settings we are now applying. + const GFXVideoMode &vm = mWindow->getVideoMode(); + + // Early out if none of the settings which require a device reset + // have changed. + if (backbufferSize == vm.resolution && + fullscreen == vm.fullScreen) + return; + } + + //release old buffers and views + SAFE_RELEASE(mDepthStencilView) + SAFE_RELEASE(mDepthStencil); + SAFE_RELEASE(mBackBufferView); + SAFE_RELEASE(mBackBuffer); + + if(!mSecondaryWindow) + D3D11->beginReset(); + mWindow->setSuppressReset(true); // Setup our presentation params. initPresentationParams(); - // Otherwise, we have to reset the device, if we're the implicit swapchain. - D3D11->reset(mPresentationParams); + if (!mPresentationParams.Windowed) + { + mPresentationParams.BufferDesc.RefreshRate.Numerator = 0; + mPresentationParams.BufferDesc.RefreshRate.Denominator = 0; + hr = mSwapChain->ResizeTarget(&mPresentationParams.BufferDesc); + + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::resetMode - failed to resize target!"); + + } + + hr = mSwapChain->ResizeBuffers(mPresentationParams.BufferCount, mPresentationParams.BufferDesc.Width, mPresentationParams.BufferDesc.Height, + mPresentationParams.BufferDesc.Format, mPresentationParams.Windowed ? 0 : DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); + + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::resetMode - failed to resize back buffer!"); + + hr = mSwapChain->SetFullscreenState(!mPresentationParams.Windowed, NULL); + + if (FAILED(hr)) + AssertFatal(false, "GFXD3D11WindowTarget::resetMode - failed to change screen states!"); // Update our size, too. mSize = Point2I(mPresentationParams.BufferDesc.Width, mPresentationParams.BufferDesc.Height); mWindow->setSuppressReset(false); - GFX->beginReset(); + + //re-create buffers and views + createBuffersAndViews(); + + if (!mSecondaryWindow) + D3D11->endReset(this); } void GFXD3D11WindowTarget::zombify() { - SAFE_RELEASE(mBackbuffer); + SAFE_RELEASE(mBackBuffer); } void GFXD3D11WindowTarget::resurrect() { - setImplicitSwapChain(); + setBackBuffer(); +} + +void GFXD3D11WindowTarget::setBackBuffer() +{ + if (!mBackBuffer) + mSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&mBackBuffer); } void GFXD3D11WindowTarget::activate() @@ -391,10 +542,10 @@ void GFXD3D11WindowTarget::activate() ID3D11RenderTargetView* rtViews[8] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; D3D11DEVICECONTEXT->OMSetRenderTargets(8, rtViews, NULL); - D3D11DEVICECONTEXT->OMSetRenderTargets(1, &D3D11->mDeviceBackBufferView, D3D11->mDeviceDepthStencilView); + D3D11DEVICECONTEXT->OMSetRenderTargets(1, &mBackBufferView, mDepthStencilView); DXGI_SWAP_CHAIN_DESC pp; - D3D11->mSwapChain->GetDesc(&pp); + mSwapChain->GetDesc(&pp); // Update our video mode here, too. GFXVideoMode vm; @@ -412,5 +563,35 @@ void GFXD3D11WindowTarget::resolveTo(GFXTextureObject *tex) D3D11_TEXTURE2D_DESC desc; ID3D11Texture2D* surf = ((GFXD3D11TextureObject*)(tex))->get2DTex(); surf->GetDesc(&desc); - D3D11DEVICECONTEXT->ResolveSubresource(surf, 0, D3D11->mDeviceBackbuffer, 0, desc.Format); + D3D11DEVICECONTEXT->ResolveSubresource(surf, 0, mBackBuffer, 0, desc.Format); +} + +IDXGISwapChain *GFXD3D11WindowTarget::getSwapChain() +{ + mSwapChain->AddRef(); + return mSwapChain; +} + +ID3D11Texture2D *GFXD3D11WindowTarget::getBackBuffer() +{ + mBackBuffer->AddRef(); + return mBackBuffer; +} + +ID3D11Texture2D *GFXD3D11WindowTarget::getDepthStencil() +{ + mDepthStencil->AddRef(); + return mDepthStencil; +} + +ID3D11RenderTargetView* GFXD3D11WindowTarget::getBackBufferView() +{ + mBackBufferView->AddRef(); + return mBackBufferView; +} + +ID3D11DepthStencilView* GFXD3D11WindowTarget::getDepthStencilView() +{ + mDepthStencilView->AddRef(); + return mDepthStencilView; } \ No newline at end of file diff --git a/Engine/source/gfx/D3D11/gfxD3D11Target.h b/Engine/source/gfx/D3D11/gfxD3D11Target.h index ff4b193d6..44233e0e2 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Target.h +++ b/Engine/source/gfx/D3D11/gfxD3D11Target.h @@ -76,17 +76,22 @@ class GFXD3D11WindowTarget : public GFXWindowTarget friend class GFXD3D11Device; /// Our backbuffer - ID3D11Texture2D *mBackbuffer; + ID3D11Texture2D *mBackBuffer; + ID3D11Texture2D *mDepthStencil; + ID3D11RenderTargetView* mBackBufferView; + ID3D11DepthStencilView* mDepthStencilView; + IDXGISwapChain *mSwapChain; /// Maximum size we can render to. Point2I mSize; - /// D3D presentation info. DXGI_SWAP_CHAIN_DESC mPresentationParams; - /// Internal interface that notifies us we need to reset our video mode. void resetMode(); + /// Is this a secondary window + bool mSecondaryWindow; + public: GFXD3D11WindowTarget(); @@ -97,7 +102,9 @@ public: virtual bool present(); void initPresentationParams(); - void setImplicitSwapChain(); + void createSwapChain(); + void createBuffersAndViews(); + void setBackBuffer(); virtual void activate(); @@ -105,6 +112,13 @@ public: void resurrect(); virtual void resolveTo( GFXTextureObject *tex ); + + // These are all reference counted and must be released by whomever uses the get* function + IDXGISwapChain *getSwapChain(); + ID3D11Texture2D *getBackBuffer(); + ID3D11Texture2D *getDepthStencil(); + ID3D11RenderTargetView* getBackBufferView(); + ID3D11DepthStencilView* getDepthStencilView(); }; #endif diff --git a/Engine/source/gfx/bitmap/gBitmap.cpp b/Engine/source/gfx/bitmap/gBitmap.cpp index e5ef6b407..9e20d6951 100644 --- a/Engine/source/gfx/bitmap/gBitmap.cpp +++ b/Engine/source/gfx/bitmap/gBitmap.cpp @@ -327,7 +327,10 @@ void GBitmap::allocateBitmap(const U32 in_width, const U32 in_height, const bool mNumMipLevels++; allocPixels += currWidth * currHeight * mBytesPerPixel; - } while (currWidth != 1 && currHeight != 1); + } while (currWidth != 1 || currHeight != 1); + + U32 expectedMips = mFloor(mLog2(mMax(in_width, in_height))) + 1; + AssertFatal(mNumMipLevels == expectedMips, "GBitmap::allocateBitmap: mipmap count wrong"); } AssertFatal(mNumMipLevels <= c_maxMipLevels, "GBitmap::allocateBitmap: too many miplevels"); diff --git a/Engine/source/gfx/gfxShader.cpp b/Engine/source/gfx/gfxShader.cpp index 54f1893e6..1fc35a995 100644 --- a/Engine/source/gfx/gfxShader.cpp +++ b/Engine/source/gfx/gfxShader.cpp @@ -178,7 +178,7 @@ void GFXShader::_unlinkBuffer( GFXShaderConstBuffer *buf ) DefineEngineFunction( addGlobalShaderMacro, void, - ( const char *name, const char *value ), ( NULL ), + ( const char *name, const char *value ), ( nullAsType() ), "Adds a global shader macro which will be merged with the script defined " "macros on every shader. The macro will replace the value of an existing " "macro of the same name. For the new macro to take effect all the shaders " diff --git a/Engine/source/gfx/gfxTextureManager.cpp b/Engine/source/gfx/gfxTextureManager.cpp index f9718a2b9..05570c06d 100644 --- a/Engine/source/gfx/gfxTextureManager.cpp +++ b/Engine/source/gfx/gfxTextureManager.cpp @@ -1085,21 +1085,7 @@ void GFXTextureManager::_validateTexParams( const U32 width, const U32 height, // NOTE: Does this belong here? if( inOutNumMips == 0 && !autoGenSupp ) { - U32 currWidth = width; - U32 currHeight = height; - - inOutNumMips = 1; - do - { - currWidth >>= 1; - currHeight >>= 1; - if( currWidth == 0 ) - currWidth = 1; - if( currHeight == 0 ) - currHeight = 1; - - inOutNumMips++; - } while ( currWidth != 1 && currHeight != 1 ); + inOutNumMips = mFloor(mLog2(mMax(width, height))) + 1; } } } diff --git a/Engine/source/gfx/gl/gfxGLDevice.cpp b/Engine/source/gfx/gl/gfxGLDevice.cpp index 7723cdc4a..ce22f16a1 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.cpp +++ b/Engine/source/gfx/gl/gfxGLDevice.cpp @@ -172,12 +172,21 @@ void GFXGLDevice::initGLState() PlatformGL::setVSync(smDisableVSync ? 0 : 1); + //install vsync callback + Con::NotifyDelegate clbk(this, &GFXGLDevice::vsyncCallback); + Con::addVariableNotify("$pref::Video::disableVerticalSync", clbk); + //OpenGL 3 need a binded VAO for render GLuint vao; glGenVertexArrays(1, &vao); glBindVertexArray(vao); } +void GFXGLDevice::vsyncCallback() +{ + PlatformGL::setVSync(smDisableVSync ? 0 : 1); +} + GFXGLDevice::GFXGLDevice(U32 adapterIndex) : mAdapterIndex(adapterIndex), mNeedUpdateVertexAttrib(false), diff --git a/Engine/source/gfx/gl/gfxGLDevice.h b/Engine/source/gfx/gl/gfxGLDevice.h index fc37d3220..f2bf4afe1 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.h +++ b/Engine/source/gfx/gl/gfxGLDevice.h @@ -256,6 +256,8 @@ private: GFXVertexBuffer* findVolatileVBO(U32 numVerts, const GFXVertexFormat *vertexFormat, U32 vertSize); ///< Returns an existing volatile VB which has >= numVerts and the same vert flags/size, or creates a new VB if necessary GFXPrimitiveBuffer* findVolatilePBO(U32 numIndices, U32 numPrimitives); ///< Returns an existing volatile PB which has >= numIndices, or creates a new PB if necessary + + void vsyncCallback(); ///< Vsync callback void initGLState(); ///< Guaranteed to be called after all extensions have been loaded, use to init card profiler, shader version, max samplers, etc. diff --git a/Engine/source/gfx/gl/gfxGLStateBlock.cpp b/Engine/source/gfx/gl/gfxGLStateBlock.cpp index 9d446f27a..1a104ab27 100644 --- a/Engine/source/gfx/gl/gfxGLStateBlock.cpp +++ b/Engine/source/gfx/gl/gfxGLStateBlock.cpp @@ -40,32 +40,32 @@ GFXGLStateBlock::GFXGLStateBlock(const GFXStateBlockDesc& desc) : mCachedHashValue(desc.getHashValue()) { if( !GFXGL->mCapabilities.samplerObjects ) - return; + return; static Map mSamplersMap; - for(int i = 0; i < TEXTURE_STAGE_COUNT; ++i) - { - GLuint &id = mSamplerObjects[i]; - GFXSamplerStateDesc &ssd = mDesc.samplers[i]; + for(int i = 0; i < TEXTURE_STAGE_COUNT; ++i) + { + GLuint &id = mSamplerObjects[i]; + GFXSamplerStateDesc &ssd = mDesc.samplers[i]; Map::Iterator itr = mSamplersMap.find(ssd); if(itr == mSamplersMap.end()) { - glGenSamplers(1, &id); + glGenSamplers(1, &id); - glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, minificationFilter(ssd.minFilter, ssd.mipFilter, 1) ); - glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GFXGLTextureFilter[ssd.magFilter]); - glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GFXGLTextureAddress[ssd.addressModeU]); - glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GFXGLTextureAddress[ssd.addressModeV]); - glSamplerParameteri(id, GL_TEXTURE_WRAP_R, GFXGLTextureAddress[ssd.addressModeW]); - if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() ) - glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, ssd.maxAnisotropy); + glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, minificationFilter(ssd.minFilter, ssd.mipFilter, 1) ); + glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GFXGLTextureFilter[ssd.magFilter]); + glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GFXGLTextureAddress[ssd.addressModeU]); + glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GFXGLTextureAddress[ssd.addressModeV]); + glSamplerParameteri(id, GL_TEXTURE_WRAP_R, GFXGLTextureAddress[ssd.addressModeW]); + if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() ) + glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, ssd.maxAnisotropy); mSamplersMap[ssd] = id; } else id = itr->value; - } + } } GFXGLStateBlock::~GFXGLStateBlock() @@ -99,7 +99,7 @@ void GFXGLStateBlock::activate(const GFXGLStateBlock* oldState) #define STATE_CHANGE(state) (!oldState || oldState->mDesc.state != mDesc.state) #define TOGGLE_STATE(state, enum) if(mDesc.state) glEnable(enum); else glDisable(enum) -#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) if(mDesc.state) glEnable(enum); else glDisable(enum) +#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) {if(mDesc.state) glEnable(enum); else glDisable(enum);} // Blending CHECK_TOGGLE_STATE(blendEnable, GL_BLEND); @@ -171,9 +171,9 @@ void GFXGLStateBlock::activate(const GFXGLStateBlock* oldState) for (U32 i = 0; i < getMin(getOwningDevice()->getNumSamplers(), (U32) TEXTURE_STAGE_COUNT); i++) { if(!oldState || oldState->mSamplerObjects[i] != mSamplerObjects[i]) - glBindSampler(i, mSamplerObjects[i] ); + glBindSampler(i, mSamplerObjects[i] ); } - } + } // TODO: states added for detail blend } diff --git a/Engine/source/gfx/gl/gfxGLTextureManager.cpp b/Engine/source/gfx/gl/gfxGLTextureManager.cpp index 4d000e576..750dc1c92 100644 --- a/Engine/source/gfx/gl/gfxGLTextureManager.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureManager.cpp @@ -316,7 +316,7 @@ bool GFXGLTextureManager::_loadTexture(GFXTextureObject *aTexture, DDSFile *dds) if(isCompressedFormat(dds->mFormat)) { - if((!isPow2(dds->getWidth()) || !isPow2(dds->getHeight())) && GFX->getCardProfiler()->queryProfile("GL::Workaround::noCompressedNPoTTextures")) + if((!isPow2(dds->getWidth()) || !isPow2(dds->getHeight()))) { U32 squishFlag = squish::kDxt1; switch (dds->mFormat) diff --git a/Engine/source/gfx/gl/gfxGLWindowTarget.cpp b/Engine/source/gfx/gl/gfxGLWindowTarget.cpp index 682c0f7c8..4acf5fef6 100644 --- a/Engine/source/gfx/gl/gfxGLWindowTarget.cpp +++ b/Engine/source/gfx/gl/gfxGLWindowTarget.cpp @@ -37,7 +37,7 @@ GFX_ImplementTextureProfile( BackBufferDepthProfile, GFXGLWindowTarget::GFXGLWindowTarget(PlatformWindow *win, GFXDevice *d) : GFXWindowTarget(win), mDevice(d), mContext(NULL), mFullscreenContext(NULL) - , mCopyFBO(0), mBackBufferFBO(0) + , mCopyFBO(0), mBackBufferFBO(0), mSecondaryWindow(false) { win->appEvent.notify(this, &GFXGLWindowTarget::_onAppSignal); } @@ -52,7 +52,14 @@ GFXGLWindowTarget::~GFXGLWindowTarget() void GFXGLWindowTarget::resetMode() { - if(mWindow->getVideoMode().fullScreen != mWindow->isFullscreen()) + // Do some validation... + bool fullscreen = mWindow->getVideoMode().fullScreen; + if (fullscreen && mSecondaryWindow) + { + AssertFatal(false, "GFXGLWindowTarget::resetMode - Cannot go fullscreen with secondary window!"); + } + + if(fullscreen != mWindow->isFullscreen()) { _teardownCurrentMode(); _setupNewMode(); diff --git a/Engine/source/gfx/gl/gfxGLWindowTarget.h b/Engine/source/gfx/gl/gfxGLWindowTarget.h index 6da33dcfb..10f1f0cc8 100644 --- a/Engine/source/gfx/gl/gfxGLWindowTarget.h +++ b/Engine/source/gfx/gl/gfxGLWindowTarget.h @@ -50,6 +50,9 @@ public: virtual void resolveTo(GFXTextureObject* obj); void _onAppSignal(WindowId wnd, S32 event); + + // create pixel format for the window + void createPixelFormat(); private: friend class GFXGLDevice; @@ -58,6 +61,8 @@ private: GFXTexHandle mBackBufferColorTex, mBackBufferDepthTex; Point2I size; GFXDevice* mDevice; + /// Is this a secondary window + bool mSecondaryWindow; void* mContext; void* mFullscreenContext; void _teardownCurrentMode(); @@ -66,6 +71,7 @@ private: void _WindowPresent(); //set this windows context to be current void _makeContextCurrent(); + }; #endif diff --git a/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp b/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp index 43b3ab04e..9eaf0c68d 100644 --- a/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp +++ b/Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp @@ -191,19 +191,21 @@ U32 GFXGLDevice::getTotalVideoMemory() GFXWindowTarget *GFXGLDevice::allocWindowTarget( PlatformWindow *window ) { - AssertFatal(!mContext, "This GFXGLDevice is already assigned to a window"); - - GFXGLWindowTarget* ggwt = 0; - if( !mContext ) - { - // no context, init the device now - init(window->getVideoMode(), window); - ggwt = new GFXGLWindowTarget(window, this); - ggwt->registerResourceWithDevice(this); - ggwt->mContext = mContext; - } + GFXGLWindowTarget* ggwt = new GFXGLWindowTarget(window, this); - return ggwt; + //first window + if (!mContext) + { + init(window->getVideoMode(), window); + ggwt->mSecondaryWindow = false; + } + else + ggwt->mSecondaryWindow = true; + + ggwt->registerResourceWithDevice(this); + ggwt->mContext = mContext; + + return ggwt; } GFXFence* GFXGLDevice::_createPlatformSpecificFence() diff --git a/Engine/source/gfx/gl/tGL/tGL.cpp b/Engine/source/gfx/gl/tGL/tGL.cpp index b13fec60a..de412ca19 100644 --- a/Engine/source/gfx/gl/tGL/tGL.cpp +++ b/Engine/source/gfx/gl/tGL/tGL.cpp @@ -41,7 +41,12 @@ namespace GL void gglPerformExtensionBinds(void *context) { - + #ifdef TORQUE_OS_WIN + if (!gladLoadWGL(wglGetCurrentDC())) + { + AssertFatal(false, "Unable to load GLAD WGL extensions. Make sure your OpenGL drivers are up to date!"); + } + #endif } } diff --git a/Engine/source/gfx/gl/tGL/tWGL.h b/Engine/source/gfx/gl/tGL/tWGL.h index 5dbf1da68..22f4a3496 100644 --- a/Engine/source/gfx/gl/tGL/tWGL.h +++ b/Engine/source/gfx/gl/tGL/tWGL.h @@ -30,7 +30,7 @@ #include "tGL.h" #include -#define gglHasWExtension(window, EXTENSION) GLAD_WGL_##EXTENSION +#define gglHasWExtension(EXTENSION) GLAD_WGL_##EXTENSION #endif //TORQUE_OPENGL diff --git a/Engine/source/gfx/gl/win32/gfxGLDevice.win.cpp b/Engine/source/gfx/gl/win32/gfxGLDevice.win.cpp index 4a0217e1f..f391f511b 100644 --- a/Engine/source/gfx/gl/win32/gfxGLDevice.win.cpp +++ b/Engine/source/gfx/gl/win32/gfxGLDevice.win.cpp @@ -255,14 +255,6 @@ void GFXGLDevice::init( const GFXVideoMode &mode, PlatformWindow *window ) HDC hdcGL = GetDC( hwnd ); AssertFatal( hdcGL != NULL, "Failed to create device context" ); - // Create pixel format descriptor... - PIXELFORMATDESCRIPTOR pfd; - CreatePixelFormat( &pfd, 32, 0, 0, false ); // 32 bit color... We do not need depth or stencil, OpenGL renders into a FBO and then copy the image to window - if( !SetPixelFormat( hdcGL, ChoosePixelFormat( hdcGL, &pfd ), &pfd ) ) - { - AssertFatal( false, "GFXGLDevice::init - cannot get the one and only pixel format we check for." ); - } - int OGL_MAJOR = 3; int OGL_MINOR = 2; @@ -277,7 +269,7 @@ void GFXGLDevice::init( const GFXVideoMode &mode, PlatformWindow *window ) if (!wglMakeCurrent(hdcGL, tempGLRC)) AssertFatal(false, "Couldn't make temp GL context."); - if( gglHasWExtension(hdcGL, ARB_create_context) ) + if( gglHasWExtension( ARB_create_context) ) { int const create_attribs[] = { WGL_CONTEXT_MAJOR_VERSION_ARB, OGL_MAJOR, @@ -330,13 +322,21 @@ U32 GFXGLDevice::getTotalVideoMemory() //------------------------------------------------------------------------------ -GFXWindowTarget *GFXGLDevice::allocWindowTarget( PlatformWindow *window ) +GFXWindowTarget *GFXGLDevice::allocWindowTarget(PlatformWindow *window) { - AssertFatal(!mContext, ""); - - init(window->getVideoMode(), window); GFXGLWindowTarget *ggwt = new GFXGLWindowTarget(window, this); ggwt->registerResourceWithDevice(this); + ggwt->createPixelFormat(); + + //first window + if (!mContext) + { + init(window->getVideoMode(), window); + ggwt->mSecondaryWindow = false; + } + else + ggwt->mSecondaryWindow = true; + ggwt->mContext = mContext; AssertFatal(ggwt->mContext, "GFXGLDevice::allocWindowTarget - failed to allocate window target!"); @@ -364,15 +364,32 @@ void GFXGLWindowTarget::_setupNewMode() { } +void GFXGLWindowTarget::createPixelFormat() +{ + HWND hwnd = GETHWND(mWindow); + // Create a device context + HDC hdcGL = GetDC(hwnd); + AssertFatal(hdcGL != NULL, "GFXGLWindowTarget::createPixelFormat() - Failed to create device context"); + + // Create pixel format descriptor... + PIXELFORMATDESCRIPTOR pfd; + CreatePixelFormat(&pfd, 32, 0, 0, false); // 32 bit color... We do not need depth or stencil, OpenGL renders into a FBO and then copy the image to window + if (!SetPixelFormat(hdcGL, ChoosePixelFormat(hdcGL, &pfd), &pfd)) + { + AssertFatal(false, "GFXGLWindowTarget::createPixelFormat() - cannot get the one and only pixel format we check for."); + } +} + void GFXGLWindowTarget::_makeContextCurrent() { HWND hwnd = GETHWND(getWindow()); HDC hdc = GetDC(hwnd); + if (!wglMakeCurrent(hdc, (HGLRC)mContext)) { //HRESULT if needed for debug //HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); AssertFatal(false, "GFXGLWindowTarget::_makeContextCurrent() - cannot make our context current."); } - -} + +} \ No newline at end of file diff --git a/Engine/source/gfx/video/videoCapture.cpp b/Engine/source/gfx/video/videoCapture.cpp index 230baf501..a966bbe01 100644 --- a/Engine/source/gfx/video/videoCapture.cpp +++ b/Engine/source/gfx/video/videoCapture.cpp @@ -314,6 +314,9 @@ DefineEngineFunction( startVideoCapture, void, "@see stopVideoCapture\n" "@ingroup Rendering\n" ) { +#ifdef TORQUE_DEBUG + Con::errorf("Recording video is disabled in debug!"); +#else if ( !canvas ) { Con::errorf("startVideoCapture -Please specify a GuiCanvas object to record from!"); @@ -328,6 +331,7 @@ DefineEngineFunction( startVideoCapture, void, VIDCAP->setResolution(resolution); VIDCAP->begin(canvas); +#endif } DefineEngineFunction( stopVideoCapture, void, (),, @@ -340,7 +344,7 @@ DefineEngineFunction( stopVideoCapture, void, (),, DefineEngineFunction( playJournalToVideo, void, ( const char *journalFile, const char *videoFile, const char *encoder, F32 framerate, Point2I resolution ), - ( NULL, "THEORA", 30.0f, Point2I::Zero ), + ( nullAsType(), "THEORA", 30.0f, Point2I::Zero ), "Load a journal file and capture it video.\n" "@ingroup Rendering\n" ) { @@ -357,4 +361,4 @@ DefineEngineFunction( playJournalToVideo, void, VIDCAP->waitForCanvas(); Journal::Play( journalFile ); -} \ No newline at end of file +} diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp index b4aed4ec7..e9d654d2a 100644 --- a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp +++ b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp @@ -59,21 +59,21 @@ ConsoleDocClass( GuiIconButtonCtrl, "has been clicked.\n\n" "@tsexample\n" - "new GuiIconButtonCtrl(TestIconButton)\n" - "{\n" - " buttonMargin = \"4 4\";\n" - " iconBitmap = \"art/gui/lagIcon.png\";\n" - " iconLocation = \"Center\";\n" - " sizeIconToButton = \"0\";\n" - " makeIconSquare = \"1\";\n" - " textLocation = \"Bottom\";\n" - " textMargin = \"-2\";\n" - " autoSize = \"0\";\n" - " text = \"Lag Icon\";\n" - " textID = \"\"STR_LAG\"\";\n" - " buttonType = \"PushButton\";\n" - " profile = \"GuiIconButtonProfile\";\n" - "};\n" + "new GuiIconButtonCtrl(TestIconButton)\n" + "{\n" + " buttonMargin = \"4 4\";\n" + " iconBitmap = \"art/gui/lagIcon.png\";\n" + " iconLocation = \"Center\";\n" + " sizeIconToButton = \"0\";\n" + " makeIconSquare = \"1\";\n" + " textLocation = \"Bottom\";\n" + " textMargin = \"-2\";\n" + " autoSize = \"0\";\n" + " text = \"Lag Icon\";\n" + " textID = \"\"STR_LAG\"\";\n" + " buttonType = \"PushButton\";\n" + " profile = \"GuiIconButtonProfile\";\n" + "};\n" "@endtsexample\n\n" "@see GuiControl\n" @@ -85,7 +85,7 @@ ConsoleDocClass( GuiIconButtonCtrl, GuiIconButtonCtrl::GuiIconButtonCtrl() { - mBitmapName = StringTable->insert(""); + mBitmapName = StringTable->EmptyString(); mTextLocation = TextLocLeft; mIconLocation = IconLocLeft; mTextMargin = 4; @@ -94,7 +94,7 @@ GuiIconButtonCtrl::GuiIconButtonCtrl() mFitBitmapToButton = false; mMakeIconSquare = false; - mErrorBitmapName = StringTable->insert(""); + mErrorBitmapName = StringTable->EmptyString(); mErrorTextureHandle = NULL; mAutoSize = false; @@ -130,7 +130,7 @@ void GuiIconButtonCtrl::initPersistFields() addField( "sizeIconToButton", TypeBool, Offset( mFitBitmapToButton, GuiIconButtonCtrl ),"If true, the icon will be scaled to be the same size as the button.\n"); addField( "makeIconSquare", TypeBool, Offset( mMakeIconSquare, GuiIconButtonCtrl ),"If true, will make sure the icon is square.\n"); addField( "textLocation", TYPEID< TextLocation >(), Offset( mTextLocation, GuiIconButtonCtrl ),"Where to place the text on the control.\n" - "Options are 0 (None), 1 (Bottom), 2 (Right), 3 (Top), 4 (Left), 5 (Center).\n"); + "Options are 0 (None), 1 (Bottom), 2 (Right), 3 (Top), 4 (Left), 5 (Center).\n"); addField( "textMargin", TypeS32, Offset( mTextMargin, GuiIconButtonCtrl ),"Margin between the icon and the text.\n"); addField( "autoSize", TypeBool, Offset( mAutoSize, GuiIconButtonCtrl ),"If true, the text and icon will be automatically sized to the size of the control.\n"); Parent::initPersistFields(); diff --git a/Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp b/Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp index 6e169a361..fcccca0e4 100644 --- a/Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp +++ b/Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp @@ -58,7 +58,7 @@ ConsoleDocClass( GuiSwatchButtonCtrl, //----------------------------------------------------------------------------- GuiSwatchButtonCtrl::GuiSwatchButtonCtrl() - : mSwatchColor( 1, 1, 1, 1 ) + : mSwatchColor(1, 1, 1, 1), mUseSRGB(false) { mButtonText = StringTable->insert( "" ); setExtent(140, 30); @@ -71,7 +71,8 @@ GuiSwatchButtonCtrl::GuiSwatchButtonCtrl() void GuiSwatchButtonCtrl::initPersistFields() { - addField( "color", TypeColorF, Offset( mSwatchColor, GuiSwatchButtonCtrl ), "The foreground color of GuiSwatchButtonCtrl" ); + addField("color", TypeColorF, Offset(mSwatchColor, GuiSwatchButtonCtrl), "The foreground color of GuiSwatchButtonCtrl"); + addField( "useSRGB", TypeBool, Offset( mUseSRGB, GuiSwatchButtonCtrl ), "Render using sRGB scale" ); addField( "gridBitmap", TypeString, Offset( mGridBitmap, GuiSwatchButtonCtrl ), "The bitmap used for the transparent grid" ); @@ -107,7 +108,10 @@ void GuiSwatchButtonCtrl::onRender( Point2I offset, const RectI &updateRect ) drawer->drawBitmapStretch( mGrid, renderRect ); // Draw swatch color as fill... - drawer->drawRectFill( renderRect, mSwatchColor ); + if (!mUseSRGB) + drawer->drawRectFill( renderRect, mSwatchColor.toGamma() ); + else + drawer->drawRectFill(renderRect, mSwatchColor); // Draw any borders... drawer->drawRect( renderRect, borderColor ); diff --git a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h index 56bd1279d..866864685 100644 --- a/Engine/source/gui/buttons/guiSwatchButtonCtrl.h +++ b/Engine/source/gui/buttons/guiSwatchButtonCtrl.h @@ -40,7 +40,7 @@ class GuiSwatchButtonCtrl : public GuiButtonBaseCtrl /// The color to display on the button. ColorF mSwatchColor; - + bool mUseSRGB; ///< use sRGB color scale /// Bitmap used for mGrid String mGridBitmap; diff --git a/Engine/source/gui/buttons/guiToggleButtonCtrl.cpp b/Engine/source/gui/buttons/guiToggleButtonCtrl.cpp index e5aa4b0f5..a2aaaa6c9 100644 --- a/Engine/source/gui/buttons/guiToggleButtonCtrl.cpp +++ b/Engine/source/gui/buttons/guiToggleButtonCtrl.cpp @@ -49,7 +49,7 @@ ConsoleDocClass( GuiToggleButtonCtrl, GuiToggleButtonCtrl::GuiToggleButtonCtrl() { setExtent(140, 30); - mButtonText = StringTable->insert(""); + mButtonText = StringTable->EmptyString(); mStateOn = false; mButtonType = ButtonTypeCheck; } @@ -60,7 +60,7 @@ void GuiToggleButtonCtrl::onPreRender() // If we have a script variable, make sure we're in sync if ( mConsoleVariable[0] ) - mStateOn = Con::getBoolVariable( mConsoleVariable ); + mStateOn = Con::getBoolVariable( mConsoleVariable ); } void GuiToggleButtonCtrl::onRender(Point2I offset, diff --git a/Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp b/Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp index 9242d8aff..ad65b5782 100644 --- a/Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp +++ b/Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp @@ -43,7 +43,7 @@ ConsoleDocClass( GuiToolboxButtonCtrl, //------------------------------------- GuiToolboxButtonCtrl::GuiToolboxButtonCtrl() { - mNormalBitmapName = StringTable->insert(""); + mNormalBitmapName = StringTable->EmptyString(); mLoweredBitmapName = StringTable->insert("sceneeditor/client/images/buttondown"); mHoverBitmapName = StringTable->insert("sceneeditor/client/images/buttonup"); setMinExtent(Point2I(16,16)); @@ -225,4 +225,4 @@ void GuiToolboxButtonCtrl::renderButton(GFXTexHandle &texture, Point2I &offset, GFX->getDrawUtil()->drawBitmap(texture, finalOffset); renderChildControls( offset, updateRect); } -} \ No newline at end of file +} diff --git a/Engine/source/gui/containers/guiFormCtrl.cpp b/Engine/source/gui/containers/guiFormCtrl.cpp index e87bcb6d2..f94e6c234 100644 --- a/Engine/source/gui/containers/guiFormCtrl.cpp +++ b/Engine/source/gui/containers/guiFormCtrl.cpp @@ -50,8 +50,8 @@ GuiFormCtrl::GuiFormCtrl() mCaption = "[none]"; mUseSmallCaption = false; - mContentLibrary = StringTable->insert(""); - mContent = StringTable->insert(""); + mContentLibrary = StringTable->EmptyString(); + mContent = StringTable->EmptyString(); mCanSaveFieldDictionary = true; mIsContainer = true; @@ -158,7 +158,7 @@ void GuiFormCtrl::addObject(SimObject *newObj ) GuiControl* parent = getParent(); if ( parent ) - parent->addObject( newObj ); + parent->addObject( newObj ); return; } @@ -213,7 +213,7 @@ bool GuiFormCtrl::resize(const Point2I &newPosition, const Point2I &newExtent) static char buf[256]; mUseSmallCaption = true; - mSmallCaption = StringTable->insert(""); + mSmallCaption = StringTable->EmptyString(); S32 strlen = dStrlen((const char*)mCaption); for(S32 i=strlen; i>=0; --i) diff --git a/Engine/source/gui/containers/guiPaneCtrl.cpp b/Engine/source/gui/containers/guiPaneCtrl.cpp index 1637b0b30..4d2ae5e61 100644 --- a/Engine/source/gui/containers/guiPaneCtrl.cpp +++ b/Engine/source/gui/containers/guiPaneCtrl.cpp @@ -68,7 +68,7 @@ GuiPaneControl::GuiPaneControl() mMouseOver = false; mDepressed = false; mCaption = "A Pane"; - mCaptionID = StringTable->insert(""); + mCaptionID = StringTable->EmptyString(); mIsContainer = true; mOriginalExtents.set(10,10); @@ -108,7 +108,7 @@ bool GuiPaneControl::onWake() } if(mCaptionID && *mCaptionID != 0) - setCaptionID(mCaptionID); + setCaptionID(mCaptionID); mProfile->constructBitmapArray(); if(mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size()) @@ -131,19 +131,19 @@ bool GuiPaneControl::onWake() void GuiPaneControl::setCaptionID(const char *id) { - S32 n = Con::getIntVariable(id, -1); - if(n != -1) - { - mCaptionID = StringTable->insert(id); - setCaptionID(n); - } + S32 n = Con::getIntVariable(id, -1); + if(n != -1) + { + mCaptionID = StringTable->insert(id); + setCaptionID(n); + } } //----------------------------------------------------------------------------- void GuiPaneControl::setCaptionID(S32 id) { - mCaption = getGUIString(id); + mCaption = getGUIString(id); } //----------------------------------------------------------------------------- diff --git a/Engine/source/gui/containers/guiRolloutCtrl.cpp b/Engine/source/gui/containers/guiRolloutCtrl.cpp index 43bd123b7..6f2272d9a 100644 --- a/Engine/source/gui/containers/guiRolloutCtrl.cpp +++ b/Engine/source/gui/containers/guiRolloutCtrl.cpp @@ -188,7 +188,7 @@ bool GuiRolloutCtrl::_onMouseUp( const GuiEvent &event, bool lockedMouse ) { // If Ctrl/Cmd-clicking a header, collapse all sibling GuiRolloutCtrls. - if( ( mAutoCollapseSiblings && !mIsExpanded && !( event.modifier & SI_PRIMARY_CTRL ) + if( (( mAutoCollapseSiblings && !mIsExpanded && !( event.modifier & SI_PRIMARY_CTRL )) || ( !mAutoCollapseSiblings && event.modifier & SI_PRIMARY_CTRL ) ) ) { for( SimSet::iterator iter = getParent()->begin(); iter != getParent()->end(); ++ iter ) @@ -462,9 +462,9 @@ void GuiRolloutCtrl::processTick() newHeight -= mAnimateStep; if( !mIsAnimating ) - { + { mIsExpanded = false; - } + } } else // We're expanding ourself (Showing our contents) { @@ -559,13 +559,13 @@ void GuiRolloutCtrl::onRender( Point2I offset, const RectI &updateRect ) if ( pChild ) { if ( !mIsExpanded && !mIsAnimating && pChild->isVisible() ) - { + { pChild->setVisible( false ); - } + } else if ( (mIsExpanded || mIsAnimating) && !pChild->isVisible() ) - { + { pChild->setVisible( true ); - } + } } renderChildControls( offset, updateRect ); @@ -614,7 +614,7 @@ DefineEngineMethod( GuiRolloutCtrl, toggleCollapse, void, (),, if( object->isExpanded() ) object->collapse(); else - object->expand(); + object->expand(); } //----------------------------------------------------------------------------- diff --git a/Engine/source/gui/containers/guiWindowCtrl.cpp b/Engine/source/gui/containers/guiWindowCtrl.cpp index 84be45148..df8838fa1 100644 --- a/Engine/source/gui/containers/guiWindowCtrl.cpp +++ b/Engine/source/gui/containers/guiWindowCtrl.cpp @@ -231,7 +231,7 @@ void GuiWindowCtrl::moveFromCollapseGroup() parent->mCollapseGroupVec[groupVec].first()->mCollapseGroupNum = -1; parent->mCollapseGroupVec[groupVec].erase(U32(0)); parent->mCollapseGroupVec[groupVec].setSize(groupVecCount - 1); - parent->mCollapseGroupVec.erase(groupVec); + parent->mCollapseGroupVec.erase(groupVec); } } @@ -381,7 +381,7 @@ void GuiWindowCtrl::refreshCollapseGroups() if( !parent ) return; - CollapseGroupNumVec collapseGroupNumVec; + CollapseGroupNumVec collapseGroupNumVec; // iterate through the collided array, renumbering the windows pointers S32 assignGroupNum = 0; @@ -463,7 +463,7 @@ void GuiWindowCtrl::handleCollapseGroup() if( !parent ) return; - CollapseGroupNumVec collapseGroupNumVec; + CollapseGroupNumVec collapseGroupNumVec; if( mIsCollapsed ) // minimize window up to its header bar { @@ -529,7 +529,7 @@ void GuiWindowCtrl::handleCollapseGroup() if((*iter)->mCollapseGroupNum > mCollapseGroupNum) { Point2I newChildPosition = (*iter)->getPosition(); - newChildPosition.y += moveChildYBy; + newChildPosition.y += moveChildYBy; (*iter)->resize(newChildPosition, (*iter)->getExtent()); } } @@ -547,7 +547,7 @@ bool GuiWindowCtrl::resizeCollapseGroup(bool resizeX, bool resizeY, Point2I resi if( !parent ) return false; - CollapseGroupNumVec collapseGroupNumVec; + CollapseGroupNumVec collapseGroupNumVec; bool canResize = true; CollapseGroupNumVec::iterator iter = parent->mCollapseGroupVec[mCollapseGroup].begin(); @@ -980,7 +980,7 @@ void GuiWindowCtrl::onMouseDragged(const GuiEvent &event) moveWithCollapseGroup(newPosition); if(mCanCollapse && mCollapseGroup >= 0 && mResizeWindow == true ) - { + { // Resize the window if allowed if( newExtent.y >= getMinExtent().y && newExtent.x >= getMinExtent().x) { @@ -1212,7 +1212,7 @@ void GuiWindowCtrl::onMouseUp(const GuiEvent &event) // We're either moving out of a collapse group or moving to another one // Not valid for windows not previously in a group if( mCollapseGroup >= 0 && - (snapType == -1 || (hitWindow && snapType >= 0 && mCollapseGroup != hitWindow->mCollapseGroup))) + (snapType == -1 || (hitWindow && snapType >= 0 && mCollapseGroup != hitWindow->mCollapseGroup))) moveFromCollapseGroup(); // No window to connect to @@ -1512,7 +1512,7 @@ void GuiWindowCtrl::setCloseCommand(const char *newCmd) if (newCmd) mCloseCommand = StringTable->insert(newCmd); else - mCloseCommand = StringTable->insert(""); + mCloseCommand = StringTable->EmptyString(); } //----------------------------------------------------------------------------- @@ -1830,7 +1830,7 @@ void GuiWindowCtrl::parentResized(const RectI &oldParentRect, const RectI &newPa // Only for collpasing groups, if were not, then do it like normal windows if( mCanCollapse && mCollapseGroup >= 0 ) - { + { bool resizeMe = false; // Only the group window should control positioning diff --git a/Engine/source/gui/controls/guiColorPicker.cpp b/Engine/source/gui/controls/guiColorPicker.cpp index 2fad6aa69..5043c8a46 100644 --- a/Engine/source/gui/controls/guiColorPicker.cpp +++ b/Engine/source/gui/controls/guiColorPicker.cpp @@ -73,6 +73,7 @@ GuiColorPickerCtrl::GuiColorPickerCtrl() mSelectColor = false; mSetColor = mSetColor.BLACK; mBitmap = NULL; + mUseSRGB = false; } GuiColorPickerCtrl::~GuiColorPickerCtrl() @@ -104,6 +105,7 @@ void GuiColorPickerCtrl::initPersistFields() addGroup("ColorPicker"); addField("baseColor", TypeColorF, Offset(mBaseColor, GuiColorPickerCtrl)); addField("pickColor", TypeColorF, Offset(mPickColor, GuiColorPickerCtrl)); + addField("useSRGB", TypeBool, Offset(mUseSRGB, GuiColorPickerCtrl), "Render using sRGB scale"); addField("selectorGap", TypeS32, Offset(mSelectorGap, GuiColorPickerCtrl)); addField("displayMode", TYPEID< PickMode >(), Offset(mDisplayMode, GuiColorPickerCtrl) ); addField("actionOnMove", TypeBool,Offset(mActionOnMove, GuiColorPickerCtrl)); @@ -120,24 +122,35 @@ void GuiColorPickerCtrl::drawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, Col S32 l = bounds.point.x, r = bounds.point.x + bounds.extent.x; S32 t = bounds.point.y, b = bounds.point.y + bounds.extent.y; - + + ColorF col[4]; + col[0] = c1; + col[1] = c2; + col[2] = c3; + col[3] = c4; + if (!mUseSRGB) + { + for (U32 i = 0; i < 4; i++) + col[i] = col[i].toGamma(); + } + //A couple of checks to determine if color blend //A couple of checks to determine if color blend - if(c1 == colorWhite && c3 == colorAlpha && c4 == colorBlack) + if (c1 == colorWhite && c3 == colorAlpha && c4 == colorBlack) { //Color PrimBuild::begin(GFXTriangleStrip, 4); - PrimBuild::color( c2 ); + PrimBuild::color(col[1]); PrimBuild::vertex2i(l, t); - PrimBuild::color( c2 ); + PrimBuild::color(col[1]); PrimBuild::vertex2i(r, t); - PrimBuild::color( c2 ); - PrimBuild::vertex2i( l, b ); + PrimBuild::color(col[1]); + PrimBuild::vertex2i(l, b); - PrimBuild::color( c2 ); + PrimBuild::color(col[1]); PrimBuild::vertex2i(r, b); PrimBuild::end(); @@ -145,14 +158,14 @@ void GuiColorPickerCtrl::drawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, Col //White PrimBuild::begin(GFXTriangleStrip, 4); - PrimBuild::color(c1); + PrimBuild::color(col[0]); PrimBuild::vertex2i(l, t); - PrimBuild::color( colorAlphaW ); + PrimBuild::color(colorAlphaW); PrimBuild::vertex2i(r, t); - PrimBuild::color( c1 ); - PrimBuild::vertex2i( l, b ); + PrimBuild::color(col[0]); + PrimBuild::vertex2i(l, b); PrimBuild::color(colorAlphaW); PrimBuild::vertex2i(r, b); @@ -162,15 +175,15 @@ void GuiColorPickerCtrl::drawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, Col //Black PrimBuild::begin(GFXTriangleStrip, 4); - PrimBuild::color(c3); + PrimBuild::color(col[2]); PrimBuild::vertex2i(l, t); - PrimBuild::color( c3 ); - PrimBuild::vertex2i( r, t ); + PrimBuild::color(col[2]); + PrimBuild::vertex2i(r, t); - PrimBuild::color( c4 ); + PrimBuild::color(col[3]); PrimBuild::vertex2i(l, b); - PrimBuild::color( c4 ); + PrimBuild::color(col[3]); PrimBuild::vertex2i(r, b); PrimBuild::end(); @@ -179,17 +192,17 @@ void GuiColorPickerCtrl::drawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, Col { PrimBuild::begin(GFXTriangleStrip, 4); - PrimBuild::color( c1 ); - PrimBuild::vertex2i( l, t ); + PrimBuild::color(col[0]); + PrimBuild::vertex2i(l, t); - PrimBuild::color( c2 ); - PrimBuild::vertex2i( r, t ); + PrimBuild::color(col[1]); + PrimBuild::vertex2i(r, t); - PrimBuild::color(c4); + PrimBuild::color(col[3]); PrimBuild::vertex2i(l, b); - PrimBuild::color( c3 ); - PrimBuild::vertex2i( r, b ); + PrimBuild::color(col[2]); + PrimBuild::vertex2i(r, b); PrimBuild::end(); } @@ -199,6 +212,7 @@ void GuiColorPickerCtrl::drawBlendBox(RectI &bounds, ColorF &c1, ColorF &c2, Col /// Function to draw a set of boxes blending throughout an array of colors void GuiColorPickerCtrl::drawBlendRangeBox(RectI &bounds, bool vertical, U8 numColors, ColorI *colors) { + GFX->setStateBlock(mStateBlock); S32 l = bounds.point.x, r = bounds.point.x + bounds.extent.x + 4; @@ -208,6 +222,20 @@ void GuiColorPickerCtrl::drawBlendRangeBox(RectI &bounds, bool vertical, U8 numC S32 x_inc = int(mFloor((r - l) / F32(numColors - 1))); S32 y_inc = int(mFloor((b - t) / F32(numColors - 1))); + ColorI *col = new ColorI[numColors]; + dMemcpy(col, colors, numColors * sizeof(ColorI)); + if (mUseSRGB) + { + for (U16 i = 0; i < numColors - 1; i++) + col[i] = colors[i]; + } + else + { + for (U16 i = 0; i < numColors - 1; i++) + col[i] = colors[i].toGamma(); + } + + for (U16 i = 0; i < numColors - 1; i++) { // This is not efficent, but then again it doesn't really need to be. -pw @@ -216,30 +244,30 @@ void GuiColorPickerCtrl::drawBlendRangeBox(RectI &bounds, bool vertical, U8 numC if (!vertical) // Horizontal (+x) { // First color - PrimBuild::color(colors[i]); + PrimBuild::color(col[i]); PrimBuild::vertex2i(l, t); - PrimBuild::color(colors[i + 1]); + PrimBuild::color(col[i + 1]); PrimBuild::vertex2i(l + x_inc, t); // Second color - PrimBuild::color(colors[i]); + PrimBuild::color(col[i]); PrimBuild::vertex2i(l, b); - PrimBuild::color(colors[i + 1]); + PrimBuild::color(col[i + 1]); PrimBuild::vertex2i(l + x_inc, b); l += x_inc; } else // Vertical (+y) { // First color - PrimBuild::color(colors[i]); + PrimBuild::color(col[i]); PrimBuild::vertex2i(l, t); - PrimBuild::color(colors[i + 1]); + PrimBuild::color(col[i + 1]); PrimBuild::vertex2i(l, t + y_inc); // Second color - PrimBuild::color(colors[i]); + PrimBuild::color(col[i]); PrimBuild::vertex2i(r, t); - PrimBuild::color(colors[i + 1]); + PrimBuild::color(col[i + 1]); PrimBuild::vertex2i(r, t + y_inc); t += y_inc; } diff --git a/Engine/source/gui/controls/guiColorPicker.h b/Engine/source/gui/controls/guiColorPicker.h index 42531c3bb..c742cea79 100644 --- a/Engine/source/gui/controls/guiColorPicker.h +++ b/Engine/source/gui/controls/guiColorPicker.h @@ -90,6 +90,7 @@ class GuiColorPickerCtrl : public GuiControl ColorF mPickColor; ///< Color that has been picked from control ColorF mBaseColor; ///< Colour we display (in case of pallet and blend mode) PickMode mDisplayMode; ///< Current color display mode of the selector + bool mUseSRGB; ///< use sRGB color scale Point2I mSelectorPos; ///< Current position of the selector bool mPositionChanged; ///< Current position has changed since last render? diff --git a/Engine/source/gui/controls/guiGameListMenuCtrl.cpp b/Engine/source/gui/controls/guiGameListMenuCtrl.cpp index 760a0246a..e64f2c7c0 100644 --- a/Engine/source/gui/controls/guiGameListMenuCtrl.cpp +++ b/Engine/source/gui/controls/guiGameListMenuCtrl.cpp @@ -38,7 +38,7 @@ GuiGameListMenuCtrl::GuiGameListMenuCtrl() VECTOR_SET_ASSOCIATION(mRows); // initialize the control callbacks - mCallbackOnA = StringTable->insert(""); + mCallbackOnA = StringTable->EmptyString(); mCallbackOnB = mCallbackOnA; mCallbackOnX = mCallbackOnA; mCallbackOnY = mCallbackOnA; @@ -572,7 +572,7 @@ StringTableEntry GuiGameListMenuCtrl::getRowLabel(S32 rowIndex) const if (! isValidRowIndex(rowIndex)) { // not a valid row index, don't do anything - return StringTable->insert(""); + return StringTable->EmptyString(); } return mRows[rowIndex]->mLabel; } diff --git a/Engine/source/gui/controls/guiListBoxCtrl.cpp b/Engine/source/gui/controls/guiListBoxCtrl.cpp index 22108ee3d..992d64903 100644 --- a/Engine/source/gui/controls/guiListBoxCtrl.cpp +++ b/Engine/source/gui/controls/guiListBoxCtrl.cpp @@ -52,9 +52,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onMouseDragged, void, (),(), "@tsexample\n" "// Mouse is dragged across the control, causing the callback to occur.\n" "GuiListBoxCtrl::onMouseDragged(%this)\n" - " {\n" - " // Code to run whenever the mouse is dragged across the control\n" - " }\n" + " {\n" + " // Code to run whenever the mouse is dragged across the control\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -64,9 +64,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onClearSelection, void, (),(), "@tsexample\n" "// A selected item is cleared, causing the callback to occur.\n" "GuiListBoxCtrl::onClearSelection(%this)\n" - " {\n" - " // Code to run whenever a selected item is cleared\n" - " }\n" + " {\n" + " // Code to run whenever a selected item is cleared\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -78,9 +78,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onUnSelect, void, ( S32 index, const char* i "@tsexample\n" "// A selected item is unselected, causing the callback to occur\n" "GuiListBoxCtrl::onUnSelect(%this, %indexId, %itemText)\n" - " {\n" - " // Code to run whenever a selected list item is unselected\n" - " }\n" + " {\n" + " // Code to run whenever a selected list item is unselected\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -92,9 +92,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onSelect, void, ( S32 index , const char* it "@tsexample\n" "// An item in the list is selected, causing the callback to occur\n" "GuiListBoxCtrl::onSelect(%this, %index, %itemText)\n" - " {\n" - " // Code to run whenever an item in the list is selected\n" - " }\n" + " {\n" + " // Code to run whenever an item in the list is selected\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -104,9 +104,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onDoubleClick, void, (),(), "@tsexample\n" "// An item in the list is double clicked, causing the callback to occur.\n" "GuiListBoxCtrl::onDoubleClick(%this)\n" - " {\n" - " // Code to run whenever an item in the control has been double clicked\n" - " }\n" + " {\n" + " // Code to run whenever an item in the control has been double clicked\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -121,9 +121,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onMouseUp, void, ( S32 itemHit, S32 mouseCli "@tsexample\n" "// Mouse was previously clicked down, and now has been released, causing the callback to occur.\n" "GuiListBoxCtrl::onMouseUp(%this, %itemHit, %mouseClickCount)\n" - " {\n" - " // Code to call whenever the mouse has been clicked and released on the control\n" - " }\n" + " {\n" + " // Code to call whenever the mouse has been clicked and released on the control\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -133,9 +133,9 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, onDeleteKey, void, (),(), "@tsexample\n" "// The delete key on the keyboard has been pressed while this control is in focus, causing the callback to occur.\n" "GuiListBoxCtrl::onDeleteKey(%this)\n" - " {\n" - " // Code to call whenever the delete key is pressed\n" - " }\n" + " {\n" + " // Code to call whenever the delete key is pressed\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -146,10 +146,10 @@ IMPLEMENT_CALLBACK( GuiListBoxCtrl, isObjectMirrored, bool, ( const char* indexI "@tsexample\n" "// Engine has requested of the script level to determine if a list entry is mirrored or not.\n" "GuiListBoxCtrl::isObjectMirrored(%this, %indexIdString)\n" - " {\n" - " // Perform code required to check and see if the list item at the index id is mirrored or not.\n" - " return %isMirrored;\n" - " }\n" + " {\n" + " // Perform code required to check and see if the list item at the index id is mirrored or not.\n" + " return %isMirrored;\n" + " }\n" "@endtsexample\n\n" "@return A boolean value on if the list item is mirrored or not.\n\n" "@see GuiControl\n\n" @@ -234,7 +234,7 @@ void GuiListBoxCtrl::clearItems() // Free our vector lists mItems.clear(); mSelectedItems.clear(); - mFilteredItems.clear(); + mFilteredItems.clear(); } DefineEngineMethod( GuiListBoxCtrl, clearSelection, void, (),, @@ -1511,8 +1511,8 @@ void GuiListBoxCtrl::_mirror() break; } } - - for ( U32 j = 0; j < mFilteredItems.size(); j++ ) + + for ( U32 j = 0; j < mFilteredItems.size(); j++ ) { if ( (SimObjectId)(uintptr_t)(mFilteredItems[j]->itemData) == curId ) { @@ -1530,7 +1530,7 @@ void GuiListBoxCtrl::_mirror() StringTableEntry GuiListBoxCtrl::_makeMirrorItemName( SimObject *inObj ) { - StringTableEntry outName = StringTable->insert(""); + StringTableEntry outName = StringTable->EmptyString(); if ( mMakeNameCallback.isNotEmpty() ) { @@ -1571,37 +1571,37 @@ DefineEngineMethod( GuiListBoxCtrl, addFilteredItem, void, (const char* newItem) "@endtsexample\n\n" "@see GuiControl") { - String item(newItem); - if( item == String::EmptyString ) - return; + String item(newItem); + if( item == String::EmptyString ) + return; - object->addFilteredItem( item ); + object->addFilteredItem( item ); } void GuiListBoxCtrl::addFilteredItem( String item ) { - // Delete from selected items list - for ( S32 i = 0; i < mSelectedItems.size(); i++ ) - { - String itemText = mSelectedItems[i]->itemText; - if ( dStrcmp( itemText.c_str(), item.c_str() ) == 0 ) - { - mSelectedItems.erase_fast( i ); - break; - } - } + // Delete from selected items list + for ( S32 i = 0; i < mSelectedItems.size(); i++ ) + { + String itemText = mSelectedItems[i]->itemText; + if ( dStrcmp( itemText.c_str(), item.c_str() ) == 0 ) + { + mSelectedItems.erase_fast( i ); + break; + } + } - for ( S32 i = 0; i < mItems.size(); i++ ) - { - String itemText = mItems[i]->itemText; - if( dStrcmp( itemText.c_str(), item.c_str() ) == 0 ) - { - mItems[i]->isSelected = false; - mFilteredItems.push_front( mItems[i] ); - mItems.erase( &mItems[i] ); - break; - } - } + for ( S32 i = 0; i < mItems.size(); i++ ) + { + String itemText = mItems[i]->itemText; + if( dStrcmp( itemText.c_str(), item.c_str() ) == 0 ) + { + mItems[i]->isSelected = false; + mFilteredItems.push_front( mItems[i] ); + mItems.erase( &mItems[i] ); + break; + } + } } DefineEngineMethod( GuiListBoxCtrl, removeFilteredItem, void, ( const char* itemName ),, @@ -1615,23 +1615,23 @@ DefineEngineMethod( GuiListBoxCtrl, removeFilteredItem, void, ( const char* item "@endtsexample\n\n" "@see GuiControl") { - String item(itemName); - if( item == String::EmptyString ) - return; + String item(itemName); + if( item == String::EmptyString ) + return; - object->removeFilteredItem( item ); + object->removeFilteredItem( item ); } void GuiListBoxCtrl::removeFilteredItem( String item ) { - for ( S32 i = 0; i < mFilteredItems.size(); i++ ) - { - String itemText = mFilteredItems[i]->itemText; - if( dStrcmp( itemText.c_str(), item.c_str() ) == 0 ) - { - mItems.push_front( mFilteredItems[i] ); - mFilteredItems.erase( &mFilteredItems[i] ); - break; - } - } -} \ No newline at end of file + for ( S32 i = 0; i < mFilteredItems.size(); i++ ) + { + String itemText = mFilteredItems[i]->itemText; + if( dStrcmp( itemText.c_str(), item.c_str() ) == 0 ) + { + mItems.push_front( mFilteredItems[i] ); + mFilteredItems.erase( &mFilteredItems[i] ); + break; + } + } +} diff --git a/Engine/source/gui/controls/guiMLTextCtrl.cpp b/Engine/source/gui/controls/guiMLTextCtrl.cpp index 1a4f64814..e61a82cc5 100644 --- a/Engine/source/gui/controls/guiMLTextCtrl.cpp +++ b/Engine/source/gui/controls/guiMLTextCtrl.cpp @@ -66,9 +66,9 @@ IMPLEMENT_CALLBACK( GuiMLTextCtrl, onURL, void, ( const char* url ),( url ), "@tsexample\n" "// A URL address was clicked on in the control, causing the callback to occur.\n" "GuiMLTextCtrl::onUrl(%this,%url)\n" - " {\n" - " // Code to run whenever a URL was clicked on\n" - " }\n" + " {\n" + " // Code to run whenever a URL was clicked on\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -80,9 +80,9 @@ IMPLEMENT_CALLBACK( GuiMLTextCtrl, onResize, void, ( S32 width, S32 maxY ),( wid "@tsexample\n" "// Control size changed, causing the callback to occur.\n" "GuiMLTextCtrl::onResize(%this,%width,%maxY)\n" - " {\n" - " // Code to call when the control size changes\n" - " }\n" + " {\n" + " // Code to call when the control size changes\n" + " }\n" "@endtsexample\n\n" "@see GuiControl\n\n" ); @@ -191,17 +191,17 @@ DefineEngineMethod( GuiMLTextCtrl, scrollToBottom, void, (),, } DefineEngineFunction(StripMLControlChars, const char*, (const char* inString),, - "@brief Strip TorqueML control characters from the specified string, returning a 'clean' version.\n\n" - "@param inString String to strip TorqueML control characters from.\n" - "@tsexample\n" - "// Define the string to strip TorqueML control characters from\n" - "%string = \"How Now Brown Cow\";\n\n" - "// Request the stripped version of the string\n" - "%strippedString = StripMLControlChars(%string);\n" - "@endtsexample\n\n" - "@return Version of the inputted string with all TorqueML characters removed.\n\n" - "@see References\n\n" - "@ingroup GuiCore") + "@brief Strip TorqueML control characters from the specified string, returning a 'clean' version.\n\n" + "@param inString String to strip TorqueML control characters from.\n" + "@tsexample\n" + "// Define the string to strip TorqueML control characters from\n" + "%string = \"How Now Brown Cow\";\n\n" + "// Request the stripped version of the string\n" + "%strippedString = StripMLControlChars(%string);\n" + "@endtsexample\n\n" + "@return Version of the inputted string with all TorqueML characters removed.\n\n" + "@see References\n\n" + "@ingroup GuiCore") { return GuiMLTextCtrl::stripControlChars(inString); } @@ -251,7 +251,7 @@ GuiMLTextCtrl::GuiMLTextCtrl() mIsEditCtrl( false ), mCursorPosition( false ), mMaxBufferSize( -1 ), - mInitialText( StringTable->insert("") ), + mInitialText( StringTable->EmptyString() ), mSelectionActive( false ), mSelectionStart( 0 ), mSelectionEnd( 0 ), @@ -267,7 +267,7 @@ GuiMLTextCtrl::GuiMLTextCtrl() mFontList( NULL ) { mActive = true; - //mInitialText = StringTable->insert(""); + //mInitialText = StringTable->EmptyString(); Sim::findObject("InputDeniedSound", mDeniedSound); } @@ -293,7 +293,7 @@ void GuiMLTextCtrl::initPersistFields() addField("deniedSound", TypeSFXTrackName, Offset(mDeniedSound, GuiMLTextCtrl), "If the text will not fit in the control, the deniedSound is played."); addField("text", TypeCaseString, Offset( mInitialText, GuiMLTextCtrl ), "Text to display in this control."); addField("useURLMouseCursor", TypeBool, Offset(mUseURLMouseCursor, GuiMLTextCtrl), "If true, the mouse cursor will turn into a hand cursor while over a link in the text.\n" - "This is dependant on the markup language used by the GuiMLTextCtrl\n"); + "This is dependant on the markup language used by the GuiMLTextCtrl\n"); endGroup( "Text" ); @@ -649,9 +649,9 @@ void GuiMLTextCtrl::ensureCursorOnScreen() // If our parent isn't a scroll control, or we're not the only control // in the content region, bail... GuiControl* pParent = getParent(); - GuiScrollCtrl *sc = dynamic_cast(pParent); - if(!sc) - return; + GuiScrollCtrl *sc = dynamic_cast(pParent); + if(!sc) + return; // Ok. Now we know that our parent is a scroll control. Let's find the // top of the cursor, and it's bottom. We can then scroll the parent control @@ -661,7 +661,7 @@ void GuiMLTextCtrl::ensureCursorOnScreen() ColorI color; getCursorPositionAndColor(cursorTopP, cursorBottomP, color); - sc->scrollRectVisible(RectI(cursorTopP.x, cursorTopP.y, 1, cursorBottomP.y - cursorTopP.y)); + sc->scrollRectVisible(RectI(cursorTopP.x, cursorTopP.y, 1, cursorBottomP.y - cursorTopP.y)); } //-------------------------------------- @@ -840,7 +840,7 @@ void GuiMLTextCtrl::onMouseUp(const GuiEvent& event) // Convert URL from UTF16 to UTF8. UTF8* url = mTextBuffer.createSubstring8(mHitURL->textStart, mHitURL->len); - onURL_callback(url); + onURL_callback(url); delete[] url; mHitURL = NULL; @@ -1018,7 +1018,7 @@ void GuiMLTextCtrl::scrollToTag( U32 id ) Con::warnf( ConsoleLogEntry::General, "GuiMLTextCtrl::scrollToTag - tag id %d not found!", id ); return; } - pappy->scrollRectVisible(RectI(0, tag->y, 1, 1)); + pappy->scrollRectVisible(RectI(0, tag->y, 1, 1)); } //-------------------------------------------------------------------------- @@ -1028,7 +1028,7 @@ void GuiMLTextCtrl::scrollToTop() GuiScrollCtrl *pappy = dynamic_cast(getParent()); if ( !pappy ) return; - pappy->scrollRectVisible(RectI(0,0,0,0)); + pappy->scrollRectVisible(RectI(0,0,0,0)); } //-------------------------------------------------------------------------- @@ -2134,7 +2134,7 @@ textemit: emitNewLine(mScanPos); setHeight( mMaxY ); onResize_callback( getWidth(), mMaxY ); - + //make sure the cursor is still visible - this handles if we're a child of a scroll ctrl... ensureCursorOnScreen(); } diff --git a/Engine/source/gui/controls/guiPopUpCtrl.cpp b/Engine/source/gui/controls/guiPopUpCtrl.cpp index aabce4d11..af172221a 100644 --- a/Engine/source/gui/controls/guiPopUpCtrl.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrl.cpp @@ -233,31 +233,31 @@ void GuiPopupTextListCtrl::onRenderCell(Point2I offset, Point2I cell, bool selec IMPLEMENT_CONOBJECT(GuiPopUpMenuCtrl); ConsoleDocClass( GuiPopUpMenuCtrl, - "@brief A control that allows to select a value from a drop-down list.\n\n" + "@brief A control that allows to select a value from a drop-down list.\n\n" - "For a nearly identical GUI with additional features, use GuiPopUpMenuCtrlEx.\n\n" + "For a nearly identical GUI with additional features, use GuiPopUpMenuCtrlEx.\n\n" - "@tsexample\n" - "new GuiPopUpMenuCtrl()\n" - "{\n" - " maxPopupHeight = \"200\";\n" - " sbUsesNAColor = \"0\";\n" - " reverseTextList = \"0\";\n" - " bitmapBounds = \"16 16\";\n" - " maxLength = \"1024\";\n" - " position = \"56 31\";\n" - " extent = \"64 64\";\n" - " minExtent = \"8 2\";\n" - " profile = \"GuiPopUpMenuProfile\";\n" - " tooltipProfile = \"GuiToolTipProfile\";\n" - "};\n" - "@endtsexample\n\n" + "@tsexample\n" + "new GuiPopUpMenuCtrl()\n" + "{\n" + " maxPopupHeight = \"200\";\n" + " sbUsesNAColor = \"0\";\n" + " reverseTextList = \"0\";\n" + " bitmapBounds = \"16 16\";\n" + " maxLength = \"1024\";\n" + " position = \"56 31\";\n" + " extent = \"64 64\";\n" + " minExtent = \"8 2\";\n" + " profile = \"GuiPopUpMenuProfile\";\n" + " tooltipProfile = \"GuiToolTipProfile\";\n" + "};\n" + "@endtsexample\n\n" - "@note This is definitely going to be deprecated soon.\n\n" + "@note This is definitely going to be deprecated soon.\n\n" - "@see GuiPopUpMenuCtrlEx for more features and better explanations.\n" + "@see GuiPopUpMenuCtrlEx for more features and better explanations.\n" - "@ingroup GuiControls\n"); + "@ingroup GuiControls\n"); GuiPopUpMenuCtrl::GuiPopUpMenuCtrl(void) { @@ -277,9 +277,9 @@ GuiPopUpMenuCtrl::GuiPopUpMenuCtrl(void) mRenderScrollInNA = false; // Added mBackgroundCancel = false; // Added mReverseTextList = false; // Added - Don't reverse text list if displaying up - mBitmapName = StringTable->insert(""); // Added + mBitmapName = StringTable->EmptyString(); // Added mBitmapBounds.set(16, 16); // Added - mIdMax = -1; + mIdMax = -1; } //------------------------------------------------------------------------------ @@ -302,11 +302,11 @@ void GuiPopUpMenuCtrl::initPersistFields(void) //------------------------------------------------------------------------------ DefineConsoleMethod( GuiPopUpMenuCtrl, add, void, (const char * name, S32 idNum, U32 scheme), ("", -1, 0), "(string name, int idNum, int scheme=0)") { - object->addEntry(name, idNum, scheme); + object->addEntry(name, idNum, scheme); } DefineConsoleMethod( GuiPopUpMenuCtrl, addScheme, void, (U32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL), , - "(int id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL)") + "(int id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL)") { object->addScheme( id, fontColor, fontColorHL, fontColorSEL ); @@ -492,43 +492,43 @@ void GuiPopUpMenuCtrl::clear() setText(""); mSelIndex = -1; mRevNum = 0; - mIdMax = -1; + mIdMax = -1; } //------------------------------------------------------------------------------ void GuiPopUpMenuCtrl::clearEntry( S32 entry ) -{ - if( entry == -1 ) - return; +{ + if( entry == -1 ) + return; - U32 i = 0; - for ( ; i < mEntries.size(); i++ ) + U32 i = 0; + for ( ; i < mEntries.size(); i++ ) { if ( mEntries[i].id == entry ) break; } - mEntries.erase( i ); + mEntries.erase( i ); - if( mEntries.size() <= 0 ) - { - mEntries.setSize(0); - setText(""); - mSelIndex = -1; - mRevNum = 0; - } - else - { - if (entry < mSelIndex) - { - mSelIndex--; - } - else if( entry == mSelIndex ) - { - setText(""); - mSelIndex = -1; - } - } + if( mEntries.size() <= 0 ) + { + mEntries.setSize(0); + setText(""); + mSelIndex = -1; + mRevNum = 0; + } + else + { + if (entry < mSelIndex) + { + mSelIndex--; + } + else if( entry == mSelIndex ) + { + setText(""); + mSelIndex = -1; + } + } } //------------------------------------------------------------------------------ @@ -620,21 +620,21 @@ void GuiPopUpMenuCtrl::addEntry( const char *buf, S32 id, U32 scheme ) //Con::printf( "GuiPopupMenuCtrlEx::addEntry - Invalid buffer!" ); return; } - - // Ensure that there are no other entries with exactly the same name - for ( U32 i = 0; i < mEntries.size(); i++ ) + + // Ensure that there are no other entries with exactly the same name + for ( U32 i = 0; i < mEntries.size(); i++ ) { if ( dStrcmp( mEntries[i].buf, buf ) == 0 ) return; } - // If we don't give an id, create one from mIdMax - if( id == -1 ) - id = mIdMax + 1; - - // Increase mIdMax when an id is greater than it - if( id > mIdMax ) - mIdMax = id; + // If we don't give an id, create one from mIdMax + if( id == -1 ) + id = mIdMax + 1; + + // Increase mIdMax when an id is greater than it + if( id > mIdMax ) + mIdMax = id; Entry e; dStrcpy( e.buf, buf ); @@ -802,28 +802,28 @@ void GuiPopUpMenuCtrl::setFirstSelected( bool bNotifyScript ) setText( mEntries[0].buf ); } - // Execute the popup console command: - if( bNotifyScript ) + // Execute the popup console command: + if( bNotifyScript ) { if ( isMethod( "onSelect" ) ) Con::executef( this, "onSelect", Con::getIntArg( mEntries[ mSelIndex ].id ), mEntries[mSelIndex].buf ); - execConsoleCallback(); - } - } - else - { - if ( mReplaceText ) // Only change the displayed text if appropriate. - setText(""); - - mSelIndex = -1; - - if( bNotifyScript ) - { - Con::executef( this, "onCancel" ); execConsoleCallback(); } - } + } + else + { + if ( mReplaceText ) // Only change the displayed text if appropriate. + setText(""); + + mSelIndex = -1; + + if( bNotifyScript ) + { + Con::executef( this, "onCancel" ); + execConsoleCallback(); + } + } } //------------------------------------------------------------------------------ @@ -1278,11 +1278,11 @@ void GuiPopUpMenuCtrl::onAction() if ( setScroll ) { // Resize the text list - Point2I cellSize; - mTl->getCellSize( cellSize ); - cellSize.x = width - mSc->scrollBarThickness() - sbBorder; - mTl->setCellSize( cellSize ); - mTl->setWidth( cellSize.x ); + Point2I cellSize; + mTl->getCellSize( cellSize ); + cellSize.x = width - mSc->scrollBarThickness() - sbBorder; + mTl->setCellSize( cellSize ); + mTl->setWidth( cellSize.x ); if ( mSelIndex ) mTl->scrollCellVisible( Point2I( 0, mSelIndex ) ); @@ -1315,7 +1315,7 @@ void GuiPopUpMenuCtrl::addChildren() else { // Use the children's profile rather than the parent's profile, if it exists. - mSc->setControlProfile( mProfile->getChildrenProfile() ? mProfile->getChildrenProfile() : mProfile ); + mSc->setControlProfile( mProfile->getChildrenProfile() ? mProfile->getChildrenProfile() : mProfile ); } mSc->setField( "hScrollBar", "AlwaysOff" ); diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp index 0d90b9d73..3c6415117 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp @@ -30,27 +30,27 @@ #include "console/engineAPI.h" ConsoleDocClass( GuiPopUpMenuCtrlEx, - "@brief A control that allows to select a value from a drop-down list.\n\n" + "@brief A control that allows to select a value from a drop-down list.\n\n" - "This is essentially a GuiPopUpMenuCtrl, but with quite a few more features.\n\n" + "This is essentially a GuiPopUpMenuCtrl, but with quite a few more features.\n\n" - "@tsexample\n" - "new GuiPopUpMenuCtrlEx()\n" - "{\n" - " maxPopupHeight = \"200\";\n" - " sbUsesNAColor = \"0\";\n" - " reverseTextList = \"0\";\n" - " bitmapBounds = \"16 16\";\n" - " hotTrackCallback = \"0\";\n" - " extent = \"64 64\";\n" - " profile = \"GuiDefaultProfile\";\n" - " tooltipProfile = \"GuiToolTipProfile\";\n" - "};\n" - "@endtsexample\n\n" + "@tsexample\n" + "new GuiPopUpMenuCtrlEx()\n" + "{\n" + " maxPopupHeight = \"200\";\n" + " sbUsesNAColor = \"0\";\n" + " reverseTextList = \"0\";\n" + " bitmapBounds = \"16 16\";\n" + " hotTrackCallback = \"0\";\n" + " extent = \"64 64\";\n" + " profile = \"GuiDefaultProfile\";\n" + " tooltipProfile = \"GuiToolTipProfile\";\n" + "};\n" + "@endtsexample\n\n" - "@see GuiPopUpMenuCtrl\n" + "@see GuiPopUpMenuCtrl\n" - "@ingroup GuiControls\n"); + "@ingroup GuiControls\n"); static ColorI colorWhite(255,255,255); // Added @@ -328,10 +328,10 @@ GuiPopUpMenuCtrlEx::GuiPopUpMenuCtrlEx(void) mRenderScrollInNA = false; // Added mBackgroundCancel = false; // Added mReverseTextList = false; // Added - Don't reverse text list if displaying up - mBitmapName = StringTable->insert(""); // Added + mBitmapName = StringTable->EmptyString(); // Added mBitmapBounds.set(16, 16); // Added mHotTrackItems = false; - mIdMax = -1; + mIdMax = -1; } //------------------------------------------------------------------------------ @@ -355,13 +355,13 @@ void GuiPopUpMenuCtrlEx::initPersistFields(void) //------------------------------------------------------------------------------ ConsoleDocFragment _GuiPopUpMenuCtrlExAdd( - "@brief Adds an entry to the list\n\n" - "@param name String containing the name of the entry\n" - "@param idNum Numerical value assigned to the name\n" - "@param scheme Optional ID associated with a scheme " - "for font coloring, highlight coloring, and selection coloring\n\n", - "GuiPopUpMenuCtrlEx", - "void add(string name, S32 idNum, S32 scheme=0);" + "@brief Adds an entry to the list\n\n" + "@param name String containing the name of the entry\n" + "@param idNum Numerical value assigned to the name\n" + "@param scheme Optional ID associated with a scheme " + "for font coloring, highlight coloring, and selection coloring\n\n", + "GuiPopUpMenuCtrlEx", + "void add(string name, S32 idNum, S32 scheme=0);" ); DefineConsoleMethod( GuiPopUpMenuCtrlEx, add, void, (const char * name, S32 idNum, U32 scheme), ("", -1, 0), "(string name, int idNum, int scheme=0)") @@ -370,23 +370,23 @@ DefineConsoleMethod( GuiPopUpMenuCtrlEx, add, void, (const char * name, S32 idNu } DefineEngineMethod( GuiPopUpMenuCtrlEx, addCategory, void, (const char* text),, - "@brief Add a category to the list.\n\n" + "@brief Add a category to the list.\n\n" - "Acts as a separator between entries, allowing for sub-lists\n\n" + "Acts as a separator between entries, allowing for sub-lists\n\n" - "@param text Name of the new category\n\n") + "@param text Name of the new category\n\n") { - object->addEntry(text, -1, 0); + object->addEntry(text, -1, 0); } DefineEngineMethod( GuiPopUpMenuCtrlEx, addScheme, void, (S32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL),, - "@brief Create a new scheme and add it to the list of choices for when a new text entry is added.\n\n" - "@param id Numerical id associated with this scheme\n" - "@param fontColor The base text font color. Formatted as \"Red Green Blue\", each a numerical between 0 and 255.\n" - "@param fontColorHL Color of text when being highlighted. Formatted as \"Red Green Blue\", each a numerical between 0 and 255.\n" - "@param fontColorSel Color of text when being selected. Formatted as \"Red Green Blue\", each a numerical between 0 and 255.\n") + "@brief Create a new scheme and add it to the list of choices for when a new text entry is added.\n\n" + "@param id Numerical id associated with this scheme\n" + "@param fontColor The base text font color. Formatted as \"Red Green Blue\", each a numerical between 0 and 255.\n" + "@param fontColorHL Color of text when being highlighted. Formatted as \"Red Green Blue\", each a numerical between 0 and 255.\n" + "@param fontColorSel Color of text when being selected. Formatted as \"Red Green Blue\", each a numerical between 0 and 255.\n") { - /*ColorI fontColor, fontColorHL, fontColorSEL; + /*ColorI fontColor, fontColorHL, fontColorSEL; U32 r, g, b; char buf[64]; @@ -457,127 +457,127 @@ DefineEngineMethod( GuiPopUpMenuCtrlEx, addScheme, void, (S32 id, ColorI fontCol //} DefineEngineMethod( GuiPopUpMenuCtrlEx, setText, void, ( const char* text),, - "@brief Set the current text to a specified value.\n\n" - "@param text String containing new text to set\n\n") + "@brief Set the current text to a specified value.\n\n" + "@param text String containing new text to set\n\n") { - object->setText(text); + object->setText(text); } DefineEngineMethod( GuiPopUpMenuCtrlEx, getText, const char*, (),, - "@brief Get the.\n\n" + "@brief Get the.\n\n" - "Detailed description\n\n" + "Detailed description\n\n" - "@param param Description\n\n" + "@param param Description\n\n" - "@tsexample\n" - "// Comment\n" - "code();\n" - "@endtsexample\n\n" + "@tsexample\n" + "// Comment\n" + "code();\n" + "@endtsexample\n\n" - "@return Returns current text in string format") + "@return Returns current text in string format") { - return object->getText(); + return object->getText(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, clear, void, (),, - "@brief Clear the popup list.\n\n") + "@brief Clear the popup list.\n\n") { - object->clear(); + object->clear(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, sort, void, (),, - "@brief Sort the list alphabetically.\n\n") + "@brief Sort the list alphabetically.\n\n") { - object->sort(); + object->sort(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, sortID, void, (),, - "@brief Sort the list by ID.\n\n") + "@brief Sort the list by ID.\n\n") { - object->sortID(); + object->sortID(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, forceOnAction, void, (),, - "@brief Manually for the onAction function, which updates everything in this control.\n\n") + "@brief Manually for the onAction function, which updates everything in this control.\n\n") { - object->onAction(); + object->onAction(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, forceClose, void, (),, - "@brief Manually force this control to collapse and close.\n\n") + "@brief Manually force this control to collapse and close.\n\n") { - object->closePopUp(); + object->closePopUp(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, getSelected, S32, (),, - "@brief Get the current selection of the menu.\n\n" - "@return Returns the ID of the currently selected entry") + "@brief Get the current selection of the menu.\n\n" + "@return Returns the ID of the currently selected entry") { - return object->getSelected(); + return object->getSelected(); } ConsoleDocFragment _GuiPopUpMenuCtrlExsetSelected( - "brief Manually set an entry as selected int his control\n\n" - "@param id The ID of the entry to select\n" - "@param scripCallback Optional boolean that forces the script callback if true\n", - "GuiPopUpMenuCtrlEx", - "setSelected(int id, bool scriptCallback=true);" + "brief Manually set an entry as selected int his control\n\n" + "@param id The ID of the entry to select\n" + "@param scripCallback Optional boolean that forces the script callback if true\n", + "GuiPopUpMenuCtrlEx", + "setSelected(int id, bool scriptCallback=true);" ); DefineConsoleMethod( GuiPopUpMenuCtrlEx, setSelected, void, (S32 id, bool scriptCallback), (true), "(int id, [scriptCallback=true])" - "@hide") + "@hide") { object->setSelected( id, scriptCallback ); } ConsoleDocFragment _GuiPopUpMenuCtrlExsetFirstSelected( - "brief Manually set the selection to the first entry\n\n" - "@param scripCallback Optional boolean that forces the script callback if true\n", - "GuiPopUpMenuCtrlEx", - "setSelected(bool scriptCallback=true);" + "brief Manually set the selection to the first entry\n\n" + "@param scripCallback Optional boolean that forces the script callback if true\n", + "GuiPopUpMenuCtrlEx", + "setSelected(bool scriptCallback=true);" ); DefineConsoleMethod( GuiPopUpMenuCtrlEx, setFirstSelected, void, (bool scriptCallback), (true), "([scriptCallback=true])" - "@hide") + "@hide") { object->setFirstSelected( scriptCallback ); } DefineEngineMethod( GuiPopUpMenuCtrlEx, setNoneSelected, void, ( S32 param),, - "@brief Clears selection in the menu.\n\n") + "@brief Clears selection in the menu.\n\n") { - object->setNoneSelected(); + object->setNoneSelected(); } DefineEngineMethod( GuiPopUpMenuCtrlEx, getTextById, const char*, (S32 id),, - "@brief Get the text of an entry based on an ID.\n\n" - "@param id The ID assigned to the entry being queried\n\n" - "@return String contained by the specified entry, NULL if empty or bad ID") + "@brief Get the text of an entry based on an ID.\n\n" + "@param id The ID assigned to the entry being queried\n\n" + "@return String contained by the specified entry, NULL if empty or bad ID") { - return(object->getTextById(id)); + return(object->getTextById(id)); } DefineConsoleMethod( GuiPopUpMenuCtrlEx, getColorById, ColorI, (S32 id), , - "@brief Get color of an entry's box\n\n" - "@param id ID number of entry to query\n\n" - "@return ColorI in the format of \"Red Green Blue Alpha\", each of with is a value between 0 - 255") + "@brief Get color of an entry's box\n\n" + "@param id ID number of entry to query\n\n" + "@return ColorI in the format of \"Red Green Blue Alpha\", each of with is a value between 0 - 255") { ColorI color; object->getColoredBox(color, id); - return color; + return color; } DefineConsoleMethod( GuiPopUpMenuCtrlEx, setEnumContent, void, ( const char * className, const char * enumName ), , - "@brief This fills the popup with a classrep's field enumeration type info.\n\n" + "@brief This fills the popup with a classrep's field enumeration type info.\n\n" "More of a helper function than anything. If console access to the field list is added, " "at least for the enumerated types, then this should go away.\n\n" - "@param class Name of the class containing the enum\n" - "@param enum Name of the enum value to acces\n") + "@param class Name of the class containing the enum\n" + "@param enum Name of the enum value to acces\n") { AbstractClassRep * classRep = AbstractClassRep::getClassList(); @@ -630,24 +630,24 @@ DefineConsoleMethod( GuiPopUpMenuCtrlEx, setEnumContent, void, ( const char * cl //------------------------------------------------------------------------------ DefineConsoleMethod( GuiPopUpMenuCtrlEx, findText, S32, (const char * text), , "(string text)" "Returns the id of the first entry containing the specified text or -1 if not found." - "@param text String value used for the query\n\n" - "@return Numerical ID of entry containing the text.") + "@param text String value used for the query\n\n" + "@return Numerical ID of entry containing the text.") { return( object->findText( text ) ); } //------------------------------------------------------------------------------ DefineConsoleMethod( GuiPopUpMenuCtrlEx, size, S32, (), , - "@brief Get the size of the menu\n\n" - "@return Number of entries in the menu\n") + "@brief Get the size of the menu\n\n" + "@return Number of entries in the menu\n") { return( object->getNumEntries() ); } //------------------------------------------------------------------------------ DefineConsoleMethod( GuiPopUpMenuCtrlEx, replaceText, void, (S32 boolVal), , - "@brief Flag that causes each new text addition to replace the current entry\n\n" - "@param True to turn on replacing, false to disable it") + "@brief Flag that causes each new text addition to replace the current entry\n\n" + "@param True to turn on replacing, false to disable it") { object->replaceText(boolVal); } @@ -697,43 +697,43 @@ void GuiPopUpMenuCtrlEx::clear() setText(""); mSelIndex = -1; mRevNum = 0; - mIdMax = -1; + mIdMax = -1; } //------------------------------------------------------------------------------ void GuiPopUpMenuCtrlEx::clearEntry( S32 entry ) { - if( entry == -1 ) - return; + if( entry == -1 ) + return; - U32 i = 0; - for ( ; i < mEntries.size(); i++ ) + U32 i = 0; + for ( ; i < mEntries.size(); i++ ) { if ( mEntries[i].id == entry ) break; } - mEntries.erase( i ); + mEntries.erase( i ); - if( mEntries.size() <= 0 ) - { - mEntries.setSize(0); - setText(""); - mSelIndex = -1; - mRevNum = 0; - } - else - { - if( entry == mSelIndex ) - { - setText(""); - mSelIndex = -1; - } - else - { - mSelIndex--; - } - } + if( mEntries.size() <= 0 ) + { + mEntries.setSize(0); + setText(""); + mSelIndex = -1; + mRevNum = 0; + } + else + { + if( entry == mSelIndex ) + { + setText(""); + mSelIndex = -1; + } + else + { + mSelIndex--; + } + } } //------------------------------------------------------------------------------ @@ -797,9 +797,9 @@ void GuiPopUpMenuCtrlEx::sort() if( size > 0 ) dQsort( mEntries.address(), size, sizeof(Entry), textCompare); - // Entries need to re-Id themselves - for( U32 i = 0; i < mEntries.size(); i++ ) - mEntries[i].id = i; + // Entries need to re-Id themselves + for( U32 i = 0; i < mEntries.size(); i++ ) + mEntries[i].id = i; } // Added to sort by entry ID @@ -810,9 +810,9 @@ void GuiPopUpMenuCtrlEx::sortID() if( size > 0 ) dQsort( mEntries.address(), size, sizeof(Entry), idCompare); - // Entries need to re-Id themselves - for( U32 i = 0; i < mEntries.size(); i++ ) - mEntries[i].id = i; + // Entries need to re-Id themselves + for( U32 i = 0; i < mEntries.size(); i++ ) + mEntries[i].id = i; } //------------------------------------------------------------------------------ @@ -823,21 +823,21 @@ void GuiPopUpMenuCtrlEx::addEntry(const char *buf, S32 id, U32 scheme) //Con::printf( "GuiPopupMenuCtrlEx::addEntry - Invalid buffer!" ); return; } - - // Ensure that there are no other entries with exactly the same name - for ( U32 i = 0; i < mEntries.size(); i++ ) + + // Ensure that there are no other entries with exactly the same name + for ( U32 i = 0; i < mEntries.size(); i++ ) { if ( dStrcmp( mEntries[i].buf, buf ) == 0 ) return; } - // If we don't give an id, create one from mIdMax - if( id == -1 ) - id = mIdMax + 1; - - // Increase mIdMax when an id is greater than it - if( id > mIdMax ) - mIdMax = id; + // If we don't give an id, create one from mIdMax + if( id == -1 ) + id = mIdMax + 1; + + // Increase mIdMax when an id is greater than it + if( id > mIdMax ) + mIdMax = id; Entry e; dStrcpy( e.buf, buf ); @@ -992,20 +992,20 @@ void GuiPopUpMenuCtrlEx::setFirstSelected( bool bNotifyScript ) if ( isMethod( "onSelect" ) ) Con::executef( this, "onSelect", idval, mEntries[mSelIndex].buf ); - // Execute the popup console command: - if ( bNotifyScript ) - execConsoleCallback(); + // Execute the popup console command: + if ( bNotifyScript ) + execConsoleCallback(); } - else - { - if ( mReplaceText ) // Only change the displayed text if appropriate. - setText(""); - - mSelIndex = -1; + else + { + if ( mReplaceText ) // Only change the displayed text if appropriate. + setText(""); + + mSelIndex = -1; - if ( bNotifyScript ) - Con::executef( this, "onCancel" ); - } + if ( bNotifyScript ) + Con::executef( this, "onCancel" ); + } } //------------------------------------------------------------------------------ @@ -1500,11 +1500,11 @@ void GuiPopUpMenuCtrlEx::onAction() if ( setScroll ) { // Resize the text list - Point2I cellSize; - mTl->getCellSize( cellSize ); - cellSize.x = width - mSc->scrollBarThickness() - sbBorder; - mTl->setCellSize( cellSize ); - mTl->setWidth( cellSize.x ); + Point2I cellSize; + mTl->getCellSize( cellSize ); + cellSize.x = width - mSc->scrollBarThickness() - sbBorder; + mTl->setCellSize( cellSize ); + mTl->setWidth( cellSize.x ); if ( mSelIndex ) mTl->scrollCellVisible( Point2I( 0, mSelIndex ) ); @@ -1536,7 +1536,7 @@ void GuiPopUpMenuCtrlEx::addChildren() else { // Use the children's profile rather than the parent's profile, if it exists. - mSc->setControlProfile( mProfile->getChildrenProfile() ? mProfile->getChildrenProfile() : mProfile ); + mSc->setControlProfile( mProfile->getChildrenProfile() ? mProfile->getChildrenProfile() : mProfile ); } mSc->setField( "hScrollBar", "AlwaysOff" ); mSc->setField( "vScrollBar", "dynamic" ); diff --git a/Engine/source/gui/controls/guiTextCtrl.cpp b/Engine/source/gui/controls/guiTextCtrl.cpp index e1079d8e0..8759e3973 100644 --- a/Engine/source/gui/controls/guiTextCtrl.cpp +++ b/Engine/source/gui/controls/guiTextCtrl.cpp @@ -37,13 +37,13 @@ ConsoleDocClass( GuiTextCtrl, "@brief GUI control object this displays a single line of text, without TorqueML.\n\n" "@tsexample\n" - " new GuiTextCtrl()\n" - " {\n" - " text = \"Hello World\";\n" - " textID = \"\"STR_HELLO\"\";\n" - " maxlength = \"1024\";\n" - " //Properties not specific to this control have been omitted from this example.\n" - " };\n" + " new GuiTextCtrl()\n" + " {\n" + " text = \"Hello World\";\n" + " textID = \"\"STR_HELLO\"\";\n" + " maxlength = \"1024\";\n" + " //Properties not specific to this control have been omitted from this example.\n" + " };\n" "@endtsexample\n\n" "@see GuiControl\n" @@ -54,8 +54,8 @@ ConsoleDocClass( GuiTextCtrl, GuiTextCtrl::GuiTextCtrl() { //default fonts - mInitialText = StringTable->insert(""); - mInitialTextID = StringTable->insert(""); + mInitialText = StringTable->EmptyString(); + mInitialTextID = StringTable->EmptyString(); mText[0] = '\0'; mMaxStrLen = GuiTextCtrl::MAX_STRING_LENGTH; } @@ -84,7 +84,7 @@ DefineEngineMethod( GuiTextCtrl, setTextID, void, (const char* textID),, "@see GuiControl" "@see Localization") { - object->setTextID( textID ); + object->setTextID( textID ); } void GuiTextCtrl::initPersistFields() @@ -117,7 +117,7 @@ void GuiTextCtrl::inspectPostApply() { Parent::inspectPostApply(); if(mInitialTextID && *mInitialTextID != 0) - setTextID(mInitialTextID); + setTextID(mInitialTextID); else if( mConsoleVariable[ 0 ] ) setText( getVariable() ); else @@ -135,7 +135,7 @@ bool GuiTextCtrl::onWake() return false; } if(mInitialTextID && *mInitialTextID != 0) - setTextID(mInitialTextID); + setTextID(mInitialTextID); if ( mConsoleVariable[0] ) { @@ -202,19 +202,19 @@ void GuiTextCtrl::setText(const char *txt) void GuiTextCtrl::setTextID(const char *id) { - S32 n = Con::getIntVariable(id, -1); - if(n != -1) - { - mInitialTextID = StringTable->insert(id); - setTextID(n); - } + S32 n = Con::getIntVariable(id, -1); + if(n != -1) + { + mInitialTextID = StringTable->insert(id); + setTextID(n); + } } void GuiTextCtrl::setTextID(S32 id) { - const UTF8 *str = getGUIString(id); - if(str) - setText((const char*)str); - //mInitialTextID = id; + const UTF8 *str = getGUIString(id); + if(str) + setText((const char*)str); + //mInitialTextID = id; } void GuiTextCtrl::onPreRender() diff --git a/Engine/source/gui/controls/guiTextEditCtrl.cpp b/Engine/source/gui/controls/guiTextEditCtrl.cpp index 99a1342c0..968fe17a6 100644 --- a/Engine/source/gui/controls/guiTextEditCtrl.cpp +++ b/Engine/source/gui/controls/guiTextEditCtrl.cpp @@ -46,17 +46,17 @@ ConsoleDocClass( GuiTextEditCtrl, "@tsexample\n" " new GuiTextEditCtrl(MessageHud_Edit)\n" - " {\n" - " text = \"Hello World\";\n" - " validate = \"validateCommand();\"\n" - " escapeCommand = \"escapeCommand();\";\n" - " historySize = \"5\";\n" - " tabComplete = \"true\";\n" - " deniedSound = \"DeniedSoundProfile\";\n" - " sinkAllKeyEvents = \"true\";\n" - " password = \"true\";\n" - " passwordMask = \"*\";\n" - " //Properties not specific to this control have been omitted from this example.\n" + " {\n" + " text = \"Hello World\";\n" + " validate = \"validateCommand();\"\n" + " escapeCommand = \"escapeCommand();\";\n" + " historySize = \"5\";\n" + " tabComplete = \"true\";\n" + " deniedSound = \"DeniedSoundProfile\";\n" + " sinkAllKeyEvents = \"true\";\n" + " password = \"true\";\n" + " passwordMask = \"*\";\n" + " //Properties not specific to this control have been omitted from this example.\n" " };\n" "@endtsexample\n\n" @@ -72,9 +72,9 @@ IMPLEMENT_CALLBACK( GuiTextEditCtrl, onTabComplete, void, (const char* val),( va "@tsexample\n" "// Tab key has been pressed, causing the callback to occur.\n" "GuiTextEditCtrl::onTabComplete(%this,%val)\n" - " {\n" - " //Code to run when the onTabComplete callback occurs\n" - " }\n" + " {\n" + " //Code to run when the onTabComplete callback occurs\n" + " }\n" "@endtsexample\n\n" "@see GuiTextCtrl\n" "@see GuiControl\n\n" @@ -85,9 +85,9 @@ IMPLEMENT_CALLBACK( GuiTextEditCtrl, onReturn, void, (),(), "@tsexample\n" "// Return or Enter key was pressed, causing the callback to occur.\n" "GuiTextEditCtrl::onReturn(%this)\n" - " {\n" - " // Code to run when the onReturn callback occurs\n" - " }\n" + " {\n" + " // Code to run when the onReturn callback occurs\n" + " }\n" "@endtsexample\n\n" "@see GuiTextCtrl\n" "@see GuiControl\n\n" @@ -98,9 +98,9 @@ IMPLEMENT_CALLBACK( GuiTextEditCtrl, onValidate, void, (),(), "@tsexample\n" "// The control gets validated, causing the callback to occur\n" "GuiTextEditCtrl::onValidated(%this)\n" - " {\n" - " // Code to run when the control is validated\n" - " }\n" + " {\n" + " // Code to run when the control is validated\n" + " }\n" "@endtsexample\n\n" "@see GuiTextCtrl\n" "@see GuiControl\n\n" @@ -139,7 +139,7 @@ GuiTextEditCtrl::GuiTextEditCtrl() mHistoryBuf = NULL; #if defined(__MACOSX__) - UTF8 bullet[4] = { 0xE2, 0x80, 0xA2, 0 }; + UTF8 bullet[4] = { 0xE2, 0x80, 0xA2, 0 }; mPasswordMask = StringTable->insert( bullet ); #else @@ -710,10 +710,10 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event) case KEY_TAB: if ( mTabComplete ) { - onTabComplete_callback("1"); + onTabComplete_callback("1"); return true; } - break; // We don't want to fall through if we don't handle the TAB here. + break; // We don't want to fall through if we don't handle the TAB here. case KEY_HOME: mBlockStart = 0; @@ -779,10 +779,10 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event) } return true; - case KEY_RETURN: - case KEY_NUMPADENTER: + case KEY_RETURN: + case KEY_NUMPADENTER: - return dealWithEnter(false); + return dealWithEnter(false); default: break; @@ -998,7 +998,7 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event) case KEY_RETURN: case KEY_NUMPADENTER: - return dealWithEnter(true); + return dealWithEnter(true); case KEY_UP: { @@ -1155,7 +1155,7 @@ dealWithBackspace: case KEY_TAB: if ( mTabComplete ) { - onTabComplete_callback("0"); + onTabComplete_callback("0"); return( true ); } case KEY_UP: @@ -1208,9 +1208,9 @@ bool GuiTextEditCtrl::dealWithEnter( bool clearResponder ) return true; } } - - if( clearResponder ) - clearFirstResponder(); + + if( clearResponder ) + clearFirstResponder(); return true; } @@ -1222,13 +1222,13 @@ void GuiTextEditCtrl::setFirstResponder() GuiCanvas *root = getRoot(); if (root != NULL) { - root->enableKeyboardTranslation(); + root->enableKeyboardTranslation(); - // If the native OS accelerator keys are not disabled - // then some key events like Delete, ctrl+V, etc may - // not make it down to us. - root->setNativeAcceleratorsEnabled( false ); + // If the native OS accelerator keys are not disabled + // then some key events like Delete, ctrl+V, etc may + // not make it down to us. + root->setNativeAcceleratorsEnabled( false ); } } @@ -1237,8 +1237,8 @@ void GuiTextEditCtrl::onLoseFirstResponder() GuiCanvas *root = getRoot(); if( root ) { - root->setNativeAcceleratorsEnabled( true ); - root->disableKeyboardTranslation(); + root->setNativeAcceleratorsEnabled( true ); + root->disableKeyboardTranslation(); } //execute the validate command @@ -1546,29 +1546,29 @@ void GuiTextEditCtrl::handleCharInput( U16 ascii ) //see if it's a number field if ( mProfile->mNumbersOnly ) { - if (ascii == '-') - { - //a minus sign only exists at the beginning, and only a single minus sign - if (mCursorPos != 0 && !isAllTextSelected()) - { - invalidText(); - return; - } + if (ascii == '-') + { + //a minus sign only exists at the beginning, and only a single minus sign + if (mCursorPos != 0 && !isAllTextSelected()) + { + invalidText(); + return; + } - if (mInsertOn && (mTextBuffer.getChar(0) == '-')) - { - invalidText(); - return; - } - } - // BJTODO: This is probably not unicode safe. - else if (ascii != '.' && (ascii < '0' || ascii > '9')) - { - invalidText(); - return; - } - else - validText(); + if (mInsertOn && (mTextBuffer.getChar(0) == '-')) + { + invalidText(); + return; + } + } + // BJTODO: This is probably not unicode safe. + else if (ascii != '.' && (ascii < '0' || ascii > '9')) + { + invalidText(); + return; + } + else + validText(); } //save the current state @@ -1684,7 +1684,7 @@ DefineEngineMethod( GuiTextEditCtrl, getText, const char*, (),, "@see GuiControl") { if( !object->hasText() ) - return StringTable->insert(""); + return StringTable->EmptyString(); char *retBuffer = Con::getReturnBuffer( GuiTextEditCtrl::MAX_STRING_LENGTH ); object->getText( retBuffer ); @@ -1778,22 +1778,22 @@ DefineEngineMethod( GuiTextEditCtrl, forceValidateText, void, (),, } DefineEngineMethod(GuiTextEditCtrl, invalidText, void, (bool playSound), (true), - "@brief Trigger the invalid sound and make the box red.nn" - "@param playSound Play the invalid text sound or not.n") + "@brief Trigger the invalid sound and make the box red.nn" + "@param playSound Play the invalid text sound or not.n") { - object->invalidText(playSound); + object->invalidText(playSound); } DefineEngineMethod(GuiTextEditCtrl, validText, void, (), , - "@brief Restores the box to normal color.nn") + "@brief Restores the box to normal color.nn") { - object->validText(); + object->validText(); } DefineEngineMethod(GuiTextEditCtrl, isValidText, bool, (), , - "@brief Returns if the text is set to valid or not.n" - "@Return true if text is set to valid, false if not.nn") + "@brief Returns if the text is set to valid or not.n" + "@Return true if text is set to valid, false if not.nn") { - return object->isValidText(); + return object->isValidText(); } diff --git a/Engine/source/gui/controls/guiTreeViewCtrl.cpp b/Engine/source/gui/controls/guiTreeViewCtrl.cpp index c98fc90aa..e4fb9ab00 100644 --- a/Engine/source/gui/controls/guiTreeViewCtrl.cpp +++ b/Engine/source/gui/controls/guiTreeViewCtrl.cpp @@ -43,9 +43,9 @@ IMPLEMENT_CONOBJECT(GuiTreeViewCtrl); ConsoleDocClass( GuiTreeViewCtrl, - "@brief Hierarchical list of text items with optional icons.\n\n" + "@brief Hierarchical list of text items with optional icons.\n\n" - "Can also be used to inspect SimObject hierarchies, primarily within editors.\n\n" + "Can also be used to inspect SimObject hierarchies, primarily within editors.\n\n" "GuiTreeViewCtrls can either display arbitrary user-defined trees or can be used to display SimObject hierarchies where " "each parent node in the tree is a SimSet or SimGroup and each leaf node is a SimObject.\n\n" @@ -59,30 +59,30 @@ ConsoleDocClass( GuiTreeViewCtrl, "Each item in the tree has a distinct numeric ID that is unique within its tree. The ID of the root item, which is always " "present on a tree, is 0.\n\n" - "@tsexample\n" - "new GuiTreeViewCtrl(DatablockEditorTree)\n" - "{\n" - " tabSize = \"16\";\n" - " textOffset = \"2\";\n" - " fullRowSelect = \"0\";\n" - " itemHeight = \"21\";\n" - " destroyTreeOnSleep = \"0\";\n" - " MouseDragging = \"0\";\n" - " MultipleSelections = \"1\";\n" - " DeleteObjectAllowed = \"1\";\n" - " DragToItemAllowed = \"0\";\n" - " ClearAllOnSingleSelection = \"1\";\n" - " showRoot = \"1\";\n" - " internalNamesOnly = \"0\";\n" - " objectNamesOnly = \"0\";\n" - " compareToObjectID = \"0\";\n" - " Profile = \"GuiTreeViewProfile\";\n" - " tooltipprofile = \"GuiToolTipProfile\";\n" - " hovertime = \"1000\";\n" - "};\n" - "@endtsexample\n\n" + "@tsexample\n" + "new GuiTreeViewCtrl(DatablockEditorTree)\n" + "{\n" + " tabSize = \"16\";\n" + " textOffset = \"2\";\n" + " fullRowSelect = \"0\";\n" + " itemHeight = \"21\";\n" + " destroyTreeOnSleep = \"0\";\n" + " MouseDragging = \"0\";\n" + " MultipleSelections = \"1\";\n" + " DeleteObjectAllowed = \"1\";\n" + " DragToItemAllowed = \"0\";\n" + " ClearAllOnSingleSelection = \"1\";\n" + " showRoot = \"1\";\n" + " internalNamesOnly = \"0\";\n" + " objectNamesOnly = \"0\";\n" + " compareToObjectID = \"0\";\n" + " Profile = \"GuiTreeViewProfile\";\n" + " tooltipprofile = \"GuiToolTipProfile\";\n" + " hovertime = \"1000\";\n" + "};\n" + "@endtsexample\n\n" - "@ingroup GuiContainers\n"); + "@ingroup GuiContainers\n"); IMPLEMENT_CALLBACK( GuiTreeViewCtrl, onDeleteObject, bool, ( SimObject* object ), ( object ), "" ); IMPLEMENT_CALLBACK( GuiTreeViewCtrl, isValidDragTarget, bool, ( S32 id, const char* value ), ( id, value ), "" ); @@ -511,7 +511,7 @@ void GuiTreeViewCtrl::Item::getDisplayText(U32 bufLen, char *buf) if( showInternalNameOnly() ) dSprintf( buf, bufLen, "%s", hasInternalName ? pInternalName : "(none)" ); - else if( showObjectNameOnly() ) + else if( showObjectNameOnly() ) { if( !hasObjectName && mState.test( ShowClassNameForUnnamed ) ) dSprintf( buf, bufLen, "%s", pClassName ); @@ -801,7 +801,7 @@ GuiTreeViewCtrl::GuiTreeViewCtrl() mStart = 0; mPossibleRenameItem = NULL; mRenamingItem = NULL; - mTempItem = NULL; + mTempItem = NULL; mRenameCtrl = NULL; mDraggedToItem = 0; @@ -845,7 +845,7 @@ GuiTreeViewCtrl::GuiTreeViewCtrl() mClearAllOnSingleSelection = true; - mBitmapBase = StringTable->insert(""); + mBitmapBase = StringTable->EmptyString(); mTexRollover = NULL; mTexSelected = NULL; @@ -1902,7 +1902,7 @@ void GuiTreeViewCtrl::onPreRender() if(mFlags.test(RebuildVisible)) { buildVisibleTree(); - mFlags.clear(RebuildVisible); + mFlags.clear(RebuildVisible); } } @@ -2084,39 +2084,39 @@ void GuiTreeViewCtrl::syncSelection() } else if (mVisibleItems[i]->isInspectorData()) { - if(mCompareToObjectID) - { - if (mVisibleItems[i]->getObject() && mVisibleItems[i]->getObject()->getId() == mSelected[j]) - { - // check to see if it is on the visible items list. - bool addToSelectedItems = true; - for (S32 k = 0; k < mSelectedItems.size(); k++) - { - if (mSelectedItems[k]->isInspectorData() && mSelectedItems[k]->getObject() ) - { - if (mSelected[j] == mSelectedItems[k]->getObject()->getId()) - { - // don't add it - addToSelectedItems = false; - } - } - else - { - if (mSelected[j] == mSelectedItems[k]->mId) - { - // don't add it - addToSelectedItems = false; - } - } - } - if (addToSelectedItems) - { - mVisibleItems[i]->mState.set(Item::Selected, true); - mSelectedItems.push_front(mVisibleItems[i]); - break; - } - } - } + if(mCompareToObjectID) + { + if (mVisibleItems[i]->getObject() && mVisibleItems[i]->getObject()->getId() == mSelected[j]) + { + // check to see if it is on the visible items list. + bool addToSelectedItems = true; + for (S32 k = 0; k < mSelectedItems.size(); k++) + { + if (mSelectedItems[k]->isInspectorData() && mSelectedItems[k]->getObject() ) + { + if (mSelected[j] == mSelectedItems[k]->getObject()->getId()) + { + // don't add it + addToSelectedItems = false; + } + } + else + { + if (mSelected[j] == mSelectedItems[k]->mId) + { + // don't add it + addToSelectedItems = false; + } + } + } + if (addToSelectedItems) + { + mVisibleItems[i]->mState.set(Item::Selected, true); + mSelectedItems.push_front(mVisibleItems[i]); + break; + } + } + } } } @@ -2200,14 +2200,14 @@ void GuiTreeViewCtrl::addSelection( S32 itemOrObjectId, bool update, bool isLast } const S32 itemId = item->getID(); - - // Ok, we have an item to select which isn't already selected.... + + // Ok, we have an item to select which isn't already selected.... // Do we want to allow more than one selected item? if( !mMultipleSelections ) clearSelection(); - // Add this object id to the vector of selected objectIds + // Add this object id to the vector of selected objectIds // if it is not already. bool foundMatch = false; for ( S32 i = 0; i < mSelected.size(); i++) @@ -2228,21 +2228,21 @@ void GuiTreeViewCtrl::addSelection( S32 itemOrObjectId, bool update, bool isLast // Callback Start // Set and add the selection to the selected items group - item->mState.set(Item::Selected, true); - mSelectedItems.push_front(item); + item->mState.set(Item::Selected, true); + mSelectedItems.push_front(item); if ( item->isInspectorData() && item->getObject() ) { SimObject *obj = item->getObject(); - + onAddSelection_callback( obj->getId(), isLastSelection ); } else { onAddSelection_callback( item->mId, isLastSelection ); } - // Callback end + // Callback end mFlags.set( RebuildVisible ); if( update ) @@ -2262,7 +2262,7 @@ void GuiTreeViewCtrl::onItemSelected( Item *item ) if (item->isInspectorData()) { SimObject* object = item->getObject(); - if( object ) + if( object ) onSelect_callback( object->getId() ); if( !item->isParent() && object ) onInspect_callback( object->getId() ); @@ -2590,9 +2590,9 @@ void GuiTreeViewCtrl::deleteSelection() } else { - Vector delSelection; - delSelection = mSelectedItems; - mSelectedItems.clear(); + Vector delSelection; + delSelection = mSelectedItems; + mSelectedItems.clear(); while (!delSelection.empty()) { Item * item = delSelection.front(); @@ -2600,7 +2600,7 @@ void GuiTreeViewCtrl::deleteSelection() if ( item->mParent ) _deleteItem( item ); - delSelection.pop_front(); + delSelection.pop_front(); } } @@ -2642,7 +2642,7 @@ bool GuiTreeViewCtrl::onKeyDown( const GuiEvent& event ) return true; } - //call a generic bit of script that will let the subclass know that a key was pressed + //call a generic bit of script that will let the subclass know that a key was pressed onKeyDown_callback( event.modifier, event.keyCode ); } @@ -3028,29 +3028,29 @@ void GuiTreeViewCtrl::onMouseUp(const GuiEvent &event) return; } - BitSet32 hitFlags = 0; + BitSet32 hitFlags = 0; Item *item; - bool hitCheck = _hitTest( event.mousePoint, item, hitFlags ); + bool hitCheck = _hitTest( event.mousePoint, item, hitFlags ); mRenamingItem = NULL; - if( hitCheck ) - { - if ( event.mouseClickCount == 1 && !mMouseDragged && mPossibleRenameItem != NULL ) - { - if ( item == mPossibleRenameItem ) + if( hitCheck ) + { + if ( event.mouseClickCount == 1 && !mMouseDragged && mPossibleRenameItem != NULL ) + { + if ( item == mPossibleRenameItem ) showItemRenameCtrl( item ); - } - else // If mouseUp occurs on the same item as mouse down - { - bool wasSelected = isSelected( item ); - bool multiSelect = getSelectedItemsCount() > 1; - if( wasSelected && multiSelect && item == mTempItem ) - { - clearSelection(); - addSelection( item->mId ); - } - } - } + } + else // If mouseUp occurs on the same item as mouse down + { + bool wasSelected = isSelected( item ); + bool multiSelect = getSelectedItemsCount() > 1; + if( wasSelected && multiSelect && item == mTempItem ) + { + clearSelection(); + addSelection( item->mId ); + } + } + } mPossibleRenameItem = NULL; @@ -3482,7 +3482,7 @@ void GuiTreeViewCtrl::onMouseDragged(const GuiEvent &event) if( mDragStartInSelection ) onMouseDragged_callback(); - if(!mSupportMouseDragging) + if(!mSupportMouseDragging) return; if( !mActive || !mAwake || !mVisible ) @@ -3652,7 +3652,7 @@ void GuiTreeViewCtrl::onMouseDown(const GuiEvent & event) mPossibleRenameItem = NULL; mRenamingItem = NULL; - mTempItem = NULL; + mTempItem = NULL; // if( event.modifier & SI_MULTISELECT ) @@ -3704,10 +3704,10 @@ void GuiTreeViewCtrl::onMouseDown(const GuiEvent & event) //select up for (S32 j = (mCurrentDragCell); j < firstSelectedIndex; j++) { - if( j != (firstSelectedIndex - 1) ) - addSelection(mVisibleItems[j]->mId, false, false); - else - addSelection(mVisibleItems[j]->mId, false); + if( j != (firstSelectedIndex - 1) ) + addSelection(mVisibleItems[j]->mId, false, false); + else + addSelection(mVisibleItems[j]->mId, false); } } else @@ -3715,10 +3715,10 @@ void GuiTreeViewCtrl::onMouseDown(const GuiEvent & event) // select down for (S32 j = firstSelectedIndex+1; j < (mCurrentDragCell+1); j++) { - if( j != mCurrentDragCell ) - addSelection(mVisibleItems[j]->mId, false, false); - else - addSelection(mVisibleItems[j]->mId, false); + if( j != mCurrentDragCell ) + addSelection(mVisibleItems[j]->mId, false, false); + else + addSelection(mVisibleItems[j]->mId, false); } } @@ -3736,39 +3736,39 @@ void GuiTreeViewCtrl::onMouseDown(const GuiEvent & event) } else if ( !hitFlags.test(OnImage) ) { - mTempItem = item; + mTempItem = item; bool wasSelected = isSelected( item ); bool multiSelect = getSelectedItemsCount() > 1; - - if( !wasSelected || !multiSelect ) - { - if ( mClearAllOnSingleSelection ) - clearSelection(); + + if( !wasSelected || !multiSelect ) + { + if ( mClearAllOnSingleSelection ) + clearSelection(); - if ( !wasSelected || mClearAllOnSingleSelection ) - addSelection( item->mId ); + if ( !wasSelected || mClearAllOnSingleSelection ) + addSelection( item->mId ); - if ( wasSelected && - !multiSelect && - mCanRenameObjects && - hitFlags.test(OnText) && - mFlags.test(IsEditable) && - item->isInspectorData() && - item->getObject() && + if ( wasSelected && + !multiSelect && + mCanRenameObjects && + hitFlags.test(OnText) && + mFlags.test(IsEditable) && + item->isInspectorData() && + item->getObject() && item->getObject()->isNameChangeAllowed() && - item != mRoot && - event.mouseClickCount == 1 ) - { - mPossibleRenameItem = item; + item != mRoot && + event.mouseClickCount == 1 ) + { + mPossibleRenameItem = item; - if ( isMethod( "canRenameObject" ) ) - { - if( canRenameObject_callback( item->getObject() ) ) - mPossibleRenameItem = NULL; - } - } - } + if ( isMethod( "canRenameObject" ) ) + { + if( canRenameObject_callback( item->getObject() ) ) + mPossibleRenameItem = NULL; + } + } + } } @@ -4221,7 +4221,7 @@ void GuiTreeViewCtrl::onRenderCell(Point2I offset, Point2I cell, bool, bool ) if( item->mState.test(Item::MouseOverText) ) { - fontColor = mProfile->mFontColorHL; + fontColor = mProfile->mFontColorHL; } drawer->setBitmapModulation( fontColor ); @@ -4551,9 +4551,9 @@ void GuiTreeViewCtrl::inspectorSearch(Item * item, Item * parent, SimSet * paren bool GuiTreeViewCtrl::objectSearch( const SimObject *object, Item **item ) { - for ( U32 i = 0; i < mItems.size(); i++ ) - { - Item *pItem = mItems[i]; + for ( U32 i = 0; i < mItems.size(); i++ ) + { + Item *pItem = mItems[i]; if ( !pItem ) continue; @@ -4565,16 +4565,16 @@ bool GuiTreeViewCtrl::objectSearch( const SimObject *object, Item **item ) continue; #endif - SimObject *pObj = pItem->getObject(); + SimObject *pObj = pItem->getObject(); - if ( pObj && pObj == object ) - { - *item = pItem; - return true; - } - } + if ( pObj && pObj == object ) + { + *item = pItem; + return true; + } + } - return false; + return false; } //----------------------------------------------------------------------------- @@ -4592,7 +4592,7 @@ bool GuiTreeViewCtrl::onVirtualParentBuild(Item *item, bool bForceFullUpdate) } // Skip the next stuff unless we're expanded... - if(!item->isExpanded() && !bForceFullUpdate && !( item == mRoot && !mShowRoot ) ) + if(!item->isExpanded() && !bForceFullUpdate && !( item == mRoot && !mShowRoot ) ) return true; // Verify that we have all the kids we should in here... @@ -4704,8 +4704,8 @@ S32 GuiTreeViewCtrl::findItemByName(const char *name) { if ( !mItems[i] ) continue; - if( mItems[i]->mState.test( Item::InspectorData ) ) - continue; + if( mItems[i]->mState.test( Item::InspectorData ) ) + continue; if (mItems[i] && dStrcmp(mItems[i]->getText(),name) == 0) return mItems[i]->mId; } @@ -4721,10 +4721,10 @@ S32 GuiTreeViewCtrl::findItemByValue(const char *name) { if (!mItems[i]) continue; - if( mItems[i]->mState.test( Item::InspectorData ) ) - continue; - if (mItems[i] && dStrcmp(mItems[i]->getValue(),name) == 0) - return mItems[i]->mId; + if( mItems[i]->mState.test( Item::InspectorData ) ) + continue; + if (mItems[i] && dStrcmp(mItems[i]->getValue(),name) == 0) + return mItems[i]->mId; } return 0; @@ -4746,13 +4746,13 @@ StringTableEntry GuiTreeViewCtrl::getTextToRoot( S32 itemId, const char * delimi if(!item) { Con::errorf(ConsoleLogEntry::General, "GuiTreeViewCtrl::getTextToRoot: invalid start item id!"); - return StringTable->insert(""); + return StringTable->EmptyString(); } if(item->isInspectorData()) { Con::errorf(ConsoleLogEntry::General, "GuiTreeViewCtrl::getTextToRoot: cannot get text to root of inspector data items"); - return StringTable->insert(""); + return StringTable->EmptyString(); } char bufferOne[1024]; @@ -4874,7 +4874,7 @@ DefineEngineMethod( GuiTreeViewCtrl, insertItem, S32, ( S32 parentId, const char DefineEngineMethod( GuiTreeViewCtrl, insertObject, S32, ( S32 parentId, SimObject* obj, bool OKToEdit ), (false), "Inserts object as a child to the given parent." ) { - return object->insertObject(parentId, obj, OKToEdit); + return object->insertObject(parentId, obj, OKToEdit); } //----------------------------------------------------------------------------- @@ -4967,10 +4967,10 @@ DefineEngineMethod( GuiTreeViewCtrl, removeChildSelectionByValue, void, ( S32 pa if(parentItem) { GuiTreeViewCtrl::Item* child = parentItem->findChildByValue(value); - if(child) - { + if(child) + { object->removeSelection(child->getID()); - } + } } } @@ -5038,7 +5038,7 @@ DefineEngineMethod( GuiTreeViewCtrl, open, void, ( const char * objName, bool ok DefineEngineMethod( GuiTreeViewCtrl, setItemTooltip, bool, ( S32 itemId, const char* tooltip), , "Set the tooltip to show for the given item.\n\n" "@param itemId TreeItemID of item to set the tooltip for.\n" - "@param tooltip String tooltip to set for the item." + "@param tooltip String tooltip to set for the item." "@return True if successfully found the item, false if not") { GuiTreeViewCtrl::Item* item = object->getItem( itemId ); @@ -5228,11 +5228,11 @@ const char* GuiTreeViewCtrl::getSelectedObjectList() { S32 id = item->getObject()->getId(); //get the current length of the buffer - U32 len = dStrlen(buff); + U32 len = dStrlen(buff); //the start of the buffer where we want to write char* buffPart = buff+len; //the size of the remaining buffer (-1 cause dStrlen doesn't count the \0) - S32 size = bufSize-len-1; + S32 size = bufSize-len-1; //write it: if(size < 1) { @@ -5283,7 +5283,7 @@ DefineEngineMethod( GuiTreeViewCtrl, getTextToRoot, const char*, (S32 itemId, co "@param delimiter (Optional) delimiter to use between each branch concatenation." "@return text from the current node to the root.") { - if (!dStrcmp(delimiter, "" )) + if (!dStrcmp(delimiter, "" )) { Con::warnf("GuiTreeViewCtrl::getTextToRoot - Invalid number of arguments!"); return (""); @@ -5296,31 +5296,31 @@ DefineEngineMethod( GuiTreeViewCtrl, getSelectedItemList, const char*, (), , "@return space separated list of selected item ids.") { const U32 bufSize = 1024; - char* buff = Con::getReturnBuffer(bufSize); - dSprintf(buff, bufSize, ""); + char* buff = Con::getReturnBuffer(bufSize); + dSprintf(buff, bufSize, ""); const Vector< S32 >& selected = object->getSelected(); - for(int i = 0; i < selected.size(); i++) - { - S32 id = selected[i]; - //get the current length of the buffer - U32 len = dStrlen(buff); - //the start of the buffer where we want to write - char* buffPart = buff+len; - //the size of the remaining buffer (-1 cause dStrlen doesn't count the \0) - S32 size = bufSize-len-1; - //write it: - if(size < 1) - { - Con::errorf("GuiTreeViewCtrl::getSelectedItemList - Not enough room to return our object list"); - return buff; - } + for(int i = 0; i < selected.size(); i++) + { + S32 id = selected[i]; + //get the current length of the buffer + U32 len = dStrlen(buff); + //the start of the buffer where we want to write + char* buffPart = buff+len; + //the size of the remaining buffer (-1 cause dStrlen doesn't count the \0) + S32 size = bufSize-len-1; + //write it: + if(size < 1) + { + Con::errorf("GuiTreeViewCtrl::getSelectedItemList - Not enough room to return our object list"); + return buff; + } - dSprintf(buffPart,size,"%d ", id); - } + dSprintf(buffPart,size,"%d ", id); + } //mSelected - return buff; + return buff; } S32 GuiTreeViewCtrl::findItemByObjectId(S32 iObjId) @@ -5331,8 +5331,8 @@ S32 GuiTreeViewCtrl::findItemByObjectId(S32 iObjId) continue; SimObject* pObj = mItems[i]->getObject(); - if( pObj && pObj->getId() == iObjId ) - return mItems[i]->mId; + if( pObj && pObj->getId() == iObjId ) + return mItems[i]->mId; } return -1; @@ -5341,7 +5341,7 @@ S32 GuiTreeViewCtrl::findItemByObjectId(S32 iObjId) //------------------------------------------------------------------------------ DefineEngineMethod( GuiTreeViewCtrl, findItemByObjectId, S32, (S32 objectId), , "Find an item by its object id and returns the Tree Item ID for it.\n\n" - "@param objectId Object id you want the item id for." + "@param objectId Object id you want the item id for." "@return Tree Item Id for the given object ID.") { return(object->findItemByObjectId(objectId)); @@ -5389,7 +5389,7 @@ bool GuiTreeViewCtrl::scrollVisibleByObjectId(S32 objID) //------------------------------------------------------------------------------ DefineEngineMethod( GuiTreeViewCtrl, scrollVisibleByObjectId, S32, (S32 objectId), , "Show item by object id.\n\n" - "@param objectId Object id you want to scroll to." + "@param objectId Object id you want to scroll to." "@return True if successful, false if not.") { return(object->scrollVisibleByObjectId(objectId)); @@ -5400,7 +5400,7 @@ DefineEngineMethod( GuiTreeViewCtrl, scrollVisibleByObjectId, S32, (S32 objectId //FIXME: this clashes with SimSet.sort() DefineEngineMethod( GuiTreeViewCtrl, sort, void, (S32 parentId, bool traverseHierarchy, bool parentsFirst, bool caseSensitive), (0, false, false, true), "Sorts all items of the given parent (or root). With 'hierarchy', traverses hierarchy." - "@param parentId TreeItemID of parent/root to sort all the items under. Use 0 to sort the entire tree." + "@param parentId TreeItemID of parent/root to sort all the items under. Use 0 to sort the entire tree." "@param traverseHierarchy True to traverse the hierarchy, false to not." "@param parentsFirst True to sort the parents first." "@param caseSensitive True to pay attention to case, false to ignore it.") @@ -5531,7 +5531,7 @@ DefineEngineMethod( GuiTreeViewCtrl, isItemSelected, bool, ( S32 id ),, "@return True if the given item/object is currently selected in the tree." ) { const Vector< GuiTreeViewCtrl::Item* >& selectedItems = object->getSelectedItems(); - for( S32 i = 0; i < selectedItems.size(); ++ i ) + for( S32 i = 0; i < selectedItems.size(); ++ i ) if( selectedItems[ i ]->mId == id ) return true; diff --git a/Engine/source/gui/core/guiCanvas.cpp b/Engine/source/gui/core/guiCanvas.cpp index a3f2344f2..0c91ec54f 100644 --- a/Engine/source/gui/core/guiCanvas.cpp +++ b/Engine/source/gui/core/guiCanvas.cpp @@ -52,42 +52,42 @@ IMPLEMENT_CONOBJECT(GuiCanvas); ConsoleDocClass( GuiCanvas, - "@brief A canvas on which rendering occurs.\n\n" + "@brief A canvas on which rendering occurs.\n\n" - "@section GuiCanvas_contents What a GUICanvas Can Contain...\n\n" + "@section GuiCanvas_contents What a GUICanvas Can Contain...\n\n" - "@subsection GuiCanvas_content_contentcontrol Content Control\n" - "A content control is the top level GuiControl for a screen. This GuiControl " - "will be the parent control for all other GuiControls on that particular " - "screen.\n\n" + "@subsection GuiCanvas_content_contentcontrol Content Control\n" + "A content control is the top level GuiControl for a screen. This GuiControl " + "will be the parent control for all other GuiControls on that particular " + "screen.\n\n" - "@subsection GuiCanvas_content_dialogs Dialogs\n\n" + "@subsection GuiCanvas_content_dialogs Dialogs\n\n" - "A dialog is essentially another screen, only it gets overlaid on top of the " - "current content control, and all input goes to the dialog. This is most akin " - "to the \"Open File\" dialog box found in most operating systems. When you " - "choose to open a file, and the \"Open File\" dialog pops up, you can no longer " - "send input to the application, and must complete or cancel the open file " - "request. Torque keeps track of layers of dialogs. The dialog with the highest " - "layer is on top and will get all the input, unless the dialog is " - "modeless, which is a profile option.\n\n" + "A dialog is essentially another screen, only it gets overlaid on top of the " + "current content control, and all input goes to the dialog. This is most akin " + "to the \"Open File\" dialog box found in most operating systems. When you " + "choose to open a file, and the \"Open File\" dialog pops up, you can no longer " + "send input to the application, and must complete or cancel the open file " + "request. Torque keeps track of layers of dialogs. The dialog with the highest " + "layer is on top and will get all the input, unless the dialog is " + "modeless, which is a profile option.\n\n" - "@see GuiControlProfile\n\n" + "@see GuiControlProfile\n\n" - "@section GuiCanvas_dirty Dirty Rectangles\n\n" + "@section GuiCanvas_dirty Dirty Rectangles\n\n" - "The GuiCanvas is based on dirty regions. " - "Every frame the canvas paints only the areas of the canvas that are 'dirty' " - "or need updating. In most cases, this only is the area under the mouse cursor. " - "This is why if you look in guiCanvas.cc the call to glClear is commented out. " - - "What you will see is a black screen, except in the dirty regions, where the " - "screen will be painted normally. If you are making an animated GuiControl " - "you need to add your control to the dirty areas of the canvas.\n\n" + "The GuiCanvas is based on dirty regions. " + "Every frame the canvas paints only the areas of the canvas that are 'dirty' " + "or need updating. In most cases, this only is the area under the mouse cursor. " + "This is why if you look in guiCanvas.cc the call to glClear is commented out. " + + "What you will see is a black screen, except in the dirty regions, where the " + "screen will be painted normally. If you are making an animated GuiControl " + "you need to add your control to the dirty areas of the canvas.\n\n" - "@see GuiControl\n\n" + "@see GuiControl\n\n" - "@ingroup GuiCore\n"); + "@ingroup GuiCore\n"); ColorI gCanvasClearColor( 255, 0, 255 ); ///< For GFX->clear @@ -209,29 +209,29 @@ bool GuiCanvas::onAdd() //If we're recording, store the intial video resolution if (Journal::IsRecording()) { - Journal::Write(vm.resolution.x); - Journal::Write(vm.resolution.y); - Journal::Write(vm.fullScreen); + Journal::Write(vm.resolution.x); + Journal::Write(vm.resolution.y); + Journal::Write(vm.fullScreen); } //If we're playing, read the intial video resolution from the journal if (Journal::IsPlaying()) { - Journal::Read(&vm.resolution.x); - Journal::Read(&vm.resolution.y); - Journal::Read(&vm.fullScreen); + Journal::Read(&vm.resolution.x); + Journal::Read(&vm.resolution.y); + Journal::Read(&vm.fullScreen); } if (a && a->mType != NullDevice) { mPlatformWindow = WindowManager->createWindow(newDevice, vm); - //Disable window resizing if recording ir playing a journal - if (Journal::IsRecording() || Journal::IsPlaying()) - mPlatformWindow->lockSize(true); - - // Set a minimum on the window size so people can't break us by resizing tiny. - mPlatformWindow->setMinimumWindowSize(Point2I(640,480)); + //Disable window resizing if recording ir playing a journal + if (Journal::IsRecording() || Journal::IsPlaying()) + mPlatformWindow->lockSize(true); + + // Set a minimum on the window size so people can't break us by resizing tiny. + mPlatformWindow->setMinimumWindowSize(Point2I(640,480)); // Now, we have to hook in our event callbacks so we'll get // appropriate events from the window. @@ -326,12 +326,12 @@ CanvasSizeChangeSignal GuiCanvas::smCanvasSizeChangeSignal; void GuiCanvas::handleResize( WindowId did, S32 width, S32 height ) { getCanvasSizeChangeSignal().trigger(this); - if (Journal::IsPlaying() && mPlatformWindow) - { - mPlatformWindow->lockSize(false); - mPlatformWindow->setSize(Point2I(width, height)); - mPlatformWindow->lockSize(true); - } + if (Journal::IsPlaying() && mPlatformWindow) + { + mPlatformWindow->lockSize(false); + mPlatformWindow->setSize(Point2I(width, height)); + mPlatformWindow->lockSize(true); + } // Notify the scripts if ( isMethod( "onResize" ) ) @@ -342,9 +342,9 @@ void GuiCanvas::handlePaintEvent(WindowId did) { bool canRender = mPlatformWindow->isVisible() && GFX->allowRender() && !GFX->canCurrentlyRender(); - // Do the screenshot first. + // Do the screenshot first. if ( gScreenShot != NULL && gScreenShot->isPending() && canRender ) - gScreenShot->capture( this ); + gScreenShot->capture( this ); // If the video capture is waiting for a canvas, start the capture if ( VIDCAP->isWaitingForCanvas() && canRender ) @@ -560,19 +560,19 @@ bool GuiCanvas::tabNext(void) //save the old GuiControl *oldResponder = mFirstResponder; - GuiControl* newResponder = ctrl->findNextTabable(mFirstResponder); + GuiControl* newResponder = ctrl->findNextTabable(mFirstResponder); if ( !newResponder ) newResponder = ctrl->findFirstTabable(); - if ( newResponder && newResponder != oldResponder ) - { - newResponder->setFirstResponder(); + if ( newResponder && newResponder != oldResponder ) + { + newResponder->setFirstResponder(); // CodeReview Can this get killed? Note tabPrev code. BJG - 3/25/07 -// if ( oldResponder ) -// oldResponder->onLoseFirstResponder(); +// if ( oldResponder ) +// oldResponder->onLoseFirstResponder(); return true; - } + } } return false; } @@ -585,30 +585,30 @@ bool GuiCanvas::tabPrev(void) //save the old GuiControl *oldResponder = mFirstResponder; - GuiControl* newResponder = ctrl->findPrevTabable(mFirstResponder); - if ( !newResponder ) + GuiControl* newResponder = ctrl->findPrevTabable(mFirstResponder); + if ( !newResponder ) newResponder = ctrl->findLastTabable(); - if ( newResponder && newResponder != oldResponder ) - { - newResponder->setFirstResponder(); - + if ( newResponder && newResponder != oldResponder ) + { + newResponder->setFirstResponder(); + // CodeReview As with tabNext() above, looks like this can now go. DAW - 7/05/09 - //if ( oldResponder ) - // oldResponder->onLoseFirstResponder(); + //if ( oldResponder ) + // oldResponder->onLoseFirstResponder(); return true; - } + } } return false; } bool GuiCanvas::processInputEvent(InputEventInfo &inputEvent) { - // First call the general input handler (on the extremely off-chance that it will be handled): - if (mFirstResponder && mFirstResponder->onInputEvent(inputEvent)) + // First call the general input handler (on the extremely off-chance that it will be handled): + if (mFirstResponder && mFirstResponder->onInputEvent(inputEvent)) { - return(true); + return(true); } switch (inputEvent.deviceType) @@ -1786,9 +1786,9 @@ void GuiCanvas::renderFrame(bool preRenderOnly, bool bufferSwap /* = true */) addUpdateRegion(pos - Point2I(2, 2), Point2I(cext.x + 4, cext.y + 4)); } - mLastCursorEnabled = cursorVisible; - mLastCursor = mouseCursor; - mLastCursorPt = cursorPos; + mLastCursorEnabled = cursorVisible; + mLastCursor = mouseCursor; + mLastCursorPt = cursorPos; // Begin GFX PROFILE_START(GFXBeginScene); @@ -1830,7 +1830,7 @@ void GuiCanvas::renderFrame(bool preRenderOnly, bool bufferSwap /* = true */) resetUpdateRegions(); - // Make sure we have a clean matrix state + // Make sure we have a clean matrix state // before we start rendering anything! GFX->setWorldMatrix( MatrixF::Identity ); GFX->setViewMatrix( MatrixF::Identity ); @@ -2039,46 +2039,46 @@ void GuiCanvas::resetUpdateRegions() void GuiCanvas::setFirstResponder( GuiControl* newResponder ) { - GuiControl* oldResponder = mFirstResponder; - Parent::setFirstResponder( newResponder ); + GuiControl* oldResponder = mFirstResponder; + Parent::setFirstResponder( newResponder ); if( oldResponder == mFirstResponder ) return; - if( oldResponder && ( oldResponder != newResponder ) ) - oldResponder->onLoseFirstResponder(); + if( oldResponder && ( oldResponder != newResponder ) ) + oldResponder->onLoseFirstResponder(); if( newResponder && ( newResponder != oldResponder ) ) newResponder->onGainFirstResponder(); } DefineEngineMethod( GuiCanvas, getContent, S32, (),, - "@brief Get the GuiControl which is being used as the content.\n\n" + "@brief Get the GuiControl which is being used as the content.\n\n" - "@tsexample\n" - "Canvas.getContent();\n" - "@endtsexample\n\n" + "@tsexample\n" + "Canvas.getContent();\n" + "@endtsexample\n\n" - "@return ID of current content control") + "@return ID of current content control") { - GuiControl *ctrl = object->getContentControl(); + GuiControl *ctrl = object->getContentControl(); if(ctrl) return ctrl->getId(); return -1; } DefineEngineMethod( GuiCanvas, setContent, void, (GuiControl* ctrl),, - "@brief Set the content of the canvas to a specified control.\n\n" + "@brief Set the content of the canvas to a specified control.\n\n" - "@param ctrl ID or name of GuiControl to set content to\n\n" + "@param ctrl ID or name of GuiControl to set content to\n\n" - "@tsexample\n" - "Canvas.setContent(PlayGui);\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.setContent(PlayGui);\n" + "@endtsexample\n\n") { - // Not using old error reporting until we modify the engineAPI - mperry + // Not using old error reporting until we modify the engineAPI - mperry - //GuiControl *gui = NULL; + //GuiControl *gui = NULL; // if(argv[2][0]) // { // if (!Sim::findObject(argv[2], gui)) @@ -2088,11 +2088,11 @@ DefineEngineMethod( GuiCanvas, setContent, void, (GuiControl* ctrl),, // } // } - if(!ctrl) - { - Con::errorf("GuiCanvas::setContent - Invalid control specified')"); - return; - } + if(!ctrl) + { + Con::errorf("GuiCanvas::setContent - Invalid control specified')"); + return; + } //set the new content control object->setContentControl(ctrl); @@ -2111,11 +2111,11 @@ ConsoleDocFragment _pushDialog( ); DefineConsoleMethod( GuiCanvas, pushDialog, void, (const char * ctrlName, S32 layer, bool center), ( 0, false), "(GuiControl ctrl, int layer=0, bool center=false)" - "@hide") + "@hide") { GuiControl *gui; - if (! Sim::findObject(ctrlName, gui)) + if (! Sim::findObject(ctrlName, gui)) { Con::printf("pushDialog(): Invalid control: %s", ctrlName); return; @@ -2147,8 +2147,8 @@ ConsoleDocFragment _popDialog2( "void popDialog();" ); -DefineConsoleMethod( GuiCanvas, popDialog, void, (GuiControl * gui), (NULL), "(GuiControl ctrl=NULL)" - "@hide") +DefineConsoleMethod( GuiCanvas, popDialog, void, (GuiControl * gui), (nullAsType()), "(GuiControl ctrl=NULL)" + "@hide") { if (gui) object->popDialogControl(gui); @@ -2157,160 +2157,160 @@ DefineConsoleMethod( GuiCanvas, popDialog, void, (GuiControl * gui), (NULL), "(G } ConsoleDocFragment _popLayer1( - "@brief Removes the top most layer of dialogs\n\n" - "@tsexample\n" - "Canvas.popLayer();\n" - "@endtsexample\n\n", - "GuiCanvas", - "void popLayer();" + "@brief Removes the top most layer of dialogs\n\n" + "@tsexample\n" + "Canvas.popLayer();\n" + "@endtsexample\n\n", + "GuiCanvas", + "void popLayer();" ); ConsoleDocFragment _popLayer2( - "@brief Removes a specified layer of dialogs\n\n" - "@param layer Number of the layer to pop\n\n" - "@tsexample\n" - "Canvas.popLayer(1);\n" - "@endtsexample\n\n", - "GuiCanvas", - "void popLayer(S32 layer);" + "@brief Removes a specified layer of dialogs\n\n" + "@param layer Number of the layer to pop\n\n" + "@tsexample\n" + "Canvas.popLayer(1);\n" + "@endtsexample\n\n", + "GuiCanvas", + "void popLayer(S32 layer);" ); DefineConsoleMethod( GuiCanvas, popLayer, void, (S32 layer), (0), "(int layer)" - "@hide") + "@hide") { object->popDialogControl(layer); } DefineEngineMethod( GuiCanvas, cursorOn, void, (),, - "@brief Turns on the mouse cursor.\n\n" - "@tsexample\n" - "Canvas.cursorOn();\n" - "@endtsexample\n\n") + "@brief Turns on the mouse cursor.\n\n" + "@tsexample\n" + "Canvas.cursorOn();\n" + "@endtsexample\n\n") { - object->setCursorON(true); + object->setCursorON(true); } DefineEngineMethod( GuiCanvas, cursorOff, void, (),, - "@brief Turns on the mouse off.\n\n" - "@tsexample\n" - "Canvas.cursorOff();\n" - "@endtsexample\n\n") + "@brief Turns on the mouse off.\n\n" + "@tsexample\n" + "Canvas.cursorOff();\n" + "@endtsexample\n\n") { - object->setCursorON(false); + object->setCursorON(false); } DefineEngineMethod( GuiCanvas, setCursor, void, (GuiCursor* cursor),, - "@brief Sets the cursor for the canvas.\n\n" + "@brief Sets the cursor for the canvas.\n\n" - "@param cursor Name of the GuiCursor to use\n\n" + "@param cursor Name of the GuiCursor to use\n\n" - "@tsexample\n" - "Canvas.setCursor(\"DefaultCursor\");\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.setCursor(\"DefaultCursor\");\n" + "@endtsexample\n\n") { - if(!cursor) - { - Con::errorf("GuiCanvas::setCursor - Invalid GuiCursor name or ID"); - return; - } - object->setCursor(cursor); + if(!cursor) + { + Con::errorf("GuiCanvas::setCursor - Invalid GuiCursor name or ID"); + return; + } + object->setCursor(cursor); } DefineEngineMethod( GuiCanvas, renderFront, void, ( bool enable ),, - "@brief This turns on/off front-buffer rendering.\n\n" + "@brief This turns on/off front-buffer rendering.\n\n" - "@param enable True if all rendering should be done to the front buffer\n\n" + "@param enable True if all rendering should be done to the front buffer\n\n" - "@tsexample\n" - "Canvas.renderFront(false);\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.renderFront(false);\n" + "@endtsexample\n\n") { - object->setRenderFront(enable); + object->setRenderFront(enable); } DefineEngineMethod( GuiCanvas, showCursor, void, (),, - "@brief Enable rendering of the cursor.\n\n" + "@brief Enable rendering of the cursor.\n\n" - "@tsexample\n" - "Canvas.showCursor();\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.showCursor();\n" + "@endtsexample\n\n") { - object->showCursor(true); + object->showCursor(true); } DefineEngineMethod( GuiCanvas, hideCursor, void, (),, - "@brief Disable rendering of the cursor.\n\n" + "@brief Disable rendering of the cursor.\n\n" - "@tsexample\n" - "Canvas.hideCursor();\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.hideCursor();\n" + "@endtsexample\n\n") { - object->showCursor(false); + object->showCursor(false); } DefineEngineMethod( GuiCanvas, isCursorOn, bool, (),, - "@brief Determines if mouse cursor is enabled.\n\n" + "@brief Determines if mouse cursor is enabled.\n\n" - "@tsexample\n" - "// Is cursor on?\n" - "if(Canvas.isCursorOn())\n" - " echo(\"Canvas cursor is on\");\n" - "@endtsexample\n\n" - "@return Returns true if the cursor is on.\n\n") + "@tsexample\n" + "// Is cursor on?\n" + "if(Canvas.isCursorOn())\n" + " echo(\"Canvas cursor is on\");\n" + "@endtsexample\n\n" + "@return Returns true if the cursor is on.\n\n") { - return object->isCursorON(); + return object->isCursorON(); } DefineEngineMethod( GuiCanvas, isCursorShown, bool, (),, - "@brief Determines if mouse cursor is rendering.\n\n" + "@brief Determines if mouse cursor is rendering.\n\n" - "@tsexample\n" - "// Is cursor rendering?\n" - "if(Canvas.isCursorShown())\n" - " echo(\"Canvas cursor is rendering\");\n" - "@endtsexample\n\n" - "@return Returns true if the cursor is rendering.\n\n") + "@tsexample\n" + "// Is cursor rendering?\n" + "if(Canvas.isCursorShown())\n" + " echo(\"Canvas cursor is rendering\");\n" + "@endtsexample\n\n" + "@return Returns true if the cursor is rendering.\n\n") { - return object->isCursorShown(); + return object->isCursorShown(); } DefineEngineMethod( GuiCanvas, repaint, void, ( S32 elapsedMS ), (0), - "@brief Force canvas to redraw.\n" + "@brief Force canvas to redraw.\n" "If the elapsed time is greater than the time since the last paint " "then the repaint will be skipped.\n" "@param elapsedMS The optional elapsed time in milliseconds.\n\n" - "@tsexample\n" - "Canvas.repaint();\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.repaint();\n" + "@endtsexample\n\n") { - object->repaint(elapsedMS < 0 ? 0 : elapsedMS); + object->repaint(elapsedMS < 0 ? 0 : elapsedMS); } DefineEngineMethod( GuiCanvas, reset, void, (),, - "@brief Reset the update regions for the canvas.\n\n" + "@brief Reset the update regions for the canvas.\n\n" - "@tsexample\n" - "Canvas.reset();\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.reset();\n" + "@endtsexample\n\n") { - object->resetUpdateRegions(); + object->resetUpdateRegions(); } DefineEngineMethod( GuiCanvas, getCursorPos, Point2I, (),, - "@brief Get the current position of the cursor in screen-space. Note that this position" + "@brief Get the current position of the cursor in screen-space. Note that this position" " might be outside the Torque window. If you want to get the position within the Canvas," " call screenToClient on the result.\n\n" "@see Canvas::screenToClient()\n\n" - "@param param Description\n\n" - "@tsexample\n" - "%cursorPos = Canvas.getCursorPos();\n" - "@endtsexample\n\n" - "@return Screen coordinates of mouse cursor, in format \"X Y\"") + "@param param Description\n\n" + "@tsexample\n" + "%cursorPos = Canvas.getCursorPos();\n" + "@endtsexample\n\n" + "@return Screen coordinates of mouse cursor, in format \"X Y\"") { - return object->getCursorPos(); + return object->getCursorPos(); } ConsoleDocFragment _setCursorPos1( @@ -2334,21 +2334,21 @@ ConsoleDocFragment _setCursorPos2( ); DefineConsoleMethod( GuiCanvas, setCursorPos, void, (Point2I pos), , "(Point2I pos)" - "@hide") + "@hide") { object->setCursorPos(pos); } DefineEngineMethod( GuiCanvas, getMouseControl, S32, (),, - "@brief Gets the gui control under the mouse.\n\n" - "@tsexample\n" - "%underMouse = Canvas.getMouseControl();\n" - "@endtsexample\n\n" + "@brief Gets the gui control under the mouse.\n\n" + "@tsexample\n" + "%underMouse = Canvas.getMouseControl();\n" + "@endtsexample\n\n" - "@return ID of the gui control, if one was found. NULL otherwise") + "@return ID of the gui control, if one was found. NULL otherwise") { - GuiControl* control = object->getMouseControl(); + GuiControl* control = object->getMouseControl(); if (control) return control->getId(); @@ -2356,18 +2356,18 @@ DefineEngineMethod( GuiCanvas, getMouseControl, S32, (),, } DefineEngineFunction(excludeOtherInstance, bool, (const char* appIdentifer),, - "@brief Used to exclude/prevent all other instances using the same identifier specified\n\n" + "@brief Used to exclude/prevent all other instances using the same identifier specified\n\n" - "@note Not used on OSX, Xbox, or in Win debug builds\n\n" + "@note Not used on OSX, Xbox, or in Win debug builds\n\n" - "@param appIdentifier Name of the app set up for exclusive use.\n" + "@param appIdentifier Name of the app set up for exclusive use.\n" - "@return False if another app is running that specified the same appIdentifier\n\n" + "@return False if another app is running that specified the same appIdentifier\n\n" - "@ingroup Platform\n" - "@ingroup GuiCore") + "@ingroup Platform\n" + "@ingroup GuiCore") { - // mac/360 can only run one instance in general. + // mac/360 can only run one instance in general. #if !defined(TORQUE_OS_MAC) && !defined(TORQUE_OS_XENON) && !defined(TORQUE_DEBUG) && !defined(TORQUE_OS_LINUX) return Platform::excludeOtherInstances(appIdentifer); #else @@ -2377,82 +2377,82 @@ DefineEngineFunction(excludeOtherInstance, bool, (const char* appIdentifer),, } DefineEngineMethod( GuiCanvas, getExtent, Point2I, (),, - "@brief Returns the dimensions of the canvas\n\n" + "@brief Returns the dimensions of the canvas\n\n" - "@tsexample\n" - "%extent = Canvas.getExtent();\n" - "@endtsexample\n\n" + "@tsexample\n" + "%extent = Canvas.getExtent();\n" + "@endtsexample\n\n" - "@return Width and height of canvas. Formatted as numerical values in a single string \"# #\"") + "@return Width and height of canvas. Formatted as numerical values in a single string \"# #\"") { - return object->getExtent(); + return object->getExtent(); } DefineEngineMethod( GuiCanvas, setWindowTitle, void, ( const char* newTitle),, - "@brief Change the title of the OS window.\n\n" + "@brief Change the title of the OS window.\n\n" - "@param newTitle String containing the new name\n\n" + "@param newTitle String containing the new name\n\n" - "@tsexample\n" - "Canvas.setWindowTitle(\"Documentation Rocks!\");\n" - "@endtsexample\n\n") + "@tsexample\n" + "Canvas.setWindowTitle(\"Documentation Rocks!\");\n" + "@endtsexample\n\n") { - object->setWindowTitle(newTitle); + object->setWindowTitle(newTitle); } DefineEngineMethod( GuiCanvas, findFirstMatchingMonitor, S32, (const char* name),, - "@brief Find the first monitor index that matches the given name.\n\n" + "@brief Find the first monitor index that matches the given name.\n\n" "The actual match algorithm depends on the implementation.\n" "@param name The name to search for.\n\n" - "@return The number of monitors attached to the system, including the default monoitor.") + "@return The number of monitors attached to the system, including the default monoitor.") { return PlatformWindowManager::get()->findFirstMatchingMonitor(name); } DefineEngineMethod( GuiCanvas, getMonitorCount, S32, (),, - "@brief Gets the number of monitors attached to the system.\n\n" + "@brief Gets the number of monitors attached to the system.\n\n" - "@return The number of monitors attached to the system, including the default monoitor.") + "@return The number of monitors attached to the system, including the default monoitor.") { return PlatformWindowManager::get()->getMonitorCount(); } DefineEngineMethod( GuiCanvas, getMonitorName, const char*, (S32 index),, - "@brief Gets the name of the requested monitor.\n\n" + "@brief Gets the name of the requested monitor.\n\n" "@param index The monitor index.\n\n" - "@return The name of the requested monitor.") + "@return The name of the requested monitor.") { return PlatformWindowManager::get()->getMonitorName(index); } DefineEngineMethod( GuiCanvas, getMonitorRect, RectI, (S32 index),, - "@brief Gets the region of the requested monitor.\n\n" + "@brief Gets the region of the requested monitor.\n\n" "@param index The monitor index.\n\n" - "@return The rectangular region of the requested monitor.") + "@return The rectangular region of the requested monitor.") { return PlatformWindowManager::get()->getMonitorRect(index); } DefineEngineMethod( GuiCanvas, getVideoMode, const char*, (),, - "@brief Gets the current screen mode as a string.\n\n" + "@brief Gets the current screen mode as a string.\n\n" - "The return string will contain 5 values (width, height, fullscreen, bitdepth, refreshRate). " - "You will need to parse out each one for individual use.\n\n" + "The return string will contain 5 values (width, height, fullscreen, bitdepth, refreshRate). " + "You will need to parse out each one for individual use.\n\n" - "@tsexample\n" - "%screenWidth = getWord(Canvas.getVideoMode(), 0);\n" - "%screenHeight = getWord(Canvas.getVideoMode(), 1);\n" - "%isFullscreen = getWord(Canvas.getVideoMode(), 2);\n" - "%bitdepth = getWord(Canvas.getVideoMode(), 3);\n" - "%refreshRate = getWord(Canvas.getVideoMode(), 4);\n" - "@endtsexample\n\n" + "@tsexample\n" + "%screenWidth = getWord(Canvas.getVideoMode(), 0);\n" + "%screenHeight = getWord(Canvas.getVideoMode(), 1);\n" + "%isFullscreen = getWord(Canvas.getVideoMode(), 2);\n" + "%bitdepth = getWord(Canvas.getVideoMode(), 3);\n" + "%refreshRate = getWord(Canvas.getVideoMode(), 4);\n" + "@endtsexample\n\n" - "@return String formatted with screen width, screen height, screen mode, bit depth, and refresh rate.") + "@return String formatted with screen width, screen height, screen mode, bit depth, and refresh rate.") { - // Grab the video mode. + // Grab the video mode. if (!object->getPlatformWindow()) return ""; @@ -2463,17 +2463,17 @@ DefineEngineMethod( GuiCanvas, getVideoMode, const char*, (),, DefineEngineMethod( GuiCanvas, getModeCount, S32, (),, - "@brief Gets the number of modes available on this device.\n\n" + "@brief Gets the number of modes available on this device.\n\n" - "@param param Description\n\n" + "@param param Description\n\n" - "@tsexample\n" - "%modeCount = Canvas.getModeCount()\n" - "@endtsexample\n\n" + "@tsexample\n" + "%modeCount = Canvas.getModeCount()\n" + "@endtsexample\n\n" - "@return The number of video modes supported by the device") + "@return The number of video modes supported by the device") { - if (!object->getPlatformWindow()) + if (!object->getPlatformWindow()) return 0; // Grab the available mode list from the device. @@ -2485,12 +2485,12 @@ DefineEngineMethod( GuiCanvas, getModeCount, S32, (),, } DefineEngineMethod( GuiCanvas, getMode, const char*, (S32 modeId),, - "@brief Gets information on the specified mode of this device.\n\n" - "@param modeId Index of the mode to get data from.\n" - "@return A video mode string given an adapter and mode index.\n\n" - "@see GuiCanvas::getVideoMode()") + "@brief Gets information on the specified mode of this device.\n\n" + "@param modeId Index of the mode to get data from.\n" + "@return A video mode string given an adapter and mode index.\n\n" + "@see GuiCanvas::getVideoMode()") { - if (!object->getPlatformWindow()) + if (!object->getPlatformWindow()) return 0; // Grab the available mode list from the device. @@ -2515,14 +2515,14 @@ DefineEngineMethod( GuiCanvas, getMode, const char*, (S32 modeId),, DefineEngineMethod( GuiCanvas, toggleFullscreen, void, (),, - "@brief toggle canvas from fullscreen to windowed mode or back.\n\n" + "@brief toggle canvas from fullscreen to windowed mode or back.\n\n" - "@tsexample\n" - "// If we are in windowed mode, the following will put is in fullscreen\n" - "Canvas.toggleFullscreen();" - "@endtsexample\n\n") + "@tsexample\n" + "// If we are in windowed mode, the following will put is in fullscreen\n" + "Canvas.toggleFullscreen();" + "@endtsexample\n\n") { - if (Platform::getWebDeployment()) + if (Platform::getWebDeployment()) return; if (!object->getPlatformWindow()) @@ -2693,7 +2693,7 @@ DefineConsoleMethod( GuiCanvas, setVideoMode, void, "\\param fullscreen Specify true to run fullscreen or false to run in a window\n" "\\param bitDepth [optional] The desired bit-depth. Defaults to the current setting. This parameter is ignored if you are running in a window.\n" "\\param refreshRate [optional] The desired refresh rate. Defaults to the current setting. This parameter is ignored if you are running in a window" - "\\param antialiasLevel [optional] The level of anti-aliasing to apply 0 = none" ) + "\\param antialiasLevel [optional] The level of anti-aliasing to apply 0 = none" ) { if (!object->getPlatformWindow()) return; diff --git a/Engine/source/gui/core/guiOffscreenCanvas.cpp b/Engine/source/gui/core/guiOffscreenCanvas.cpp index fc23c1369..e974873fd 100644 --- a/Engine/source/gui/core/guiOffscreenCanvas.cpp +++ b/Engine/source/gui/core/guiOffscreenCanvas.cpp @@ -18,6 +18,7 @@ GuiOffscreenCanvas::GuiOffscreenCanvas() mTargetName = "offscreenCanvas"; mTargetDirty = true; mDynamicTarget = false; + mUseDepth = false; } GuiOffscreenCanvas::~GuiOffscreenCanvas() @@ -30,6 +31,7 @@ void GuiOffscreenCanvas::initPersistFields() addField( "targetFormat", TypeGFXFormat, Offset( mTargetFormat, GuiOffscreenCanvas ), ""); addField( "targetName", TypeRealString, Offset( mTargetName, GuiOffscreenCanvas ), ""); addField( "dynamicTarget", TypeBool, Offset( mDynamicTarget, GuiOffscreenCanvas ), ""); + addField( "useDepth", TypeBool, Offset( mUseDepth, GuiOffscreenCanvas ), ""); Parent::initPersistFields(); } @@ -70,6 +72,7 @@ void GuiOffscreenCanvas::onRemove() mTarget = NULL; mTargetTexture = NULL; + mTargetDepth = NULL; Parent::onRemove(); } @@ -89,6 +92,13 @@ void GuiOffscreenCanvas::_setupTargets() mTargetTexture.set( mTargetSize.x, mTargetSize.y, mTargetFormat, &GFXDefaultRenderTargetProfile, avar( "%s() - (line %d)", __FUNCTION__, __LINE__ ), 1, 0 ); } + // Update depth if needed + if (mUseDepth && (!mTargetDepth.isValid() || mTargetSize != mTargetDepth.getWidthHeight())) + { + mTargetDepth.set( mTargetSize.x, mTargetSize.y, GFXFormatD24S8, &GFXDefaultZTargetProfile, avar( "%s() - (line %d)", __FUNCTION__, __LINE__ ), 1, 0 ); + mTarget->attachTexture( GFXTextureTarget::RenderSlot(GFXTextureTarget::DepthStencil), mTargetDepth ); + } + mTarget->attachTexture( GFXTextureTarget::RenderSlot(GFXTextureTarget::Color0), mTargetTexture ); mNamedTarget.setTexture(0, mTargetTexture); } @@ -97,6 +107,7 @@ void GuiOffscreenCanvas::_teardownTargets() { mNamedTarget.release(); mTargetTexture = NULL; + mTargetDepth = NULL; mTargetDirty = true; } diff --git a/Engine/source/gui/core/guiOffscreenCanvas.h b/Engine/source/gui/core/guiOffscreenCanvas.h index 9807f56a7..77c388a9e 100644 --- a/Engine/source/gui/core/guiOffscreenCanvas.h +++ b/Engine/source/gui/core/guiOffscreenCanvas.h @@ -56,6 +56,9 @@ protected: bool mTargetDirty; bool mDynamicTarget; + + bool mUseDepth; + GFXTexHandle mTargetDepth; public: static Vector sList; diff --git a/Engine/source/gui/editor/guiEditCtrl.cpp b/Engine/source/gui/editor/guiEditCtrl.cpp index f972ec8ca..aa002f05d 100644 --- a/Engine/source/gui/editor/guiEditCtrl.cpp +++ b/Engine/source/gui/editor/guiEditCtrl.cpp @@ -716,16 +716,16 @@ void GuiEditCtrl::onRender(Point2I offset, const RectI &updateRect) ctOffset = getCurrentAddSet()->localToGlobalCoord(Point2I(0,0)); RectI box(ctOffset.x, ctOffset.y, cext.x, cext.y); - box.inset( -5, -5 ); + box.inset( -5, -5 ); drawer->drawRect( box, ColorI( 50, 101, 152, 128 ) ); - box.inset( 1, 1 ); + box.inset( 1, 1 ); drawer->drawRect( box, ColorI( 50, 101, 152, 128 ) ); - box.inset( 1, 1 ); + box.inset( 1, 1 ); drawer->drawRect( box, ColorI( 50, 101, 152, 128 ) ); - box.inset( 1, 1 ); + box.inset( 1, 1 ); + drawer->drawRect( box, ColorI( 50, 101, 152, 128 ) ); + box.inset( 1, 1 ); drawer->drawRect( box, ColorI( 50, 101, 152, 128 ) ); - box.inset( 1, 1 ); - drawer->drawRect( box, ColorI( 50, 101, 152, 128 ) ); } Vector::iterator i; bool multisel = mSelectedControls.size() > 1; @@ -2481,16 +2481,16 @@ DefineConsoleMethod( GuiEditCtrl, getContentControl, S32, (), , "() - Return the DefineConsoleMethod( GuiEditCtrl, setContentControl, void, (GuiControl *ctrl ), , "( GuiControl ctrl ) - Set the toplevel control to edit in the GUI editor." ) { - if (ctrl) - object->setContentControl(ctrl); + if (ctrl) + object->setContentControl(ctrl); } //----------------------------------------------------------------------------- DefineConsoleMethod( GuiEditCtrl, addNewCtrl, void, (GuiControl *ctrl), , "(GuiControl ctrl)") { - if (ctrl) - object->addNewControl(ctrl); + if (ctrl) + object->addNewControl(ctrl); } //----------------------------------------------------------------------------- @@ -2518,7 +2518,7 @@ DefineConsoleMethod( GuiEditCtrl, clearSelection, void, (), , "Clear selected co DefineConsoleMethod( GuiEditCtrl, select, void, (GuiControl *ctrl), , "(GuiControl ctrl)") { - if (ctrl) + if (ctrl) object->setSelection(ctrl, false); } @@ -2526,7 +2526,7 @@ DefineConsoleMethod( GuiEditCtrl, select, void, (GuiControl *ctrl), , "(GuiContr DefineConsoleMethod( GuiEditCtrl, setCurrentAddSet, void, (GuiControl *addSet), , "(GuiControl ctrl)") { - if (addSet) + if (addSet) object->setCurrentAddSet(addSet); } @@ -2582,7 +2582,7 @@ DefineConsoleMethod( GuiEditCtrl, moveSelection, void, (S32 dx, S32 dy), , "Move //----------------------------------------------------------------------------- -DefineConsoleMethod( GuiEditCtrl, saveSelection, void, (const char * filename), (NULL), "( string fileName=null ) - Save selection to file or clipboard.") +DefineConsoleMethod( GuiEditCtrl, saveSelection, void, (const char * filename), (nullAsType()), "( string fileName=null ) - Save selection to file or clipboard.") { object->saveSelection( filename ); @@ -2590,7 +2590,7 @@ DefineConsoleMethod( GuiEditCtrl, saveSelection, void, (const char * filename), //----------------------------------------------------------------------------- -DefineConsoleMethod( GuiEditCtrl, loadSelection, void, (const char * filename), (NULL), "( string fileName=null ) - Load selection from file or clipboard.") +DefineConsoleMethod( GuiEditCtrl, loadSelection, void, (const char * filename), (nullAsType()), "( string fileName=null ) - Load selection from file or clipboard.") { object->loadSelection( filename ); diff --git a/Engine/source/gui/editor/guiMenuBar.cpp b/Engine/source/gui/editor/guiMenuBar.cpp index 4a9a4cefa..688531a87 100644 --- a/Engine/source/gui/editor/guiMenuBar.cpp +++ b/Engine/source/gui/editor/guiMenuBar.cpp @@ -81,8 +81,8 @@ ConsoleDocClass( GuiMenuBar, "@tsexample\n" "new GuiMenuBar(newMenuBar)\n" "{\n" - " Padding = \"0\";\n" - " //Properties not specific to this control have been omitted from this example.\n" + " Padding = \"0\";\n" + " //Properties not specific to this control have been omitted from this example.\n" "};\n\n" "// Add a menu to the menu bar\n" "newMenuBar.addMenu(0,\"New Menu\");\n\n" @@ -105,7 +105,7 @@ IMPLEMENT_CALLBACK( GuiMenuBar, onMouseInMenu, void, (bool isInMenu),( isInMenu "// Mouse enters or persists within the menu, causing the callback to occur.\n" "GuiMenuBar::onMouseInMenu(%this,%hasLeftMenu)\n" "{\n" - " // Code to run when the callback occurs\n" + " // Code to run when the callback occurs\n" "}\n" "@endtsexample\n\n" "@see GuiTickCtrl\n\n" @@ -119,14 +119,14 @@ IMPLEMENT_CALLBACK( GuiMenuBar, onMenuSelect, void, ( S32 menuId, const char* me "// A menu has been selected, causing the callback to occur.\n" "GuiMenuBar::onMenuSelect(%this,%menuId,%menuText)\n" "{\n" - " // Code to run when the callback occurs\n" + " // Code to run when the callback occurs\n" "}\n" "@endtsexample\n\n" "@see GuiTickCtrl\n\n" ); IMPLEMENT_CALLBACK( GuiMenuBar, onMenuItemSelect, void, ( S32 menuId, const char* menuText, S32 menuItemId, const char* menuItemText ), - ( menuId, menuText, menuItemId, menuItemText ), + ( menuId, menuText, menuItemId, menuItemText ), "@brief Called whenever an item in a menu is selected.\n\n" "@param menuId Index id of the menu which contains the selected menu item\n" "@param menuText Text of the menu which contains the selected menu item\n\n" @@ -136,7 +136,7 @@ IMPLEMENT_CALLBACK( GuiMenuBar, onMenuItemSelect, void, ( S32 menuId, const char "// A menu item has been selected, causing the callback to occur.\n" "GuiMenuBar::onMenuItemSelect(%this,%menuId,%menuText,%menuItemId,%menuItemText)\n" "{\n" - " // Code to run when the callback occurs\n" + " // Code to run when the callback occurs\n" "}\n" "@endtsexample\n\n" "@see GuiTickCtrl\n\n" @@ -149,7 +149,7 @@ IMPLEMENT_CALLBACK( GuiMenuBar, onSubmenuSelect, void, ( S32 submenuId, const ch "@tsexample\n" "GuiMenuBar::onSubmenuSelect(%this,%submenuId,%submenuText)\n" "{\n" - " // Code to run when the callback occurs\n" + " // Code to run when the callback occurs\n" "}\n" "@endtsexample\n\n" "@see GuiTickCtrl\n\n" @@ -216,7 +216,7 @@ DefineEngineMethod(GuiMenuBar, addMenu, void, (const char* menuText, S32 menuId) } DefineEngineMethod(GuiMenuBar, addMenuItem, void, (const char* targetMenu, const char* menuItemText, S32 menuItemId, const char* accelerator, int checkGroup, const char *cmd), - ("","",0,NULL,-1,""), + ("","",0,nullAsType(),-1,""), "@brief Adds a menu item to the specified menu. The menu argument can be either the text of a menu or its id.\n\n" "@param menu Menu name or menu Id to add the new item to.\n" "@param menuItemText Text for the new menu item.\n" @@ -637,7 +637,7 @@ DefineEngineMethod(GuiMenuBar, setMenuItemSubmenuState, void, (const char* menuT } DefineEngineMethod(GuiMenuBar, addSubmenuItem, void, (const char* menuTarget, const char* menuItem, const char* submenuItemText, - int submenuItemId, const char* accelerator, int checkGroup),, + int submenuItemId, const char* accelerator, int checkGroup),, "@brief Adds a menu item to the specified menu. The menu argument can be either the text of a menu or its id.\n\n" "@param menuTarget Menu to affect a submenu in\n" "@param menuItem Menu item to affect\n" @@ -814,21 +814,21 @@ void GuiMenuBar::addMenu(const char *menuText, U32 menuId) GuiMenuBar::Menu *GuiMenuBar::findMenu(const char *menu) { - if(dIsdigit(menu[0])) - { - U32 id = dAtoi(menu); + if(dIsdigit(menu[0])) + { + U32 id = dAtoi(menu); for (U32 i = 0; i < mMenuList.size(); ++i) if (id == mMenuList[i]->id) return mMenuList[i]; - return NULL; - } - else - { + return NULL; + } + else + { for (U32 i = 0; i < mMenuList.size(); ++i) if (!dStricmp(menu, mMenuList[i]->text)) return mMenuList[i]; - return NULL; - } + return NULL; + } } GuiMenuBar::MenuItem *GuiMenuBar::findMenuItem(Menu *menu, const char *menuItem) @@ -981,13 +981,13 @@ GuiMenuBar::MenuItem *GuiMenuBar::findSubmenuItem(Menu *menu, const char *menuIt U32 id = dAtoi(menuItem); for(MenuItem *walk = menu->firstMenuItem; walk; walk = walk->nextMenuItem) if(id == walk->id) - { - if(walk->isSubmenu && walk->submenu) - { + { + if(walk->isSubmenu && walk->submenu) + { return GuiMenuBar::findMenuItem(walk->submenu, submenuItem); - } - return NULL; - } + } + return NULL; + } return NULL; } else @@ -995,13 +995,13 @@ GuiMenuBar::MenuItem *GuiMenuBar::findSubmenuItem(Menu *menu, const char *menuIt // Search by name for(MenuItem *walk = menu->firstMenuItem; walk; walk = walk->nextMenuItem) if(!dStricmp(menuItem, walk->text)) - { - if(walk->isSubmenu && walk->submenu) - { + { + if(walk->isSubmenu && walk->submenu) + { return GuiMenuBar::findMenuItem(walk->submenu, submenuItem); - } - return NULL; - } + } + return NULL; + } return NULL; } } @@ -1021,7 +1021,7 @@ void GuiMenuBar::addSubmenuItem(Menu *menu, MenuItem *submenu, const char *text, if(submenu && !submenu->isSubmenu) { Con::errorf("GuiMenuBar::addSubmenuItem: Attempting to add menuitem '%s' to an invalid submenu",text); - return; + return; } // allocate the new menu item @@ -1074,7 +1074,7 @@ void GuiMenuBar::removeSubmenuItem(MenuItem *menuItem, MenuItem *submenuItem) if(menuItem && !menuItem->isSubmenu) { Con::errorf("GuiMenuBar::removeSubmenuItem: Attempting to remove submenuitem '%s' from an invalid submenu",submenuItem->text); - return; + return; } GuiMenuBar::removeMenuItem(menuItem->submenu, submenuItem); @@ -1087,7 +1087,7 @@ void GuiMenuBar::clearSubmenuItems(MenuItem *menuitem) if(menuitem && !menuitem->isSubmenu) { Con::errorf("GuiMenuBar::clearSubmenuItems: Attempting to clear an invalid submenu"); - return; + return; } while(menuitem->submenu->firstMenuItem) @@ -1175,33 +1175,33 @@ void GuiMenuBar::onPreRender() if (!mMenuList[i]->visible) continue; - // Bounds depends on if there is a bitmap to be drawn or not + // Bounds depends on if there is a bitmap to be drawn or not if (mMenuList[i]->bitmapIndex == -1) - { + { // Text only mMenuList[i]->bounds.set(curX, 0, mProfile->mFont->getStrWidth(mMenuList[i]->text) + (mHorizontalMargin * 2), getHeight() - (mVerticalMargin * 2)); } else - { + { // Will the bitmap and text be draw? if (!mMenuList[i]->drawBitmapOnly) - { + { // Draw the bitmap and the text RectI *bitmapBounds = mProfile->mBitmapArrayRects.address(); mMenuList[i]->bounds.set(curX, 0, bitmapBounds[mMenuList[i]->bitmapIndex].extent.x + mProfile->mFont->getStrWidth(mMenuList[i]->text) + (mHorizontalMargin * 2), getHeight() + (mVerticalMargin * 2)); - } else - { + } else + { // Only the bitmap will be drawn RectI *bitmapBounds = mProfile->mBitmapArrayRects.address(); mMenuList[i]->bounds.set(curX, 0, bitmapBounds[mMenuList[i]->bitmapIndex].extent.x + mBitmapMargin + (mHorizontalMargin * 2), getHeight() + (mVerticalMargin * 2)); - } - } + } + } curX += mMenuList[i]->bounds.extent.x; } - mouseOverMenu = NULL; - mouseDownMenu = NULL; + mouseOverMenu = NULL; + mouseDownMenu = NULL; } } @@ -1222,35 +1222,35 @@ void GuiMenuBar::checkMenuMouseMove(const GuiEvent &event) void GuiMenuBar::onMouseMove(const GuiEvent &event) { Menu *hit = findHitMenu(event.mousePoint); - if(hit != mouseOverMenu) - { - // If we need to, reset the mouse over menu counter and indicate - // that we should track it. - if(hit) + if(hit != mouseOverMenu) + { + // If we need to, reset the mouse over menu counter and indicate + // that we should track it. + if(hit) mMouseOverCounter = 0; - if(!mCountMouseOver) - { + if(!mCountMouseOver) + { // We've never started the counter, so start it. if(hit) mCountMouseOver = true; - } + } - mouseOverMenu = hit; - setUpdate(); - } + mouseOverMenu = hit; + setUpdate(); + } } void GuiMenuBar::onMouseLeave(const GuiEvent &event) { if(mouseOverMenu) - setUpdate(); - mouseOverMenu = NULL; + setUpdate(); + mouseOverMenu = NULL; // As we've left the control, don't track how long the mouse has been // within it. if(mCountMouseOver && mMouseOverCounter >= mMouseHoverAmount) { - onMouseInMenu_callback(false); // Last parameter indicates if we've entered or left the menu + onMouseInMenu_callback(false); // Last parameter indicates if we've entered or left the menu } mCountMouseOver = false; mMouseOverCounter = 0; @@ -1259,38 +1259,38 @@ void GuiMenuBar::onMouseLeave(const GuiEvent &event) void GuiMenuBar::onMouseDragged(const GuiEvent &event) { Menu *hit = findHitMenu(event.mousePoint); - - if(hit != mouseOverMenu) - { - // If we need to, reset the mouse over menu counter and indicate - // that we should track it. - if(hit) + + if(hit != mouseOverMenu) + { + // If we need to, reset the mouse over menu counter and indicate + // that we should track it. + if(hit) mMouseOverCounter = 0; - if(!mCountMouseOver) - { + if(!mCountMouseOver) + { // We've never started the counter, so start it. if(hit) mCountMouseOver = true; - } + } - mouseOverMenu = hit; + mouseOverMenu = hit; mouseDownMenu = hit; - setUpdate(); + setUpdate(); onAction(); - } + } } void GuiMenuBar::onMouseDown(const GuiEvent &event) { mouseDownMenu = mouseOverMenu = findHitMenu(event.mousePoint); - setUpdate(); + setUpdate(); onAction(); } void GuiMenuBar::onMouseUp(const GuiEvent &event) { mouseDownMenu = NULL; - setUpdate(); + setUpdate(); } void GuiMenuBar::onRender(Point2I offset, const RectI &updateRect) @@ -1320,20 +1320,20 @@ void GuiMenuBar::onRender(Point2I offset, const RectI &updateRect) start.x = mMenuList[i]->bounds.point.x + mHorizontalMargin; start.y = mMenuList[i]->bounds.point.y + (mMenuList[i]->bounds.extent.y - mProfile->mFont->getHeight()) / 2; - // Draw the border + // Draw the border if (mMenuList[i]->drawBorder) - { + { RectI highlightBounds = bounds; highlightBounds.inset(1,1); if (mMenuList[i] == mouseDownMenu) renderFilledBorder(highlightBounds, mProfile->mBorderColorHL, mProfile->mFillColorHL ); else if (mMenuList[i] == mouseOverMenu && mouseDownMenu == NULL) renderFilledBorder(highlightBounds, mProfile->mBorderColorHL, mProfile->mFillColorHL); - } + } - // Do we draw a bitmap? + // Do we draw a bitmap? if (mMenuList[i]->bitmapIndex != -1) - { + { S32 index = mMenuList[i]->bitmapIndex * 3; if (mMenuList[i] == mouseDownMenu) ++index; @@ -1342,24 +1342,24 @@ void GuiMenuBar::onRender(Point2I offset, const RectI &updateRect) RectI rect = mProfile->mBitmapArrayRects[index]; - Point2I bitmapstart(start); + Point2I bitmapstart(start); bitmapstart.y = mMenuList[i]->bounds.point.y + (mMenuList[i]->bounds.extent.y - rect.extent.y) / 2; drawUtil->clearBitmapModulation(); drawUtil->drawBitmapSR( mProfile->mTextureObject, offset + bitmapstart, rect); - // Should we also draw the text? + // Should we also draw the text? if (!mMenuList[i]->drawBitmapOnly) - { + { start.x += mBitmapMargin; drawUtil->setBitmapModulation( fontColor ); drawUtil->drawText(mProfile->mFont, start + offset, mMenuList[i]->text, mProfile->mFontColors); - } - } else - { + } + } else + { drawUtil->setBitmapModulation( fontColor ); drawUtil->drawText(mProfile->mFont, start + offset, mMenuList[i]->text, mProfile->mFontColors); - } + } } renderChildControls( offset, updateRect ); @@ -1381,7 +1381,7 @@ void GuiMenuBar::buildWindowAcceleratorMap( WindowInputGenerator &inputGenerator continue; } EventDescriptor accelEvent; - ActionMap::createEventDescriptor(item->accelerator, &accelEvent); + ActionMap::createEventDescriptor(item->accelerator, &accelEvent); //now we have a modifier, and a key, add them to the canvas inputGenerator.addAcceleratorKey( this, item->cmd, accelEvent.eventCode, accelEvent.flags); @@ -1412,7 +1412,7 @@ void GuiMenuBar::acceleratorKeyPress(U32 index) { // first, call the script callback for menu selection: onMenuSelect_callback(mMenuList[i]->id, mMenuList[i]->text); - + if(item->visible) menuItemSelected(mMenuList[i], item); return; @@ -1551,15 +1551,15 @@ void GuiMenuTextListCtrl::onMouseUp(const GuiEvent &event) void GuiMenuTextListCtrl::onCellHighlighted(Point2I cell) { - // If this text list control is part of a submenu, then don't worry about - // passing this along - if(!isSubMenu) - { - RectI globalbounds(getBounds()); - Point2I globalpoint = localToGlobalCoord(globalbounds.point); - globalbounds.point = globalpoint; - mMenuBarCtrl->highlightedMenuItem(cell.y, globalbounds, mCellSize); - } + // If this text list control is part of a submenu, then don't worry about + // passing this along + if(!isSubMenu) + { + RectI globalbounds(getBounds()); + Point2I globalpoint = localToGlobalCoord(globalbounds.point); + globalbounds.point = globalpoint; + mMenuBarCtrl->highlightedMenuItem(cell.y, globalbounds, mCellSize); + } } //------------------------------------------------------------------------------ @@ -1582,9 +1582,9 @@ bool GuiSubmenuBackgroundCtrl::pointInControl(const Point2I& parentCoordPoint) S32 yt = parentCoordPoint.y - getTop(); if(findHitControl(Point2I(xt,yt)) == this) - return false; + return false; else - return true; + return true; // return xt >= 0 && yt >= 0 && xt < getWidth() && yt < getHeight(); } @@ -1609,7 +1609,7 @@ void GuiMenuBar::onSleep() void GuiMenuBar::closeMenu() { // First close any open submenu - closeSubmenu(); + closeSubmenu(); // Get the selection from the text list: S32 selectionIndex = mTextList->getSelectedCell().y; @@ -1657,25 +1657,25 @@ void GuiMenuBar::highlightedMenuItem(S32 selectionIndex, const RectI& bounds, Po } if(list) - { + { // If the highlighted item has changed... if(mouseOverSubmenu != list) - { + { closeSubmenu(); mouseOverSubmenu = NULL; // Check if this is a submenu. If so, open the submenu. if(list->isSubmenu) - { - // If there are submenu items, then open the submenu + { + // If there are submenu items, then open the submenu if(list->submenu->firstMenuItem) - { - mouseOverSubmenu = list; - onSubmenuAction(selstore, bounds, cellSize); - } - } - } - } + { + mouseOverSubmenu = list; + onSubmenuAction(selstore, bounds, cellSize); + } + } + } + } } } @@ -1745,11 +1745,11 @@ void GuiMenuBar::onAction() char buf[512]; - // If this menu item is a submenu, then set the isSubmenu to 2 to indicate - // an arrow should be drawn. Otherwise set the isSubmenu normally. - char isSubmenu = 1; - if(walk->isSubmenu) - isSubmenu = 2; + // If this menu item is a submenu, then set the isSubmenu to 2 to indicate + // an arrow should be drawn. Otherwise set the isSubmenu normally. + char isSubmenu = 1; + if(walk->isSubmenu) + isSubmenu = 2; char bitmapIndex = 1; if(walk->bitmapIndex >= 0 && (walk->bitmapIndex * 3 <= mProfile->mBitmapArrayRects.size())) @@ -1861,8 +1861,8 @@ void GuiMenuBar::onSubmenuAction(S32 selectionIndex, const RectI& bounds, Point2 char buf[512]; - // Can't have submenus within submenus. - char isSubmenu = 1; + // Can't have submenus within submenus. + char isSubmenu = 1; char bitmapIndex = 1; if(walk->bitmapIndex >= 0 && (walk->bitmapIndex * 3 <= mProfile->mBitmapArrayRects.size())) @@ -1916,7 +1916,7 @@ void GuiMenuBar::onSubmenuAction(S32 selectionIndex, const RectI& bounds, Point2 void GuiMenuBar::closeSubmenu() { if(!mSubmenuBackground || !mSubmenuTextList) - return; + return; // Get the selection from the text list: S32 selectionIndex = mSubmenuTextList->getSelectedCell().y; @@ -1934,8 +1934,8 @@ void GuiMenuBar::closeSubmenu() if ( selectionIndex != -1 ) { MenuItem *list = NULL; - if(mouseOverSubmenu) - { + if(mouseOverSubmenu) + { list = mouseOverSubmenu->submenu->firstMenuItem; while(selectionIndex && list) @@ -1943,7 +1943,7 @@ void GuiMenuBar::closeSubmenu() list = list->nextMenuItem; selectionIndex--; } - } + } if(list) menuItemSelected(list->submenuParentMenu, list); } @@ -1981,13 +1981,13 @@ void GuiMenuBar::processTick() { // If we're at a particular number of ticks, notify the script function if(mMouseOverCounter < mMouseHoverAmount) - { + { ++mMouseOverCounter; - } else if(mMouseOverCounter == mMouseHoverAmount) - { + } else if(mMouseOverCounter == mMouseHoverAmount) + { ++mMouseOverCounter; - onMouseInMenu_callback(true); // Last parameter indicates if we've entered or left the menu - } + onMouseInMenu_callback(true); // Last parameter indicates if we've entered or left the menu + } } } diff --git a/Engine/source/gui/editor/guiParticleGraphCtrl.cpp b/Engine/source/gui/editor/guiParticleGraphCtrl.cpp index 1f9465760..68ecf81c4 100644 --- a/Engine/source/gui/editor/guiParticleGraphCtrl.cpp +++ b/Engine/source/gui/editor/guiParticleGraphCtrl.cpp @@ -43,16 +43,16 @@ GuiParticleGraphCtrl::GuiParticleGraphCtrl() for(S32 i = 0; i < MaxPlots; i++) { - mPlots[i].mGraphColor = ColorF(1.0, 1.0, 1.0); - VECTOR_SET_ASSOCIATION(mPlots[i].mGraphData); - mPlots[i].mGraphMax.x = 1; - mPlots[i].mGraphMax.y = 50; - mPlots[i].mGraphMin.x = 0; - mPlots[i].mGraphMin.y = 0; - mPlots[i].mGraphType = Polyline; - mPlots[i].mGraphName = StringTable->insert(""); - mPlots[i].mHidden = false; - mPlots[i].mGraphScale = 0.05f; + mPlots[i].mGraphColor = ColorF(1.0, 1.0, 1.0); + VECTOR_SET_ASSOCIATION(mPlots[i].mGraphData); + mPlots[i].mGraphMax.x = 1; + mPlots[i].mGraphMax.y = 50; + mPlots[i].mGraphMin.x = 0; + mPlots[i].mGraphMin.y = 0; + mPlots[i].mGraphType = Polyline; + mPlots[i].mGraphName = StringTable->EmptyString(); + mPlots[i].mHidden = false; + mPlots[i].mGraphScale = 0.05f; } mPlots[0].mGraphColor = ColorF(1.0f, 0.2f, 0.2f); @@ -127,87 +127,87 @@ void GuiParticleGraphCtrl::onRender(Point2I offset, const RectI &updateRect) // Fetch Draw Utility. GFXDrawUtil* pDrawUtil = GFX->getDrawUtil(); - if (mProfile->mBorder) - { - const RectI bounds = getBounds(); - RectI rect(offset.x, offset.y, bounds.extent.x, bounds.extent.y); - pDrawUtil->drawRect(rect, mProfile->mBorderColor); - } + if (mProfile->mBorder) + { + const RectI bounds = getBounds(); + RectI rect(offset.x, offset.y, bounds.extent.x, bounds.extent.y); + pDrawUtil->drawRect(rect, mProfile->mBorderColor); + } GuiControlProfile* profile = dynamic_cast(Sim::findObject("GuiDefaultProfile")); Resource font = profile->mFont; - GFXVideoMode videoMode = GFXInit::getDesktopResolution(); + GFXVideoMode videoMode = GFXInit::getDesktopResolution(); - ColorF color(1.0f, 1.0f, 1.0f, 0.5f); - pDrawUtil->drawRectFill(updateRect, color); + ColorF color(1.0f, 1.0f, 1.0f, 0.5f); + pDrawUtil->drawRectFill(updateRect, color); - for (S32 k = 0; k < MaxPlots; k++) - { - // Nothing to graph - if ((mPlots[k].mGraphData.size() == 0) || (mPlots[k].mHidden == true)) - continue; - + for (S32 k = 0; k < MaxPlots; k++) + { + // Nothing to graph + if ((mPlots[k].mGraphData.size() == 0) || (mPlots[k].mHidden == true)) + continue; + Point2F graphExtent = getGraphExtent(k); - // Adjust scale to max value + 5% so we can see high value - F32 ScaleX = (F32(getExtent().x) / (graphExtent.x*(1.00 + (mPlots[k].mGraphScale)))); - F32 ScaleY = (F32(getExtent().y) / (graphExtent.y*(1.00 + (mPlots[k].mGraphScale)))); + // Adjust scale to max value + 5% so we can see high value + F32 ScaleX = (F32(getExtent().x) / (graphExtent.x*(1.00 + (mPlots[k].mGraphScale)))); + F32 ScaleY = (F32(getExtent().y) / (graphExtent.y*(1.00 + (mPlots[k].mGraphScale)))); - if((mPlots[k].mGraphType == Point) || (mPlots[k].mGraphType == Polyline)) - { + if((mPlots[k].mGraphType == Point) || (mPlots[k].mGraphType == Polyline)) + { S32 posX; - S32 posY; - S32 lastPosX = 0; - S32 lastPosY = 0; - Point2F plotPoint; + S32 posY; + S32 lastPosX = 0; + S32 lastPosY = 0; + Point2F plotPoint; - S32 size = 32; + S32 size = 32; - for (S32 sample = 0; sample < mPlots[k].mGraphData.size(); sample++) - { - S32 temp; + for (S32 sample = 0; sample < mPlots[k].mGraphData.size(); sample++) + { + S32 temp; - temp = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample); + temp = (S32)(((F32)getExtent().x / (F32)mPlots[k].mGraphData.size()) * (F32)sample); - // calculate the point positions + // calculate the point positions plotPoint = getPlotPoint(k, sample); - posX = (S32)((plotPoint.x - mPlots[k].mGraphMin.x) * (ScaleX /(1.00 + mPlots[k].mGraphScale))); - posY = (getExtent().y) - (S32)((plotPoint.y - mPlots[k].mGraphMin.y) * ScaleY); + posX = (S32)((plotPoint.x - mPlots[k].mGraphMin.x) * (ScaleX /(1.00 + mPlots[k].mGraphScale))); + posY = (getExtent().y) - (S32)((plotPoint.y - mPlots[k].mGraphMin.y) * ScaleY); posX += getExtent().x * (mPlots[k].mGraphScale); - posY /= (1.00 + (mPlots[k].mGraphScale)); + posY /= (1.00 + (mPlots[k].mGraphScale)); posX = localToGlobalCoord(Point2I(posX, posY)).x; - posY = localToGlobalCoord(Point2I(posX, posY)).y; + posY = localToGlobalCoord(Point2I(posX, posY)).y; - // check if this isn't our first loop through, if it is we won't have starting points + // check if this isn't our first loop through, if it is we won't have starting points if(sample > 0) - { - pDrawUtil->drawLine( lastPosX, lastPosY , posX, posY , mPlots[k].mGraphColor ); - } else - { + { + pDrawUtil->drawLine( lastPosX, lastPosY , posX, posY , mPlots[k].mGraphColor ); + } else + { mPlots[k].mNutList.clear(); - } + } mPlots[k].mNutList.push_back( Point2F(posX, posY) ); - // store the last positions to be the starting points drawn into a line next loop - lastPosX = posX; - lastPosY = posY; + // store the last positions to be the starting points drawn into a line next loop + lastPosX = posX; + lastPosY = posY; //Con::printf("red %f green %f blue %f", mPlots[k].mGraphColor.red, mPlots[k].mGraphColor.green, mPlots[k].mGraphColor.blue); - if(mSelectedPoint != -1) - { - mLastSelectedPoint = mSelectedPoint; - } + if(mSelectedPoint != -1) + { + mLastSelectedPoint = mSelectedPoint; + } ColorI nutColor (mPlots[k].mGraphColor); - if(k == mSelectedPlot && sample == mLastSelectedPoint) + if(k == mSelectedPlot && sample == mLastSelectedPoint) { // grab the colors for the nut F32 red = mPlots[k].mGraphColor.red; @@ -224,51 +224,51 @@ void GuiParticleGraphCtrl::onRender(Point2I offset, const RectI &updateRect) } // draw the seleciton nut - drawNut( Point2I(posX, posY), 3, mOutlineColor, nutColor ); + drawNut( Point2I(posX, posY), 3, mOutlineColor, nutColor ); - if((mLastSelectedPoint != -1) || (mRenderAllPoints == true)) - { + if((mLastSelectedPoint != -1) || (mRenderAllPoints == true)) + { if((k == mSelectedPlot && sample == mLastSelectedPoint) || (mRenderAllPoints == true)) - { + { char number[32]; - Point2I comparePos = localToGlobalCoord(Point2I(getPosition().x, getPosition().y)); + Point2I comparePos = localToGlobalCoord(Point2I(getPosition().x, getPosition().y)); dSprintf(number, 32, "%4.3f %4.3f", plotPoint.x, plotPoint.y); S32 textWidth = (S32)font->getStrWidth((const UTF8*)number);; - textWidth /= 2; + textWidth /= 2; - if((((S32)posX - (textWidth/2)) < comparePos.x) || (((S32)posX - textWidth) <= 0)) - { + if((((S32)posX - (textWidth/2)) < comparePos.x) || (((S32)posX - textWidth) <= 0)) + { posX += (textWidth/1.5); - } else if((posX + (textWidth * 1.8)) > (comparePos.x + getExtent().x) || ((posX + textWidth) >= videoMode.resolution.x)) - { + } else if((posX + (textWidth * 1.8)) > (comparePos.x + getExtent().x) || ((posX + textWidth) >= videoMode.resolution.x)) + { posX -= (textWidth * 1.5); - } + } - if((((S32)posY) < comparePos.y) || (((S32)posY - textWidth) <= 0)) - { + if((((S32)posY) < comparePos.y) || (((S32)posY - textWidth) <= 0)) + { posY += 40; - } - - pDrawUtil->setBitmapModulation( profile->mFontColor ); - pDrawUtil->drawText( font, Point2I(posX, posY + 5) - Point2I(size >> 1, size), number ); - pDrawUtil->clearBitmapModulation(); - } - } - } - } - } + } + + pDrawUtil->setBitmapModulation( profile->mFontColor ); + pDrawUtil->drawText( font, Point2I(posX, posY + 5) - Point2I(size >> 1, size), number ); + pDrawUtil->clearBitmapModulation(); + } + } + } + } + } - if(mRenderNextGraphTooltip == true && mRenderGraphTooltip == true) - { + if(mRenderNextGraphTooltip == true && mRenderGraphTooltip == true) + { char argBuffer[1][32]; dSprintf(argBuffer[0], 32, "%s", getGraphName(mTooltipSelectedPlot)); - renderGraphTooltip(mCursorPos, argBuffer[0]); - } + renderGraphTooltip(mCursorPos, argBuffer[0]); + } } S32 GuiParticleGraphCtrl::addPlotPoint(S32 plotID, Point2F v, bool setAdded) @@ -302,44 +302,44 @@ S32 GuiParticleGraphCtrl::addPlotPoint(S32 plotID, Point2F v, bool setAdded) for(S32 i = 0; i < mPlots[plotID].mGraphData.size(); i++) { - if(mFabs(v.x - mPlots[plotID].mGraphData[i].x) < 0.001) - { - if(mAutoRemove == true) - { + if(mFabs(v.x - mPlots[plotID].mGraphData[i].x) < 0.001) + { + if(mAutoRemove == true) + { changePlotPoint(plotID, i, v); - plotChanged = true; - mPlotIndex = i; - } else - { + plotChanged = true; + mPlotIndex = i; + } else + { mPlotIndex = -1; - } - - plotAdded = true; - - break; - } else if(v.x < mPlots[plotID].mGraphData[i].x) - { + } + + plotAdded = true; + + break; + } else if(v.x < mPlots[plotID].mGraphData[i].x) + { insertPlotPoint(plotID, i, v); - plotAdded = true; - mPlotIndex = i; - break; - } + plotAdded = true; + mPlotIndex = i; + break; + } } if(plotAdded == false) { - mPlots[plotID].mGraphData.push_back( v ); - mPlotIndex = mPlots[plotID].mGraphData.size() - 1; + mPlots[plotID].mGraphData.push_back( v ); + mPlotIndex = mPlots[plotID].mGraphData.size() - 1; } if(mAutoMax == true) { // Keep record of maximum data value for scaling purposes. if(v.y > mPlots[plotID].mGraphMax.y) - mPlots[plotID].mGraphMax.y = v.y; + mPlots[plotID].mGraphMax.y = v.y; if(v.x > mPlots[plotID].mGraphMax.x) - mPlots[plotID].mGraphMax.x = v.x; + mPlots[plotID].mGraphMax.x = v.x; } if(plotChanged == true) @@ -348,8 +348,8 @@ S32 GuiParticleGraphCtrl::addPlotPoint(S32 plotID, Point2F v, bool setAdded) } else if(mPlotIndex != -1 && setAdded) { mPointWasAdded = true; - mAddedPoint = v; - mAddedPointIndex = mPlotIndex; + mAddedPoint = v; + mAddedPointIndex = mPlotIndex; } return mPlotIndex; @@ -367,10 +367,10 @@ void GuiParticleGraphCtrl::insertPlotPoint(S32 plotID, S32 i, Point2F v) { // Keep record of maximum data value for scaling purposes. if(v.y > mPlots[plotID].mGraphMax.y) - mPlots[plotID].mGraphMax.y = v.y; + mPlots[plotID].mGraphMax.y = v.y; if(v.x > mPlots[plotID].mGraphMax.x) - mPlots[plotID].mGraphMax.x = v.x; + mPlots[plotID].mGraphMax.x = v.x; } // Argument Buffer. @@ -477,7 +477,7 @@ S32 GuiParticleGraphCtrl::getPlotIndex(S32 plotID, F32 x, F32 y) compareY = mPlots[plotID].mGraphData[i].y; // - //if((x == compareX) && (y == compareY)) + //if((x == compareX) && (y == compareY)) if((mFabs(x - compareX) < 0.001) && (mFabs(y - compareY) < 0.001)) return i; } @@ -487,16 +487,16 @@ S32 GuiParticleGraphCtrl::getPlotIndex(S32 plotID, F32 x, F32 y) void GuiParticleGraphCtrl::setGraphType(S32 plotID, const char *graphType) { - AssertFatal(plotID > -1 && plotID < MaxPlots, "Invalid plot specified!"); - if(!dStricmp(graphType,"Bar")) - mPlots[plotID].mGraphType = Bar; - else if(!dStricmp(graphType,"Filled")) - mPlots[plotID].mGraphType = Filled; - else if(!dStricmp(graphType,"Point")) - mPlots[plotID].mGraphType = Point; - else if(!dStricmp(graphType,"Polyline")) - mPlots[plotID].mGraphType = Polyline; - else AssertWarn(true, "Invalid graph type!"); + AssertFatal(plotID > -1 && plotID < MaxPlots, "Invalid plot specified!"); + if(!dStricmp(graphType,"Bar")) + mPlots[plotID].mGraphType = Bar; + else if(!dStricmp(graphType,"Filled")) + mPlots[plotID].mGraphType = Filled; + else if(!dStricmp(graphType,"Point")) + mPlots[plotID].mGraphType = Point; + else if(!dStricmp(graphType,"Polyline")) + mPlots[plotID].mGraphType = Polyline; + else AssertWarn(true, "Invalid graph type!"); } void GuiParticleGraphCtrl::setSelectedPlot(S32 plotID) @@ -565,8 +565,8 @@ void GuiParticleGraphCtrl::setRenderGraphTooltip(bool renderGraphTooltip) void GuiParticleGraphCtrl::drawNut(const Point2I &nut, S32 size, ColorI &outlineColor, ColorI &nutColor) { - // Fetch Draw Utility. - GFXDrawUtil* pDrawUtil = GFX->getDrawUtil(); + // Fetch Draw Utility. + GFXDrawUtil* pDrawUtil = GFX->getDrawUtil(); //Con::printf("r %d g %d b %d", nutColor.red, nutColor.green, nutColor.blue); S32 NUT_SIZE = size; @@ -588,17 +588,17 @@ Point2I GuiParticleGraphCtrl::findHitNut( Point2I hitPoint ) { for(S32 i = 0; i < MaxPlots; i++) { - if ( (mPlots[i].mGraphData.size() == 0) || (mPlots[i].mHidden == true)) + if ( (mPlots[i].mGraphData.size() == 0) || (mPlots[i].mHidden == true)) continue; for (S32 j = 0 ; j < mPlots[i].mNutList.size(); j++ ) { - if( inNut (Point2I( mPlots[i].mNutList[j].x, mPlots[i].mNutList[j].y), hitPoint.x, hitPoint.y) ) - { + if( inNut (Point2I( mPlots[i].mNutList[j].x, mPlots[i].mNutList[j].y), hitPoint.x, hitPoint.y) ) + { mTooltipSelectedPlot = i; - return Point2I(i,j); - } - } + return Point2I(i,j); + } + } } return Point2I(-1,-1); @@ -718,7 +718,7 @@ StringTableEntry GuiParticleGraphCtrl::getGraphName(S32 plotID) void GuiParticleGraphCtrl::onMouseMove(const GuiEvent &event) { mCursorPos = event.mousePoint; - + Point2I hitNut = findHitNut(event.mousePoint); if( hitNut != Point2I(-1,-1) ) @@ -745,8 +745,8 @@ void GuiParticleGraphCtrl::onMouseDown(const GuiEvent &event) if( hitNut != Point2I(-1,-1) ) { - if(event.mouseClickCount == 2) - { + if(event.mouseClickCount == 2) + { Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y); S32 point = removePlotPoint(hitNut.x, hitNut.y); @@ -755,31 +755,31 @@ void GuiParticleGraphCtrl::onMouseDown(const GuiEvent &event) dSprintf(argBuffer[0], 32, "%d", mSelectedPlot); dSprintf(argBuffer[1], 32, "%d", point); - dSprintf(argBuffer[2], 32, "%f %f", plotPoint.x, plotPoint.y); + dSprintf(argBuffer[2], 32, "%f %f", plotPoint.x, plotPoint.y); - + // Call Scripts. Con::executef(this, "onPlotPointRemoved", argBuffer[0], argBuffer[1], argBuffer[2]); - } else - { - setSelectedPlot(hitNut.x); + } else + { + setSelectedPlot(hitNut.x); setSelectedPoint(hitNut.y); - mOriginalSelectedPoint = hitNut.y; + mOriginalSelectedPoint = hitNut.y; - char argBuffer[32]; + char argBuffer[32]; dSprintf(argBuffer, 32, "%d", hitNut.y); // Call Scripts. Con::executef(this, "onPlotPointSelectedMouseDown", argBuffer); - } + } } else if( mSelectedPlot != -1 ) { - Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint); - mLastSelectedPoint = addPlotPoint(mSelectedPlot, mousePos); + Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint); + mLastSelectedPoint = addPlotPoint(mSelectedPlot, mousePos); - // Argument Buffer. + // Argument Buffer. char argBuffer[32]; dSprintf(argBuffer, 32, "%f %f", convertToGraphCoord(mSelectedPlot, event.mousePoint).x, convertToGraphCoord(mSelectedPlot, event.mousePoint).y); @@ -787,41 +787,41 @@ void GuiParticleGraphCtrl::onMouseDown(const GuiEvent &event) // Call Scripts. Con::executef(this, "onMouseDragged", argBuffer); - return; + return; } } void GuiParticleGraphCtrl::onMouseUp(const GuiEvent &event) { if(mSelectedPoint != -1) - mLastSelectedPoint = mSelectedPoint; + mLastSelectedPoint = mSelectedPoint; if(mPointWasAdded == true) { if(mSelectedPoint == -1) - { - // Argument Buffer. + { + // Argument Buffer. char argBuffer[3][32]; dSprintf(argBuffer[0], 32, "%d", mSelectedPlot); dSprintf(argBuffer[1], 32, "%f %f", mAddedPoint.x, mAddedPoint.y); - dSprintf(argBuffer[2], 32, "%d", mAddedPointIndex); + dSprintf(argBuffer[2], 32, "%d", mAddedPointIndex); // Call Scripts. Con::executef(this, "onPlotPointAdded", argBuffer[0], argBuffer[1], argBuffer[2]); - } else - { + } else + { // Argument Buffer. char argBuffer[4][32]; dSprintf(argBuffer[0], 32, "%d", mSelectedPlot); dSprintf(argBuffer[1], 32, "%f %f", mAddedPoint.x, mAddedPoint.y); - dSprintf(argBuffer[2], 32, "%d", mOriginalSelectedPoint); - dSprintf(argBuffer[3], 32, "%d", mAddedPointIndex); + dSprintf(argBuffer[2], 32, "%d", mOriginalSelectedPoint); + dSprintf(argBuffer[3], 32, "%d", mAddedPointIndex); // Call Scripts. Con::executef(this, "onPlotPointChangedUp", argBuffer[0], argBuffer[1], argBuffer[2], argBuffer[3]); - } + } } mPointWasAdded = false; @@ -835,37 +835,37 @@ void GuiParticleGraphCtrl::onMouseDragged(const GuiEvent &event) if(mSelectedPoint != -1) { - Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint); + Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint); if(mPointXMovementClamped == true) - { + { F32 prevXPos = getPlotPoint(mSelectedPlot, mSelectedPoint).x; - if(mousePos.x != prevXPos) - { - mousePos.x = prevXPos; - } - } + if(mousePos.x != prevXPos) + { + mousePos.x = prevXPos; + } + } - removePlotPoint(mSelectedPlot, mSelectedPoint); - S32 point = addPlotPoint(mSelectedPlot, mousePos); + removePlotPoint(mSelectedPlot, mSelectedPoint); + S32 point = addPlotPoint(mSelectedPlot, mousePos); if(point != -1) - { + { setSelectedPoint(point); - mLastMousePos = mousePos; + mLastMousePos = mousePos; // Argument Buffer. char argBuffer[3][32]; dSprintf(argBuffer[0], 32, "%d", mSelectedPlot); dSprintf(argBuffer[1], 32, "%f %f", mAddedPoint.x, mAddedPoint.y); - dSprintf(argBuffer[2], 32, "%d", point); + dSprintf(argBuffer[2], 32, "%d", point); // Call Scripts. Con::executef(this, "onPlotPointChangedMove", argBuffer[0], argBuffer[1], argBuffer[2]); - } else - { + } else + { point = addPlotPoint(mSelectedPlot, mLastMousePos); - } + } } // Argument Buffer. @@ -891,7 +891,7 @@ void GuiParticleGraphCtrl::onRightMouseDown(const GuiEvent &event) dSprintf(argBuffer[0], 32, "%d", mSelectedPlot); dSprintf(argBuffer[1], 32, "%d", point); - dSprintf(argBuffer[2], 32, "%f %f", plotPoint.x, plotPoint.y); + dSprintf(argBuffer[2], 32, "%f %f", plotPoint.x, plotPoint.y); // Call Scripts. Con::executef(this, "onPlotPointRemoved", argBuffer[0], argBuffer[1], argBuffer[2]); @@ -912,12 +912,12 @@ void GuiParticleGraphCtrl::onRightMouseDragged(const GuiEvent &event) Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y); S32 point = removePlotPoint(hitNut.x, hitNut.y); - // Argument Buffer. + // Argument Buffer. char argBuffer[3][32]; dSprintf(argBuffer[0], 32, "%d", mSelectedPlot); dSprintf(argBuffer[1], 32, "%d", point); - dSprintf(argBuffer[2], 32, "%f %f", plotPoint.x, plotPoint.y); + dSprintf(argBuffer[2], 32, "%f %f", plotPoint.x, plotPoint.y); // Call Scripts. Con::executef(this, "onPlotPointRemoved", argBuffer[0], argBuffer[1], argBuffer[2]); @@ -987,12 +987,12 @@ bool GuiParticleGraphCtrl::renderGraphTooltip(Point2I cursorPos, StringTableEntr RectI rect(offset, textBounds); GFX->setClipRect(rect); - // Fetch Draw Utility. - GFXDrawUtil* pDrawUtil = GFX->getDrawUtil(); + // Fetch Draw Utility. + GFXDrawUtil* pDrawUtil = GFX->getDrawUtil(); // Draw Filler bit, then border on top of that - pDrawUtil->drawRectFill(rect, ColorI(mTooltipProfile->mFillColor.red, mTooltipProfile->mFillColor.green, mTooltipProfile->mFillColor.blue, 200) ); - pDrawUtil->drawRect( rect, mTooltipProfile->mBorderColor ); + pDrawUtil->drawRectFill(rect, ColorI(mTooltipProfile->mFillColor.red, mTooltipProfile->mFillColor.green, mTooltipProfile->mFillColor.blue, 200) ); + pDrawUtil->drawRect( rect, mTooltipProfile->mBorderColor ); // Draw the text centered in the tool tip box pDrawUtil->setBitmapModulation( mTooltipProfile->mFontColor ); @@ -1006,102 +1006,102 @@ bool GuiParticleGraphCtrl::renderGraphTooltip(Point2I cursorPos, StringTableEntr DefineConsoleMethod(GuiParticleGraphCtrl, setSelectedPoint, void, (S32 point), , "(int point)" "Set the selected point on the graph.\n" - "@return No return value") + "@return No return value") { if(point >= object->mPlots[object->mSelectedPlot].mGraphData.size() || point < 0) { - Con::errorf("Invalid point to select."); - return; + Con::errorf("Invalid point to select."); + return; } object->setSelectedPoint( point ); } DefineConsoleMethod(GuiParticleGraphCtrl, setSelectedPlot, void, (S32 plotID), , "(int plotID)" "Set the selected plot (a.k.a. graph)." - "@return No return value" ) + "@return No return value" ) { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); - return; + Con::errorf("Invalid plotID."); + return; } object->setSelectedPlot( plotID ); } DefineConsoleMethod(GuiParticleGraphCtrl, clearGraph, void, (S32 plotID), , "(int plotID)" "Clear the graph of the given plot." - "@return No return value") + "@return No return value") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); - return; + Con::errorf("Invalid plotID."); + return; } object->clearGraph( plotID ); } DefineConsoleMethod(GuiParticleGraphCtrl, clearAllGraphs, void, (), , "()" "Clear all of the graphs." - "@return No return value") + "@return No return value") { object->clearAllGraphs(); } DefineConsoleMethod(GuiParticleGraphCtrl, addPlotPoint, S32, (S32 plotID, F32 x, F32 y, bool setAdded), (true), "(int plotID, float x, float y, bool setAdded = true;)" "Add a data point to the given plot." - "@return") + "@return") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); - return -2; + Con::errorf("Invalid plotID."); + return -2; } return object->addPlotPoint( plotID, Point2F(x, y), setAdded); } DefineConsoleMethod(GuiParticleGraphCtrl, insertPlotPoint, void, (S32 plotID, S32 i, F32 x, F32 y), , "(int plotID, int i, float x, float y)\n" "Insert a data point to the given plot and plot position.\n" - "@param plotID The plot you want to access\n" - "@param i The data point.\n" - "@param x,y The plot position.\n" - "@return No return value.") + "@param plotID The plot you want to access\n" + "@param i The data point.\n" + "@param x,y The plot position.\n" + "@return No return value.") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); - return; + Con::errorf("Invalid plotID."); + return; } object->insertPlotPoint( plotID, i, Point2F(x, y)); } DefineConsoleMethod(GuiParticleGraphCtrl, changePlotPoint, S32, (S32 plotID, S32 i, F32 x, F32 y), , "(int plotID, int i, float x, float y)" "Change a data point to the given plot and plot position.\n" - "@param plotID The plot you want to access\n" - "@param i The data point.\n" - "@param x,y The plot position.\n" - "@return No return value.") + "@param plotID The plot you want to access\n" + "@param i The data point.\n" + "@param x,y The plot position.\n" + "@return No return value.") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); - return -1; + Con::errorf("Invalid plotID."); + return -1; } return object->changePlotPoint( plotID, i, Point2F(x, y)); } DefineConsoleMethod(GuiParticleGraphCtrl, getSelectedPlot, S32, (), , "() " "Gets the selected Plot (a.k.a. graph).\n" - "@return The plot's ID.") + "@return The plot's ID.") { return object->getSelectedPlot(); } DefineConsoleMethod(GuiParticleGraphCtrl, getSelectedPoint, S32, (), , "()" "Gets the selected Point on the Plot (a.k.a. graph)." - "@return The last selected point ID") + "@return The last selected point ID") { - return object->getSelectedPoint(); + return object->getSelectedPoint(); } DefineConsoleMethod(GuiParticleGraphCtrl, isExistingPoint, bool, (S32 plotID, S32 samples), , "(int plotID, int samples)" @@ -1110,27 +1110,27 @@ DefineConsoleMethod(GuiParticleGraphCtrl, isExistingPoint, bool, (S32 plotID, S3 if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } if(samples > object->MaxDataPoints) { - Con::errorf("Invalid sample."); + Con::errorf("Invalid sample."); } return object->isExistingPoint(plotID, samples); } DefineConsoleMethod(GuiParticleGraphCtrl, getPlotPoint, Point2F, (S32 plotID, S32 samples), , "(int plotID, int samples)" "Get a data point from the plot specified, samples from the start of the graph." - "@return The data point ID") + "@return The data point ID") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } if(samples > object->MaxDataPoints) { - Con::errorf("Invalid sample."); + Con::errorf("Invalid sample."); } @@ -1139,26 +1139,26 @@ DefineConsoleMethod(GuiParticleGraphCtrl, getPlotPoint, Point2F, (S32 plotID, S3 DefineConsoleMethod(GuiParticleGraphCtrl, getPlotIndex, S32, (S32 plotID, F32 x, F32 y), , "(int plotID, float x, float y)\n" "Gets the index of the point passed on the plotID passed (graph ID).\n" - "@param plotID The plot you wish to check.\n" - "@param x,y The coordinates of the point to get.\n" - "@return Returns the index of the point.\n") + "@param plotID The plot you wish to check.\n" + "@param x,y The coordinates of the point to get.\n" + "@return Returns the index of the point.\n") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } return object->getPlotIndex(plotID, x, y); } DefineConsoleMethod(GuiParticleGraphCtrl, getGraphColor, ColorF, (S32 plotID), , "(int plotID)" "Get the color of the graph passed." - "@return Returns the color of the graph as a string of RGB values formatted as \"R G B\"") + "@return Returns the color of the graph as a string of RGB values formatted as \"R G B\"") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } return object->getGraphColor(plotID); @@ -1167,24 +1167,24 @@ DefineConsoleMethod(GuiParticleGraphCtrl, getGraphColor, ColorF, (S32 plotID), , DefineConsoleMethod(GuiParticleGraphCtrl, getGraphMin, Point2F, (S32 plotID), , "(int plotID) " "Get the minimum values of the graph ranges.\n" - "@return Returns the minimum of the range formatted as \"x-min y-min\"") + "@return Returns the minimum of the range formatted as \"x-min y-min\"") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } return object->getGraphMin(plotID); } DefineConsoleMethod(GuiParticleGraphCtrl, getGraphMax, Point2F, (S32 plotID), , "(int plotID) " - "Get the maximum values of the graph ranges.\n" - "@return Returns the maximum of the range formatted as \"x-max y-max\"") + "Get the maximum values of the graph ranges.\n" + "@return Returns the maximum of the range formatted as \"x-max y-max\"") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } return object->getGraphMax(plotID); @@ -1192,12 +1192,12 @@ DefineConsoleMethod(GuiParticleGraphCtrl, getGraphMax, Point2F, (S32 plotID), , DefineConsoleMethod(GuiParticleGraphCtrl, getGraphName, const char*, (S32 plotID), , "(int plotID) " "Get the name of the graph passed.\n" - "@return Returns the name of the plot") + "@return Returns the name of the plot") { if(plotID > object->MaxPlots) { - Con::errorf("Invalid plotID."); + Con::errorf("Invalid plotID."); } const U32 bufSize = 64; @@ -1208,170 +1208,170 @@ DefineConsoleMethod(GuiParticleGraphCtrl, getGraphName, const char*, (S32 plotID } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphMin, void, (S32 plotID, F32 minX, F32 minY), , "(int plotID, float minX, float minY) " - "Set the min values of the graph of plotID.\n" - "@param plotID The plot to modify\n" - "@param minX,minY The minimum bound of the value range.\n" - "@return No return value.") + "Set the min values of the graph of plotID.\n" + "@param plotID The plot to modify\n" + "@param minX,minY The minimum bound of the value range.\n" + "@return No return value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphMin(plotID, Point2F(minX, minY)); + object->setGraphMin(plotID, Point2F(minX, minY)); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphMinX, void, (S32 plotID, F32 minX), , "(int plotID, float minX) " - "Set the min X value of the graph of plotID.\n" - "@param plotID The plot to modify.\n" - "@param minX The minimum x value.\n" - "@return No return Value.") + "Set the min X value of the graph of plotID.\n" + "@param plotID The plot to modify.\n" + "@param minX The minimum x value.\n" + "@return No return Value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphMinX(plotID, minX); + object->setGraphMinX(plotID, minX); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphMinY, void, (S32 plotID, F32 minX), , "(int plotID, float minY) " - "Set the min Y value of the graph of plotID." - "@param plotID The plot to modify.\n" - "@param minY The minimum y value.\n" - "@return No return Value.") + "Set the min Y value of the graph of plotID." + "@param plotID The plot to modify.\n" + "@param minY The minimum y value.\n" + "@return No return Value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphMinY(plotID, minX); + object->setGraphMinY(plotID, minX); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphMax, void, (S32 plotID, F32 maxX, F32 maxY), , "(int plotID, float maxX, float maxY) " - "Set the max values of the graph of plotID." - "@param plotID The plot to modify\n" - "@param maxX,maxY The maximum bound of the value range.\n" - "@return No return value.") + "Set the max values of the graph of plotID." + "@param plotID The plot to modify\n" + "@param maxX,maxY The maximum bound of the value range.\n" + "@return No return value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphMax(plotID, Point2F(maxX, maxY)); + object->setGraphMax(plotID, Point2F(maxX, maxY)); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphMaxX, void, (S32 plotID, F32 maxX), , "(int plotID, float maxX)" - "Set the max X value of the graph of plotID." - "@param plotID The plot to modify.\n" - "@param maxX The maximum x value.\n" - "@return No return Value.") + "Set the max X value of the graph of plotID." + "@param plotID The plot to modify.\n" + "@param maxX The maximum x value.\n" + "@return No return Value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphMaxX(plotID, maxX); + object->setGraphMaxX(plotID, maxX); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphMaxY, void, (S32 plotID, F32 maxX), , "(int plotID, float maxY)" - "Set the max Y value of the graph of plotID." - "@param plotID The plot to modify.\n" - "@param maxY The maximum y value.\n" - "@return No return Value.") + "Set the max Y value of the graph of plotID." + "@param plotID The plot to modify.\n" + "@param maxY The maximum y value.\n" + "@return No return Value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphMaxY(plotID, maxX); + object->setGraphMaxY(plotID, maxX); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphHidden, void, (S32 plotID, bool isHidden), , "(int plotID, bool isHidden)" - "Set whether the graph number passed is hidden or not." - "@return No return value.") + "Set whether the graph number passed is hidden or not." + "@return No return value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphHidden(plotID, isHidden); + object->setGraphHidden(plotID, isHidden); } DefineConsoleMethod(GuiParticleGraphCtrl, setAutoGraphMax, void, (bool autoMax), , "(bool autoMax) " - "Set whether the max will automatically be set when adding points " - "(ie if you add a value over the current max, the max is increased to that value).\n" - "@return No return value.") + "Set whether the max will automatically be set when adding points " + "(ie if you add a value over the current max, the max is increased to that value).\n" + "@return No return value.") { - object->setAutoGraphMax(autoMax); + object->setAutoGraphMax(autoMax); } DefineConsoleMethod(GuiParticleGraphCtrl, setAutoRemove, void, (bool autoRemove), , "(bool autoRemove) " - "Set whether or not a point should be deleted when you drag another one over it." - "@return No return value.") + "Set whether or not a point should be deleted when you drag another one over it." + "@return No return value.") { - object->setAutoRemove(autoRemove); + object->setAutoRemove(autoRemove); } DefineConsoleMethod(GuiParticleGraphCtrl, setRenderAll, void, (bool autoRemove), , "(bool renderAll)" - "Set whether or not a position should be rendered on every point or just the last selected." - "@return No return value.") + "Set whether or not a position should be rendered on every point or just the last selected." + "@return No return value.") { - object->setRenderAll(autoRemove); + object->setRenderAll(autoRemove); } DefineConsoleMethod(GuiParticleGraphCtrl, setPointXMovementClamped, void, (bool autoRemove), , "(bool clamped)" - "Set whether the x position of the selected graph point should be clamped" - "@return No return value.") + "Set whether the x position of the selected graph point should be clamped" + "@return No return value.") { - object->setPointXMovementClamped(autoRemove); + object->setPointXMovementClamped(autoRemove); } DefineConsoleMethod(GuiParticleGraphCtrl, setRenderGraphTooltip, void, (bool autoRemove), , "(bool renderGraphTooltip)" - "Set whether or not to render the graph tooltip." - "@return No return value.") + "Set whether or not to render the graph tooltip." + "@return No return value.") { - object->setRenderGraphTooltip(autoRemove); + object->setRenderGraphTooltip(autoRemove); } DefineConsoleMethod(GuiParticleGraphCtrl, setGraphName, void, (S32 plotID, const char * graphName), , "(int plotID, string graphName) " - "Set the name of the given plot.\n" - "@param plotID The plot to modify.\n" - "@param graphName The name to set on the plot.\n" - "@return No return value.") + "Set the name of the given plot.\n" + "@param plotID The plot to modify.\n" + "@param graphName The name to set on the plot.\n" + "@return No return value.") { - if(plotID > object->MaxPlots) - { - Con::errorf("Invalid plotID."); - return; - } + if(plotID > object->MaxPlots) + { + Con::errorf("Invalid plotID."); + return; + } - object->setGraphName(plotID, graphName); + object->setGraphName(plotID, graphName); } DefineConsoleMethod(GuiParticleGraphCtrl, resetSelectedPoint, void, (), , "()" - "This will reset the currently selected point to nothing." - "@return No return value.") + "This will reset the currently selected point to nothing." + "@return No return value.") { - object->resetSelectedPoint(); + object->resetSelectedPoint(); } diff --git a/Engine/source/gui/game/guiChunkedBitmapCtrl.cpp b/Engine/source/gui/game/guiChunkedBitmapCtrl.cpp index 735607224..d0f9549e1 100644 --- a/Engine/source/gui/game/guiChunkedBitmapCtrl.cpp +++ b/Engine/source/gui/game/guiChunkedBitmapCtrl.cpp @@ -65,10 +65,10 @@ ConsoleDocClass( GuiChunkedBitmapCtrl, void GuiChunkedBitmapCtrl::initPersistFields() { - addGroup("GuiChunkedBitmapCtrl"); + addGroup("GuiChunkedBitmapCtrl"); addField( "bitmap", TypeFilename, Offset( mBitmapName, GuiChunkedBitmapCtrl ), "This is the bitmap to render to the control." ); addField( "useVariable", TypeBool, Offset( mUseVariable, GuiChunkedBitmapCtrl ), "This decides whether to use the \"bitmap\" file " - "or a bitmap stored in \"variable\""); + "or a bitmap stored in \"variable\""); addField( "tile", TypeBool, Offset( mTile, GuiChunkedBitmapCtrl ), "This is no longer in use"); endGroup("GuiChunkedBitmapCtrl"); Parent::initPersistFields(); @@ -86,7 +86,7 @@ DefineEngineMethod( GuiChunkedBitmapCtrl, setBitmap, void, (const char* filename GuiChunkedBitmapCtrl::GuiChunkedBitmapCtrl() { - mBitmapName = StringTable->insert(""); + mBitmapName = StringTable->EmptyString(); mUseVariable = false; mTile = false; } diff --git a/Engine/source/gui/worldEditor/undoActions.cpp b/Engine/source/gui/worldEditor/undoActions.cpp index 6c71a0831..d88b72bcd 100644 --- a/Engine/source/gui/worldEditor/undoActions.cpp +++ b/Engine/source/gui/worldEditor/undoActions.cpp @@ -32,9 +32,9 @@ IMPLEMENT_CONOBJECT( MECreateUndoAction ); ConsoleDocClass( MECreateUndoAction, - "@brief Material Editor create undo instance\n\n" - "Not intended for game development, for editors or internal use only.\n\n " - "@internal"); + "@brief Material Editor create undo instance\n\n" + "Not intended for game development, for editors or internal use only.\n\n " + "@internal"); MECreateUndoAction::MECreateUndoAction( const UTF8* actionName ) : UndoAction( actionName ) @@ -62,7 +62,7 @@ DefineEngineMethod( MECreateUndoAction, addObject, void, ( SimObject* obj),, "Add the object being created to an undo action.\n" "@param obj Object being created you want to create the undo for.") { - if (obj) + if (obj) object->addObject( obj ); } @@ -117,9 +117,9 @@ void MECreateUndoAction::redo() IMPLEMENT_CONOBJECT( MEDeleteUndoAction ); ConsoleDocClass( MEDeleteUndoAction, - "@brief Material Editor delete undo instance\n\n" - "Not intended for game development, for editors or internal use only.\n\n " - "@internal"); + "@brief Material Editor delete undo instance\n\n" + "Not intended for game development, for editors or internal use only.\n\n " + "@internal"); MEDeleteUndoAction::MEDeleteUndoAction( const UTF8 *actionName ) : UndoAction( actionName ) @@ -169,7 +169,7 @@ DefineEngineMethod( MEDeleteUndoAction, deleteObject, void, ( SimObject* obj),, "Delete the object and add it to the undo action.\n" "@param obj Object to delete and add to the undo action.") { - if (obj) + if (obj) object->deleteObject( obj ); } @@ -210,16 +210,16 @@ void MEDeleteUndoAction::redo() IMPLEMENT_CONOBJECT( InspectorFieldUndoAction ); ConsoleDocClass( InspectorFieldUndoAction, - "@brief Inspector Field undo action instance\n\n" - "Not intended for game development, for editors or internal use only.\n\n " - "@internal"); + "@brief Inspector Field undo action instance\n\n" + "Not intended for game development, for editors or internal use only.\n\n " + "@internal"); InspectorFieldUndoAction::InspectorFieldUndoAction() { mObjId = 0; mField = NULL; - mSlotName = StringTable->insert(""); - mArrayIdx = StringTable->insert(""); + mSlotName = StringTable->EmptyString(); + mArrayIdx = StringTable->EmptyString(); } InspectorFieldUndoAction::InspectorFieldUndoAction( const UTF8 *actionName ) @@ -228,8 +228,8 @@ InspectorFieldUndoAction::InspectorFieldUndoAction( const UTF8 *actionName ) mInspector = NULL; mObjId = 0; mField = NULL; - mSlotName = StringTable->insert(""); - mArrayIdx = StringTable->insert(""); + mSlotName = StringTable->EmptyString(); + mArrayIdx = StringTable->EmptyString(); } void InspectorFieldUndoAction::initPersistFields() @@ -272,4 +272,4 @@ void InspectorFieldUndoAction::undo() // Now save the previous data in this UndoAction // since an undo action must become a redo action and vice-versa mData = data; -} \ No newline at end of file +} diff --git a/Engine/source/lighting/lightManager.cpp b/Engine/source/lighting/lightManager.cpp index f53f5284d..58f0949c2 100644 --- a/Engine/source/lighting/lightManager.cpp +++ b/Engine/source/lighting/lightManager.cpp @@ -306,7 +306,7 @@ void LightManager::_update4LightConsts( const SceneData &sgData, GFXShaderConstHandle *lightInvRadiusSqSC, GFXShaderConstHandle *lightSpotDirSC, GFXShaderConstHandle *lightSpotAngleSC, - GFXShaderConstHandle *lightSpotFalloffSC, + GFXShaderConstHandle *lightSpotFalloffSC, GFXShaderConstBuffer *shaderConsts ) { PROFILE_SCOPE( LightManager_Update4LightConsts ); @@ -317,7 +317,7 @@ void LightManager::_update4LightConsts( const SceneData &sgData, lightInvRadiusSqSC->isValid() || lightSpotDirSC->isValid() || lightSpotAngleSC->isValid() || - lightSpotFalloffSC->isValid() ) + lightSpotFalloffSC->isValid() ) { PROFILE_SCOPE( LightManager_Update4LightConsts_setLights ); @@ -326,7 +326,7 @@ void LightManager::_update4LightConsts( const SceneData &sgData, static AlignedArray lightColors( 4, sizeof( Point4F ) ); static Point4F lightInvRadiusSq; static Point4F lightSpotAngle; - static Point4F lightSpotFalloff; + static Point4F lightSpotFalloff; F32 range; // Need to clear the buffers so that we don't leak @@ -359,10 +359,10 @@ void LightManager::_update4LightConsts( const SceneData &sgData, lightSpotDirs[2][i] = lightDir.z; if ( light->getType() == LightInfo::Spot ) - { + { lightSpotAngle[i] = mCos( mDegToRad( light->getOuterConeAngle() / 2.0f ) ); - lightSpotFalloff[i] = 1.0f / getMax( F32_MIN, mCos( mDegToRad( light->getInnerConeAngle() / 2.0f ) ) - lightSpotAngle[i] ); - } + lightSpotFalloff[i] = 1.0f / getMax( F32_MIN, mCos( mDegToRad( light->getInnerConeAngle() / 2.0f ) ) - lightSpotAngle[i] ); + } // Prescale the light color by the brightness to // avoid doing this in the shader. @@ -379,7 +379,7 @@ void LightManager::_update4LightConsts( const SceneData &sgData, shaderConsts->setSafe( lightSpotDirSC, lightSpotDirs ); shaderConsts->setSafe( lightSpotAngleSC, lightSpotAngle ); - shaderConsts->setSafe( lightSpotFalloffSC, lightSpotFalloff ); + shaderConsts->setSafe( lightSpotFalloffSC, lightSpotFalloff ); } @@ -442,7 +442,7 @@ DefineEngineFunction( setLightManager, bool, ( const char *name ),, return gClientSceneGraph->setLightManager( name ); } -DefineEngineFunction( lightScene, bool, ( const char *completeCallbackFn, const char *mode ), ( NULL, NULL ), +DefineEngineFunction( lightScene, bool, ( const char *completeCallbackFn, const char *mode ), ( nullAsType(), nullAsType() ), "Will generate static lighting for the scene if supported by the active light manager.\n\n" "If mode is \"forceAlways\", the lightmaps will be regenerated regardless of whether " "lighting cache files can be written to. If mode is \"forceWritable\", then the lightmaps " diff --git a/Engine/source/math/mMathFn.h b/Engine/source/math/mMathFn.h index 1855656e7..93596f63f 100644 --- a/Engine/source/math/mMathFn.h +++ b/Engine/source/math/mMathFn.h @@ -320,6 +320,11 @@ inline F32 mLog(const F32 val) return (F32) log(val); } +inline F32 mLog2(const F32 val) +{ + return (F32) log2(val); +} + inline F32 mExp(const F32 val) { return (F32) exp(val); @@ -380,6 +385,10 @@ inline F64 mLog(const F64 val) return (F64) log(val); } +inline F64 mLog2(const F64 val) +{ + return (F64) log2(val); +} inline F32 mCatmullrom(F32 t, F32 p0, F32 p1, F32 p2, F32 p3) { diff --git a/Engine/source/navigation/navMesh.cpp b/Engine/source/navigation/navMesh.cpp index ee20fb036..7dbb40d6d 100644 --- a/Engine/source/navigation/navMesh.cpp +++ b/Engine/source/navigation/navMesh.cpp @@ -181,7 +181,7 @@ DefineConsoleFunction(NavMeshUpdateOne, void, (S32 meshid, S32 objid, bool remov NavMesh::NavMesh() { mTypeMask |= StaticShapeObjectType | MarkerObjectType; - mFileName = StringTable->insert(""); + mFileName = StringTable->EmptyString(); mNetFlags.clear(Ghostable); mSaveIntermediates = false; @@ -211,7 +211,7 @@ NavMesh::NavMesh() mLargeCharacters = false; mVehicles = false; - mCoverSet = StringTable->insert(""); + mCoverSet = StringTable->EmptyString(); mInnerCover = false; mCoverDist = 1.0f; mPeekDist = 0.7f; @@ -1143,9 +1143,10 @@ void NavMesh::buildLinks() // Iterate over links for(U32 j = 0; j < mLinkIDs.size(); j++) { + if (mLinksUnsynced[j]) + { if(tile.box.isContained(getLinkStart(j)) || - tile.box.isContained(getLinkEnd(j)) && - mLinksUnsynced[j]) + tile.box.isContained(getLinkEnd(j))) { // Mark tile for build. mDirtyTiles.push_back_unique(i); @@ -1160,6 +1161,7 @@ void NavMesh::buildLinks() } } } + } if(mDirtyTiles.size()) ctx->startTimer(RC_TIMER_TOTAL); } diff --git a/Engine/source/navigation/navPath.cpp b/Engine/source/navigation/navPath.cpp index a945e7f8d..9409cc193 100644 --- a/Engine/source/navigation/navPath.cpp +++ b/Engine/source/navigation/navPath.cpp @@ -170,7 +170,7 @@ const char *NavPath::getProtectedFrom(void *obj, const char *data) if(object->mFromSet) return data; else - return StringTable->insert(""); + return StringTable->EmptyString(); } const char *NavPath::getProtectedTo(void *obj, const char *data) @@ -180,7 +180,7 @@ const char *NavPath::getProtectedTo(void *obj, const char *data) if(object->mToSet) return data; else - return StringTable->insert(""); + return StringTable->EmptyString(); } IRangeValidator ValidIterations(1, S32_MAX); diff --git a/Engine/source/platform/input/event.h b/Engine/source/platform/input/event.h index b77caa202..1c6d1f1dc 100644 --- a/Engine/source/platform/input/event.h +++ b/Engine/source/platform/input/event.h @@ -429,7 +429,7 @@ struct InputEventInfo U16 ascii; /// Modifiers to action: SI_LSHIFT, SI_LCTRL, etc. - InputModifiers modifier; + U32 modifier; inline void postToSignal(InputEvent &ie) { diff --git a/Engine/source/platform/menus/popupMenu.cpp b/Engine/source/platform/menus/popupMenu.cpp index ee8d75a82..7e8aad7ba 100644 --- a/Engine/source/platform/menus/popupMenu.cpp +++ b/Engine/source/platform/menus/popupMenu.cpp @@ -51,10 +51,10 @@ PopupMenu::PopupMenu() : mCanvas(NULL) mSubmenus = new SimSet; mSubmenus->registerObject(); - mBarTitle = StringTable->insert(""); + mBarTitle = StringTable->EmptyString(); mIsPopup = false; - mPopupGUID = sMaxPopupGUID++; + mPopupGUID = sMaxPopupGUID++; } PopupMenu::~PopupMenu() @@ -126,10 +126,10 @@ void PopupMenu::onMenuSelect() //----------------------------------------------------------------------------- void PopupMenu::handleSelectEvent(U32 popID, U32 command) -{ - if (popID == mPopupGUID && canHandleID(command)) - if (handleSelect(command)) - smSelectionEventHandled = true; +{ + if (popID == mPopupGUID && canHandleID(command)) + if (handleSelect(command)) + smSelectionEventHandled = true; } //----------------------------------------------------------------------------- @@ -138,8 +138,8 @@ void PopupMenu::onAttachToMenuBar(GuiCanvas *canvas, S32 pos, const char *title) { mCanvas = canvas; - // Attached menus must be notified of menu events - smPopupMenuEvent.notify(this, &PopupMenu::handleSelectEvent); + // Attached menus must be notified of menu events + smPopupMenuEvent.notify(this, &PopupMenu::handleSelectEvent); // Pass on to sub menus for(SimSet::iterator i = mSubmenus->begin();i != mSubmenus->end();++i) @@ -160,8 +160,8 @@ void PopupMenu::onRemoveFromMenuBar(GuiCanvas *canvas) { mCanvas = NULL; - // We are no longer interested in select events, remove ourselves from the notification list in a safe way - Sim::postCurrentEvent(this, new PopUpNotifyRemoveEvent()); + // We are no longer interested in select events, remove ourselves from the notification list in a safe way + Sim::postCurrentEvent(this, new PopUpNotifyRemoveEvent()); // Pass on to sub menus for(SimSet::iterator i = mSubmenus->begin();i != mSubmenus->end();++i) diff --git a/Engine/source/platform/nativeDialogs/fileDialog.cpp b/Engine/source/platform/nativeDialogs/fileDialog.cpp index 08d689585..09ed1c63e 100644 --- a/Engine/source/platform/nativeDialogs/fileDialog.cpp +++ b/Engine/source/platform/nativeDialogs/fileDialog.cpp @@ -48,10 +48,10 @@ FileDialogData::FileDialogData() if (mDefaultPath == StringTable->lookup("") || !Platform::isDirectory(mDefaultPath)) mDefaultPath = Platform::getCurrentDirectory(); - mDefaultFile = StringTable->insert(""); - mFilters = StringTable->insert(""); - mFile = StringTable->insert(""); - mTitle = StringTable->insert(""); + mDefaultFile = StringTable->EmptyString(); + mFilters = StringTable->EmptyString(); + mFile = StringTable->EmptyString(); + mTitle = StringTable->EmptyString(); mStyle = 0; diff --git a/Engine/source/platform/platformNet.cpp b/Engine/source/platform/platformNet.cpp index a0669d62a..4d5b6ca18 100644 --- a/Engine/source/platform/platformNet.cpp +++ b/Engine/source/platform/platformNet.cpp @@ -201,6 +201,7 @@ public: const SOCKET InvalidSocketHandle = -1; static void IPSocketToNetAddress(const struct sockaddr_in *sockAddr, NetAddress *address); +static void IPSocket6ToNetAddress(const struct sockaddr_in6 *sockAddr, NetAddress *address); namespace PlatformNetState { @@ -217,7 +218,7 @@ namespace PlatformNetState static ReservedSocketList smReservedSocketList; - static Net::Error getLastError() + Net::Error getLastError() { #if defined(TORQUE_USE_WINSOCK) S32 err = WSAGetLastError(); @@ -243,7 +244,7 @@ namespace PlatformNetState #endif } - static S32 getDefaultGameProtocol() + S32 getDefaultGameProtocol() { // we turn off VDP in non-release builds because VDP does not support broadcast packets // which are required for LAN queries (PC->Xbox connectivity). The wire protocol still @@ -259,7 +260,7 @@ namespace PlatformNetState return protocol; } - static struct addrinfo* pickAddressByProtocol(struct addrinfo* addr, int protocol) + struct addrinfo* pickAddressByProtocol(struct addrinfo* addr, int protocol) { for (addr; addr != NULL; addr = addr->ai_next) { @@ -271,7 +272,7 @@ namespace PlatformNetState } /// Extracts core address parts from an address string. Returns false if it's malformed. - static bool extractAddressParts(const char *addressString, char outAddress[256], int &outPort, int &outFamily) + bool extractAddressParts(const char *addressString, char outAddress[256], int &outPort, int &outFamily) { outPort = 0; outFamily = AF_UNSPEC; @@ -359,6 +360,42 @@ namespace PlatformNetState return true; } + + Net::Error getSocketAddress(SOCKET socketFd, int requiredFamily, NetAddress *outAddress) + { + Net::Error error = Net::UnknownError; + + if (requiredFamily == AF_INET) + { + sockaddr_in ipAddr; + socklen_t len = sizeof(ipAddr); + if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0) + { + IPSocketToNetAddress(&ipAddr, outAddress); + error = Net::NoError; + } + else + { + error = getLastError(); + } + } + else if (requiredFamily == AF_INET6) + { + sockaddr_in6 ipAddr; + socklen_t len = sizeof(ipAddr); + if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0) + { + IPSocket6ToNetAddress(&ipAddr, outAddress); + error = Net::NoError; + } + else + { + error = getLastError(); + } + } + + return error; + } }; @@ -924,12 +961,6 @@ bool Net::openPort(S32 port, bool doBind) PlatformNetState::udp6Socket = NetSocket::INVALID; } - // Frequently port "0" is used even though it makes no sense, so instead use the default port. - if (port == 0) - { - port = PlatformNetState::defaultPort; - } - // Update prefs Net::smMulticastEnabled = Con::getBoolVariable("pref::Net::Multicast6Enabled", true); Net::smIpv4Enabled = Con::getBoolVariable("pref::Net::IPV4Enabled", true); @@ -942,6 +973,8 @@ bool Net::openPort(S32 port, bool doBind) SOCKET socketFd = InvalidSocketHandle; NetAddress address; + NetAddress listenAddress; + char listenAddressStr[256]; if (Net::smIpv4Enabled) { @@ -969,12 +1002,18 @@ bool Net::openPort(S32 port, bool doBind) if (error == NoError) error = setBlocking(PlatformNetState::udpSocket, false); - + if (error == NoError) { - Con::printf("UDP initialized on ipv4 port %d", port); + error = PlatformNetState::getSocketAddress(socketFd, AF_INET, &listenAddress); + if (error == NoError) + { + Net::addressToString(&listenAddress, listenAddressStr); + Con::printf("UDP initialized on ipv4 %s", listenAddressStr); + } } - else + + if (error != NoError) { closeSocket(PlatformNetState::udpSocket); PlatformNetState::udpSocket = NetSocket::INVALID; @@ -1019,9 +1058,15 @@ bool Net::openPort(S32 port, bool doBind) if (error == NoError) { - Con::printf("UDP initialized on ipv6 port %d", port); + error = PlatformNetState::getSocketAddress(socketFd, AF_INET6, &listenAddress); + if (error == NoError) + { + Net::addressToString(&listenAddress, listenAddressStr); + Con::printf("UDP initialized on ipv6 %s", listenAddressStr); + } } - else + + if (error != NoError) { closeSocket(PlatformNetState::udp6Socket); PlatformNetState::udp6Socket = NetSocket::INVALID; @@ -1579,7 +1624,7 @@ Net::Error Net::getListenAddress(const NetAddress::Type type, NetAddress *addres if (!serverIP || serverIP[0] == '\0') { address->type = type; - address->port = PlatformNetState::defaultPort; + address->port = 0; *((U32*)address->address.ipv4.netNum) = INADDR_ANY; return Net::NoError; } @@ -1591,7 +1636,7 @@ Net::Error Net::getListenAddress(const NetAddress::Type type, NetAddress *addres else if (type == NetAddress::IPBroadcastAddress) { address->type = type; - address->port = PlatformNetState::defaultPort; + address->port = 0; *((U32*)address->address.ipv4.netNum) = INADDR_BROADCAST; return Net::NoError; } @@ -1603,7 +1648,7 @@ Net::Error Net::getListenAddress(const NetAddress::Type type, NetAddress *addres sockaddr_in6 addr; dMemset(&addr, '\0', sizeof(addr)); - addr.sin6_port = htons(PlatformNetState::defaultPort); + addr.sin6_port = 0; addr.sin6_addr = in6addr_any; IPSocket6ToNetAddress(&addr, address); @@ -1947,9 +1992,13 @@ void Net::enableMulticast() if (error == NoError) { - Con::printf("Multicast initialized on port %d", PlatformNetState::defaultPort); + NetAddress listenAddress; + char listenAddressStr[256]; + Net::addressToString(&multicastAddress, listenAddressStr); + Con::printf("Multicast initialized on %s", listenAddressStr); } - else + + if (error != NoError) { PlatformNetState::multicast6Socket = NetSocket::INVALID; Con::printf("Unable to multicast UDP - error %d", error); diff --git a/Engine/source/platform/platformNet.h b/Engine/source/platform/platformNet.h index ff3838d2e..50a2c1d4c 100644 --- a/Engine/source/platform/platformNet.h +++ b/Engine/source/platform/platformNet.h @@ -31,7 +31,9 @@ #define MAXPACKETSIZE 1500 #endif +#ifndef TORQUE_NET_DEFAULT_MULTICAST_ADDRESS #define TORQUE_NET_DEFAULT_MULTICAST_ADDRESS "ff04::7467::656E::6574::776B" +#endif typedef S32 NetConnectionId; @@ -76,8 +78,8 @@ struct NetAddress bool isSameAddress(const NetAddress &other) const { - if (type != other.type) - return false; + if (type != other.type) + return false; switch (type) { @@ -100,32 +102,32 @@ struct NetAddress bool isSameAddressAndPort(const NetAddress &other) const { - if (type != other.type) - return false; + if (type != other.type) + return false; - switch (type) - { - case NetAddress::IPAddress: - return (dMemcmp(other.address.ipv4.netNum, address.ipv4.netNum, 4) == 0) && other.port == port; - break; - case NetAddress::IPV6Address: - return (dMemcmp(other.address.ipv6.netNum, address.ipv6.netNum, 16) == 0) && other.port == port; - break; - case NetAddress::IPBroadcastAddress: - return true; - break; - case NetAddress::IPV6MulticastAddress: - return true; - break; - } + switch (type) + { + case NetAddress::IPAddress: + return (dMemcmp(other.address.ipv4.netNum, address.ipv4.netNum, 4) == 0) && other.port == port; + break; + case NetAddress::IPV6Address: + return (dMemcmp(other.address.ipv6.netNum, address.ipv6.netNum, 16) == 0) && other.port == port; + break; + case NetAddress::IPBroadcastAddress: + return true; + break; + case NetAddress::IPV6MulticastAddress: + return true; + break; + } - return false; + return false; } bool isEqual(const NetAddress &other) const { - if (type != other.type) - return false; + if (type != other.type) + return false; switch (type) { @@ -191,7 +193,7 @@ struct Net WouldBlock, NotASocket, UnknownError, - NeedHostLookup + NeedHostLookup }; enum ConnectionState { diff --git a/Engine/source/platform/profiler.cpp b/Engine/source/platform/profiler.cpp index c978b9ac2..1083b6d08 100644 --- a/Engine/source/platform/profiler.cpp +++ b/Engine/source/platform/profiler.cpp @@ -27,7 +27,7 @@ #endif #if defined(TORQUE_OS_MAC) -#include // For high resolution timer +#include #endif #include "core/stream/fileStream.h" @@ -48,15 +48,15 @@ Profiler *gProfiler = NULL; //#define TORQUE_PROFILER_DEBUG // Machinery to record the stack of node names, as a debugging aid to find -// mismatched PROFILE_START and PROFILE_END blocks. We profile from the +// mismatched PROFILE_START and PROFILE_END blocks. We profile from the // beginning to catch profile block errors that occur when torque is starting up. #ifdef TORQUE_PROFILER_DEBUG Vector gProfilerNodeStack; #define TORQUE_PROFILE_AT_ENGINE_START true #define PROFILER_DEBUG_PUSH_NODE( nodename ) \ - gProfilerNodeStack.push_back( nodename ); +gProfilerNodeStack.push_back( nodename ); #define PROFILER_DEBUG_POP_NODE() \ - gProfilerNodeStack.pop_back(); +gProfilerNodeStack.pop_back(); #else #define TORQUE_PROFILE_AT_ENGINE_START false #define PROFILER_DEBUG_PUSH_NODE( nodename ) ; @@ -68,7 +68,7 @@ Vector gProfilerNodeStack; void startHighResolutionTimer(U32 time[2]) { //time[0] = Platform::getRealMilliseconds(); - + __asm { push eax @@ -89,7 +89,7 @@ U32 endHighResolutionTimer(U32 time[2]) U32 ticks; //ticks = Platform::getRealMilliseconds() - time[0]; //return ticks; - + __asm { push eax @@ -135,20 +135,26 @@ U32 endHighResolutionTimer(U32 time[2]) void startHighResolutionTimer(U32 time[2]) { - UnsignedWide t; - Microseconds(&t); - time[0] = t.lo; - time[1] = t.hi; + U64 now = mach_absolute_time(); + AssertFatal(sizeof(U32[2]) == sizeof(U64), "Can't pack mach_absolute_time into U32[2]"); + memcpy(time, &now, sizeof(U64)); } U32 endHighResolutionTimer(U32 time[2]) { - UnsignedWide t; - Microseconds(&t); - return t.lo - time[0]; - // given that we're returning a 32 bit integer, and this is unsigned subtraction... - // it will just wrap around, we don't need the upper word of the time. - // NOTE: the code assumes that more than 3 hrs will not go by between calls to startHighResolutionTimer() and endHighResolutionTimer(). - // I mean... that damn well better not happen anyway. + static mach_timebase_info_data_t sTimebaseInfo = {0, 0}; + + U64 now = mach_absolute_time(); + AssertFatal(sizeof(U32[2]) == sizeof(U64), "Can't pack mach_absolute_time into U32[2]"); + U64 then; + memcpy(&then, time, sizeof(U64)); + + if(sTimebaseInfo.denom == 0){ + mach_timebase_info(&sTimebaseInfo); + } + // Handle the micros/nanos conversion first, because shedding a few bits is better than overflowing. + U64 elapsedMicros = ((now - then) / 1000) * sTimebaseInfo.numer / sTimebaseInfo.denom; + + return (U32)elapsedMicros; // Just truncate, and hope we didn't overflow } #else @@ -170,7 +176,7 @@ Profiler::Profiler() { mMaxStackDepth = MaxStackDepth; mCurrentHash = 0; - + mCurrentProfilerData = (ProfilerData *) malloc(sizeof(ProfilerData)); mCurrentProfilerData->mRoot = NULL; mCurrentProfilerData->mNextForRoot = NULL; @@ -185,17 +191,17 @@ Profiler::Profiler() mCurrentProfilerData->mInvokeCount = 0; mCurrentProfilerData->mTotalTime = 0; mCurrentProfilerData->mSubTime = 0; -#ifdef TORQUE_ENABLE_PROFILE_PATH +#ifdef TORQUE_ENABLE_PROFILE_PATH mCurrentProfilerData->mPath = ""; #endif mRootProfilerData = mCurrentProfilerData; - + for(U32 i = 0; i < ProfilerData::HashTableSize; i++) mCurrentProfilerData->mChildHash[i] = 0; - + mProfileList = NULL; - - mEnabled = TORQUE_PROFILE_AT_ENGINE_START; + + mEnabled = TORQUE_PROFILE_AT_ENGINE_START; mNextEnable = TORQUE_PROFILE_AT_ENGINE_START; mStackDepth = 0; gProfiler = this; @@ -216,20 +222,20 @@ void Profiler::reset() mEnabled = false; // in case we're in a profiler call. ProfilerData * head = mProfileList; ProfilerData * curr = head; - + while ( curr ) { head = curr->mNextProfilerData; free( curr ); - + if ( head ) curr = head; else curr = NULL; } - + mProfileList = NULL; - + for(ProfilerRootData *walk = ProfilerRootData::sRootList; walk; walk = walk->mNextRoot) { walk->mFirstProfilerData = 0; @@ -256,7 +262,7 @@ ProfilerRootData::ProfilerRootData(const char *name) for(ProfilerRootData *walk = sRootList; walk; walk = walk->mNextRoot) if(!dStrcmp(walk->mName, name)) AssertFatal( false, avar( "Duplicate profile name: %s", name ) ); - + mName = name; mNameHash = _StringTable::hashString(name); mNextRoot = sRootList; @@ -283,7 +289,7 @@ void Profiler::validate() if(!wk) Platform::debugBreak(); for(wk = dp->mParent->mChildHash[walk->mNameHash & (ProfilerData::HashTableSize - 1)] ; - wk; wk = wk->mNextHash) + wk; wk = wk->mNextHash) if(wk == dp) break; if(!wk) @@ -300,7 +306,7 @@ const char * Profiler::getProfilePath() if( !ThreadManager::isMainThread() ) return "[non-main thread]"; #endif - + return (mEnabled && mCurrentProfilerData) ? mCurrentProfilerData->mPath : "na"; } #endif @@ -312,14 +318,14 @@ const char * Profiler::constructProfilePath(ProfilerData * pd) { const bool saveEnable = gProfiler->mEnabled; gProfiler->mEnabled = false; - + const char * connector = " -> "; U32 len = dStrlen(pd->mParent->mPath); if (!len) connector = ""; len += dStrlen(connector); len += dStrlen(pd->mRoot->mName); - + U32 mark = FrameAllocator::getWaterMark(); char * buf = (char*)FrameAllocator::alloc(len+1); dStrcpy(buf,pd->mParent->mPath); @@ -342,25 +348,25 @@ void Profiler::hashPush(ProfilerRootData *root) if( !ThreadManager::isMainThread() ) return; #endif - + mStackDepth++; PROFILER_DEBUG_PUSH_NODE(root->mName); AssertFatal(mStackDepth <= mMaxStackDepth, - "Stack overflow in profiler. You may have mismatched PROFILE_START and PROFILE_ENDs"); + "Stack overflow in profiler. You may have mismatched PROFILE_START and PROFILE_ENDs"); if(!mEnabled) return; - + ProfilerData *nextProfiler = NULL; if(!root->mEnabled || mCurrentProfilerData->mRoot == root) { mCurrentProfilerData->mSubDepth++; return; } - + if(mCurrentProfilerData->mLastSeenProfiler && - mCurrentProfilerData->mLastSeenProfiler->mRoot == root) + mCurrentProfilerData->mLastSeenProfiler->mRoot == root) nextProfiler = mCurrentProfilerData->mLastSeenProfiler; - + if(!nextProfiler) { // first see if it's in the hash table... @@ -377,17 +383,17 @@ void Profiler::hashPush(ProfilerRootData *root) nextProfiler = (ProfilerData *) malloc(sizeof(ProfilerData)); for(U32 i = 0; i < ProfilerData::HashTableSize; i++) nextProfiler->mChildHash[i] = 0; - + nextProfiler->mRoot = root; nextProfiler->mNextForRoot = root->mFirstProfilerData; root->mFirstProfilerData = nextProfiler; - + nextProfiler->mNextProfilerData = mProfileList; mProfileList = nextProfiler; - + nextProfiler->mNextHash = mCurrentProfilerData->mChildHash[index]; mCurrentProfilerData->mChildHash[index] = nextProfiler; - + nextProfiler->mParent = mCurrentProfilerData; nextProfiler->mNextSibling = mCurrentProfilerData->mFirstChild; mCurrentProfilerData->mFirstChild = nextProfiler; @@ -437,7 +443,7 @@ void Profiler::hashPop(ProfilerRootData *expected) if( !ThreadManager::isMainThread() ) return; #endif - + mStackDepth--; PROFILER_DEBUG_POP_NODE(); AssertFatal(mStackDepth >= 0, "Stack underflow in profiler. You may have mismatched PROFILE_START and PROFILE_ENDs"); @@ -453,15 +459,15 @@ void Profiler::hashPop(ProfilerRootData *expected) { AssertISV(expected == mCurrentProfilerData->mRoot, "Profiler::hashPop - didn't get expected ProfilerRoot!"); } - + F64 fElapsed = endHighResolutionTimer(mCurrentProfilerData->mStartTime); - + mCurrentProfilerData->mTotalTime += fElapsed; mCurrentProfilerData->mParent->mSubTime += fElapsed; // mark it in the parent as well... mCurrentProfilerData->mRoot->mTotalTime += fElapsed; if(mCurrentProfilerData->mParent->mRoot) mCurrentProfilerData->mParent->mRoot->mSubTime += fElapsed; // mark it in the parent as well... - + mCurrentProfilerData = mCurrentProfilerData->mParent; } if(mStackDepth == 0) @@ -474,13 +480,13 @@ void Profiler::hashPop(ProfilerRootData *expected) } if(!mEnabled && mNextEnable) startHighResolutionTimer(mCurrentProfilerData->mStartTime); - + #if defined(TORQUE_OS_WIN) // The high performance counters under win32 are unreliable when running on multiple // processors. When the profiler is enabled, we restrict Torque to a single processor. if(mNextEnable != mEnabled) { - + if(mNextEnable) { Con::warnf("Warning: forcing the Torque profiler thread to run only on cpu 1."); @@ -496,7 +502,7 @@ void Profiler::hashPop(ProfilerRootData *expected) } } #endif - + mEnabled = mNextEnable; } } @@ -514,15 +520,15 @@ static void profilerDataDumpRecurse(ProfilerData *data, char *buffer, U32 buffer { // dump out this one: Con::printf("%7.3f %7.3f %8d %s%s", - 100 * data->mTotalTime / totalTime, - 100 * (data->mTotalTime - data->mSubTime) / totalTime, - data->mInvokeCount, - buffer, - data->mRoot ? data->mRoot->mName : "ROOT" ); + 100 * data->mTotalTime / totalTime, + 100 * (data->mTotalTime - data->mSubTime) / totalTime, + data->mInvokeCount, + buffer, + data->mRoot ? data->mRoot->mName : "ROOT" ); data->mTotalTime = 0; data->mSubTime = 0; data->mInvokeCount = 0; - + buffer[bufferLen] = ' '; buffer[bufferLen+1] = ' '; buffer[bufferLen+2] = 0; @@ -552,16 +558,16 @@ static void profilerDataDumpRecurseFile(ProfilerData *data, char *buffer, U32 bu { char pbuffer[256]; dSprintf(pbuffer, 255, "%7.3f %7.3f %8d %s%s\n", - 100 * data->mTotalTime / totalTime, - 100 * (data->mTotalTime - data->mSubTime) / totalTime, - data->mInvokeCount, - buffer, - data->mRoot ? data->mRoot->mName : "ROOT" ); + 100 * data->mTotalTime / totalTime, + 100 * (data->mTotalTime - data->mSubTime) / totalTime, + data->mInvokeCount, + buffer, + data->mRoot ? data->mRoot->mName : "ROOT" ); fws.write(dStrlen(pbuffer), pbuffer); data->mTotalTime = 0; data->mSubTime = 0; data->mInvokeCount = 0; - + buffer[bufferLen] = ' '; buffer[bufferLen+1] = ' '; buffer[bufferLen+2] = 0; @@ -593,7 +599,7 @@ void Profiler::dump() mEnabled = false; mStackDepth++; // may have some profiled calls... gotta turn em off. - + Vector rootVector; F64 totalTime = 0; for(ProfilerRootData *walk = ProfilerRootData::sRootList; walk; walk = walk->mNextRoot) @@ -602,8 +608,8 @@ void Profiler::dump() rootVector.push_back(walk); } dQsort((void *) &rootVector[0], rootVector.size(), sizeof(ProfilerRootData *), rootDataCompare); - - + + if (mDumpToConsole == true) { Con::printf("Profiler Data Dump:"); @@ -612,10 +618,10 @@ void Profiler::dump() for(U32 i = 0; i < rootVector.size(); i++) { Con::printf("%7.3f %7.3f %8d %s", - 100 * (rootVector[i]->mTotalTime - rootVector[i]->mSubTime) / totalTime, - 100 * rootVector[i]->mTotalTime / totalTime, - rootVector[i]->mTotalInvokeCount, - rootVector[i]->mName); + 100 * (rootVector[i]->mTotalTime - rootVector[i]->mSubTime) / totalTime, + 100 * rootVector[i]->mTotalTime / totalTime, + rootVector[i]->mTotalInvokeCount, + rootVector[i]->mName); rootVector[i]->mTotalInvokeCount = 0; rootVector[i]->mTotalTime = 0; rootVector[i]->mSubTime = 0; @@ -623,9 +629,9 @@ void Profiler::dump() Con::printf(""); Con::printf("Ordered by stack trace total time -"); Con::printf("%% Time %% NSTime Invoke # Name"); - + mCurrentProfilerData->mTotalTime = endHighResolutionTimer(mCurrentProfilerData->mStartTime); - + char depthBuffer[MaxStackDepth * 2 + 1]; depthBuffer[0] = 0; profilerDataDumpRecurse(mCurrentProfilerData, depthBuffer, 0, totalTime); @@ -637,44 +643,44 @@ void Profiler::dump() FileStream fws; bool success = fws.open(mDumpFileName, Torque::FS::File::Write); AssertFatal(success, "Cannot write profile dump to specified file!"); - char buffer[1024]; - - dStrcpy(buffer, "Profiler Data Dump:\n"); + char buffer[1024]; + + dStrcpy(buffer, "Profiler Data Dump:\n"); + fws.write(dStrlen(buffer), buffer); + dStrcpy(buffer, "Ordered by non-sub total time -\n"); + fws.write(dStrlen(buffer), buffer); + dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n"); + fws.write(dStrlen(buffer), buffer); + + for(U32 i = 0; i < rootVector.size(); i++) + { + dSprintf(buffer, 1023, "%7.3f %7.3f %8d %s\n", + 100 * (rootVector[i]->mTotalTime - rootVector[i]->mSubTime) / totalTime, + 100 * rootVector[i]->mTotalTime / totalTime, + rootVector[i]->mTotalInvokeCount, + rootVector[i]->mName); fws.write(dStrlen(buffer), buffer); - dStrcpy(buffer, "Ordered by non-sub total time -\n"); - fws.write(dStrlen(buffer), buffer); - dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n"); - fws.write(dStrlen(buffer), buffer); - - for(U32 i = 0; i < rootVector.size(); i++) - { - dSprintf(buffer, 1023, "%7.3f %7.3f %8d %s\n", - 100 * (rootVector[i]->mTotalTime - rootVector[i]->mSubTime) / totalTime, - 100 * rootVector[i]->mTotalTime / totalTime, - rootVector[i]->mTotalInvokeCount, - rootVector[i]->mName); - fws.write(dStrlen(buffer), buffer); - - rootVector[i]->mTotalInvokeCount = 0; - rootVector[i]->mTotalTime = 0; - rootVector[i]->mSubTime = 0; - } - dStrcpy(buffer, "\nOrdered by non-sub total time -\n"); - fws.write(dStrlen(buffer), buffer); - dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n"); - fws.write(dStrlen(buffer), buffer); - + + rootVector[i]->mTotalInvokeCount = 0; + rootVector[i]->mTotalTime = 0; + rootVector[i]->mSubTime = 0; + } + dStrcpy(buffer, "\nOrdered by non-sub total time -\n"); + fws.write(dStrlen(buffer), buffer); + dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n"); + fws.write(dStrlen(buffer), buffer); + mCurrentProfilerData->mTotalTime = endHighResolutionTimer(mCurrentProfilerData->mStartTime); - + char depthBuffer[MaxStackDepth * 2 + 1]; depthBuffer[0] = 0; profilerDataDumpRecurseFile(mCurrentProfilerData, depthBuffer, 0, totalTime, fws); mEnabled = enableSave; mStackDepth--; - + fws.close(); } - + mDumpToConsole = false; mDumpToFile = false; mDumpFileName[0] = '\0'; @@ -709,13 +715,13 @@ void Profiler::enableMarker(const char *marker, bool enable) //----------------------------------------------------------------------------- -DefineEngineFunction( profilerMarkerEnable, void, ( const char* markerName, bool enable ), ( true ), - "@brief Enable or disable a specific profile.\n\n" - "@param enable Optional paramater to enable or disable the profile.\n" - "@param markerName Name of a specific marker to enable or disable.\n" - "@note Calling this function will first call profilerReset(), clearing all data from profiler. " - "All profile markers are enabled by default.\n\n" - "@ingroup Debugging") +DefineEngineFunction( profilerMarkerEnable, void, ( const char* markerName, bool enable ), ( true ), + "@brief Enable or disable a specific profile.\n\n" + "@param enable Optional paramater to enable or disable the profile.\n" + "@param markerName Name of a specific marker to enable or disable.\n" + "@note Calling this function will first call profilerReset(), clearing all data from profiler. " + "All profile markers are enabled by default.\n\n" + "@ingroup Debugging") { if( gProfiler ) gProfiler->enableMarker( markerName, enable ); @@ -724,37 +730,37 @@ DefineEngineFunction( profilerMarkerEnable, void, ( const char* markerName, bool //----------------------------------------------------------------------------- DefineEngineFunction( profilerEnable, void, ( bool enable ),, - "@brief Enables or disables the profiler.\n\n" - "Data is only gathered while the profiler is enabled.\n\n" - "@note Profiler is not available in shipping builds.\n" - "T3D has predefined profiling areas surrounded by markers, " - "but you may need to define additional markers (in C++) around areas you wish to profile," - " by using the PROFILE_START( markerName ); and PROFILE_END(); macros.\n\n" - "@ingroup Debugging\n" ) + "@brief Enables or disables the profiler.\n\n" + "Data is only gathered while the profiler is enabled.\n\n" + "@note Profiler is not available in shipping builds.\n" + "T3D has predefined profiling areas surrounded by markers, " + "but you may need to define additional markers (in C++) around areas you wish to profile," + " by using the PROFILE_START( markerName ); and PROFILE_END(); macros.\n\n" + "@ingroup Debugging\n" ) { if(gProfiler) gProfiler->enable(enable); } DefineEngineFunction(profilerDump, void, (),, - "@brief Dumps current profiling stats to the console window.\n\n" - "@note Markers disabled with profilerMarkerEnable() will be skipped over. " - "If the profiler is currently running, it will be disabled.\n" - "@ingroup Debugging") + "@brief Dumps current profiling stats to the console window.\n\n" + "@note Markers disabled with profilerMarkerEnable() will be skipped over. " + "If the profiler is currently running, it will be disabled.\n" + "@ingroup Debugging") { if(gProfiler) gProfiler->dumpToConsole(); } DefineEngineFunction( profilerDumpToFile, void, ( const char* fileName ),, - "@brief Dumps current profiling stats to a file.\n\n" - "@note If the profiler is currently running, it will be disabled.\n" - "@param fileName Name and path of file to save profiling stats to. Must use forward slashes (/). " - "Will attempt to create the file if it does not already exist.\n" - "@tsexample\n" - "profilerDumpToFile( \"C:/Torque/log1.txt\" );\n" - "@endtsexample\n\n" - "@ingroup Debugging" ) + "@brief Dumps current profiling stats to a file.\n\n" + "@note If the profiler is currently running, it will be disabled.\n" + "@param fileName Name and path of file to save profiling stats to. Must use forward slashes (/). " + "Will attempt to create the file if it does not already exist.\n" + "@tsexample\n" + "profilerDumpToFile( \"C:/Torque/log1.txt\" );\n" + "@endtsexample\n\n" + "@ingroup Debugging" ) { if(gProfiler) gProfiler->dumpToFile(fileName); @@ -762,9 +768,9 @@ DefineEngineFunction( profilerDumpToFile, void, ( const char* fileName ),, DefineEngineFunction( profilerReset, void, (),, "@brief Resets the profiler, clearing it of all its data.\n\n" - "If the profiler is currently running, it will first be disabled. " - "All markers will retain their current enabled/disabled status.\n\n" - "@ingroup Debugging" ) + "If the profiler is currently running, it will first be disabled. " + "All markers will retain their current enabled/disabled status.\n\n" + "@ingroup Debugging" ) { if(gProfiler) gProfiler->reset(); diff --git a/Engine/source/platformMac/macFileIO.mm b/Engine/source/platformMac/macFileIO.mm index 26dca66bb..f11b5b052 100644 --- a/Engine/source/platformMac/macFileIO.mm +++ b/Engine/source/platformMac/macFileIO.mm @@ -68,46 +68,54 @@ bool dFileTouch(const char *path) //----------------------------------------------------------------------------- bool dPathCopy(const char* source, const char* dest, bool nooverwrite) { - NSFileManager *manager = [NSFileManager defaultManager]; - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *nsource = [[NSString stringWithUTF8String:source] stringByStandardizingPath]; - NSString *ndest = [[NSString stringWithUTF8String:dest] stringByStandardizingPath]; - NSString *ndestFolder = [ndest stringByDeletingLastPathComponent]; - - if(! [manager fileExistsAtPath:nsource]) - { - Con::errorf("dPathCopy: no file exists at %s",source); + if(source == NULL || dest == NULL) return false; - } - if( [manager fileExistsAtPath:ndest] ) - { - if(nooverwrite) + @autoreleasepool { + NSFileManager *manager = [NSFileManager defaultManager]; + + NSString *nsource = [manager stringWithFileSystemRepresentation:source length:dStrlen(source)]; + NSString *ndest = [manager stringWithFileSystemRepresentation:dest length:dStrlen(dest)]; + NSString *ndestFolder = [ndest stringByDeletingLastPathComponent]; + + if(! [manager fileExistsAtPath:nsource]) { - Con::errorf("dPathCopy: file already exists at %s",dest); + Con::errorf("dPathCopy: no file exists at %s",source); return false; } - Con::warnf("Deleting files at path: %s", dest); - bool deleted = [manager removeFileAtPath:ndest handler:nil]; - if(!deleted) + + if( [manager fileExistsAtPath:ndest] ) { - Con::errorf("Copy failed! Could not delete files at path: %s", dest); - return false; + if(nooverwrite) + { + Con::errorf("dPathCopy: file already exists at %s",dest); + return false; + } + Con::warnf("Deleting files at path: %s", dest); + if(![manager removeItemAtPath:ndest error:nil] || [manager fileExistsAtPath:ndest]) + { + Con::errorf("Copy failed! Could not delete files at path: %s", dest); + return false; + } } + + if([manager fileExistsAtPath:ndestFolder] == NO) + { + ndestFolder = [ndestFolder stringByAppendingString:@"/"]; // createpath requires a trailing slash + Platform::createPath([ndestFolder UTF8String]); + } + + bool ret = [manager copyItemAtPath:nsource toPath:ndest error:nil]; + // n.b.: The "success" semantics don't guarantee a copy actually took place, so we'll verify + // because this is surprising behavior for a method called copy. + if( ![manager fileExistsAtPath:ndest] ) + { + Con::warnf("The filemanager returned success, but the file was not copied. Something strange is happening"); + ret = false; + } + return ret; } - if([manager fileExistsAtPath:ndestFolder] == NO) - { - ndestFolder = [ndestFolder stringByAppendingString:@"/"]; // createpath requires a trailing slash - Platform::createPath([ndestFolder UTF8String]); - } - - bool ret = [manager copyPath:nsource toPath:ndest handler:nil]; - - [pool release]; - return ret; - } //----------------------------------------------------------------------------- @@ -117,25 +125,35 @@ bool dFileRename(const char *source, const char *dest) if(source == NULL || dest == NULL) return false; - NSFileManager *manager = [NSFileManager defaultManager]; - - NSString *nsource = [manager stringWithFileSystemRepresentation:source length:dStrlen(source)]; - NSString *ndest = [manager stringWithFileSystemRepresentation:dest length:dStrlen(dest)]; - - if(! [manager fileExistsAtPath:nsource]) - { - Con::errorf("dFileRename: no file exists at %s",source); - return false; + @autoreleasepool { + NSFileManager *manager = [NSFileManager defaultManager]; + + NSString *nsource = [manager stringWithFileSystemRepresentation:source length:dStrlen(source)]; + NSString *ndest = [manager stringWithFileSystemRepresentation:dest length:dStrlen(dest)]; + + if(! [manager fileExistsAtPath:nsource]) + { + Con::errorf("dFileRename: no file exists at %s",source); + return false; + } + + if( [manager fileExistsAtPath:ndest] ) + { + Con::warnf("dFileRename: Deleting files at path: %s", dest); + } + + bool ret = [manager moveItemAtPath:nsource toPath:ndest error:nil]; + // n.b.: The "success" semantics don't guarantee a move actually took place, so we'll verify + // because this is surprising behavior for a method called rename. + + if( ![manager fileExistsAtPath:ndest] ) + { + Con::warnf("The filemanager returned success, but the file was not moved. Something strange is happening"); + ret = false; + } + + return ret; } - - if( [manager fileExistsAtPath:ndest] ) - { - Con::warnf("dFileRename: Deleting files at path: %s", dest); - } - - bool ret = [manager movePath:nsource toPath:ndest handler:nil]; - - return ret; } //----------------------------------------------------------------------------- @@ -722,9 +740,9 @@ bool Platform::isSubDirectory(const char *pathParent, const char *pathSub) inline bool isGoodDirectory(dirent* entry) { return (entry->d_type == DT_DIR // is a dir - && dStrcmp(entry->d_name,".") != 0 // not here - && dStrcmp(entry->d_name,"..") != 0 // not parent - && !Platform::isExcludedDirectory(entry->d_name)); // not excluded + && dStrcmp(entry->d_name,".") != 0 // not here + && dStrcmp(entry->d_name,"..") != 0 // not parent + && !Platform::isExcludedDirectory(entry->d_name)); // not excluded } //----------------------------------------------------------------------------- @@ -839,7 +857,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve while (d = readdir(dip)) { - bool isDir; + bool isDir; isDir = false; if (d->d_type == DT_UNKNOWN) { @@ -856,7 +874,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve if ( isDir ) { if (dStrcmp(d->d_name, ".") == 0 || - dStrcmp(d->d_name, "..") == 0) + dStrcmp(d->d_name, "..") == 0) continue; if (Platform::isExcludedDirectory(d->d_name)) continue; @@ -869,8 +887,8 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve dSprintf(child, 1024, "%s/%s", subPath, d->d_name); if (currentDepth < recurseDepth || recurseDepth == -1 ) recurseDumpDirectories(basePath, child, directoryVector, - currentDepth + 1, recurseDepth, - noBasePath); + currentDepth + 1, recurseDepth, + noBasePath); } else { @@ -881,8 +899,8 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve dSprintf(child, 1024, "/%s", d->d_name); if (currentDepth < recurseDepth || recurseDepth == -1) recurseDumpDirectories(basePath, child, directoryVector, - currentDepth + 1, recurseDepth, - noBasePath); + currentDepth + 1, recurseDepth, + noBasePath); } } } diff --git a/Engine/source/platformPOSIX/posixVolume.cpp b/Engine/source/platformPOSIX/posixVolume.cpp index a5d0871d0..0f39bea3c 100644 --- a/Engine/source/platformPOSIX/posixVolume.cpp +++ b/Engine/source/platformPOSIX/posixVolume.cpp @@ -206,7 +206,7 @@ bool PosixFileSystem::rename(const Path& from,const Path& to) String fa = buildFileName(_volume,from); String fb = buildFileName(_volume,to); - if (!rename(fa.c_str(),fb.c_str())) + if (!::rename(fa.c_str(),fb.c_str())) return true; return false; diff --git a/Engine/source/platformSDL/sdlPlatformGL.cpp b/Engine/source/platformSDL/sdlPlatformGL.cpp index dbd163ecc..47eab147b 100644 --- a/Engine/source/platformSDL/sdlPlatformGL.cpp +++ b/Engine/source/platformSDL/sdlPlatformGL.cpp @@ -6,6 +6,8 @@ #include "gfx/gl/tGL/tWGL.h" #endif +#include "gfx/gl/gfxGLUtils.h" + namespace PlatformGL { @@ -69,6 +71,9 @@ namespace PlatformGL void setVSync(const int i) { + PRESERVE_FRAMEBUFFER(); + // Nvidia needs to have the default framebuffer bound or the vsync calls fail + glBindFramebuffer(GL_FRAMEBUFFER, 0); if( i == 1 || i == -1 ) { int ret = SDL_GL_SetSwapInterval(-1); @@ -78,6 +83,7 @@ namespace PlatformGL } else SDL_GL_SetSwapInterval(0); + } } diff --git a/Engine/source/platformSDL/threads/semaphore.cpp b/Engine/source/platformSDL/threads/semaphore.cpp index b31cb3688..af9141e87 100644 --- a/Engine/source/platformSDL/threads/semaphore.cpp +++ b/Engine/source/platformSDL/threads/semaphore.cpp @@ -25,8 +25,9 @@ #include #include -struct PlatformSemaphore +class PlatformSemaphore { +public: SDL_sem *semaphore; PlatformSemaphore(S32 initialCount) diff --git a/Engine/source/platformWin32/WinPlatformGL.cpp b/Engine/source/platformWin32/WinPlatformGL.cpp index a30212bad..cd9e1975e 100644 --- a/Engine/source/platformWin32/WinPlatformGL.cpp +++ b/Engine/source/platformWin32/WinPlatformGL.cpp @@ -2,11 +2,32 @@ #include "platform/platformGL.h" #include "gfx/gl/tGL/tWGL.h" +#include "gfx/gl/gfxGLUtils.h" void PlatformGL::setVSync(const int i) { - if (gglHasWExtension(wglGetCurrentDC(), EXT_swap_control)) + if (gglHasWExtension(EXT_swap_control)) { + PRESERVE_FRAMEBUFFER(); + // NVidia needs to have the default framebuffer bound or the vsync calls fail + glBindFramebuffer(GL_FRAMEBUFFER, 0); + + if (gglHasWExtension(EXT_swap_control_tear)) + { + if (i == 1 || i == -1) + { + BOOL ret = wglSwapIntervalEXT(-1); + + if (!ret) + wglSwapIntervalEXT(1); + } + else + { + wglSwapIntervalEXT(i); + } + return; + } + //fallback with no EXT_swap_control_tear wglSwapIntervalEXT(i); } } diff --git a/Engine/source/renderInstance/renderMeshMgr.cpp b/Engine/source/renderInstance/renderMeshMgr.cpp index 476c5e9b8..ce27a09c2 100644 --- a/Engine/source/renderInstance/renderMeshMgr.cpp +++ b/Engine/source/renderInstance/renderMeshMgr.cpp @@ -245,7 +245,7 @@ void RenderMeshMgr::render(SceneRenderState * state) if ( passRI->accuTex != lastAccuTex ) { sgData.accuTex = passRI->accuTex; - lastAccuTex = lastAccuTex; + lastAccuTex = passRI->accuTex; dirty = true; } diff --git a/Engine/source/renderInstance/renderParticleMgr.cpp b/Engine/source/renderInstance/renderParticleMgr.cpp index dcae9756c..ad0811f91 100644 --- a/Engine/source/renderInstance/renderParticleMgr.cpp +++ b/Engine/source/renderInstance/renderParticleMgr.cpp @@ -589,43 +589,51 @@ bool RenderParticleMgr::_initShader() void RenderParticleMgr::_onLMActivate( const char*, bool activate ) { - RenderPassManager *rpm = getRenderPass(); - if ( !rpm ) - return; - - // Hunt for the pre-pass manager/target - RenderPrePassMgr *prePassBin = NULL; - for( U32 i = 0; i < rpm->getManagerCount(); i++ ) + if ( activate ) { - RenderBinManager *bin = rpm->getManager(i); - if( bin->getRenderInstType() == RenderPrePassMgr::RIT_PrePass ) + RenderPassManager *rpm = getRenderPass(); + if ( !rpm ) + return; + + // Hunt for the pre-pass manager/target + RenderPrePassMgr *prePassBin = NULL; + for( U32 i = 0; i < rpm->getManagerCount(); i++ ) { - prePassBin = (RenderPrePassMgr*)bin; - break; + RenderBinManager *bin = rpm->getManager(i); + if( bin->getRenderInstType() == RenderPrePassMgr::RIT_PrePass ) + { + prePassBin = (RenderPrePassMgr*)bin; + break; + } } - } - // If we found the prepass bin, set this bin to render very shortly afterwards - // and re-add this render-manager. If there is no pre-pass bin, or it doesn't - // have a depth-texture, we can't render offscreen. - mOffscreenRenderEnabled = prePassBin && (prePassBin->getTargetChainLength() > 0); - if(mOffscreenRenderEnabled) - { - rpm->removeManager(this); - setRenderOrder( prePassBin->getRenderOrder() + 0.011f ); - rpm->addManager(this); - } + // If we found the prepass bin, set this bin to render very shortly afterwards + // and re-add this render-manager. If there is no pre-pass bin, or it doesn't + // have a depth-texture, we can't render offscreen. + mOffscreenRenderEnabled = prePassBin && (prePassBin->getTargetChainLength() > 0); + if(mOffscreenRenderEnabled) + { + rpm->removeManager(this); + setRenderOrder( prePassBin->getRenderOrder() + 0.011f ); + rpm->addManager(this); + } - // Find the targets we use - mPrepassTarget = NamedTexTarget::find( "prepass" ); - mEdgeTarget = NamedTexTarget::find( "edge" ); + // Find the targets we use + mPrepassTarget = NamedTexTarget::find( "prepass" ); + mEdgeTarget = NamedTexTarget::find( "edge" ); - // Setup the shader - if ( activate ) + // Setup the shader _initShader(); - if ( mScreenQuadVertBuff.isNull() ) - _initGFXResources(); + if ( mScreenQuadVertBuff.isNull() ) + _initGFXResources(); + } + else + { + mStencilClearSB = NULL; + mScreenQuadPrimBuff = NULL; + mScreenQuadVertBuff = NULL; + } } GFXStateBlockRef RenderParticleMgr::_getOffscreenStateBlock(ParticleRenderInst *ri) diff --git a/Engine/source/renderInstance/renderPassManager.cpp b/Engine/source/renderInstance/renderPassManager.cpp index f620a627b..3ed2671dc 100644 --- a/Engine/source/renderInstance/renderPassManager.cpp +++ b/Engine/source/renderInstance/renderPassManager.cpp @@ -124,6 +124,7 @@ RenderPassManager::RenderBinEventSignal& RenderPassManager::getRenderBinSignal() void RenderPassManager::initPersistFields() { + Parent::initPersistFields(); } RenderPassManager::RenderPassManager() diff --git a/Engine/source/renderInstance/renderPrePassMgr.cpp b/Engine/source/renderInstance/renderPrePassMgr.cpp index 2c3f2c4c2..88accf3c7 100644 --- a/Engine/source/renderInstance/renderPrePassMgr.cpp +++ b/Engine/source/renderInstance/renderPrePassMgr.cpp @@ -480,7 +480,7 @@ void RenderPrePassMgr::render( SceneRenderState *state ) if (passRI->accuTex != lastAccuTex) { sgData.accuTex = passRI->accuTex; - lastAccuTex = lastAccuTex; + lastAccuTex = passRI->accuTex; dirty = true; } @@ -612,9 +612,9 @@ void ProcessedPrePassMaterial::_determineFeatures( U32 stageNum, mIsLightmappedGeometry = ( fd.features.hasFeature( MFT_ToneMap ) || fd.features.hasFeature( MFT_LightMap ) || fd.features.hasFeature( MFT_VertLit ) || - ( bEnableMRTLightmap && fd.features.hasFeature( MFT_IsTranslucent ) || + ( bEnableMRTLightmap && (fd.features.hasFeature( MFT_IsTranslucent ) || fd.features.hasFeature( MFT_ForwardShading ) || - fd.features.hasFeature( MFT_IsTranslucentZWrite ) ) ); + fd.features.hasFeature( MFT_IsTranslucentZWrite) ) ) ); // Integrate proper opaque stencil write state mUserDefined.addDesc( mPrePassMgr->getOpaqueStenciWriteDesc( mIsLightmappedGeometry ) ); @@ -843,7 +843,7 @@ void ProcessedPrePassMaterial::addStateBlockDesc(const GFXStateBlockDesc& desc) if ( isTranslucent ) { prePassStateBlock.setBlend( true, GFXBlendSrcAlpha, GFXBlendInvSrcAlpha ); - prePassStateBlock.setColorWrites(false, false, false, true); + prePassStateBlock.setColorWrites(false, false, false, true); } // Enable z reads, but only enable zwrites if we're not translucent. diff --git a/Engine/source/scene/sceneContainer.cpp b/Engine/source/scene/sceneContainer.cpp index f5a271794..6f6202414 100644 --- a/Engine/source/scene/sceneContainer.cpp +++ b/Engine/source/scene/sceneContainer.cpp @@ -307,7 +307,7 @@ void SceneContainer::insertIntoBins(SceneObject* obj, // For huge objects, dump them into the overflow bin. Otherwise, everything // goes into the grid... // - if ((maxX - minX + 1) < csmNumBins || (maxY - minY + 1) < csmNumBins && !obj->isGlobalBounds()) + if ((maxX - minX + 1) < csmNumBins || ((maxY - minY + 1) < csmNumBins && !obj->isGlobalBounds())) { SceneObjectRef** pCurrInsert = &obj->mBinRefHead; @@ -892,7 +892,7 @@ bool SceneContainer::_castRay( U32 type, const Point3F& start, const Point3F& en *info = ri; info->point.interpolate(start, end, info->t); currentT = ri.t; - info->distance = (start - info->point).len(); + info->distance = (start - info->point).len(); } } } @@ -991,7 +991,7 @@ bool SceneContainer::_castRay( U32 type, const Point3F& start, const Point3F& en *info = ri; info->point.interpolate(start, end, info->t); currentT = ri.t; - info->distance = (start - info->point).len(); + info->distance = (start - info->point).len(); } } } @@ -1088,7 +1088,7 @@ bool SceneContainer::_castRay( U32 type, const Point3F& start, const Point3F& en *info = ri; info->point.interpolate(start, end, info->t); currentT = ri.t; - info->distance = (start - info->point).len(); + info->distance = (start - info->point).len(); } } } @@ -1602,7 +1602,7 @@ DefineEngineFunction( containerSearchCurrRadiusDist, F32, ( bool useClientContai //TODO: make RayInfo an API type DefineEngineFunction( containerRayCast, const char*, - ( Point3F start, Point3F end, U32 mask, SceneObject *pExempt, bool useClientContainer ), ( NULL, false ), + ( Point3F start, Point3F end, U32 mask, SceneObject *pExempt, bool useClientContainer ), ( nullAsType(), false ), "@brief Cast a ray from start to end, checking for collision against items matching mask.\n\n" "If pExempt is specified, then it is temporarily excluded from collision checks (For " diff --git a/Engine/source/sfx/sfxController.cpp b/Engine/source/sfx/sfxController.cpp index 76a5c1d45..f5f17dfb6 100644 --- a/Engine/source/sfx/sfxController.cpp +++ b/Engine/source/sfx/sfxController.cpp @@ -324,8 +324,8 @@ void SFXController::_printInsn( Insn& insn) Con::printf( "[SFXController] ip=%d: slot=%d: state=%s: Delay %f:%f:%f", mIp, insn.mSlotIndex, insn.mState ? insn.mState->getName() : "", insn.mArg.mDelayTime.mValue[ 0 ], - insn.mArg.mDelayTime.mVariance[ 0 ], - insn.mArg.mDelayTime.mVariance[ 1 ] + insn.mArg.mDelayTime.mVariance[ 0 ][ 0 ], + insn.mArg.mDelayTime.mVariance[ 0 ][ 1 ] ); break; diff --git a/Engine/source/sim/actionMap.cpp b/Engine/source/sim/actionMap.cpp index e4455d458..88bcde89e 100644 --- a/Engine/source/sim/actionMap.cpp +++ b/Engine/source/sim/actionMap.cpp @@ -36,138 +36,138 @@ IMPLEMENT_CONOBJECT(ActionMap); ConsoleDocClass( ActionMap, - "@brief ActionMaps assign platform input events to console commands.\n\n" + "@brief ActionMaps assign platform input events to console commands.\n\n" - "Any platform input event can be bound in a single, generic way. In theory, the game doesn't need to know if the event came from the keyboard, mouse, joystick " - "or some other input device. This allows users of the game to map keys and actions according to their own preferences. " - "Game action maps are arranged in a stack for processing so individual parts of the game can define specific " - "actions. For example, when the player jumps into a vehicle it could push a vehicle action map and pop the default player action map.\n\n" + "Any platform input event can be bound in a single, generic way. In theory, the game doesn't need to know if the event came from the keyboard, mouse, joystick " + "or some other input device. This allows users of the game to map keys and actions according to their own preferences. " + "Game action maps are arranged in a stack for processing so individual parts of the game can define specific " + "actions. For example, when the player jumps into a vehicle it could push a vehicle action map and pop the default player action map.\n\n" - "@section ActionMap_creation Creating an ActionMap\n" + "@section ActionMap_creation Creating an ActionMap\n" - "The input system allows for the creation of multiple ActionMaps, so long as they have unique names and do not already exist. It's a simple " - "three step process.\n\n" - "1. Check to see if the ActionMap exists\n" - "2. Delete it if it exists\n" - "3. Instantiate the ActionMap\n\n" + "The input system allows for the creation of multiple ActionMaps, so long as they have unique names and do not already exist. It's a simple " + "three step process.\n\n" + "1. Check to see if the ActionMap exists\n" + "2. Delete it if it exists\n" + "3. Instantiate the ActionMap\n\n" - "The following is an example of how to create a new ActionMap:\n" + "The following is an example of how to create a new ActionMap:\n" - "@tsexample\n" - "if ( isObject( moveMap ) )\n" - " moveMap.delete();\n" - "new ActionMap(moveMap);" - "@endtsexample\n\n\n" - - "@section ActionMap_binding Binding Functions\n" - "Once you have created an ActionMap, you can start binding functionality to events. Currently, Torque 3D supports the following devices out of the box\n\n" - "* Mouse\n\n" - "* Keyboard\n\n" - "* Joystick/Gamepad\n\n" - "* Xbox 360 Controller\n\n" + "@tsexample\n" + "if ( isObject( moveMap ) )\n" + " moveMap.delete();\n" + "new ActionMap(moveMap);" + "@endtsexample\n\n\n" + + "@section ActionMap_binding Binding Functions\n" + "Once you have created an ActionMap, you can start binding functionality to events. Currently, Torque 3D supports the following devices out of the box\n\n" + "* Mouse\n\n" + "* Keyboard\n\n" + "* Joystick/Gamepad\n\n" + "* Xbox 360 Controller\n\n" - "The two most commonly used binding methods are bind() and bindCmd(). Both are similar in that they will bind functionality to a device and event, " + "The two most commonly used binding methods are bind() and bindCmd(). Both are similar in that they will bind functionality to a device and event, " "but different in how the event is interpreted. With bind(), " - "you specify a device, action to bind, then a function to be called when the event happens.\n\n" + "you specify a device, action to bind, then a function to be called when the event happens.\n\n" - "@tsexample\n" - "// Simple function that prints to console\n" - "// %val - Sent by the device letting the user know\n" - "// if an input was pressed (true) or released (false)\n" - "function testInput(%val)\n" - "{\n" - " if(%val)\n" - " echo(\"Key is down\");\n" - " else\n" - " echo(\"Key was released\");\n" - "}\n\n" - "// Bind the \'K\' key to the testInput function\n" - "moveMap.bind(keyboard, \"k\", testInput);\n\n" - "@endtsexample\n\n\n" + "@tsexample\n" + "// Simple function that prints to console\n" + "// %val - Sent by the device letting the user know\n" + "// if an input was pressed (true) or released (false)\n" + "function testInput(%val)\n" + "{\n" + " if(%val)\n" + " echo(\"Key is down\");\n" + " else\n" + " echo(\"Key was released\");\n" + "}\n\n" + "// Bind the \'K\' key to the testInput function\n" + "moveMap.bind(keyboard, \"k\", testInput);\n\n" + "@endtsexample\n\n\n" - "bindCmd is an alternative method for binding commands. This function is similar to bind(), " + "bindCmd is an alternative method for binding commands. This function is similar to bind(), " "except two functions are set to be called when the event is processed.\n\n" - "One will be called when the event is activated (input down), while the other is activated when the event is broken (input release). " + "One will be called when the event is activated (input down), while the other is activated when the event is broken (input release). " "When using bindCmd(), pass the functions as strings rather than the function names.\n\n" - "@tsexample\n" - "// Print to the console when the spacebar is pressed\n" - "function onSpaceDown()\n" - "{\n" - " echo(\"Space bar down!\");\n" - "}\n\n" + "@tsexample\n" + "// Print to the console when the spacebar is pressed\n" + "function onSpaceDown()\n" + "{\n" + " echo(\"Space bar down!\");\n" + "}\n\n" - "// Print to the console when the spacebar is released\n" - "function onSpaceUp()\n" - "{\n" - " echo(\"Space bar up!\");\n" - "}\n\n" + "// Print to the console when the spacebar is released\n" + "function onSpaceUp()\n" + "{\n" + " echo(\"Space bar up!\");\n" + "}\n\n" - "// Bind the commands onSpaceDown and onSpaceUp to spacebar events\n" - "moveMap.bindCmd(keyboard, \"space\", \"onSpaceDown();\", \"onSpaceUp();\");\n" - "@endtsexample\n\n" - - "@section ActionMap_switching Switching ActionMaps\n" - "Let's say you want to have different ActionMaps activated based on game play situations. A classic example would be first person shooter controls and racing controls " - "in the same game. On foot, spacebar may cause your player to jump. In a vehicle, it may cause some kind of \"turbo charge\". You simply need to push/pop the ActionMaps appropriately:\n\n" + "// Bind the commands onSpaceDown and onSpaceUp to spacebar events\n" + "moveMap.bindCmd(keyboard, \"space\", \"onSpaceDown();\", \"onSpaceUp();\");\n" + "@endtsexample\n\n" + + "@section ActionMap_switching Switching ActionMaps\n" + "Let's say you want to have different ActionMaps activated based on game play situations. A classic example would be first person shooter controls and racing controls " + "in the same game. On foot, spacebar may cause your player to jump. In a vehicle, it may cause some kind of \"turbo charge\". You simply need to push/pop the ActionMaps appropriately:\n\n" - "First, create two separate ActionMaps:\n\n" - "@tsexample\n" - "// Create the two ActionMaps\n" - "if ( isObject( moveMap ) )\n" - " moveMap.delete();\n" - "new ActionMap(moveMap);\n\n" - "if ( isObject( carMap ) )\n" - " carMap.delete();\n" - "new ActionMap(carMap);\n\n" - "@endtsexample\n\n" + "First, create two separate ActionMaps:\n\n" + "@tsexample\n" + "// Create the two ActionMaps\n" + "if ( isObject( moveMap ) )\n" + " moveMap.delete();\n" + "new ActionMap(moveMap);\n\n" + "if ( isObject( carMap ) )\n" + " carMap.delete();\n" + "new ActionMap(carMap);\n\n" + "@endtsexample\n\n" - "Next, create the two separate functions. Both will be bound to spacebar, but not the same ActionMap:\n\n" - "@tsexample\n" - "// Print to the console the player is jumping\n" - "function playerJump(%val)\n" - "{\n" - " if(%val)\n" - " echo(\"Player jumping!\");\n" - "}\n\n" - "// Print to the console the vehicle is charging\n" - "function turboCharge()\n" - "{\n" - " if(%val)\n" - " echo(\"Vehicle turbo charging!\");\n" - "}\n" - "@endtsexample\n\n" - - "You are now ready to bind functions to your ActionMaps' devices:\n\n" + "Next, create the two separate functions. Both will be bound to spacebar, but not the same ActionMap:\n\n" + "@tsexample\n" + "// Print to the console the player is jumping\n" + "function playerJump(%val)\n" + "{\n" + " if(%val)\n" + " echo(\"Player jumping!\");\n" + "}\n\n" + "// Print to the console the vehicle is charging\n" + "function turboCharge()\n" + "{\n" + " if(%val)\n" + " echo(\"Vehicle turbo charging!\");\n" + "}\n" + "@endtsexample\n\n" + + "You are now ready to bind functions to your ActionMaps' devices:\n\n" - "@tsexample\n" - "// Bind the spacebar to the playerJump function\n" - "// when moveMap is the active ActionMap\n" - "moveMap.bind(keyboard, \"space\", playerJump);\n\n" - "// Bind the spacebar to the turboCharge function\n" - "// when carMap is the active ActionMap\n" - "carMap.bind(keyboard, \"space\", turboCharge);\n" - "@endtsexample\n" + "@tsexample\n" + "// Bind the spacebar to the playerJump function\n" + "// when moveMap is the active ActionMap\n" + "moveMap.bind(keyboard, \"space\", playerJump);\n\n" + "// Bind the spacebar to the turboCharge function\n" + "// when carMap is the active ActionMap\n" + "carMap.bind(keyboard, \"space\", turboCharge);\n" + "@endtsexample\n" - "Finally, you can use the push() and pop() commands on each ActionMap to toggle activation. To activate an ActionMap, use push():\n\n" + "Finally, you can use the push() and pop() commands on each ActionMap to toggle activation. To activate an ActionMap, use push():\n\n" - "@tsexample\n" - "// Make moveMap the active action map\n" - "// You should now be able to activate playerJump with spacebar\n" - "moveMap.push();\n" - "@endtsexample\n\n" + "@tsexample\n" + "// Make moveMap the active action map\n" + "// You should now be able to activate playerJump with spacebar\n" + "moveMap.push();\n" + "@endtsexample\n\n" - "To switch ActionMaps, first pop() the old one. Then you can push() the new one:\n\n" + "To switch ActionMaps, first pop() the old one. Then you can push() the new one:\n\n" - "@tsexample\n" - "// Deactivate moveMap\n" - "moveMap.pop();\n\n" - "// Activate carMap\n" - "carMap.push();\n\n" - "@endtsexample\n\n\n" + "@tsexample\n" + "// Deactivate moveMap\n" + "moveMap.pop();\n\n" + "// Activate carMap\n" + "carMap.push();\n\n" + "@endtsexample\n\n\n" - "@ingroup Input" - + "@ingroup Input" + ); // This is used for determing keys that have ascii codes for the foreign keyboards. IsAlpha doesn't work on foreign keys. @@ -775,32 +775,32 @@ const char* ActionMap::getBinding( const char* command ) // const char* ActionMap::getCommand( const char* device, const char* action ) { - U32 deviceType; - U32 deviceInst; - if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) - { - EventDescriptor eventDescriptor; - if ( createEventDescriptor( action, &eventDescriptor ) ) - { - const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); - if ( mapNode ) - { - if ( mapNode->flags & Node::BindCmd ) - { - S32 bufferLen = dStrlen( mapNode->makeConsoleCommand ) + dStrlen( mapNode->breakConsoleCommand ) + 2; - char* returnString = Con::getReturnBuffer( bufferLen ); - dSprintf( returnString, bufferLen, "%s\t%s", - ( mapNode->makeConsoleCommand ? mapNode->makeConsoleCommand : "" ), - ( mapNode->breakConsoleCommand ? mapNode->breakConsoleCommand : "" ) ); - return( returnString ); - } - else - return( mapNode->consoleFunction ); - } - } - } + U32 deviceType; + U32 deviceInst; + if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) + { + EventDescriptor eventDescriptor; + if ( createEventDescriptor( action, &eventDescriptor ) ) + { + const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); + if ( mapNode ) + { + if ( mapNode->flags & Node::BindCmd ) + { + S32 bufferLen = dStrlen( mapNode->makeConsoleCommand ) + dStrlen( mapNode->breakConsoleCommand ) + 2; + char* returnString = Con::getReturnBuffer( bufferLen ); + dSprintf( returnString, bufferLen, "%s\t%s", + ( mapNode->makeConsoleCommand ? mapNode->makeConsoleCommand : "" ), + ( mapNode->breakConsoleCommand ? mapNode->breakConsoleCommand : "" ) ); + return( returnString ); + } + else + return( mapNode->consoleFunction ); + } + } + } - return( "" ); + return( "" ); } //------------------------------------------------------------------------------ @@ -808,92 +808,92 @@ const char* ActionMap::getCommand( const char* device, const char* action ) // Obviously, this should only be used for axes. bool ActionMap::isInverted( const char* device, const char* action ) { - U32 deviceType; - U32 deviceInst; - if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) - { - EventDescriptor eventDescriptor; - if ( createEventDescriptor( action, &eventDescriptor ) ) - { - const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); - if ( mapNode ) - return( mapNode->flags & Node::Inverted ); - } - } + U32 deviceType; + U32 deviceInst; + if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) + { + EventDescriptor eventDescriptor; + if ( createEventDescriptor( action, &eventDescriptor ) ) + { + const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); + if ( mapNode ) + return( mapNode->flags & Node::Inverted ); + } + } - Con::errorf( "The input event specified by %s %s is not in this action map!", device, action ); - return( false ); + Con::errorf( "The input event specified by %s %s is not in this action map!", device, action ); + return( false ); } //------------------------------------------------------------------------------ F32 ActionMap::getScale( const char* device, const char* action ) { - U32 deviceType; - U32 deviceInst; - if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) - { - EventDescriptor eventDescriptor; - if ( createEventDescriptor( action, &eventDescriptor ) ) - { - const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); - if ( mapNode ) - { - if ( mapNode->flags & Node::HasScale ) - return( mapNode->scaleFactor ); + U32 deviceType; + U32 deviceInst; + if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) + { + EventDescriptor eventDescriptor; + if ( createEventDescriptor( action, &eventDescriptor ) ) + { + const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); + if ( mapNode ) + { + if ( mapNode->flags & Node::HasScale ) + return( mapNode->scaleFactor ); else return( 1.0f ); } - } - } + } + } - Con::errorf( "The input event specified by %s %s is not in this action map!", device, action ); - return( 1.0f ); + Con::errorf( "The input event specified by %s %s is not in this action map!", device, action ); + return( 1.0f ); } //------------------------------------------------------------------------------ const char* ActionMap::getDeadZone( const char* device, const char* action ) { - U32 deviceType; - U32 deviceInst; - if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) - { - EventDescriptor eventDescriptor; - if ( createEventDescriptor( action, &eventDescriptor ) ) - { - const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); - if ( mapNode ) - { - if ( mapNode->flags & Node::HasDeadZone ) + U32 deviceType; + U32 deviceInst; + if ( getDeviceTypeAndInstance( device, deviceType, deviceInst ) ) + { + EventDescriptor eventDescriptor; + if ( createEventDescriptor( action, &eventDescriptor ) ) + { + const ActionMap::Node* mapNode = findNode( deviceType, deviceInst, eventDescriptor.flags, eventDescriptor.eventCode ); + if ( mapNode ) + { + if ( mapNode->flags & Node::HasDeadZone ) { - char buf[64]; - dSprintf( buf, sizeof( buf ), "%g %g", mapNode->deadZoneBegin, mapNode->deadZoneEnd ); - char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 ); - dStrcpy( returnString, buf ); - return( returnString ); - } - else - return( "0 0" ); - } - } - } + char buf[64]; + dSprintf( buf, sizeof( buf ), "%g %g", mapNode->deadZoneBegin, mapNode->deadZoneEnd ); + char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 ); + dStrcpy( returnString, buf ); + return( returnString ); + } + else + return( "0 0" ); + } + } + } - Con::errorf( "The input event specified by %s %s is not in this action map!", device, action ); - return( "" ); + Con::errorf( "The input event specified by %s %s is not in this action map!", device, action ); + return( "" ); } //------------------------------------------------------------------------------ const char* ActionMap::buildActionString( const InputEventInfo* event ) { - const char* modifierString = getModifierString( event->modifier ); + const char* modifierString = getModifierString( event->modifier ); - char objectBuffer[64]; - if ( !getKeyString( event->objInst, objectBuffer ) ) - return( "" ); + char objectBuffer[64]; + if ( !getKeyString( event->objInst, objectBuffer ) ) + return( "" ); - U32 returnLen = dStrlen( modifierString ) + dStrlen( objectBuffer ) + 2; - char* returnString = Con::getReturnBuffer( returnLen ); - dSprintf( returnString, returnLen - 1, "%s%s", modifierString, objectBuffer ); - return( returnString ); + U32 returnLen = dStrlen( modifierString ) + dStrlen( objectBuffer ) + 2; + char* returnString = Con::getReturnBuffer( returnLen ); + dSprintf( returnString, returnLen - 1, "%s%s", modifierString, objectBuffer ); + return( returnString ); } //------------------------------------------------------------------------------ @@ -989,15 +989,15 @@ bool ActionMap::getDeviceName(const U32 deviceType, const U32 deviceInstance, ch //------------------------------------------------------------------------------ const char* ActionMap::getModifierString(const U32 modifiers) { - U32 realModifiers = modifiers; - if ( modifiers & SI_LSHIFT || modifiers & SI_RSHIFT ) - realModifiers |= SI_SHIFT; - if ( modifiers & SI_LCTRL || modifiers & SI_RCTRL ) - realModifiers |= SI_CTRL; - if ( modifiers & SI_LALT || modifiers & SI_RALT ) - realModifiers |= SI_ALT; - if ( modifiers & SI_MAC_LOPT || modifiers & SI_MAC_ROPT ) - realModifiers |= SI_MAC_OPT; + U32 realModifiers = modifiers; + if ( modifiers & SI_LSHIFT || modifiers & SI_RSHIFT ) + realModifiers |= SI_SHIFT; + if ( modifiers & SI_LCTRL || modifiers & SI_RCTRL ) + realModifiers |= SI_CTRL; + if ( modifiers & SI_LALT || modifiers & SI_RALT ) + realModifiers |= SI_ALT; + if ( modifiers & SI_MAC_LOPT || modifiers & SI_MAC_ROPT ) + realModifiers |= SI_MAC_OPT; switch (realModifiers & (SI_SHIFT|SI_CTRL|SI_ALT|SI_MAC_OPT)) { @@ -1820,19 +1820,19 @@ static ConsoleDocFragment _ActionMapbind1( "@param command The function to bind to the action. Function must have a single boolean argument.\n" "@return True if the binding was successful, false if the device was unknown or description failed.\n\n" "@tsexample\n" - "// Simple function that prints to console\n" - "// %val - Sent by the device letting the user know\n" - "// if an input was pressed (true) or released (false)\n" - "function testInput(%val)\n" - "{\n" - " if(%val)\n" - " echo(\"Key is down\");\n" - " else\n" - " echo(\"Key was released\");\n" - "}\n\n" - "// Bind the \'K\' key to the testInput function\n" - "moveMap.bind(keyboard, k, testInput);\n\n" - "@endtsexample\n\n\n", + "// Simple function that prints to console\n" + "// %val - Sent by the device letting the user know\n" + "// if an input was pressed (true) or released (false)\n" + "function testInput(%val)\n" + "{\n" + " if(%val)\n" + " echo(\"Key is down\");\n" + " else\n" + " echo(\"Key was released\");\n" + "}\n\n" + "// Bind the \'K\' key to the testInput function\n" + "moveMap.bind(keyboard, k, testInput);\n\n" + "@endtsexample\n\n\n", "ActionMap", "bool bind( string device, string action, string command );"); @@ -1854,22 +1854,22 @@ static ConsoleDocFragment _ActionMapbind2( "@param command The function bound to the action. Must take in a single argument.\n" "@return True if the binding was successful, false if the device was unknown or description failed.\n\n" "@tsexample\n" - "// Simple function that adjusts the pitch of the camera based on the " + "// Simple function that adjusts the pitch of the camera based on the " "mouse's movement along the X axis.\n" - "function testPitch(%val)\n" - "{\n" - " %pitchAdj = getMouseAdjustAmount(%val);\n" - " $mvPitch += %pitchAdj;\n" - "}\n\n" - "// Bind the mouse's X axis to the testPitch function\n" - "// DI is flagged, meaning input is inverted and has a deadzone\n" - "%this.bind( mouse, \"xaxis\", \"DI\", \"-0.23 0.23\", testPitch );\n" - "@endtsexample\n\n\n", + "function testPitch(%val)\n" + "{\n" + " %pitchAdj = getMouseAdjustAmount(%val);\n" + " $mvPitch += %pitchAdj;\n" + "}\n\n" + "// Bind the mouse's X axis to the testPitch function\n" + "// DI is flagged, meaning input is inverted and has a deadzone\n" + "%this.bind( mouse, \"xaxis\", \"DI\", \"-0.23 0.23\", testPitch );\n" + "@endtsexample\n\n\n", "ActionMap", "bool bind( string device, string action, string flag, string deadZone, string scale, string command );"); ConsoleMethod( ActionMap, bind, bool, 5, 10, "actionMap.bind( device, action, [modifier spec, mod...], command )" - "@hide") + "@hide") { StringStackWrapper args(argc - 2, argv + 2); return object->processBind( args.count(), args, NULL ); @@ -1918,7 +1918,7 @@ static ConsoleDocFragment _ActionMapbindObj2( "bool bindObj( string device, string action, string flag, string deadZone, string scale, string command, SimObjectID object );"); ConsoleMethod( ActionMap, bindObj, bool, 6, 11, "(device, action, [modifier spec, mod...], command, object)" - "@hide") + "@hide") { SimObject* simObject = Sim::findObject(argv[argc - 1]); if ( simObject == NULL ) @@ -1941,20 +1941,20 @@ DefineEngineMethod( ActionMap, bindCmd, bool, ( const char* device, const char* "@param makeCmd The command to execute when the device/action is made.\n" "@param breakCmd [optional] The command to execute when the device or action is unmade.\n" "@return True the bind was successful, false if the device was unknown or description failed.\n" - "@tsexample\n" - "// Print to the console when the spacebar is pressed\n" - "function onSpaceDown()\n" - "{\n" - " echo(\"Space bar down!\");\n" - "}\n\n" - "// Print to the console when the spacebar is released\n" - "function onSpaceUp()\n" - "{\n" - " echo(\"Space bar up!\");\n" - "}\n\n" + "@tsexample\n" + "// Print to the console when the spacebar is pressed\n" + "function onSpaceDown()\n" + "{\n" + " echo(\"Space bar down!\");\n" + "}\n\n" + "// Print to the console when the spacebar is released\n" + "function onSpaceUp()\n" + "{\n" + " echo(\"Space bar up!\");\n" + "}\n\n" "// Bind the commands onSpaceDown() and onSpaceUp() to spacebar events\n\n" - "moveMap.bindCmd(keyboard, \"space\", \"onSpaceDown();\", \"onSpaceUp();\");\n" - "@endtsexample\n\n") + "moveMap.bindCmd(keyboard, \"space\", \"onSpaceDown();\", \"onSpaceUp();\");\n" + "@endtsexample\n\n") { return object->processBindCmd( device, action, makeCmd, breakCmd ); } @@ -1964,9 +1964,9 @@ DefineEngineMethod( ActionMap, unbind, bool, ( const char* device, const char* a "@param device The device to unbind from. Can be a keyboard, mouse, joystick or a gamepad.\n" "@param action The device action to unbind from. The action is dependant upon the device. Specify a key for keyboards.\n" "@return True if the unbind was successful, false if the device was unknown or description failed.\n\n" - "@tsexample\n" - "moveMap.unbind(\"keyboard\", \"space\");\n" - "@endtsexample\n\n") + "@tsexample\n" + "moveMap.unbind(\"keyboard\", \"space\");\n" + "@endtsexample\n\n") { return object->processUnbind( device, action ); } @@ -1977,7 +1977,7 @@ DefineEngineMethod( ActionMap, unbindObj, bool, ( const char* device, const char "@param action The device action to unbind from. The action is dependant upon the device. Specify a key for keyboards.\n" "@param obj The object to perform unbind against.\n" "@return True if the unbind was successful, false if the device was unknown or description failed.\n" - "@tsexample\n" + "@tsexample\n" "moveMap.unbindObj(\"keyboard\", \"numpad1\", \"rangeChange\", %player);" "@endtsexample\n\n\n") { @@ -1991,15 +1991,15 @@ DefineEngineMethod( ActionMap, unbindObj, bool, ( const char* device, const char return object->processUnbind( device, action, simObject ); } -DefineEngineMethod( ActionMap, save, void, ( const char* fileName, bool append ), ( NULL, false ), +DefineEngineMethod( ActionMap, save, void, ( const char* fileName, bool append ), ( nullAsType(), false ), "@brief Saves the ActionMap to a file or dumps it to the console.\n\n" "@param fileName The file path to save the ActionMap to. If a filename is not specified " " the ActionMap will be dumped to the console.\n" "@param append Whether to write the ActionMap at the end of the file or overwrite it.\n" - "@tsexample\n" - "// Write out the actionmap into the config.cs file\n" + "@tsexample\n" + "// Write out the actionmap into the config.cs file\n" "moveMap.save( \"scripts/client/config.cs\" );" - "@endtsexample\n\n") + "@endtsexample\n\n") { char buffer[1024]; @@ -2015,7 +2015,7 @@ DefineEngineMethod( ActionMap, save, void, ( const char* fileName, bool append ) DefineEngineFunction( getCurrentActionMap, ActionMap*, (),, "@brief Returns the current %ActionMap.\n" "@see ActionMap" - "@ingroup Input") + "@ingroup Input") { SimSet* pActionMapSet = Sim::getActiveActionMapSet(); return dynamic_cast< ActionMap* >( pActionMapSet->last() ); @@ -2024,10 +2024,10 @@ DefineEngineFunction( getCurrentActionMap, ActionMap*, (),, DefineEngineMethod( ActionMap, push, void, (),, "@brief Push the ActionMap onto the %ActionMap stack.\n\n" "Activates an ActionMap and placees it at the top of the ActionMap stack.\n\n" - "@tsexample\n" - "// Make moveMap the active action map\n" - "moveMap.push();\n" - "@endtsexample\n\n" + "@tsexample\n" + "// Make moveMap the active action map\n" + "moveMap.push();\n" + "@endtsexample\n\n" "@see ActionMap") { SimSet* pActionMapSet = Sim::getActiveActionMapSet(); @@ -2037,10 +2037,10 @@ DefineEngineMethod( ActionMap, push, void, (),, DefineEngineMethod( ActionMap, pop, void, (),, "@brief Pop the ActionMap off the %ActionMap stack.\n\n" "Deactivates an %ActionMap and removes it from the @ActionMap stack.\n" - "@tsexample\n" - "// Deactivate moveMap\n" - "moveMap.pop();\n" - "@endtsexample\n\n" + "@tsexample\n" + "// Deactivate moveMap\n" + "moveMap.pop();\n" + "@endtsexample\n\n" "@see ActionMap") { SimSet* pActionMapSet = Sim::getActiveActionMapSet(); @@ -2053,20 +2053,20 @@ DefineEngineMethod( ActionMap, getBinding, const char*, ( const char* command ), "@param command The function to search bindings for.\n" "@return The binding against the specified command. Returns an empty string(\"\") " "if a binding wasn't found.\n" - "@tsexample\n" - "// Find what the function \"jump()\" is bound to in moveMap\n" - "%bind = moveMap.getBinding( \"jump\" );\n\n" - "if ( %bind !$= \"\" )\n" - "{\n" - "// Find out what device is used in the binding\n" - " %device = getField( %bind, 0 );\n\n" - "// Find out what action (such as a key) is used in the binding\n" - " %action = getField( %bind, 1 );\n" - "}\n" - "@endtsexample\n\n" + "@tsexample\n" + "// Find what the function \"jump()\" is bound to in moveMap\n" + "%bind = moveMap.getBinding( \"jump\" );\n\n" + "if ( %bind !$= \"\" )\n" + "{\n" + "// Find out what device is used in the binding\n" + " %device = getField( %bind, 0 );\n\n" + "// Find out what action (such as a key) is used in the binding\n" + " %action = getField( %bind, 1 );\n" + "}\n" + "@endtsexample\n\n" "@see getField") { - return object->getBinding( command ); + return object->getBinding( command ); } DefineEngineMethod( ActionMap, getCommand, const char*, ( const char* device, const char* action ),, @@ -2074,15 +2074,15 @@ DefineEngineMethod( ActionMap, getCommand, const char*, ( const char* device, co "@param device The device that was bound. Can be a keyboard, mouse, joystick or a gamepad.\n" "@param action The device action that was bound. The action is dependant upon the device. Specify a key for keyboards.\n" "@return The command against the specified device and action.\n" - "@tsexample\n" - "// Find what function is bound to a device\'s action\n" - "// In this example, \"jump()\" was assigned to the space key in another script\n" - "%command = moveMap.getCommand(\"keyboard\", \"space\");\n\n" - "// Should print \"jump\" in the console\n" - "echo(%command)\n" - "@endtsexample\n\n") + "@tsexample\n" + "// Find what function is bound to a device\'s action\n" + "// In this example, \"jump()\" was assigned to the space key in another script\n" + "%command = moveMap.getCommand(\"keyboard\", \"space\");\n\n" + "// Should print \"jump\" in the console\n" + "echo(%command)\n" + "@endtsexample\n\n") { - return object->getCommand( device, action ); + return object->getCommand( device, action ); } DefineEngineMethod( ActionMap, isInverted, bool, ( const char* device, const char* action ),, @@ -2091,12 +2091,12 @@ DefineEngineMethod( ActionMap, isInverted, bool, ( const char* device, const cha "@param device The device that was bound. Can be a keyboard, mouse, joystick or a gamepad.\n" "@param action The device action that was bound. The action is dependant upon the device. Specify a key for keyboards.\n" "@return True if the specified device and action is inverted.\n" - "@tsexample\n" + "@tsexample\n" "%if ( moveMap.isInverted( \"mouse\", \"xaxis\"))\n" " echo(\"Mouse's xAxis is inverted\");" - "@endtsexample\n\n") + "@endtsexample\n\n") { - return object->isInverted( device, action ); + return object->isInverted( device, action ); } DefineEngineMethod( ActionMap, getScale, F32, ( const char* device, const char* action ),, @@ -2104,11 +2104,11 @@ DefineEngineMethod( ActionMap, getScale, F32, ( const char* device, const char* "@param device The device that was bound. Can be keyboard, mouse, joystick or gamepad.\n" "@param action The device action that was bound. The action is dependant upon the device. Specify a key for keyboards.\n" "@return Any scaling applied to the specified device and action.\n" - "@tsexample\n" - "%scale = %moveMap.getScale( \"gamepad\", \"thumbrx\");\n" - "@endtsexample\n\n") + "@tsexample\n" + "%scale = %moveMap.getScale( \"gamepad\", \"thumbrx\");\n" + "@endtsexample\n\n") { - return object->getScale( device, action ); + return object->getScale( device, action ); } DefineEngineMethod( ActionMap, getDeadZone, const char*, ( const char* device, const char* action ),, @@ -2117,11 +2117,11 @@ DefineEngineMethod( ActionMap, getDeadZone, const char*, ( const char* device, c "@param action The device action that was bound. The action is dependant upon the device. Specify a key for keyboards.\n" "@return The dead zone for the specified device and action. Returns \"0 0\" if there is no dead zone " "or an empty string(\"\") if the mapping was not found.\n" - "@tsexample\n" - "%deadZone = moveMap.getDeadZone( \"gamepad\", \"thumbrx\");\n" - "@endtsexample\n\n") + "@tsexample\n" + "%deadZone = moveMap.getDeadZone( \"gamepad\", \"thumbrx\");\n" + "@endtsexample\n\n") { - return object->getDeadZone( device, action ); + return object->getDeadZone( device, action ); } //------------------------------------------------------------------------------ diff --git a/Engine/source/ts/tsShapeConstruct.h b/Engine/source/ts/tsShapeConstruct.h index 24dffe0da..7826e0507 100644 --- a/Engine/source/ts/tsShapeConstruct.h +++ b/Engine/source/ts/tsShapeConstruct.h @@ -97,7 +97,8 @@ public: { eCommandType type; // Command type StringTableEntry name; // Command name - String argv[10]; // Command arguments + static const U32 MAX_ARGS = 10; + String argv[MAX_ARGS]; // Command arguments S32 argc; // Number of arguments Command() : type(CmdInvalid), name(0), argc(0) { } Command( const char* _name ) @@ -105,68 +106,12 @@ public: { name = StringTable->insert( _name ); } - - // Helper functions to fill in the command arguments - inline void addArgs() { } - - template< typename A > - inline void addArgs( A a ) - { - argv[argc++] = EngineMarshallData( a ); - } - template< typename A, typename B > void addArgs( A a, B b ) - { - addArgs( a ); - addArgs( b ); - } - template< typename A, typename B, typename C > - inline void addArgs( A a, B b, C c ) - { - addArgs( a ); - addArgs( b, c ); - } - template< typename A, typename B, typename C, typename D > - inline void addArgs( A a, B b, C c, D d ) - { - addArgs( a ); - addArgs( b, c, d ); - } - template< typename A, typename B, typename C, typename D, typename E > - inline void addArgs( A a, B b, C c, D d, E e ) - { - addArgs( a ); - addArgs( b, c, d, e ); - } - template< typename A, typename B, typename C, typename D, typename E, typename F > - inline void addArgs( A a, B b, C c, D d, E e, F f ) - { - addArgs( a ); - addArgs( b, c, d, e, f ); - } - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G > - inline void addArgs( A a, B b, C c, D d, E e, F f, G g ) - { - addArgs( a ); - addArgs( b, c, d, e, f, g ); - } - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H > - inline void addArgs( A a, B b, C c, D d, E e, F f, G g, H h ) - { - addArgs( a ); - addArgs( b, c, d, e, f, g, h ); - } - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I > - inline void addArgs( A a, B b, C c, D d, E e, F f, G g, H h, I i ) - { - addArgs( a ); - addArgs( b, c, d, e, f, g, h, i ); - } - template< typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J > - inline void addArgs( A a, B b, C c, D d, E e, F f, G g, H h, I i, J j ) - { - addArgs( a ); - addArgs( b, c, d, e, f, g, h, i, j ); - } + + // Helper functions to fill in the command arguments + template inline void addArgs(ArgTs ...args){ + using Helper = engineAPI::detail::MarshallHelpers; + Helper::marshallEach(argc, argv, args...); + } }; Vector mCommands; diff --git a/Engine/source/windowManager/sdl/sdlSplashScreen.cpp b/Engine/source/windowManager/sdl/sdlSplashScreen.cpp index bf0931a9c..1cf2440af 100644 --- a/Engine/source/windowManager/sdl/sdlSplashScreen.cpp +++ b/Engine/source/windowManager/sdl/sdlSplashScreen.cpp @@ -22,7 +22,7 @@ #include "platform/platform.h" #include "console/console.h" - +#include "gfx/bitmap/gBitmap.h" #include "SDL.h" #include "windowManager/sdl/sdlWindow.h" @@ -36,7 +36,52 @@ bool Platform::displaySplashWindow( String path ) if(path.isEmpty()) return false; - gSplashImage = SDL_LoadBMP(path); + Torque::Path iconPath = Torque::Path(path); + + if (iconPath.getExtension() == String("bmp")) + { + Con::errorf("Unable to use bmp format images for the splash screen. Please use a different format."); + return false; + } + + Resource img = GBitmap::load(iconPath); + if (img != NULL) + { + U32 pitch; + U32 width = img->getWidth(); + bool hasAlpha = img->getHasTransparency(); + U32 depth; + + if (hasAlpha) + { + pitch = 4 * width; + depth = 32; + } + else + { + pitch = 3 * width; + depth = 24; + } + + Uint32 rmask, gmask, bmask, amask; + if (SDL_BYTEORDER == SDL_BIG_ENDIAN) + { + S32 shift = hasAlpha ? 8 : 0; + rmask = 0xff000000 >> shift; + gmask = 0x00ff0000 >> shift; + bmask = 0x0000ff00 >> shift; + amask = 0x000000ff >> shift; + } + else + { + rmask = 0x000000ff; + gmask = 0x0000ff00; + bmask = 0x00ff0000; + amask = hasAlpha ? 0xff000000 : 0; + } + + gSplashImage = SDL_CreateRGBSurfaceFrom(img->getAddress(0, 0), img->getWidth(), img->getHeight(), depth, pitch, rmask, gmask, bmask, amask); + } //now the pop-up window if (gSplashImage) diff --git a/Engine/source/windowManager/sdl/sdlWindow.cpp b/Engine/source/windowManager/sdl/sdlWindow.cpp index 510834fca..3c819248b 100644 --- a/Engine/source/windowManager/sdl/sdlWindow.cpp +++ b/Engine/source/windowManager/sdl/sdlWindow.cpp @@ -51,23 +51,41 @@ namespace { U32 ret = 0; - if(mod & KMOD_LSHIFT) - ret |= IM_LSHIFT; + if (mod & KMOD_LSHIFT) + { + ret |= SI_LSHIFT; + ret |= SI_SHIFT; + } - if(mod & KMOD_RSHIFT) - ret |= IM_RSHIFT; + if (mod & KMOD_RSHIFT) + { + ret |= SI_RSHIFT; + ret |= SI_SHIFT; + } - if(mod & KMOD_LCTRL) - ret |= IM_LCTRL; + if (mod & KMOD_LCTRL) + { + ret |= SI_LCTRL; + ret |= SI_CTRL; + } - if(mod & KMOD_RCTRL) - ret |= IM_RCTRL; + if (mod & KMOD_RCTRL) + { + ret |= SI_RCTRL; + ret |= SI_CTRL; + } - if(mod & KMOD_LALT) - ret |= IM_LALT; + if (mod & KMOD_LALT) + { + ret |= SI_LALT; + ret |= SI_ALT; + } - if(mod & KMOD_RALT) - ret |= IM_RALT; + if (mod & KMOD_RALT) + { + ret |= SI_RALT; + ret |= SI_ALT; + } return ret; } diff --git a/Engine/source/windowManager/sdl/sdlWindowMgr.cpp b/Engine/source/windowManager/sdl/sdlWindowMgr.cpp index 6157374dd..489377082 100644 --- a/Engine/source/windowManager/sdl/sdlWindowMgr.cpp +++ b/Engine/source/windowManager/sdl/sdlWindowMgr.cpp @@ -168,47 +168,55 @@ PlatformWindow *PlatformWindowManagerSDL::createWindow(GFXDevice *device, const //Now, fetch our window icon, if any Torque::Path iconPath = Torque::Path(Con::getVariable( "$Core::windowIcon" )); - Resource bmp = GBitmap::load(iconPath); - if (bmp != NULL) + + if (iconPath.getExtension() == String("bmp")) { - U32 pitch; - U32 width = bmp->getWidth(); - bool hasAlpha = bmp->getHasTransparency(); - U32 depth; - - if (hasAlpha) + Con::errorf("Unable to use bmp format images for the window icon. Please use a different format."); + } + else + { + Resource img = GBitmap::load(iconPath); + if (img != NULL) { - pitch = 4 * width; - depth = 32; - } - else - { - pitch = 3 * width; - depth = 24; - } + U32 pitch; + U32 width = img->getWidth(); + bool hasAlpha = img->getHasTransparency(); + U32 depth; - Uint32 rmask, gmask, bmask, amask; - if (SDL_BYTEORDER == SDL_BIG_ENDIAN) - { - S32 shift = hasAlpha ? 8 : 0; - rmask = 0xff000000 >> shift; - gmask = 0x00ff0000 >> shift; - bmask = 0x0000ff00 >> shift; - amask = 0x000000ff >> shift; + if (hasAlpha) + { + pitch = 4 * width; + depth = 32; + } + else + { + pitch = 3 * width; + depth = 24; + } + + Uint32 rmask, gmask, bmask, amask; + if (SDL_BYTEORDER == SDL_BIG_ENDIAN) + { + S32 shift = hasAlpha ? 8 : 0; + rmask = 0xff000000 >> shift; + gmask = 0x00ff0000 >> shift; + bmask = 0x0000ff00 >> shift; + amask = 0x000000ff >> shift; + } + else + { + rmask = 0x000000ff; + gmask = 0x0000ff00; + bmask = 0x00ff0000; + amask = hasAlpha ? 0xff000000 : 0; + } + + SDL_Surface* iconSurface = SDL_CreateRGBSurfaceFrom(img->getAddress(0, 0), img->getWidth(), img->getHeight(), depth, pitch, rmask, gmask, bmask, amask); + + SDL_SetWindowIcon(window->mWindowHandle, iconSurface); + + SDL_FreeSurface(iconSurface); } - else - { - rmask = 0x000000ff; - gmask = 0x0000ff00; - bmask = 0x00ff0000; - amask = hasAlpha ? 0xff000000 : 0; - } - - SDL_Surface* iconSurface = SDL_CreateRGBSurfaceFrom(bmp->getAddress(0, 0), bmp->getWidth(), bmp->getHeight(), depth, pitch, rmask, gmask, bmask, amask); - - SDL_SetWindowIcon(window->mWindowHandle, iconSurface); - - SDL_FreeSurface(iconSurface); } if(device) diff --git a/Engine/source/windowManager/windowInputGenerator.cpp b/Engine/source/windowManager/windowInputGenerator.cpp index c31bad1ba..6c9e45b71 100644 --- a/Engine/source/windowManager/windowInputGenerator.cpp +++ b/Engine/source/windowManager/windowInputGenerator.cpp @@ -95,7 +95,7 @@ void WindowInputGenerator::generateInputEvent( InputEventInfo &inputEvent ) { const AccKeyMap &acc = mAcceleratorMap[i]; if (!mWindow->getKeyboardTranslation() && - (acc.modifier & inputEvent.modifier || (acc.modifier == 0 && inputEvent.modifier == 0)) + ((acc.modifier == inputEvent.modifier && acc.modifier != 0) || (acc.modifier == 0 && inputEvent.modifier == 0)) && acc.keyCode == inputEvent.objInst) { Con::evaluatef(acc.cmd); @@ -145,7 +145,11 @@ void WindowInputGenerator::handleMouseMove( WindowId did, U32 modifier, S32 x, S event.deviceType = MouseDeviceType; event.deviceInst = 0; event.objType = SI_AXIS; - event.modifier = convertModifierBits(modifier); +#ifdef TORQUE_SDL + event.modifier = modifier; +#else + event.modifier = convertModifierBits(modifier); +#endif event.ascii = 0; // Generate delta movement along each axis @@ -231,7 +235,11 @@ void WindowInputGenerator::handleMouseButton( WindowId did, U32 modifiers, U32 a event.deviceInst = 0; event.objType = SI_BUTTON; event.objInst = (InputObjectInstances)(KEY_BUTTON0 + button); - event.modifier = convertModifierBits(modifiers); +#ifdef TORQUE_SDL + event.modifier = modifiers; +#else + event.modifier = convertModifierBits(modifiers); +#endif event.ascii = 0; event.action = (action==IA_MAKE) ? SI_MAKE : SI_BREAK; event.fValue = (action==IA_MAKE) ? 1.0 : 0.0; @@ -248,7 +256,11 @@ void WindowInputGenerator::handleMouseWheel( WindowId did, U32 modifiers, S32 wh event.deviceType = MouseDeviceType; event.deviceInst = 0; event.objType = SI_AXIS; - event.modifier = convertModifierBits(modifiers); +#ifdef TORQUE_SDL + event.modifier = modifiers; +#else + event.modifier = convertModifierBits(modifiers); +#endif event.ascii = 0; event.action = SI_MOVE; @@ -281,7 +293,11 @@ void WindowInputGenerator::handleCharInput( WindowId did, U32 modifier, U16 key event.deviceInst = 0; event.objType = SI_KEY; event.objInst = KEY_NULL; - event.modifier = convertModifierBits(modifier); +#ifdef TORQUE_SDL + event.modifier = modifier; +#else + event.modifier = convertModifierBits(modifier); +#endif event.ascii = key; event.action = SI_MAKE; event.fValue = 1.0; @@ -303,7 +319,11 @@ void WindowInputGenerator::handleKeyboard( WindowId did, U32 modifier, U32 actio event.deviceInst = 0; event.objType = SI_KEY; event.objInst = (InputObjectInstances)key; - event.modifier = convertModifierBits(modifier); +#ifdef TORQUE_SDL + event.modifier = modifier; +#else + event.modifier = convertModifierBits(modifier); +#endif event.ascii = 0; switch(action) diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..7eaddb5df --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2012-2016 GarageGames, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 88bd21f46..db43f542f 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,12 @@ MIT Licensed Open Source version of [Torque 3D](http://torque3d.org) from [GarageGames](http://www.garagegames.com) +[![GitHub tag](https://img.shields.io/github/tag/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/tags) +[![GitHub release](https://img.shields.io/github/release/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/releases/latest) +[![Github All Releases](https://img.shields.io/github/downloads/GarageGames/Torque3D/total.svg)](https://github.com/GarageGames/Torque3D/releases/latest) + +[![IRC](https://img.shields.io/badge/irc-%23garagegames-green.svg)](https://kiwiirc.com/client/irc.maxgaming.net/?nick=wiki_user|?#garagegames) + ## More Information * [Homepage](http://torque3d.org) @@ -17,28 +23,9 @@ They are available from the [downloads](http://wiki.torque3d.org/main:downloads) ## Related repositories -* [Torque 3D main repository](https://github.com/GarageGames/Torque3D) (you are here!) * [Project Manager repository](https://github.com/GarageGames/Torque3D-ProjectManager) * [Offline documentation repository](https://github.com/GarageGames/Torque3D-Documentation) -# License +# License - Copyright (c) 2012 GarageGames, LLC - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. +All assets and code are under the [![license](https://img.shields.io/github/license/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/blob/master/LICENSE.md) diff --git a/Templates/Empty/game/art/gui/mainMenuGui.gui b/Templates/Empty/game/art/gui/mainMenuGui.gui index e9d575093..212944c56 100644 --- a/Templates/Empty/game/art/gui/mainMenuGui.gui +++ b/Templates/Empty/game/art/gui/mainMenuGui.gui @@ -106,7 +106,7 @@ profile = "GuiMenuButtonProfile"; visible = "1"; active = "1"; - command = "GuiEdit();"; + command = "toggleGuiEditor(1);"; tooltipProfile = "GuiToolTipProfile"; tooltip = "The GUI Editor is accessible in-game by pressing F10"; hovertime = "1000"; diff --git a/Templates/Empty/game/art/gui/splash.bmp b/Templates/Empty/game/art/gui/splash.bmp deleted file mode 100644 index 47cb47f97..000000000 Binary files a/Templates/Empty/game/art/gui/splash.bmp and /dev/null differ diff --git a/Templates/Empty/game/art/gui/splash.png b/Templates/Empty/game/art/gui/splash.png new file mode 100644 index 000000000..333df9eb3 Binary files /dev/null and b/Templates/Empty/game/art/gui/splash.png differ diff --git a/Templates/Empty/game/core/scripts/client/postFx/fog.cs b/Templates/Empty/game/core/scripts/client/postFx/fog.cs index 78b2a8924..ea59a3f4c 100644 --- a/Templates/Empty/game/core/scripts/client/postFx/fog.cs +++ b/Templates/Empty/game/core/scripts/client/postFx/fog.cs @@ -62,6 +62,7 @@ singleton PostEffect( FogPostFx ) renderPriority = 5; + targetFormat = getBestHDRFormat(); isEnabled = true; }; diff --git a/Templates/Empty/game/core/scripts/client/postFx/hdr.cs b/Templates/Empty/game/core/scripts/client/postFx/hdr.cs index 6c8e870d0..60aecac96 100644 --- a/Templates/Empty/game/core/scripts/client/postFx/hdr.cs +++ b/Templates/Empty/game/core/scripts/client/postFx/hdr.cs @@ -22,7 +22,7 @@ /// Blends between the scene and the tone mapped scene. -$HDRPostFX::enableToneMapping = 1.0; +$HDRPostFX::enableToneMapping = 0.5; /// The tone mapping middle grey or exposure value used /// to adjust the overall "balance" of the image. @@ -318,7 +318,7 @@ function HDRPostFX::onDisabled( %this ) GammaPostFX.enable(); // Restore the non-HDR offscreen surface format. - %format = "GFXFormatR8G8B8A8"; + %format = getBestHDRFormat(); AL_FormatToken.format = %format; setReflectFormat( %format ); @@ -333,8 +333,8 @@ function HDRPostFX::onDisabled( %this ) singleton PostEffect( HDRPostFX ) { isEnabled = false; - allowReflectPass = true; - + allowReflectPass = false; + // Resolve the HDR before we render any editor stuff // and before we resolve the scene to the backbuffer. renderTime = "PFXBeforeBin"; @@ -359,7 +359,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownScale4x4Shader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -370,7 +370,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "bloomH"; shader = HDR_BloomGaussBlurHShader; @@ -382,7 +382,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "bloomV"; shader = HDR_BloomGaussBlurVShader; @@ -397,7 +397,7 @@ singleton PostEffect( HDRPostFX ) // Now calculate the adapted luminance. new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "adaptLum"; shader = HDR_SampleLumShader; @@ -409,7 +409,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownSampleLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -420,7 +420,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownSampleLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -431,7 +431,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownSampleLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -445,8 +445,8 @@ singleton PostEffect( HDRPostFX ) // one... PostEffect takes care to manage that. new PostEffect() { - allowReflectPass = true; - internalName = "finalLum"; + allowReflectPass = false; + internalName = "finalLum"; shader = HDR_CalcAdaptedLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -462,7 +462,7 @@ singleton PostEffect( HDRPostFX ) // version of the scene. new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "combinePass"; shader = HDR_CombineShader; @@ -471,7 +471,6 @@ singleton PostEffect( HDRPostFX ) texture[1] = "#adaptedLum"; texture[2] = "#bloomFinal"; texture[3] = $HDRPostFX::colorCorrectionRamp; - texture[4] = "#prepass"; target = "$backBuffer"; }; }; diff --git a/Templates/Empty/game/core/scripts/client/recordings.cs b/Templates/Empty/game/core/scripts/client/recordings.cs index 5609f0337..f281652a5 100644 --- a/Templates/Empty/game/core/scripts/client/recordings.cs +++ b/Templates/Empty/game/core/scripts/client/recordings.cs @@ -97,7 +97,6 @@ function startDemoRecord() ChatHud.AddLine( "\c4Recording to file [\c2" @ $DemoFileName @ "\cr]."); - ServerConnection.prepDemoRecord(); ServerConnection.startRecording($DemoFileName); // make sure start worked diff --git a/Templates/Empty/game/core/scripts/client/renderManager.cs b/Templates/Empty/game/core/scripts/client/renderManager.cs index f746c4527..ea7f84d03 100644 --- a/Templates/Empty/game/core/scripts/client/renderManager.cs +++ b/Templates/Empty/game/core/scripts/client/renderManager.cs @@ -33,7 +33,7 @@ function initRenderManager() { enabled = "false"; - format = "GFXFormatR16G16B16A16F"; + format = getBestHDRFormat(); depthFormat = "GFXFormatD24S8"; aaLevel = 0; // -1 = match backbuffer @@ -59,7 +59,7 @@ function initRenderManager() DiffuseRenderPassManager.addManager( new RenderMeshMgr(MeshBin) { bintype = "Mesh"; renderOrder = 0.5; processAddOrder = 0.5; basicOnly = true; } ); DiffuseRenderPassManager.addManager( new RenderImposterMgr(ImposterBin) { renderOrder = 0.56; processAddOrder = 0.56; } ); DiffuseRenderPassManager.addManager( new RenderObjectMgr(ObjectBin) { bintype = "Object"; renderOrder = 0.6; processAddOrder = 0.6; } ); - + DiffuseRenderPassManager.addManager( new RenderObjectMgr(ShadowBin) { bintype = "Shadow"; renderOrder = 0.7; processAddOrder = 0.7; } ); DiffuseRenderPassManager.addManager( new RenderMeshMgr(DecalRoadBin) { bintype = "DecalRoad"; renderOrder = 0.8; processAddOrder = 0.8; } ); DiffuseRenderPassManager.addManager( new RenderMeshMgr(DecalBin) { bintype = "Decal"; renderOrder = 0.81; processAddOrder = 0.81; } ); diff --git a/Templates/Empty/game/core/scripts/client/screenshot.cs b/Templates/Empty/game/core/scripts/client/screenshot.cs index 897325a1a..3c78aa2cd 100644 --- a/Templates/Empty/game/core/scripts/client/screenshot.cs +++ b/Templates/Empty/game/core/scripts/client/screenshot.cs @@ -55,6 +55,9 @@ function formatSessionNumber(%number) // Records a movie file from the Canvas content using the specified fps. // Possible encoder values are "PNG" and "THEORA" (default). //--------------------------------------------------------------------------------------------- + +$RecordingMovie = false; + function recordMovie(%movieName, %fps, %encoder) { // If the canvas doesn't exist yet, setup a flag so it'll @@ -65,12 +68,24 @@ function recordMovie(%movieName, %fps, %encoder) if (%encoder $= "") %encoder = "THEORA"; %resolution = Canvas.getVideoMode(); + + // Start the movie recording + ChatHud.AddLine( "\c4Recording movie file to [\c2" @ %movieName @ "\cr].ogv."); + echo("Recording movie to: " @ %movieName); startVideoCapture(Canvas, %movieName, %encoder, %fps); + + $RecordingMovie = true; } function stopMovie() { + // Stop the current recording + ChatHud.AddLine( "\c4Recording movie file finished."); + echo("Stopped movie recording"); + stopVideoCapture(); + + $RecordingMovie = false; } /// This is bound in initializeCommon() to take diff --git a/Templates/Empty/game/core/torque.png b/Templates/Empty/game/core/torque.png new file mode 100644 index 000000000..1023f2bb6 Binary files /dev/null and b/Templates/Empty/game/core/torque.png differ diff --git a/Templates/Empty/game/main.cs b/Templates/Empty/game/main.cs index 22a3ab2ff..44b333b87 100644 --- a/Templates/Empty/game/main.cs +++ b/Templates/Empty/game/main.cs @@ -28,6 +28,8 @@ $defaultGame = "scripts"; // Set profile directory $Pref::Video::ProfilePath = "core/profile"; +$Core::windowIcon = "core/torque.png"; +$Core::splashWindowImage = "art/gui/splash.png"; function createCanvas(%windowTitle) { diff --git a/Templates/Empty/game/scripts/client/default.bind.cs b/Templates/Empty/game/scripts/client/default.bind.cs index 51dc53d4b..b4216a33d 100644 --- a/Templates/Empty/game/scripts/client/default.bind.cs +++ b/Templates/Empty/game/scripts/client/default.bind.cs @@ -409,6 +409,49 @@ function stopRecordingDemo( %val ) moveMap.bind( keyboard, F3, startRecordingDemo ); moveMap.bind( keyboard, F4, stopRecordingDemo ); +//------------------------------------------------------------------------------ +// Theora Video Capture (Records a movie file) +//------------------------------------------------------------------------------ + +function toggleMovieRecording(%val) +{ + if (!%val) + return; + + %movieEncodingType = "THEORA"; // Valid encoder values are "PNG" and "THEORA" (default). + %movieFPS = 30; // video capture frame rate. + + if (!$RecordingMovie) + { + // locate a non-existent filename to use + for(%i = 0; %i < 1000; %i++) + { + %num = %i; + if(%num < 10) + %num = "0" @ %num; + if(%num < 100) + %num = "0" @ %num; + + %filePath = "movies/movie" @ %num; + if(!isfile(%filePath)) + break; + } + if(%i == 1000) + return; + + // Start the movie recording + recordMovie(%filePath, %movieFPS, %movieEncodingType); + + } + else + { + // Stop the current recording + stopMovie(); + } +} + +// Key binding works at any time and not just while in a game. +GlobalActionMap.bind(keyboard, "alt m", toggleMovieRecording); //------------------------------------------------------------------------------ // Helper Functions diff --git a/Templates/Empty/game/shaders/common/gl/torque.glsl b/Templates/Empty/game/shaders/common/gl/torque.glsl index abe1cd76d..6e369bd5e 100644 --- a/Templates/Empty/game/shaders/common/gl/torque.glsl +++ b/Templates/Empty/game/shaders/common/gl/torque.glsl @@ -138,13 +138,13 @@ mat3x3 quatToMat( vec4 quat ) /// vec2 parallaxOffset( sampler2D texMap, vec2 texCoord, vec3 negViewTS, float depthScale ) { - float depth = texture( texMap, texCoord ).a; - vec2 offset = negViewTS.xy * vec2( depth * depthScale ); + float depth = texture( texMap, texCoord ).a/(PARALLAX_REFINE_STEPS*2); + vec2 offset = negViewTS.xy * vec2( depth * depthScale )/vec2(PARALLAX_REFINE_STEPS*2); for ( int i=0; i < PARALLAX_REFINE_STEPS; i++ ) { - depth = ( depth + texture( texMap, texCoord + offset ).a ) * 0.5; - offset = negViewTS.xy * vec2( depth * depthScale ); + depth = ( depth + texture( texMap, texCoord + offset ).a )/(PARALLAX_REFINE_STEPS*2); + offset = negViewTS.xy * vec2( depth * depthScale )/vec2(PARALLAX_REFINE_STEPS*2); } return offset; @@ -153,13 +153,13 @@ vec2 parallaxOffset( sampler2D texMap, vec2 texCoord, vec3 negViewTS, float dept /// Same as parallaxOffset but for dxtnm where depth is stored in the red channel instead of the alpha vec2 parallaxOffsetDxtnm(sampler2D texMap, vec2 texCoord, vec3 negViewTS, float depthScale) { - float depth = texture(texMap, texCoord).r; - vec2 offset = negViewTS.xy * vec2(depth * depthScale); + float depth = texture(texMap, texCoord).r/(PARALLAX_REFINE_STEPS*2); + vec2 offset = negViewTS.xy * vec2(depth * depthScale)/vec2(PARALLAX_REFINE_STEPS*2); for (int i = 0; i < PARALLAX_REFINE_STEPS; i++) { - depth = (depth + texture(texMap, texCoord + offset).r) * 0.5; - offset = negViewTS.xy * vec2(depth * depthScale); + depth = (depth + texture(texMap, texCoord + offset).r)/(PARALLAX_REFINE_STEPS*2); + offset = negViewTS.xy * vec2(depth * depthScale)/vec2(PARALLAX_REFINE_STEPS*2); } return offset; diff --git a/Templates/Empty/game/shaders/common/postFx/gammaP.hlsl b/Templates/Empty/game/shaders/common/postFx/gammaP.hlsl index 6e284eb88..21b86fe4e 100644 --- a/Templates/Empty/game/shaders/common/postFx/gammaP.hlsl +++ b/Templates/Empty/game/shaders/common/postFx/gammaP.hlsl @@ -41,7 +41,7 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 color.b = TORQUE_TEX1D( colorCorrectionTex, color.b ).b; // Apply gamma correction - color.rgb = pow( abs(color.rgb), OneOverGamma ); + color.rgb = pow( saturate(color.rgb), OneOverGamma ); // Apply contrast color.rgb = ((color.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Empty/game/shaders/common/postFx/gl/gammaP.glsl b/Templates/Empty/game/shaders/common/postFx/gl/gammaP.glsl index 1bf5d1b8f..a170bf39f 100644 --- a/Templates/Empty/game/shaders/common/postFx/gl/gammaP.glsl +++ b/Templates/Empty/game/shaders/common/postFx/gl/gammaP.glsl @@ -45,7 +45,7 @@ void main() color.b = texture( colorCorrectionTex, color.b ).b; // Apply gamma correction - color.rgb = pow( abs(color.rgb), vec3(OneOverGamma) ); + color.rgb = pow( clamp(color.rgb, vec3(0.0),vec3(1.0)), vec3(OneOverGamma) ); // Apply contrast color.rgb = ((color.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Empty/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl b/Templates/Empty/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl index b786b3f6a..f87616a6e 100644 --- a/Templates/Empty/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl +++ b/Templates/Empty/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl @@ -28,7 +28,6 @@ TORQUE_UNIFORM_SAMPLER2D(sceneTex, 0); TORQUE_UNIFORM_SAMPLER2D(luminanceTex, 1); TORQUE_UNIFORM_SAMPLER2D(bloomTex, 2); TORQUE_UNIFORM_SAMPLER1D(colorCorrectionTex, 3); -TORQUE_UNIFORM_SAMPLER2D(prepassTex, 4); uniform float2 texSize0; uniform float2 texSize2; @@ -40,7 +39,6 @@ uniform float g_fEnableBlueShift; uniform float3 g_fBlueShiftColor; uniform float g_fBloomScale; - uniform float g_fOneOverGamma; uniform float Brightness; uniform float Contrast; @@ -71,6 +69,9 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 bloom.rgb = lerp( bloom.rgb, rodColor, coef ); } + // Add the bloom effect. + sample += g_fBloomScale * bloom; + // Map the high range of color values into a range appropriate for // display, taking into account the user's adaptation level, // white point, and selected value for for middle gray. @@ -82,19 +83,13 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 sample.rgb = lerp( sample.rgb, sample.rgb * toneScalar, g_fEnableToneMapping ); } - // Add the bloom effect. - float depth = TORQUE_PREPASS_UNCONDITION( prepassTex, IN.uv0 ).w; - if (depth>0.9999) - sample += g_fBloomScale * bloom; - // Apply the color correction. sample.r = TORQUE_TEX1D( colorCorrectionTex, sample.r ).r; sample.g = TORQUE_TEX1D( colorCorrectionTex, sample.g ).g; sample.b = TORQUE_TEX1D( colorCorrectionTex, sample.b ).b; - // Apply gamma correction - sample.rgb = pow( abs(sample.rgb), g_fOneOverGamma ); + sample.rgb = pow( saturate(sample.rgb), g_fOneOverGamma ); // Apply contrast sample.rgb = ((sample.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Empty/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl b/Templates/Empty/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl index 24a516e79..8437cb04b 100644 --- a/Templates/Empty/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl +++ b/Templates/Empty/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl @@ -29,7 +29,6 @@ uniform sampler2D sceneTex; uniform sampler2D luminanceTex; uniform sampler2D bloomTex; uniform sampler1D colorCorrectionTex; -uniform sampler2D prepassTex; uniform vec2 texSize0; uniform vec2 texSize2; @@ -49,7 +48,6 @@ uniform float Contrast; out vec4 OUT_col; - void main() { vec4 _sample = hdrDecode( texture( sceneTex, IN_uv0 ) ); @@ -76,6 +74,9 @@ void main() bloom.rgb = mix( bloom.rgb, rodColor, coef ); } + // Add the bloom effect. + _sample += g_fBloomScale * bloom; + // Map the high range of color values into a range appropriate for // display, taking into account the user's adaptation level, // white point, and selected value for for middle gray. @@ -87,18 +88,13 @@ void main() _sample.rgb = mix( _sample.rgb, _sample.rgb * toneScalar, g_fEnableToneMapping ); } - // Add the bloom effect. - float depth = prepassUncondition( prepassTex, IN_uv0 ).w; - if (depth>0.9999) - _sample += g_fBloomScale * bloom; - // Apply the color correction. _sample.r = texture( colorCorrectionTex, _sample.r ).r; _sample.g = texture( colorCorrectionTex, _sample.g ).g; _sample.b = texture( colorCorrectionTex, _sample.b ).b; // Apply gamma correction - _sample.rgb = pow( abs(_sample.rgb), vec3(g_fOneOverGamma) ); + _sample.rgb = pow( _sample.rgb, vec3(g_fOneOverGamma) ); // Apply contrast _sample.rgb = ((_sample.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Empty/game/shaders/common/torque.hlsl b/Templates/Empty/game/shaders/common/torque.hlsl index f1099abf8..7081c7153 100644 --- a/Templates/Empty/game/shaders/common/torque.hlsl +++ b/Templates/Empty/game/shaders/common/torque.hlsl @@ -140,13 +140,13 @@ float3x3 quatToMat( float4 quat ) /// float2 parallaxOffset(TORQUE_SAMPLER2D(texMap), float2 texCoord, float3 negViewTS, float depthScale) { - float depth = TORQUE_TEX2D(texMap, texCoord).a; - float2 offset = negViewTS.xy * (depth * depthScale); + float depth = TORQUE_TEX2D(texMap, texCoord).a/(PARALLAX_REFINE_STEPS*2); + float2 offset = negViewTS.xy * (depth * depthScale)/(PARALLAX_REFINE_STEPS); for (int i = 0; i < PARALLAX_REFINE_STEPS; i++) { - depth = (depth + TORQUE_TEX2D(texMap, texCoord + offset).a) * 0.5; - offset = negViewTS.xy * (depth * depthScale); + depth = (depth + TORQUE_TEX2D(texMap, texCoord + offset).a)/(PARALLAX_REFINE_STEPS*2); + offset = negViewTS.xy * (depth * depthScale)/(PARALLAX_REFINE_STEPS); } return offset; @@ -155,13 +155,13 @@ float2 parallaxOffset(TORQUE_SAMPLER2D(texMap), float2 texCoord, float3 negViewT /// Same as parallaxOffset but for dxtnm where depth is stored in the red channel instead of the alpha float2 parallaxOffsetDxtnm(TORQUE_SAMPLER2D(texMap), float2 texCoord, float3 negViewTS, float depthScale) { - float depth = TORQUE_TEX2D(texMap, texCoord).r; - float2 offset = negViewTS.xy * (depth * depthScale); + float depth = TORQUE_TEX2D(texMap, texCoord).r/(PARALLAX_REFINE_STEPS*2); + float2 offset = negViewTS.xy * (depth * depthScale)/(PARALLAX_REFINE_STEPS*2); for (int i = 0; i < PARALLAX_REFINE_STEPS; i++) { - depth = (depth + TORQUE_TEX2D(texMap, texCoord + offset).r) * 0.5; - offset = negViewTS.xy * (depth * depthScale); + depth = (depth + TORQUE_TEX2D(texMap, texCoord + offset).r)/(PARALLAX_REFINE_STEPS*2); + offset = negViewTS.xy * (depth * depthScale)/(PARALLAX_REFINE_STEPS*2); } return offset; diff --git a/Templates/Empty/game/tools/base/utils/inspector.ed.cs b/Templates/Empty/game/tools/base/utils/inspector.ed.cs index 9df8c7e98..f7c27ecf0 100644 --- a/Templates/Empty/game/tools/base/utils/inspector.ed.cs +++ b/Templates/Empty/game/tools/base/utils/inspector.ed.cs @@ -105,7 +105,7 @@ function EditorInspectorBase::onAdd( %this ) superClass = "MenuBuilder"; isPopup = true; - item[ 0 ] = "Edit Profile" TAB "" TAB "if( !$InGuiEditor ) toggleGuiEditor( true ); GuiEditor.editProfile( %this.inspectorField.getData() );"; + item[ 0 ] = "Edit Profile" TAB "" TAB "if( !GuiEditorIsActive() ) toggleGuiEditor( true ); GuiEditor.editProfile( %this.inspectorField.getData() );"; item[ 1 ] = "Jump to Definition in Torsion" TAB "" TAB "EditorOpenDeclarationInTorsion( %this.inspectorField.getData() );"; item[ 2 ] = "Inspect Object" TAB "" TAB "inspectObject( %this.inspectorField.getData() );"; item[ 3 ] = "-"; diff --git a/Templates/Empty/game/tools/forestEditor/forestEditorGui.gui b/Templates/Empty/game/tools/forestEditor/forestEditorGui.gui index ca40147bf..e46a09f3d 100644 --- a/Templates/Empty/game/tools/forestEditor/forestEditorGui.gui +++ b/Templates/Empty/game/tools/forestEditor/forestEditorGui.gui @@ -252,7 +252,7 @@ objectNamesOnly = "1"; useInspectorTooltips = "0"; tooltipOnWidthOnly = "0"; - compareToObjectID = "1"; + compareToObjectID = "0"; canRenameObjects = "1"; renameInternal = "0"; isContainer = "1"; diff --git a/Templates/Empty/game/tools/gui/colorPicker.ed.gui b/Templates/Empty/game/tools/gui/colorPicker.ed.gui index c203ca52e..d8f15e76b 100644 --- a/Templates/Empty/game/tools/gui/colorPicker.ed.gui +++ b/Templates/Empty/game/tools/gui/colorPicker.ed.gui @@ -718,6 +718,22 @@ canSave = "1"; canSaveDynamicFields = "0"; }; + new GuiCheckBoxCtrl() { + text = "use sRGB"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "360 105"; + extent = "66 16"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiCheckBoxProfile"; + visible = "1"; + active = "1"; + variable = "$displayAsSRGB"; + command = "useSRGBctrl($displayAsSRGB);"; + }; }; }; //--- OBJECT WRITE END --- @@ -727,6 +743,15 @@ $ColorPickerCancelCallback = ""; $ColorPickerUpdateCallback = ""; $ColorCallbackType = 1; // ColorI +function useSRGBctrl(%colorScale) +{ +ColorPickerDlg.useSRGB = %colorScale; +ColorRangeSelect.useSRGB = %colorScale; +ColorBlendSelect.useSRGB = %colorScale; +myColor.useSRGB = %colorScale; +oldColor.useSRGB = %colorScale; +} + // This function pushes the color picker dialog and returns to a callback the selected value function GetColorI( %currentColor, %callback, %root, %updateCallback, %cancelCallback ) { diff --git a/Templates/Empty/game/tools/guiEditor/gui/guiEditor.ed.gui b/Templates/Empty/game/tools/guiEditor/gui/guiEditor.ed.gui index e387f1bc0..cc03cbd07 100644 --- a/Templates/Empty/game/tools/guiEditor/gui/guiEditor.ed.gui +++ b/Templates/Empty/game/tools/guiEditor/gui/guiEditor.ed.gui @@ -86,7 +86,7 @@ minExtent = "8 8"; canSave = "1"; visible = "1"; - command = "GuiEditor.switchToWorldEditor();"; + command = "toggleEditor(1);"; tooltipProfile = "ToolsGuiToolTipProfile"; ToolTip = "World Editor"; hovertime = "1000"; diff --git a/Templates/Empty/game/tools/guiEditor/scripts/guiEditor.ed.cs b/Templates/Empty/game/tools/guiEditor/scripts/guiEditor.ed.cs index eace7d43b..61dc8c5e7 100644 --- a/Templates/Empty/game/tools/guiEditor/scripts/guiEditor.ed.cs +++ b/Templates/Empty/game/tools/guiEditor/scripts/guiEditor.ed.cs @@ -75,11 +75,26 @@ function toggleGuiEditor( %make ) if( EditorIsActive() && !GuiEditor.toggleIntoEditorGui ) toggleEditor( true ); - GuiEdit(); + if( !isObject( GuiEditCanvas ) ) + new GuiControl( GuiEditCanvas, EditorGuiGroup ); - // Cancel the scheduled event to prevent - // the level from cycling after it's duration - // has elapsed. + if( GuiEditorIsActive() ) + { + GuiEditor.close(); + } + else + { + GuiEditor.open(); + + // Cancel the scheduled event to prevent + // the level from cycling after it's duration + // has elapsed. + cancel($Game::Schedule); + } + + // Cancel the scheduled event to prevent + // the level from cycling after it's duration + // has elapsed. cancel($Game::Schedule); } } @@ -98,6 +113,26 @@ package GuiEditor_BlockDialogs //--------------------------------------------------------------------------------------------- +function GuiEditor::open(%this) +{ + GuiEditCanvas.onCreateMenu(); + + GuiEditContent(Canvas.getContent()); +} + +function GuiEditor::close(%this) +{ + // prevent the mission editor from opening while the GuiEditor is open. + if(Canvas.getContent() != GuiEditorGui.getId()) + return; + + GuiGroup.add(GuiEditorGui); + + Canvas.setContent(GuiEditor.lastContent); + + GuiEditCanvas.onDestroyMenu(); +} + function GuiEditor::openForEditing( %this, %content ) { Canvas.setContent( GuiEditorGui ); diff --git a/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui index 445bacf63..3eb8558e4 100644 --- a/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/Empty/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -67,7 +67,7 @@ MinExtent = "8 8"; canSave = "1"; Visible = "1"; - Command = "toggleEditor( true ); GuiEdit(); $GuiEditorBtnPressed = true;"; + Command = "toggleGuiEditor(true); $GuiEditorBtnPressed = true;"; tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Open the GuiEditor"; hovertime = "1000"; diff --git a/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs index 38a180e64..31f794d17 100644 --- a/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs +++ b/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs @@ -35,8 +35,6 @@ function EditorGui::init(%this) $NextOperationId = 1; $HeightfieldDirtyRow = -1; - %this.buildMenus(); - if( !isObject( %this-->ToolsPaletteWindow ) ) { // Load Creator/Inspector GUI @@ -1914,6 +1912,8 @@ function Editor::open(%this) if(Canvas.getContent() == GuiEditorGui.getId()) return; + EditorGui.buildMenus(); + if( !EditorGui.isInitialized ) EditorGui.init(); @@ -1929,6 +1929,21 @@ function Editor::close(%this, %gui) if(isObject(MessageHud)) MessageHud.close(); EditorGui.writeCameraSettings(); + + EditorGui.onDestroyMenu(); +} + +function EditorGui::onDestroyMenu(%this) +{ + if( !isObject( %this.menuBar ) ) + return; + + // Destroy menus + while( %this.menuBar.getCount() != 0 ) + %this.menuBar.getObject( 0 ).delete(); + + %this.menuBar.removeFromCanvas(); + %this.menuBar.delete(); } $RelightCallback = ""; diff --git a/Templates/Empty/game/tools/worldEditor/scripts/editor.ed.cs b/Templates/Empty/game/tools/worldEditor/scripts/editor.ed.cs index 74b34e0a9..8545c9d67 100644 --- a/Templates/Empty/game/tools/worldEditor/scripts/editor.ed.cs +++ b/Templates/Empty/game/tools/worldEditor/scripts/editor.ed.cs @@ -99,18 +99,12 @@ function Editor::checkActiveLoadDone() //------------------------------------------------------------------------------ function toggleEditor(%make) { - if (Canvas.isFullscreen()) - { - MessageBoxOK("Windowed Mode Required", "Please switch to windowed mode to access the Mission Editor."); - return; - } - if (%make) - { + { %timerId = startPrecisionTimer(); - if( $InGuiEditor ) - GuiEdit(); + if( GuiEditorIsActive() ) + toggleGuiEditor(1); if( !$missionRunning ) { @@ -141,29 +135,21 @@ function toggleEditor(%make) Editor.close("PlayGui"); } } - else + else { - if ( !$GuiEditorBtnPressed ) - { - canvas.pushDialog( EditorLoadingGui ); - canvas.repaint(); - } - else - { - $GuiEditorBtnPressed = false; - } + canvas.pushDialog( EditorLoadingGui ); + canvas.repaint(); Editor.open(); - // Cancel the scheduled event to prevent - // the level from cycling after it's duration - // has elapsed. + // Cancel the scheduled event to prevent + // the level from cycling after it's duration + // has elapsed. cancel($Game::Schedule); if (theLevelInfo.type $= "DemoScene") commandToServer('dropCameraAtPlayer', true); - canvas.popDialog(EditorLoadingGui); } diff --git a/Templates/Empty/game/tools/worldEditor/scripts/menus.ed.cs b/Templates/Empty/game/tools/worldEditor/scripts/menus.ed.cs index 976d3c08b..be068b9ed 100644 --- a/Templates/Empty/game/tools/worldEditor/scripts/menus.ed.cs +++ b/Templates/Empty/game/tools/worldEditor/scripts/menus.ed.cs @@ -42,47 +42,59 @@ function EditorGui::buildMenus(%this) } // Sub menus (temporary, until MenuBuilder gets updated) - // The speed increments located here are overwritten in EditorCameraSpeedMenu::setupDefaultState. - // The new min/max for the editor camera speed range can be set in each level's levelInfo object. - %this.cameraSpeedMenu = new PopupMenu(EditorCameraSpeedOptions) + // The speed increments located here are overwritten in EditorCameraSpeedMenu::setupDefaultState. + // The new min/max for the editor camera speed range can be set in each level's levelInfo object. + if(!isObject(EditorCameraSpeedOptions)) { - superClass = "MenuBuilder"; - class = "EditorCameraSpeedMenu"; - - item[0] = "Slowest" TAB %cmdCtrl @ "-Shift 1" TAB "5"; - item[1] = "Slow" TAB %cmdCtrl @ "-Shift 2" TAB "35"; - item[2] = "Slower" TAB %cmdCtrl @ "-Shift 3" TAB "70"; - item[3] = "Normal" TAB %cmdCtrl @ "-Shift 4" TAB "100"; - item[4] = "Faster" TAB %cmdCtrl @ "-Shift 5" TAB "130"; - item[5] = "Fast" TAB %cmdCtrl @ "-Shift 6" TAB "165"; - item[6] = "Fastest" TAB %cmdCtrl @ "-Shift 7" TAB "200"; - }; - %this.freeCameraTypeMenu = new PopupMenu(EditorFreeCameraTypeOptions) + %this.cameraSpeedMenu = new PopupMenu(EditorCameraSpeedOptions) + { + superClass = "MenuBuilder"; + class = "EditorCameraSpeedMenu"; + + item[0] = "Slowest" TAB %cmdCtrl @ "-Shift 1" TAB "5"; + item[1] = "Slow" TAB %cmdCtrl @ "-Shift 2" TAB "35"; + item[2] = "Slower" TAB %cmdCtrl @ "-Shift 3" TAB "70"; + item[3] = "Normal" TAB %cmdCtrl @ "-Shift 4" TAB "100"; + item[4] = "Faster" TAB %cmdCtrl @ "-Shift 5" TAB "130"; + item[5] = "Fast" TAB %cmdCtrl @ "-Shift 6" TAB "165"; + item[6] = "Fastest" TAB %cmdCtrl @ "-Shift 7" TAB "200"; + }; + } + if(!isObject(EditorFreeCameraTypeOptions)) { - superClass = "MenuBuilder"; - class = "EditorFreeCameraTypeMenu"; - - item[0] = "Standard" TAB "Ctrl 1" TAB "EditorGuiStatusBar.setCamera(\"Standard Camera\");"; - item[1] = "Orbit Camera" TAB "Ctrl 2" TAB "EditorGuiStatusBar.setCamera(\"Orbit Camera\");"; - Item[2] = "-"; - item[3] = "Smoothed" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Camera\");"; - item[4] = "Smoothed Rotate" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Rot Camera\");"; - }; - %this.playerCameraTypeMenu = new PopupMenu(EditorPlayerCameraTypeOptions) + %this.freeCameraTypeMenu = new PopupMenu(EditorFreeCameraTypeOptions) + { + superClass = "MenuBuilder"; + class = "EditorFreeCameraTypeMenu"; + + item[0] = "Standard" TAB "Ctrl 1" TAB "EditorGuiStatusBar.setCamera(\"Standard Camera\");"; + item[1] = "Orbit Camera" TAB "Ctrl 2" TAB "EditorGuiStatusBar.setCamera(\"Orbit Camera\");"; + Item[2] = "-"; + item[3] = "Smoothed" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Camera\");"; + item[4] = "Smoothed Rotate" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Rot Camera\");"; + }; + } + if(!isObject(EditorPlayerCameraTypeOptions)) { - superClass = "MenuBuilder"; - class = "EditorPlayerCameraTypeMenu"; - - Item[0] = "First Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"1st Person Camera\");"; - Item[1] = "Third Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"3rd Person Camera\");"; - }; - %this.cameraBookmarksMenu = new PopupMenu(EditorCameraBookmarks) + %this.playerCameraTypeMenu = new PopupMenu(EditorPlayerCameraTypeOptions) + { + superClass = "MenuBuilder"; + class = "EditorPlayerCameraTypeMenu"; + + Item[0] = "First Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"1st Person Camera\");"; + Item[1] = "Third Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"3rd Person Camera\");"; + }; + } + if(!isObject(EditorCameraBookmarks)) { - superClass = "MenuBuilder"; - class = "EditorCameraBookmarksMenu"; - - //item[0] = "None"; - }; + %this.cameraBookmarksMenu = new PopupMenu(EditorCameraBookmarks) + { + superClass = "MenuBuilder"; + class = "EditorCameraBookmarksMenu"; + + //item[0] = "None"; + }; + } %this.viewTypeMenu = new PopupMenu() { superClass = "MenuBuilder"; @@ -98,7 +110,7 @@ function EditorGui::buildMenus(%this) }; // Menu bar - %this.menuBar = new MenuBar() + %this.menuBar = new MenuBar(WorldEditorMenubar) { dynamicItemInsertPos = 3; }; @@ -263,7 +275,8 @@ function EditorGui::buildMenus(%this) item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();"; item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);"; - item[2] = "Bake Selected to Mesh" TAB "" TAB "bakeSelectedToMesh();"; + item[2] = "Torque SimView" TAB "" TAB "tree();"; + item[3] = "Make Selected a Mesh" TAB "" TAB "makeSelectedAMesh();"; }; %this.menuBar.insert(%toolsMenu, %this.menuBar.getCount()); diff --git a/Templates/Full/game/art/datablocks/datablockExec.cs b/Templates/Full/game/art/datablocks/datablockExec.cs index 7784332bf..0c66f7df7 100644 --- a/Templates/Full/game/art/datablocks/datablockExec.cs +++ b/Templates/Full/game/art/datablocks/datablockExec.cs @@ -61,4 +61,7 @@ exec("./player.cs"); exec("./aiPlayer.cs"); // Load the vehicle datablocks -exec("./vehicles/cheetahCar.cs"); \ No newline at end of file +exec("./vehicles/cheetahCar.cs"); + +// Physics objects +exec("./physics.cs"); \ No newline at end of file diff --git a/Templates/Full/game/art/datablocks/environment.cs b/Templates/Full/game/art/datablocks/environment.cs index c9d2b0a51..ab9af14d3 100644 --- a/Templates/Full/game/art/datablocks/environment.cs +++ b/Templates/Full/game/art/datablocks/environment.cs @@ -83,6 +83,8 @@ datablock LightningData(DefaultStorm) thunderSounds[1] = ThunderCrash2Sound; thunderSounds[2] = ThunderCrash3Sound; thunderSounds[3] = ThunderCrash4Sound; + + strikeTextures[0] = "art/environment/lightning"; }; datablock ReflectorDesc( DefaultCubeDesc ) diff --git a/Engine/source/T3D/physics/physx/pxContactReporter.h b/Templates/Full/game/art/datablocks/physics.cs similarity index 53% rename from Engine/source/T3D/physics/physx/pxContactReporter.h rename to Templates/Full/game/art/datablocks/physics.cs index 883d61b9c..40cacf81d 100644 --- a/Engine/source/T3D/physics/physx/pxContactReporter.h +++ b/Templates/Full/game/art/datablocks/physics.cs @@ -20,35 +20,52 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#ifndef _PXCONTACTREPORTER_H_ -#define _PXCONTACTREPORTER_H_ - -#ifndef _PHYSX_H_ -#include "T3D/physics/physX/px.h" -#endif - - -class PxContactReporter : public NxUserContactReport -{ -protected: - - virtual void onContactNotify( NxContactPair& pair, NxU32 events ); - -public: - - PxContactReporter(); - virtual ~PxContactReporter(); +datablock PhysicsShapeData( PhysicsCube ) +{ + category = "Physics"; + shapeName = "art/shapes/cube/cube.dae"; + emap = true; + + //physics properties + mass = "0.5"; + friction = "0.4"; + staticFriction = "0.5"; + restitution = "0.3"; + linearDamping = "0.1"; + angularDamping = "0.2"; + linearSleepThreshold = "1.0"; + angularSleepThreshold = "1.0"; + buoyancyDensity = "0.9"; + waterDampingScale = "10"; + + //damage - dynamic fields + radiusDamage = 0; + damageRadius = 0; + areaImpulse = 0; + invulnerable = true; }; - - -class PxUserNotify : public NxUserNotify -{ -public: - virtual bool onJointBreak( NxReal breakingForce, NxJoint &brokenJoint ); - virtual void onWake( NxActor **actors, NxU32 count ) {} - virtual void onSleep ( NxActor **actors, NxU32 count ) {} +datablock PhysicsShapeData( PhysicsBoulder ) +{ + category = "Physics"; + shapeName = "art/shapes/rocks/boulder.dts"; + emap = true; + + //physics properties + mass = "20"; + friction = "0.2"; + staticFriction = "0.3"; + restitution = "0.8"; + linearDamping = "0.1"; + angularDamping = "0.2"; + linearSleepThreshold = "1.0"; + angularSleepThreshold = "1.0"; + buoyancyDensity = "0.9"; + waterDampingScale = "10"; + + //damage - dynamic fields + radiusDamage = 0; + damageRadius = 0; + areaImpulse = 0; + invulnerable = false; }; - - -#endif // _PXCONTACTREPORTER_H_ diff --git a/Templates/Full/game/art/environment/lightning.png b/Templates/Full/game/art/environment/lightning.png new file mode 100644 index 000000000..fc19efad9 Binary files /dev/null and b/Templates/Full/game/art/environment/lightning.png differ diff --git a/Templates/Full/game/art/gui/mainMenuGui.gui b/Templates/Full/game/art/gui/mainMenuGui.gui index bde78491f..895f48200 100644 --- a/Templates/Full/game/art/gui/mainMenuGui.gui +++ b/Templates/Full/game/art/gui/mainMenuGui.gui @@ -126,7 +126,7 @@ profile = "GuiMenuButtonProfile"; visible = "1"; active = "1"; - command = "GuiEdit();"; + command = "toggleGuiEditor(1);"; tooltipProfile = "GuiToolTipProfile"; tooltip = "The GUI Editor is accessible in-game by pressing F10"; hovertime = "1000"; diff --git a/Templates/Full/game/art/gui/splash.bmp b/Templates/Full/game/art/gui/splash.bmp deleted file mode 100644 index 47cb47f97..000000000 Binary files a/Templates/Full/game/art/gui/splash.bmp and /dev/null differ diff --git a/Templates/Full/game/art/gui/splash.png b/Templates/Full/game/art/gui/splash.png new file mode 100644 index 000000000..333df9eb3 Binary files /dev/null and b/Templates/Full/game/art/gui/splash.png differ diff --git a/Templates/Full/game/core/scripts/client/postFx/hdr.cs b/Templates/Full/game/core/scripts/client/postFx/hdr.cs index 90a66f5b3..60aecac96 100644 --- a/Templates/Full/game/core/scripts/client/postFx/hdr.cs +++ b/Templates/Full/game/core/scripts/client/postFx/hdr.cs @@ -22,7 +22,7 @@ /// Blends between the scene and the tone mapped scene. -$HDRPostFX::enableToneMapping = 1.0; +$HDRPostFX::enableToneMapping = 0.5; /// The tone mapping middle grey or exposure value used /// to adjust the overall "balance" of the image. @@ -333,8 +333,8 @@ function HDRPostFX::onDisabled( %this ) singleton PostEffect( HDRPostFX ) { isEnabled = false; - allowReflectPass = true; - + allowReflectPass = false; + // Resolve the HDR before we render any editor stuff // and before we resolve the scene to the backbuffer. renderTime = "PFXBeforeBin"; @@ -359,7 +359,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownScale4x4Shader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -370,7 +370,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "bloomH"; shader = HDR_BloomGaussBlurHShader; @@ -382,7 +382,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "bloomV"; shader = HDR_BloomGaussBlurVShader; @@ -397,7 +397,7 @@ singleton PostEffect( HDRPostFX ) // Now calculate the adapted luminance. new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "adaptLum"; shader = HDR_SampleLumShader; @@ -409,7 +409,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownSampleLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -420,7 +420,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownSampleLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -431,7 +431,7 @@ singleton PostEffect( HDRPostFX ) new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; shader = HDR_DownSampleLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -445,8 +445,8 @@ singleton PostEffect( HDRPostFX ) // one... PostEffect takes care to manage that. new PostEffect() { - allowReflectPass = true; - internalName = "finalLum"; + allowReflectPass = false; + internalName = "finalLum"; shader = HDR_CalcAdaptedLumShader; stateBlock = HDR_DownSampleStateBlock; texture[0] = "$inTex"; @@ -462,7 +462,7 @@ singleton PostEffect( HDRPostFX ) // version of the scene. new PostEffect() { - allowReflectPass = true; + allowReflectPass = false; internalName = "combinePass"; shader = HDR_CombineShader; @@ -471,7 +471,6 @@ singleton PostEffect( HDRPostFX ) texture[1] = "#adaptedLum"; texture[2] = "#bloomFinal"; texture[3] = $HDRPostFX::colorCorrectionRamp; - texture[4] = "#prepass"; target = "$backBuffer"; }; }; diff --git a/Templates/Full/game/core/scripts/client/recordings.cs b/Templates/Full/game/core/scripts/client/recordings.cs index 5609f0337..f281652a5 100644 --- a/Templates/Full/game/core/scripts/client/recordings.cs +++ b/Templates/Full/game/core/scripts/client/recordings.cs @@ -97,7 +97,6 @@ function startDemoRecord() ChatHud.AddLine( "\c4Recording to file [\c2" @ $DemoFileName @ "\cr]."); - ServerConnection.prepDemoRecord(); ServerConnection.startRecording($DemoFileName); // make sure start worked diff --git a/Templates/Full/game/core/scripts/client/screenshot.cs b/Templates/Full/game/core/scripts/client/screenshot.cs index 897325a1a..3c78aa2cd 100644 --- a/Templates/Full/game/core/scripts/client/screenshot.cs +++ b/Templates/Full/game/core/scripts/client/screenshot.cs @@ -55,6 +55,9 @@ function formatSessionNumber(%number) // Records a movie file from the Canvas content using the specified fps. // Possible encoder values are "PNG" and "THEORA" (default). //--------------------------------------------------------------------------------------------- + +$RecordingMovie = false; + function recordMovie(%movieName, %fps, %encoder) { // If the canvas doesn't exist yet, setup a flag so it'll @@ -65,12 +68,24 @@ function recordMovie(%movieName, %fps, %encoder) if (%encoder $= "") %encoder = "THEORA"; %resolution = Canvas.getVideoMode(); + + // Start the movie recording + ChatHud.AddLine( "\c4Recording movie file to [\c2" @ %movieName @ "\cr].ogv."); + echo("Recording movie to: " @ %movieName); startVideoCapture(Canvas, %movieName, %encoder, %fps); + + $RecordingMovie = true; } function stopMovie() { + // Stop the current recording + ChatHud.AddLine( "\c4Recording movie file finished."); + echo("Stopped movie recording"); + stopVideoCapture(); + + $RecordingMovie = false; } /// This is bound in initializeCommon() to take diff --git a/Templates/Full/game/core/torque.png b/Templates/Full/game/core/torque.png new file mode 100644 index 000000000..1023f2bb6 Binary files /dev/null and b/Templates/Full/game/core/torque.png differ diff --git a/Templates/Full/game/main.cs b/Templates/Full/game/main.cs index 2a261201d..65aae6d7f 100644 --- a/Templates/Full/game/main.cs +++ b/Templates/Full/game/main.cs @@ -28,6 +28,8 @@ $defaultGame = "scripts"; // Set profile directory $Pref::Video::ProfilePath = "core/profile"; +$Core::windowIcon = "core/torque.png"; +$Core::splashWindowImage = "art/gui/splash.png"; function createCanvas(%windowTitle) { diff --git a/Templates/Full/game/scripts/client/default.bind.cs b/Templates/Full/game/scripts/client/default.bind.cs index 1af881a81..ed804bbb2 100644 --- a/Templates/Full/game/scripts/client/default.bind.cs +++ b/Templates/Full/game/scripts/client/default.bind.cs @@ -583,6 +583,49 @@ function stopRecordingDemo( %val ) moveMap.bind( keyboard, F3, startRecordingDemo ); moveMap.bind( keyboard, F4, stopRecordingDemo ); +//------------------------------------------------------------------------------ +// Theora Video Capture (Records a movie file) +//------------------------------------------------------------------------------ + +function toggleMovieRecording(%val) +{ + if (!%val) + return; + + %movieEncodingType = "THEORA"; // Valid encoder values are "PNG" and "THEORA" (default). + %movieFPS = 30; // video capture frame rate. + + if (!$RecordingMovie) + { + // locate a non-existent filename to use + for(%i = 0; %i < 1000; %i++) + { + %num = %i; + if(%num < 10) + %num = "0" @ %num; + if(%num < 100) + %num = "0" @ %num; + + %filePath = "movies/movie" @ %num; + if(!isfile(%filePath)) + break; + } + if(%i == 1000) + return; + + // Start the movie recording + recordMovie(%filePath, %movieFPS, %movieEncodingType); + + } + else + { + // Stop the current recording + stopMovie(); + } +} + +// Key binding works at any time and not just while in a game. +GlobalActionMap.bind(keyboard, "alt m", toggleMovieRecording); //------------------------------------------------------------------------------ // Helper Functions diff --git a/Templates/Full/game/shaders/common/postFx/gammaP.hlsl b/Templates/Full/game/shaders/common/postFx/gammaP.hlsl index 6e284eb88..21b86fe4e 100644 --- a/Templates/Full/game/shaders/common/postFx/gammaP.hlsl +++ b/Templates/Full/game/shaders/common/postFx/gammaP.hlsl @@ -41,7 +41,7 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 color.b = TORQUE_TEX1D( colorCorrectionTex, color.b ).b; // Apply gamma correction - color.rgb = pow( abs(color.rgb), OneOverGamma ); + color.rgb = pow( saturate(color.rgb), OneOverGamma ); // Apply contrast color.rgb = ((color.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Full/game/shaders/common/postFx/gl/gammaP.glsl b/Templates/Full/game/shaders/common/postFx/gl/gammaP.glsl index 1bf5d1b8f..a170bf39f 100644 --- a/Templates/Full/game/shaders/common/postFx/gl/gammaP.glsl +++ b/Templates/Full/game/shaders/common/postFx/gl/gammaP.glsl @@ -45,7 +45,7 @@ void main() color.b = texture( colorCorrectionTex, color.b ).b; // Apply gamma correction - color.rgb = pow( abs(color.rgb), vec3(OneOverGamma) ); + color.rgb = pow( clamp(color.rgb, vec3(0.0),vec3(1.0)), vec3(OneOverGamma) ); // Apply contrast color.rgb = ((color.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Full/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl b/Templates/Full/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl index b786b3f6a..f87616a6e 100644 --- a/Templates/Full/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl +++ b/Templates/Full/game/shaders/common/postFx/hdr/finalPassCombineP.hlsl @@ -28,7 +28,6 @@ TORQUE_UNIFORM_SAMPLER2D(sceneTex, 0); TORQUE_UNIFORM_SAMPLER2D(luminanceTex, 1); TORQUE_UNIFORM_SAMPLER2D(bloomTex, 2); TORQUE_UNIFORM_SAMPLER1D(colorCorrectionTex, 3); -TORQUE_UNIFORM_SAMPLER2D(prepassTex, 4); uniform float2 texSize0; uniform float2 texSize2; @@ -40,7 +39,6 @@ uniform float g_fEnableBlueShift; uniform float3 g_fBlueShiftColor; uniform float g_fBloomScale; - uniform float g_fOneOverGamma; uniform float Brightness; uniform float Contrast; @@ -71,6 +69,9 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 bloom.rgb = lerp( bloom.rgb, rodColor, coef ); } + // Add the bloom effect. + sample += g_fBloomScale * bloom; + // Map the high range of color values into a range appropriate for // display, taking into account the user's adaptation level, // white point, and selected value for for middle gray. @@ -82,19 +83,13 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 sample.rgb = lerp( sample.rgb, sample.rgb * toneScalar, g_fEnableToneMapping ); } - // Add the bloom effect. - float depth = TORQUE_PREPASS_UNCONDITION( prepassTex, IN.uv0 ).w; - if (depth>0.9999) - sample += g_fBloomScale * bloom; - // Apply the color correction. sample.r = TORQUE_TEX1D( colorCorrectionTex, sample.r ).r; sample.g = TORQUE_TEX1D( colorCorrectionTex, sample.g ).g; sample.b = TORQUE_TEX1D( colorCorrectionTex, sample.b ).b; - // Apply gamma correction - sample.rgb = pow( abs(sample.rgb), g_fOneOverGamma ); + sample.rgb = pow( saturate(sample.rgb), g_fOneOverGamma ); // Apply contrast sample.rgb = ((sample.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Full/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl b/Templates/Full/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl index 24a516e79..8437cb04b 100644 --- a/Templates/Full/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl +++ b/Templates/Full/game/shaders/common/postFx/hdr/gl/finalPassCombineP.glsl @@ -29,7 +29,6 @@ uniform sampler2D sceneTex; uniform sampler2D luminanceTex; uniform sampler2D bloomTex; uniform sampler1D colorCorrectionTex; -uniform sampler2D prepassTex; uniform vec2 texSize0; uniform vec2 texSize2; @@ -49,7 +48,6 @@ uniform float Contrast; out vec4 OUT_col; - void main() { vec4 _sample = hdrDecode( texture( sceneTex, IN_uv0 ) ); @@ -76,6 +74,9 @@ void main() bloom.rgb = mix( bloom.rgb, rodColor, coef ); } + // Add the bloom effect. + _sample += g_fBloomScale * bloom; + // Map the high range of color values into a range appropriate for // display, taking into account the user's adaptation level, // white point, and selected value for for middle gray. @@ -87,18 +88,13 @@ void main() _sample.rgb = mix( _sample.rgb, _sample.rgb * toneScalar, g_fEnableToneMapping ); } - // Add the bloom effect. - float depth = prepassUncondition( prepassTex, IN_uv0 ).w; - if (depth>0.9999) - _sample += g_fBloomScale * bloom; - // Apply the color correction. _sample.r = texture( colorCorrectionTex, _sample.r ).r; _sample.g = texture( colorCorrectionTex, _sample.g ).g; _sample.b = texture( colorCorrectionTex, _sample.b ).b; // Apply gamma correction - _sample.rgb = pow( abs(_sample.rgb), vec3(g_fOneOverGamma) ); + _sample.rgb = pow( _sample.rgb, vec3(g_fOneOverGamma) ); // Apply contrast _sample.rgb = ((_sample.rgb - 0.5f) * Contrast) + 0.5f; diff --git a/Templates/Full/game/tools/base/utils/inspector.ed.cs b/Templates/Full/game/tools/base/utils/inspector.ed.cs index 9df8c7e98..f7c27ecf0 100644 --- a/Templates/Full/game/tools/base/utils/inspector.ed.cs +++ b/Templates/Full/game/tools/base/utils/inspector.ed.cs @@ -105,7 +105,7 @@ function EditorInspectorBase::onAdd( %this ) superClass = "MenuBuilder"; isPopup = true; - item[ 0 ] = "Edit Profile" TAB "" TAB "if( !$InGuiEditor ) toggleGuiEditor( true ); GuiEditor.editProfile( %this.inspectorField.getData() );"; + item[ 0 ] = "Edit Profile" TAB "" TAB "if( !GuiEditorIsActive() ) toggleGuiEditor( true ); GuiEditor.editProfile( %this.inspectorField.getData() );"; item[ 1 ] = "Jump to Definition in Torsion" TAB "" TAB "EditorOpenDeclarationInTorsion( %this.inspectorField.getData() );"; item[ 2 ] = "Inspect Object" TAB "" TAB "inspectObject( %this.inspectorField.getData() );"; item[ 3 ] = "-"; diff --git a/Templates/Full/game/tools/forestEditor/forestEditorGui.gui b/Templates/Full/game/tools/forestEditor/forestEditorGui.gui index ca40147bf..e46a09f3d 100644 --- a/Templates/Full/game/tools/forestEditor/forestEditorGui.gui +++ b/Templates/Full/game/tools/forestEditor/forestEditorGui.gui @@ -252,7 +252,7 @@ objectNamesOnly = "1"; useInspectorTooltips = "0"; tooltipOnWidthOnly = "0"; - compareToObjectID = "1"; + compareToObjectID = "0"; canRenameObjects = "1"; renameInternal = "0"; isContainer = "1"; diff --git a/Templates/Full/game/tools/gui/colorPicker.ed.gui b/Templates/Full/game/tools/gui/colorPicker.ed.gui index c203ca52e..d8f15e76b 100644 --- a/Templates/Full/game/tools/gui/colorPicker.ed.gui +++ b/Templates/Full/game/tools/gui/colorPicker.ed.gui @@ -718,6 +718,22 @@ canSave = "1"; canSaveDynamicFields = "0"; }; + new GuiCheckBoxCtrl() { + text = "use sRGB"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "360 105"; + extent = "66 16"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiCheckBoxProfile"; + visible = "1"; + active = "1"; + variable = "$displayAsSRGB"; + command = "useSRGBctrl($displayAsSRGB);"; + }; }; }; //--- OBJECT WRITE END --- @@ -727,6 +743,15 @@ $ColorPickerCancelCallback = ""; $ColorPickerUpdateCallback = ""; $ColorCallbackType = 1; // ColorI +function useSRGBctrl(%colorScale) +{ +ColorPickerDlg.useSRGB = %colorScale; +ColorRangeSelect.useSRGB = %colorScale; +ColorBlendSelect.useSRGB = %colorScale; +myColor.useSRGB = %colorScale; +oldColor.useSRGB = %colorScale; +} + // This function pushes the color picker dialog and returns to a callback the selected value function GetColorI( %currentColor, %callback, %root, %updateCallback, %cancelCallback ) { diff --git a/Templates/Full/game/tools/guiEditor/gui/guiEditor.ed.gui b/Templates/Full/game/tools/guiEditor/gui/guiEditor.ed.gui index e387f1bc0..cc03cbd07 100644 --- a/Templates/Full/game/tools/guiEditor/gui/guiEditor.ed.gui +++ b/Templates/Full/game/tools/guiEditor/gui/guiEditor.ed.gui @@ -86,7 +86,7 @@ minExtent = "8 8"; canSave = "1"; visible = "1"; - command = "GuiEditor.switchToWorldEditor();"; + command = "toggleEditor(1);"; tooltipProfile = "ToolsGuiToolTipProfile"; ToolTip = "World Editor"; hovertime = "1000"; diff --git a/Templates/Full/game/tools/guiEditor/scripts/guiEditor.ed.cs b/Templates/Full/game/tools/guiEditor/scripts/guiEditor.ed.cs index eace7d43b..61dc8c5e7 100644 --- a/Templates/Full/game/tools/guiEditor/scripts/guiEditor.ed.cs +++ b/Templates/Full/game/tools/guiEditor/scripts/guiEditor.ed.cs @@ -75,11 +75,26 @@ function toggleGuiEditor( %make ) if( EditorIsActive() && !GuiEditor.toggleIntoEditorGui ) toggleEditor( true ); - GuiEdit(); + if( !isObject( GuiEditCanvas ) ) + new GuiControl( GuiEditCanvas, EditorGuiGroup ); - // Cancel the scheduled event to prevent - // the level from cycling after it's duration - // has elapsed. + if( GuiEditorIsActive() ) + { + GuiEditor.close(); + } + else + { + GuiEditor.open(); + + // Cancel the scheduled event to prevent + // the level from cycling after it's duration + // has elapsed. + cancel($Game::Schedule); + } + + // Cancel the scheduled event to prevent + // the level from cycling after it's duration + // has elapsed. cancel($Game::Schedule); } } @@ -98,6 +113,26 @@ package GuiEditor_BlockDialogs //--------------------------------------------------------------------------------------------- +function GuiEditor::open(%this) +{ + GuiEditCanvas.onCreateMenu(); + + GuiEditContent(Canvas.getContent()); +} + +function GuiEditor::close(%this) +{ + // prevent the mission editor from opening while the GuiEditor is open. + if(Canvas.getContent() != GuiEditorGui.getId()) + return; + + GuiGroup.add(GuiEditorGui); + + Canvas.setContent(GuiEditor.lastContent); + + GuiEditCanvas.onDestroyMenu(); +} + function GuiEditor::openForEditing( %this, %content ) { Canvas.setContent( GuiEditorGui ); diff --git a/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui index 445bacf63..3eb8558e4 100644 --- a/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/Full/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -67,7 +67,7 @@ MinExtent = "8 8"; canSave = "1"; Visible = "1"; - Command = "toggleEditor( true ); GuiEdit(); $GuiEditorBtnPressed = true;"; + Command = "toggleGuiEditor(true); $GuiEditorBtnPressed = true;"; tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Open the GuiEditor"; hovertime = "1000"; diff --git a/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs index 38a180e64..31f794d17 100644 --- a/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs +++ b/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs @@ -35,8 +35,6 @@ function EditorGui::init(%this) $NextOperationId = 1; $HeightfieldDirtyRow = -1; - %this.buildMenus(); - if( !isObject( %this-->ToolsPaletteWindow ) ) { // Load Creator/Inspector GUI @@ -1914,6 +1912,8 @@ function Editor::open(%this) if(Canvas.getContent() == GuiEditorGui.getId()) return; + EditorGui.buildMenus(); + if( !EditorGui.isInitialized ) EditorGui.init(); @@ -1929,6 +1929,21 @@ function Editor::close(%this, %gui) if(isObject(MessageHud)) MessageHud.close(); EditorGui.writeCameraSettings(); + + EditorGui.onDestroyMenu(); +} + +function EditorGui::onDestroyMenu(%this) +{ + if( !isObject( %this.menuBar ) ) + return; + + // Destroy menus + while( %this.menuBar.getCount() != 0 ) + %this.menuBar.getObject( 0 ).delete(); + + %this.menuBar.removeFromCanvas(); + %this.menuBar.delete(); } $RelightCallback = ""; diff --git a/Templates/Full/game/tools/worldEditor/scripts/editor.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/editor.ed.cs index 74b34e0a9..8545c9d67 100644 --- a/Templates/Full/game/tools/worldEditor/scripts/editor.ed.cs +++ b/Templates/Full/game/tools/worldEditor/scripts/editor.ed.cs @@ -99,18 +99,12 @@ function Editor::checkActiveLoadDone() //------------------------------------------------------------------------------ function toggleEditor(%make) { - if (Canvas.isFullscreen()) - { - MessageBoxOK("Windowed Mode Required", "Please switch to windowed mode to access the Mission Editor."); - return; - } - if (%make) - { + { %timerId = startPrecisionTimer(); - if( $InGuiEditor ) - GuiEdit(); + if( GuiEditorIsActive() ) + toggleGuiEditor(1); if( !$missionRunning ) { @@ -141,29 +135,21 @@ function toggleEditor(%make) Editor.close("PlayGui"); } } - else + else { - if ( !$GuiEditorBtnPressed ) - { - canvas.pushDialog( EditorLoadingGui ); - canvas.repaint(); - } - else - { - $GuiEditorBtnPressed = false; - } + canvas.pushDialog( EditorLoadingGui ); + canvas.repaint(); Editor.open(); - // Cancel the scheduled event to prevent - // the level from cycling after it's duration - // has elapsed. + // Cancel the scheduled event to prevent + // the level from cycling after it's duration + // has elapsed. cancel($Game::Schedule); if (theLevelInfo.type $= "DemoScene") commandToServer('dropCameraAtPlayer', true); - canvas.popDialog(EditorLoadingGui); } diff --git a/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs index 0558d93db..be068b9ed 100644 --- a/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs +++ b/Templates/Full/game/tools/worldEditor/scripts/menus.ed.cs @@ -42,47 +42,59 @@ function EditorGui::buildMenus(%this) } // Sub menus (temporary, until MenuBuilder gets updated) - // The speed increments located here are overwritten in EditorCameraSpeedMenu::setupDefaultState. - // The new min/max for the editor camera speed range can be set in each level's levelInfo object. - %this.cameraSpeedMenu = new PopupMenu(EditorCameraSpeedOptions) + // The speed increments located here are overwritten in EditorCameraSpeedMenu::setupDefaultState. + // The new min/max for the editor camera speed range can be set in each level's levelInfo object. + if(!isObject(EditorCameraSpeedOptions)) { - superClass = "MenuBuilder"; - class = "EditorCameraSpeedMenu"; - - item[0] = "Slowest" TAB %cmdCtrl @ "-Shift 1" TAB "5"; - item[1] = "Slow" TAB %cmdCtrl @ "-Shift 2" TAB "35"; - item[2] = "Slower" TAB %cmdCtrl @ "-Shift 3" TAB "70"; - item[3] = "Normal" TAB %cmdCtrl @ "-Shift 4" TAB "100"; - item[4] = "Faster" TAB %cmdCtrl @ "-Shift 5" TAB "130"; - item[5] = "Fast" TAB %cmdCtrl @ "-Shift 6" TAB "165"; - item[6] = "Fastest" TAB %cmdCtrl @ "-Shift 7" TAB "200"; - }; - %this.freeCameraTypeMenu = new PopupMenu(EditorFreeCameraTypeOptions) + %this.cameraSpeedMenu = new PopupMenu(EditorCameraSpeedOptions) + { + superClass = "MenuBuilder"; + class = "EditorCameraSpeedMenu"; + + item[0] = "Slowest" TAB %cmdCtrl @ "-Shift 1" TAB "5"; + item[1] = "Slow" TAB %cmdCtrl @ "-Shift 2" TAB "35"; + item[2] = "Slower" TAB %cmdCtrl @ "-Shift 3" TAB "70"; + item[3] = "Normal" TAB %cmdCtrl @ "-Shift 4" TAB "100"; + item[4] = "Faster" TAB %cmdCtrl @ "-Shift 5" TAB "130"; + item[5] = "Fast" TAB %cmdCtrl @ "-Shift 6" TAB "165"; + item[6] = "Fastest" TAB %cmdCtrl @ "-Shift 7" TAB "200"; + }; + } + if(!isObject(EditorFreeCameraTypeOptions)) { - superClass = "MenuBuilder"; - class = "EditorFreeCameraTypeMenu"; - - item[0] = "Standard" TAB "Ctrl 1" TAB "EditorGuiStatusBar.setCamera(\"Standard Camera\");"; - item[1] = "Orbit Camera" TAB "Ctrl 2" TAB "EditorGuiStatusBar.setCamera(\"Orbit Camera\");"; - Item[2] = "-"; - item[3] = "Smoothed" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Camera\");"; - item[4] = "Smoothed Rotate" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Rot Camera\");"; - }; - %this.playerCameraTypeMenu = new PopupMenu(EditorPlayerCameraTypeOptions) + %this.freeCameraTypeMenu = new PopupMenu(EditorFreeCameraTypeOptions) + { + superClass = "MenuBuilder"; + class = "EditorFreeCameraTypeMenu"; + + item[0] = "Standard" TAB "Ctrl 1" TAB "EditorGuiStatusBar.setCamera(\"Standard Camera\");"; + item[1] = "Orbit Camera" TAB "Ctrl 2" TAB "EditorGuiStatusBar.setCamera(\"Orbit Camera\");"; + Item[2] = "-"; + item[3] = "Smoothed" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Camera\");"; + item[4] = "Smoothed Rotate" TAB "" TAB "EditorGuiStatusBar.setCamera(\"Smooth Rot Camera\");"; + }; + } + if(!isObject(EditorPlayerCameraTypeOptions)) { - superClass = "MenuBuilder"; - class = "EditorPlayerCameraTypeMenu"; - - Item[0] = "First Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"1st Person Camera\");"; - Item[1] = "Third Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"3rd Person Camera\");"; - }; - %this.cameraBookmarksMenu = new PopupMenu(EditorCameraBookmarks) + %this.playerCameraTypeMenu = new PopupMenu(EditorPlayerCameraTypeOptions) + { + superClass = "MenuBuilder"; + class = "EditorPlayerCameraTypeMenu"; + + Item[0] = "First Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"1st Person Camera\");"; + Item[1] = "Third Person" TAB "" TAB "EditorGuiStatusBar.setCamera(\"3rd Person Camera\");"; + }; + } + if(!isObject(EditorCameraBookmarks)) { - superClass = "MenuBuilder"; - class = "EditorCameraBookmarksMenu"; - - //item[0] = "None"; - }; + %this.cameraBookmarksMenu = new PopupMenu(EditorCameraBookmarks) + { + superClass = "MenuBuilder"; + class = "EditorCameraBookmarksMenu"; + + //item[0] = "None"; + }; + } %this.viewTypeMenu = new PopupMenu() { superClass = "MenuBuilder"; @@ -98,7 +110,7 @@ function EditorGui::buildMenus(%this) }; // Menu bar - %this.menuBar = new MenuBar() + %this.menuBar = new MenuBar(WorldEditorMenubar) { dynamicItemInsertPos = 3; }; @@ -263,7 +275,8 @@ function EditorGui::buildMenus(%this) item[0] = "Network Graph" TAB "n" TAB "toggleNetGraph();"; item[1] = "Profiler" TAB "ctrl F2" TAB "showMetrics(true);"; - item[2] = "Make Selected a Mesh" TAB "" TAB "makeSelectedAMesh();"; + item[2] = "Torque SimView" TAB "" TAB "tree();"; + item[3] = "Make Selected a Mesh" TAB "" TAB "makeSelectedAMesh();"; }; %this.menuBar.insert(%toolsMenu, %this.menuBar.getCount()); diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index 56954541e..970518f0f 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -165,11 +165,52 @@ macro(addLib libs) endforeach() endmacro() +#addLibRelease will add to only release builds +macro(addLibRelease libs) + foreach(lib ${libs}) + # check if we can build it ourselfs + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake") + addLibSrc("${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake") + endif() + # then link against it + # two possibilities: a) target already known, so add it directly, or b) target not yet known, so add it to its cache + if(TARGET ${PROJECT_NAME}) + target_link_libraries(${PROJECT_NAME} optimized "${lib}") + else() + list(APPEND ${PROJECT_NAME}_libsRelease ${lib}) + endif() + endforeach() +endmacro() + +#addLibDebug will add to only debug builds +macro(addLibDebug libs) + foreach(lib ${libs}) + # check if we can build it ourselfs + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake") + addLibSrc("${CMAKE_CURRENT_SOURCE_DIR}/libraries/${lib}.cmake") + endif() + # then link against it + # two possibilities: a) target already known, so add it directly, or b) target not yet known, so add it to its cache + if(TARGET ${PROJECT_NAME}) + target_link_libraries(${PROJECT_NAME} debug "${lib}") + else() + list(APPEND ${PROJECT_NAME}_libsDebug ${lib}) + endif() + endforeach() +endmacro() + # this applies cached definitions onto the target macro(_process_libs) if(DEFINED ${PROJECT_NAME}_libs) target_link_libraries(${PROJECT_NAME} "${${PROJECT_NAME}_libs}") endif() + if(DEFINED ${PROJECT_NAME}_libsRelease) + target_link_libraries(${PROJECT_NAME} optimized "${${PROJECT_NAME}_libsRelease}") + endif() + if(DEFINED ${PROJECT_NAME}_libsDebug) + target_link_libraries(${PROJECT_NAME} debug "${${PROJECT_NAME}_libsDebug}") + endif() + endmacro() # apple frameworks diff --git a/Tools/CMake/libraries/libbullet.cmake b/Tools/CMake/libraries/libbullet.cmake index 32e37c38b..78e1823a3 100644 --- a/Tools/CMake/libraries/libbullet.cmake +++ b/Tools/CMake/libraries/libbullet.cmake @@ -36,14 +36,6 @@ addPath( "${libDir}/bullet/src/BulletDynamics/Dynamics" ) addPath( "${libDir}/bullet/src/BulletDynamics/Vehicle" ) addPath( "${libDir}/bullet/src/LinearMath" ) -if( WIN32 ) - addDef( "WIN32" ) - - addPath( "${libDir}/bullet/src/BulletMultiThreaded" ) - addPath( "${libDir}/bullet/src/MiniCL/MiniCLTask" ) - addPath( "${libDir}/bullet/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask" ) - addInclude( "${libDir}/bullet/src/vectormath/scalar" ) -endif() addInclude( "${libDir}/bullet/src" ) diff --git a/Tools/CMake/modules/module_physx3.cmake b/Tools/CMake/modules/module_physx3.cmake new file mode 100644 index 000000000..5545120ee --- /dev/null +++ b/Tools/CMake/modules/module_physx3.cmake @@ -0,0 +1,161 @@ +# ----------------------------------------------------------------------------- +# Copyright (c) 2015 GarageGames, LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# ----------------------------------------------------------------------------- + +# module Physx 3.3 + +option(TORQUE_PHYSICS_PHYSX3 "Use PhysX 3.3 physics" OFF) + +if( NOT TORQUE_PHYSICS_PHYSX3 ) + return() +endif() + +if("${PHYSX3_BASE_PATH}" STREQUAL "") + set(PHYSX3_BASE_PATH "" CACHE PATH "PhysX 3.3 path" FORCE) +endif() + +#still no path we can't go any further +if("${PHYSX3_BASE_PATH}" STREQUAL "") + message(FATAL_ERROR "No PhysX path selected") + return() +endif() + +#set physx path +set(PHYSX3_PATH "${PHYSX3_BASE_PATH}/PhysXSDK") + +# TODO linux support +if(MSVC) +if(TORQUE_CPU_X32) + if(MSVC11) + set(PHYSX3_LIBPATH_PREFIX vc11win32) + elseif(MSVC12) + set(PHYSX3_LIBPATH_PREFIX vc12win32) + elseif(MSVC14) + set(PHYSX3_LIBPATH_PREFIX vc14win32) + else() + return() + endif() +set(PHYSX3_LIBNAME_POSTFIX _x86) + +elseif(TORQUE_CPU_X64) + if(MSVC11) + set(PHYSX3_LIBPATH_PREFIX vc11win64) + elseif(MSVC12) + set(PHYSX3_LIBPATH_PREFIX vc12win64) + elseif(MSVC14) + set(PHYSX3_LIBPATH_PREFIX vc14win64) + else() + return() + endif() +set(PHYSX3_LIBNAME_POSTFIX _x64) + +endif() + +endif(MSVC) + +MACRO(FIND_PHYSX3_LIBRARY VARNAME LIBNAME WITHPOSTFIX) + + set(LIBPOSTFIX "") + if(${WITHPOSTFIX}) + set(LIBPOSTFIX ${PHYSX3_LIBNAME_POSTFIX}) + endif(${WITHPOSTFIX}) + find_library(PHYSX3_${VARNAME}_LIBRARY NAMES ${LIBNAME}${LIBPOSTFIX} + PATHS ${PHYSX3_PATH}/Lib/${PHYSX3_LIBPATH_PREFIX}) + find_library(PHYSX3_${VARNAME}_LIBRARY_DEBUG NAMES ${LIBNAME}DEBUG${LIBPOSTFIX} + PATHS ${PHYSX3_PATH}/Lib/${PHYSX3_LIBPATH_PREFIX}) + +ENDMACRO(FIND_PHYSX3_LIBRARY VARNAME LIBNAME) + +# Find the Libs, we just use the full path to save playing around with link_directories +FIND_PHYSX3_LIBRARY(CORE PhysX3 1) +FIND_PHYSX3_LIBRARY(COMMON PhysX3Common 1) +FIND_PHYSX3_LIBRARY(COOKING PhysX3Cooking 1) +FIND_PHYSX3_LIBRARY(CHARACTER PhysX3CharacterKinematic 1) +FIND_PHYSX3_LIBRARY(EXTENSIONS PhysX3Extensions 0) +FIND_PHYSX3_LIBRARY(TASK PxTask 0) +FIND_PHYSX3_LIBRARY(DEBUGGER PhysXVisualDebuggerSDK 0) +FIND_PHYSX3_LIBRARY(PROFILE PhysXProfileSDK 0) + +if(NOT PHYSX3_CORE_LIBRARY) + return() +endif() + +# Defines +addDef( "TORQUE_PHYSICS_PHYSX3" ) +addDef( "TORQUE_PHYSICS_ENABLED" ) + +# Source +addPath( "${srcDir}/T3D/physics/physx3" ) + +# Includes +addInclude( "${PHYSX3_PATH}/Include" ) +addInclude( "${PHYSX3_PATH}/Include/extensions" ) +addInclude( "${PHYSX3_PATH}/Include/foundation" ) +addInclude( "${PHYSX3_PATH}/Include/characterkinematic" ) +addInclude( "${PHYSX3_PATH}/Include/common" ) + +#Add the libs +set(PHYSX_LIBRARIES_DEBUG + ${PHYSX3_CORE_LIBRARY_DEBUG} + ${PHYSX3_COMMON_LIBRARY_DEBUG} + ${PHYSX3_COOKING_LIBRARY_DEBUG} + ${PHYSX3_CHARACTER_LIBRARY_DEBUG} + ${PHYSX3_EXTENSIONS_LIBRARY_DEBUG} + ${PHYSX3_TASK_LIBRARY_DEBUG} + ${PHYSX3_DEBUGGER_LIBRARY_DEBUG} + ${PHYSX3_PROFILE_LIBRARY_DEBUG} +) + +set(PHYSX_LIBRARIES + ${PHYSX3_CORE_LIBRARY} + ${PHYSX3_COMMON_LIBRARY} + ${PHYSX3_COOKING_LIBRARY} + ${PHYSX3_CHARACTER_LIBRARY} + ${PHYSX3_EXTENSIONS_LIBRARY} + ${PHYSX3_TASK_LIBRARY} + ${PHYSX3_DEBUGGER_LIBRARY} + ${PHYSX3_PROFILE_LIBRARY} +) + +addLibRelease("${PHYSX_LIBRARIES}") +addLibDebug("${PHYSX_LIBRARIES_DEBUG}") + +#Install dll files +if( WIN32 ) + # File Copy for Release + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release") + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CharacterKinematic${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release") + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3Common${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release") + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3Cooking${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Release") + + # File Copy for Debug + if(TORQUE_CPU_X32) + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/nvToolsExt32_1.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug") + elseif(TORQUE_CPU_X64) + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/nvToolsExt64_1.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug") + endif() + + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3DEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug") + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CharacterKinematicDEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug") + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CommonDEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug") + INSTALL(FILES "${PHYSX3_PATH}/Bin/${PHYSX3_LIBPATH_PREFIX}/PhysX3CookingDEBUG${PHYSX3_LIBNAME_POSTFIX}.dll" DESTINATION "${projectOutDir}" CONFIGURATIONS "Debug") + +endif(WIN32) diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index dd707b7a4..a470faa17 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -67,48 +67,92 @@ endif() option(TORQUE_SFX_OPENAL "OpenAL Sound" ON) #windows uses openal-soft if(WIN32) -#disable a few things that are not required -set(ALSOFT_TESTS OFF CACHE BOOL "Build and install test programs" FORCE) -set(ALSOFT_UTILS OFF CACHE BOOL "Build and install utility programs" FORCE) -set(ALSOFT_EXAMPLES OFF CACHE BOOL "Build and install example programs" FORCE) -set(ALSOFT_CONFIG OFF CACHE BOOL "Install alsoft.conf sample configuration file" FORCE) -set(ALSOFT_INSTALL OFF CACHE BOOL "Install headers and libraries" FORCE) -set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE) -set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE) -set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE) -add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft) + #disable a few things that are not required + set(ALSOFT_TESTS OFF CACHE BOOL "Build and install test programs" FORCE) + set(ALSOFT_UTILS OFF CACHE BOOL "Build and install utility programs" FORCE) + set(ALSOFT_EXAMPLES OFF CACHE BOOL "Build and install example programs" FORCE) + set(ALSOFT_CONFIG OFF CACHE BOOL "Install alsoft.conf sample configuration file" FORCE) + set(ALSOFT_INSTALL OFF CACHE BOOL "Install headers and libraries" FORCE) + set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE) + set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE) + set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE) + + add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft) endif() + +if(TORQUE_SFX_OPENAL) + #Hide some unnecessary fields as advanced + mark_as_advanced(ALSOFT_AMBDEC_PRESETS) + mark_as_advanced(ALSOFT_BACKEND_DSOUND) + mark_as_advanced(ALSOFT_BACKEND_MMDEVAPI) + mark_as_advanced(ALSOFT_BACKEND_WAVE) + mark_as_advanced(ALSOFT_BACKEND_WINMM) + mark_as_advanced(ALSOFT_CONFIG) + mark_as_advanced(ALSOFT_CPUEXT_SSE) + mark_as_advanced(ALSOFT_CPUEXT_SSE2) + mark_as_advanced(ALSOFT_CPUEXT_SSE3) + mark_as_advanced(ALSOFT_CPUEXT_SSE4_1) + mark_as_advanced(ALSOFT_DLOPEN) + mark_as_advanced(ALSOFT_EMBED_HRTF_DATA) + mark_as_advanced(ALSOFT_EXAMPLES) + mark_as_advanced(ALSOFT_HRTF_DEFS) + mark_as_advanced(ALSOFT_INSTALL) + mark_as_advanced(ALSOFT_NO_CONFIG_UTIL) + mark_as_advanced(ALSOFT_NO_UID_DEFS) + mark_as_advanced(ALSOFT_REQUIRE_ALSA) + mark_as_advanced(ALSOFT_REQUIRE_COREAUDIO) + mark_as_advanced(ALSOFT_REQUIRE_DSOUND) + mark_as_advanced(ALSOFT_REQUIRE_JACK) + mark_as_advanced(ALSOFT_REQUIRE_MMDEVAPI) + mark_as_advanced(ALSOFT_REQUIRE_NEON) + mark_as_advanced(ALSOFT_REQUIRE_OPENSL) + mark_as_advanced(ALSOFT_REQUIRE_OSS) + mark_as_advanced(ALSOFT_REQUIRE_PORTAUDIO) + mark_as_advanced(ALSOFT_REQUIRE_PULSEAUDIO) + mark_as_advanced(ALSOFT_REQUIRE_QSA) + mark_as_advanced(ALSOFT_REQUIRE_SNDIO) + mark_as_advanced(ALSOFT_REQUIRE_SOLARIS) + mark_as_advanced(ALSOFT_REQUIRE_SSE) + mark_as_advanced(ALSOFT_REQUIRE_SSE2) + mark_as_advanced(ALSOFT_REQUIRE_SSE4_1) + mark_as_advanced(ALSOFT_REQUIRE_WINMM) + mark_as_advanced(ALSOFT_TESTS) + mark_as_advanced(ALSOFT_UTILS) + mark_as_advanced(ALSOFT_WERROR) + mark_as_advanced(COREAUDIO_FRAMEWORK) + mark_as_advanced(CMAKE_DEBUG_POSTFIX) + mark_as_advanced(FORCE_STATIC_VCRT) +endif() + mark_as_advanced(TORQUE_SFX_OPENAL) option(TORQUE_HIFI "HIFI? support" OFF) mark_as_advanced(TORQUE_HIFI) option(TORQUE_EXTENDED_MOVE "Extended move support" OFF) mark_as_advanced(TORQUE_EXTENDED_MOVE) + if(WIN32) - option(TORQUE_SDL "Use SDL for window and input" OFF) + option(TORQUE_SDL "Use SDL for window and input" ON) else() set(TORQUE_SDL ON) # we need sdl to work on Linux/Mac endif() + if(WIN32) - option(TORQUE_OPENGL "Allow OpenGL render" OFF) + option(TORQUE_OPENGL "Allow OpenGL render" ON) #mark_as_advanced(TORQUE_OPENGL) else() set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac endif() if(WIN32) - option(TORQUE_OPENGL "Allow OpenGL render" OFF) - #mark_as_advanced(TORQUE_OPENGL) -else() - set(TORQUE_OPENGL ON) # we need OpenGL to render on Linux/Mac -endif() - -if(WIN32) - option(TORQUE_D3D11 "Allow Direct3D 11 render" OFF) + option(TORQUE_D3D11 "Allow Direct3D 11 render" ON) endif() option(TORQUE_EXPERIMENTAL_EC "Experimental Entity/Component systems" OFF) mark_as_advanced(TORQUE_EXPERIMENTAL_EC) +option(TORQUE_DEDICATED "Torque dedicated" OFF) +mark_as_advanced(TORQUE_DEDICATED) + ############################################################################### # options ############################################################################### @@ -587,7 +631,7 @@ endif() if(NOT EXISTS "${projectOutDir}/${PROJECT_NAME}.torsion") CONFIGURE_FILE("${cmakeDir}/template.torsion.in" "${projectOutDir}/${PROJECT_NAME}.torsion") endif() -if(EXISTS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in" AND NOT EXISTS "${projectOutDir}/main.cs") +if(EXISTS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in") CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in" "${projectOutDir}/main.cs") endif() if(WIN32) @@ -649,6 +693,7 @@ if (APPLE) addFramework("CoreVideo") #grrr damn you sdl! addFramework("Carbon") + addFramework("AudioToolbox") addLib("iconv") #set a few arch defaults set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "OSX Architecture" FORCE) @@ -699,6 +744,63 @@ if(TORQUE_SDL) addDef(TORQUE_SDL) addInclude(${libDir}/sdl/include) addLib(SDL2) + + SET(VIDEO_WAYLAND OFF CACHE BOOL "" FORCE) + mark_as_advanced(3DNOW) + mark_as_advanced(ALSA) + mark_as_advanced(ALTIVEC) + mark_as_advanced(ARTS) + mark_as_advanced(ASSEMBLY) + mark_as_advanced(ASSERTIONS) + mark_as_advanced(DIRECTX) + mark_as_advanced(DISKAUDIO) + mark_as_advanced(DUMMYAUDIO) + mark_as_advanced(ESD) + mark_as_advanced(FUSIONSOUND) + mark_as_advanced(INPUT_TSLIB) + mark_as_advanced(LIBC) + mark_as_advanced(MMX) + mark_as_advanced(NAS) + mark_as_advanced(NAS_SHARED) + mark_as_advanced(OSS) + mark_as_advanced(PTHREADS) + mark_as_advanced(PULSEAUDIO) + mark_as_advanced(RENDER_D3D) + mark_as_advanced(RPATH) + mark_as_advanced(SNDIO) + mark_as_advanced(SSE) + mark_as_advanced(SSE2) + mark_as_advanced(SSEMATH) + mark_as_advanced(WINDRES) + mark_as_advanced(SDL_ATOMIC) + mark_as_advanced(SDL_AUDIO) + mark_as_advanced(SDL_CPUINFO) + mark_as_advanced(SDL_DLOPEN) + mark_as_advanced(SDL_EVENTS) + mark_as_advanced(SDL_FILE) + mark_as_advanced(SDL_FILESYSTEM) + mark_as_advanced(SDL_HAPTIC) + mark_as_advanced(SDL_JOYSTICK) + mark_as_advanced(SDL_LOADSO) + mark_as_advanced(SDL_POWER) + mark_as_advanced(SDL_RENDER) + mark_as_advanced(SDL_SHARED) + mark_as_advanced(SDL_STATIC) + mark_as_advanced(SDL_THREADS) + mark_as_advanced(SDL_TIMERS) + mark_as_advanced(SDL_VIDEO) + mark_as_advanced(CLOCK_GETTIME) + mark_as_advanced(GCC_ATOMICS) + mark_as_advanced(VIDEO_WAYLAND) + mark_as_advanced(VIDEO_COCOA) + mark_as_advanced(VIDEO_DIRECTFB) + mark_as_advanced(VIDEO_DUMMY) + mark_as_advanced(VIDEO_MIR) + mark_as_advanced(VIDEO_OPENGL) + mark_as_advanced(VIDEO_OPENGLES) + mark_as_advanced(VIDEO_RPI) + mark_as_advanced(VIDEO_VIVANTE) + mark_as_advanced(VIDEO_X11) endif() if(TORQUE_STATIC_CODE_ANALYSIS) @@ -751,6 +853,12 @@ if(MSVC) endforeach() endif() +############################################################################### +# Project-specific configuration: +############################################################################### + +include(${TORQUE_APP_DIR}/${PROJECT_NAME}.cmake OPTIONAL) + ############################################################################### # Installation ###############################################################################