mirror of
https://github.com/glest/glest-source.git
synced 2025-09-28 08:29:00 +02:00
Fixed the god-awful indentation
This commit is contained in:
mathusummut
@@ -28,171 +28,177 @@ using namespace Shared::Platform;
|
||||
|
||||
//#define UNDEF_DEBUG
|
||||
|
||||
namespace Shared { namespace Util {
|
||||
namespace Shared {
|
||||
namespace Util {
|
||||
|
||||
enum GlobalStaticFlagTypes {
|
||||
gsft_none = 0x00,
|
||||
gsft_lan_mode = 0x01,
|
||||
//gsft_xx = 0x02
|
||||
//gsft__xx = 0x04,
|
||||
//gsft__xx = 0x08,
|
||||
//gsft__xx = 0x10,
|
||||
};
|
||||
enum GlobalStaticFlagTypes {
|
||||
gsft_none = 0x00,
|
||||
gsft_lan_mode = 0x01,
|
||||
//gsft_xx = 0x02
|
||||
//gsft__xx = 0x04,
|
||||
//gsft__xx = 0x08,
|
||||
//gsft__xx = 0x10,
|
||||
};
|
||||
|
||||
class GlobalStaticFlags {
|
||||
public:
|
||||
static bool getIsNonGraphicalModeEnabled() {
|
||||
return isNonGraphicalMode;
|
||||
}
|
||||
class GlobalStaticFlags {
|
||||
public:
|
||||
static bool getIsNonGraphicalModeEnabled() {
|
||||
return isNonGraphicalMode;
|
||||
}
|
||||
|
||||
static void setIsNonGraphicalModeEnabled(bool value) {
|
||||
isNonGraphicalMode = value;
|
||||
}
|
||||
static void setIsNonGraphicalModeEnabled(bool value) {
|
||||
isNonGraphicalMode = value;
|
||||
}
|
||||
|
||||
static void setFlags(uint64 flagsValue) { flags = flagsValue; }
|
||||
static uint64 getFlags() { return flags; }
|
||||
static void setFlags(uint64 flagsValue) {
|
||||
flags = flagsValue;
|
||||
}
|
||||
static uint64 getFlags() {
|
||||
return flags;
|
||||
}
|
||||
|
||||
static void setFlag(GlobalStaticFlagTypes flag) { flags |= flag; }
|
||||
static bool isFlagSet(GlobalStaticFlagTypes flag) { return (flags & (unsigned int)flag) == (unsigned int)flag; }
|
||||
static void setFlag(GlobalStaticFlagTypes flag) {
|
||||
flags |= flag;
|
||||
}
|
||||
static bool isFlagSet(GlobalStaticFlagTypes flag) {
|
||||
return (flags & (unsigned int) flag) == (unsigned int) flag;
|
||||
}
|
||||
|
||||
protected:
|
||||
static bool isNonGraphicalMode;
|
||||
static uint64 flags;
|
||||
};
|
||||
protected:
|
||||
static bool isNonGraphicalMode;
|
||||
static uint64 flags;
|
||||
};
|
||||
|
||||
class SystemFlags
|
||||
{
|
||||
public:
|
||||
class SystemFlags {
|
||||
public:
|
||||
|
||||
struct httpMemoryStruct {
|
||||
char *memory;
|
||||
size_t size;
|
||||
};
|
||||
struct httpMemoryStruct {
|
||||
char *memory;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
enum DebugType {
|
||||
debugSystem,
|
||||
debugNetwork,
|
||||
debugPerformance,
|
||||
debugWorldSynch,
|
||||
debugWorldSynchMax,
|
||||
debugUnitCommands,
|
||||
debugPathFinder,
|
||||
debugLUA,
|
||||
debugSound,
|
||||
debugError
|
||||
};
|
||||
enum DebugType {
|
||||
debugSystem,
|
||||
debugNetwork,
|
||||
debugPerformance,
|
||||
debugWorldSynch,
|
||||
debugWorldSynchMax,
|
||||
debugUnitCommands,
|
||||
debugPathFinder,
|
||||
debugLUA,
|
||||
debugSound,
|
||||
debugError
|
||||
};
|
||||
|
||||
class SystemFlagsType
|
||||
{
|
||||
protected:
|
||||
DebugType debugType;
|
||||
class SystemFlagsType {
|
||||
protected:
|
||||
DebugType debugType;
|
||||
|
||||
public:
|
||||
SystemFlagsType() {
|
||||
this->debugType = debugSystem;
|
||||
this->enabled = false;
|
||||
this->fileStream = NULL;
|
||||
this->debugLogFileName = "";
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
SystemFlagsType(DebugType debugType) {
|
||||
this->debugType = debugType;
|
||||
this->enabled = false;
|
||||
this->fileStream = NULL;
|
||||
this->debugLogFileName = "";
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
~SystemFlagsType() {
|
||||
Close();
|
||||
}
|
||||
SystemFlagsType(DebugType debugType,bool enabled,
|
||||
std::ofstream *fileStream,std::string debugLogFileName) {
|
||||
this->debugType = debugType;
|
||||
this->enabled = enabled;
|
||||
this->fileStream = fileStream;
|
||||
this->debugLogFileName = debugLogFileName;
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
|
||||
void Close() {
|
||||
if(this->fileStreamOwner == true) {
|
||||
if( this->fileStream != NULL &&
|
||||
this->fileStream->is_open() == true) {
|
||||
this->fileStream->close();
|
||||
public:
|
||||
SystemFlagsType() {
|
||||
this->debugType = debugSystem;
|
||||
this->enabled = false;
|
||||
this->fileStream = NULL;
|
||||
this->debugLogFileName = "";
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
delete this->fileStream;
|
||||
delete this->mutex;
|
||||
SystemFlagsType(DebugType debugType) {
|
||||
this->debugType = debugType;
|
||||
this->enabled = false;
|
||||
this->fileStream = NULL;
|
||||
this->debugLogFileName = "";
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
~SystemFlagsType() {
|
||||
Close();
|
||||
}
|
||||
SystemFlagsType(DebugType debugType, bool enabled,
|
||||
std::ofstream *fileStream, std::string debugLogFileName) {
|
||||
this->debugType = debugType;
|
||||
this->enabled = enabled;
|
||||
this->fileStream = fileStream;
|
||||
this->debugLogFileName = debugLogFileName;
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
|
||||
void Close() {
|
||||
if (this->fileStreamOwner == true) {
|
||||
if (this->fileStream != NULL &&
|
||||
this->fileStream->is_open() == true) {
|
||||
this->fileStream->close();
|
||||
}
|
||||
delete this->fileStream;
|
||||
delete this->mutex;
|
||||
}
|
||||
this->fileStream = NULL;
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
|
||||
bool enabled;
|
||||
std::ofstream *fileStream;
|
||||
std::string debugLogFileName;
|
||||
bool fileStreamOwner;
|
||||
Mutex *mutex;
|
||||
};
|
||||
|
||||
protected:
|
||||
|
||||
static int lockFile;
|
||||
static string lockfilename;
|
||||
static int lockFileCountIndex;
|
||||
|
||||
static std::map<DebugType, SystemFlagsType> *debugLogFileList;
|
||||
static bool haveSpecialOutputCommandLineOption;
|
||||
static bool curl_global_init_called;
|
||||
|
||||
static SystemFlagsType * setupRequiredMembers();
|
||||
|
||||
public:
|
||||
|
||||
static CURL *curl_handle;
|
||||
static int DEFAULT_HTTP_TIMEOUT;
|
||||
static bool VERBOSE_MODE_ENABLED;
|
||||
static bool ENABLE_THREADED_LOGGING;
|
||||
static bool SHUTDOWN_PROGRAM_MODE;
|
||||
|
||||
SystemFlags();
|
||||
~SystemFlags();
|
||||
|
||||
static void init(bool haveSpecialOutputCommandLineOption);
|
||||
//static SystemFlagsType & getSystemSettingType(DebugType type);
|
||||
inline static SystemFlagsType & getSystemSettingType(DebugType type) {
|
||||
if (SystemFlags::debugLogFileList == NULL) {
|
||||
SystemFlagsType *result = setupRequiredMembers();
|
||||
if (result != NULL) {
|
||||
return *result;
|
||||
} else if (SystemFlags::debugLogFileList == NULL) {
|
||||
throw std::runtime_error("unknown return value for SystemFlagsType!");
|
||||
}
|
||||
}
|
||||
|
||||
return (*debugLogFileList)[type];
|
||||
}
|
||||
this->fileStream = NULL;
|
||||
this->fileStreamOwner = false;
|
||||
this->mutex = NULL;
|
||||
}
|
||||
|
||||
bool enabled;
|
||||
std::ofstream *fileStream;
|
||||
std::string debugLogFileName;
|
||||
bool fileStreamOwner;
|
||||
Mutex *mutex;
|
||||
};
|
||||
static size_t httpWriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data);
|
||||
static std::string getHTTP(std::string URL, CURL *handle = NULL, int timeOut = -1, CURLcode *savedResult = NULL);
|
||||
static std::string escapeURL(std::string URL, CURL *handle = NULL);
|
||||
|
||||
protected:
|
||||
static CURL *initHTTP();
|
||||
static void cleanupHTTP(CURL **handle, bool globalCleanup = false);
|
||||
static void globalCleanupHTTP();
|
||||
|
||||
static int lockFile;
|
||||
static string lockfilename;
|
||||
static int lockFileCountIndex;
|
||||
static bool getThreadedLoggerRunning();
|
||||
static std::size_t getLogEntryBufferCount();
|
||||
|
||||
static std::map<DebugType,SystemFlagsType> *debugLogFileList;
|
||||
static bool haveSpecialOutputCommandLineOption;
|
||||
static bool curl_global_init_called;
|
||||
// Let the macro call into this when require.. NEVER call it automatically.
|
||||
static void handleDebug(DebugType type, const char *fmt, ...);
|
||||
static void logDebugEntry(DebugType type, string debugEntry, time_t debugTime);
|
||||
|
||||
static SystemFlagsType * setupRequiredMembers();
|
||||
|
||||
public:
|
||||
|
||||
static CURL *curl_handle;
|
||||
static int DEFAULT_HTTP_TIMEOUT;
|
||||
static bool VERBOSE_MODE_ENABLED;
|
||||
static bool ENABLE_THREADED_LOGGING;
|
||||
static bool SHUTDOWN_PROGRAM_MODE;
|
||||
|
||||
SystemFlags();
|
||||
~SystemFlags();
|
||||
|
||||
static void init(bool haveSpecialOutputCommandLineOption);
|
||||
//static SystemFlagsType & getSystemSettingType(DebugType type);
|
||||
inline static SystemFlagsType & getSystemSettingType(DebugType type) {
|
||||
if(SystemFlags::debugLogFileList == NULL) {
|
||||
SystemFlagsType *result = setupRequiredMembers();
|
||||
if(result != NULL) {
|
||||
return *result;
|
||||
}
|
||||
else if(SystemFlags::debugLogFileList == NULL) {
|
||||
throw std::runtime_error("unknown return value for SystemFlagsType!");
|
||||
}
|
||||
}
|
||||
|
||||
return (*debugLogFileList)[type];
|
||||
}
|
||||
|
||||
static size_t httpWriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data);
|
||||
static std::string getHTTP(std::string URL,CURL *handle=NULL, int timeOut=-1, CURLcode *savedResult=NULL);
|
||||
static std::string escapeURL(std::string URL, CURL *handle=NULL);
|
||||
|
||||
static CURL *initHTTP();
|
||||
static void cleanupHTTP(CURL **handle,bool globalCleanup=false);
|
||||
static void globalCleanupHTTP();
|
||||
|
||||
static bool getThreadedLoggerRunning();
|
||||
static std::size_t getLogEntryBufferCount();
|
||||
|
||||
// Let the macro call into this when require.. NEVER call it automatically.
|
||||
static void handleDebug(DebugType type, const char *fmt, ...);
|
||||
static void logDebugEntry(DebugType type, string debugEntry, time_t debugTime);
|
||||
|
||||
// If logging is enabled then define the logging method
|
||||
// If logging is enabled then define the logging method
|
||||
#ifndef UNDEF_DEBUG
|
||||
|
||||
#ifndef WIN32
|
||||
@@ -208,89 +214,87 @@ public:
|
||||
#else
|
||||
// stub out debugging completely
|
||||
#ifndef WIN32
|
||||
#define OutputDebug(type, fmt, ...) type
|
||||
#define OutputDebug(type, fmt, ...) type
|
||||
#else
|
||||
static void nothing() {}
|
||||
#define OutputDebug(type, fmt, ...) nothing()
|
||||
static void nothing() {
|
||||
}
|
||||
#define OutputDebug(type, fmt, ...) nothing()
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
static void Close();
|
||||
};
|
||||
static void Close();
|
||||
};
|
||||
|
||||
const string sharedLibVersionString= "v0.4.1";
|
||||
const string sharedLibVersionString = "v0.4.1";
|
||||
|
||||
//string fcs
|
||||
string lastDir(const string &s);
|
||||
string lastFile(const string &s);
|
||||
string cutLastFile(const string &s);
|
||||
string cutLastExt(const string &s);
|
||||
string ext(const string &s);
|
||||
string replaceBy(const string &s, char c1, char c2);
|
||||
vector<string> split(string s,string d);
|
||||
string toLower(const string &s);
|
||||
bool compareNonCaseSensitive(const string &a, const string &b);
|
||||
//void copyStringToBuffer(char *buffer, int bufferSize, const string& s);
|
||||
//string fcs
|
||||
string lastDir(const string &s);
|
||||
string lastFile(const string &s);
|
||||
string cutLastFile(const string &s);
|
||||
string cutLastExt(const string &s);
|
||||
string ext(const string &s);
|
||||
string replaceBy(const string &s, char c1, char c2);
|
||||
vector<string> split(string s, string d);
|
||||
string toLower(const string &s);
|
||||
bool compareNonCaseSensitive(const string &a, const string &b);
|
||||
//void copyStringToBuffer(char *buffer, int bufferSize, const string& s);
|
||||
|
||||
//numeric fcs
|
||||
int clamp(int value, int min, int max);
|
||||
float clamp(float value, float min, float max);
|
||||
int64 clamp(int64 value, int64 min, int64 max);
|
||||
//float saturate(float value);
|
||||
//int round(float f);
|
||||
//numeric fcs
|
||||
int clamp(int value, int min, int max);
|
||||
float clamp(float value, float min, float max);
|
||||
int64 clamp(int64 value, int64 min, int64 max);
|
||||
//float saturate(float value);
|
||||
//int round(float f);
|
||||
|
||||
//misc
|
||||
int compareMajorMinorVersion(const string &versionA, const string &versionB);
|
||||
int getMajor(string version);
|
||||
int getMinor(string version);
|
||||
bool checkVersionComptability(string clientVersionString, string serverVersionString);
|
||||
//misc
|
||||
int compareMajorMinorVersion(const string &versionA, const string &versionB);
|
||||
int getMajor(string version);
|
||||
int getMinor(string version);
|
||||
bool checkVersionComptability(string clientVersionString, string serverVersionString);
|
||||
|
||||
template<typename T>
|
||||
void enforceMinimumValue(T minValue, T &value) {
|
||||
if (value < minValue) {
|
||||
value = minValue;
|
||||
}
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void deleteValues(T beginIt, T endIt) {
|
||||
for (T it = beginIt; it != endIt; ++it) {
|
||||
delete *it;
|
||||
}
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void deleteMapValues(T beginIt, T endIt) {
|
||||
for (T it = beginIt; it != endIt; ++it) {
|
||||
delete it->second;
|
||||
it->second = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
class create_map {
|
||||
private:
|
||||
std::map<T, U> m_map;
|
||||
public:
|
||||
create_map(const T& key, const U& val) {
|
||||
m_map[key] = val;
|
||||
}
|
||||
|
||||
create_map<T, U>& operator()(const T& key, const U& val) {
|
||||
m_map[key] = val;
|
||||
return *this;
|
||||
}
|
||||
|
||||
operator std::map<T, U>() {
|
||||
return m_map;
|
||||
}
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
void enforceMinimumValue(T minValue, T &value) {
|
||||
if(value < minValue) {
|
||||
value = minValue;
|
||||
}
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void deleteValues(T beginIt, T endIt){
|
||||
for(T it= beginIt; it!=endIt; ++it){
|
||||
delete *it;
|
||||
}
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void deleteMapValues(T beginIt, T endIt){
|
||||
for(T it= beginIt; it!=endIt; ++it){
|
||||
delete it->second;
|
||||
it->second = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T, typename U>
|
||||
class create_map
|
||||
{
|
||||
private:
|
||||
std::map<T, U> m_map;
|
||||
public:
|
||||
create_map(const T& key, const U& val)
|
||||
{
|
||||
m_map[key] = val;
|
||||
}
|
||||
|
||||
create_map<T, U>& operator()(const T& key, const U& val)
|
||||
{
|
||||
m_map[key] = val;
|
||||
return *this;
|
||||
}
|
||||
|
||||
operator std::map<T, U>()
|
||||
{
|
||||
return m_map;
|
||||
}
|
||||
};
|
||||
|
||||
}}//end namespace
|
||||
}//end namespace
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user