TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

set_render_mode_thickness/perspective no longer overwrites wireframe color

Browse Source
This commit is contained in:
rdb 2015-12-19 23:44:23 +01:00
parent 56194acf87
commit 5f59f54475
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panda/src/pgraph/nodePath.cxx
View File

@ -4940,9 +4940,9 @@ get_fog() const {
void NodePath:: void NodePath::
set_render_mode_wireframe(int priority) { set_render_mode_wireframe(int priority) {
nassertv_always(!is_empty()); nassertv_always(!is_empty());
PN_stdfloat thickness = get_render_mode_thickness(); const RenderModeAttrib *rma;
bool perspective = get_render_mode_perspective(); node()->get_state()->get_attrib_def(rma);
node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_wireframe, thickness, perspective), priority); node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_wireframe, rma->get_thickness(), rma->get_perspective()), priority);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -4955,9 +4955,9 @@ set_render_mode_wireframe(int priority) {
void NodePath:: void NodePath::
set_render_mode_filled(int priority) { set_render_mode_filled(int priority) {
nassertv_always(!is_empty()); nassertv_always(!is_empty());
PN_stdfloat thickness = get_render_mode_thickness(); const RenderModeAttrib *rma;
bool perspective = get_render_mode_perspective(); node()->get_state()->get_attrib_def(rma);
node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled, thickness, perspective), priority); node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled, rma->get_thickness(), rma->get_perspective()), priority);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -4971,9 +4971,9 @@ set_render_mode_filled(int priority) {
void NodePath:: void NodePath::
set_render_mode_filled_wireframe(const LColor &wireframe_color, int priority) { set_render_mode_filled_wireframe(const LColor &wireframe_color, int priority) {
nassertv_always(!is_empty()); nassertv_always(!is_empty());
PN_stdfloat thickness = get_render_mode_thickness(); const RenderModeAttrib *rma;
bool perspective = get_render_mode_perspective(); node()->get_state()->get_attrib_def(rma);
node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled_wireframe, thickness, perspective, wireframe_color), priority); node()->set_attrib(RenderModeAttrib::make(RenderModeAttrib::M_filled_wireframe, rma->get_thickness(), rma->get_perspective(), wireframe_color), priority);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -4994,9 +4994,9 @@ set_render_mode_filled_wireframe(const LColor &wireframe_color, int priority) {
void NodePath:: void NodePath::
set_render_mode_perspective(bool perspective, int priority) { set_render_mode_perspective(bool perspective, int priority) {
nassertv_always(!is_empty()); nassertv_always(!is_empty());
RenderModeAttrib::Mode mode = get_render_mode(); const RenderModeAttrib *rma;
PN_stdfloat thickness = get_render_mode_thickness(); node()->get_state()->get_attrib_def(rma);
node()->set_attrib(RenderModeAttrib::make(mode, thickness, perspective), priority); node()->set_attrib(RenderModeAttrib::make(rma->get_mode(), rma->get_thickness(), perspective, rma->get_wireframe_color()), priority);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -5015,9 +5015,9 @@ set_render_mode_perspective(bool perspective, int priority) {
void NodePath:: void NodePath::
set_render_mode_thickness(PN_stdfloat thickness, int priority) { set_render_mode_thickness(PN_stdfloat thickness, int priority) {
nassertv_always(!is_empty()); nassertv_always(!is_empty());
RenderModeAttrib::Mode mode = get_render_mode(); const RenderModeAttrib *rma;
bool perspective = get_render_mode_perspective(); node()->get_state()->get_attrib_def(rma);
node()->set_attrib(RenderModeAttrib::make(mode, thickness, perspective), priority); node()->set_attrib(RenderModeAttrib::make(rma->get_mode(), thickness, rma->get_perspective(), rma->get_wireframe_color()), priority);
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////