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 1807 by tim, Tue Nov 30 22:43:51 2004 UTC vs.
Revision 1822 by tim, Thu Dec 2 02:08:29 2004 UTC

# Line 461 | Line 461 | namespace oopse{
461           * Returns the previous unit vectors of this stuntdouble
462           * @return the unit vectors of this stuntdouble
463           */    
464 <        RotMat3x3d getPrevUnitFrame() {
465 <            return ((snapshotMan_->getPrevSnapshot())->*storage_).unitFrame[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 <        RotMat3x3d getUnitFrame() {
473 <            return ((snapshotMan_->getCurrentSnapshot())->*storage_).unitFrame[localIndex_];
472 >        RotMat3x3d getElectroFrame() {
473 >            return ((snapshotMan_->getCurrentSnapshot())->*storage_).electroFrame[localIndex_];
474          }
475  
476         /**
# Line 479 | Line 479 | namespace oopse{
479           * @return the unit vectors of this stuntdouble
480           * @param snapshotNo
481           */    
482 <         RotMat3x3d getUnitFrame(int snapshotNo) {
483 <            return ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).unitFrame[localIndex_];
482 >         RotMat3x3d getElectroFrame(int snapshotNo) {
483 >            return ((snapshotMan_->getSnapshot(snapshotNo))->*storage_).electroFrame[localIndex_];
484          }
485  
486         /**
# Line 782 | Line 782 | namespace oopse{
782          }
783  
784          /** Returns the name of this stuntdouble */
785 <        std::string getType();
785 >        virtual void getType() = 0;
786          
787          /** Sets the name of this stuntdouble*/
788 <        void setType(const std::string& name);
788 >        virtual void setType(const std::string& name) {}
789  
790          /**
791           * Converts a lab fixed vector to a body fixed vector.
# Line 867 | Line 867 | namespace oopse{
867          
868          int globalIndex_;
869          int localIndex_;
870 –        
871 –    private:
870  
873 –        std::string name_;
871  
872          double mass_;
873          
874 +    private:
875 +        
876          PropertyMap properties_;
877 <    };
877 > };
878  
879   }//end namespace oopse
880   #endif //PRIMITIVES_STUNTDOUBLE_HPP

Diff Legend

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