Changeset 381 for ps

Timestamp:

06/03/04 15:20:36 (21 years ago)

Author:

Simon Brenner

Message:

Use the VFS Wrapper instead of Xerces' local file input. Use XMLCh/CStr
conversion functions from XML.h/XMLUtils.cpp

File:

• ps/trunk/source/graphics/ObjectEntry.cpp (modified) (14 diffs)

ps/trunk/source/graphics/ObjectEntry.cpp

@@ -6 +6 @@
 #include "UnitManager.h"
 
-// xerces XML stuff
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <xercesc/framework/LocalFileInputSource.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-
-// Gee's custom error handler
-#include "ps/XercesErrorHandler.h"
+#include "XML.h"
 
 #ifdef _MSC_VER
@@ -59 +51 @@
 
     // build filename
-    CStr modelfilename("mods\\official\\");
+    CStr modelfilename("mods/official/");
     modelfilename+=m_ModelName; 
     
@@ -68 +60 @@
         modeldef=CModelDef::Load((const char*) modelfilename);
     } catch (...) {
+        LOG(ERROR, "CObjectEntry::BuildModel(): Model %s failed to load\n", modelfilename.c_str());
         return false;
     }
@@ -84 +77 @@
         if( m_Animations[t].m_FileName.Length() > 0 )
         {
-            CStr animfilename( "mods\\official\\" );
+            CStr animfilename( "mods/official/" );
             animfilename += m_Animations[t].m_FileName;
             m_Animations[t].m_AnimData = m_Model->BuildAnimation((const char*) animfilename,m_Animations[t].m_Speed);
@@ -153 +146 @@
 }
 
-CStr Transcode(const XMLCh* xmltext)
-{
-    char* str=XMLString::transcode(xmltext);
-    CStr result(str);
-    XMLString::release(&str);
-    return result;
-}
-
 bool CObjectEntry::Load(const char* filename)
 {
@@ -187 +172 @@
         CXercesErrorHandler *errorHandler = new CXercesErrorHandler();
         parser->setErrorHandler(errorHandler);
+        
+        CVFSEntityResolver *entityResolver = new CVFSEntityResolver(filename);
+        parser->setEntityResolver(entityResolver);
 
         // Push the CLogger to mark it's reading this file.
 
         // Get main node
-        XMLCh* xfilename=XMLString::transcode(filename);
-        LocalFileInputSource source(xfilename);
-        XMLString::release(&xfilename);
-
-        // Parse file
-        parser->parse(source);
-
-        // Check how many errors
-        parseOK = parser->getErrorCount() == 0;
-
+        CVFSInputSource source;
+        parseOK = source.OpenFile(filename) == 0;
+        if (parseOK)
+        {
+            // Parse file
+            parser->parse(source);
+
+            // Check how many errors
+            parseOK = parser->getErrorCount() == 0;
+        }
         if (parseOK) {
             // parsed successfully - grab our data
@@ -207 +195 @@
 
             // root_name should be Object
-            CStr root_name = Transcode( element->getNodeName() );
+            CStr root_name = XMLTranscode( element->getNodeName() );
 
             // should have at least 3 children - Name, ModelName and TextureName
@@ -222 +210 @@
                     DOMElement *child_element = (DOMElement*)child;
 
-                    CStr element_name = Transcode( child_element->getNodeName() );
+                    CStr element_name = XMLTranscode( child_element->getNodeName() );
                     DOMNode *value_node= child_element->getChildNodes()->item(0);
-                    CStr element_value=value_node ? Transcode(value_node->getNodeValue()) : "";
+                    CStr element_value=value_node ? XMLTranscode(value_node->getNodeValue()) : "";
 
                     if (element_name==CStr("Name")) {
@@ -237 +225 @@
                         for (uint j=0; j<animations->getLength(); ++j) {
                             DOMElement *anim_element = (DOMElement*) animations->item(j);
-                            CStr element_name = Transcode( anim_element->getNodeName() );
+                            CStr element_name = XMLTranscode( anim_element->getNodeName() );
                             DOMNamedNodeMap* attributes=anim_element->getAttributes();
                             if (attributes) {
@@ -243 +231 @@
 
                                 DOMNode *nameattr=attributes->getNamedItem(nametext);
-                                anim.m_AnimName=Transcode(nameattr->getChildNodes()->item(0)->getNodeValue());
+                                anim.m_AnimName=XMLTranscode(nameattr->getChildNodes()->item(0)->getNodeValue());
                                 DOMNode *fileattr=attributes->getNamedItem(filetext);
-                                anim.m_FileName=Transcode(fileattr->getChildNodes()->item(0)->getNodeValue());
+                                anim.m_FileName=XMLTranscode(fileattr->getChildNodes()->item(0)->getNodeValue());
                                 
                                 DOMNode *speedattr=attributes->getNamedItem(speedtext);
-                                CStr speedstr=Transcode(speedattr->getChildNodes()->item(0)->getNodeValue());           
+                                CStr speedstr=XMLTranscode(speedattr->getChildNodes()->item(0)->getNodeValue());            
 
                                 anim.m_Speed=float(atoi((const char*) speedstr))/100.0f;
@@ -261 +249 @@
                         for (uint j=0; j<props->getLength(); ++j) {
                             DOMElement *prop_element = (DOMElement*) props->item(j);
-                            CStr element_name = Transcode( prop_element->getNodeName() );
+                            CStr element_name = XMLTranscode( prop_element->getNodeName() );
                             DOMNamedNodeMap* attributes=prop_element->getAttributes();
                             if (attributes) {
@@ -267 +255 @@
 
                                 DOMNode *nameattr=attributes->getNamedItem(attachpointtext);
-                                prop.m_PropPointName=Transcode(nameattr->getChildNodes()->item(0)->getNodeValue());
+                                prop.m_PropPointName=XMLTranscode(nameattr->getChildNodes()->item(0)->getNodeValue());
                                 DOMNode *modelattr=attributes->getNamedItem(modeltext);
                                 prop.m_ModelName=XMLString::transcode(modelattr->getChildNodes()->item(0)->getNodeValue());
@@ -287 +275 @@
         delete parser;
         delete errorHandler;
+        delete entityResolver;
     }
     XMLPlatformUtils::Terminate();
@@ -300 +289 @@
     // write XML header
     fprintf(fp,"<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"no\"?>\n\n");
-    fprintf(fp,"<!DOCTYPE Object SYSTEM \"..\\object.dtd\">\n\n");
+    fprintf(fp,"<!DOCTYPE Object SYSTEM \"../object.dtd\">\n\n");
 
     // write the object itself