RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change iterators to unambiguous scoping

This commit is contained in:
David Rose 2003-11-04 18:55:15 +00:00
parent 3a761fc27c
commit bb96cc89c2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/physics/baseIntegrator.cxx
View File

@ -71,9 +71,8 @@ precompute_linear_matrices(Physical *physical,
NodePath global_physical_np = physical_np.get_parent();
// tally the global xforms
for (LinearForceVector::const_iterator fi = forces.begin();
fi != forces.end();
++fi) {
LinearForceVector::const_iterator fi;
for (fi = forces.begin(); fi != forces.end(); ++fi) {
//LinearForce *cur_force = *fi;
force_node = (*fi)->get_force_node();
nassertv(force_node != (ForceNode *) NULL);
@ -85,9 +84,7 @@ precompute_linear_matrices(Physical *physical,
// tally the local xforms
const LinearForceVector &force_vector = physical->get_linear_forces();
for (LinearForceVector::const_iterator fi = force_vector.begin();
fi != force_vector.end();
++fi) {
for (fi = force_vector.begin(); fi != force_vector.end(); ++fi) {
force_node = (*fi)->get_force_node();
nassertv(force_node != (ForceNode *) NULL);
@ -128,9 +125,8 @@ precompute_angular_matrices(Physical *physical,
NodePath global_physical_np = physical_np.get_parent();
// tally the global xforms
for (AngularForceVector::const_iterator fi = forces.begin();
fi != forces.end();
++fi) {
AngularForceVector::const_iterator fi;
for (fi = forces.begin(); fi != forces.end(); ++fi) {
force_node = (*fi)->get_force_node();
nassertv(force_node != (ForceNode *) NULL);
@ -141,9 +137,7 @@ precompute_angular_matrices(Physical *physical,
// tally the local xforms
const AngularForceVector &force_vector = physical->get_angular_forces();
for (AngularForceVector::const_iterator fi = force_vector.begin();
fi != force_vector.end();
++fi) {
for (fi = force_vector.begin(); fi != force_vector.end(); ++fi) {
force_node = (*fi)->get_force_node();
nassertv(force_node != (ForceNode *) NULL);