feat: added states to miniatures, so graphics can be switched out quickly

Author: Ro_bat

OmegaRPG/omegarpgmainwindow.h

@@ -20,7 +20,6 @@
 #include <QAudioOutput>
 #include <QAudioDecoder>
 #include <QSoundEffect>
-#include <QSound>
 #include <QSettings>
 #include <QGraphicsColorizeEffect>
 

core/multi/roomresources/mapresources/mapminiatureresource.cpp

@@ -1,4 +1,5 @@
 #include "mapminiatureresource.h"
+#include <QJsonArray>
 
 const QString MapMiniatureResource::resourceName = "map-miniature";
 
@@ -12,12 +13,12 @@ void MapMiniatureResource::setName(const QString &value)
   _name = value;
 }
 
-QString MapMiniatureResource::getGraphic() const
+QVector<QString> MapMiniatureResource::getGraphic() const
 {
   return graphic;
 }
 
-void MapMiniatureResource::setGraphic(const QString &value)
+void MapMiniatureResource::setGraphic(const QVector<QString> &value)
 {
   graphic = value;
 }
@@ -94,6 +95,14 @@ void MapMiniatureResource::setVisibility(const Visibility &value)
   visibility = value;
 }
 
+quint32 MapMiniatureResource::getSelectedGraphicsIndex() const {
+  return selectedGraphicsIndex;
+}
+
+void MapMiniatureResource::setSelectedGraphicsIndex(quint32 value) {
+  selectedGraphicsIndex = value;
+}
+
 const QString&MapMiniatureResource::name() const
 {
   return resourceName;
@@ -111,14 +120,15 @@ void MapMiniatureResource::updateValidity()
 }
 
 MapMiniatureResource::MapMiniatureResource(const QString &name,
-                                           const QString &graphic,
+                                           const QVector<QString> &graphic,
                                            const QPointF &pos,
                                            qreal size,
                                            MapMiniatureResource::Layer layer,
                                            MapMiniatureResource::Display display,
                                            qreal rotation,
                                            qreal direction,
-                                           MapMiniatureResource::Visibility visibility)
+                                           MapMiniatureResource::Visibility visibility,
+                                           quint32 selectedGraphicsIndex)
   : Resource()
 {
   this->_name = name;
@@ -130,14 +140,24 @@ MapMiniatureResource::MapMiniatureResource(const QString &name,
   this->rotation = rotation;
   this->direction = direction;
   this->visibility = visibility;
+  this->selectedGraphicsIndex = selectedGraphicsIndex;
   updateValidity();
 }
 
 MapMiniatureResource::MapMiniatureResource(const QJsonObject &data)
   : Resource()
 {
   this->_name = data["name"].toString();
-  this->graphic = data["graphic"].toString();
+  QVector<QString> graphicArray;
+  if (data["graphic"].isString()) {
+    graphicArray = QVector<QString>({data["graphic"].toString()});
+  } else if (data["graphic"].isArray()) {
+      for (const QJsonValue &entry : data["graphic"].toArray()) {
+          graphicArray.push_back(entry.toString());
+      }
+  }
+  this->graphic = graphicArray;
+  this->selectedGraphicsIndex = data["selectedGraphicsIndex"].toInt(0);
   this->pos.rx() = data["x"].toDouble(0.0);
   this->pos.ry() = data["y"].toDouble(0.0);
   this->size = data["size"].toDouble(1);
@@ -153,7 +173,11 @@ QJsonObject MapMiniatureResource::data() const
 {
   QJsonObject data;
   data.insert("name",_name);
-  data.insert("graphic",graphic);
+  QJsonArray graphicsArray;
+  for (const QString &entry : graphic) {
+      graphicsArray.push_back(entry);
+  }
+  data.insert("graphic",graphicsArray);
   data.insert("x",pos.x());
   data.insert("y",pos.y());
   data.insert("size",size);
@@ -162,5 +186,14 @@ QJsonObject MapMiniatureResource::data() const
   data.insert("rotation",rotation);
   data.insert("direction",direction);
   data.insert("vis",(int)visibility);
+  data.insert("selectedGraphicsIndex", (int) selectedGraphicsIndex);
   return data;
 }
+
+QString MapMiniatureResource::getSelectedGraphic() const {
+    if (this->selectedGraphicsIndex < this->graphic.size()) {
+        return this->graphic[selectedGraphicsIndex];
+    } else {
+        return "";
+    }
+}

core/multi/roomresources/mapresources/mapminiatureresource.h

@@ -33,7 +33,8 @@ class MapMiniatureResource : public Resource
   };
 private:
   QString _name;
-  QString graphic;
+  QVector<QString> graphic;
+  quint32 selectedGraphicsIndex;
   QPointF pos;
   qreal size;
   Layer layer;
@@ -43,20 +44,21 @@ class MapMiniatureResource : public Resource
   void updateValidity();
 public:
   MapMiniatureResource(const QString& name="",
-                       const QString& graphic="",
+                       const QVector<QString>& graphic=QVector<QString>(),
                        const QPointF& pos=QPointF(0,0),
                        qreal size=1.0,
                        MapMiniatureResource::Layer layer=LAYER_ABOVELINES,
                        MapMiniatureResource::Display display=DISPLAY_NORMAL,
                        qreal rotation=0.0,
                        qreal direction=-1.0,
-                       Visibility visibility = VISIBILITY_VISIBLE);
+                       Visibility visibility = VISIBILITY_VISIBLE,
+                       quint32 selectedGraphicsIndex=0);
   MapMiniatureResource(const QJsonObject& data);
   virtual QJsonObject data() const;
   QString getName() const;
   void setName(const QString &value);
-  QString getGraphic() const;
-  void setGraphic(const QString &value);
+  QVector<QString> getGraphic() const;
+  void setGraphic(const QVector<QString> &value);
   QPointF getPos() const;
   void setPos(const QPointF &value);
   qreal getSize() const;
@@ -71,6 +73,9 @@ class MapMiniatureResource : public Resource
   void setDirection(const qreal &value);
   Visibility getVisibility() const;
   void setVisibility(const Visibility &value);
+  quint32 getSelectedGraphicsIndex() const;
+  void setSelectedGraphicsIndex(quint32 value);
+  QString getSelectedGraphic() const;
   virtual const QString& name() const;
 };
 

gui/map/dialogs/miniatureeditdialog.cpp

@@ -212,7 +212,21 @@ void MiniatureEditDialog::addRow(QWidget *widget)
 
 void MiniatureEditDialog::addRow(QLayout *layout)
 {
-  this->layout->addLayout(layout,this->layout->rowCount(),0,1,2);
+    this->layout->addLayout(layout,this->layout->rowCount(),0,1,2);
+}
+
+void MiniatureEditDialog::addRow(const QString &label, QLayout *layout)
+{
+    this->layout->addLayout(layout,this->layout->rowCount(),0,1,2);
+
+    int row = this->layout->rowCount();
+    if(!label.isEmpty())
+    {
+        QLabel* labelWidget = new QLabel(label);
+        labelMap.insert((QWidget*)layout,labelWidget);
+        this->layout->addWidget(labelWidget,row,0,1,1);
+    }
+    this->layout->addLayout(layout,row,1,1,1);
 }
 
 void MiniatureEditDialog::setWidgetHidden(QWidget *widget, bool value)
@@ -262,15 +276,41 @@ void MiniatureEditDialog::setDirection(qreal deg)
   directionBox->setCurrentIndex(directionBox->count()-1);
 }
 
+void MiniatureEditDialog::graphicsSliderChanged(int value) {
+  this->graphicStateSliderLabel->setText(QString::fromStdString(std::to_string(value+1)));
+  setUrl(urls[value]);
+}
+
+void MiniatureEditDialog::urlLineEditChanged(const QString& value) {
+  this->urls[this->graphicStateSlider->value()] = value;
+}
+
+void MiniatureEditDialog::colorChanged(QColor value) {
+  this->urls[this->graphicStateSlider->value()] = value.name();
+}
+
 MiniatureEditDialog::MiniatureEditDialog(QWidget* parent) : NightModeDialog(parent)
 {
+  urls = QVector<QString>(8);
   layout = new QGridLayout(getCentralWidget());
   nameEdit = new QLineEdit();
   urlEdit  = new ImageUrlSelection(Global::imgurClientID());
   sizeBox = new MiniatureSizeSpinBox();
   sizeBox->setMinimum(1.0/4.0);
   sizeBox->setMaximum(1000);
   sizeBox->setSuffix(" Grid Cells");
+  graphicStateSlider = new QSlider(this);
+  quint32 selectedState = 0;
+  graphicStateSlider->setValue(selectedState);
+  graphicStateSlider->setMinimum(0);
+  graphicStateSlider->setMaximum(7);
+  graphicStateSlider->setOrientation(Qt::Horizontal);
+  graphicStateSliderLabel = new QLabel(QString::fromStdString(std::to_string(selectedState+1)), this);
+  QHBoxLayout* graphicStateLayout = new QHBoxLayout(this);
+  QWidget* fuckoff = new QWidget(this);
+  fuckoff->setLayout(graphicStateLayout);
+  graphicStateLayout->addWidget(graphicStateSliderLabel);
+  graphicStateLayout->addWidget(graphicStateSlider);
   imageSourceBox = new QComboBox(this);
   imageSourceBox->addItem("URL");
   imageSourceBox->addItem("Color");
@@ -331,6 +371,7 @@ MiniatureEditDialog::MiniatureEditDialog(QWidget* parent) : NightModeDialog(pare
   buttonLayout->addWidget(cancelButton);
 
   addRow("Name:",nameEdit);
+  addRow("State:",fuckoff);
   addRow("Image Source:",imageSourceBox);
   addRow("URL:",urlEdit);
   addRow("Color:",colorButton);
@@ -355,12 +396,22 @@ MiniatureEditDialog::MiniatureEditDialog(QWidget* parent) : NightModeDialog(pare
   connect(imageSourceBox,qOverload<int>(&QComboBox::currentIndexChanged), this, &MiniatureEditDialog::sourceChanged);
   connect(rotationBox,qOverload<int>(&QComboBox::currentIndexChanged),this,&MiniatureEditDialog::rotationBoxChanged);
   connect(directionBox,qOverload<int>(&QComboBox::currentIndexChanged),this,&MiniatureEditDialog::directionBoxChanged);
+  connect(graphicStateSlider, qOverload<int>(&QSlider::valueChanged), this, &MiniatureEditDialog::graphicsSliderChanged);
+  connect(this->urlEdit->lineEdit(), qOverload<const QString&>(&QLineEdit::textChanged), this, &MiniatureEditDialog::urlLineEditChanged);
+  connect(this->colorButton, qOverload<QColor>(&ColorSelectButton::finalColorChanged), this, &MiniatureEditDialog::colorChanged);
 }
 
 MapMiniatureResource MiniatureEditDialog::getMiniature()
 {
   miniature.setName(nameEdit->text());
-  miniature.setGraphic(getUrl());
+  QVector<QString> urls;
+  for (int i = 0; i<this->urls.size(); ++i) {
+    if (this->urls[i].size()>0) {
+      urls.push_back(this->urls[i]);
+    }
+  }
+  miniature.setSelectedGraphicsIndex(this->graphicStateSlider->value());
+  miniature.setGraphic(urls);
   miniature.setSize(getSize());
   miniature.setLayer(getLayer());
   miniature.setVisibility(getVisibility());
@@ -374,11 +425,23 @@ void MiniatureEditDialog::setMiniature(const MapMiniatureResource &mini)
 {
   miniature = mini;
   setName(mini.getName());
-  setUrl(mini.getGraphic());
+  auto graphics = mini.getGraphic();
+  for(int i=0; i<std::min(this->urls.size(),graphics.size()); ++i) {
+      this->urls[i] = graphics[i];
+  }
+  //setUrl(mini.getGraphic()[0]);
   setSize(mini.getSize());
   setLayer(mini.getLayer());
   setVisibility(mini.getVisibility());
   setDisplay(mini.getDisplay());
   setRotation(mini.getRotation());
   setDirection(mini.getDirection());
+  auto selectedIndex = mini.getSelectedGraphicsIndex();
+  if (selectedIndex > 0 && selectedIndex < 8) {
+    graphicsSliderChanged(mini.getSelectedGraphicsIndex());
+    setUrl(this->urls[mini.getSelectedGraphicsIndex()]);
+  } else {
+      graphicsSliderChanged(0);
+      setUrl(this->urls[0]);
+  }
 }

gui/map/dialogs/miniatureeditdialog.h

@@ -30,6 +30,8 @@ class MiniatureEditDialog : public NightModeDialog
   QGridLayout* layout;
   //QGridLayout* layout;
   QLineEdit* nameEdit;
+  QLabel* graphicStateSliderLabel;
+  QSlider* graphicStateSlider;
   QComboBox* imageSourceBox;
   ColorSelectButton* colorButton;
   ImageUrlSelection* urlEdit;
@@ -44,6 +46,7 @@ class MiniatureEditDialog : public NightModeDialog
   QComboBox* directionBox;
   QSpinBox* directionSpinBox;
 
+  QVector<QString> urls;
 
   QHBoxLayout* buttonLayout;
   QPushButton* okButton;
@@ -57,6 +60,7 @@ class MiniatureEditDialog : public NightModeDialog
   void addRow(const QString& label, QWidget* widget);
   void addRow(QWidget* widget);
   void addRow(QLayout* layout);
+  void addRow(const QString &label, QLayout *layout);
   void setWidgetHidden(QWidget* widget, bool value);
 
   void setRotation(qreal deg);
@@ -89,6 +93,9 @@ private slots:
   void sourceChanged(int index);
   void rotationBoxChanged(int index);
   void directionBoxChanged(int index);
+  void graphicsSliderChanged(int value);
+  void urlLineEditChanged(const QString& value);
+  void colorChanged(QColor value);
 };
 
 #endif // MINIATUREEDITDIALOG_H

gui/map/objects/mapscene-instances/miniatureinstance.cpp

@@ -207,7 +207,7 @@ MiniatureInstance::MiniatureInstance(const MapMiniatureResource &miniature, QGra
   this->miniature = miniature;
   if(!miniature.getGraphic().isEmpty())
   {
-    item = ih->getGraphicsItem(miniature.getGraphic(),miniature.getSize()*gridSize,miniature.getDisplay());
+    item = ih->getGraphicsItem(miniature.getSelectedGraphic(),miniature.getSize()*gridSize,miniature.getDisplay());
     item->setRotation(miniature.getRotation());
     item->setPos(miniature.getPos()*gridSize);