mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Add ability to add pathgrids.

Browse Source
This commit is contained in:
Aesylwinn 2016-05-19 18:33:15 -04:00
parent 1781aaaa27
commit b86250036c
3 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apps/opencs/model/world/commands.cpp
View File

@ -8,9 +8,11 @@
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QAbstractProxyModel> #include <QAbstractProxyModel>
#include "idcollection.hpp"
#include "idtable.hpp" #include "idtable.hpp"
#include "idtree.hpp" #include "idtree.hpp"
#include "nestedtablewrapper.hpp" #include "nestedtablewrapper.hpp"
#include "pathgrid.hpp"
CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
const QVariant& new_, QUndoCommand* parent) const QVariant& new_, QUndoCommand* parent)
@ -235,6 +237,35 @@ void CSMWorld::CloneCommand::undo()
mModel.removeRow (mModel.getModelIndex (mId, 0).row()); mModel.removeRow (mModel.getModelIndex (mId, 0).row());
} }
CSMWorld::CreatePathgridCommand::CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent)
: CreateCommand(model, id, parent)
{
setType(UniversalId::Type_Pathgrid);
}
void CSMWorld::CreatePathgridCommand::redo()
{
CreateCommand::redo();
Record<Pathgrid> record = static_cast<const Record<Pathgrid>& >(mModel.getRecord(mId));
record.get().blank();
record.get().mCell = mId;
if (!mId.empty() && mId[0]=='#')
{
int x, y;
char ignore;
std::istringstream stream (mId);
if (stream >> ignore >> x >> y)
{
record.get().mData.mX = x;
record.get().mData.mY = y;
}
}
mModel.setRecord(mId, record, mType);
}
CSMWorld::UpdateCellCommand::UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent) CSMWorld::UpdateCellCommand::UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent)
: QUndoCommand (parent), mModel (model), mRow (row) : QUndoCommand (parent), mModel (model), mRow (row)

9
apps/opencs/model/world/commands.hpp
View File

@ -153,6 +153,15 @@ namespace CSMWorld
virtual void undo(); virtual void undo();
}; };
class CreatePathgridCommand : public CreateCommand
{
public:
CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0);
virtual void redo();
};
/// \brief Update cell ID according to x/y-coordinates /// \brief Update cell ID according to x/y-coordinates
/// ///
/// \note The new value will be calculated in the first call to redo instead of the /// \note The new value will be calculated in the first call to redo instead of the

18
apps/opencs/view/render/pathgrid.cpp
View File

@ -241,6 +241,10 @@ namespace CSVRender
void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos) void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
{ {
CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
CSMWorld::UniversalId::Type_Pathgrids));
const CSMWorld::Pathgrid* source = getPathgridSource(); const CSMWorld::Pathgrid* source = getPathgridSource();
if (source) if (source)
{ {
@ -250,9 +254,6 @@ namespace CSVRender
int posY = clampToCell(static_cast<int>(localCoords.y())); int posY = clampToCell(static_cast<int>(localCoords.y()));
int posZ = clampToCell(static_cast<int>(localCoords.z())); int posZ = clampToCell(static_cast<int>(localCoords.z()));
CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
CSMWorld::UniversalId::Type_Pathgrids));
int recordIndex = mPathgridCollection.getIndex (mId); int recordIndex = mPathgridCollection.getIndex (mId);
int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints); int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
@ -269,14 +270,15 @@ namespace CSVRender
int row = static_cast<int>(source->mPoints.size()); int row = static_cast<int>(source->mPoints.size());
// Add node // Add node
commands.push (new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn)); commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX)); commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY)); commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ)); commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
} }
else else
{ {
// Create pathgrid TODO CSMWorld::CreatePathgridCommand* createCmd = new CSMWorld::CreatePathgridCommand(*model, mId);
commands.push(createCmd);
} }
} }