InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
shmyga
2014-08-26 12:08:45 +04:00
parent c08638c264
commit d32a35aa2f
22 changed files with 199 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/haxe/ru/m/tankz/Client.hx
View File

@@ -19,11 +19,13 @@ import haxework.log.TraceLogger;
class Client implements IConnectionHandler {
private static inline var TAG = "Armageddon";
private static inline var TAG = "Tankz";
public static function main() {
L.push(new TraceLogger());
#if flash
L.push(new JSLogger());
#end
L.d(TAG, Meta.getVersion());
new Client();
}

12
src/client/haxe/ru/m/tankz/config/TankzConfig.hx
View File

@@ -1,12 +0,0 @@
package ru.m.tankz.config;
typedef MapConfig = {
var cellWidth:Float;
var cellHeight:Float;
var gridWidth:Int;
var gridHeight:Int;
}
typedef TankzConfig = {
var map:MapConfig;
}

25
src/client/haxe/ru/m/tankz/core/Direction.hx
View File

@@ -1,25 +0,0 @@
package ru.m.tankz.core;
import haxe.ds.IntMap;
class Direction {
private static var directions:IntMap<Direction> = new IntMap<Direction>();
public static var LEFT(default, null) = new Direction(-1, 0);
public static var TOP(default, null) = new Direction(0, -1);
public static var RIGHT(default, null) = new Direction(1, 0);
public static var BOTTOM(default, null) = new Direction(0, 1);
public var x(default, null):Int;
public var y(default, null):Int;
public function new(x, y) {
this.x = x;
this.y = y;
directions.set(x + y * 10, this);
}
public function reverse():Direction {
return directions.get(-x + (-y) * 10);
}
}

17
src/client/haxe/ru/m/tankz/core/Entity.hx
View File

@@ -1,17 +0,0 @@
package ru.m.tankz.core;
import flash.geom.Point;
class Entity implements IEntity {
public var x(default, default):Float;
public var y(default, default):Float;
public var width(default, default):Float;
public var height(default, default):Float;
public function new(position:Point) {
x = position.x;
y = position.y;
}
}

9
src/client/haxe/ru/m/tankz/core/IEntity.hx
View File

@@ -1,9 +0,0 @@
package ru.m.tankz.core;
interface IEntity {
public var x(default, default):Float;
public var y(default, default):Float;
public var width(default, default):Float;
public var height(default, default):Float;
}

12
src/client/haxe/ru/m/tankz/core/IMobileEntity.hx
View File

@@ -1,12 +0,0 @@
package ru.m.tankz.core;
interface IMobileEntity extends IEntity {
public var mx(default, default):Float;
public var my(default, default):Float;
public var speed(default, null):Float;
public var direction(default, default):Direction;
public function move(direction:Direction):Void;
public function stop():Void;
}

8
src/client/haxe/ru/m/tankz/core/ITank.hx
View File

@@ -1,8 +0,0 @@
package ru.m.tankz.core;
interface ITank extends IMobileEntity {
public var bullets:Array<IMobileEntity>;
public function shot():Void;
public function destroyBullet(bullet:IMobileEntity):Void;
}

28
src/client/haxe/ru/m/tankz/core/MobileEntity.hx
View File

@@ -1,28 +0,0 @@
package ru.m.tankz.core;
import flash.geom.Point;
class MobileEntity extends Entity implements IMobileEntity {
public var mx(default, default):Float;
public var my(default, default):Float;
public var speed(default, null):Float;
public var direction(default, default):Direction;
public function new(position:Point, speed:Float, ?direction:Direction = null) {
super(position);
this.speed = speed;
this.direction = direction == null ? Direction.BOTTOM : direction;
}
public function move(direction:Direction):Void {
this.direction = direction;
mx = direction.x * speed;
my = direction.y * speed;
}
public function stop():Void {
mx = 0;
my = 0;
}
}

51
src/client/haxe/ru/m/tankz/core/PlayerTank.hx
View File

@@ -1,51 +0,0 @@
package ru.m.tankz.core;
import flash.geom.Point;
import ru.m.tankz.core.Tank.TankAction;
import flash.events.KeyboardEvent;
import flash.Lib;
class PlayerTank extends Tank {
private var keyBinding:Map<Int, TankAction>;
private var moveQueue:Array<Int>;
public function new(position:Point, keyBinding:Map<Int, TankAction>) {
super(position);
this.keyBinding = keyBinding;
moveQueue = new Array<Int>();
Lib.current.stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
Lib.current.stage.addEventListener(KeyboardEvent.KEY_UP, onKeyUp);
}
private function onKeyDown(event:KeyboardEvent):Void {
switch (keyBinding.get(event.keyCode)) {
case TankAction.MOVE(direction):
if (moveQueue.indexOf(event.keyCode) == -1) {
moveQueue.unshift(event.keyCode);
updateMove();
}
case TankAction.SHOT: shot();
}
}
private function onKeyUp(event:KeyboardEvent):Void {
switch (keyBinding.get(event.keyCode)) {
case TankAction.MOVE(direction):
moveQueue.remove(event.keyCode);
updateMove();
case _: {};
}
}
private function updateMove():Void {
if (moveQueue.length == 0) {
stop();
} else {
switch (keyBinding.get(moveQueue[0])) {
case TankAction.MOVE(direction): move(direction);
case _: {};
}
}
}
}

33
src/client/haxe/ru/m/tankz/core/Tank.hx
View File

@@ -1,33 +0,0 @@
package ru.m.tankz.core;
import flash.geom.Point;
enum TankAction {
MOVE(direction:Direction);
SHOT;
}
class Tank extends MobileEntity implements ITank {
public var bullets:Array<IMobileEntity>;
public function new(position:Point) {
super(position, 4);
bullets = new Array<IMobileEntity>();
width = 34;
height = 34;
}
public function shot():Void {
if (bullets.length >= 5) return;
var bullet = new MobileEntity(new Point(x + width / 2 - 5, y + height / 2 - 5), 6, direction);
bullet.width = 10;
bullet.height = 10;
bullet.move(direction);
bullets.push(bullet);
}
public function destroyBullet(bullet:IMobileEntity):Void {
bullets.remove(bullet);
}
}

15
src/client/haxe/ru/m/tankz/game/ITankz.hx
View File

@@ -1,15 +0,0 @@
package ru.m.tankz.game;
import ru.m.tankz.config.TankzConfig;
import ru.m.tankz.core.ITank;
import ru.m.tankz.map.ITankzMap;
interface ITankz {
public var config(default, default):TankzConfig;
public var map(default, null):ITankzMap;
public var tanks(default, null):Array<ITank>;
public function clear():Void;
public function init(config:TankzConfig):Void;
public function update():Void;
}

116
src/client/haxe/ru/m/tankz/game/Tankz.hx
View File

@@ -1,116 +0,0 @@
package ru.m.tankz.game;
import ru.m.tankz.core.Direction;
import ru.m.tankz.core.IMobileEntity;
import flash.geom.Point;
import flash.ui.Keyboard;
import flash.geom.Rectangle;
import ru.m.tankz.config.TankzConfig;
import ru.m.tankz.core.Tank;
import ru.m.tankz.core.PlayerTank;
import ru.m.tankz.map.TankzMap;
import ru.m.tankz.core.ITank;
import ru.m.tankz.map.ITankzMap;
class Tankz implements ITankz {
public var config(default, default):TankzConfig;
public var map(default, null):ITankzMap;
public var tanks(default, null):Array<ITank>;
private var x_limit:Float;
private var y_limit:Float;
public function new() {}
public function clear():Void {
tanks = [];
}
public function init(config:TankzConfig):Void {
this.config = config;
map = new TankzMap(config.map);
tanks = [
new PlayerTank(new Point(0, 0), [
Keyboard.A => TankAction.MOVE(Direction.LEFT),
Keyboard.S => TankAction.MOVE(Direction.BOTTOM),
Keyboard.W => TankAction.MOVE(Direction.TOP),
Keyboard.D => TankAction.MOVE(Direction.RIGHT),
Keyboard.SPACE => TankAction.SHOT
]),
new PlayerTank(new Point(100, 0), [
Keyboard.LEFT => TankAction.MOVE(Direction.LEFT),
Keyboard.DOWN => TankAction.MOVE(Direction.BOTTOM),
Keyboard.UP => TankAction.MOVE(Direction.TOP),
Keyboard.RIGHT => TankAction.MOVE(Direction.RIGHT),
Keyboard.SHIFT => TankAction.SHOT
])
];
x_limit = map.gridWidth * map.cellWidth;
y_limit = map.gridHeight * map.cellHeight;
}
public function update():Void {
for (tank in tanks) {
if (tank.direction.x != 0) {
tank.y = Math.round((tank.y + tank.height / 2) / config.map.cellHeight) * config.map.cellHeight - tank.height / 2;
}
if (tank.direction.y != 0) {
tank.x = Math.round((tank.x + tank.width / 2) / config.map.cellWidth) * config.map.cellWidth - tank.width / 2;
}
tank.x += tank.mx;
tank.y += tank.my;
var tankR = new Rectangle(tank.x, tank.y, tank.width, tank.height);
for (t in tanks) if (t != tank) {
var r = new Rectangle(t.x, t.y, t.width, t.height);
if (tankR.intersects(r)) {
if (tank.direction.x > 0) {
if (tank.x + tank.width > t.x) tank.x = t.x - tank.width;
} else if (tank.direction.x < 0) {
if (tank.x < t.x + t.width) tank.x = t.x + t.width;
}
if (tank.direction.y > 0) {
if (tank.y + tank.height > t.y) tank.y = t.y - tank.height;
} else if (tank.direction.y < 0) {
if (tank.y < t.y + t.height) tank.y = t.y + t.height;
}
}
}
if (tank.x < 0) tank.x = 0;
if (tank.x + tank.width > x_limit) tank.x = x_limit - tank.width;
if (tank.y < 0) tank.y = 0;
if (tank.y + tank.height > y_limit) tank.y = y_limit - tank.height;
updateBullets(tank);
}
}
private function updateBullets(tank:ITank):Void {
for (bullet in tank.bullets) {
bullet.x += bullet.mx;
bullet.y += bullet.my;
var bulletR = new Rectangle(bullet.x, bullet.y, bullet.width, bullet.height);
var i = 0;
while (i < tanks.length) {
var t = tanks[i++];
if (t != tank) {
var r = new Rectangle(t.x, t.y, t.width, t.height);
if (bulletR.intersects(r)) {
tank.destroyBullet(bullet);
tanks.remove(t);
i--;
}
}
}
if (bullet.x < 0 || bullet.x + bullet.width > x_limit || bullet.y < 0 || bullet.y + bullet.height > y_limit) {
tank.destroyBullet(bullet);
}
}
}
}

8
src/client/haxe/ru/m/tankz/map/ITankzMap.hx
View File

@@ -1,8 +0,0 @@
package ru.m.tankz.map;
interface ITankzMap {
public var cellWidth(default, null):Float;
public var cellHeight(default, null):Float;
public var gridWidth(default, null):Int;
public var gridHeight(default, null):Int;
}

18
src/client/haxe/ru/m/tankz/map/TankzMap.hx
View File

@@ -1,18 +0,0 @@
package ru.m.tankz.map;
import ru.m.tankz.config.TankzConfig.MapConfig;
class TankzMap implements ITankzMap {
public var cellWidth(default, null):Float;
public var cellHeight(default, null):Float;
public var gridWidth(default, null):Int;
public var gridHeight(default, null):Int;
public function new(config:MapConfig) {
cellWidth = config.cellWidth;
cellHeight = config.cellHeight;
gridWidth = config.gridWidth;
gridHeight = config.gridHeight;
}
}

2
src/client/haxe/ru/m/tankz/view/frames/AuthFrame.hx
View File

@@ -74,7 +74,7 @@ class AuthFrame extends VGroupView implements IPacketHandler {
so.setProperty("password", passwordInput.text);
so.flush();
Provider.get(GameData).account = packet.account;
Provider.get(IFrameSwitcher).change(PersonFrame.ID);
Provider.get(IFrameSwitcher).change(PersonListFrame.ID);
}
public function onErrorResponse(packet:ErrorResponse):Void {

69
src/client/haxe/ru/m/tankz/view/frames/GameListFrame.hx Normal file
View File

@@ -0,0 +1,69 @@
package ru.m.tankz.view.frames;
import ru.m.tankz.proto.CreateGameResponse;
import ru.m.tankz.proto.CreateGameRequest;
import ru.m.tankz.view.frames.game.GameView;
import haxework.frame.IFrameSwitcher;
import haxework.gui.ButtonView;
import haxework.gui.LabelView;
import ru.m.tankz.proto.GamesResponse;
import ru.m.tankz.proto.GamesRequest;
import ru.m.tankz.proto.Game;
import haxework.gui.list.ListView;
import protohx.Message;
import ru.m.core.connect.IConnection;
import ru.m.tankz.data.GameData;
import haxework.provider.Provider;
import haxework.gui.list.VListView;
import haxework.gui.VGroupView;
class GameListFrame extends VGroupView implements IPacketHandler implements ListViewListener<Game> {
private static inline var TAG = "GameListFrame";
public static inline var ID = "game_list";
private var list:VListView<Game>;
public function new() {
super();
}
public function init() {
list = findViewById("list");
list.dispatcher.addListener(this);
findViewById("logout", ButtonView).onPress = this;
findViewById("create", ButtonView).onPress = this;
}
public function onShow() {
findViewById("name", LabelView).text = Provider.get(GameData).person.name;
Provider.get(IConnection).packetHandler = this;
Provider.get(IConnection).send(new GamesRequest());
}
public function onListItemClick(item:IListItemView<Game>):Void {
L.d(TAG, "game selected: ", item.data.id);
Provider.get(IFrameSwitcher).change(GameFrame.ID);
}
public function onGamesResponse(packet:GamesResponse):Void {
list.data = packet.games;
}
public function onCreateGameResponse(packet:CreateGameResponse):Void {
list.data.push(packet.game);
list.update();
}
public function onPacket(packet:Message):Void {}
public function onPress(view:ButtonView):Void {
switch (view.id) {
case "logout":
Provider.get(IConnection).disconnect();
case "create":
Provider.get(IConnection).send(new CreateGameRequest());
}
}
}

9
src/client/haxe/ru/m/tankz/view/frames/PersonFrame.hx → src/client/haxe/ru/m/tankz/view/frames/PersonListFrame.hx
View File

@@ -1,5 +1,6 @@
package ru.m.tankz.view.frames;
import ru.m.tankz.view.frames.GameListFrame;
import haxework.frame.IFrameSwitcher;
import ru.m.tankz.proto.PersonSelectResponse;
import ru.m.tankz.proto.PersonSelectRequest;
@@ -13,11 +14,11 @@ import ru.m.tankz.proto.Person;
import haxework.gui.list.VListView;
import haxework.gui.HGroupView;
class PersonFrame extends HGroupView implements IPacketHandler implements ListViewListener<Person> {
class PersonListFrame extends HGroupView implements IPacketHandler implements ListViewListener<Person> {
private static inline var TAG = "PersonFrame";
private static inline var TAG = "PersonListFrame";
public static inline var ID = "person";
public static inline var ID = "person_list";
private var list:VListView<Person>;
@@ -41,7 +42,7 @@ class PersonFrame extends HGroupView implements IPacketHandler implements ListVi
public function onPersonSelectResponse(packet:PersonSelectResponse):Void {
Provider.get(GameData).person = packet.person;
Provider.get(IFrameSwitcher).change(GameFrame.ID);
Provider.get(IFrameSwitcher).change(GameListFrame.ID);
}
public function onPacket(packet:Message):Void {}

31
src/client/haxe/ru/m/tankz/view/frames/game/GameView.hx Normal file
View File

@@ -0,0 +1,31 @@
package ru.m.tankz.view.frames.game;
import ru.m.tankz.proto.Game;
import haxework.gui.list.ListView.IListItemView;
import haxework.gui.LabelView;
import haxework.gui.skin.ColorSkin;
import haxework.gui.HGroupView;
class GameView extends HGroupView implements IListItemView<Game> {
public var item_index(default, default):Int;
public var data(default, set):Game;
private var nameLabel:LabelView;
public function new() {
super();
pWidth = 100;
height = 50;
skin = new ColorSkin(0xffffff);
nameLabel = new LabelView();
addView(nameLabel);
}
private function set_data(value:Game):Game {
this.data = value;
nameLabel.text = "Game_" + this.data.id;
return this.data;
}
}