Merge with develop
--HG-- branch : feature-streamed-packagehg/feature/streamed-package
kaetemi
10 years ago
commit
a33799d210
@ -0,0 +1,53 @@
|
||||
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2014 Laszlo Kis-Adam
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program 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 Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef GROUP_EDITBOX_DECOR
|
||||
#define GROUP_EDITBOX_DECOR
|
||||
|
||||
#include "nel/gui/group_editbox.h"
|
||||
|
||||
namespace NLGUI
|
||||
{
|
||||
/// Decorated CGroupEditBox
|
||||
class CGroupEditBoxDecor : public CGroupEditBox
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupEditBoxDecor )
|
||||
|
||||
CGroupEditBoxDecor( const TCtorParam ¶m );
|
||||
~CGroupEditBoxDecor();
|
||||
|
||||
void moveBy( sint32 x, sint32 y );
|
||||
|
||||
void setIdRecurse( const std::string &newID );
|
||||
|
||||
std::string getProperty( const std::string &name ) const;
|
||||
void setProperty( const std::string &name, const std::string &value );
|
||||
xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
|
||||
bool parse( xmlNodePtr cur, CInterfaceGroup *parent );
|
||||
void draw();
|
||||
void updateCoords();
|
||||
|
||||
static void forceLink();
|
||||
|
||||
private:
|
||||
class EBDPrivate *_Pvt;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,74 @@
|
||||
// Public domain hash functions
|
||||
|
||||
#ifndef NLMISC_WANG_HASH_H
|
||||
#define NLMISC_WANG_HASH_H
|
||||
|
||||
#include "types_nl.h"
|
||||
|
||||
namespace NLMISC {
|
||||
|
||||
// http://burtleburtle.net/bob/hash/integer.html
|
||||
inline uint32 wangHash(uint32 a)
|
||||
{
|
||||
a = (a ^ 61) ^ (a >> 16);
|
||||
a = a + (a << 3);
|
||||
a = a ^ (a >> 4);
|
||||
a = a * 0x27d4eb2d;
|
||||
a = a ^ (a >> 15);
|
||||
return a;
|
||||
}
|
||||
|
||||
// http://naml.us/blog/2012/03
|
||||
inline uint64 wangHash64(uint64 key)
|
||||
{
|
||||
key = (~key) + (key << 21); // key = (key << 21) - key - 1;
|
||||
key = key ^ (key >> 24);
|
||||
key = (key + (key << 3)) + (key << 8); // key * 265
|
||||
key = key ^ (key >> 14);
|
||||
key = (key + (key << 2)) + (key << 4); // key * 21
|
||||
key = key ^ (key >> 28);
|
||||
key = key + (key << 31);
|
||||
return key;
|
||||
}
|
||||
|
||||
// http://naml.us/blog/2012/03 Inverse 64-bit wang hash
|
||||
inline uint64 wangHash64Inv(uint64 key)
|
||||
{
|
||||
uint64 tmp;
|
||||
|
||||
// Invert key = key + (key << 31)
|
||||
tmp = key - (key << 31);
|
||||
key = key - (tmp << 31);
|
||||
|
||||
// Invert key = key ^ (key >> 28)
|
||||
tmp = key^key >> 28;
|
||||
key = key^tmp >> 28;
|
||||
|
||||
// Invert key *= 21
|
||||
key *= 14933078535860113213u;
|
||||
|
||||
// Invert key = key ^ (key >> 14)
|
||||
tmp = key^key >> 14;
|
||||
tmp = key^tmp >> 14;
|
||||
tmp = key^tmp >> 14;
|
||||
key = key^tmp >> 14;
|
||||
|
||||
// Invert key *= 265
|
||||
key *= 15244667743933553977u;
|
||||
|
||||
// Invert key = key ^ (key >> 24)
|
||||
tmp = key^key >> 24;
|
||||
key = key^tmp >> 24;
|
||||
|
||||
// Invert key = (~key) + (key << 21)
|
||||
tmp = ~key;
|
||||
tmp = ~(key - (tmp << 21));
|
||||
tmp = ~(key - (tmp << 21));
|
||||
key = ~(key - (tmp << 21));
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
} /* namespace NLMISC */
|
||||
|
||||
#endif // NLMISC_WANG_HASH_H
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue