Merge remote-tracking branch 'remotes/lc/tundra2_lc' into tundra2

Author: cadaver

WhatsNew.txt

@@ -1,3 +1,19 @@
+v2.5 https://github.com/realXtend/naali/compare/tundra2.4.1...tundra2.5
+------
+- Undo/redo functionality in scene editing.
+- Optional interest management system implemented into server->client scene updates. Configurable from the command line or with the interest management settings dialog. Contributed by Kari Vatjus-Anttila.
+- Update to Bullet 2.8.1 and physics rolling friction support for EC_RigidBody. Contributed by Peter C.
+- Update to Qt 4.8.4 on Windows.
+- Update to OpenSSL 0.9.8x on Windows. Contributed by Peter C.
+- Official support for compiling on Visual Studio 2010 and cleanup of the Windows dependencies build script.
+- Support for compiling without Boost (TUNDRA_NO_BOOST CMake define). Cleanup of Tundra codebase of Boost-specific constructs.
+- Per-rigidbody gravity enable/disable.
+- Wire protocol resiliency for adding component attributes to the end of a component's attribute list while maintaining future version compatibility.
+  Unfortunately Tundra 2.4.x can not retroactively support this and is incompatible eg. with the EC_RigidBody component.
+- For consistency, signal individual component removals also when an entity is being removed from the scene. This may simplify eg. script code checking for removal of specific components.
+- Added a Javascript Tundra1 -> Tundra2 scene orientation converter.
+- Several bugfixes and convenience improvements in the API.
+
 v2.4.1 - https://github.com/realXtend/naali/compare/tundra2.4...tundra2.4.1
 ------
  - Add support for Crunch texture format (#532), see http://code.google.com/p/crunch/

doc/dependencies.txt

@@ -1733,7 +1733,10 @@ template<> void ECAttributeEditor<AssetReference>::Update(IAttribute *attr)
 
         QtStringPropertyManager *stringManager = dynamic_cast<QtStringPropertyManager *>(propertyMgr_);
         if (!stringManager)
+        {
+            LogWarning("Failed to update attribute value in ECEditor, couldn't find stringmanager");
             return;
+        }
 
         stringManager->setValue(rootProperty_, attribute->Get().ref);
     }
@@ -1841,34 +1844,52 @@ void AssetReferenceAttributeEditor::OpenAssetsWindow()
         QString assetType = components_[0].lock()->GetFramework()->Asset()->GetResourceTypeFromAssetRef(assetRef->Get());
         LogDebug("Creating AssetsWindow for asset type " + assetType);
         AssetsWindow *assetsWindow = new AssetsWindow(assetType, fw, fw->Ui()->MainWindow());
-        connect(assetsWindow, SIGNAL(SelectedAssetChanged(AssetPtr)), SLOT(HandleAssetPicked(AssetPtr)));
+        connect(assetsWindow, SIGNAL(SelectedAssetChanged(AssetPtr)), SLOT(HandleAssetSelected(AssetPtr)));
         connect(assetsWindow, SIGNAL(AssetPicked(AssetPtr)), SLOT(HandleAssetPicked(AssetPtr)));
         connect(assetsWindow, SIGNAL(PickCanceled()), SLOT(RestoreOriginalValue()));
         assetsWindow->setAttribute(Qt::WA_DeleteOnClose);
         assetsWindow->setWindowFlags(Qt::Tool);
         assetsWindow->show();
 
-        // Save the original asset ref(s), if we decide to cancel
-        foreach(const ComponentWeakPtr &c, components_)
-            if (c.lock())
-            {
-                Attribute<AssetReference> *ref = FindAttribute<AssetReference>(c.lock());
-                if (ref)
-                    originalValues[c] = ref->Get();
-            }
+        SaveOriginalValue();
     }
 }
 
+void AssetReferenceAttributeEditor::SaveOriginalValue()
+{
+    originalValues.clear();
+    
+    // Save the original asset ref(s), if we decide to cancel
+    foreach(const ComponentWeakPtr &c, components_)
+        if (c.lock())
+        {
+            Attribute<AssetReference> *ref = FindAttribute<AssetReference>(c.lock());
+            if (ref)
+                originalValues[c] = ref->Get();
+        }
+}
+
 void AssetReferenceAttributeEditor::HandleAssetPicked(AssetPtr asset)
+{
+    // Choice was final, set new original values
+    originalValues.clear();
+    HandleAssetSelected(asset);
+    SaveOriginalValue();
+}
+
+void AssetReferenceAttributeEditor::HandleAssetSelected(AssetPtr asset)
 {
     if (asset)
     {
         LogDebug("AssetReferenceAttributeEditor: Setting new value " + asset->Name());
         SetValue(AssetReference(asset->Name()));
-        Update();
+        // Update() does not update immediately, need to reinit
+        UnInitialize();
+        Initialize();
     }
 }
 
+
 void AssetReferenceAttributeEditor::RestoreOriginalValue()
 {
     Attribute<AssetReference> *assetRef= FindAttribute<AssetReference>(components_[0].lock());
@@ -1947,6 +1968,12 @@ template<> void ECAttributeEditor<AssetReferenceList>::Update(IAttribute *attr)
             Initialize();
         }
 
+        if (!stringManager)
+        {
+            LogWarning("Failed to update attribute value in ECEditor, couldn't find stringmanager");
+            return;
+        }
+        
         if (value.Size() <= children.size())
             for(uint i = 0; i < (uint)value.Size(); ++i)
                 stringManager->setValue(children[i], value[i].ref);
@@ -2121,13 +2148,18 @@ void AssetReferenceListAttributeEditor::OpenAssetsWindow()
     LogDebug("OpenAssetsWindow, index " + QString::number(currentIndex));
     LogDebug("Creating AssetsWindow for asset type " + assetType);
     AssetsWindow *assetsWindow = new AssetsWindow(assetType, fw, fw->Ui()->MainWindow());
-    connect(assetsWindow, SIGNAL(SelectedAssetChanged(AssetPtr)), SLOT(HandleAssetPicked(AssetPtr)));
+    connect(assetsWindow, SIGNAL(SelectedAssetChanged(AssetPtr)), SLOT(HandleAssetSelected(AssetPtr)));
     connect(assetsWindow, SIGNAL(AssetPicked(AssetPtr)), SLOT(HandleAssetPicked(AssetPtr)));
     connect(assetsWindow, SIGNAL(PickCanceled()), SLOT(RestoreOriginalValue()));
     assetsWindow->setAttribute(Qt::WA_DeleteOnClose);
     assetsWindow->setWindowFlags(Qt::Tool);
     assetsWindow->show();
 
+    SaveOriginalValue();
+}
+
+void AssetReferenceListAttributeEditor::SaveOriginalValue()
+{
     originalValues.clear();
 
     // Save the original asset ref(s), if we decide to cancel
@@ -2141,6 +2173,14 @@ void AssetReferenceListAttributeEditor::OpenAssetsWindow()
 }
 
 void AssetReferenceListAttributeEditor::HandleAssetPicked(AssetPtr asset)
+{
+    // Choice was final, set new original values
+    originalValues.clear();
+    HandleAssetSelected(asset);
+    SaveOriginalValue();
+}
+
+void AssetReferenceListAttributeEditor::HandleAssetSelected(AssetPtr asset)
 {
     Attribute<AssetReferenceList> *refList = FindAttribute<AssetReferenceList>(components_[0].lock());
     if (!refList)
@@ -2165,7 +2205,9 @@ void AssetReferenceListAttributeEditor::HandleAssetPicked(AssetPtr asset)
             newRefList.Set(currentIndex, AssetReference(asset->Name()));
 
         SetValue(newRefList);
-        Update();
+        // Update() does not update immediately, need to reinit
+        UnInitialize();
+        Initialize();
     }
 }
 
@@ -2252,7 +2294,10 @@ template<> void ECAttributeEditor<EntityReference>::Update(IAttribute *attr)
 
         QtStringPropertyManager *stringManager = dynamic_cast<QtStringPropertyManager *>(propertyMgr_);
         if (!stringManager)
+        {
+            LogWarning("Failed to update attribute value in ECEditor, couldn't find stringmanager");
             return;
+        }
 
         stringManager->setValue(rootProperty_, attribute->Get().ref);
     }

src/Core/ECEditorModule/ECAttributeEditor.cpp

@@ -299,7 +299,9 @@ class AssetReferenceAttributeEditor : public ECAttributeEditor<AssetReference>
 private slots:
     void OpenAssetsWindow();
     void HandleNewEditor(QtProperty *prop, QObject *);
+    void HandleAssetSelected(AssetPtr asset);
     void HandleAssetPicked(AssetPtr asset);
+    void SaveOriginalValue();
     void RestoreOriginalValue();
     void OpenEditor();
 
@@ -330,7 +332,9 @@ class AssetReferenceListAttributeEditor : public ECAttributeEditor<AssetReferenc
 private slots:
     void OpenAssetsWindow();
     void HandleNewEditor(QtProperty *prop, QObject *);
+    void HandleAssetSelected(AssetPtr asset);
     void HandleAssetPicked(AssetPtr asset);
+    void SaveOriginalValue();
     void RestoreOriginalValue();
     void OpenEditor();
 

src/Core/ECEditorModule/ECAttributeEditor.h

@@ -199,27 +199,23 @@ void EC_VolumeTrigger::OnPhysicsUpdate()
     for(EntitiesWithinVolumeMap::iterator it = entities_.begin(); it != entities_.end();)
     {
         bool remove = false;
+        EntityPtr entity = it->first.lock();
 
         // Entity was destroyed without us knowing? Remove from map in that case
-        if (it->first.expired())
+        if (!entity)
             remove = true;
         else
         {
             // If collision is old, remove the entity if its rigidbody is active
             // (inactive rigidbodies do not refresh the collision, so we would remove the entity mistakenly)
             if (!it->second)
             {
-                EntityPtr entity = it->first.lock();
                 bool active = true;
                 shared_ptr<EC_RigidBody> rigidbody = entity->GetComponent<EC_RigidBody>();
                 if (rigidbody)
                     active = rigidbody->IsActive();
                 if (active)
-                {
                     remove = true;
-                    emit entityLeave(entity.get());
-                    disconnect(entity.get(), SIGNAL(EntityRemoved(Entity*, AttributeChange::Type)), this, SLOT(OnEntityRemoved(Entity*)));
-                }
             }
             else
             {
@@ -235,6 +231,11 @@ void EC_VolumeTrigger::OnPhysicsUpdate()
             EntitiesWithinVolumeMap::iterator current = it;
             ++it;
             entities_.erase(current);
+            if (entity)
+            {
+                emit entityLeave(entity.get());
+                disconnect(entity.get(), SIGNAL(EntityRemoved(Entity*, AttributeChange::Type)), this, SLOT(OnEntityRemoved(Entity*)));
+            }
         }
     }
 }
@@ -255,17 +256,25 @@ void EC_VolumeTrigger::OnPhysicsCollision(Entity* otherEntity, const float3& pos
     if (byPivot.Get() && !IsPivotInside(entity.get()))
         return;
 
+    bool refreshed = false;
+    
     if (newCollision)
     {
         // make sure the entity isn't already inside the volume
         if (entities_.find(entity) == entities_.end())
         {
+            entities_[entity] = true;
+            refreshed = true;
             emit entityEnter(otherEntity);
             connect(otherEntity, SIGNAL(EntityRemoved(Entity*, AttributeChange::Type)), this, SLOT(OnEntityRemoved(Entity*)), Qt::UniqueConnection);
         }
     }
-    // Refresh the collision status to new
-    entities_[entity] = true;
+
+    if (!refreshed)
+    {
+        // Refresh the collision status to new
+        entities_[entity] = true;
+    }
 }
 
 /** Called when the given entity is deleted from the scene. In that case, remove the Entity immediately from our tracking data structure (and signal listeners). */

src/Core/PhysicsModule/EC_VolumeTrigger.cpp

@@ -63,7 +63,7 @@
 /// @note Modify these values when you are making a custom Tundra build. Also the version needs to be changed here on releases.
 const char *Application::organizationName = "realXtend";
 const char *Application::applicationName = "Tundra";
-const char *Application::version = "2.4.1";
+const char *Application::version = "2.5";
 
 Application::Application(Framework *owner, int &argc, char **argv) :
     QApplication(argc, argv),

src/Core/TundraCore/Framework/Application.cpp

@@ -2,7 +2,7 @@
 
 # Note: You can define custom version from outside this script by using /DVERSION=YourCustomVersion
 !ifndef VERSION
-!define VERSION "2.4.1"
+!define VERSION "2.5"
 !endif
 
 Name "Tundra ${VERSION}"

tools/installers/tundra-installer.nsi

@@ -58,9 +58,14 @@ cp -R $qtlibdir/QtDeclarative.framework $frameworksdir
 
 echo "Deploying Qt plugins from $qtpluginsdir to app bundle."
 cp -R $qtpluginsdir/* $bundledir/Contents/Plugins
+mkdir $bundledir/Contents/MacOS/qtplugins
+mkdir $bundledir/Contents/MacOS/qtplugins/script
+cp -R $depsdir/build/qtscriptgenerator/plugins/script/*.dylib $bundledir/Contents/MacOS/qtplugins/script 
+debugplugins=`find $bundledir/Contents/MacOS/qtplugins/script -name "*_debug*.dylib"`
+rm $debugplugins
 
 echo "Deploying Ogre plugins from $ogredir to app bundle."
-cp $ogredir/*.dylib $bundledir/Contents/Plugins
+cp $ogredir/lib/relwithdebinfo/*.dylib $bundledir/Contents/Plugins
 cp $ogredir/lib* $bundledir/Contents/Components
 ogresamples=`find $bundledir/Contents/Plugins -name "Sample_*.dylib"`
 rm $ogresamples