sirrf-svn-update Mailing List for Sirrf - Simple Irrlicht Framework

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 169
          http://sirrf.svn.sourceforge.net/sirrf/?rev=169&view=rev
Author:   zccdark203
Date:     2009-12-22 21:02:34 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
Added the createComponent class, which is a basic component factory, to simplify component deserialization through the Entity class.

Modified Paths:
--------------
    trunk/src/components/components.cpp
    trunk/src/components/components.h
    trunk/src/core/Entity.cpp

Modified: trunk/src/components/components.cpp
===================================================================

--- trunk/src/components/components.cpp	2009-12-22 20:26:16 UTC (rev 168)
+++ trunk/src/components/components.cpp	2009-12-22 21:02:34 UTC (rev 169)
@@ -16,47 +16,29 @@
 // Include files
 #include "components.h"
 
-
-// Parses the given XML file for components.
-void parseComponentsXML(IXMLReader *file, Entity *entity)
+// Creates a component of the given type.
+EntityComponent* createComponent(const std::string &type, Entity *parent)
 {
-    // Did we get a valid pointer?
-    if(!file)
-      return;
+    // scene
+         if(type == "AnimatedMeshComponent")    return new AnimatedMeshComponent(parent);
+    else if(type == "BillboardComponent")       return new BillboardComponent(parent);
+    else if(type == "CameraComponent")          return new CameraComponent(parent);
+    else if(type == "ImageComponent")           return new ImageComponent(parent);
+    else if(type == "LightComponent")           return new LightComponent(parent);
+    else if(type == "MeshComponent")            return new MeshComponent(parent);
+    else if(type == "OctTreeComponent")         return new OctTreeComponent(parent);
+    else if(type == "ParticleSysComponent")     return new ParticleSysComponent(parent);
+    else if(type == "SkyBoxComponent")          return new SkyBoxComponent(parent);
+    else if(type == "SkyDomeComponent")         return new SkyDomeComponent(parent);
+    else if(type == "TerrainComponent")         return new TerrainComponent(parent);
+    else if(type == "TextBillboardComponent")   return new TextBillboardComponent(parent);
 
-    // Create a list of available parse functions.
-    std::vector<bool (*)(IXMLReader*, Entity*)> parsers;
+    // sound
+    else if(type == "SoundListenerComponent")   return new SoundListenerComponent(parent);
+    else if(type == "SoundSourceComponent")     return new SoundSourceComponent(parent);
 
-    parsers.push_back(AnimatedMeshComponent::parseXML);
-    parsers.push_back(ParticleSysComponent::parseXML);
-
-    // Read from the file.
-    while(file->read())
-    {
-       switch(file->getNodeType())
-       {
-          case io::EXN_ELEMENT_END:
-
-             // </components>
-             if(stringw("components") == file->getNodeName())
-               return;
-
-             break;
-
-         default:
-
-            // Parse for components.
-            std::vector<bool (*)(IXMLReader*, Entity*)>::iterator it;
-
-            for(it = parsers.begin(); it != parsers.end(); it++)
-            {
-                if( (*it)(file, entity) )
-                  break;
-            }
-
-            break;
-        }
-    }
+    // We couldn't find the requested component.
+    return NULL;
 }
 
 // End of File

Modified: trunk/src/components/components.h
===================================================================
--- trunk/src/components/components.h	2009-12-22 20:26:16 UTC (rev 168)
+++ trunk/src/components/components.h	2009-12-22 21:02:34 UTC (rev 169)
@@ -38,8 +38,8 @@
 
 
 // Functions
-//! Parses the given XML file for components.
-extern void parseComponentsXML(IXMLReader *file, Entity *entity);
+//! Creates a component with of the given type.
+extern EntityComponent* createComponent(const std::string &type, Entity *parent);
 
 #endif
 

Modified: trunk/src/core/Entity.cpp
===================================================================
--- trunk/src/core/Entity.cpp	2009-12-22 20:26:16 UTC (rev 168)
+++ trunk/src/core/Entity.cpp	2009-12-22 21:02:34 UTC (rev 169)
@@ -575,12 +575,12 @@
           // Process all attributes in the components collection.
           for(SerializedAttribute *innerAttribute = components->pullAttribute(); innerAttribute != NULL; innerAttribute = components->pullAttribute())
           {
-             // Top attribute.
-             if(innerAttribute->getName() == "BillboardComponent")
+             // Try to create a component of the given type.
+             EntityComponent *component = createComponent(innerAttribute->getName(), this);
+
+             // Did we succesfully create a component?
+             if(component != NULL)
              {
-                // Create the component.
-                BillboardComponent *component = new BillboardComponent(this);
-
                 // Rewrap attribute so that it can be deserialized properly.
                 SerializedAttributes *wrappedComponent = new SerializedAttributes();
                 wrappedComponent->pushAttribute(innerAttribute);
@@ -590,8 +590,10 @@
 
                 // Clean up.
                 wrappedComponent->drop();
-                component->drop();
              }
+
+             // Clean up.
+             component->drop();
           }
        }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




sirrf-svn-update Mailing List for Sirrf - Simple Irrlicht Framework

sirrf-svn-update — Stay up-to-date with the latest SVN updates