From 2c6ef8d261eccb6a7bbf16bd7213f78d81a757a0 Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 9 Oct 2005 17:39:28 +0000 Subject: [PATCH] reorder make_cube_map() parameters --- direct/src/showbase/ShowBase.py | 4 ++-- panda/src/display/graphicsOutput.cxx | 4 ++-- panda/src/display/graphicsOutput.h | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 139408d4df..c2b2b1374c 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -1604,7 +1604,7 @@ class ShowBase(DirectObject.DirectObject): source = source.getWindow() rig = NodePath(namePrefix) - buffer = source.makeCubeMap(namePrefix, size, 1, rig, cameraMask) + buffer = source.makeCubeMap(namePrefix, size, rig, cameraMask, 1) if buffer == None: raise StandardError, "Could not make cube map." @@ -1664,7 +1664,7 @@ class ShowBase(DirectObject.DirectObject): # Now make the cube map buffer. rig = NodePath(namePrefix) - buffer = toSphere.makeCubeMap(namePrefix, size, 0, rig, cameraMask) + buffer = toSphere.makeCubeMap(namePrefix, size, rig, cameraMask, 0) if buffer == None: base.graphicsEngine.removeWindow(toSphere) raise StandardError, "Could not make cube map." diff --git a/panda/src/display/graphicsOutput.cxx b/panda/src/display/graphicsOutput.cxx index 15464e5bbb..7d54fe12bb 100644 --- a/panda/src/display/graphicsOutput.cxx +++ b/panda/src/display/graphicsOutput.cxx @@ -626,8 +626,8 @@ static ShowBuffersCubeMapRegions cube_map_regions[6] = { // rig. //////////////////////////////////////////////////////////////////// GraphicsOutput *GraphicsOutput:: -make_cube_map(const string &name, int size, bool to_ram, - NodePath &camera_rig, DrawMask camera_mask) { +make_cube_map(const string &name, int size, NodePath &camera_rig, + DrawMask camera_mask, bool to_ram) { if (!to_ram) { // Check the limits imposed by the GSG. (However, if we're // rendering the texture to RAM only, these limits may be diff --git a/panda/src/display/graphicsOutput.h b/panda/src/display/graphicsOutput.h index bf3d0864a6..ad0fd7ba52 100644 --- a/panda/src/display/graphicsOutput.h +++ b/panda/src/display/graphicsOutput.h @@ -112,8 +112,10 @@ PUBLISHED: GraphicsOutput *make_texture_buffer(const string &name, int x_size, int y_size, Texture *tex = NULL, bool to_ram = false); - GraphicsOutput *make_cube_map(const string &name, int size, bool to_ram, - NodePath &camera_rig, DrawMask camera_mask); + GraphicsOutput *make_cube_map(const string &name, int size, + NodePath &camera_rig, + DrawMask camera_mask = DrawMask::all_on(), + bool to_ram = false); INLINE static Filename make_screenshot_filename(const string &prefix = "screenshot"); INLINE Filename save_screenshot_default(const string &prefix = "screenshot");