mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-22 08:03:45 +00:00
Areloch
GitHub
commit
83d4493f53
4 changed files with 216 additions and 14 deletions
|
|
@ -63,7 +63,8 @@ Px3World::Px3World(): mScene( NULL ),
|
|||
mEditorTimeScale( 1.0f ),
|
||||
mAccumulator( 0 ),
|
||||
mControllerManager(NULL),
|
||||
mIsSceneLocked(false)
|
||||
mIsSceneLocked(false),
|
||||
mRenderBuffer(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -177,6 +178,8 @@ void Px3World::destroyWorld()
|
|||
{
|
||||
getPhysicsResults();
|
||||
|
||||
mRenderBuffer = NULL;
|
||||
|
||||
// Release the tick processing signals.
|
||||
if ( mProcessList )
|
||||
{
|
||||
|
|
@ -223,13 +226,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<physx::PxRenderBuffer*>(&mScene->getRenderBuffer());
|
||||
|
||||
physx::PxDominanceGroupPair debrisDominance( 0.0f, 1.0f );
|
||||
mScene->setDominanceGroupPair(0,31,debrisDominance);
|
||||
|
|
@ -548,22 +552,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 +578,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 +597,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 );
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ protected:
|
|||
ProcessList *mProcessList;
|
||||
F32 mEditorTimeScale;
|
||||
bool mErrorReport;
|
||||
physx::PxRenderBuffer *mRenderBuffer;
|
||||
physx::PxControllerManager* mControllerManager;
|
||||
static Px3ConsoleStream *smErrorCallback;
|
||||
static physx::PxDefaultAllocator smMemoryAlloc;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
161
Tools/CMake/modules/module_physx3.cmake
Normal file
161
Tools/CMake/modules/module_physx3.cmake
Normal file
|
|
@ -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)
|
||||
Loading…
Add table
Add a link
Reference in a new issue