- Timestamp:
- Nov 20, 2009, 8:15:25 PM (14 years ago)
- Location:
- code/branches/presentation2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2
- Property svn:mergeinfo changed
/code/branches/steering (added) merged: 5979,5981,5984,5993,6001,6033,6045,6052,6055,6058,6091
- Property svn:mergeinfo changed
-
code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h
r5929 r6108 109 109 { return this->muzzleOffset_; } 110 110 111 Vector3 getMuzzlePosition() const; 112 const Quaternion& getMuzzleOrientation() const; 111 void computeMuzzleParameters(); 112 const Vector3& getMuzzlePosition() const 113 { return this->muzzlePosition_; } 114 const Quaternion& getMuzzleOrientation() const 115 { return this->muzzleOrientation_; } 113 116 Vector3 getMuzzleDirection() const; 114 117 … … 124 127 inline unsigned int getMode() const 125 128 { return this->mode_; } 129 130 Vector3 getTarget(); 126 131 127 132 protected: … … 152 157 Timer reloadTimer_; 153 158 bool bReloading_; 159 160 Vector3 muzzlePosition_; 161 Quaternion muzzleOrientation_; 154 162 }; 155 163 }
Note: See TracChangeset
for help on using the changeset viewer.