From 688b5f42e9bfe498d7af7075d4d8f4429867f3a3 Mon Sep 17 00:00:00 2001
From: Miles Macklin <miles.macklin@gmail.com>
Date: Fri, 9 Jun 2017 13:41:15 +1200
Subject: 1.2.0.beta.1

---
 doc/_static/api/globals.html | 121 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 92 insertions(+), 29 deletions(-)

(limited to 'doc/_static/api/globals.html')

diff --git a/doc/_static/api/globals.html b/doc/_static/api/globals.html
index 42e1ec0..6039eb7 100644
--- a/doc/_static/api/globals.html
+++ b/doc/_static/api/globals.html
@@ -20,7 +20,7 @@
   <td id="projectlogo"><img alt="Logo" src="nvidia.png"/></td>
   <td style="padding-left: 0.5em;">
    <div id="projectname">FLEX
-   &#160;<span id="projectnumber">1.1.0</span>
+   &#160;<span id="projectnumber">1.2.0</span>
    </div>
   </td>
  </tr>
@@ -58,6 +58,15 @@
 <li>eNvFlexExtModeVelocityChange
 : <a class="el" href="_nv_flex_ext_8h.html#a502acd5c1db4ba6eef61eba25f26d68ea6a2e4817b1e86764147c81e8d5e5070c">NvFlexExt.h</a>
 </li>
+<li>eNvFlexFeatureModeDefault
+: <a class="el" href="_nv_flex_8h.html#aee5c235d5fab40831cf339680aa25560a3ab06dc4cd4aa073ab0f2d96a56c499d">NvFlex.h</a>
+</li>
+<li>eNvFlexFeatureModeSimpleFluids
+: <a class="el" href="_nv_flex_8h.html#aee5c235d5fab40831cf339680aa25560aeab2b8a68b528d46e11b71ad0f4d83f2">NvFlex.h</a>
+</li>
+<li>eNvFlexFeatureModeSimpleSolids
+: <a class="el" href="_nv_flex_8h.html#aee5c235d5fab40831cf339680aa25560a421fe1e1bb00fc41e9b32208cd9155f5">NvFlex.h</a>
+</li>
 <li>eNvFlexLogAll
 : <a class="el" href="_nv_flex_8h.html#ab4435b3857752360375fe52fc992cfcaa8feff72c0b0391e8adf3ddb6c39ef10e">NvFlex.h</a>
 </li>
@@ -73,15 +82,15 @@
 <li>eNvFlexLogWarning
 : <a class="el" href="_nv_flex_8h.html#ab4435b3857752360375fe52fc992cfcaa5538835c4767004ba5fd443ada08ea61">NvFlex.h</a>
 </li>
-<li>eNvFlexMapDiscard
-: <a class="el" href="_nv_flex_8h.html#a6541b33eaca7b2323e73b30cea34d16caa01c2dce3aa1e0d9d151060e1786c706">NvFlex.h</a>
-</li>
 <li>eNvFlexMapDoNotWait
 : <a class="el" href="_nv_flex_8h.html#a6541b33eaca7b2323e73b30cea34d16ca1bd450ab65ccc06288fae95e23d5e6f1">NvFlex.h</a>
 </li>
 <li>eNvFlexMapWait
 : <a class="el" href="_nv_flex_8h.html#a6541b33eaca7b2323e73b30cea34d16ca11adf517d180983daec217e761acc3d6">NvFlex.h</a>
 </li>
+<li>eNvFlexPhaseFlagsMask
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a7b776084468bae4e3566484cf34d0154">NvFlex.h</a>
+</li>
 <li>eNvFlexPhaseFluid
 : <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a1728772beb1746ace4c549b2ed8f1d74">NvFlex.h</a>
 </li>
@@ -94,6 +103,36 @@
 <li>eNvFlexPhaseSelfCollideFilter
 : <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a76a62d3a5df428f18e01f8b37573a7b1">NvFlex.h</a>
 </li>
+<li>eNvFlexPhaseShapeChannel0
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a66aa70953a97744621e2afa41d0e32d2">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel1
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a1de4e956764950e501bcb8376a70f5a9">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel2
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644aa3a4fd0d5930b31199334e500ac2d7c8">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel3
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644ab4034dbf78d6045ee13278531ee21c2b">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel4
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644af309316efb695be38a4e15986be21ef9">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel5
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a92bbb75d47ea0058a9a89deb0abec67f">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel6
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a0c8d08e646d2713e34d7e2dd6e7b21f2">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannel7
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a0679f1deab7afc547900e30aae0b711a">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseShapeChannelMask
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644ae4ea43366942f719f40e8526ad21a038">NvFlex.h</a>
+</li>
+<li>eNvFlexPhaseUnused
+: <a class="el" href="_nv_flex_8h.html#a5ad2a7745fcb4d4afd5b5f1bda074644a52ee05f3e425c336856277774bc9f69f">NvFlex.h</a>
+</li>
 <li>eNvFlexRelaxationGlobal
 : <a class="el" href="_nv_flex_8h.html#a46f5d35902f7da40628247175a174f3ba33711a4b466d606d68dee43918f819db">NvFlex.h</a>
 </li>
@@ -183,7 +222,7 @@
 : <a class="el" href="_nv_flex_8h.html#a5c28caf6d5d513c5adacd4fbc782f308">NvFlex.h</a>
 </li>
 <li>NvFlexCreateSolver()
-: <a class="el" href="_nv_flex_8h.html#af7f91fa47c779fcd8bee60061de6d31c">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a9e925acbc34675dfe247da017cbd855f">NvFlex.h</a>
 </li>
 <li>NvFlexCreateTriangleMesh()
 : <a class="el" href="_nv_flex_8h.html#afdda5a5210938a1e8a7c3a8218ad468e">NvFlex.h</a>
@@ -240,7 +279,7 @@
 : <a class="el" href="_nv_flex_ext_8h.html#ad0a9c7e2f907e46b60f6bacf402987ce">NvFlexExt.h</a>
 </li>
 <li>NvFlexExtCreateSoftFromMesh()
-: <a class="el" href="_nv_flex_ext_8h.html#a9f2c0daf521df4920e44cca1cb30b42c">NvFlexExt.h</a>
+: <a class="el" href="_nv_flex_ext_8h.html#a3a9ce6bba709625f6c338bd3070bd012">NvFlexExt.h</a>
 </li>
 <li>NvFlexExtCreateSoftMeshSkinning()
 : <a class="el" href="_nv_flex_ext_8h.html#a6e3f12e9e92abb31b115cf31b33e34bb">NvFlexExt.h</a>
@@ -326,6 +365,9 @@
 <li>NvFlexExtUpdateInstances()
 : <a class="el" href="_nv_flex_ext_8h.html#a4695d37db8b61495f200bfd88a2be628">NvFlexExt.h</a>
 </li>
+<li>NvFlexFeatureMode
+: <a class="el" href="_nv_flex_8h.html#aee5c235d5fab40831cf339680aa25560">NvFlex.h</a>
+</li>
 <li>NvFlexFlush()
 : <a class="el" href="_nv_flex_8h.html#a898eb8e66a456dd2266c694f29cab600">NvFlex.h</a>
 </li>
@@ -333,13 +375,13 @@
 : <a class="el" href="_nv_flex_8h.html#ab559759820a4322aff061745ef26c867">NvFlex.h</a>
 </li>
 <li>NvFlexGetActive()
-: <a class="el" href="_nv_flex_8h.html#aeed8fe87fa073067af1a45560cc54a79">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a1bd4b70e0118abe18ca5fe85157299b6">NvFlex.h</a>
 </li>
 <li>NvFlexGetActiveCount()
 : <a class="el" href="_nv_flex_8h.html#a2345372dea2ad4f043153a84e7a2c407">NvFlex.h</a>
 </li>
 <li>NvFlexGetAnisotropy()
-: <a class="el" href="_nv_flex_8h.html#ae28167c680ad56dcff600ce0a223cec5">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#aef768edc8e4df1a78a94a6c971541550">NvFlex.h</a>
 </li>
 <li>NvFlexGetBounds()
 : <a class="el" href="_nv_flex_8h.html#ab1eec84a21b1872fba11c9b4cc1d1629">NvFlex.h</a>
@@ -351,7 +393,7 @@
 : <a class="el" href="_nv_flex_8h.html#ad56e661161763579afb375b3841eb5ff">NvFlex.h</a>
 </li>
 <li>NvFlexGetDensities()
-: <a class="el" href="_nv_flex_8h.html#a6f6f14e625dc744a127be81e6dc4cb74">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a3a20cc2539983a009caaf77ec9ceab82">NvFlex.h</a>
 </li>
 <li>NvFlexGetDetailTimers()
 : <a class="el" href="_nv_flex_8h.html#ab1efb6764f65900cb09f0188ad6da08a">NvFlex.h</a>
@@ -360,37 +402,43 @@
 : <a class="el" href="_nv_flex_8h.html#a2ac0a898a565a2cdf13b80acd4a3555c">NvFlex.h</a>
 </li>
 <li>NvFlexGetDeviceLatency()
-: <a class="el" href="_nv_flex_8h.html#a221a4621ab98eca6ecd3368d288154a4">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#aa77d2a4edd4ccd79c9389854dca80613">NvFlex.h</a>
 </li>
 <li>NvFlexGetDeviceName()
 : <a class="el" href="_nv_flex_8h.html#a4c451971259524c6878b6b1ed4023ada">NvFlex.h</a>
 </li>
 <li>NvFlexGetDiffuseParticles()
-: <a class="el" href="_nv_flex_8h.html#a37ada4b95999cc253dfb049b99030d50">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#afa458a6eec8b0d117e53c40c13788fd9">NvFlex.h</a>
 </li>
 <li>NvFlexGetDynamicTriangles()
 : <a class="el" href="_nv_flex_8h.html#abdfd0834422dd99154a27962614525e5">NvFlex.h</a>
 </li>
+<li>NvFlexGetNeighbors()
+: <a class="el" href="_nv_flex_8h.html#ade1ef600ada4d7567e515258b289e209">NvFlex.h</a>
+</li>
 <li>NvFlexGetNormals()
-: <a class="el" href="_nv_flex_8h.html#aadb2a0cf125e4a6b2f3443ab7dcbd3d4">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a73d87b460a34c52ff4b616e97a53ade7">NvFlex.h</a>
 </li>
 <li>NvFlexGetParams()
 : <a class="el" href="_nv_flex_8h.html#a581b458848039220203547af53de128f">NvFlex.h</a>
 </li>
 <li>NvFlexGetParticles()
-: <a class="el" href="_nv_flex_8h.html#a84f06fff995d8eb034cff81c811fa312">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#aaff62cfd50431d82af5d04a6c9ac4ffd">NvFlex.h</a>
 </li>
 <li>NvFlexGetPhases()
-: <a class="el" href="_nv_flex_8h.html#a15b7a5449bee38bbe5dcaf23690f09f5">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#accc944f0e76ee2e5d67c3f977b150806">NvFlex.h</a>
 </li>
 <li>NvFlexGetRestParticles()
-: <a class="el" href="_nv_flex_8h.html#affb884bcf3e7e389812d0b52b0fc0490">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#aafc89f87307602fb9bfa8f6668122121">NvFlex.h</a>
 </li>
-<li>NvFlexGetRigidTransforms()
-: <a class="el" href="_nv_flex_8h.html#a3eafe7fe6b200c757c7402eca7d13f6d">NvFlex.h</a>
+<li>NvFlexGetRigids()
+: <a class="el" href="_nv_flex_8h.html#ab5cc56e228374b1da0910356b3172b4e">NvFlex.h</a>
 </li>
 <li>NvFlexGetSmoothParticles()
-: <a class="el" href="_nv_flex_8h.html#abfa62e01c4f4511d3f6a00ab6a0f257a">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a96a771dd328d019e6164e5f23d29ffcb">NvFlex.h</a>
+</li>
+<li>NvFlexGetSolverDesc()
+: <a class="el" href="_nv_flex_8h.html#afd6aff58269d6c359df2453c96397840">NvFlex.h</a>
 </li>
 <li>NvFlexGetSolverLibrary()
 : <a class="el" href="_nv_flex_8h.html#ae0d57e4fc2b3b51ec08f7da0a28ff343">NvFlex.h</a>
@@ -405,7 +453,7 @@
 : <a class="el" href="_nv_flex_8h.html#a60794d849b4184335e2a0ddec0a9e6a2">NvFlex.h</a>
 </li>
 <li>NvFlexGetVelocities()
-: <a class="el" href="_nv_flex_8h.html#a67bd9669086e823ebe33d08d14f5b2b9">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#afbcbff4e4865105514c194398ab3a7b0">NvFlex.h</a>
 </li>
 <li>NvFlexGetVersion()
 : <a class="el" href="_nv_flex_8h.html#ac25ec5de38c177db51198bb620644d36">NvFlex.h</a>
@@ -417,11 +465,17 @@
 : <a class="el" href="_nv_flex_8h.html#a3078976e98f370a9fbdb11db80f1f318">NvFlex.h</a>
 </li>
 <li>NvFlexMakePhase()
-: <a class="el" href="_nv_flex_8h.html#af53fa9d7caef50db346475065504848d">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#ab43db5f28808f8038cfc9330d4b47d57">NvFlex.h</a>
+</li>
+<li>NvFlexMakePhaseWithChannels()
+: <a class="el" href="_nv_flex_8h.html#a615e8070212c24a70e7a849120c13353">NvFlex.h</a>
 </li>
 <li>NvFlexMakeShapeFlags()
 : <a class="el" href="_nv_flex_8h.html#ad6ee1e23e0c49aad63df8f605182de3a">NvFlex.h</a>
 </li>
+<li>NvFlexMakeShapeFlagsWithChannels()
+: <a class="el" href="_nv_flex_8h.html#ad83b7fb561a91467a3094771bb682b96">NvFlex.h</a>
+</li>
 <li>NvFlexMap()
 : <a class="el" href="_nv_flex_8h.html#a0898bb9210440b159688d4647f6eb083">NvFlex.h</a>
 </li>
@@ -447,7 +501,10 @@
 : <a class="el" href="_nv_flex_8h.html#ae6671f352bd77e296609d0bc2a57fd11">NvFlex.h</a>
 </li>
 <li>NvFlexSetActive()
-: <a class="el" href="_nv_flex_8h.html#aea2af336bdd96d7168c3acdce6d1875d">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#adc0c97635cdbb3da7b571574a3b38990">NvFlex.h</a>
+</li>
+<li>NvFlexSetActiveCount()
+: <a class="el" href="_nv_flex_8h.html#a677dc591fe443ae058701966c52d1316">NvFlex.h</a>
 </li>
 <li>NvFlexSetDiffuseParticles()
 : <a class="el" href="_nv_flex_8h.html#a5a7213593dd9a23d9d67f8517d1da9de">NvFlex.h</a>
@@ -459,31 +516,34 @@
 : <a class="el" href="_nv_flex_8h.html#a7f2b59fba77c60ce116e1eac57d63e50">NvFlex.h</a>
 </li>
 <li>NvFlexSetNormals()
-: <a class="el" href="_nv_flex_8h.html#add03fd357383845f07e0596290faf316">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a32e8fdb39029a2564c129bd493c52058">NvFlex.h</a>
 </li>
 <li>NvFlexSetParams()
 : <a class="el" href="_nv_flex_8h.html#ae2db6ad8006027c1acf2315a0d15fe71">NvFlex.h</a>
 </li>
 <li>NvFlexSetParticles()
-: <a class="el" href="_nv_flex_8h.html#abef057ac89ba5cf1cd71f0084f9313de">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a7ec5ebe3e98a44a2058d6be74b2cb633">NvFlex.h</a>
 </li>
 <li>NvFlexSetPhases()
-: <a class="el" href="_nv_flex_8h.html#a3117f92571613709936291c48414e521">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#aa1d44495e442f8cae874c635ef847478">NvFlex.h</a>
 </li>
 <li>NvFlexSetRestParticles()
-: <a class="el" href="_nv_flex_8h.html#aa457096286567a37d4f1d5f4857d9296">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#a125cfd9817437bb4f4bcb9418efa3dda">NvFlex.h</a>
 </li>
 <li>NvFlexSetRigids()
-: <a class="el" href="_nv_flex_8h.html#a89c872e761a53c87375f536a0ef597d8">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#aa8b7bfeffb0fa7dc6dbd291fee87edc9">NvFlex.h</a>
 </li>
 <li>NvFlexSetShapes()
 : <a class="el" href="_nv_flex_8h.html#aea4e7117722df53dfe44c676496117fa">NvFlex.h</a>
 </li>
+<li>NvFlexSetSolverDescDefaults()
+: <a class="el" href="_nv_flex_8h.html#a69a33d464c002a8916a5925c6ef32ae6">NvFlex.h</a>
+</li>
 <li>NvFlexSetSprings()
 : <a class="el" href="_nv_flex_8h.html#ae67c0cab2ecee8eb9485a26ef0fad6a9">NvFlex.h</a>
 </li>
 <li>NvFlexSetVelocities()
-: <a class="el" href="_nv_flex_8h.html#afe09e63d22c5156fe24cd2d2bc069c04">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#ae2b271f123db0054512936f2acc6467f">NvFlex.h</a>
 </li>
 <li>NvFlexShutdown()
 : <a class="el" href="_nv_flex_8h.html#aaf59e45ada57c7f958a8030099cbe211">NvFlex.h</a>
@@ -507,7 +567,7 @@
 : <a class="el" href="_nv_flex_8h.html#a78045a8d4e856372df108dc616a94cd8">NvFlex.h</a>
 </li>
 <li>NvFlexUpdateConvexMesh()
-: <a class="el" href="_nv_flex_8h.html#a69289002a6f8ecd697118f0ec6572f5d">NvFlex.h</a>
+: <a class="el" href="_nv_flex_8h.html#ab452c355f92dda050d4b4dafb8e71b03">NvFlex.h</a>
 </li>
 <li>NvFlexUpdateDistanceField()
 : <a class="el" href="_nv_flex_8h.html#a584ffb275b9986fd5444ed1a7ea247d9">NvFlex.h</a>
@@ -518,11 +578,14 @@
 <li>NvFlexUpdateTriangleMesh()
 : <a class="el" href="_nv_flex_8h.html#a4958c555f0ed65dee54c37af32529356">NvFlex.h</a>
 </li>
+<li>NvFlexWait()
+: <a class="el" href="_nv_flex_8h.html#a615d2e6eec2486a5db815d929f9c642c">NvFlex.h</a>
+</li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Feb 22 2017 12:18:22 for FLEX by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Jun 9 2017 09:57:25 for FLEX by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.9.1
 </small></address>
-- 
cgit v1.2.3