Changeset 1747 for code/trunk/src/orxonox/Radar.h
- Timestamp:
- Sep 9, 2008, 4:25:52 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core3 (added) merged: 1573-1574,1583-1586,1591-1594,1596-1597,1603,1606-1607,1610-1611,1655,1658,1676-1679,1681-1685,1687,1716-1723,1725-1729,1736
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/Radar.h
r1625 r1747 55 55 RadarBase() { } 56 56 }; 57 57 58 58 class _OrxonoxExport Radar : public Tickable, private virtual RadarBase 59 59 { … … 61 61 Radar(); 62 62 ~Radar(); 63 64 virtual void tick(float dt); 63 65 64 66 const RadarViewable* getFocus(); … … 75 77 private: 76 78 Radar(Radar& instance); 77 void tick(float dt);78 79 79 80 void releaseFocus(); … … 81 82 void cycleFocus(); 82 83 83 Iterator<RadarViewable> itFocus_;84 ObjectListIterator<RadarViewable> itFocus_; 84 85 RadarViewable* focus_; 85 86 std::map<std::string, RadarViewable::Shape> objectTypes_; 86 int objectTypeCounter_; 87 int objectTypeCounter_; 87 88 88 89 static Radar* instance_s;
Note: See TracChangeset
for help on using the changeset viewer.