summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
77d0c7a)
M_PI is not strictly a part of the C++ standard.
float p_sq = pupil*pupil;
float a_sq = aperture*aperture;
float two_ap = 2*pupil*aperture;
float p_sq = pupil*pupil;
float a_sq = aperture*aperture;
float two_ap = 2*pupil*aperture;
- shdata.uniform("optical", pupil, aperture, a_sq, a_sq*M_PI);
+ static const float pi = Geometry::Angle<float>::straight().radians();
+ shdata.uniform("optical", pupil, aperture, a_sq, a_sq*pi);
shdata.uniform("optical_range", p_sq-two_ap+a_sq, p_sq+two_ap+a_sq);
}
shdata.uniform("optical_range", p_sq-two_ap+a_sq, p_sq+two_ap+a_sq);
}