diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
| commit | d11708e398c2f6377d9eac2b1f7248c62faab569 (patch) | |
| tree | 5778e794690c046ab4b0205d8f764960a5af168b /PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp | |
| parent | PhysX 3.4, APEX 1.4 patch release @21821222 (diff) | |
| download | physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.tar.xz physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.zip | |
PhysX 3.4, APEX 1.4 patch release @22017166
Diffstat (limited to 'PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp')
| -rw-r--r-- | PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp b/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp index 08d1a14c..45202c2d 100644 --- a/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp +++ b/PhysX_3.4/Source/PhysX/src/NpSceneQueries.cpp @@ -819,18 +819,8 @@ bool NpSceneQueries::multiQuery( } } +//explicit template instantiation +template bool NpSceneQueries::multiQuery<PxRaycastHit>(const MultiQueryInput&, PxHitCallback<PxRaycastHit>&, PxHitFlags, const PxQueryCache*, const PxQueryFilterData&, PxQueryFilterCallback*, BatchQueryFilterData*) const; +template bool NpSceneQueries::multiQuery<PxOverlapHit>(const MultiQueryInput&, PxHitCallback<PxOverlapHit>&, PxHitFlags, const PxQueryCache*, const PxQueryFilterData&, PxQueryFilterCallback*, BatchQueryFilterData*) const; +template bool NpSceneQueries::multiQuery<PxSweepHit>(const MultiQueryInput&, PxHitCallback<PxSweepHit>&, PxHitFlags, const PxQueryCache*, const PxQueryFilterData&, PxQueryFilterCallback*, BatchQueryFilterData*) const; -// explicit instantiations for multiQuery to fix link errors on android -#if !PX_WINDOWS_FAMILY -#define TMQ(hittype) \ - template bool NpSceneQueries::multiQuery<hittype>( \ - const MultiQueryInput& input, PxHitCallback<hittype>& hits, PxHitFlags hitFlags, \ - const PxQueryCache* cache, const PxQueryFilterData& filterData, PxQueryFilterCallback* filterCall, \ - BatchQueryFilterData* bfd) const; - -TMQ(PxRaycastHit) -TMQ(PxOverlapHit) -TMQ(PxSweepHit) - -#undef TMQ -#endif |