[Gcblue-commits] gcb_wx/include/sim tcSensorMap.h,1.4,1.5

[<ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7358/include/sim

Modified Files:
	tcSensorMap.h 
Log Message:


Index: tcSensorMap.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSensorMap.h	15 Feb 2004 19:47:22 -0000	1.4
--- tcSensorMap.h	16 Feb 2004 01:06:22 -0000	1.5
***************
*** 74,82 ****
     * engageRating controls how much ordance
     */
!    class tcSensorMapTrack 
     {
        enum {MAX_SENSOR_REPORTS = 2, MAX_EMITTERS = 4};
     public:
!       tcTrack track;
        double mfLastUpdateTime;
        tcSensorReport maSensorReport[MAX_SENSOR_REPORTS]; // most recent data from contributing sensors
--- 74,82 ----
     * engageRating controls how much ordance
     */
!    class tcSensorMapTrack : public tcTrack
     {
        enum {MAX_SENSOR_REPORTS = 2, MAX_EMITTERS = 4};
     public:
!       //tcTrack track;
        double mfLastUpdateTime;
        tcSensorReport maSensorReport[MAX_SENSOR_REPORTS]; // most recent data from contributing sensors
***************
*** 114,119 ****
        unsigned GetInterceptCount() const;
  
!       const tcTrack* GetTrack() {return &track;}
!       bool IsNew() {return track.mfTimestamp == 0;}
  
  
--- 114,119 ----
        unsigned GetInterceptCount() const;
  
!       const tcTrack* GetTrack() {return this;}
!       bool IsNew() {return mfTimestamp == 0;}
  
  
***************
*** 133,137 ****
  
        tcSensorMapTrack* operator= (tcSensorMapTrack *pa) {return pa;}
!       tcSensorMapTrack& operator= (tcSensorMapTrack&);
        tcSensorMapTrack();
        ~tcSensorMapTrack();
--- 133,137 ----
  
        tcSensorMapTrack* operator= (tcSensorMapTrack *pa) {return pa;}
!       tcSensorMapTrack& operator= (const tcSensorMapTrack&);
        tcSensorMapTrack();
        ~tcSensorMapTrack();
***************
*** 150,154 ****
        int GetTrackCount(void);
        tnPoolIndex GetStartTrackPosition(void);
!       void GetNextTrack(tnPoolIndex& pos, tcTrack*& pTrack);
        void Clear(void);
        void DropTrack(tnPoolIndex anID);
--- 150,154 ----
        int GetTrackCount(void);
        tnPoolIndex GetStartTrackPosition(void);
!       void GetNextTrack(tnPoolIndex& pos, tcSensorMapTrack*& pTrack);
        void Clear(void);
        void DropTrack(tnPoolIndex anID);
***************
*** 179,183 ****
        int GetTrackCount(UINT8 anAlliance);
        tnPoolIndex GetStartTrackPosition(UINT8 anAlliance);
!       void GetNextTrack(tnPoolIndex& pos, tcTrack*& pTrack, UINT8 anAlliance);
  
        tcAllianceSensorMap* GetMap(UINT8 anAlliance);
--- 179,183 ----
        int GetTrackCount(UINT8 anAlliance);
        tnPoolIndex GetStartTrackPosition(UINT8 anAlliance);
!       void GetNextTrack(tnPoolIndex& pos, tcSensorMapTrack*& pTrack, UINT8 anAlliance);
  
        tcAllianceSensorMap* GetMap(UINT8 anAlliance);