Upgraded to latest COLLADA-DOM 1.2.0, see http://sourceforge.net/project/showfiles.php?group_id=157838
November 13, 2006 Re-applied the 'INF' fix for constraint limits.
This commit is contained in:
@@ -15,8 +15,6 @@
|
||||
#define __DAE_LIBXMLPLUGIN__
|
||||
|
||||
#include <vector>
|
||||
#include <libxml/xmlreader.h>
|
||||
#include <libxml/xmlwriter.h>
|
||||
#include <dae/daeElement.h>
|
||||
#include <dae/daeMetaAttribute.h>
|
||||
#include <dae/daeIOPlugin.h>
|
||||
@@ -26,6 +24,9 @@ class daeIntegrationObject;
|
||||
class daeMetaElement;
|
||||
class daeDocument;
|
||||
|
||||
struct _xmlTextReader;
|
||||
struct _xmlTextWriter;
|
||||
|
||||
/**
|
||||
* The @c daeLIBXMLPlugin class derives from @c daeIOPlugin and implements an XML
|
||||
* input/output backend using libxml2 as a parser. When using this plugin, daeInterface::load() expects
|
||||
@@ -41,34 +42,33 @@ public:
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
daeLIBXMLPlugin();
|
||||
DLLSPEC daeLIBXMLPlugin();
|
||||
/**
|
||||
* Destructor.
|
||||
*/
|
||||
virtual ~daeLIBXMLPlugin();
|
||||
virtual daeInt setMeta(daeMetaElement *topMeta);
|
||||
virtual DLLSPEC ~daeLIBXMLPlugin();
|
||||
virtual DLLSPEC daeInt setMeta(daeMetaElement *topMeta);
|
||||
|
||||
// Database setup
|
||||
virtual void setDatabase(daeDatabase* database);
|
||||
virtual DLLSPEC void setDatabase(daeDatabase* database);
|
||||
|
||||
// Operations
|
||||
virtual daeInt read(daeURI& uri, daeString docBuffer);
|
||||
virtual daeInt write(daeURI *name, daeDocument *document, daeBool replace);
|
||||
virtual DLLSPEC daeInt read(daeURI& uri, daeString docBuffer);
|
||||
virtual DLLSPEC daeInt write(daeURI *name, daeDocument *document, daeBool replace);
|
||||
|
||||
// Parsing support
|
||||
|
||||
daeElementRef startParse(daeMetaElement* thisMetaElement, xmlTextReaderPtr reader);
|
||||
daeElementRef nextElement(daeMetaElement* thisMetaElement, xmlTextReaderPtr reader);
|
||||
// Parsing support
|
||||
DLLSPEC daeElementRef startParse(daeMetaElement* thisMetaElement, _xmlTextReader *reader);
|
||||
DLLSPEC daeElementRef nextElement(daeMetaElement* thisMetaElement, _xmlTextReader *reader);
|
||||
|
||||
// Stats
|
||||
virtual void getProgress(daeInt* bytesParsed,
|
||||
virtual DLLSPEC void getProgress(daeInt* bytesParsed,
|
||||
daeInt* lineNumber,
|
||||
daeInt* totalBytes,
|
||||
daeBool reset = false );
|
||||
|
||||
private:
|
||||
// xmlTextReaderPtr reader;
|
||||
xmlTextWriterPtr writer;
|
||||
_xmlTextWriter *writer;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@@ -85,8 +85,8 @@ private:
|
||||
void writeElement( daeElement* element );
|
||||
void writeAttribute( daeMetaAttribute* attr, daeElement* element, daeInt attrNum = -1 );
|
||||
|
||||
void readAttributes( daeElement *element, xmlTextReaderPtr reader );
|
||||
void readValue( daeElement *element, xmlTextReaderPtr reader );
|
||||
void readAttributes( daeElement *element, _xmlTextReader *reader );
|
||||
void readValue( daeElement *element, _xmlTextReader *reader );
|
||||
};
|
||||
|
||||
#endif //__DAE_XMLPLUGIN__
|
||||
|
||||
@@ -30,22 +30,22 @@ public:
|
||||
* @param database The @c daeDatabase used.
|
||||
* @param plugin The @c daeIOPlugin used.
|
||||
*/
|
||||
daeLIBXMLResolver(daeDatabase* database, daeIOPlugin* plugin);
|
||||
DLLSPEC daeLIBXMLResolver(daeDatabase* database, daeIOPlugin* plugin);
|
||||
/**
|
||||
* Destructor.
|
||||
*/
|
||||
~daeLIBXMLResolver();
|
||||
DLLSPEC ~daeLIBXMLResolver();
|
||||
|
||||
protected:
|
||||
daeDatabase* _database;
|
||||
daeIOPlugin* _plugin;
|
||||
public:
|
||||
|
||||
public: // Abstract Interface
|
||||
virtual daeBool resolveElement(daeURI& uri, daeString typeNameHint = NULL);
|
||||
virtual daeBool resolveURI(daeURI& uri);
|
||||
virtual daeString getName();
|
||||
virtual daeBool isProtocolSupported(daeString protocol);
|
||||
virtual daeBool isExtensionSupported(daeString extension);
|
||||
virtual DLLSPEC daeBool resolveElement(daeURI& uri, daeString typeNameHint = NULL);
|
||||
virtual DLLSPEC daeBool resolveURI(daeURI& uri);
|
||||
virtual DLLSPEC daeString getName();
|
||||
virtual DLLSPEC daeBool isProtocolSupported(daeString protocol);
|
||||
virtual DLLSPEC daeBool isExtensionSupported(daeString extension);
|
||||
};
|
||||
|
||||
#endif //__DAE_XMLRESOLVER__
|
||||
|
||||
@@ -35,97 +35,59 @@ public:
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
daeSTLDatabase();
|
||||
DLLSPEC daeSTLDatabase();
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
virtual ~daeSTLDatabase();
|
||||
virtual DLLSPEC ~daeSTLDatabase();
|
||||
|
||||
public:
|
||||
// Element Types of all Elements
|
||||
virtual daeUInt getTypeCount();
|
||||
virtual daeString getTypeName(daeUInt index);
|
||||
virtual daeInt setMeta(daeMetaElement *_topMeta);
|
||||
virtual DLLSPEC daeUInt getTypeCount();
|
||||
virtual DLLSPEC daeString getTypeName(daeUInt index);
|
||||
virtual DLLSPEC daeInt setMeta(daeMetaElement *_topMeta);
|
||||
|
||||
// Documents
|
||||
virtual daeInt insertDocument(const char *name, daeElement* dom, daeDocument** document = NULL);
|
||||
virtual daeInt insertDocument(daeString name, daeDocument** document = NULL);
|
||||
virtual daeInt createDocument(daeString name, daeElement* dom, daeDocument** document = NULL);
|
||||
virtual daeInt createDocument(daeString name, daeDocument** document = NULL);
|
||||
virtual daeInt insertDocument( daeDocument *c );
|
||||
virtual DLLSPEC daeInt insertDocument(const char *name, daeElement* dom, daeDocument** document = NULL);
|
||||
virtual DLLSPEC daeInt insertDocument(daeString name, daeDocument** document = NULL);
|
||||
virtual DLLSPEC daeInt createDocument(daeString name, daeElement* dom, daeDocument** document = NULL);
|
||||
virtual DLLSPEC daeInt createDocument(daeString name, daeDocument** document = NULL);
|
||||
virtual DLLSPEC daeInt insertDocument( daeDocument *c );
|
||||
|
||||
virtual daeInt removeDocument(daeDocument* document);
|
||||
virtual daeUInt getDocumentCount();
|
||||
virtual daeDocument* getDocument(daeUInt index);
|
||||
virtual daeDocument* getDocument(daeString name);
|
||||
virtual daeString getDocumentName(daeUInt index);
|
||||
virtual daeBool isDocumentLoaded(daeString name);
|
||||
virtual DLLSPEC daeInt removeDocument(daeDocument* document);
|
||||
virtual DLLSPEC daeUInt getDocumentCount();
|
||||
virtual DLLSPEC daeDocument* getDocument(daeUInt index);
|
||||
virtual DLLSPEC daeDocument* getDocument(daeString name);
|
||||
virtual DLLSPEC daeString getDocumentName(daeUInt index);
|
||||
virtual DLLSPEC daeBool isDocumentLoaded(daeString name);
|
||||
|
||||
// Elements
|
||||
virtual daeInt insertElement(daeDocument* document, daeElement* element);
|
||||
virtual daeInt removeElement(daeDocument* document, daeElement* element);
|
||||
virtual daeInt clear();
|
||||
virtual void validate();
|
||||
virtual daeUInt getElementCount(daeString name = NULL,
|
||||
daeString type = NULL,
|
||||
daeString file = NULL);
|
||||
virtual daeInt getElement(daeElement** pElement,
|
||||
daeInt index,
|
||||
daeString name = NULL,
|
||||
daeString type = NULL,
|
||||
daeString file = NULL);
|
||||
virtual DLLSPEC daeInt insertElement(daeDocument* document, daeElement* element);
|
||||
virtual DLLSPEC daeInt removeElement(daeDocument* document, daeElement* element);
|
||||
virtual DLLSPEC daeInt clear();
|
||||
virtual DLLSPEC void validate();
|
||||
virtual DLLSPEC daeUInt getElementCount(daeString name = NULL,
|
||||
daeString type = NULL,
|
||||
daeString file = NULL);
|
||||
virtual DLLSPEC daeInt getElement(daeElement** pElement,
|
||||
daeInt index,
|
||||
daeString name = NULL,
|
||||
daeString type = NULL,
|
||||
daeString file = NULL);
|
||||
|
||||
// Generic Query
|
||||
virtual daeInt queryElement(daeElement** pElement, daeString genericQuery);
|
||||
virtual DLLSPEC daeInt queryElement(daeElement** pElement, daeString genericQuery);
|
||||
|
||||
private:
|
||||
|
||||
/**
|
||||
* A struct to describe a cell in the STL run-time database.
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
daeElement* element;
|
||||
daeString name;
|
||||
daeString type;
|
||||
daeDocument *document;
|
||||
} DAE_STL_DATABASE_CELL;
|
||||
|
||||
/**
|
||||
* Sorting structure.
|
||||
*/
|
||||
struct daeSTLDatabaseLess: public std::binary_function<DAE_STL_DATABASE_CELL,DAE_STL_DATABASE_CELL,bool>
|
||||
{
|
||||
bool operator() (const DAE_STL_DATABASE_CELL& x, const DAE_STL_DATABASE_CELL& y) const
|
||||
{
|
||||
int res = strcmp(x.type,y.type);
|
||||
if (res != 0)
|
||||
return res<0;
|
||||
else
|
||||
return strcmp(x.name,y.name)<0;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Sorting structure.
|
||||
*/
|
||||
struct daeSTLDatabaseTypeLess: public std::binary_function<DAE_STL_DATABASE_CELL,DAE_STL_DATABASE_CELL,bool>
|
||||
{
|
||||
bool operator() (const DAE_STL_DATABASE_CELL& x, const DAE_STL_DATABASE_CELL& y) const
|
||||
{
|
||||
int res = strcmp(x.type,y.type);
|
||||
return res<0;
|
||||
}
|
||||
};
|
||||
std::map< std::string, std::vector< daeElement* > > elements; //map for all elements keyed on Type
|
||||
std::multimap< std::string, daeElement* > elementsIDMap; //map for elements keyed on ID
|
||||
|
||||
std::vector<DAE_STL_DATABASE_CELL> elements;
|
||||
std::multimap< std::string, DAE_STL_DATABASE_CELL> elementsIDMap;
|
||||
std::vector<daeDocument*> documents;
|
||||
daeMetaElement* topMeta;
|
||||
|
||||
daeInt insertChildren( daeDocument *c, daeElement *element );
|
||||
daeInt removeChildren( daeDocument *c, daeElement *element );
|
||||
|
||||
};
|
||||
|
||||
#endif // __DAE_STLDATABASE__
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
* The @c stdErrPlugin class is the default implementation of daeErrorHandler. It routes the Error
|
||||
* and Warning messaged to stdout.
|
||||
*/
|
||||
class stdErrPlugin : public daeErrorHandler {
|
||||
class DLLSPEC stdErrPlugin : public daeErrorHandler {
|
||||
public:
|
||||
stdErrPlugin();
|
||||
virtual ~stdErrPlugin();
|
||||
|
||||
Reference in New Issue
Block a user