added cell rendering class

apps/opencs/CMakeLists.txt

@@ -70,7 +70,7 @@ opencs_units (view/render
 
 opencs_units_noqt (view/render
     navigation navigation1st navigationfree navigationorbit lighting lightingday lightingnight
-    lightingbright object
+    lightingbright object cell
     )
 
 opencs_units_noqt (view/world

apps/opencs/view/render/cell.cpp

@@ -0,0 +1,201 @@
+
+#include "cell.hpp"
+
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+
+#include <components/misc/stringops.hpp>
+
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/columns.hpp"
+#include "../../model/world/data.hpp"
+
+bool CSVRender::Cell::removeObject (const std::string& id)
+{
+    std::map<std::string, Object *>::iterator iter =
+        mObjects.find (Misc::StringUtils::lowerCase (id));
+
+    if (iter==mObjects.end())
+        return false;
+
+    delete iter->second;
+    mObjects.erase (iter);
+    return true;
+}
+
+bool CSVRender::Cell::addObjects (int start, int end)
+{
+    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
+        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+
+    int idColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int cellColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
+    int stateColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+
+    bool modified = false;
+
+    for (int i=start; i<=end; ++i)
+    {
+        std::string cell = Misc::StringUtils::lowerCase (references.data (
+            references.index (i, cellColumn)).toString().toUtf8().constData());
+
+        int state = references.data (references.index (i, stateColumn)).toInt();
+
+        if (cell==mId && state!=CSMWorld::RecordBase::State_Deleted)
+        {
+            std::string id = Misc::StringUtils::lowerCase (references.data (
+                references.index (i, idColumn)).toString().toUtf8().constData());
+
+            mObjects.insert (std::make_pair (id, new Object (mData, mCellNode, id, false)));
+            modified = true;
+        }
+    }
+
+    return modified;
+}
+
+CSVRender::Cell::Cell (CSMWorld::Data& data, Ogre::SceneManager *sceneManager,
+    const std::string& id, const Ogre::Vector3& origin)
+: mData (data), mId (Misc::StringUtils::lowerCase (id))
+{
+    mCellNode = sceneManager->getRootSceneNode()->createChildSceneNode();
+    mCellNode->setPosition (origin);
+
+    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
+        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+
+    int rows = references.rowCount();
+
+    addObjects (0, rows-1);
+}
+
+CSVRender::Cell::~Cell()
+{
+    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
+        iter!=mObjects.end(); ++iter)
+        delete iter->second;
+
+    mCellNode->getCreator()->destroySceneNode (mCellNode);
+}
+
+bool CSVRender::Cell::referenceableDataChanged (const QModelIndex& topLeft,
+    const QModelIndex& bottomRight)
+{
+    bool modified = false;
+
+    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
+        iter!=mObjects.end(); ++iter)
+        if (iter->second->referenceableDataChanged (topLeft, bottomRight))
+            modified = true;
+
+    return modified;
+}
+
+bool CSVRender::Cell::referenceableAboutToBeRemoved (const QModelIndex& parent, int start,
+    int end)
+{
+    if (parent.isValid())
+        return false;
+
+    bool modified = false;
+
+    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
+        iter!=mObjects.end(); ++iter)
+        if (iter->second->referenceableAboutToBeRemoved (parent, start, end))
+            modified = true;
+
+    return modified;
+}
+
+bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
+    const QModelIndex& bottomRight)
+{
+    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
+        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+
+    int idColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+    int cellColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
+    int stateColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+
+    // list IDs in cell
+    std::map<std::string, bool> ids; // id, deleted state
+
+    for (int i=topLeft.row(); i<=bottomRight.row(); ++i)
+    {
+        std::string cell = Misc::StringUtils::lowerCase (references.data (
+            references.index (i, cellColumn)).toString().toUtf8().constData());
+
+        if (cell==mId)
+        {
+            std::string id = Misc::StringUtils::lowerCase (references.data (
+                references.index (i, idColumn)).toString().toUtf8().constData());
+
+            int state = references.data (references.index (i, stateColumn)).toInt();
+
+            ids.insert (std::make_pair (id, state==CSMWorld::RecordBase::State_Deleted));
+        }
+    }
+
+    // perform update and remove where needed
+    bool modified = false;
+
+    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
+        iter!=mObjects.end(); ++iter)
+    {
+        if (iter->second->referenceDataChanged (topLeft, bottomRight))
+            modified = true;
+
+        std::map<std::string, bool>::iterator iter2 = ids.find (iter->first);
+
+        if (iter2!=ids.end())
+        {
+            if (iter2->second)
+            {
+                removeObject (iter->first);
+                modified = true;
+            }
+
+            ids.erase (iter2);
+        }
+    }
+
+    // add new objects
+    for (std::map<std::string, bool>::iterator iter (ids.begin()); iter!=ids.end(); ++iter)
+    {
+        mObjects.insert (std::make_pair (
+            iter->first, new Object (mData, mCellNode, iter->first, false)));
+
+        modified = true;
+    }
+
+    return modified;
+}
+
+bool CSVRender::Cell::referenceAboutToBeRemoved (const QModelIndex& parent, int start,
+    int end)
+{
+    if (parent.isValid())
+        return false;
+
+    CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
+        *mData.getTableModel (CSMWorld::UniversalId::Type_References));
+
+    int idColumn = references.findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+
+    bool modified = false;
+
+    for (int row = start; row<=end; ++row)
+        if (removeObject (references.data (
+            references.index (row, idColumn)).toString().toUtf8().constData()))
+            modified = true;
+
+    return modified;
+}
+
+bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int end)
+{
+    if (parent.isValid())
+        return false;
+
+    return addObjects (start, end);
+}

apps/opencs/view/render/cell.hpp

@@ -0,0 +1,73 @@
+#ifndef OPENCS_VIEW_CELL_H
+#define OPENCS_VIEW_CELL_H
+
+#include <string>
+#include <map>
+
+#include <OgreVector3.h>
+
+#include "object.hpp"
+
+class QModelIndex;
+
+namespace Ogre
+{
+    class SceneManager;
+    class SceneNode;
+}
+
+namespace CSMWorld
+{
+    class Data;
+}
+
+namespace CSVRender
+{
+    class Cell
+    {
+            CSMWorld::Data& mData;
+            std::string mId;
+            Ogre::SceneNode *mCellNode;
+            std::map<std::string, Object *> mObjects;
+
+            /// Ignored if cell does not have an object with the given ID.
+            ///
+            /// \return Was the object deleted?
+            bool removeObject (const std::string& id);
+
+            /// Add objects from reference table that are within this cell.
+            ///
+            /// \return Have any objects been added?
+            bool addObjects (int start, int end);
+
+        public:
+
+            Cell (CSMWorld::Data& data, Ogre::SceneManager *sceneManager,
+                const std::string& id, const Ogre::Vector3& origin = Ogre::Vector3 (0, 0, 0));
+
+            ~Cell();
+
+            /// \return Did this call result in a modification of the visual representation of
+            /// this cell?
+            bool referenceableDataChanged (const QModelIndex& topLeft,
+                const QModelIndex& bottomRight);
+
+            /// \return Did this call result in a modification of the visual representation of
+            /// this cell?
+            bool referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            /// \return Did this call result in a modification of the visual representation of
+            /// this cell?
+            bool referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            /// \return Did this call result in a modification of the visual representation of
+            /// this cell?
+            bool referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            /// \return Did this call result in a modification of the visual representation of
+            /// this cell?
+            bool referenceAdded (const QModelIndex& parent, int start, int end);
+    };
+}
+
+#endif