[Jais-checkins] jaisteam/src/jais/world WorldModel.java,1.57,1.58 WorldDataAccessInterface.java,1.9,1.10

[<mae...@us...>]

Update of /cvsroot/jais/jaisteam/src/jais/world
In directory usw-pr-cvs1:/tmp/cvs-serv4108/world

Modified Files:
	WorldModel.java WorldDataAccessInterface.java 
Log Message:
change viewModes not ready yet, but massively improved
added a new thread, an actionPerformer .... this is needed as
of timing issues 

Index: WorldModel.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/world/WorldModel.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** WorldModel.java	13 Jul 2002 20:29:23 -0000	1.57
--- WorldModel.java	14 Jul 2002 14:01:23 -0000	1.58
***************
*** 83,86 ****
--- 83,87 ----
    public double getBodyDirectionTo(ObjectInfo f_obj)
    {
+ /*
      if (this.sorry_whatTimeDoWeHave()-f_obj.getTime()==0)
      {
***************
*** 91,126 ****
        return getBodyDirectionTo(f_obj.getAbsPosition());
      }
    }
  
!   public synchronized double getBodyDirectionTo(Coordinate f_coord)
    {
      double l_angle=0;
!     l_angle=Math.atan((f_coord.getY()-m_myself.getAbsPosition().getY())/(f_coord.getX()-m_myself.getAbsPosition().getX()));
      l_angle=(Math.toDegrees(l_angle)-getAbsBodyDir());
-     if (f_coord.getY()<m_myself.getAbsPosition().getY())
-     {
-       if (f_coord.getX()>=m_myself.getAbsPosition().getX())
-       {
-         l_angle+=360;
-       }
-       else
-       {
-         l_angle-= -180;
-       }
-     }
-     else
-     {
-       if (f_coord.getX()>=m_myself.getAbsPosition().getX())
-       {
-       }
-       else
-       {
-         l_angle= l_angle+180;
-       }
-     }
      return Angle.normalize(l_angle);
    }
  
!   public synchronized double getMyDistanceTo(Coordinate f_coord)
    {
      return (Math.sqrt((Math.pow(Math.abs(m_myself.getAbsPosition().getX() - f_coord.getX()), 2)) +
--- 92,108 ----
        return getBodyDirectionTo(f_obj.getAbsPosition());
      }
+ */
+     return getBodyDirectionTo(f_obj.getAbsPosition());
    }
  
!   public double getBodyDirectionTo(Coordinate f_coord)
    {
      double l_angle=0;
!     l_angle=Math.atan2(f_coord.getY()-m_myself.getAbsPosition().getY(),(f_coord.getX()-m_myself.getAbsPosition().getX()));
      l_angle=(Math.toDegrees(l_angle)-getAbsBodyDir());
      return Angle.normalize(l_angle);
    }
  
!   public double getMyDistanceTo(Coordinate f_coord)
    {
      return (Math.sqrt((Math.pow(Math.abs(m_myself.getAbsPosition().getX() - f_coord.getX()), 2)) +
***************
*** 129,134 ****
    }
  
!   public synchronized double getMyDistanceTo(ObjectInfo f_object)
    {
      if(this.sorry_whatTimeDoWeHave()-f_object.getTime()==0) //we saw this guy this round
      {
--- 111,118 ----
    }
  
!   public double getMyDistanceTo(ObjectInfo f_object)
    {
+     return getMyDistanceTo(f_object.getAbsPosition());
+   /*
      if(this.sorry_whatTimeDoWeHave()-f_object.getTime()==0) //we saw this guy this round
      {
***************
*** 139,142 ****
--- 123,127 ----
        return getMyDistanceTo(f_object.getAbsPosition());
      }
+   */
    }
  
***************
*** 153,162 ****
    }
  
!   public synchronized ArrayList getEnemyPlayers()
    {
      return m_enemyTeam;
    }
  
!   public synchronized ArrayList getFriendlyPlayers()
    {
      return m_ownTeam;
--- 138,147 ----
    }
  
!   public ArrayList getEnemyPlayers()
    {
      return m_enemyTeam;
    }
  
!   public ArrayList getFriendlyPlayers()
    {
      return m_ownTeam;
***************
*** 165,170 ****
    public SenseBodyInfo getSenseBodyInfo()
    {
-     synchronized(m_senseBodyInfos)
-     {
        try
        {
--- 150,153 ----
***************
*** 177,189 ****
          return(SenseBodyInfo)m_senseBodyInfos.getLast();
        }
-     }
    }
  
!   public synchronized BallInfo getBall()
    {
      return m_ball;
    }
  
!   public synchronized PlayerInfo getMyself()
    {
      return m_myself;
--- 160,171 ----
          return(SenseBodyInfo)m_senseBodyInfos.getLast();
        }
    }
  
!   public BallInfo getBall()
    {
      return m_ball;
    }
  
!   public PlayerInfo getMyself()
    {
      return m_myself;
***************
*** 309,312 ****
--- 291,295 ----
          {
            m_ball=(BallInfo)l_objectInfo;
+ //          logger.fatal("time:"+m_ball.getTime()+"direction "+ m_ball.getDirection() +" distance"+ m_ball.getDistance());
            m_ball.setVisible(true);
          }
***************
*** 333,346 ****
    public void updateSenseBodyInfo(SenseBodyEvent f_senseBodyEvent)
    {
!     synchronized(m_senseBodyInfos)
      {
!       while(m_senseBodyInfos.size()>=STORAGE_COUNT_OF_INFOS)
!         m_senseBodyInfos.removeFirst();
!       if(!f_senseBodyEvent.getObjects().isEmpty())
!       {
!         m_senseBodyInfos.addLast(f_senseBodyEvent.getObjects().get(0));
!         logger.info("added a SenseBodyInfo to my List");
!       }
      }
    }
  
--- 316,328 ----
    public void updateSenseBodyInfo(SenseBodyEvent f_senseBodyEvent)
    {
! //   logger.fatal("turn count "+((SenseBodyInfo)f_senseBodyEvent.getObjects().get(0)).m_turnCount);
!     while(m_senseBodyInfos.size()>=STORAGE_COUNT_OF_INFOS)
!       m_senseBodyInfos.removeFirst();
!     if(!f_senseBodyEvent.getObjects().isEmpty())
      {
!       m_senseBodyInfos.addLast(f_senseBodyEvent.getObjects().get(0));
!       logger.info("added a SenseBodyInfo to my List");
      }
+ 
    }
  

Index: WorldDataAccessInterface.java
===================================================================
RCS file: /cvsroot/jais/jaisteam/src/jais/world/WorldDataAccessInterface.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WorldDataAccessInterface.java	13 Jul 2002 20:29:24 -0000	1.9
--- WorldDataAccessInterface.java	14 Jul 2002 14:01:23 -0000	1.10
***************
*** 1,7 ****
  package jais.world;
  
  import jais.objects.*;
- import java.util.ArrayList;
- import java.util.LinkedList;
  
  /**
--- 1,6 ----
  package jais.world;
  
+ import java.util.*;
  import jais.objects.*;
  
  /**