From 4b58cb850055e995aea62f1af56ece98f2f2f45f Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 7 Sep 2005 00:05:24 +0000
Subject: [PATCH] fix initialization bug; add minor interfaces

---
 panda/src/grutil/frameRateMeter.I   | 14 ++++++++++++++
 panda/src/grutil/frameRateMeter.cxx |  1 +
 panda/src/grutil/frameRateMeter.h   |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/panda/src/grutil/frameRateMeter.I b/panda/src/grutil/frameRateMeter.I
index 87385fc059..7ca54fa81e 100644
--- a/panda/src/grutil/frameRateMeter.I
+++ b/panda/src/grutil/frameRateMeter.I
@@ -101,6 +101,7 @@ get_text_pattern() const {
 INLINE void FrameRateMeter::
 set_clock_object(ClockObject *clock_object) {
   _clock_object = clock_object;
+  _last_update = 0.0f;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -113,3 +114,16 @@ INLINE ClockObject *FrameRateMeter::
 get_clock_object() const {
   return _clock_object;
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: FrameRateMeter::update
+//       Access: Published
+//  Description: You can call this to explicitly force the
+//               FrameRateMeter to update itself with the latest frame
+//               rate information.  Normally, it is not necessary to
+//               call this explicitly.
+////////////////////////////////////////////////////////////////////
+INLINE void FrameRateMeter::
+update() {
+  do_update();
+}
diff --git a/panda/src/grutil/frameRateMeter.cxx b/panda/src/grutil/frameRateMeter.cxx
index 0ce2b47780..4b3df47a03 100644
--- a/panda/src/grutil/frameRateMeter.cxx
+++ b/panda/src/grutil/frameRateMeter.cxx
@@ -39,6 +39,7 @@ TypeHandle FrameRateMeter::_type_handle;
 FrameRateMeter::
 FrameRateMeter(const string &name) : TextNode(name) {
   _update_interval = frame_rate_meter_update_interval;
+  _last_update = 0.0f;
   _text_pattern = frame_rate_meter_text_pattern;
   _clock_object = ClockObject::get_global_clock();
 
diff --git a/panda/src/grutil/frameRateMeter.h b/panda/src/grutil/frameRateMeter.h
index acae637e46..fc83ed152b 100644
--- a/panda/src/grutil/frameRateMeter.h
+++ b/panda/src/grutil/frameRateMeter.h
@@ -62,6 +62,8 @@ PUBLISHED:
   INLINE void set_clock_object(ClockObject *clock_object);
   INLINE ClockObject *get_clock_object() const;
 
+  INLINE void update();
+
 protected:
   virtual bool cull_callback(CullTraverser *trav, CullTraverserData &data);