Working on the selection highlight js interface

samcake committed 8 years ago

Commit 771c64f1 parent 93208914 files · +59 −12Browse files

Showing the changes to interface/src/scripting/SelectionScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

interface/src/scripting/SelectionScriptingInterface.cpp+45−12

 }
 bool SelectionScriptingInterface::enableListHighlight(const QString& listName, const QVariantMap& highlightStyleValues) {
-    auto highlightStyle = _highlightedListMap.value(listName);
+    auto highlightStyle = _highlightedListMap.find(listName);
-    if (!highlightStyle.isBoundToList()) {
+    if (highlightStyle == _highlightedListMap.end()) {
+        highlightStyle = _highlightedListMap.insert(listName, SelectionHighlightStyle());
+    }
+    if (!(*highlightStyle).isBoundToList()) {
         GameplayObjects currentList = _selectedItemsListMap.value(listName);
         if (!currentList.getContainsData()) {
             _selectedItemsListMap.insert(listName, currentList);
+            highlightStyleChanged(listName);
         }
+        (*highlightStyle).setBoundToList(true);
     }
-    highlightStyle.fromVariantMap(highlightStyleValues);
+    (*highlightStyle).fromVariantMap(highlightStyleValues);
-    highlightStyle.setBoundToList(true);
-    _highlightedListMap.insert(listName, highlightStyle);
-    emit selectedItemsListChanged(listName);
+    emit highlightStyleChanged(listName);
     return true;
 }
             if (currentList.getContainsData()) {
             }
             _highlightedListMap.erase(highlightStyle);
+            emit selectedItemsListChanged(listName);
         }
     }
     return QVariantMap();
 }
+render::HighlightStyle SelectionScriptingInterface::getHighlightStyle(const QString& listName) const {
+    auto highlightStyle = _highlightedListMap.find(listName);
+    if (highlightStyle != _highlightedListMap.end()) {
+        return render::HighlightStyle();
+    } else {
+        return (*highlightStyle).getStyle();
+    }
+}
 template <class T> bool SelectionScriptingInterface::addToGameplayObjects(const QString& listName, T idToAdd) {
     GameplayObjects currentList = _selectedItemsListMap.value(listName);
     currentList.addToGameplayObjects(idToAdd);
     }
 }
+void SelectionToSceneHandler::highlightStyleChanged(const QString& listName) {
+    auto mainScene = qApp->getMain3DScene();
+    if (mainScene) {
+        auto thisStyle = DependencyManager::get<SelectionScriptingInterface>()->getHighlightStyle(listName);
+        render::Transaction transaction;
+        render::ItemIDs finalList;
+        transaction.resetSelectionHighlight(listName.toStdString(), thisStyle);
+        mainScene->enqueueTransaction(transaction);
+    }
+    else {
+        qWarning() << "SelectionToSceneHandler::updateRendererSelectedList(), Unexpected null scene, possibly during application shutdown";
+    }
+}
 bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) {
     auto outlineColor = properties["outlineColor"];
         _style.outlineIntensity = outlineIntensity.toFloat();
     }
-    auto isFilled = properties["isFilled"];
-    if (isFilled.isValid()) {
-        _style.isFilled = isFilled.toBool();
-    }
     auto unoccludedFillOpacity = properties["unoccludedFillOpacity"];
     if (unoccludedFillOpacity.isValid()) {
         _style.unoccludedFillOpacity = unoccludedFillOpacity.toFloat();
     return true;
 }
 QVariantMap SelectionHighlightStyle::toVariantMap() const {
-    return QVariantMap();
+    QVariantMap properties;
+    properties["outlineColor"] = xColorToVariant(xColorFromGlm(_style.color));
+    properties["outlineWidth"] = _style.outlineWidth;
+    properties["isOutlineSmooth"] = _style.isOutlineSmooth;
+    properties["outlineIntensity"] = _style.outlineIntensity;
+    properties["unoccludedFillOpacity"] = _style.unoccludedFillOpacity;
+    properties["occludedFillOpacity"] = _style.occludedFillOpacity;
+    return properties;
 }