PhysX 3.4 / APEX 1.4 release candidate @21506124

3 files changed, 26 insertions, 3 deletions

diff --git a/PhysX_3.4/Documentation/PhysXGuide/Manual/ExtendingSerialization.html b/PhysX_3.4/Documentation/PhysXGuide/Manual/ExtendingSerialization.html
index 0cf2419a..32c57929 100644
--- a/PhysX_3.4/Documentation/PhysXGuide/Manual/ExtendingSerialization.html
+++ b/PhysX_3.4/Documentation/PhysXGuide/Manual/ExtendingSerialization.html
@@ -343,8 +343,8 @@
 <p>PxVehicle serialization is a useful example.  With Source/PhysXVehicle as the root folder the structure of the files is as follows:</p>
 <div class="highlight-c++"><div class="highlight"><pre><span class="n">src</span><span class="o">/</span><span class="n">PhysXMetaData</span><span class="o">/</span><span class="n">include</span><span class="o">/</span><span class="n">PxVehicleMetaDataObjects</span><span class="p">.</span><span class="n">h</span>
 <span class="n">src</span><span class="o">/</span><span class="n">PhysXMetaData</span><span class="o">/</span><span class="n">src</span><span class="o">/</span><span class="n">PxVehicleMetaDataObjects</span><span class="p">.</span><span class="n">cpp</span>
-<span class="p">..</span><span class="o">/</span><span class="p">..</span><span class="o">/</span><span class="n">Tools</span><span class="o">/</span><span class="n">PhysXMetaDataGenerator</span><span class="o">/</span><span class="n">PxVehicleExtension</span><span class="o">/</span><span class="n">PxVehicleExtensionAPI</span><span class="p">.</span><span class="n">h</span>
-<span class="p">..</span><span class="o">/</span><span class="p">..</span><span class="o">/</span><span class="n">Tools</span><span class="o">/</span><span class="n">PhysXMetaDataGenerator</span><span class="o">/</span><span class="n">PxVehicleExtension</span><span class="o">/</span><span class="n">runClang_</span><span class="p">[</span><span class="n">windows</span><span class="o">|</span><span class="n">osx</span><span class="o">|</span><span class="n">linux</span><span class="p">].[</span><span class="n">bat</span><span class="o">|</span><span class="n">sh</span><span class="p">]</span>
+<span class="p">..</span><span class="o">/</span><span class="p">..</span><span class="o">/</span><span class="n">Tools</span><span class="o">/</span><span class="n">PhysXMetaDataGenerator</span><span class="o">/</span><span class="n">PxVehicleExtensionAPI</span><span class="p">.</span><span class="n">h</span>
+<span class="p">..</span><span class="o">/</span><span class="p">..</span><span class="o">/</span><span class="n">Tools</span><span class="o">/</span><span class="n">PhysXMetaDataGenerator</span><span class="o">/</span><span class="n">generateMetaData</span><span class="p">.</span><span class="n">py</span>
 </pre></div>
 </div>
 <p>Running the script will auto-generate the following files:</p>
diff --git a/PhysX_3.4/Documentation/PhysXGuide/Manual/Index.html b/PhysX_3.4/Documentation/PhysXGuide/Manual/Index.html
index 9d81ed92..23597b3c 100644
--- a/PhysX_3.4/Documentation/PhysXGuide/Manual/Index.html
+++ b/PhysX_3.4/Documentation/PhysXGuide/Manual/Index.html
@@ -50,7 +50,7 @@
   <div class="section" id="user-s-guide">
 <h1>User's Guide<a class="headerlink" href="#user-s-guide" title="Permalink to this headline">¶</a></h1>
 <img alt="../_images/PhysXlogo1.png" src="../_images/PhysXlogo1.png" />
-<p>Built October 24, 2016</p>
+<p>Built December 21, 2016</p>
 <p>Contents:</p>
 <div class="toctree-wrapper compound">
 <ul>
@@ -96,6 +96,7 @@
 <li class="toctree-l2"><a class="reference internal" href="Startup.html#delay-loading-dlls">Delay-Loading DLLs</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="Startup.html#physxcommon-dll-and-psfoundation-dll-load">PhysXCommon DLL and PsFoundation DLL load</a></li>
 <li class="toctree-l3"><a class="reference internal" href="Startup.html#pxdelayloadhook">PxDelayLoadHook</a></li>
+<li class="toctree-l3"><a class="reference internal" href="Startup.html#pxgpuloadhook">PxGpuLoadHook</a></li>
 <li class="toctree-l3"><a class="reference internal" href="Startup.html#physxcommon-secure-load">PhysXCommon Secure Load</a></li>
 </ul>
 </li>
diff --git a/PhysX_3.4/Documentation/PhysXGuide/Manual/Startup.html b/PhysX_3.4/Documentation/PhysXGuide/Manual/Startup.html
index 9e406285..f04ef679 100644
--- a/PhysX_3.4/Documentation/PhysXGuide/Manual/Startup.html
+++ b/PhysX_3.4/Documentation/PhysXGuide/Manual/Startup.html
@@ -191,6 +191,27 @@
 </pre></div>
 </div>
 </div>
+<div class="section" id="pxgpuloadhook">
+<h3>PxGpuLoadHook<a class="headerlink" href="#pxgpuloadhook" title="Permalink to this headline">¶</a></h3>
+<p>The PxGpuLoadHook class supports loading of different versions of PhysXGpu DLL. This can be achieved by providing different DLL names to the PhysX SDK through a custom subclass of PxGpuLoadHook, see the following example:</p>
+<div class="highlight-c++"><div class="highlight"><pre><span class="k">class</span> <span class="nc">SampleGpuLoadHook</span><span class="o">:</span> <span class="k">public</span> <span class="n">PxGpuLoadHook</span>
+<span class="p">{</span>
+    <span class="k">virtual</span> <span class="k">const</span> <span class="kt">char</span><span class="o">*</span> <span class="n">getPhysXGpuDEBUGDllName</span><span class="p">()</span> <span class="k">const</span>
+        <span class="p">{</span> <span class="k">return</span> <span class="s">&quot;PhysX3GpuDEBUG_x64_Test.dll&quot;</span><span class="p">;</span> <span class="p">}</span>
+    <span class="k">virtual</span> <span class="k">const</span> <span class="kt">char</span><span class="o">*</span> <span class="n">getPhysXGpuCHECKEDDllName</span><span class="p">()</span> <span class="k">const</span>
+        <span class="p">{</span> <span class="k">return</span> <span class="s">&quot;PhysX3GpuCHECKED_x64_Test.dll&quot;</span><span class="p">;</span> <span class="p">}</span>
+    <span class="k">virtual</span> <span class="k">const</span> <span class="kt">char</span><span class="o">*</span> <span class="n">getPhysXGpuPROFILEDllName</span><span class="p">()</span> <span class="k">const</span>
+        <span class="p">{</span> <span class="k">return</span> <span class="s">&quot;PhysX3GpuPROFILE_x64_Test.dll&quot;</span><span class="p">;</span> <span class="p">}</span>
+    <span class="k">virtual</span> <span class="k">const</span> <span class="kt">char</span><span class="o">*</span> <span class="n">getPhysXGpuDllName</span><span class="p">()</span> <span class="k">const</span>
+        <span class="p">{</span> <span class="k">return</span> <span class="s">&quot;PhysX3Gpu_x64_Test.dll&quot;</span><span class="p">;</span> <span class="p">}</span>
+<span class="p">}</span> <span class="n">gGpuLoadHook</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>Now the hook must be set for PhysX:</p>
+<div class="highlight-c++"><div class="highlight"><pre><span class="n">PxSetPhysXGpuLoadHook</span><span class="p">(</span><span class="o">&amp;</span><span class="n">gGpuLoadHook</span><span class="p">);</span>
+</pre></div>
+</div>
+</div>
 <div class="section" id="physxcommon-secure-load">
 <h3>PhysXCommon Secure Load<a class="headerlink" href="#physxcommon-secure-load" title="Permalink to this headline">¶</a></h3>
 <p>All PhysX DLLs distributed by NVIDIA are signed. The PhysXCommon DLL signature is checked, when it is loaded by PhysX or PhysXCooking. If signature test fails the application is terminated.</p>
@@ -226,6 +247,7 @@
 <li><a class="reference internal" href="#delay-loading-dlls">Delay-Loading DLLs</a><ul>
 <li><a class="reference internal" href="#physxcommon-dll-and-psfoundation-dll-load">PhysXCommon DLL and PsFoundation DLL load</a></li>
 <li><a class="reference internal" href="#pxdelayloadhook">PxDelayLoadHook</a></li>
+<li><a class="reference internal" href="#pxgpuloadhook">PxGpuLoadHook</a></li>
 <li><a class="reference internal" href="#physxcommon-secure-load">PhysXCommon Secure Load</a></li>
 </ul>
 </li>