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

vc++ doesn't like 'vector'

Browse Source
This commit is contained in:
David Rose 2001-12-06 23:21:38 +00:00
parent 46189dbae4
commit d05416a7cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/gobj/lens.cxx
View File

@ -1660,8 +1660,8 @@ build_shear_mat(LMatrix4f &shear_mat,
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
float Lens:: float Lens::
sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin, sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin,
const LVector3f &vector) { const LVector3f &vec) {
LVector3f norm = vector; LVector3f norm = vec;
norm.normalize(); norm.normalize();
LVector3f d = point - origin; LVector3f d = point - origin;
float hyp_2 = d.length_squared(); float hyp_2 = d.length_squared();

2
panda/src/gobj/lens.h
View File

@ -173,7 +173,7 @@ private:
const LPoint3f &cul, const LPoint3f &cur, const LPoint3f &cul, const LPoint3f &cur,
const LPoint3f &cll, const LPoint3f &clr); const LPoint3f &cll, const LPoint3f &clr);
static float sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin, static float sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin,
const LVector3f &vector); const LVector3f &vec);
protected: protected:
string _change_event; string _change_event;