Changeset 424 for cafu/trunk

Timestamp:

11/18/11 23:46:15 (6 months ago)

Author:

Carsten

Message:

Fix for problem introduced in previous revision r423.
See comment in the code for further details.

Files:

• cafu/trunk/Ca3DE/MainCanvas.cpp (modified) (1 diff)

cafu/trunk/Ca3DE/MainCanvas.cpp

@@ -158 +158 @@
     }
 
+    // This code has been moved down, see there for details.
+    // if (m_GameDLL)
+    // {
+    //     FreeLibrary(m_GameDLL);
+    //     m_GameDLL=NULL;
+    // }
+
+    // When the game has been unloaded, no collision models must be left in the collision model manager.
+    wxASSERT(cf::ClipSys::CollModelMan->GetUniqueCMCount()==0);
+
+
+    // Release the GuiManager (*before* the renderer).
+    if (cf::GuiSys::GuiMan)
+    {
+        delete cf::GuiSys::GuiMan;
+        cf::GuiSys::GuiMan=NULL;
+    }
+
+
+    // Release the Cafu Sound System.
+    if (SoundSystem)
+    {
+        SoundSystem->Release();
+        SoundSystem=NULL;
+    }
+
+    if (m_SoundSysDLL)
+    {
+        FreeLibrary(m_SoundSysDLL);
+        m_SoundSysDLL=NULL;
+    }
+
+
+    // Release the GUI resources.
+    if (m_GuiResources)
+    {
+        delete m_GuiResources;
+        m_GuiResources=NULL;
+    }
+
+
+    // Release the model manager.
+    if (m_ModelManager)
+    {
+        delete m_ModelManager;
+        m_ModelManager=NULL;
+    }
+
+
+    // Release the Cafu Material System.
+    if (MatSys::TextureMapManager)
+    {
+        // MatSys::TextureMapManager->FreeTextureMap(m_WhiteTexture);
+        MatSys::TextureMapManager=NULL;
+    }
+
+    if (MatSys::Renderer)
+    {
+        MatSys::Renderer->Release();
+        MatSys::Renderer=NULL;
+    }
+
+    if (m_RendererDLL)
+    {
+        FreeLibrary(m_RendererDLL);
+        m_RendererDLL=NULL;
+    }
+
+    // This code used to be further up, but under Windows at r423, the following problem exists:
+    // Class CafuModelT is derived from class ModelT, and thus has a virtual destructor.
+    // When we call ModelManagerT::GetModel() in the game DLL, everything works all right,
+    // but the code linked to the game DLL is used to create the new model, which causes
+    // the vtable of the newly created model to point to the destructor code in the game DLL.
+    // When the call FreeLibrary(m_GameDLL); before the destructors of the models in the
+    // m_ModelManager are run, we essentially remove the code that the virtual destructors
+    // are pointing to, causing access violation.
+    // Moving the call to FreeLibrary() below the "delete m_ModelManager;" fixes the problem.
+    //
+    // Also see this report of someone else experiencing the same problem:
+    // http://social.msdn.microsoft.com/forums/en-US/vclanguage/thread/dacc7dbd-2775-4e86-a429-8dd32fae0e33
     if (m_GameDLL)
     {
         FreeLibrary(m_GameDLL);
         m_GameDLL=NULL;
-    }
-
-    // When the game has been unloaded, no collision models must be left in the collision model manager.
-    wxASSERT(cf::ClipSys::CollModelMan->GetUniqueCMCount()==0);
-
-
-    // Release the GuiManager (*before* the renderer).
-    if (cf::GuiSys::GuiMan)
-    {
-        delete cf::GuiSys::GuiMan;
-        cf::GuiSys::GuiMan=NULL;
-    }
-
-
-    // Release the Cafu Sound System.
-    if (SoundSystem)
-    {
-        SoundSystem->Release();
-        SoundSystem=NULL;
-    }
-
-    if (m_SoundSysDLL)
-    {
-        FreeLibrary(m_SoundSysDLL);
-        m_SoundSysDLL=NULL;
-    }
-
-
-    // Release the GUI resources.
-    if (m_GuiResources)
-    {
-        delete m_GuiResources;
-        m_GuiResources=NULL;
-    }
-
-
-    // Release the model manager.
-    if (m_ModelManager)
-    {
-        delete m_ModelManager;
-        m_ModelManager=NULL;
-    }
-
-
-    // Release the Cafu Material System.
-    if (MatSys::TextureMapManager)
-    {
-        // MatSys::TextureMapManager->FreeTextureMap(m_WhiteTexture);
-        MatSys::TextureMapManager=NULL;
-    }
-
-    if (MatSys::Renderer)
-    {
-        MatSys::Renderer->Release();
-        MatSys::Renderer=NULL;
-    }
-
-    if (m_RendererDLL)
-    {
-        FreeLibrary(m_RendererDLL);
-        m_RendererDLL=NULL;
     }
 }