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

Add FrameBufferProperties argument to WindowFramework

Browse Source
This commit is contained in:
rdb 2014-03-20 22:56:53 +00:00
parent 32ad6785f2
commit 528a607f4a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/framework/windowFramework.cxx
View File

@ -145,7 +145,8 @@ WindowFramework::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
GraphicsOutput *WindowFramework:: GraphicsOutput *WindowFramework::
open_window(const WindowProperties &props, int flags, GraphicsEngine *engine, open_window(const WindowProperties &props, int flags, GraphicsEngine *engine,
GraphicsPipe *pipe, GraphicsStateGuardian *gsg) { GraphicsPipe *pipe, GraphicsStateGuardian *gsg,
const FrameBufferProperties &fbprops) {
nassertr(_window == (GraphicsOutput *)NULL, _window); nassertr(_window == (GraphicsOutput *)NULL, _window);
static int next_window_index = 1; static int next_window_index = 1;
@ -156,8 +157,7 @@ open_window(const WindowProperties &props, int flags, GraphicsEngine *engine,
_window = 0; _window = 0;
GraphicsOutput *winout = GraphicsOutput *winout =
engine->make_output(pipe, name, 0, engine->make_output(pipe, name, 0, fbprops,
FrameBufferProperties::get_default(),
props, flags, gsg, NULL); props, flags, gsg, NULL);
if (winout != (GraphicsOutput *)NULL) { if (winout != (GraphicsOutput *)NULL) {
_window = winout; _window = winout;

4
panda/src/framework/windowFramework.h
View File

@ -63,7 +63,9 @@ public:
protected: protected:
GraphicsOutput *open_window(const WindowProperties &props, int flags, GraphicsOutput *open_window(const WindowProperties &props, int flags,
GraphicsEngine *engine, GraphicsPipe *pipe, GraphicsEngine *engine, GraphicsPipe *pipe,
GraphicsStateGuardian *gsg = NULL); GraphicsStateGuardian *gsg = NULL,
const FrameBufferProperties &fbprops =
FrameBufferProperties::get_default());
void close_window(); void close_window();
public: public: