Changeset 2171 for code/trunk/src/core

Timestamp:

Nov 10, 2008, 12:05:03 AM (16 years ago)

Author:

landauf

Message:

merged revisions 2111-2170 from objecthierarchy branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/BaseObject.cc (modified) (1 diff)
• src/core/BaseObject.h (modified) (4 diffs)
• src/core/ClassFactory.h (modified) (1 diff)
• src/core/ClassTreeMask.cc (modified) (1 diff)
• src/core/ClassTreeMask.h (modified) (1 diff)
• src/core/Clock.h (modified) (1 diff)
• src/core/ConfigValueContainer.cc (modified) (1 diff)
• src/core/ConfigValueContainer.h (modified) (1 diff)
• src/core/ConfigValueIncludes.h (modified) (1 diff)
• src/core/Core.cc (modified) (1 diff)
• src/core/Core.h (modified) (1 diff)
• src/core/CoreIncludes.h (modified) (1 diff)
• src/core/Factory.cc (modified) (1 diff)
• src/core/Factory.h (modified) (1 diff)
• src/core/Identifier.cc (modified) (1 diff)
• src/core/Identifier.h (modified) (1 diff)
• src/core/Iterator.h (modified) (1 diff)
• src/core/Language.cc (modified) (1 diff)
• src/core/Language.h (modified) (1 diff)
• src/core/Loader.cc (modified) (2 diffs)
• src/core/MetaObjectList.cc (modified) (1 diff)
• src/core/MetaObjectList.h (modified) (1 diff)
• src/core/ObjectList.h (modified) (1 diff)
• src/core/ObjectListBase.cc (modified) (1 diff)
• src/core/ObjectListBase.h (modified) (1 diff)
• src/core/OrxonoxClass.cc (modified) (1 diff)
• src/core/OrxonoxClass.h (modified) (1 diff)
• src/core/Super.h (modified) (1 diff)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 diff, 1 prop)
• src/core/XMLPort.h (modified) (3 diffs)

code/trunk/src/core/BaseObject.cc

@@ -41 +41 @@
 #include "Template.h"
 #include "util/String.h"
+#include "util/mbool.h"
 
 namespace orxonox

code/trunk/src/core/BaseObject.h

@@ -28 +28 @@
 
 /**
-    @file BaseObject.h
+    @file
     @brief Definition of the BaseObject class.
 
@@ -45 +45 @@
 #include "XMLIncludes.h"
 #include "Event.h"
+#include "util/mbool.h"
 
 namespace orxonox
@@ -72 +73 @@
 
             /** @brief Sets the state of the objects activity. @param bActive True = active */
-            inline void setActive(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
+            inline void setActive(bool bActive)
+            {
+                if (this->bActive_ != bActive)
+                {
+                    this->bActive_ = bActive;
+                    this->changedActivity();
+                }
+            }
             /** @brief Returns the state of the objects activity. @return The state of the activity */
-            inline bool isActive() const { return this->bActive_; }
+            inline const mbool& isActive() const { return this->bActive_; }
             /** @brief This function gets called if the activity of the object changes. */
             virtual void changedActivity() {}
 
             /** @brief Sets the state of the objects visibility. @param bVisible True = visible */
-            inline void setVisible(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
+            inline void setVisible(bool bVisible)
+            {
+                if (this->bVisible_ != bVisible)
+                {
+                    this->bVisible_ = bVisible;
+                    this->changedVisibility();
+                }
+            }
             /** @brief Returns the state of the objects visibility. @return The state of the visibility */
-            inline bool isVisible() const { return this->bVisible_; }
+            inline const mbool& isVisible() const { return this->bVisible_; }
             /** @brief This function gets called if the visibility of the object changes. */
             virtual void changedVisibility() {}
@@ -138 +153 @@
             std::string name_;                          //!< The name of the object
             std::string oldName_;                       //!< The old name of the object
-            bool bActive_;                              //!< True = the object is active
-            bool bVisible_;                             //!< True = the object is visible
+            mbool bActive_;                             //!< True = the object is active
+            mbool bVisible_;                            //!< True = the object is visible
 
         private:

code/trunk/src/core/ClassFactory.h

@@ -28 +28 @@
 
 /**
-    @file ClassFactory.h
+    @file
     @brief Definition and implementation of the ClassFactory class
 

code/trunk/src/core/ClassTreeMask.cc

@@ -28 +28 @@
 
 /**
-    @file ClassTreeMask.cc
+    @file
     @brief Implementation of the ClassTreeMask, ClassTreeMaskNode and ClassTreeMaskIterator classes.
 */

code/trunk/src/core/ClassTreeMask.h

@@ -28 +28 @@
 
 /**
-    @file ClassTreeMask.h
+    @file
     @brief Definition of the ClassTreeMask, ClassTreeMaskNode and ClassTreeMaskIterator classes.
 

code/trunk/src/core/Clock.h

@@ -28 +28 @@
 
 /**
-    @file Core.h
+    @file
     @brief Declaration of the Core class.
 

code/trunk/src/core/ConfigValueContainer.cc

@@ -28 +28 @@
 
 /**
-    @file ConfigValueContainer.cc
+    @file
     @brief Implementation of the ConfigValueContainer class.
 */

code/trunk/src/core/ConfigValueContainer.h

@@ -28 +28 @@
 
 /**
-    @file ConfigValueContainer.h
+    @file
     @brief Definition of the ConfigValueContainer class.
 

code/trunk/src/core/ConfigValueIncludes.h

@@ -28 +28 @@
 
 /**
-    @file ConfigValueIncludes.h
+    @file
     @brief Definition of macros for config-values.
 */

code/trunk/src/core/Core.cc

@@ -28 +28 @@
 
 /**
-    @file Core.cc
+    @file
     @brief Implementation of the Core class.
 */

code/trunk/src/core/Core.h

@@ -28 +28 @@
 
 /**
-    @file Core.h
+    @file
     @brief Declaration of the Core class.
 

code/trunk/src/core/CoreIncludes.h

@@ -28 +28 @@
 
 /**
-    @file CoreIncludes.h
+    @file
     @brief Definition of macros for Identifier and Factory.
 

code/trunk/src/core/Factory.cc

@@ -28 +28 @@
 
 /**
-    @file Factory.cc
+    @file
     @brief Implementation of the Factory class.
 */

code/trunk/src/core/Factory.h

@@ -28 +28 @@
 
 /**
-    @file Factory.h
+    @file
     @brief Definition of the Factory and the BaseFactory class.
 

code/trunk/src/core/Identifier.cc

@@ -28 +28 @@
 
 /**
-    @file Identifier.cc
+    @file
     @brief Implementation of the Identifier class.
 */

code/trunk/src/core/Identifier.h

@@ -28 +28 @@
 
 /**
-    @file Identifier.h
+    @file
     @brief Definition of the Identifier, ClassIdentifier and SubclassIdentifier classes, implementation of the ClassIdentifier and SubclassIdentifier classes.
 

code/trunk/src/core/Iterator.h

@@ -28 +28 @@
 
 /**
-    @file Iterator.h
+    @file
     @brief Definition and implementation of the Iterator class.
 

code/trunk/src/core/Language.cc

@@ -28 +28 @@
 
 /**
-    @file Language.cc
+    @file
     @brief Implementation of the Language and the LanguageEntry classes.
 */

code/trunk/src/core/Language.h

@@ -28 +28 @@
 
 /**
-    @file Language.h
+    @file
     @brief Definition of the Language and the LanguageEntry class.
 

code/trunk/src/core/Loader.cc

@@ -37 +37 @@
 #include "Namespace.h"
 #include "util/Debug.h"
+#include "util/Exception.h"
 
 #include "tinyxml/ticpp.h"
@@ -157 +158 @@
             return true;
         }
-        catch(ticpp::Exception& ex)
+        catch (ticpp::Exception& ex)
+        {
+            COUT(1) << std::endl;
+            COUT(1) << "An XML-error occurred in Loader.cc while loading " << file->getFilename() << ":" << std::endl;
+            COUT(1) << ex.what() << std::endl;
+            COUT(1) << "Loading aborted." << std::endl;
+            return false;
+        }
+        catch (Exception& ex)
+        {
+            COUT(1) << std::endl;
+            COUT(1) << "A loading-error occurred in Loader.cc while loading " << file->getFilename() << ":" << std::endl;
+            COUT(1) << ex.what() << std::endl;
+            COUT(1) << "Loading aborted." << std::endl;
+            return false;
+        }
+        catch (std::exception& ex)
         {
             COUT(1) << std::endl;
             COUT(1) << "An error occurred in Loader.cc while loading " << file->getFilename() << ":" << std::endl;
             COUT(1) << ex.what() << std::endl;
+            COUT(1) << "Loading aborted." << std::endl;
+            return false;
+        }
+        catch (...)
+        {
+            COUT(1) << std::endl;
+            COUT(1) << "An unknown error occurred in Loader.cc while loading " << file->getFilename() << ":" << std::endl;
             COUT(1) << "Loading aborted." << std::endl;
             return false;

code/trunk/src/core/MetaObjectList.cc

@@ -28 +28 @@
 
 /**
-    @file MetaObjectList.cc
+    @file
     @brief Implementation of the MetaObjectList class.
 */

code/trunk/src/core/MetaObjectList.h

@@ -28 +28 @@
 
 /**
-    @file MetaObjectList.h
+    @file
     @brief Definition of the MetaObjectList class.
 

code/trunk/src/core/ObjectList.h

@@ -28 +28 @@
 
 /**
-    @file ObjectList.h
+    @file
     @brief Definition and implementation of the ObjectList class.
 

code/trunk/src/core/ObjectListBase.cc

@@ -28 +28 @@
 
 /**
-    @file ObjectListBase.cc
+    @file
     @brief Implementation of the ObjectListBase class.
 

code/trunk/src/core/ObjectListBase.h

@@ -28 +28 @@
 
 /**
-    @file ObjectListBase.h
+    @file
     @brief Definition of the ObjectListBase class.
 

code/trunk/src/core/OrxonoxClass.cc

@@ -28 +28 @@
 
 /**
-    @file OrxonoxClass.cc
+    @file
     @brief Implementation of the OrxonoxClass Class.
 */

code/trunk/src/core/OrxonoxClass.h

@@ -28 +28 @@
 
 /**
-    @file OrxonoxClass.h
+    @file
     @brief Declaration of the OrxonoxClass Class.
 

code/trunk/src/core/Super.h

@@ -28 +28 @@
 
 /**
-    @file Super.h
+    @file
     @brief Definition of all super-function related macros.
 

code/trunk/src/core/XMLIncludes.h

@@ -28 +28 @@
 
 /**
-    @file XMLIncludes.h
+    @file
     @brief Forward declarations of some XML classes.
 */

code/trunk/src/core/XMLPort.h

@@ -28 +28 @@
 
 /**
-    @file XMLPort.h
+    @file
     @brief Declaration of the XMLPort helper classes and macros.
 
@@ -44 +44 @@
 
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "util/MultiType.h"
 #include "tinyxml/ticpp.h"
@@ -495 +496 @@
                                             if (this->identifierIsIncludedInLoaderMask(identifier))
                                             {
-                                                COUT(4) << ((BaseObject*)object)->getLoaderIndentation() << "fabricating " << child->Value() << "..." << std::endl;
-
-                                                BaseObject* newObject = identifier->fabricate((BaseObject*)object);
-                                                assert(newObject);
-                                                newObject->setLoaderIndentation(((BaseObject*)object)->getLoaderIndentation() + "  ");
-
-                                                O* castedObject = dynamic_cast<O*>(newObject);
-                                                assert(castedObject);
-
-                                                if (this->bLoadBefore_)
+                                                try
                                                 {
-                                                    newObject->XMLPort(*child, XMLPort::LoadObject);
-                                                    COUT(4) << ((BaseObject*)object)->getLoaderIndentation() << "assigning " << child->Value() << " (objectname " << newObject->getName() << ") to " << this->identifier_->getName() << " (objectname " << ((BaseObject*)object)->getName() << ")" << std::endl;
+                                                    COUT(4) << ((BaseObject*)object)->getLoaderIndentation() << "fabricating " << child->Value() << "..." << std::endl;
+
+                                                    BaseObject* newObject = identifier->fabricate((BaseObject*)object);
+                                                    assert(newObject);
+                                                    newObject->setLoaderIndentation(((BaseObject*)object)->getLoaderIndentation() + "  ");
+
+                                                    O* castedObject = dynamic_cast<O*>(newObject);
+                                                    assert(castedObject);
+
+                                                    if (this->bLoadBefore_)
+                                                    {
+                                                        newObject->XMLPort(*child, XMLPort::LoadObject);
+                                                        COUT(4) << ((BaseObject*)object)->getLoaderIndentation() << "assigning " << child->Value() << " (objectname " << newObject->getName() << ") to " << this->identifier_->getName() << " (objectname " << ((BaseObject*)object)->getName() << ")" << std::endl;
+                                                    }
+                                                    else
+                                                    {
+                                                        COUT(4) << ((BaseObject*)object)->getLoaderIndentation() << "assigning " << child->Value() << " (object not yet loaded) to " << this->identifier_->getName() << " (objectname " << ((BaseObject*)object)->getName() << ")" << std::endl;
+                                                    }
+
+                                                    COUT(5) << ((BaseObject*)object)->getLoaderIndentation();
+                                                    (*this->loadexecutor_)(object, castedObject);
+
+                                                    if (!this->bLoadBefore_)
+                                                        newObject->XMLPort(*child, XMLPort::LoadObject);
+
+                                                    COUT(5) << ((BaseObject*)object)->getLoaderIndentation() << "...fabricated " << child->Value() << " (objectname " << newObject->getName() << ")." << std::endl;
                                                 }
-                                                else
+                                                catch (AbortLoadingException& ex)
                                                 {
-                                                    COUT(4) << ((BaseObject*)object)->getLoaderIndentation() << "assigning " << child->Value() << " (object not yet loaded) to " << this->identifier_->getName() << " (objectname " << ((BaseObject*)object)->getName() << ")" << std::endl;
+                                                    COUT(1) << "An error occurred while loading object, abort loading..." << std::endl;
+                                                    throw ex;
                                                 }
-
-                                                COUT(5) << ((BaseObject*)object)->getLoaderIndentation();
-                                                (*this->loadexecutor_)(object, castedObject);
-
-                                                if (!this->bLoadBefore_)
-                                                    newObject->XMLPort(*child, XMLPort::LoadObject);
-
-                                                COUT(5) << ((BaseObject*)object)->getLoaderIndentation() << "...fabricated " << child->Value() << " (objectname " << newObject->getName() << ")." << std::endl;
+                                                catch (std::exception& ex)
+                                                {
+                                                    COUT(1) << "An error occurred while loading object:" << std::endl;
+                                                    COUT(1) << ex.what() << std::endl;
+                                                }
+                                                catch (...)
+                                                {
+                                                    COUT(1) << "An unknown error occurred while loading object." << std::endl;
+                                                }
                                             }
                                         }