2
0
Эх сурвалжийг харах

Merge pull request #55 from DavidWyand-GG/issue54-PhysXCrash

Fix for Issue #54 for PhysX client crash on exit
David Wyand 13 жил өмнө
parent
commit
a59a6ef8b1

+ 7 - 0
Templates/Empty PhysX/game/scripts/client/serverConnection.cs

@@ -121,6 +121,13 @@ function disconnectedCleanup()
    // Back to the launch screen
    // Back to the launch screen
    if (isObject( MainMenuGui ))
    if (isObject( MainMenuGui ))
       Canvas.setContent( MainMenuGui );
       Canvas.setContent( MainMenuGui );
+
+   // Before we destroy the client physics world
+   // make sure all ServerConnection objects are deleted.
+   if(isObject(ServerConnection))
+   {
+      ServerConnection.deleteAllObjects();
+   }
    
    
    // We can now delete the client physics simulation.
    // We can now delete the client physics simulation.
    physicsDestroyWorld( "client" );                 
    physicsDestroyWorld( "client" );                 

+ 7 - 0
Templates/Empty/game/scripts/client/serverConnection.cs

@@ -121,6 +121,13 @@ function disconnectedCleanup()
    // Back to the launch screen
    // Back to the launch screen
    if (isObject( MainMenuGui ))
    if (isObject( MainMenuGui ))
       Canvas.setContent( MainMenuGui );
       Canvas.setContent( MainMenuGui );
+
+   // Before we destroy the client physics world
+   // make sure all ServerConnection objects are deleted.
+   if(isObject(ServerConnection))
+   {
+      ServerConnection.deleteAllObjects();
+   }
    
    
    // We can now delete the client physics simulation.
    // We can now delete the client physics simulation.
    physicsDestroyWorld( "client" );                 
    physicsDestroyWorld( "client" );                 

+ 7 - 0
Templates/Full PhysX/game/scripts/client/serverConnection.cs

@@ -222,6 +222,13 @@ function disconnectedCleanup()
       Canvas.setContent( MainMenuGui );
       Canvas.setContent( MainMenuGui );
    else if (isObject( UnifiedMainMenuGui ))
    else if (isObject( UnifiedMainMenuGui ))
       Canvas.setContent( UnifiedMainMenuGui );
       Canvas.setContent( UnifiedMainMenuGui );
+
+   // Before we destroy the client physics world
+   // make sure all ServerConnection objects are deleted.
+   if(isObject(ServerConnection))
+   {
+      ServerConnection.deleteAllObjects();
+   }
    
    
    // We can now delete the client physics simulation.
    // We can now delete the client physics simulation.
    physicsDestroyWorld( "client" );                 
    physicsDestroyWorld( "client" );                 

+ 7 - 0
Templates/Full/game/scripts/client/serverConnection.cs

@@ -222,6 +222,13 @@ function disconnectedCleanup()
       Canvas.setContent( MainMenuGui );
       Canvas.setContent( MainMenuGui );
    else if (isObject( UnifiedMainMenuGui ))
    else if (isObject( UnifiedMainMenuGui ))
       Canvas.setContent( UnifiedMainMenuGui );
       Canvas.setContent( UnifiedMainMenuGui );
+
+   // Before we destroy the client physics world
+   // make sure all ServerConnection objects are deleted.
+   if(isObject(ServerConnection))
+   {
+      ServerConnection.deleteAllObjects();
+   }
    
    
    // We can now delete the client physics simulation.
    // We can now delete the client physics simulation.
    physicsDestroyWorld( "client" );                 
    physicsDestroyWorld( "client" );