janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
93 lines
2.4 KiB
C++
93 lines
2.4 KiB
C++
#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:
|
|
struct hashfunc {
|
|
enum {
|
|
bucket_size = 4,
|
|
min_buckets = 8
|
|
};
|
|
size_t operator()(const std::pair<ssize_t, ssize_t>& p) const {
|
|
return STL_HASH_VALUE(p.first << 16) + STL_HASH_VALUE(p.second);
|
|
}
|
|
bool operator()(const std::pair<ssize_t, ssize_t>& a, const std::pair<ssize_t, ssize_t>& b) const {
|
|
return (a < b);
|
|
}
|
|
};
|
|
// TODO: more efficient representation
|
|
typedef STL_HASH_MAP<std::pair<ssize_t, ssize_t>, std::pair<T, T>, hashfunc> Data; // map of <x,y> -> <old_val, new_val>
|
|
Data m_Data;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
|
|
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
|
|
{
|
|
//debug_assert(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
|