RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove broken six-parameter constructor

This commit is contained in:
David Rose 2011-12-02 19:08:50 +00:00
parent c1b23c986d
commit 36ca6df75f
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/collide/collisionBox.I
View File

@ -54,17 +54,6 @@ CollisionBox(const LPoint3 &min, const LPoint3 &max) :
setup_box();
}
////////////////////////////////////////////////////////////////////
// Function: CollisionBox::Constructor
// Access: Public
// Description: Center as three separate co-ordinate points
////////////////////////////////////////////////////////////////////
INLINE CollisionBox::
CollisionBox(PN_stdfloat cx, PN_stdfloat cy, PN_stdfloat cz, PN_stdfloat x, PN_stdfloat y, PN_stdfloat z)
{
CollisionBox(LPoint3(cx, cy, cz), x, y, z);
}
////////////////////////////////////////////////////////////////////
// Function: CollisionBox::Default constructor
// Access: Protected

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

@ -1,3 +1,4 @@
// Filename: collisionBox.h
// Created by: amith tudur( 31Jul09 )
//
@ -30,8 +31,6 @@ class EXPCL_PANDA_COLLIDE CollisionBox : public CollisionSolid {
PUBLISHED:
INLINE CollisionBox(const LPoint3 &center,
PN_stdfloat x, PN_stdfloat y, PN_stdfloat z);
INLINE CollisionBox(PN_stdfloat cx, PN_stdfloat cy, PN_stdfloat cz,
PN_stdfloat x, PN_stdfloat y, PN_stdfloat z);
INLINE CollisionBox(const LPoint3 &min, const LPoint3 &max);
virtual LPoint3 get_collision_origin() const;