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

collide: remove unused legacy_to_3d method

Browse Source
This commit is contained in:
rdb 2019-02-04 23:37:47 +01:00
parent 86c266fd88
commit 16d5c27a57
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/collide/collisionBox.h
View File

@ -139,7 +139,6 @@ public:
INLINE void calc_to_3d_mat(LMatrix4 &to_3d_mat, int plane) const;
INLINE void rederive_to_3d_mat(LMatrix4 &to_3d_mat, int plane) const;
INLINE static LPoint3 to_3d(const LVecBase2 &point2d, const LMatrix4 &to_3d_mat);
LPoint3 legacy_to_3d(const LVecBase2 &point2d, int axis) const;
bool clip_polygon(Points &new_points, const Points &source_points,
const LPlane &plane,int plane_no) const;
bool apply_clip_plane(Points &new_points, const ClipPlaneAttrib *cpa,

31
panda/src/collide/collisionPolygon.cxx
View File

@ -1335,37 +1335,6 @@ setup_points(const LPoint3 *begin, const LPoint3 *end) {
compute_vectors(_points);
}
/**
* Converts the indicated point to 3-d space according to the way
* CollisionPolygons used to be stored in bam files prior to 4.9.
*/
LPoint3 CollisionPolygon::
legacy_to_3d(const LVecBase2 &point2d, int axis) const {
nassertr(!point2d.is_nan(), LPoint3(0.0f, 0.0f, 0.0f));
LVector3 normal = get_normal();
PN_stdfloat D = get_plane()[3];
nassertr(!normal.is_nan(), LPoint3(0.0f, 0.0f, 0.0f));
nassertr(!cnan(D), LPoint3(0.0f, 0.0f, 0.0f));
switch (axis) {
case 0: // AT_x:
return LPoint3(-(normal[1]*point2d[0] + normal[2]*point2d[1] + D)/normal[0], point2d[0], point2d[1]);
case 1: // AT_y:
return LPoint3(point2d[0],
-(normal[0]*point2d[0] + normal[2]*point2d[1] + D)/normal[1], point2d[1]);
case 2: // AT_z:
return LPoint3(point2d[0], point2d[1],
-(normal[0]*point2d[0] + normal[1]*point2d[1] + D)/normal[2]);
}
nassertr(false, LPoint3(0.0f, 0.0f, 0.0f));
return LPoint3(0.0f, 0.0f, 0.0f);
}
/**
* Clips the source_points of the polygon by the indicated clipping plane, and
* modifies new_points to reflect the new set of clipped points (but does not

1
panda/src/collide/collisionPolygon.h
View File

@ -131,7 +131,6 @@ private:
INLINE void calc_to_3d_mat(LMatrix4 &to_3d_mat) const;
INLINE void rederive_to_3d_mat(LMatrix4 &to_3d_mat) const;
INLINE static LPoint3 to_3d(const LVecBase2 &point2d, const LMatrix4 &to_3d_mat);
LPoint3 legacy_to_3d(const LVecBase2 &point2d, int axis) const;
bool clip_polygon(Points &new_points, const Points &source_points,
const LPlane &plane) const;