TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

reorder methods for consistency with panda conventions

Browse Source
This commit is contained in:
David Rose 2004-02-06 06:30:32 +00:00
parent 5815bcef16
commit a16557c9bb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/display/graphicsPipe.I
View File

@ -55,7 +55,7 @@ supports_fullscreen() const {
////////////////////////////////////////////////////////////////////
// Function: GraphicsPipe::get_display_width
// Access: Public
// Access: Published
// Description: Returns the width of the entire display, if it is
// known. This may return 0. This is not a guarantee
// that windows (particularly fullscreen windows) may
@ -69,7 +69,7 @@ get_display_width() const {
////////////////////////////////////////////////////////////////////
// Function: GraphicsPipe::get_display_height
// Access: Public
// Access: Published
// Description: Returns the height of the entire display, if it is
// known. This may return 0. See the caveats for
// get_display_width().

6
panda/src/display/graphicsPipe.cxx
View File

@ -104,14 +104,14 @@ get_hw_channel(GraphicsWindow *, int) {
////////////////////////////////////////////////////////////////////
// Function: GraphicsPipe::make_device
// Access: Protected, Virtual
// Access: Public, Virtual
// Description: Creates a new device for the pipe. Only DirectX uses
// this device, for other api's it is NULL.
////////////////////////////////////////////////////////////////////
PT(GraphicsDevice) GraphicsPipe::
make_device(void *scrn) {
// shouldnt this method really be pure virtual? it's an error for a pipe to not implement it
display_cat.error() << "Error: make_device() unimplemented by graphicsPipe!\n";
display_cat.error()
<< "Error: make_device() unimplemented by graphicsPipe!\n";
return NULL;
}

6
panda/src/display/graphicsPipe.h
View File

@ -76,6 +76,9 @@ public:
virtual int get_num_hw_channels();
virtual HardwareChannel *get_hw_channel(GraphicsWindow *window, int index);
INLINE GraphicsDevice *get_device() const;
virtual PT(GraphicsDevice) make_device(void *scrn = NULL);
protected:
// The make_window() and make_gsg() interfaces on GraphicsPipe are
// protected; don't try to call them directly. Instead, use
@ -94,8 +97,6 @@ protected:
public:
virtual PT(GraphicsDevice) make_device(void *scrn = NULL);
static TypeHandle get_class_type() {
return _type_handle;
}
@ -108,7 +109,6 @@ public:
return get_class_type();
}
virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
INLINE GraphicsDevice *get_device() const;
private:
static TypeHandle _type_handle;