update

build/client.js

@@ -1,7 +1,5 @@
-"use strict";
 const gulp = require('gulp');
 const yargs = require('yargs');
-const tail = require('../tasks/tail');
 const Haxe = require('../tasks/haxe');
 const FlashPlayer = require('../tasks/flashplayer');
 const version = require('./version');
@@ -26,7 +24,6 @@ const test = (build) => function test() {
     const argv = yargs.argv;
     return build()
             .pipe(new FlashPlayer().run(argv.dev))
-            //.pipe(tail(debug.log));
             .pipe(debug());
 };
 

build/server.js

@@ -1,7 +1,5 @@
-"use strict";
 const gulp = require('gulp');
 const yargs = require('yargs');
-const tail = require('../tasks/tail');
 const Haxe = require('../tasks/haxe');
 const FlashPlayer = require('../tasks/flashplayer');
 const Neko = require('../tasks/neko');

src/client/haxe/layout/frames/start.json

@@ -0,0 +1,28 @@
+{
+    "pWidth": 100, "pHeight": 100,
+    "views": [
+        {
+            "@type": "haxework.gui.ImageView",
+            "image": "@asset:image:resources/images/logo/logo.png",
+            "contentSize": true, "bottomMargin": 15
+        },
+        {
+            "id": "start_1p",
+            "@type": "haxework.gui.ButtonView",
+            "text": "1 Player",
+            "@style": "button"
+        },
+        {
+            "id": "start_2p",
+            "@type": "haxework.gui.ButtonView",
+            "text": "2 Player",
+            "@style": "button"
+        },
+        {
+            "id": "start_lan",
+            "@type": "haxework.gui.ButtonView",
+            "text": "Multiplayer",
+            "@style": "button"
+        }
+    ]
+}

src/client/haxe/layout/main.json

@@ -3,6 +3,7 @@
   "pWidth": 100, "pHeight": 100,
   "views": [
     {
+      "visible": false, "inLayout": false,
       "id":"top", "@type": "haxework.gui.HGroupView",
       "pWidth": 100, "height": 44,
       "skin": {
@@ -34,6 +35,10 @@
         "fillType": "REPEAT"
       },
       "views": [
+        {
+          "id": "start",
+          "@type": "ru.m.tankz.view.frames.StartFrame"
+        },
         {
           "id": "auth",
           "@type": "ru.m.tankz.view.frames.AuthFrame"

src/client/haxe/layout/styles.json

@@ -1,18 +1,6 @@
 {
-  "_button_skin": {
+  "button": {
-    "skin": {
+    "width":250, "height":60,
-      "@type": "haxework.gui.skin.ButtonBitmapSkin",
-      "image": "@asset:image:resources/images/map/map_4.png",
-      "fillType": "REPEAT"
-    },
-    "fontColor": "0xffffff",
-    "fontEmbed": true,
-    "fontFamily": "@res:text:fontName",
-    "fontSize": 16,
-    "shadowColor": "0x000000"
-  },
-
-  "button_skin": {
     "skin": {
       "@type": "haxework.gui.skin.ButtonBitmapSkin",
       "upImage": "@asset:image:resources/images/control/button_normal.png",
@@ -20,7 +8,7 @@
       "overImage": "@asset:image:resources/images/control/button_over.png",
       "fillType": "NINEPATH"
     },
-    "fontColor": "0xffffff"
+    "fontFamily":"@res:text:font", "fontEmbed":true, "fontColor":"0xE7E0BB", "fontSize":20
   },
 
   "label": {

src/client/haxe/ru/m/tankz/Client.hx

@@ -1,5 +1,7 @@
 package ru.m.tankz;
 
+import flash.text.Font;
+import ru.m.tankz.view.frames.StartFrame;
 import haxework.log.SocketLogger;
 import haxework.resources.Resources;
 import haxework.resources.IResources;
@@ -49,9 +51,8 @@ class Client implements IConnectionHandler {
     Provider.setFactory(IResources, Resources);
     Provider.setFactory(GameData, GameData);
 
-    //var font = Assets.getFont("resources/fonts/8-BIT WONDER.TTF");
+    var font:Font = Font.enumerateFonts()[0];
-    //Provider.get(IResources).text.put("fontName", font.fontName);
+    Provider.get(IResources).text.put("font", "Bookman Old Style");
-    Provider.get(IResources).text.put("fontName", "Arial");
 
     Provider.set(IPacketBuilder, new PacketBuilder());
     #if flash
@@ -66,7 +67,7 @@ class Client implements IConnectionHandler {
     Provider.set(IFrameSwitcher, view.switcher);
     Root.bind(view);
     view.logout.onPress = this;
-    view.switcher.change(AuthFrame.ID);
+    view.switcher.change(StartFrame.ID);
   }
 
   public function onPress(view:ButtonView):Void {

src/client/haxe/ru/m/tankz/core/PlayerTank.hx

@@ -30,11 +30,11 @@ class PlayerTank extends Tank {
         }
       case TankAction.SHOT:
         //ToDo:
-        //shot();
+        shot();
-        Provider.get(IConnection).send(
+        /*Provider.get(IConnection).send(
           new GameActionRequest()
             .setType(GameActionType.SHOT)
-        );
+        );*/
     }
   }
 
@@ -49,22 +49,22 @@ class PlayerTank extends Tank {
 
   private function updateMove():Void {
     if (moveQueue.length == 0) {
-      //stop();
+      stop();
-      Provider.get(IConnection).send(
+      /*Provider.get(IConnection).send(
         new GameActionRequest()
           .setType(GameActionType.STOP)
-      );
+      );*/
     } else {
       switch (keyBinding.get(moveQueue[0])) {
         case TankAction.MOVE(direction):
           //ToDo:
-          //move(direction);
+          move(direction);
-          Provider.get(IConnection).send(
+          /*Provider.get(IConnection).send(
             new GameActionRequest()
               .setType(GameActionType.MOVE)
               .setDirectionX(direction.x)
               .setDirectionY(direction.y)
-          );
+          );*/
         case _:
       }
     }

src/client/haxe/ru/m/tankz/view/frames/GameFrame.hx

@@ -29,6 +29,7 @@ class GameFrame extends VGroupView implements ViewBuilder implements IPacketHand
     var persons = Provider.get(GameData).game.persons;
     engine.personId = person.id;
     engine.init(DEFAULT.CONFIG);
+    engine.initTanks(persons);
     content.addEventListener(Event.ENTER_FRAME, updateGame);
     Provider.get(IConnection).packetHandler.addListener(this);
     render.draw(engine);
@@ -41,8 +42,8 @@ class GameFrame extends VGroupView implements ViewBuilder implements IPacketHand
   }
 
   private function updateGame(_):Void {
-    //game.update();
+    engine.update();
-    //render.draw(game);
+    render.draw(engine);
   }
 
   public function onGameUpdateResponse(packet:GameUpdateResponse):Void {

src/client/haxe/ru/m/tankz/view/frames/StartFrame.hx

@@ -0,0 +1,35 @@
+package ru.m.tankz.view.frames;
+
+import ru.m.tankz.proto.Person;
+import ru.m.tankz.proto.Game;
+import haxework.gui.frame.IFrameSwitcher;
+import ru.m.tankz.data.GameData;
+import haxework.provider.Provider;
+import haxework.gui.ButtonView;
+import haxework.gui.ViewBuilder;
+import haxework.gui.VGroupView;
+
+@:template("layout/frames/start.json", "layout/styles.json")
+class StartFrame extends VGroupView implements ViewBuilder {
+
+    public static inline var ID = "start";
+
+    public function init() {
+        start_1p.onPress = this;
+    }
+
+    public function onPress(view:ButtonView):Void {
+        switch (view.id) {
+            case "start_1p":
+                var player = new Person();
+                player.id = 1;
+                var game = new Game();
+                game.creator = player;
+                game.persons.push(player);
+                game.id = 1;
+                Provider.get(GameData).person = player;
+                Provider.get(GameData).game = game;
+                Provider.get(IFrameSwitcher).change(GameFrame.ID);
+        }
+    }
+}

tasks/adobeAir.js

@@ -1,4 +1,3 @@
-"use strict";
 const fs = require('fs');
 const tmp = require('tmp-file');
 const gutil = require('gulp-util');

tasks/android.js

@@ -1,72 +0,0 @@
-"use strict";
-const exec = require('./exec');
-const fs = require('fs');
-const through = require('through2');
-
-
-const Android = {
-    adb: (args) => {
-        const adbBin = `${process.env.ANDROID_HOME}/platform-tools/adb.exe`;
-        return exec('.', [adbBin].concat(args).join(' ')).then((data) => {
-            for (let line of data.stderr.split('\n')) {
-                if (line.indexOf('Error') > -1) {
-                    throw line;
-                }
-            }
-        });
-    },
-
-    aapt: (args) => {
-        let buildToolsVersion = null;
-        fs.readdirSync(`${process.env.ANDROID_HOME}/build-tools`).forEach(file => {
-            buildToolsVersion = file;
-        });
-        const aaptBin = `${process.env.ANDROID_HOME}/build-tools/${buildToolsVersion}/aapt.exe`;
-        return exec('.', [aaptBin].concat(args).join(' '));
-    },
-
-    apk: () => {
-        return through.obj(function(file, enc, callback) {
-            Android.aapt(['l', '-a', file.path]).then((data) => {
-                let activity = false;
-                for (let line of data.stdout.split('\n')) {
-                    if (line.indexOf('package') > -1) {
-                        const value = /"(.*?)"/.exec(line);
-                        if (value) file.package = value[1]
-                    }
-                    if (line.indexOf('activity') > -1) {
-                        activity = true;
-                    }
-                    if (activity && line.indexOf('name') > -1) {
-                        const value = /"(.*?)"/.exec(line);
-                        if (value) {
-                            file.activity = value[1];
-                            activity = false;
-                        }
-                    }
-                }
-                this.push(file);
-                callback();
-            });
-        });
-    },
-
-    install: () => {
-        return through.obj(function(file, enc, callback) {
-            Android.adb(['install', '-r', file.path]).then(() => {
-                this.push(file);
-                callback();
-            });
-        });
-    },
-
-    start: () => {
-        return through.obj((file, enc, callback) => {
-            const name = `${file.package}/${file.activity}`;
-            Android.adb(['shell', 'am', 'start', '-n', name]).then(() => callback());
-        });
-    }
-};
-
-
-module.exports = Android;

tasks/haxe.js

@@ -1,4 +1,3 @@
-"use strict";
 const fs = require('fs');
 const os = require('os');
 const path = require('path');

tasks/sdk.js

@@ -1,4 +1,3 @@
-"use strict";
 const os = require('os');
 const gulp = require('gulp');
 const gutil = require('gulp-util');

tasks/tail.js

@@ -1,26 +0,0 @@
-'use strict';
-const through = require('through2');
-const gutil = require('gulp-util');
-const col = gutil.colors;
-const Tail = require('tail').Tail;
-
-module.exports = (handler) => {
-    let stream = null;
-    let tail = null;
-
-    const bufferContents = (file, enc, callback) => {
-        tail = new Tail(file.path);
-        tail.on("line", handler);
-        callback();
-    };
-
-    const endStream = (callback) => {
-        if (tail) {
-            tail.unwatch();
-            tail = null;
-        }
-        callback();
-    };
-
-    return stream = through.obj(bufferContents, endStream);
-};