Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-12-18 14:47:16 +01:00
parent c551307ff7
commit bb28b25e71
319 changed files with 1412 additions and 437 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -9,9 +9,7 @@ os:
matrix:
fast_finish: true
env:
- CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=on -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=off"
- CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=on -DWITH_LUA53:BOOL=off"
- CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=on"
- CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON"
- CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so"
CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2"
RUN="build/bin/nel_unit_test"
@ -19,10 +17,7 @@ env:
addons:
apt:
packages:
- liblua5.1-0-dev
- liblua5.1-0-dbg
- liblua5.2-0-dev
- liblua5.2-0-dbg
- liblua5.1-dev
- libluabind-dev
- libcpptest-dev
- libogg-dev

12
code/nel/include/nel/georges/form.h
View file

@ -22,7 +22,7 @@
#include "form_elm.h"
#include "header.h"
extern bool convertFormFile (const char *oldFileName, const char *newFileName);
extern bool convertFormFile (const std::string &oldFileName, const std::string &newFileName);
namespace NLGEORGES
{
@ -35,7 +35,7 @@ class UFormElm;
class CForm : public UForm
{
friend class CFormLoader;
friend bool convertFormFile (const char *oldFileName, const char *newFileName);
friend bool convertFormFile (const std::string &oldFileName, const std::string &newFileName);
public:
enum { HeldElementCount = 4 };
@ -73,12 +73,12 @@ public:
// ** IO functions
// Set the filename before saving the form
void write (xmlDocPtr doc, const char *filename);
void write (xmlDocPtr doc, const std::string &filename);
// ** Parent access
// Insert parent before parent indexed "before".
bool insertParent (uint before, const char *filename, CForm *parent);
bool insertParent (uint before, const std::string &filename, CForm *parent);
// Remove a parent from parent list
void removeParent (uint parent);
@ -97,7 +97,7 @@ public:
const std::string &getFilename () const;
// Error handling
void warning (bool exception, const char *function, const char *format, ... ) const;
void warning (bool exception, const std::string &function, const char *format, ... ) const;
private:
@ -114,7 +114,7 @@ private:
// CFormLoader call it
// Set the filename before reading the form
void read (xmlNodePtr node, CFormLoader &loader, CFormDfn *dfn, const char *filename);
void read (xmlNodePtr node, CFormLoader &loader, CFormDfn *dfn, const std::string &filename);
// Called by read
void readParent (const char *parent, CFormLoader &loader);

26
code/nel/include/nel/georges/form_dfn.h
View file

@ -24,7 +24,7 @@
#include "header.h"
#include "type.h"
bool convertDfnFile (const char *oldFileName, const char *newFileName);
bool convertDfnFile (const std::string &oldFileName, const std::string &newFileName);
namespace NLGEORGES
{
@ -41,7 +41,7 @@ class CFormDfn : public UFormDfn
friend class CFormElm;
friend class CFormLoader;
friend class CFormElmStruct;
friend bool convertDfnFile (const char *oldFileName, const char *newFileName);
friend bool convertDfnFile (const std::string &oldFileName, const std::string &newFileName);
public:
// Default cstr
@ -60,7 +60,7 @@ public:
friend class CFormElm;
friend class CFormDfn;
friend class CFormElmStruct;
friend bool convertDfnFile (const char *oldFileName, const char *newFileName);
friend bool convertDfnFile (const std::string &oldFileName, const std::string &newFileName);
public:
CEntry ()
@ -85,12 +85,12 @@ public:
TEntryType getType () const;
// Set as a type
void setType (CFormLoader &loader, const char *filename);
void setType (CFormLoader &loader, const std::string &filename);
void setType (TEntryType type);
// Set as a dfn
void setDfn (CFormLoader &loader, const char *filename);
void setDfn (CFormLoader &loader, const std::string &filename);
// Set as a dfn pointer
void setDfnPointer ();
@ -99,7 +99,7 @@ public:
const std::string &getName () const;
// Set element Name
void setName (const char *name);
void setName (const std::string &name);
// Get the filename
const std::string &getFilename() const;
@ -108,16 +108,16 @@ public:
const std::string &getFilenameExt() const;
// Set the filename
void setFilename (const char *def);
void setFilename (const std::string &def);
// Set the filename extension
void setFilenameExt (const char *ext);
void setFilenameExt (const std::string &ext);
// Get default value
const std::string &getDefault () const;
// Set default value
void setDefault (const char *def);
void setDefault (const std::string &def);
// Set array flag
void setArrayFlag (bool flag);
@ -167,7 +167,7 @@ public:
void removeEntry( uint idx );
// ** IO functions
void write (xmlDocPtr root, const char *filename);
void write (xmlDocPtr root, const std::string &filename);
// Count parent DFN
uint countParentDfn (uint32 round=0) const;
@ -185,7 +185,7 @@ public:
void setNumParent (uint size);
// Set a parent
void setParent (uint parent, CFormLoader &loader, const char *filename);
void setParent (uint parent, CFormLoader &loader, const std::string &filename);
// Get a parent
CFormDfn *getParent (uint parent) const;
@ -232,7 +232,7 @@ public:
CFileHeader Header;
// Error handling
void warning (bool exception, const char *function, const char *format, ... ) const;
void warning (bool exception, const std::string &function, const char *format, ... ) const;
private:
// The parents array
@ -249,7 +249,7 @@ private:
private:
// Read method called by the form loader
void read (xmlNodePtr doc, CFormLoader &loader, bool forceLoad, const char *filename);
void read (xmlNodePtr doc, CFormLoader &loader, bool forceLoad, const std::string &filename);
};
} // NLGEORGES

150
code/nel/include/nel/georges/form_elm.h
View file

@ -62,30 +62,30 @@ public:
virtual void getFormName (std::string &result, const CFormElm *child=NULL) const = 0;
// From UFormElm
virtual bool getNodeByName (const UFormElm **result, const char *name, TWhereIsNode *where, bool verbose, uint32 round=0) const;
virtual bool getNodeByName (UFormElm **result, const char *name, TWhereIsNode *where, bool verbose, uint32 round=0);
virtual bool getValueByName (std::string &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (sint8 &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (uint8 &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (sint16 &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (uint16 &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (sint32 &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (uint32 &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (float &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (double &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (bool &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (NLMISC::CRGBA &result, const char *name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool setValueByName (const char *value, const char *name, bool *created);
virtual bool setValueByName (sint8 value, const char *name, bool *created);
virtual bool setValueByName (uint8 value, const char *name, bool *created);
virtual bool setValueByName (sint16 value, const char *name, bool *created);
virtual bool setValueByName (uint16 value, const char *name, bool *created);
virtual bool setValueByName (sint32 value, const char *name, bool *created);
virtual bool setValueByName (uint32 value, const char *name, bool *created);
virtual bool setValueByName (float value, const char *name, bool *created);
virtual bool setValueByName (double value, const char *name, bool *created);
virtual bool setValueByName (bool value, const char *name, bool *created);
virtual bool setValueByName (NLMISC::CRGBA value, const char *name, bool *created);
virtual bool getNodeByName (const UFormElm **result, const std::string &name, TWhereIsNode *where, bool verbose, uint32 round=0) const;
virtual bool getNodeByName (UFormElm **result, const std::string &name, TWhereIsNode *where, bool verbose, uint32 round=0);
virtual bool getValueByName (std::string &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (sint8 &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (uint8 &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (sint16 &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (uint16 &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (sint32 &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (uint32 &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (float &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (double &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (bool &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool getValueByName (NLMISC::CRGBA &result, const std::string &name, TEval evaluate, TWhereIsValue *where, uint32 round=0) const;
virtual bool setValueByName (const std::string &value, const std::string &name, bool *created);
virtual bool setValueByName (sint8 value, const std::string &name, bool *created);
virtual bool setValueByName (uint8 value, const std::string &name, bool *created);
virtual bool setValueByName (sint16 value, const std::string &name, bool *created);
virtual bool setValueByName (uint16 value, const std::string &name, bool *created);
virtual bool setValueByName (sint32 value, const std::string &name, bool *created);
virtual bool setValueByName (uint32 value, const std::string &name, bool *created);
virtual bool setValueByName (float value, const std::string &name, bool *created);
virtual bool setValueByName (double value, const std::string &name, bool *created);
virtual bool setValueByName (bool value, const std::string &name, bool *created);
virtual bool setValueByName (NLMISC::CRGBA value, const std::string &name, bool *created);
virtual UFormElm *getParent () const;
virtual const CType *getType ();
virtual bool isArray () const;
@ -127,16 +127,16 @@ public:
// ** Convert functions
inline bool convertValue (sint8 &result, const char *value) const;
inline bool convertValue (uint8 &result, const char *value) const;
inline bool convertValue (sint16 &result, const char *value) const;
inline bool convertValue (uint16 &result, const char *value) const;
inline bool convertValue (sint32 &result, const char *value) const;
inline bool convertValue (uint32 &result, const char *value) const;
inline bool convertValue (float &result, const char *value) const;
inline bool convertValue (double &result, const char *value) const;
inline bool convertValue (bool &result, const char *value) const;
inline bool convertValue (NLMISC::CRGBA &result, const char *value) const;
inline bool convertValue (sint8 &result, const std::string &value) const;
inline bool convertValue (uint8 &result, const std::string &value) const;
inline bool convertValue (sint16 &result, const std::string &value) const;
inline bool convertValue (uint16 &result, const std::string &value) const;
inline bool convertValue (sint32 &result, const std::string &value) const;
inline bool convertValue (uint32 &result, const std::string &value) const;
inline bool convertValue (float &result, const std::string &value) const;
inline bool convertValue (double &result, const std::string &value) const;
inline bool convertValue (bool &result, const std::string &value) const;
inline bool convertValue (NLMISC::CRGBA &result, const std::string &value) const;
// ** Get dependencies
virtual void getDependencies (std::set<std::string> &dependencies) const = 0;
@ -144,7 +144,7 @@ public:
// ** Internal node access
// Create a node by name. If the node already exists, return it
bool createNodeByName (const char *name, const CFormDfn **parentDfn, uint &indexDfn,
bool createNodeByName (const std::string &, const CFormDfn **parentDfn, uint &indexDfn,
const CFormDfn **nodeDfn, const CType **nodeType,
CFormElm **node, UFormDfn::TEntryType &type,
bool &array, bool &created);
@ -153,13 +153,13 @@ public:
* Delete a node by name. If the node already exists, return it
*Delete its parent if not used
*/
bool deleteNodeByName (const char *name, const CFormDfn **parentDfn, uint &indexDfn,
bool deleteNodeByName (const std::string &name, const CFormDfn **parentDfn, uint &indexDfn,
const CFormDfn **nodeDfn, const CType **nodeType,
CFormElm **node, UFormDfn::TEntryType &type,
bool &array);
// Search for a node by name
bool getNodeByName (const char *name, const CFormDfn **parentDfn, uint &indexDfn,
bool getNodeByName (const std::string &name, const CFormDfn **parentDfn, uint &indexDfn,
const CFormDfn **nodeDfn, const CType **nodeType,
CFormElm **node, UFormDfn::TEntryType &type,
bool &array, bool &parentVDfnArray, bool verbose, uint32 round) const;
@ -168,7 +168,7 @@ public:
* Insert an array node by name
* The index asked must be < the size of the array.
*/
bool arrayInsertNodeByName (const char *name, const CFormDfn **parentDfn, uint &indexDfn,
bool arrayInsertNodeByName (const std::string &name, const CFormDfn **parentDfn, uint &indexDfn,
const CFormDfn **nodeDfn, const CType **nodeType,
CFormElm **node, UFormDfn::TEntryType &type,
bool &array, bool verbose, uint arrayIndex) const;
@ -177,7 +177,7 @@ public:
* Delete an array node by name
* The index asked must be < the size of the array.
*/
bool arrayDeleteNodeByName (const char *name, const CFormDfn **parentDfn, uint &indexDfn,
bool arrayDeleteNodeByName (const std::string &name, const CFormDfn **parentDfn, uint &indexDfn,
const CFormDfn **nodeDfn, const CType **nodeType,
CFormElm **node, UFormDfn::TEntryType &type,
bool &array, bool verbose, uint arrayIndex) const;
@ -199,7 +199,7 @@ protected:
* Then, else (*parentDfn / indexDfn ) or *node must be defined.
* Other values are for result only.
*/
static bool getInternalNodeByName (CForm *form, const char *name, const CFormDfn **parentDfn, uint &indexDfn,
static bool getInternalNodeByName (CForm *form, const std::string &name, const CFormDfn **parentDfn, uint &indexDfn,
const CFormDfn **nodeDfn, const CType **nodeType,
CFormElm **node, UFormDfn::TEntryType &type,
bool &array, TNodeAction action, bool &created, bool &parentVDfnArray, bool verbose, uint32 round);
@ -215,7 +215,7 @@ public:
static const char* tokenize (const char *name, std::string &str, uint &errorIndex, uint &code);
// ** IO functions
virtual xmlNodePtr write (xmlNodePtr node, const CForm *form, const char *structName = NULL, bool forceWrite = false) const = 0;
virtual xmlNodePtr write (xmlNodePtr node, const CForm *form, const std::string &structName = "", bool forceWrite = false) const = 0;
protected:
@ -235,8 +235,8 @@ protected:
uint32 Round;
// Error handling
static void warning (bool exception, const char *formName, const char *formFileName, const char *function, const char *format, ... );
virtual void warning (bool exception, const char *function, const char *format, ... ) const;
static void warning (bool exception, const std::string &formName, const std::string &formFileName, const std::string &function, const char *format, ... );
virtual void warning (bool exception, const std::string &function, const char *format, ... ) const;
private:
// Tokens
@ -298,7 +298,7 @@ public:
// From CFormElm
bool isUsed (const CForm *form) const;
xmlNodePtr write (xmlNodePtr node, const CForm *form, const char *structName, bool forceWrite = false) const;
xmlNodePtr write (xmlNodePtr node, const CForm *form, const std::string &structName, bool forceWrite = false) const;
void unlink (CFormElm *child);
void getFormName (std::string &result, const CFormElm *child) const;
void getDependencies (std::set<std::string> &dependencies) const;
@ -310,7 +310,7 @@ public:
std::vector<CFormElmStructElm> Elements;
// Error handling
virtual void warning (bool exception, const char *function, const char *format, ... ) const;
virtual void warning (bool exception, const std::string &function, const char *format, ... ) const;
};
/**
@ -332,13 +332,13 @@ public:
// From CFormElm
bool isUsed (const CForm *form) const;
xmlNodePtr write (xmlNodePtr node, const CForm *form, const char *structName, bool forceWrite = false) const;
xmlNodePtr write (xmlNodePtr node, const CForm *form, const std::string &structName, bool forceWrite = false) const;
// Call by CFormLoader
void read (xmlNodePtr node, CFormLoader &loader, CForm *form);
// Error handling
virtual void warning (bool exception, const char *function, const char *format, ... ) const;
virtual void warning (bool exception, const std::string &function, const char *format, ... ) const;
};
/**
@ -377,7 +377,7 @@ public:
bool getArrayValue (NLMISC::CRGBA &result, uint arrayIndex, TEval evaluate, TWhereIsValue *where) const;
// From CFormElm
xmlNodePtr write (xmlNodePtr node, const CForm *form, const char *structName, bool forceWrite = false) const;
xmlNodePtr write (xmlNodePtr node, const CForm *form, const std::string &structName, bool forceWrite = false) const;
bool setParent (CFormElm *parent);
void unlink (CFormElm *child);
bool isUsed (const CForm *form) const;
@ -406,7 +406,7 @@ public:
std::vector<CElement> Elements;
// Error handling
virtual void warning (bool exception, const char *function, const char *format, ... ) const;
virtual void warning (bool exception, const std::string &function, const char *format, ... ) const;
};
/**
@ -429,7 +429,7 @@ public:
const CType *Type;
// From CFormElm
xmlNodePtr write (xmlNodePtr node, const CForm *form, const char *structName, bool forceWrite = false) const;
xmlNodePtr write (xmlNodePtr node, const CForm *form, const std::string &structName, bool forceWrite = false) const;
bool setParent (CFormElm *parent);
void getFormName (std::string &result, const CFormElm *child) const;
void getDependencies (std::set<std::string> &dependencies) const;
@ -453,7 +453,7 @@ public:
bool getValue (NLMISC::CRGBA &result, TEval evaluate) const;
// Set the value, the elt been used
void setValue (const char *value);
void setValue (const std::string &value);
// Get the raw value. Does not care about any parent or default values
void getValue (std::string &result) const;
@ -463,14 +463,14 @@ private:
std::string Value;
// Error handling
virtual void warning (bool exception, const char *function, const char *format, ... ) const;
virtual void warning (bool exception, const std::string &function, const char *format, ... ) const;
};
// ***************************************************************************
// CFormElm inlines
// ***************************************************************************
inline bool CFormElm::convertValue (sint8 &result, const char *value) const
inline bool CFormElm::convertValue (sint8 &result, const std::string &value) const
{
float tmp;
if (NLMISC::fromString(value, tmp))
@ -482,14 +482,14 @@ inline bool CFormElm::convertValue (sint8 &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in sint8.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in sint8.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (uint8 &result, const char *value) const
inline bool CFormElm::convertValue (uint8 &result, const std::string &value) const
{
float tmp;
if (NLMISC::fromString(value, tmp))
@ -501,14 +501,14 @@ inline bool CFormElm::convertValue (uint8 &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in uint8.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in uint8.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (sint16 &result, const char *value) const
inline bool CFormElm::convertValue (sint16 &result, const std::string &value) const
{
float tmp;
if (NLMISC::fromString(value, tmp))
@ -520,14 +520,14 @@ inline bool CFormElm::convertValue (sint16 &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in sint16.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in sint16.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (uint16 &result, const char *value) const
inline bool CFormElm::convertValue (uint16 &result, const std::string &value) const
{
float tmp;
if (NLMISC::fromString(value, tmp))
@ -539,14 +539,14 @@ inline bool CFormElm::convertValue (uint16 &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in uint16.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in uint16.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (sint32 &result, const char *value) const
inline bool CFormElm::convertValue (sint32 &result, const std::string &value) const
{
float tmp;
if (NLMISC::fromString(value, tmp))
@ -558,14 +558,14 @@ inline bool CFormElm::convertValue (sint32 &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in sint32.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in sint32.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (uint32 &result, const char *value) const
inline bool CFormElm::convertValue (uint32 &result, const std::string &value) const
{
float tmp;
if (NLMISC::fromString(value, tmp))
@ -577,14 +577,14 @@ inline bool CFormElm::convertValue (uint32 &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in uint32.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in uint32.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (float &result, const char *value) const
inline bool CFormElm::convertValue (float &result, const std::string &value) const
{
if (NLMISC::fromString(value, result))
{
@ -593,16 +593,16 @@ inline bool CFormElm::convertValue (float &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in float.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in float.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (double &result, const char *value) const
inline bool CFormElm::convertValue (double &result, const std::string &value) const
{
float tmp;
double tmp;
if (NLMISC::fromString(value, tmp))
{
result = tmp;
@ -611,14 +611,14 @@ inline bool CFormElm::convertValue (double &result, const char *value) const
else
{
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in double.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in double.", value.c_str());
}
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (bool &result, const char *value) const
inline bool CFormElm::convertValue (bool &result, const std::string &value) const
{
int tmp;
if (NLMISC::fromString(value, tmp))
@ -628,7 +628,7 @@ inline bool CFormElm::convertValue (bool &result, const char *value) const
}
else
{
std::string temp = NLMISC::toLower(std::string(value));
std::string temp = NLMISC::toLower(value);
if (strcmp (temp.c_str (), "true") == 0)
{
result = true;
@ -642,17 +642,17 @@ inline bool CFormElm::convertValue (bool &result, const char *value) const
}
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in boolean.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in boolean.", value.c_str());
return false;
}
// ***************************************************************************
inline bool CFormElm::convertValue (NLMISC::CRGBA &result, const char *value) const
inline bool CFormElm::convertValue (NLMISC::CRGBA &result, const std::string &value) const
{
float r, g, b;
if (sscanf (value, "%f,%f,%f", &r, &g, &b) == 3)
if (sscanf (value.c_str(), "%f,%f,%f", &r, &g, &b) == 3)
{
NLMISC::clamp (r, 0.f, 255.f);
NLMISC::clamp (g, 0.f, 255.f);
@ -664,7 +664,7 @@ inline bool CFormElm::convertValue (NLMISC::CRGBA &result, const char *value) co
}
// Error message
warning (false, "convertValue", "Can't convert the string \"%s\" in RGB color.", value);
warning (false, "convertValue", "Can't convert the string \"%s\" in RGB color.", value.c_str());
return false;
}

12
code/nel/include/nel/georges/form_loader.h
View file

@ -42,18 +42,18 @@ class CFormLoader : public UFormLoader
public:
virtual ~CFormLoader();
// From UFormLoader
UForm *loadForm (const char *filename);
UFormDfn *loadFormDfn (const char *filename);
UType *loadFormType (const char *filename);
UForm *loadForm (const std::string &filename);
UFormDfn *loadFormDfn (const std::string &filename);
UType *loadFormType (const std::string &filename);
// Load type and formDfn
CType *loadType (const char *filename);
CFormDfn *loadFormDfn (const char *filename, bool forceLoad);
CType *loadType (const std::string &filename);
CFormDfn *loadFormDfn (const std::string &filename, bool forceLoad);
private:
// Error handling
virtual void warning (bool exception, const char *function, const char *format, ... ) const;
virtual void warning (bool exception, const std::string &function, const char *format, ... ) const;
typedef std::map<std::string, NLMISC::CRefPtr<CType> > TTypeMap;
typedef std::map<std::string, NLMISC::CRefPtr<CFormDfn> > TFormDfnMap;

6
code/nel/include/nel/georges/header.h
View file

@ -44,10 +44,10 @@ public:
};
/// Add a log
void addLog (const char *log);
void addLog(const std::string &log);
/// Set the comment
void setComments (const char *comments);
void setComments (const std::string &comments);
/// Major version number
uint32 MajorVersion;
@ -72,7 +72,7 @@ public:
static const char *getStateString (TState state);
// Error handling
void warning (bool exception, const char *function, const char *format, ... ) const;
void warning (bool exception, const std::string &function, const char *format, ... ) const;
};
} // NLGEORGES

6
code/nel/include/nel/georges/type.h
View file

@ -80,7 +80,7 @@ public:
// Evaluate a node
bool getValue (std::string &result, const class CForm *form, const class CFormElmAtom *node, const class CFormDfn &parentDfn,
uint parentIndex, UFormElm::TEval evaluate, uint32 *where, uint32 round, const char *formName) const;
uint parentIndex, UFormElm::TEval evaluate, uint32 *where, uint32 round, const std::string &formName) const;
// Definitions
class CDefinition
@ -114,8 +114,8 @@ public:
private:
// Error handling
virtual void warning (bool exception, const char *formName, const char *formFilename, const char *function, const char *format, ... ) const;
virtual void warning2 (bool exception, const char *function, const char *format, ... ) const;
virtual void warning (bool exception, const std::string &formName, const std::string &formFilename, const std::string &function, const char *format, ... ) const;
virtual void warning2 (bool exception, const std::string &function, const char *format, ... ) const;
// Type names
static const char *TypeNames[];

48
code/nel/include/nel/georges/u_form_elm.h
View file

@ -78,8 +78,8 @@ public:
* "position.x" : get the element named x in the struct named position
* "entities[2].color" : get the node named color in the second element of the entities array
*/
virtual bool getNodeByName (const UFormElm **result, const char *name, TWhereIsNode *where = NULL, bool reserved=true, uint32 round=0) const = 0;
virtual bool getNodeByName (UFormElm **result, const char *name, TWhereIsNode *where = NULL, bool reserved=true, uint32 round=0) = 0;
virtual bool getNodeByName (const UFormElm **result, const std::string &name, TWhereIsNode *where = NULL, bool reserved=true, uint32 round=0) const = 0;
virtual bool getNodeByName (UFormElm **result, const std::string &name, TWhereIsNode *where = NULL, bool reserved=true, uint32 round=0) = 0;
/// Where a value has been found
@ -104,19 +104,19 @@ public:
* \return true if the result has been filled, false if the value has not been found or the cast has failed or the evaluation has failed.
* \see getNodeByName ()
*/
virtual bool getValueByName (std::string &result, const char *namename, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (sint8 &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (uint8 &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (sint16 &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (uint16 &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (sint32 &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (uint32 &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (float &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (double &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (bool &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (std::string &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (sint8 &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (uint8 &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (sint16 &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (uint16 &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (sint32 &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (uint32 &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (float &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (double &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (bool &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
/// Warning, only R, G and B members are filled, not A.
virtual bool getValueByName (NLMISC::CRGBA &result, const char *name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
virtual bool getValueByName (NLMISC::CRGBA &result, const std::string &name, TEval evaluate = Eval, TWhereIsValue *where = NULL, uint32 round=0) const = 0;
/**
* Set a form value with its name. If the node doesn't exist, it is created.
@ -129,17 +129,17 @@ public:
* true if the value has been created, false it the value has been filled.
* \return true if the value has been set, false if the value has not been found or hasn't been created.
*/
virtual bool setValueByName (const char *value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (sint8 value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (uint8 value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (sint16 value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (uint16 value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (sint32 value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (uint32 value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (float value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (double value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (bool value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (NLMISC::CRGBA value, const char *name, bool *created = NULL) = 0;
virtual bool setValueByName (const std::string &value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (sint8 value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (uint8 value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (sint16 value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (uint16 value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (sint32 value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (uint32 value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (float value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (double value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (bool value, const std::string &name, bool *created = NULL) = 0;
virtual bool setValueByName (NLMISC::CRGBA value, const std::string &name, bool *created = NULL) = 0;
// ** Array element methods

6
code/nel/include/nel/georges/u_form_loader.h
View file

@ -43,19 +43,19 @@ public:
*
* The pointer on the form must be held in a CSmartPtr<UForm>. Returns NULL if the form can't be loaded.
*/
virtual UForm *loadForm (const char *filename) = 0;
virtual UForm *loadForm (const std::string &filename) = 0;
/** Load a DFN, use NMISC::CPath to find the file.
*
* The pointer on the form must be held in a CSmartPtr<UFormDfn>. Returns NULL if the DFN can't be loaded.
*/
virtual UFormDfn *loadFormDfn (const char *filename) = 0;
virtual UFormDfn *loadFormDfn (const std::string &filename) = 0;
/** Load a type, use NMISC::CPath to find the file.
*
* The pointer on the form must be held in a CSmartPtr<UType>. Returns NULL if the type can't be loaded.
*/
virtual UType *loadFormType (const char *filename) = 0;
virtual UType *loadFormType (const std::string &filename) = 0;
/// Create a form loader
static UFormLoader *createLoader ();

3
code/nel/src/3d/anim_detail_trav.cpp
View file

@ -26,6 +26,9 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/animation_set_user.cpp
View file

@ -19,6 +19,9 @@
#include "nel/3d/animation_set_user.h"
#include "nel/3d/driver_user.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/async_texture_manager.cpp
View file

@ -25,6 +25,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/bezier_patch.cpp
View file

@ -20,6 +20,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {
// ***************************************************************************

4
code/nel/src/3d/bloom_effect.cpp
View file

@ -33,6 +33,10 @@ using namespace NLMISC;
using namespace NL3D;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/bone.cpp
View file

@ -20,6 +20,9 @@
#include "nel/3d/anim_ctrl.h"
#include "nel/misc/hierarchical_timer.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/camera.cpp
View file

@ -19,6 +19,9 @@
#include "nel/3d/camera.h"
#include "nel/3d/scene.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/camera_col.cpp
View file

@ -22,6 +22,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/channel_mixer.cpp
View file

@ -27,6 +27,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/clip_trav.cpp
View file

@ -37,6 +37,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/cloud_scape.cpp
View file

@ -23,6 +23,10 @@
// ------------------------------------------------------------------------------------------------
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/cloud_scape_user.cpp
View file

@ -22,6 +22,9 @@
#include "nel/3d/cloud_scape.h"
#include "nel/3d/scene.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/cluster.cpp
View file

@ -28,6 +28,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/coarse_mesh_build.cpp
View file

@ -23,6 +23,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/coarse_mesh_manager.cpp
View file

@ -28,6 +28,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/computed_string.cpp
View file

@ -32,6 +32,10 @@
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

3
code/nel/src/3d/cube_map_builder.cpp
View file

@ -26,6 +26,9 @@
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/debug_vb.cpp
View file

@ -19,6 +19,10 @@
#include "nel/3d/vertex_buffer.h"
#include "nel/3d/index_buffer.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/deform_2d.cpp
View file

@ -27,6 +27,10 @@
#include "nel/3d/dru.h"
#include "nel/3d/material.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/driver.cpp
View file

@ -28,6 +28,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/driver_user.cpp
View file

@ -40,6 +40,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/driver_user2.cpp
View file

@ -37,6 +37,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/dru.cpp
View file

@ -46,6 +46,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/event_mouse_listener.cpp
View file

@ -24,6 +24,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/fast_ptr_list.cpp
View file

@ -20,6 +20,10 @@
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/fasthls_modifier.cpp
View file

@ -26,6 +26,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/flare_model.cpp
View file

@ -30,6 +30,9 @@
#include "nel/misc/common.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

3
code/nel/src/3d/flare_shape.cpp
View file

@ -24,6 +24,9 @@
#include "nel/3d/shape_bank.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/font_generator.cpp
View file

@ -58,6 +58,10 @@ const char* err_msg;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {
FT_Library CFontGenerator::_Library = NULL;

4
code/nel/src/3d/font_manager.cpp
View file

@ -32,6 +32,10 @@
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/frustum.cpp
View file

@ -23,6 +23,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

10
code/nel/src/3d/fxaa.cpp
View file

@ -49,11 +49,17 @@ using namespace std;
namespace NL3D {
namespace {
#include "fxaa_program.h"
} /* anonymous namespace */
}
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {
CFXAA::CFXAA(NL3D::UDriver *driver) : m_Driver(driver), m_VP(NULL), m_PP(NULL), m_Width(~0), m_Height(~0)
{
nldebug("3D: Create FXAA");

4
code/nel/src/3d/geometry_program.cpp
View file

@ -27,6 +27,10 @@
#include "nel/3d/driver.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/gpu_program_params.cpp
View file

@ -41,6 +41,10 @@
using namespace std;
// using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {
const size_t CGPUProgramParams::s_End = -1;

4
code/nel/src/3d/heat_haze.cpp
View file

@ -22,6 +22,10 @@
#include "nel/3d/deform_2d.h"
#include "nel/misc/vector_2f.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/height_map.cpp
View file

@ -21,6 +21,9 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/hls_color_texture.cpp
View file

@ -27,6 +27,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/hls_texture_bank.cpp
View file

@ -21,6 +21,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/hls_texture_manager.cpp
View file

@ -22,6 +22,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

3
code/nel/src/3d/hrc_trav.cpp
View file

@ -23,6 +23,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/ig_surface_light.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/ig_surface_light.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/ig_surface_light_build.cpp
View file

@ -23,6 +23,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/index_buffer.cpp
View file

@ -23,6 +23,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{
// ***************************************************************************

4
code/nel/src/3d/init_3d.cpp
View file

@ -22,6 +22,10 @@
#include "nel/3d/scene.h"
#include "nel/3d/register_3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace
{
static bool _Initialized = false;

4
code/nel/src/3d/instance_group_user.cpp
View file

@ -29,6 +29,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/instance_lighter.cpp
View file

@ -28,6 +28,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

3
code/nel/src/3d/key.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/key.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/landscape.cpp
View file

@ -41,6 +41,9 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D

4
code/nel/src/3d/landscape_collision_grid.cpp
View file

@ -24,6 +24,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/landscape_def.cpp
View file

@ -23,6 +23,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/landscape_face_vector_manager.cpp
View file

@ -23,6 +23,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

5
code/nel/src/3d/landscape_model.cpp
View file

@ -23,9 +23,14 @@
#include "nel/3d/cluster.h"
#include "nel/3d/scene.h"
#include "nel/3d/light_trav.h"
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/landscape_profile.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/landscape_profile.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/landscape_user.cpp
View file

@ -24,6 +24,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/landscape_vegetable_block.cpp
View file

@ -27,6 +27,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/landscapeig_manager.cpp
View file

@ -36,6 +36,10 @@ H_AUTO_DECL ( NL3D_Unload_Zone_IG )
#define NL3D_HAUTO_LAND_MNGR_LOAD_ZONEIG H_AUTO_USE( NL3D_Load_Zone_IG )
#define NL3D_HAUTO_LAND_MNGR_UNLOAD_ZONEIG H_AUTO_USE( NL3D_Unload_Zone_IG )
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/landscapevb_allocator.cpp
View file

@ -24,6 +24,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/landscapevb_info.cpp
View file

@ -20,6 +20,9 @@
#include "nel/3d/vertex_buffer.h"
#include "nel/3d/landscapevb_allocator.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/light.cpp
View file

@ -20,6 +20,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/light_contribution.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/light_contribution.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

3
code/nel/src/3d/light_influence_interpolator.cpp
View file

@ -20,6 +20,9 @@
#include "nel/misc/debug.h"
#include "nel/3d/point_light_named.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

5
code/nel/src/3d/light_trav.cpp
View file

@ -27,12 +27,13 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{
using namespace NLMISC;
// ***************************************************************************
CLightTrav::CLightTrav(bool bSmallScene) : LightingManager(bSmallScene)
{

3
code/nel/src/3d/light_user.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/light_user.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/lighting_manager.cpp
View file

@ -28,6 +28,9 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/load_balancing_trav.cpp
View file

@ -32,6 +32,10 @@ using namespace NLMISC;
#define NL3D_DEFAULT_LOADBALANCING_VALUE_SMOOTHER 50
#define NL3D_LOADBALANCING_SMOOTHER_MAX_RATIO 1.1f
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/lod_character_builder.cpp
View file

@ -27,6 +27,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/lod_character_instance.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/lod_character_instance.h"
#include "nel/3d/lod_character_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/lod_character_manager.cpp
View file

@ -34,6 +34,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/lod_character_shape.cpp
View file

@ -28,6 +28,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/lod_character_shape_bank.cpp
View file

@ -23,6 +23,10 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/lod_character_texture.cpp
View file

@ -18,6 +18,9 @@
#include "std3d.h"
#include "nel/3d/lod_character_texture.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

3
code/nel/src/3d/logic_info.cpp
View file

@ -18,6 +18,9 @@
#include "nel/3d/logic_info.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/material.cpp
View file

@ -24,6 +24,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/mesh.cpp
View file

@ -36,6 +36,9 @@ using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/mesh_base.cpp
View file

@ -25,6 +25,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_base_instance.cpp
View file

@ -29,6 +29,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/mesh_blender.cpp
View file

@ -20,6 +20,9 @@
#include "nel/3d/driver.h"
#include "nel/misc/fast_floor.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D {

4
code/nel/src/3d/mesh_block_manager.cpp
View file

@ -21,6 +21,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/mesh_geom.cpp
View file

@ -19,6 +19,9 @@
#include "nel/3d/mesh_geom.h"
#include "nel/3d/mesh_block_manager.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_instance.cpp
View file

@ -26,6 +26,10 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/mesh_morpher.cpp
View file

@ -24,6 +24,9 @@
using namespace std;
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/mesh_mrm.cpp
View file

@ -38,6 +38,9 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_mrm_instance.cpp
View file

@ -27,6 +27,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_mrm_skin_template.cpp
View file

@ -20,6 +20,10 @@
#include "std3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
// ace: before including this, #define this define to use it
// the goal is to be able to compile every .cpp file with no
// special case (GNU/Linux needs)

3
code/nel/src/3d/mesh_mrm_skinned.cpp
View file

@ -39,6 +39,9 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_mrm_skinned_instance.cpp
View file

@ -27,6 +27,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_mrm_skinned_template.cpp
View file

@ -20,6 +20,10 @@
#include "std3d.h"
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
// ***************************************************************************
// ***************************************************************************
// Raw "Vertex/Normal only" ApplySkin methods.

3
code/nel/src/3d/mesh_multi_lod.cpp
View file

@ -35,6 +35,9 @@ using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

4
code/nel/src/3d/mesh_multi_lod_instance.cpp
View file

@ -25,6 +25,10 @@
using namespace NLMISC;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/meshvp_per_pixel_light.cpp
View file

@ -29,6 +29,9 @@
#include <string>
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

3
code/nel/src/3d/meshvp_wind_tree.cpp
View file

@ -28,6 +28,9 @@
using namespace NLMISC;
using namespace std;
#ifdef DEBUG_NEW
#define new DEBUG_NEW
#endif
namespace NL3D
{

Some files were not shown because too many files have changed in this diff Show more