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

Fix back-to-front sorting with gl-coordinate-system set to a custom value

Browse Source
This commit is contained in:
rdb 2016-12-07 19:32:44 +01:00
parent ceee5e9df9
commit b1d61b7b10
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,10 @@ GraphicsStateGuardian(CoordinateSystem internal_coordinate_system,
_coordinate_system = CS_invalid; _coordinate_system = CS_invalid;
_internal_transform = TransformState::make_identity(); _internal_transform = TransformState::make_identity();
if (_internal_coordinate_system == CS_default) {
_internal_coordinate_system = get_default_coordinate_system();
}
set_coordinate_system(get_default_coordinate_system()); set_coordinate_system(get_default_coordinate_system());
_data_reader = (GeomVertexDataPipelineReader *)NULL; _data_reader = (GeomVertexDataPipelineReader *)NULL;

2
panda/src/display/graphicsStateGuardian.h
View File

@ -322,7 +322,7 @@ public:
virtual void set_state_and_transform(const RenderState *state, virtual void set_state_and_transform(const RenderState *state,
const TransformState *transform); const TransformState *transform);
virtual PN_stdfloat compute_distance_to(const LPoint3 &point) const; PN_stdfloat compute_distance_to(const LPoint3 &point) const;
virtual void clear(DrawableRegion *clearable); virtual void clear(DrawableRegion *clearable);

10
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -6024,16 +6024,6 @@ make_geom_munger(const RenderState *state, Thread *current_thread) {
return GeomMunger::register_munger(munger, current_thread); return GeomMunger::register_munger(munger, current_thread);
} }
/**
* This function will compute the distance to the indicated point, assumed to
* be in eye coordinates, from the camera plane. The point is assumed to be
* in the GSG's internal coordinate system.
*/
PN_stdfloat CLP(GraphicsStateGuardian)::
compute_distance_to(const LPoint3 &point) const {
return -point[2];
}
/** /**
* Copy the pixels within the indicated display region from the framebuffer * Copy the pixels within the indicated display region from the framebuffer
* into texture memory. * into texture memory.

2
panda/src/glstuff/glGraphicsStateGuardian_src.h
View File

@ -358,8 +358,6 @@ public:
virtual PT(GeomMunger) make_geom_munger(const RenderState *state, virtual PT(GeomMunger) make_geom_munger(const RenderState *state,
Thread *current_thread); Thread *current_thread);
virtual PN_stdfloat compute_distance_to(const LPoint3 &point) const;
virtual void clear(DrawableRegion *region); virtual void clear(DrawableRegion *region);
virtual bool framebuffer_copy_to_texture virtual bool framebuffer_copy_to_texture