mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 15:09:39 +00:00
Code Issues Releases Wiki Activity

Avoid redundant conversion from RefId to string and back

Browse source
This commit is contained in:
elsid 2023-03-03 11:30:50 +01:00
parent 191f207e78
commit d03bec60e9
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
4 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/model/world/cellcoordinates.cpp
View file

@ -6,6 +6,7 @@
#include <osg/Vec3d>
#include <components/esm/refid.hpp>
#include <components/esm3/loadland.hpp>
#include <components/misc/constants.hpp>
@ -59,6 +60,11 @@ bool CSMWorld::CellCoordinates::isExteriorCell(const std::string& id)
return (!id.empty() && id[0] == '#');
}
bool CSMWorld::CellCoordinates::isExteriorCell(const ESM::RefId& id)
{
return id.startsWith("#");
}
std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId(const std::string& id)
{
// no worldspace for now, needs to be changed for 1.1

7
apps/opencs/model/world/cellcoordinates.hpp
View file

@ -12,6 +12,11 @@ namespace osg
class Vec3d;
}
namespace ESM
{
class RefId;
}
namespace CSMWorld
{
class CellCoordinates
@ -41,6 +46,8 @@ namespace CSMWorld
static bool isExteriorCell(const std::string& id);
static bool isExteriorCell(const ESM::RefId& id);
/// \return first: CellCoordinates (or 0, 0 if cell does not have coordinates),
/// second: is cell paged?
///

27
apps/opencs/model/world/collection.hpp
View file

@ -91,10 +91,10 @@ namespace CSMWorld
///
/// \return Success?
int cloneRecordImp(const std::string& origin, const std::string& dest, UniversalId::Type type);
int cloneRecordImp(const ESM::RefId& origin, const ESM::RefId& dest, UniversalId::Type type);
///< Returns the index of the clone.
int touchRecordImp(const std::string& id);
int touchRecordImp(const ESM::RefId& id);
///< Returns the index of the record on success, -1 on failure.
public:
@ -227,29 +227,28 @@ namespace CSMWorld
template <typename ESXRecordT>
int Collection<ESXRecordT>::cloneRecordImp(
const std::string& origin, const std::string& destination, UniversalId::Type type)
const ESM::RefId& origin, const ESM::RefId& destination, UniversalId::Type type)
{
auto copy = std::make_unique<Record<ESXRecordT>>();
copy->mModified = getRecord(ESM::RefId::stringRefId(origin)).get();
copy->mModified = getRecord(origin).get();
copy->mState = RecordBase::State_ModifiedOnly;
setRecordId(ESM::RefId::stringRefId(destination), copy->get());
setRecordId(destination, copy->get());
if (type == UniversalId::Type_Reference)
{
CSMWorld::CellRef* ptr = (CSMWorld::CellRef*)&copy->mModified;
ptr->mRefNum.mIndex = 0;
}
ESM::RefId destinationRefId = ESM::RefId::stringRefId(destination);
int index = getAppendIndex(destinationRefId, type);
insertRecord(std::move(copy), getAppendIndex(destinationRefId, type));
const int index = getAppendIndex(destination, type);
insertRecord(std::move(copy), getAppendIndex(destination, type));
return index;
}
template <typename ESXRecordT>
int Collection<ESXRecordT>::touchRecordImp(const std::string& id)
int Collection<ESXRecordT>::touchRecordImp(const ESM::RefId& id)
{
int index = getIndex(ESM::RefId::stringRefId(id));
const int index = getIndex(id);
Record<ESXRecordT>& record = *mRecords.at(index);
if (record.isDeleted())
{
@ -269,27 +268,27 @@ namespace CSMWorld
void Collection<ESXRecordT>::cloneRecord(
const ESM::RefId& origin, const ESM::RefId& destination, const UniversalId::Type type)
{
cloneRecordImp(origin.getRefIdString(), destination.getRefIdString(), type);
cloneRecordImp(origin, destination, type);
}
template <>
inline void Collection<Land>::cloneRecord(
const ESM::RefId& origin, const ESM::RefId& destination, const UniversalId::Type type)
{
int index = cloneRecordImp(origin.getRefIdString(), destination.getRefIdString(), type);
const int index = cloneRecordImp(origin, destination, type);
mRecords.at(index)->get().setPlugin(0);
}
template <typename ESXRecordT>
bool Collection<ESXRecordT>::touchRecord(const ESM::RefId& id)
{
return touchRecordImp(id.getRefIdString()) != -1;
return touchRecordImp(id) != -1;
}
template <>
inline bool Collection<Land>::touchRecord(const ESM::RefId& id)
{
int index = touchRecordImp(id.getRefIdString());
const int index = touchRecordImp(id);
if (index >= 0)
{
mRecords.at(index)->get().setPlugin(0);

2
apps/opencs/view/render/object.cpp
View file

@ -737,7 +737,7 @@ void CSVRender::Object::apply(CSMWorld::CommandMacro& commands)
// Do cell check first so positions can be compared
const CSMWorld::CellRef& ref = collection.getRecord(recordIndex).get();
if (CSMWorld::CellCoordinates::isExteriorCell(ref.mCell.getRefIdString()))
if (CSMWorld::CellCoordinates::isExteriorCell(ref.mCell))
{
// Find cell index at new position
std::pair<int, int> cellIndex