hla: Provide access to the parent federate.

diff --git a/simgear/hla/HLAInteractionClass.cxx b/simgear/hla/HLAInteractionClass.cxx
index b56aec4437583da63ee7ac154b22da4832abedaa..e2674d3f75d00568d8b21f82dae310ff038c2e06 100644 (file)
--- a/simgear/hla/HLAInteractionClass.cxx
+++ b/simgear/hla/HLAInteractionClass.cxx
@@ -55,6 +55,12 @@ HLAInteractionClass::getName() const
     return _name;
 }
 
+const SGWeakPtr<HLAFederate>&
+HLAInteractionClass::getFederate() const
+{
+    return _federate;
+}
+
 HLASubscriptionType
 HLAInteractionClass::getSubscriptionType() const
 {

diff --git a/simgear/hla/HLAInteractionClass.hxx b/simgear/hla/HLAInteractionClass.hxx
index 4e1d15315b13108d95b1407299d0ff5ea7619b8c..34a25c7e95db506aba602b33f9eaab37c8b2f88f 100644 (file)
--- a/simgear/hla/HLAInteractionClass.hxx
+++ b/simgear/hla/HLAInteractionClass.hxx
@@ -41,6 +41,9 @@ public:
 
     const std::string& getName() const;
 
+    /// return the federate this interaction class belongs to
+    const SGWeakPtr<HLAFederate>& getFederate() const;
+
     HLASubscriptionType getSubscriptionType() const;
     void setSubscriptionType(HLASubscriptionType subscriptionType);
 

diff --git a/simgear/hla/HLAObjectClass.cxx b/simgear/hla/HLAObjectClass.cxx
index 9d4146d2d8907ba6484919319f721fbfddf3ac43..5bd86c0c3022c65a7d77da911533511558443b11 100644 (file)
--- a/simgear/hla/HLAObjectClass.cxx
+++ b/simgear/hla/HLAObjectClass.cxx
@@ -81,6 +81,12 @@ HLAObjectClass::getName() const
     return _name;
 }
 
+const SGWeakPtr<HLAFederate>&
+HLAObjectClass::getFederate() const
+{
+    return _federate;
+}
+
 unsigned
 HLAObjectClass::getNumAttributes() const
 {

diff --git a/simgear/hla/HLAObjectClass.hxx b/simgear/hla/HLAObjectClass.hxx
index ea054a48f9b71d65a21ebd774000eb8f92024e99..6a04f4a12f2ecb41b6ca5471316028e21de344a2 100644 (file)
--- a/simgear/hla/HLAObjectClass.hxx
+++ b/simgear/hla/HLAObjectClass.hxx
@@ -38,6 +38,9 @@ public:
     /// Return the name of this object class
     const std::string& getName() const;
 
+    /// return the federate this class belongs to
+    const SGWeakPtr<HLAFederate>& getFederate() const;
+
     /// Return the number of attributes in this object class
     unsigned getNumAttributes() const;
 

diff --git a/simgear/hla/HLAObjectInstance.cxx b/simgear/hla/HLAObjectInstance.cxx
index a163c5953dbb12331ea3069d5736f7e42927c9ce..56ccf78e556640f5d209108f5877e715ce2cd68d 100644 (file)
--- a/simgear/hla/HLAObjectInstance.cxx
+++ b/simgear/hla/HLAObjectInstance.cxx
@@ -51,6 +51,24 @@ HLAObjectInstance::~HLAObjectInstance()
     _clearRTIObjectInstance();
 }
 
+const std::string&
+HLAObjectInstance::getName() const
+{
+    return _name;
+}
+
+const SGWeakPtr<HLAFederate>&
+HLAObjectInstance::getFederate() const
+{
+    return _federate;
+}
+
+const SGSharedPtr<HLAObjectClass>&
+HLAObjectInstance::getObjectClass() const
+{
+    return _objectClass;
+}
+
 unsigned
 HLAObjectInstance::getNumAttributes() const
 {

diff --git a/simgear/hla/HLAObjectInstance.hxx b/simgear/hla/HLAObjectInstance.hxx
index 1262d6dee0c48bd35006afa5df5b65b61a6c1899..d0f47b083e84ee2d041c1fb60f5fd65c945cfc3b 100644 (file)
--- a/simgear/hla/HLAObjectInstance.hxx
+++ b/simgear/hla/HLAObjectInstance.hxx
@@ -39,13 +39,14 @@ public:
     virtual ~HLAObjectInstance();
 
     /// Return the name of this object instance
-    const std::string& getName() const
-    { return _name; }
+    const std::string& getName() const;
+
+    /// return the federate this instance belongs to
+    const SGWeakPtr<HLAFederate>& getFederate() const;
 
     /// Return the object class of this instance.
     /// Should always return a valid object class.
-    const SGSharedPtr<HLAObjectClass>& getObjectClass() const
-    { return _objectClass; }
+    const SGSharedPtr<HLAObjectClass>& getObjectClass() const;
 
     /// Return the number of attributes
     unsigned getNumAttributes() const;
@@ -55,7 +56,8 @@ public:
     /// Return the attribute name for the attribute with the given index
     std::string getAttributeName(unsigned index) const;
 
-    /// Return true if the attribute with the given index is owned by this federate
+    /// Return true if the attribute with the given index is owned by
+    /// this federate
     bool getAttributeOwned(unsigned index) const;
 
     /// Return the data type of the attribute with the given index
@@ -65,7 +67,8 @@ public:
     HLADataElement* getAttributeDataElement(unsigned index);
     const HLADataElement* getAttributeDataElement(unsigned index) const;
 
-    /// Write the raw attribute data value into data, works only of the object is backed up with an rti object instance
+    /// Write the raw attribute data value into data, works only of the object
+    /// is backed up with an rti object instance
     bool getAttributeData(unsigned index, RTIData& data) const;
 
     /// Sets the data element of the attribute with the given index to dataElement