Bump version to 2.11.0

Bounding box of drawables use other coordinate frame
then bounding sphere of MatrixTransform...

simgear/canvas/CanvasEventVisitor.cxx

@@ -73,7 +73,7 @@ namespace canvas
       // Don't check collision with root element (2nd element in _target_path)
       // do event listeners attached to the canvas itself (its root group)
       // always get called even if no element has been hit.
-      if( _target_path.size() > 2 && !el.hitBound(local_pos) )
+      if( _target_path.size() > 2 && !el.hitBound(pos, local_pos) )
         return false;
 
       const osg::Vec2f& delta = _target_path.back().local_delta;

simgear/canvas/elements/CanvasElement.cxx

@@ -88,14 +88,24 @@ namespace canvas
         {
           case TT_MATRIX:
             tf = osg::Matrix( tf_node->getDoubleValue("m[0]", 1),
-                              tf_node->getDoubleValue("m[1]", 0), 0, 0,
+                              tf_node->getDoubleValue("m[1]", 0),
+                              0,
+                              tf_node->getDoubleValue("m[6]", 0),
 
                               tf_node->getDoubleValue("m[2]", 0),
-                              tf_node->getDoubleValue("m[3]", 1), 0, 0,
+                              tf_node->getDoubleValue("m[3]", 1),
+                              0,
+                              tf_node->getDoubleValue("m[7]", 0),
+
+                              0,
+                              0,
+                              1,
+                              0,
 
-                              0,    0,    1, 0,
                               tf_node->getDoubleValue("m[4]", 0),
-                              tf_node->getDoubleValue("m[5]", 0), 0, 1 );
+                              tf_node->getDoubleValue("m[5]", 0),
+                              0,
+                              tf_node->getDoubleValue("m[8]", 1) );
             break;
           case TT_TRANSLATE:
             tf.makeTranslate( osg::Vec3f( tf_node->getDoubleValue("t[0]", 0),
@@ -182,19 +192,20 @@ namespace canvas
   }
 
   //----------------------------------------------------------------------------
-  bool Element::hitBound(const osg::Vec2f& pos) const
+  bool Element::hitBound( const osg::Vec2f& pos,
+                          const osg::Vec2f& local_pos ) const
   {
     const osg::Vec3f pos3(pos, 0);
 
     // Drawables have a bounding box...
     if( _drawable )
     {
-      if( !_drawable->getBound().contains(pos3) )
+      if( !_drawable->getBound().contains(osg::Vec3f(local_pos, 0)) )
         return false;
     }
     // ... for other elements, i.e. groups only a bounding sphere is available
-    else if( !_transform->getBound().contains(pos3) )
-      return false;
+    else if( !_transform->getBound().contains(osg::Vec3f(pos, 0)) )
+        return false;
 
     return true;
   }
@@ -394,7 +405,15 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::BoundingBox Element::getTransformedBounds(const osg::Matrix& m) const
   {
-    return osg::BoundingBox();
+    if( !_drawable )
+      return osg::BoundingBox();
+
+    osg::BoundingBox transformed;
+    const osg::BoundingBox& bb = _drawable->getBound();
+    for(int i = 0; i < 4; ++i)
+      transformed.expandBy( m * bb.corner(i) );
+
+    return transformed;
   }
 
   //----------------------------------------------------------------------------

simgear/canvas/elements/CanvasElement.hxx

@@ -79,7 +79,8 @@ namespace canvas
 
       void callListeners(const canvas::EventPtr& event);
 
-      virtual bool hitBound(const osg::Vec2f& pos) const;
+      virtual bool hitBound( const osg::Vec2f& pos,
+                             const osg::Vec2f& local_pos ) const;
 
 
       osg::ref_ptr<osg::MatrixTransform> getMatrixTransform();

simgear/hla/HLAFederate.cxx

@@ -787,7 +787,7 @@ HLAFederate::processMessages()
 bool
 HLAFederate::readRTI13ObjectModelTemplate(const std::string& objectModel)
 {
-    SG_LOG(SG_IO, SG_ALERT, "HLA version RTI13 not yet(!?) supported.");
+    SG_LOG(SG_IO, SG_WARN, "HLA version RTI13 not yet(!?) supported.");
     return false;
 }
 
@@ -816,7 +816,7 @@ HLAFederate::readRTI1516ObjectModelTemplate(const std::string& objectModel)
 bool
 HLAFederate::readRTI1516EObjectModelTemplate(const std::string& objectModel)
 {
-    SG_LOG(SG_IO, SG_ALERT, "HLA version RTI1516E not yet(!?) supported.");
+    SG_LOG(SG_IO, SG_WARN, "HLA version RTI1516E not yet(!?) supported.");
     return false;
 }
 

simgear/io/HTTPClient.cxx

@@ -88,13 +88,24 @@ public:
     virtual void handleError(int error)
     {
         if (error == ENOENT) {
-            // name lookup failure, abandon all requests on this connection
+        // name lookup failure
+            // we won't have an active request yet, so the logic below won't
+            // fire to actually call setFailure. Let's fail all of the requests
+            BOOST_FOREACH(Request_ptr req, sentRequests) {
+                req->setFailure(error, "hostname lookup failure");
+            }
+            
+            BOOST_FOREACH(Request_ptr req, queuedRequests) {
+                req->setFailure(error, "hostname lookup failure");
+            }
+            
+        // name lookup failure, abandon all requests on this connection
             sentRequests.clear();
             queuedRequests.clear();
         }
         
         NetChat::handleError(error);
-        if (activeRequest) {
+        if (activeRequest) {            
             SG_LOG(SG_IO, SG_INFO, "HTTP socket error");
             activeRequest->setFailure(error, "socket error");
             activeRequest = NULL;

simgear/math/SGVec2.hxx

@@ -18,10 +18,6 @@
 #ifndef SGVec2_H
 #define SGVec2_H
 
-#include "SGLimits.hxx"
-#include "SGMathFwd.hxx"
-#include "SGMisc.hxx"
-
 #include <iosfwd>
 
 /// 2D Vector Class

simgear/nasal/cppbind/Ghost.hxx

@@ -29,6 +29,7 @@
 #include <boost/call_traits.hpp>
 #include <boost/function.hpp>
 #include <boost/lambda/lambda.hpp>
+#include <boost/mpl/has_xxx.hpp>
 #include <boost/utility/enable_if.hpp>
 
 #include <map>
@@ -39,117 +40,6 @@
 namespace nasal
 {
 
-  /**
-   * Traits for C++ classes exposed as Ghost. This is the basic template for
-   * raw types.
-   */
-  template<class T>
-  struct GhostTypeTraits
-  {
-    /** Whether the class is passed by shared pointer or raw pointer */
-    typedef boost::false_type::type is_shared;
-
-    /** The raw class type (Without any shared pointer) */
-    typedef T raw_type;
-  };
-
-  template<class T>
-  struct GhostTypeTraits<boost::shared_ptr<T> >
-  {
-    typedef boost::true_type::type is_shared;
-    typedef T raw_type;
-  };
-
-#ifdef OSG_REF_PTR
-  template<class T>
-  struct GhostTypeTraits<osg::ref_ptr<T> >
-  {
-    typedef boost::true_type::type is_shared;
-    typedef T raw_type;
-  };
-#endif
-
-#ifdef SGSharedPtr_HXX
-  template<class T>
-  struct GhostTypeTraits<SGSharedPtr<T> >
-  {
-    typedef boost::true_type::type is_shared;
-    typedef T raw_type;
-  };
-#endif
-
-  /**
-   * Policy for creating ghost instances from shared pointer objects.
-   */
-  template<class T>
-  struct SharedPointerPolicy
-  {
-    typedef typename GhostTypeTraits<T>::raw_type   raw_type;
-    typedef T                                       pointer;
-    typedef boost::false_type                       returns_dynamic_type;
-
-    /**
-     * Create a shared pointer on the heap to handle the reference counting for
-     * the passed shared pointer while it is used in Nasal space.
-     */
-    static T* createInstance(const T& ptr)
-    {
-      return ptr ? new T(ptr) : 0;
-    }
-
-    static pointer getPtr(void* ptr)
-    {
-      if( ptr )
-        return *static_cast<T*>(ptr);
-      else
-        return pointer();
-    }
-
-    static raw_type* getRawPtr(void* ptr)
-    {
-      if( ptr )
-        return static_cast<T*>(ptr)->get();
-      else
-        return 0;
-    }
-
-    static raw_type* getRawPtr(const T& ptr)
-    {
-      return ptr.get();
-    }
-  };
-
-  /**
-   * Policy for creating ghost instances as raw objects on the heap.
-   */
-  template<class T>
-  struct RawPointerPolicy
-  {
-    typedef typename GhostTypeTraits<T>::raw_type   raw_type;
-    typedef raw_type*                               pointer;
-    typedef boost::true_type                        returns_dynamic_type;
-
-    /**
-     * Create a new object instance on the heap
-     */
-    static T* createInstance()
-    {
-      return new T();
-    }
-
-    static pointer getPtr(void* ptr)
-    {
-      BOOST_STATIC_ASSERT((boost::is_same<pointer, T*>::value));
-      return static_cast<T*>(ptr);
-    }
-
-    static raw_type* getRawPtr(void* ptr)
-    {
-      BOOST_STATIC_ASSERT((boost::is_same<raw_type, T>::value));
-      return static_cast<T*>(ptr);
-    }
-  };
-
   namespace internal
   {
     /**
@@ -217,6 +107,8 @@ namespace nasal
           return nasal::to_nasal(c, _parents);
         }
     };
+
+    BOOST_MPL_HAS_XXX_TRAIT_DEF(element_type)
   }
 
   /**
@@ -278,12 +170,14 @@ namespace nasal
    *
    *     naRef myMember(naContext c, int argc, naRef* args);
    * }
+   * typedef boost::shared_ptr<MyClass> MyClassPtr;
    *
    * void exposeClasses()
    * {
    *   // Register a nasal ghost type for MyClass. This needs to be done only
-   *   // once before creating the first ghost instance.
-   *   Ghost<MyClass>::init("MyClass")
+   *   // once before creating the first ghost instance. The exposed class needs
+   *   // to be wrapped inside a shared pointer, eg. boost::shared_ptr.
+   *   Ghost<MyClassPtr>::init("MyClass")
    *     // Members can be exposed by getters and setters
    *     .member("x", &MyClass::getX, &MyClass::setX)
    *     // For readonly variables only pass a getter
@@ -298,15 +192,13 @@ namespace nasal
    */
   template<class T>
   class Ghost:
-    public internal::GhostMetadata,
-    protected boost::mpl::if_< typename GhostTypeTraits<T>::is_shared,
-                               SharedPointerPolicy<T>,
-                               RawPointerPolicy<T> >::type
+    public internal::GhostMetadata
   {
+      BOOST_STATIC_ASSERT( internal::has_element_type<T>::value );
+
     public:
-      typedef T                                                   value_type;
-      typedef typename GhostTypeTraits<T>::raw_type               raw_type;
-      typedef typename Ghost::pointer                             pointer;
+      typedef typename T::element_type                            raw_type;
+      typedef T                                                   pointer;
       typedef naRef (raw_type::*member_func_t)(const CallContext&);
       typedef naRef (*free_func_t)(raw_type&, const CallContext&);
       typedef boost::function<naRef(naContext, raw_type&)>        getter_t;
@@ -361,22 +253,27 @@ namespace nasal
        * registers on its own before it can be used as base class.
        *
        * @tparam BaseGhost  Type of base class already wrapped into Ghost class
-       *                    (Ghost<Base>)
+       *                    (Ghost<BasePtr>)
        *
        * @code{cpp}
-       * Ghost<MyBase>::init("MyBase");
-       * Ghost<MyClass>::init("MyClass")
-       *   .bases<Ghost<MyBase> >();
+       * Ghost<MyBasePtr>::init("MyBase");
+       * Ghost<MyClassPtr>::init("MyClass")
+       *   .bases<Ghost<MyBasePtr> >();
        * @endcode
        */
       template<class BaseGhost>
-      typename boost::enable_if_c
-        <    boost::is_base_of<GhostMetadata, BaseGhost>::value
-          && boost::is_base_of<typename BaseGhost::raw_type, raw_type>::value,
+      typename boost::enable_if
+        <
+          boost::is_base_of<GhostMetadata, BaseGhost>,
           Ghost
         >::type&
       bases()
       {
+        BOOST_STATIC_ASSERT
+        ((
+          boost::is_base_of<typename BaseGhost::raw_type, raw_type>::value
+        ));
+
         BaseGhost* base = BaseGhost::getSingletonPtr();
         base->addDerived
         (
@@ -417,22 +314,27 @@ namespace nasal
        * Register a base class for this ghost. The base class needs to be
        * registers on its own before it can be used as base class.
        *
-       * @tparam Base   Type of base class (Base as used in Ghost<Base>)
+       * @tparam Base   Type of base class (Base as used in Ghost<BasePtr>)
        *
        * @code{cpp}
-       * Ghost<MyBase>::init("MyBase");
-       * Ghost<MyClass>::init("MyClass")
-       *   .bases<MyBase>();
+       * Ghost<MyBasePtr>::init("MyBase");
+       * Ghost<MyClassPtr>::init("MyClass")
+       *   .bases<MyBasePtr>();
        * @endcode
        */
       template<class Base>
-      typename boost::enable_if_c
-        <   !boost::is_base_of<GhostMetadata, Base>::value
-          && boost::is_base_of<typename Ghost<Base>::raw_type, raw_type>::value,
+      typename boost::disable_if
+        <
+          boost::is_base_of<GhostMetadata, Base>,
           Ghost
         >::type&
       bases()
       {
+        BOOST_STATIC_ASSERT
+        ((
+          boost::is_base_of<typename Ghost<Base>::raw_type, raw_type>::value
+        ));
+
         return bases< Ghost<Base> >();
       }
 
@@ -537,7 +439,7 @@ namespace nasal
        *     naRef myMethod(naContext c, int argc, naRef* args);
        * }
        *
-       * Ghost<MyClass>::init("Test")
+       * Ghost<MyClassPtr>::init("Test")
        *   .method<&MyClass::myMethod>("myMethod");
        * @endcode
        */
@@ -563,7 +465,7 @@ namespace nasal
        * class MyClass;
        * naRef myMethod(MyClass& obj, naContext c, int argc, naRef* args);
        *
-       * Ghost<MyClass>::init("Test")
+       * Ghost<MyClassPtr>::init("Test")
        *   .method_func<&myMethod>("myMethod");
        * @endcode
        */
@@ -580,10 +482,11 @@ namespace nasal
        *
        * @param c   Active Nasal context
        */
-      static naRef create( naContext c )
-      {
-        return makeGhost(c, Ghost::createInstance());
-      }
+      // TODO check if default constructor exists
+//      static naRef create( naContext c )
+//      {
+//        return makeGhost(c, createInstance());
+//      }
 
       /**
        * Create a Nasal instance of this ghost.
@@ -594,7 +497,7 @@ namespace nasal
       template<class A1>
       static naRef create( naContext c, const A1& a1 )
       {
-        return makeGhost(c, Ghost::createInstance(a1));
+        return makeGhost(c, createInstance(a1));
       }
 
       /**
@@ -627,7 +530,7 @@ namespace nasal
       {
         // Check if it's a ghost and if it can be converted
         if( isBaseOf( naGhost_type(me) ) )
-          return Ghost::getPtr( naGhost_ptr(me) );
+          return getPtr( naGhost_ptr(me) );
 
         // Now if it is derived from a ghost (hash with ghost in parent vector)
         else if( naIsHash(me) )
@@ -663,6 +566,36 @@ namespace nasal
       typedef std::vector<type_checker_t> DerivedList;
       DerivedList _derived_types;
 
+      /**
+       * Create a shared pointer on the heap to handle the reference counting
+       * for the passed shared pointer while it is used in Nasal space.
+       */
+      static pointer* createInstance(const pointer& ptr)
+      {
+        return ptr ? new pointer(ptr) : 0;
+      }
+
+      static pointer getPtr(void* ptr)
+      {
+        if( ptr )
+          return *static_cast<pointer*>(ptr);
+        else
+          return pointer();
+      }
+
+      static raw_type* getRawPtr(void* ptr)
+      {
+        if( ptr )
+          return static_cast<pointer*>(ptr)->get();
+        else
+          return 0;
+      }
+
+      static raw_type* getRawPtr(const pointer& ptr)
+      {
+        return ptr.get();
+      }
+
       void addDerived( const internal::GhostMetadata* derived_meta,
                        const type_checker_t& derived_info )
       {
@@ -724,7 +657,7 @@ namespace nasal
 
       static raw_type& requireObject(naContext c, naRef me)
       {
-        raw_type* obj = Ghost::getRawPtr( fromNasal(c, me) );
+        raw_type* obj = getRawPtr( fromNasal(c, me) );
         naGhostType* ghost_type = naGhost_type(me);
 
         if( !obj )
@@ -800,20 +733,13 @@ namespace nasal
 
       static naRef makeGhost(naContext c, void *ptr)
       {
-        if( Ghost::getRawPtr(ptr) )
+        if( getRawPtr(ptr) )
         {
-          naGhostType* ghost_type = 0;
-          if( Ghost::returns_dynamic_type::value )
-            // For pointer policies already returning instances of an object
-            // with the dynamic type of this Ghost's raw_type the type is always
-            // the same.
-            ghost_type = &getSingletonPtr()->_ghost_type;
-          else
-            // If wrapping eg. shared pointers the users passes an already
-            // existing instance of an object which will then be hold be a new
-            // shared pointer. We therefore have to check for the dynamic type
-            // of the object as it might differ from the passed static type.
-            ghost_type = getTypeFor<Ghost>( Ghost::getRawPtr(ptr) );
+          // We are wrapping shared pointers to already existing objects which
+          // will then be hold be a new shared pointer. We therefore have to
+          // check for the dynamic type of the object as it might differ from
+          // the passed static type.
+          naGhostType* ghost_type = getTypeFor<Ghost>( getRawPtr(ptr) );
 
           if( ghost_type )
             return naNewGhost2(c, ghost_type, ptr);
@@ -825,7 +751,7 @@ namespace nasal
 
       static void destroyGhost(void *ptr)
       {
-        delete static_cast<T*>(ptr);
+        delete static_cast<pointer*>(ptr);
       }
 
       /**
@@ -852,7 +778,7 @@ namespace nasal
         if( member->second.func )
           *out = nasal::to_nasal(c, member->second.func);
         else if( !member->second.getter.empty() )
-          *out = member->second.getter(c, *Ghost::getRawPtr(g));
+          *out = member->second.getter(c, *getRawPtr(g));
         else
           return "Read-protected member";
 
@@ -873,7 +799,7 @@ namespace nasal
         if( member->second.setter.empty() )
           naRuntimeError(c, "ghost: Write protected member: %s", key.c_str());
 
-        member->second.setter(c, *Ghost::getRawPtr(g), val);
+        member->second.setter(c, *getRawPtr(g), val);
       }
   };
 

simgear/nasal/cppbind/cppbind_test.cxx

@@ -1,4 +1,4 @@
-#include <simgear/math/SGVec2.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include "Ghost.hxx"
 #include "NasalHash.hxx"
@@ -111,31 +111,21 @@ int main(int argc, char* argv[])
   Hash mod = hash.createHash("mod");
   mod.set("parent", hash);
 
-  Ghost<Base>::init("Base")
+  Ghost<BasePtr>::init("BasePtr")
     .method<&Base::member>("member")
     .member("str", &Base::getString, &Base::setString);
-  Ghost<Derived>::init("Derived")
-    .bases<Base>()
-    .member("x", &Derived::getX, &Derived::setX)
-    .member("x_alternate", &f_derivedGetX)
-    .method_func<&member>("free_member");
-
-  naRef derived = Ghost<Derived>::create(c);
-  VERIFY( naIsGhost(derived) );
-  VERIFY( std::string("Derived") ==  naGhost_type(derived)->name );
-
-  Ghost<BasePtr>::init("BasePtr");
   Ghost<DerivedPtr>::init("DerivedPtr")
     .bases<BasePtr>()
     .member("x", &Derived::getX, &Derived::setX)
+    .member("x_alternate", &f_derivedGetX)
     .method_func<&member>("free_member");
   Ghost<DoubleDerivedPtr>::init("DoubleDerivedPtr")
     .bases<DerivedPtr>();
   Ghost<DoubleDerived2Ptr>::init("DoubleDerived2Ptr")
-    .bases<DerivedPtr>();
+    .bases< Ghost<DerivedPtr> >();
 
   BasePtr d( new Derived );
-  derived = Ghost<BasePtr>::create(c, d);
+  naRef derived = Ghost<BasePtr>::create(c, d);
   VERIFY( naIsGhost(derived) );
   VERIFY( std::string("DerivedPtr") == naGhost_type(derived)->name );
 

simgear/nasal/cppbind/from_nasal.cxx

@@ -19,6 +19,8 @@
 #include "from_nasal_detail.hxx"
 #include "NasalHash.hxx"
 
+#include <simgear/misc/sg_path.hxx>
+
 namespace nasal
 {
   //----------------------------------------------------------------------------
@@ -53,6 +55,12 @@ namespace nasal
     return std::string(naStr_data(na_str), naStr_len(na_str));
   }
 
+  SGPath from_nasal_helper(naContext c, naRef ref, SGPath*)
+  {
+      naRef na_str = naStringValue(c, ref);
+      return SGPath(std::string(naStr_data(na_str), naStr_len(na_str)));
+  }
+
   //----------------------------------------------------------------------------
   Hash from_nasal_helper(naContext c, naRef ref, Hash*)
   {

simgear/nasal/cppbind/from_nasal_detail.hxx

@@ -31,6 +31,8 @@
 #include <typeinfo> // std::bad_cast
 #include <vector>
 
+class SGPath;
+
 namespace nasal
 {
   class Hash;
@@ -75,6 +77,11 @@ namespace nasal
    */
   std::string from_nasal_helper(naContext c, naRef ref, std::string*);
 
+  /**
+   * Convert a Nasal string to an SGPath
+   */
+  SGPath from_nasal_helper(naContext c, naRef ref, SGPath*);
+
   /**
    * Convert a Nasal hash to a nasal::Hash
    */

simgear/nasal/cppbind/to_nasal.cxx

@@ -19,6 +19,8 @@
 #include "to_nasal.hxx"
 #include "NasalHash.hxx"
 
+#include <simgear/misc/sg_path.hxx>
+
 namespace nasal
 {
   //----------------------------------------------------------------------------
@@ -53,4 +55,9 @@ namespace nasal
     return ref;
   }
 
+  //----------------------------------------------------------------------------
+  naRef to_nasal(naContext c, const SGPath& path)
+  {
+    return to_nasal(c, path.str());
+  }
 } // namespace nasal

simgear/nasal/cppbind/to_nasal.hxx

@@ -30,6 +30,8 @@
 #include <string>
 #include <vector>
 
+class SGPath;
+
 namespace nasal
 {
   class Hash;
@@ -60,6 +62,8 @@ namespace nasal
    */
   naRef to_nasal(naContext c, naRef ref);
 
+  naRef to_nasal(naContext c, const SGPath& path);
+    
   /**
    * Convert a numeric type to Nasal number
    */

simgear/scene/tsync/terrasync.cxx

@@ -597,8 +597,15 @@ int SGTerraSync::SvnThread::svnClientSetup(void)
         return EXIT_FAILURE;
 #endif
 
-    apr_pool_t *pool;
-    apr_pool_create(&pool, NULL);
+    apr_pool_t *pool = NULL;
+    
+    apr_allocator_t* allocator = NULL;
+    int aprErr = apr_allocator_create(&allocator);
+    if (aprErr != APR_SUCCESS)
+        return EXIT_FAILURE;
+    
+    apr_pool_create_ex(&pool, NULL /* parent pool */, NULL /* abort func */, allocator);
+    
     svn_error_t *err = NULL;
     SVN_VERSION_DEFINE(_svn_version);
     err = svn_ver_check_list(&_svn_version, mysvn_checklist);

simgear/structure/SGSharedPtr.hxx

@@ -48,6 +48,8 @@ class SGWeakPtr;
 template<typename T>
 class SGSharedPtr {
 public:
+  typedef T element_type;
+
   SGSharedPtr(void) : _ptr(0)
   {}
   SGSharedPtr(T* ptr) : _ptr(ptr)

simgear/structure/subsystem_mgr.cxx

@@ -281,6 +281,16 @@ SGSubsystemGroup::resume ()
         _members[i]->subsystem->resume();
 }
 
+string_list
+SGSubsystemGroup::member_names() const
+{
+	string_list result;
+	for (unsigned int i = 0; i < _members.size(); i++)
+		result.push_back( _members[i]->name );
+	
+	return result;
+}
+
 bool
 SGSubsystemGroup::is_suspended () const
 {

simgear/structure/subsystem_mgr.hxx

@@ -32,7 +32,7 @@
 
 #include <simgear/timing/timestamp.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
-
+#include <simgear/misc/strutils.hxx>
 
 class TimingInfo
 {
@@ -321,6 +321,12 @@ public:
      *
      */
     void set_fixed_update_time(double fixed_dt);
+	 
+	/**
+	 * retrive list of member subsystem names
+	 */ 
+    string_list member_names() const;
+	 
 private:
 
     class Member;

simgear/timing/timestamp.cxx

@@ -255,6 +255,24 @@ bool SGTimeStamp::sleepFor(const SGTimeStamp& reltime)
     // Don't know, but may be win32 has something better today??
     Sleep(static_cast<DWORD>(reltime.toMSecs()));
     return true;
+#elif defined __APPLE__
+    // the generic version below behaves badly on Mac; use nanosleep directly,
+    // similar to the POSIX timers version
+    struct timespec ts;
+    ts.tv_sec = reltime._sec;
+    ts.tv_nsec = reltime._nsec;
+    
+    for (;;) {
+        struct timespec rem;
+        int ret = nanosleep(&ts, &rem);
+        if (-1 == ret && errno != EINTR)
+            return false;
+        if (ret == 0)
+            break;
+        // Use the remainder for the next cycle.
+        ts = rem;
+    }
+    return true;
 #else
     SGTimeStamp abstime;
     abstime.stamp();

version

@@ -1 +1 @@
-2.10.0
+2.11.0