[nostalgia] Update for Ox changes
This commit is contained in:
parent
922323833c
commit
700d7016d5
@ -24,7 +24,7 @@ core::DeleteTilesCommand::DeleteTilesCommand(
|
|||||||
auto dst = m_deletedPixels.data();
|
auto dst = m_deletedPixels.data();
|
||||||
auto src = p.data() + m_deletePos;
|
auto src = p.data() + m_deletePos;
|
||||||
const auto sz = m_deleteSz * sizeof(decltype(p[0]));
|
const auto sz = m_deleteSz * sizeof(decltype(p[0]));
|
||||||
ox_memcpy(dst, src, sz);
|
ox::memcpy(dst, src, sz);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,8 +35,8 @@ void core::DeleteTilesCommand::redo() noexcept {
|
|||||||
const auto src = p.data() + srcPos;
|
const auto src = p.data() + srcPos;
|
||||||
const auto dst1 = p.data() + m_deletePos;
|
const auto dst1 = p.data() + m_deletePos;
|
||||||
const auto dst2 = p.data() + (p.size() - m_deleteSz);
|
const auto dst2 = p.data() + (p.size() - m_deleteSz);
|
||||||
ox_memmove(dst1, src, p.size() - srcPos);
|
ox::memmove(dst1, src, p.size() - srcPos);
|
||||||
ox_memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
|
ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeleteTilesCommand::undo() noexcept {
|
void DeleteTilesCommand::undo() noexcept {
|
||||||
@ -46,8 +46,8 @@ void DeleteTilesCommand::undo() noexcept {
|
|||||||
const auto dst1 = p.data() + m_deletePos + m_deleteSz;
|
const auto dst1 = p.data() + m_deletePos + m_deleteSz;
|
||||||
const auto dst2 = src;
|
const auto dst2 = src;
|
||||||
const auto sz = p.size() - m_deletePos - m_deleteSz;
|
const auto sz = p.size() - m_deletePos - m_deleteSz;
|
||||||
ox_memmove(dst1, src, sz);
|
ox::memmove(dst1, src, sz);
|
||||||
ox_memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
|
ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
int DeleteTilesCommand::commandId() const noexcept {
|
int DeleteTilesCommand::commandId() const noexcept {
|
||||||
|
@ -24,7 +24,7 @@ core::InsertTilesCommand::InsertTilesCommand(
|
|||||||
auto dst = m_deletedPixels.data();
|
auto dst = m_deletedPixels.data();
|
||||||
auto src = p.data() + p.size() - m_insertCnt;
|
auto src = p.data() + p.size() - m_insertCnt;
|
||||||
const auto sz = m_insertCnt * sizeof(decltype(p[0]));
|
const auto sz = m_insertCnt * sizeof(decltype(p[0]));
|
||||||
ox_memcpy(dst, src, sz);
|
ox::memcpy(dst, src, sz);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,8 +34,8 @@ void InsertTilesCommand::redo() noexcept {
|
|||||||
auto dstPos = m_insertPos + m_insertCnt;
|
auto dstPos = m_insertPos + m_insertCnt;
|
||||||
const auto dst = p.data() + dstPos;
|
const auto dst = p.data() + dstPos;
|
||||||
const auto src = p.data() + m_insertPos;
|
const auto src = p.data() + m_insertPos;
|
||||||
ox_memmove(dst, src, p.size() - dstPos);
|
ox::memmove(dst, src, p.size() - dstPos);
|
||||||
ox_memset(src, 0, m_insertCnt * sizeof(decltype(p[0])));
|
ox::memset(src, 0, m_insertCnt * sizeof(decltype(p[0])));
|
||||||
}
|
}
|
||||||
|
|
||||||
void InsertTilesCommand::undo() noexcept {
|
void InsertTilesCommand::undo() noexcept {
|
||||||
@ -46,8 +46,8 @@ void InsertTilesCommand::undo() noexcept {
|
|||||||
const auto dst1 = p.data() + m_insertPos;
|
const auto dst1 = p.data() + m_insertPos;
|
||||||
const auto dst2 = p.data() + p.size() - m_insertCnt;
|
const auto dst2 = p.data() + p.size() - m_insertCnt;
|
||||||
const auto sz = p.size() - srcIdx;
|
const auto sz = p.size() - srcIdx;
|
||||||
ox_memmove(dst1, src, sz);
|
ox::memmove(dst1, src, sz);
|
||||||
ox_memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
|
ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
int InsertTilesCommand::commandId() const noexcept {
|
int InsertTilesCommand::commandId() const noexcept {
|
||||||
|
Loading…
Reference in New Issue
Block a user