Changeset 223 in flair-src for trunk/lib/FlairCore

Timestamp:

Feb 27, 2018, 12:20:03 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

add delta time to io_data

Location:

trunk/lib/FlairCore/src

Files:

• io_data.cpp (modified) (2 diffs)
• io_data.h (modified) (1 diff)
• io_data_impl.cpp (modified) (1 diff)
• unexported/io_data_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/io_data.cpp

@@ -46 +46 @@
 void io_data::SetDataTime(Time time) {
   GetMutex();
+  if(pimpl_->time!=TIME_INFINITE) pimpl_->deltaTime = time-pimpl_->time;
+  pimpl_->time = time;
+  ReleaseMutex();
+}
+
+void io_data::SetDataTime(Time time,Time deltaTime) {
+  GetMutex();
+  pimpl_->deltaTime = deltaTime;
   pimpl_->time = time;
   ReleaseMutex();
@@ -56 +64 @@
   ReleaseMutex();
   return tmp;
+}
+
+Time io_data::DataDeltaTime(void) const {
+  Time tmp;
+  GetMutex();
+  tmp = pimpl_->deltaTime;
+  ReleaseMutex();
+  return tmp;
+}
+
+void io_data::GetDataTime(Time &time,Time &deltaTime) const{
+  GetMutex();
+  deltaTime=pimpl_->deltaTime ;
+  time=pimpl_->time ;
+  ReleaseMutex();
 }
 

trunk/lib/FlairCore/src/io_data.h

@@ -116 +116 @@
 
   /*!
-  * \brief Set data time
-  *
+  * \brief Set data time, also caluculates the delta time based on last call
+  *
+  * TIME_INFINITE represents an unitialized time
+  * 
   * \param time time
   */
   void SetDataTime(Time time);
+  
+  /*!
+  * \brief Set data time and  delta time (thus delta time is not based on last call)
+  *
+  * TIME_INFINITE represents an unitialized time
+  * 
+  * \param time time
+  * \param deltaTime delta time
+  */
+  void SetDataTime(Time time,Time deltaTime);
 
   /*!
   * \brief Data time
   *
+  * TIME_INFINITE represents an unitialized time.
+  * 
   * \return data time
   */
   Time DataTime(void) const;
+  
+  /*!
+  * \brief Data delta time
+  *
+  * TIME_INFINITE represents an unitialized time.
+  * 
+  * \return data delta time
+  */
+  Time DataDeltaTime(void) const;
+  
+  /*!
+  * \brief Get data time and  delta time
+  *
+  * TIME_INFINITE represents an unitialized time
+  * 
+  * \param time time
+  * \param deltaTime delta time
+  */
+  void GetDataTime(Time &time,Time &deltaTime) const;
 
   /*!

trunk/lib/FlairCore/src/io_data_impl.cpp

@@ -31 +31 @@
   is_consistent = false;
   circle_ptr = NULL;
+  deltaTime=TIME_INFINITE;//init
+  time=TIME_INFINITE;//init
 }
 

trunk/lib/FlairCore/src/unexported/io_data_impl.h

@@ -37 +37 @@
                             flair::core::DataType const &datatype);
   size_t size;
-  flair::core::Time time;
+  flair::core::Time time,deltaTime;
   void **circle_ptr;