This commit is contained in:
Jesper Lundin 2007-04-16 13:25:25 +00:00
parent 380415f035
commit 79ae1d0dcc
3 changed files with 27 additions and 5 deletions

View file

@ -3,10 +3,12 @@ package ei.game.scene.units;
import ei.engine.math.Vector2f;
import ei.engine.math.Vector2i;
import ei.engine.math.Vector3f;
import ei.engine.scene.Node;
import ei.engine.scene.Sprite;
import ei.game.gamestate.InGameState;
import ei.game.scene.GameEntity;
import ei.game.scene.Map;
import ei.game.scene.weapons.Weapon;
/**
@ -74,7 +76,7 @@ public abstract class Unit extends GameEntity{
InGameState.getMap().removePos(oldPos.getX(), oldPos.getY());
}
setPos(x, y);
moveTo = InGameState.getMap().getPixelByPos((int)x, (int)y);
moveTo = Map.getPixelByPos((int)x, (int)y);
oldPos = new Vector2i(x, y);
}
@ -83,6 +85,26 @@ public abstract class Unit extends GameEntity{
*/
public void update() {
if(moveTo!=null) {
Vector2i moveVect = Map.getPosByPixel(moveTo.getX(), moveTo.getY());
Vector2i currentVect = Map.getPosByPixel(unitNode.getLocation().getX(), unitNode.getLocation().getY());
//System.out.println("going to: "+moveVect);
//System.out.println("from: "+currentVect);
Vector3f currentRot = null;
if(moveVect.getX() < currentVect.getX()) {
unitNode.get("Tank").setRotation(new Vector3f(0, 0, 90));
}
if(moveVect.getX() > currentVect.getX()) {
unitNode.get("Tank").setRotation(new Vector3f(0, 0, -90));
}
if(moveVect.getY() < currentVect.getY()) {
unitNode.get("Tank").setRotation(new Vector3f(0, 0, 180));
}
if(moveVect.getY() > currentVect.getY()) {
unitNode.get("Tank").setRotation(new Vector3f(0, 0, 0));
}
//System.out.println(unitNode.get("Tank").getRotation());
if(moveTo.getX() > unitNode.getLocation().getX()) {
unitNode.getLocation().add(1.5f, 0f, 0f);
}