TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 12:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source
This commit is contained in:
Jeff Hutchinson 2021-08-29 22:28:42 -04:00
commit 6e072dbf91
62 changed files with 388 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/source/core/util/uuid.cpp
View file

@ -68,32 +68,15 @@
#include <ctype.h>
#include "core/util/md5.h"
#include "core/util/uuid.h"
#include "console/enginePrimitives.h"
#if defined (TORQUE_OS_MAC) && (defined(TORQUE_CPU_X64) || defined(TORQUE_CPU_ARM64))
typedef unsigned int unsigned32;
#else
typedef unsigned long unsigned32;
#endif
typedef unsigned short unsigned16;
typedef unsigned char unsigned8;
typedef struct {
char nodeID[6];
} uuid_node_t;
#undef xuuid_t
typedef struct _uuid_t
{
unsigned32 time_low;
unsigned16 time_mid;
unsigned16 time_hi_and_version;
unsigned8 clock_seq_hi_and_reserved;
unsigned8 clock_seq_low;
unsigned8 node[6];
} xuuid_t;
/* data type for UUID generator persistent state */
typedef struct {

18
Engine/source/core/util/uuid.h
View file

@ -28,11 +28,27 @@
#endif
#include "console/engineTypeInfo.h"
typedef unsigned int unsigned32;
typedef unsigned short unsigned16;
typedef unsigned char unsigned8;
class xuuid_t
{
public:
unsigned32 time_low;
unsigned16 time_mid;
unsigned16 time_hi_and_version;
unsigned8 clock_seq_hi_and_reserved;
unsigned8 clock_seq_low;
unsigned8 node[6];
};
namespace Torque
{
/// A universally unique identifier.
class UUID
class UUID : public xuuid_t
{
friend class UUIDEngineExport;
public: