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

*** empty log message ***

Browse Source
This commit is contained in:
georges 2001-02-09 01:50:04 +00:00
parent 9847efb688
commit 227cfe307d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/glgsg/glGraphicsStateGuardian.cxx
View File

@ -939,13 +939,7 @@ draw_sprite(const GeomSprite *geom) {
modelview_mat = ctatt->get_matrix(); modelview_mat = ctatt->get_matrix();
// get the camera information // get the camera information
float tnear, tfar, hfov, aspect_ratio; float aspect_ratio = _actual_display_region->get_camera()->get_aspect();
tnear = _actual_display_region->get_camera()->get_near();
tfar = _actual_display_region->get_camera()->get_far();
hfov = _actual_display_region->get_camera()->get_hfov();
aspect_ratio = _actual_display_region->get_camera()->get_aspect();
// load up our own matrices
// Note on DO_CHARLES_PROJECTION_MAT // Note on DO_CHARLES_PROJECTION_MAT
// apparently adjusting the projection as done below is incorrect // apparently adjusting the projection as done below is incorrect
@ -961,17 +955,26 @@ draw_sprite(const GeomSprite *geom) {
float x_frustum_scale, y_frustum_scale; float x_frustum_scale, y_frustum_scale;
float recip_x_frustum_scale, recip_y_frustum_scale; float recip_x_frustum_scale, recip_y_frustum_scale;
float tnear, tfar, hfov;
// get the camera information
tnear = _actual_display_region->get_camera()->get_near();
tfar = _actual_display_region->get_camera()->get_far();
hfov = _actual_display_region->get_camera()->get_hfov();
// extract the left and top bounds of the current camera // extract the left and top bounds of the current camera
x_frustum_scale = tanf(hfov * 0.5f * (3.1415926f / 180.0f)) * tnear; x_frustum_scale = tanf(hfov * 0.5f * (3.1415926f / 180.0f)) * tnear;
recip_x_frustum_scale = 1.0f / x_frustum_scale; recip_x_frustum_scale = 1.0f / x_frustum_scale;
y_frustum_scale = x_frustum_scale / aspect_ratio; y_frustum_scale = x_frustum_scale / aspect_ratio;
recip_y_frustum_scale = 1.0f / y_frustum_scale; recip_y_frustum_scale = 1.0f / y_frustum_scale;
// load up our own matrices
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
glFrustum(-1.0f, 1.0f, -1.0f, 1.0f, tnear, tfar); glFrustum(-1.0f, 1.0f, -1.0f, 1.0f, tnear, tfar);
#endif #endif
// load up our own matrices
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();