ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/primitives/StuntDouble.hpp
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/primitives/StuntDouble.hpp (file contents):
Revision 1765 by tim, Mon Nov 22 20:55:52 2004 UTC vs.
Revision 1815 by tim, Wed Dec 1 18:42:45 2004 UTC

# Line 40 | Line 40
40   #include "math/SquareMatrix3.hpp"
41   #include "math/Vector3.hpp"
42   #include "utils/PropertyMap.hpp"
43 + #include "brains/Snapshot.hpp"
44   #include "brains/SnapshotManager.hpp"
45   namespace oopse{
46  
# Line 98 | Line 99 | namespace oopse{
99           */        
100          void setLocalIndex(int index) {
101              localIndex_ = index;
102 +        }
103 +
104 +        /**
105 +         * Sets the Snapshot Manager of this stuntdouble
106 +         */
107 +        void setSnapshotManager(SnapshotManager* sman) {
108 +            snapshotMan_ = sman;
109          }
110  
111          /**
# Line 453 | Line 461 | namespace oopse{
461           * Returns the previous unit vectors of this stuntdouble
462           * @return the unit vectors of this stuntdouble
463           */    
464 <        Vector3d getPrevUnitVector() {
465 <            return ((snapshotMan_->getPrevSnapshot())->*storage_).unitVector[localIndex_];
464 >        RotMat3x3d getPrevElectroFrame() {
465 >            return ((snapshotMan_->getPrevSnapshot())->*storage_).electroFrame[localIndex_];
466          }
467        
468          /**
469           * Returns the current unit vectors of this stuntdouble
470           * @return the unit vectors of this stuntdouble
471           */    
472 <        Vector3d getUnitVector() {
473 <            return ((snapshotMan_->getCurrentSnapshot())->*storage_).unitVector[localIndex_];
472 >        RotMat3x3d getElectroFrame() {
473 >            return ((snapshotMan_->getCurrentSnapshot())->*storage_).electroFrame[localIndex_];
474          }
475  
476         /**
# Line 471 | Line 479 | namespace oopse{
479           * @return the unit vectors of this stuntdouble
480           * @param snapshotNo
481           */    
482 <         Vector3d getUnitVector(int snapshotNo) {
483 <            return ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).unitVector[localIndex_];
482 >         RotMat3x3d getElectroFrame(int snapshotNo) {
483 >            return ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).electroFrame[localIndex_];
484          }
485  
486         /**
# Line 859 | Line 867 | namespace oopse{
867          
868          int globalIndex_;
869          int localIndex_;
870 +
871 +
872 +        double mass_;
873          
874      private:
875  
876          std::string name_;
866 –
867 –        double mass_;
877          
878          PropertyMap properties_;
879      };

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines