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

lod config vars should be defined in pgraphnodes, not pgraph

Browse Source
This commit is contained in:
rdb 2013-08-27 21:37:10 +00:00
parent b3225609b2
commit 1b129d905d
5 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
panda/src/pgraph/config_pgraph.cxx
View File

@ -256,12 +256,6 @@ ConfigVariableBool retransform_sprites
"re-transformed back into the original object space, which is "
"necessary in order for fog to work correctly on the sprites."));
ConfigVariableBool support_fade_lod
("support-fade-lod", true,
PRC_DESC("Set this false to make FadeLOD nodes behave like regular LOD nodes "
"(ignoring the fade time). This may be useful, for instance, to "
"test the performance impact of using FadeLOD nodes."));
ConfigVariableBool depth_offset_decals
("depth-offset-decals", false,
PRC_DESC("Set this true to allow decals to be implemented via the advanced "
@ -334,35 +328,6 @@ ConfigVariableBool polylight_info
PRC_DESC("Set this true to view some info statements regarding the polylight. "
"It is helpful for debugging."));
ConfigVariableDouble lod_fade_time
("lod-fade-time", 0.5,
PRC_DESC("The default amount of time (in seconds) over which a FadeLODNode "
"transitions between its different levels."));
ConfigVariableString lod_fade_bin_name
("lod-fade-bin-name", "fixed",
PRC_DESC("The default bin name in which to place the fading part of a "
"FadeLODNode transition."));
ConfigVariableInt lod_fade_bin_draw_order
("lod-fade-bin-draw-order", 0,
PRC_DESC("The default bin draw order to assign the fading part of a "
"FadeLODNode transition."));
ConfigVariableInt lod_fade_state_override
("lod-fade-state-override", 1000,
PRC_DESC("The default override value to assign to the fade attribs "
"in order to effect a FadeLODNode transition."));
ConfigVariableBool verify_lods
("verify-lods", false,
PRC_DESC("When this is true, LODNodes will test when they are rendered to "
"ensure that each child's geometry fits entirely within the radius "
"defined by its switch-out distance. When it is false, LODNodes "
"may have any switch in and out distances, regardless of the "
"actual size of their geometry. This test is only made in NDEBUG "
"mode (the variable is ignored in a production build)."));
ConfigVariableBool show_vertex_animation
("show-vertex-animation", false,
PRC_DESC("Set this true to flash any objects whose vertices are animated "

6
panda/src/pgraph/config_pgraph.h
View File

@ -52,7 +52,6 @@ extern ConfigVariableBool uniquify_transforms;
extern ConfigVariableBool uniquify_states;
extern ConfigVariableBool uniquify_attribs;
extern ConfigVariableBool retransform_sprites;
extern ConfigVariableBool support_fade_lod;
extern ConfigVariableBool depth_offset_decals;
extern ConfigVariableInt max_collect_vertices;
extern ConfigVariableInt max_collect_indices;
@ -63,11 +62,6 @@ extern EXPCL_PANDA_PGRAPH ConfigVariableInt max_lenses;
extern ConfigVariableBool default_antialias_enable;
extern ConfigVariableBool polylight_info;
extern ConfigVariableDouble lod_fade_time;
extern ConfigVariableString lod_fade_bin_name;
extern ConfigVariableInt lod_fade_bin_draw_order;
extern ConfigVariableInt lod_fade_state_override;
extern ConfigVariableBool verify_lods;
extern ConfigVariableBool show_vertex_animation;
extern ConfigVariableBool show_transparency;

35
panda/src/pgraphnodes/config_pgraphnodes.cxx
View File

@ -47,6 +47,41 @@ ConfigVariableEnum<LODNodeType> default_lod_type
PRC_DESC("Set this to either 'pop' or 'fade' to determine the type of "
"LODNode that is created by LODNode::make_default_lod()."));
ConfigVariableBool support_fade_lod
("support-fade-lod", true,
PRC_DESC("Set this false to make FadeLOD nodes behave like regular LOD nodes "
"(ignoring the fade time). This may be useful, for instance, to "
"test the performance impact of using FadeLOD nodes."));
ConfigVariableDouble lod_fade_time
("lod-fade-time", 0.5,
PRC_DESC("The default amount of time (in seconds) over which a FadeLODNode "
"transitions between its different levels."));
ConfigVariableString lod_fade_bin_name
("lod-fade-bin-name", "fixed",
PRC_DESC("The default bin name in which to place the fading part of a "
"FadeLODNode transition."));
ConfigVariableInt lod_fade_bin_draw_order
("lod-fade-bin-draw-order", 0,
PRC_DESC("The default bin draw order to assign the fading part of a "
"FadeLODNode transition."));
ConfigVariableInt lod_fade_state_override
("lod-fade-state-override", 1000,
PRC_DESC("The default override value to assign to the fade attribs "
"in order to effect a FadeLODNode transition."));
ConfigVariableBool verify_lods
("verify-lods", false,
PRC_DESC("When this is true, LODNodes will test when they are rendered to "
"ensure that each child's geometry fits entirely within the radius "
"defined by its switch-out distance. When it is false, LODNodes "
"may have any switch in and out distances, regardless of the "
"actual size of their geometry. This test is only made in NDEBUG "
"mode (the variable is ignored in a production build)."));
ConfigVariableInt parallax_mapping_samples
("parallax-mapping-samples", 3,
PRC_DESC("Sets the amount of samples to use in the parallax mapping "

14
panda/src/pgraphnodes/config_pgraphnodes.h
View File

@ -16,9 +16,14 @@
#define CONFIG_PGRAPHNODES_H
#include "pandabase.h"
#include "lodNodeType.h"
#include "notifyCategoryProxy.h"
#include "dconfig.h"
#include "configVariableBool.h"
#include "configVariableEnum.h"
#include "configVariableDouble.h"
#include "configVariableInt.h"
#include "configVariableString.h"
#include "lodNodeType.h"
class DSearchPath;
@ -26,6 +31,13 @@ ConfigureDecl(config_pgraphnodes, EXPCL_PANDA_PGRAPHNODES, EXPTP_PANDA_PGRAPHNOD
NotifyCategoryDecl(pgraphnodes, EXPCL_PANDA_PGRAPHNODES, EXPTP_PANDA_PGRAPHNODES);
extern ConfigVariableEnum<LODNodeType> default_lod_type;
extern ConfigVariableBool support_fade_lod;
extern ConfigVariableDouble lod_fade_time;
extern ConfigVariableString lod_fade_bin_name;
extern ConfigVariableInt lod_fade_bin_draw_order;
extern ConfigVariableInt lod_fade_state_override;
extern ConfigVariableBool verify_lods;
extern ConfigVariableInt parallax_mapping_samples;
extern ConfigVariableDouble parallax_mapping_scale;

2
panda/src/pgraphnodes/lodNode.h
View File

@ -16,7 +16,7 @@
#define LODNODE_H
#include "pandabase.h"
#include "config_pgraphnodes.h"
#include "pandaNode.h"
#include "luse.h"
#include "pvector.h"