Changeset 162 in flair-src for trunk/lib/FlairSimulator/src

Timestamp:

Mar 6, 2017, 8:30:06 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pb crash fin simulateur

Location:

trunk/lib/FlairSimulator/src

Files:

• Gui_impl.cpp (modified) (3 diffs)
• SimuCameraGL.cpp (modified) (1 diff)
• Simulator_impl.cpp (modified) (2 diffs)

trunk/lib/FlairSimulator/src/Gui_impl.cpp

@@ -131 +131 @@
 Gui_impl::~Gui_impl() {
   // printf("del Gui_impl\n");
-  device->drop();
+  //device->drop();
 
   delete receiver;
@@ -209 +209 @@
 
   while (device->run()) {
-    if (dbtFile_r != NULL) // rejeu
-    {
+    if (dbtFile_r != NULL) {// rejeu
       takeScreenshot(); // on enregistre l'image precedente
       road_time_t time;
@@ -258 +257 @@
                  }
                  device->setWindowCaption(L"toto");*/
-
-    if (dbtFile_r == NULL) // mode normal
-    {
+    if (dbtFile_r == NULL) {// mode normal
       for (size_t i = 0; i < models.size(); i++) {
         models.at(i)->pimpl_->CheckCollision();

trunk/lib/FlairSimulator/src/SimuCameraGL.cpp

@@ -111 +111 @@
     free(buffer);
   }
+  camera->removeAnimator(this);
+  camera->drop();
 }
 

trunk/lib/FlairSimulator/src/Simulator_impl.cpp

@@ -21 +21 @@
 #include "Gui.h"
 #include "Gui_impl.h"
+#include <ISceneManager.h>
 #endif
 #include "Model.h"
@@ -46 +47 @@
     models.at(i)->pimpl_->SafeStop();
     models.at(i)->pimpl_->Join();
+#ifdef GL
+    getGui()->getSceneManager()->getRootSceneNode()->removeChild(models.at(i)->pimpl_);
+#endif
     delete models.at(i);
   }