TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

reorder make_cube_map() parameters

Browse Source
This commit is contained in:
David Rose 2005-10-09 17:39:28 +00:00
parent 1568b255ca
commit 2c6ef8d261
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/showbase/ShowBase.py
View File

@ -1604,7 +1604,7 @@ class ShowBase(DirectObject.DirectObject):
source = source.getWindow() source = source.getWindow()
rig = NodePath(namePrefix) rig = NodePath(namePrefix)
buffer = source.makeCubeMap(namePrefix, size, 1, rig, cameraMask) buffer = source.makeCubeMap(namePrefix, size, rig, cameraMask, 1)
if buffer == None: if buffer == None:
raise StandardError, "Could not make cube map." raise StandardError, "Could not make cube map."
@ -1664,7 +1664,7 @@ class ShowBase(DirectObject.DirectObject):
# Now make the cube map buffer. # Now make the cube map buffer.
rig = NodePath(namePrefix) rig = NodePath(namePrefix)
buffer = toSphere.makeCubeMap(namePrefix, size, 0, rig, cameraMask) buffer = toSphere.makeCubeMap(namePrefix, size, rig, cameraMask, 0)
if buffer == None: if buffer == None:
base.graphicsEngine.removeWindow(toSphere) base.graphicsEngine.removeWindow(toSphere)
raise StandardError, "Could not make cube map." raise StandardError, "Could not make cube map."

4
panda/src/display/graphicsOutput.cxx
View File

@ -626,8 +626,8 @@ static ShowBuffersCubeMapRegions cube_map_regions[6] = {
// rig. // rig.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
GraphicsOutput *GraphicsOutput:: GraphicsOutput *GraphicsOutput::
make_cube_map(const string &name, int size, bool to_ram, make_cube_map(const string &name, int size, NodePath &camera_rig,
NodePath &camera_rig, DrawMask camera_mask) { DrawMask camera_mask, bool to_ram) {
if (!to_ram) { if (!to_ram) {
// Check the limits imposed by the GSG. (However, if we're // Check the limits imposed by the GSG. (However, if we're
// rendering the texture to RAM only, these limits may be // rendering the texture to RAM only, these limits may be

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

@ -112,8 +112,10 @@ PUBLISHED:
GraphicsOutput *make_texture_buffer(const string &name, int x_size, int y_size, GraphicsOutput *make_texture_buffer(const string &name, int x_size, int y_size,
Texture *tex = NULL, bool to_ram = false); Texture *tex = NULL, bool to_ram = false);
GraphicsOutput *make_cube_map(const string &name, int size, bool to_ram, GraphicsOutput *make_cube_map(const string &name, int size,
NodePath &camera_rig, DrawMask camera_mask); NodePath &camera_rig,
DrawMask camera_mask = DrawMask::all_on(),
bool to_ram = false);
INLINE static Filename make_screenshot_filename(const string &prefix = "screenshot"); INLINE static Filename make_screenshot_filename(const string &prefix = "screenshot");
INLINE Filename save_screenshot_default(const string &prefix = "screenshot"); INLINE Filename save_screenshot_default(const string &prefix = "screenshot");