mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-16 21:34:08 -07:00
5d2c20beb0
Replace boost::hash_combine with a lib/hash.h hash_combine performing
the same statement.
Replace inconspicuous global boost hash_value specializations with
std::hash specializations.
No performance difference was observed in three simple MeshManager
measurements.
Remove unused TAG_MASK and h_tag in h_mgr.cpp following 0748c5a75e.
Replace typedef with using keyword and sort header includes.
Differential Revision: https://code.wildfiregames.com/D2441
Tested on: clang 9.0.0, gcc 9.2.0, Jenkins/vs2015, Jenkins/gcc6
This was SVN commit r23191.
121 lines
3.2 KiB
C++
121 lines
3.2 KiB
C++
/* Copyright (C) 2019 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_DELTAARRAY
|
|
#define INCLUDED_DELTAARRAY
|
|
|
|
template<typename T> class DeltaArray2D
|
|
{
|
|
public:
|
|
virtual ~DeltaArray2D() {}
|
|
|
|
T get(ssize_t x, ssize_t y);
|
|
void set(ssize_t x, ssize_t y, const T& val);
|
|
|
|
void OverlayWith(const DeltaArray2D<T>& overlayer);
|
|
void Undo();
|
|
void Redo();
|
|
|
|
protected:
|
|
virtual T getOld(ssize_t x, ssize_t y) = 0;
|
|
virtual void setNew(ssize_t x, ssize_t y, const T& val) = 0;
|
|
|
|
private:
|
|
// TODO: more efficient representation
|
|
using Data = std::unordered_map<std::pair<ssize_t, ssize_t>, std::pair<T, T> >; // map of <x,y> -> <old_val, new_val>
|
|
Data m_Data;
|
|
};
|
|
|
|
namespace std
|
|
{
|
|
template<>
|
|
struct hash<std::pair<ssize_t, ssize_t> >
|
|
{
|
|
std::size_t operator()(const std::pair<ssize_t, ssize_t>& p) const
|
|
{
|
|
std::size_t seed = 0;
|
|
hash_combine(seed, p.first << 16);
|
|
hash_combine(seed, p.second);
|
|
return seed;
|
|
}
|
|
|
|
// Same as boost::hash_combine
|
|
void hash_combine(std::size_t& seed, const ssize_t val) const
|
|
{
|
|
seed ^= m_SizeHash(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
|
|
}
|
|
|
|
private:
|
|
std::hash<ssize_t> m_SizeHash;
|
|
};
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
|
|
template<typename T>
|
|
T DeltaArray2D<T>::get(ssize_t x, ssize_t y)
|
|
{
|
|
typename Data::iterator it = m_Data.find(std::make_pair(x, y));
|
|
if (it == m_Data.end())
|
|
return getOld(x, y);
|
|
else
|
|
return it->second.second;
|
|
}
|
|
|
|
template<typename T>
|
|
void DeltaArray2D<T>::set(ssize_t x, ssize_t y, const T& val)
|
|
{
|
|
typename Data::iterator it = m_Data.find(std::make_pair(x, y));
|
|
if (it == m_Data.end())
|
|
m_Data.insert(std::make_pair(std::make_pair(x, y), std::make_pair(getOld(x, y), val)));
|
|
else
|
|
it->second.second = val;
|
|
setNew(x, y, val);
|
|
}
|
|
|
|
template <typename T>
|
|
void DeltaArray2D<T>::OverlayWith(const DeltaArray2D<T>& overlayer)
|
|
{
|
|
for (typename Data::const_iterator it = overlayer.m_Data.begin(); it != overlayer.m_Data.end(); ++it)
|
|
{
|
|
typename Data::iterator it2 = m_Data.find(it->first);
|
|
if (it2 == m_Data.end())
|
|
m_Data.insert(*it);
|
|
else
|
|
{
|
|
//ENSURE(it2->second.second == it->second.first);
|
|
it2->second.second = it->second.second;
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
template <typename T>
|
|
void DeltaArray2D<T>::Undo()
|
|
{
|
|
for (typename Data::iterator it = m_Data.begin(); it != m_Data.end(); ++it)
|
|
setNew(it->first.first, it->first.second, it->second.first);
|
|
}
|
|
|
|
template <typename T>
|
|
void DeltaArray2D<T>::Redo()
|
|
{
|
|
for (typename Data::iterator it = m_Data.begin(); it != m_Data.end(); ++it)
|
|
setNew(it->first.first, it->first.second, it->second.second);
|
|
}
|
|
|
|
#endif // INCLUDED_DELTAARRAY
|