RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more fixes after removing GraphicsLayer

This commit is contained in:
David Rose 2004-12-06 21:37:41 +00:00
parent 666dd76fed
commit 3f94604fc3
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/grutil/frameRateMeter.I
View File

@ -20,9 +20,8 @@
////////////////////////////////////////////////////////////////////
// Function: FrameRateMeter::get_window
// Access: Published
// Description: Returns the GraphicsOutput that the meter has created
// to render itself into the window or channel supplied
// to setup_window(), or NULL if setup_window() has not
// Description: Returns the GraphicsOutput that was passed to
// setup_window(), or NULL if setup_window() has not
// been called.
////////////////////////////////////////////////////////////////////
INLINE GraphicsOutput *FrameRateMeter::
@ -30,6 +29,18 @@ get_window() const {
return _window;
}
////////////////////////////////////////////////////////////////////
// Function: FrameRateMeter::get_display_region
// Access: Published
// Description: Returns the DisplayRegion that the meter has created
// to render itself into the window to setup_window(),
// or NULL if setup_window() has not been called.
////////////////////////////////////////////////////////////////////
INLINE DisplayRegion *FrameRateMeter::
get_display_region() const {
return _display_region;
}
////////////////////////////////////////////////////////////////////
// Function: FrameRateMeter::set_update_interval
// Access: Published

10
panda/src/grutil/frameRateMeter.cxx
View File

@ -44,7 +44,7 @@ FrameRateMeter(const string &name) : TextNode(name) {
set_align(A_right);
set_transform(LMatrix4f::scale_mat(frame_rate_meter_scale) *
LMatrix4f::translate_mat(1.0f - frame_rate_meter_side_margins * frame_rate_meter_scale, 0.0f, 1.0f - frame_rate_meter_scale));
LMatrix4f::translate_mat(LVector3f::rfu(1.0f - frame_rate_meter_side_margins * frame_rate_meter_scale, 0.0f, 1.0f - frame_rate_meter_scale)));
set_card_color(0.0f, 0.0f, 0.0f, 0.4f);
set_card_as_margin(frame_rate_meter_side_margins, frame_rate_meter_side_margins, 0.1f, 0.0f);
@ -86,6 +86,7 @@ setup_window(GraphicsOutput *window) {
// Create a display region that covers the entire window.
_display_region = _window->make_display_region();
_display_region->set_sort(frame_rate_meter_layer_sort);
// Finally, we need a camera to associate with the display region.
PT(Camera) camera = new Camera("frame_rate_camera");
@ -114,8 +115,11 @@ setup_window(GraphicsOutput *window) {
////////////////////////////////////////////////////////////////////
void FrameRateMeter::
clear_window() {
_window = (GraphicsOutput *)NULL;
_display_region = (DisplayRegion *)NULL;
if (_window != (GraphicsOutput *)NULL) {
_window->remove_display_region(_display_region);
_window = (GraphicsOutput *)NULL;
_display_region = (DisplayRegion *)NULL;
}
_root = NodePath();
}

1
panda/src/grutil/frameRateMeter.h
View File

@ -51,6 +51,7 @@ PUBLISHED:
void clear_window();
INLINE GraphicsOutput *get_window() const;
INLINE DisplayRegion *get_display_region() const;
INLINE void set_update_interval(double update_interval);
INLINE double get_update_interval() const;