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

fix old bit-rot

Browse Source
This commit is contained in:
David Rose 2007-11-27 01:12:16 +00:00
parent 8d56e2e234
commit b990681b1a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/testbed/pgrid.cxx
View File

@ -325,7 +325,7 @@ load_gridded_models(WindowFramework *window,
ypos+new_center._v.v._1, ypos+new_center._v.v._1,
0.0); 0.0);
LMatrix4f::rotate_mat_normaxis(info.ang2,rotate_axis,tmat1); tmat1.set_rotate_mat_normaxis(info.ang2,rotate_axis);
tmat2 = LMatrix4f::translate_mat(translate_vec); tmat2 = LMatrix4f::translate_mat(translate_vec);
xfm_mat = tmat1 * tmat2; xfm_mat = tmat1 * tmat2;
} else if(gridmotiontype==LinearMotion) { } else if(gridmotiontype==LinearMotion) {
@ -353,7 +353,7 @@ load_gridded_models(WindowFramework *window,
const LVector3f rotate_axis(0.0, 0.0, 1.0); const LVector3f rotate_axis(0.0, 0.0, 1.0);
float ang = rad_2_deg(atan2(-xdel,ydel)); float ang = rad_2_deg(atan2(-xdel,ydel));
LMatrix4f::rotate_mat_normaxis(ang,rotate_axis,info.rotmat); info.rotmat.set_rotate_mat_normaxis(ang,rotate_axis);
LVector3f translate_vec(xpos, ypos, 0.0); LVector3f translate_vec(xpos, ypos, 0.0);
LMatrix4f tmat2 = LMatrix4f::translate_mat(translate_vec); LMatrix4f tmat2 = LMatrix4f::translate_mat(translate_vec);
@ -418,10 +418,12 @@ main(int argc, char *argv[]) {
load_gridded_models(window, gridded_filenames, info_arr); load_gridded_models(window, gridded_filenames, info_arr);
window->loop_animations(); window->loop_animations();
window->stagger_animations();
framework.enable_default_keys(); framework.enable_default_keys();
while (framework.do_frame()) { Thread *current_thread = Thread::get_current_thread();
while (framework.do_frame(current_thread)) {
if (!info_arr.empty() && gridmotiontype) { if (!info_arr.empty() && gridmotiontype) {
move_gridded_stuff(gridmotiontype, &info_arr[0], info_arr.size()); move_gridded_stuff(gridmotiontype, &info_arr[0], info_arr.size());
} }