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

formatting

Browse Source
This commit is contained in:
Dave Schuyler 2003-10-28 01:15:10 +00:00
parent e17eb83f3c
commit 1f8298e7fa
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/linmath/lquaternion.h
View File

@ -27,7 +27,7 @@
#include "deg_2_rad.h" #include "deg_2_rad.h"
#include "compose_matrix.h" #include "compose_matrix.h"
#include <notify.h> #include "notify.h"
#include "fltnames.h" #include "fltnames.h"
#include "lquaternion_src.h" #include "lquaternion_src.h"

23
panda/src/physics/angularEulerIntegrator.cxx
View File

@ -27,7 +27,7 @@
// Description : constructor // Description : constructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
AngularEulerIntegrator:: AngularEulerIntegrator::
AngularEulerIntegrator(void) { AngularEulerIntegrator() {
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -36,7 +36,7 @@ AngularEulerIntegrator(void) {
// Description : destructor // Description : destructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
AngularEulerIntegrator:: AngularEulerIntegrator::
~AngularEulerIntegrator(void) { ~AngularEulerIntegrator() {
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -48,7 +48,7 @@ AngularEulerIntegrator::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void AngularEulerIntegrator:: void AngularEulerIntegrator::
child_integrate(Physical *physical, child_integrate(Physical *physical,
pvector< PT(AngularForce) >& forces, AngularForceVector& forces,
float dt) { float dt) {
// perform the precomputation. Note that the vector returned by // perform the precomputation. Note that the vector returned by
// get_precomputed_matrices() has the matrices loaded in order of force // get_precomputed_matrices() has the matrices loaded in order of force
@ -65,26 +65,27 @@ child_integrate(Physical *physical,
// velocity of each physicsobject in the set. Accordingly, we have // velocity of each physicsobject in the set. Accordingly, we have
// to grunt our way through each one. wrt caching of the xform matrix // to grunt our way through each one. wrt caching of the xform matrix
// should help. // should help.
pvector< PT(PhysicsObject) >::const_iterator current_object_iter; PhysicsObject::Vector::const_iterator current_object_iter;
current_object_iter = physical->get_object_vector().begin(); current_object_iter = physical->get_object_vector().begin();
for (; current_object_iter != physical->get_object_vector().end(); for (; current_object_iter != physical->get_object_vector().end();
++current_object_iter) { ++current_object_iter) {
PhysicsObject *current_object = *current_object_iter; PhysicsObject *current_object = *current_object_iter;
// bail out if this object doesn't exist or doesn't want to be // bail out if this object doesn't exist or doesn't want to be
// processed. // processed.
if (current_object == (PhysicsObject *) NULL) if (current_object == (PhysicsObject *) NULL) {
continue; continue;
}
if (current_object->get_active() == false) if (current_object->get_active() == false) {
continue; continue;
}
LVector3f accum_vec(0, 0, 0); LVector3f accum_vec(0, 0, 0);
// set up the traversal stuff. // set up the traversal stuff.
ForceNode *force_node; ForceNode *force_node;
pvector< PT(AngularForce) >::const_iterator f_cur; AngularForceVector::const_iterator f_cur;
LVector3f f; LVector3f f;
@ -95,8 +96,9 @@ child_integrate(Physical *physical,
AngularForce *cur_force = *f_cur; AngularForce *cur_force = *f_cur;
// make sure the force is turned on. // make sure the force is turned on.
if (cur_force->get_active() == false) if (cur_force->get_active() == false) {
continue; continue;
}
force_node = cur_force->get_force_node(); force_node = cur_force->get_force_node();
@ -113,8 +115,9 @@ child_integrate(Physical *physical,
AngularForce *cur_force = *f_cur; AngularForce *cur_force = *f_cur;
// make sure the force is turned on. // make sure the force is turned on.
if (cur_force->get_active() == false) if (cur_force->get_active() == false) {
continue; continue;
}
force_node = cur_force->get_force_node(); force_node = cur_force->get_force_node();

4
panda/src/physics/baseIntegrator.I
View File

@ -21,7 +21,7 @@
// Access : protected // Access : protected
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const pvector< LMatrix4f > &BaseIntegrator:: INLINE const pvector< LMatrix4f > &BaseIntegrator::
get_precomputed_linear_matrices(void) const { get_precomputed_linear_matrices() const {
return _precomputed_linear_matrices; return _precomputed_linear_matrices;
} }
@ -30,6 +30,6 @@ get_precomputed_linear_matrices(void) const {
// Access : protected // Access : protected
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const pvector< LMatrix4f > &BaseIntegrator:: INLINE const pvector< LMatrix4f > &BaseIntegrator::
get_precomputed_angular_matrices(void) const { get_precomputed_angular_matrices() const {
return _precomputed_angular_matrices; return _precomputed_angular_matrices;
} }

2
panda/src/putil/lineStream.h
View File

@ -19,7 +19,7 @@
#ifndef LINESTREAM_H #ifndef LINESTREAM_H
#define LINESTREAM_H #define LINESTREAM_H
#include <pandabase.h> #include "pandabase.h"
#include "lineStreamBuf.h" #include "lineStreamBuf.h"