comparison transform/ModelTransformer.cpp @ 877:b109b88bfa85 tonioni

Callback handler for additional models at end of processing

 #include "ModelTransformer.h"
 
 ModelTransformer::ModelTransformer(Input input, const Transform &transform) :
     m_input(input),
     m_detached(false),
+    m_detachedAdd(false),
     m_abandoned(false)
 {
     m_transforms.push_back(transform);
 }
 
 ModelTransformer::ModelTransformer(Input input, const Transforms &transforms) :
     m_transforms(transforms),
     m_input(input),
     m_detached(false),
+    m_detachedAdd(false),
     m_abandoned(false)
 {
 }
 
 ModelTransformer::~ModelTransformer()
 {
     m_abandoned = true;
     wait();
     if (!m_detached) {
-        Models mine = getOutputModels(); // including any additional ones
-        foreach (Model *m, mine) {
-            delete m;
-        }
+        Models mine = getOutputModels();
+        foreach (Model *m, mine) delete m;
+    }
+    if (!m_detachedAdd) {
+        Models mine = getAdditionalOutputModels();
+        foreach (Model *m, mine) delete m;
     }
 }
 
-ModelTransformer::Models
-ModelTransformer::getOutputModels()
-{
-    Models out(m_outputs);
-    Models add(getAdditionalOutputModels());
-    foreach (Model *m, add) out.push_back(m);
-    return out;
-}
-