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

OSphereLens shouldn't scale vertical component by focal_length.

Browse Source
This commit is contained in:
David Rose 2012-01-15 23:21:08 +00:00
parent d1a31167f7
commit 401da63c22
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/distort/oSphereLens.cxx
View File

@ -68,8 +68,8 @@ do_extrude(const Lens::CData *lens_cdata,
near_point = (v * do_get_near(lens_cdata)); near_point = (v * do_get_near(lens_cdata));
far_point = (v * do_get_far(lens_cdata)); far_point = (v * do_get_far(lens_cdata));
near_point[2] = f[1] / focal_length; near_point[2] = f[1];
far_point[2] = f[1] / focal_length; far_point[2] = f[1];
// And we'll need to account for the lens's rotations, etc. at the // And we'll need to account for the lens's rotations, etc. at the
// end of the day. // end of the day.
@ -121,8 +121,7 @@ do_project(const Lens::CData *lens_cdata, const LPoint3 &point3d, LPoint3 &point
// The x position is the angle about the Z axis. // The x position is the angle about the Z axis.
rad_2_deg(catan2(xy[0], xy[1])) * focal_length / ospherical_k, rad_2_deg(catan2(xy[0], xy[1])) * focal_length / ospherical_k,
// The y position is the Z height. // The y position is the Z height.
// distance. p[2],
p[2] * focal_length,
// Z is the distance scaled into the range (1, -1). // Z is the distance scaled into the range (1, -1).
(do_get_near(lens_cdata) - dist) / (do_get_far(lens_cdata) - do_get_near(lens_cdata)) (do_get_near(lens_cdata) - dist) / (do_get_far(lens_cdata) - do_get_near(lens_cdata))
); );