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

[client] update haxework

Browse Source
This commit is contained in:
shmyga
2019-03-25 16:45:54 +03:00
parent a9b591a7ca
commit 7d570336a5
53 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/haxe/ru/m/skin/ButtonSVGSkin.hx
View File

@@ -2,9 +2,9 @@ package ru.m.skin;
import haxework.color.ColorUtil; import haxework.color.ColorUtil;
import haxework.color.Color; import haxework.color.Color;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import format.SVG; import format.SVG;
import haxework.gui.skin.ISkin; import haxework.view.skin.ISkin;
class ButtonSVGSkin implements ISkin<ButtonView> { class ButtonSVGSkin implements ISkin<ButtonView> {

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

@@ -3,7 +3,7 @@ package ru.m.tankz;
import ru.m.tankz.view.ClientView; import ru.m.tankz.view.ClientView;
import flash.Lib; import flash.Lib;
import haxework.animate.Animate; import haxework.animate.Animate;
import haxework.gui.Root; import haxework.view.Root;
import haxework.log.TraceLogger; import haxework.log.TraceLogger;
#if flash import haxework.log.JSLogger; #end #if flash import haxework.log.JSLogger; #end
#if debug import haxework.log.SocketLogger; #end #if debug import haxework.log.SocketLogger; #end

2
src/client/haxe/ru/m/tankz/Init.hx
View File

@@ -1,6 +1,6 @@
package ru.m.tankz; package ru.m.tankz;
import haxework.gui.popup.PopupManager; import haxework.view.popup.PopupManager;
import ru.m.tankz.storage.SettingsStorage; import ru.m.tankz.storage.SettingsStorage;
import haxework.provider.Provider; import haxework.provider.Provider;
import haxework.resources.IResources; import haxework.resources.IResources;

16
src/client/haxe/ru/m/tankz/Style.hx
View File

@@ -3,13 +3,13 @@ package ru.m.tankz;
import flash.text.Font; import flash.text.Font;
import flash.text.FontType; import flash.text.FontType;
import haxework.color.ColorUtil; import haxework.color.ColorUtil;
import haxework.gui.core.Geometry; import haxework.view.core.Geometry;
import haxework.gui.core.HAlign; import haxework.view.core.HAlign;
import haxework.gui.core.VAlign; import haxework.view.core.VAlign;
import haxework.gui.ITextView; import haxework.view.ITextView;
import haxework.gui.layout.Layout; import haxework.view.layout.Layout;
import haxework.gui.skin.ISkin; import haxework.view.skin.ISkin;
import haxework.gui.skin.Skin; import haxework.view.skin.Skin;
import haxework.resources.IResources; import haxework.resources.IResources;
import openfl.Assets; import openfl.Assets;
import ru.m.skin.ButtonSVGSkin; import ru.m.skin.ButtonSVGSkin;
@@ -57,7 +57,7 @@ class Style {
Skin.text(textColor, baseFontSize, fontFamily, fontEmbed), Skin.text(textColor, baseFontSize, fontFamily, fontEmbed),
]); ]);
resources.skin.put("scroll.vertical", [ resources.skin.put("scroll.vertical", [
haxework.gui.skin.Skin.scrollVertical(lightColor, darkColor), haxework.view.skin.Skin.scrollVertical(lightColor, darkColor),
]); ]);
resources.skin.put("text.header", [ resources.skin.put("text.header", [
Skin.color(0x000000, 0.1), Skin.color(0x000000, 0.1),

2
src/client/haxe/ru/m/tankz/render/AnimateBundle.hx
View File

@@ -1,6 +1,6 @@
package ru.m.tankz.render; package ru.m.tankz.render;
import haxework.gui.utils.BitmapUtil; import haxework.view.utils.BitmapUtil;
import haxework.color.Color; import haxework.color.Color;
import flash.display.BitmapData; import flash.display.BitmapData;
import openfl.Assets; import openfl.Assets;

2
src/client/haxe/ru/m/tankz/render/Render.hx
View File

@@ -7,7 +7,7 @@ import flash.display.Sprite;
import flash.text.TextField; import flash.text.TextField;
import flash.text.TextFormat; import flash.text.TextFormat;
import haxe.Timer; import haxe.Timer;
import haxework.gui.SpriteView; import haxework.view.SpriteView;
import haxework.provider.Provider; import haxework.provider.Provider;
import haxework.resources.IResources; import haxework.resources.IResources;
import ru.m.animate.Animate; import ru.m.animate.Animate;

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

@@ -3,7 +3,7 @@ package ru.m.tankz.view;
import flash.events.KeyboardEvent; import flash.events.KeyboardEvent;
import flash.text.Font; import flash.text.Font;
import flash.ui.Keyboard; import flash.ui.Keyboard;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.resources.IResources; import haxework.resources.IResources;
@:template class ClientView extends FrameSwitcher { @:template class ClientView extends FrameSwitcher {

2
src/client/haxe/ru/m/tankz/view/ClientView.yaml
View File

@@ -1,5 +1,5 @@
--- ---
$type: haxework.gui.frame.FrameSwitcher $type: haxework.view.frame.FrameSwitcher
geometry.size.stretch: true geometry.size.stretch: true
skinId: dark skinId: dark
views: views:

14
src/client/haxe/ru/m/tankz/view/NetworkFrame.hx
View File

@@ -1,12 +1,12 @@
package ru.m.tankz.view; package ru.m.tankz.view;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.frame.IFrameSwitcher; import haxework.view.frame.IFrameSwitcher;
import haxework.gui.IGroupView; import haxework.view.IGroupView;
import haxework.gui.InputView; import haxework.view.InputView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.list.ListView; import haxework.view.list.ListView;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import haxework.provider.Provider; import haxework.provider.Provider;
import ru.m.tankz.game.GameState; import ru.m.tankz.game.GameState;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;

38
src/client/haxe/ru/m/tankz/view/NetworkFrame.yaml
View File

@@ -3,88 +3,88 @@ pWidth: 100
pHeight: 100 pHeight: 100
views: views:
- id: frameSwitcher - id: frameSwitcher
$type: haxework.gui.frame.FrameSwitcher $type: haxework.view.frame.FrameSwitcher
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
views: views:
# login # login
- id: loginFrame - id: loginFrame
$type: haxework.gui.VGroupView $type: haxework.view.VGroupView
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
views: views:
- id: stateLabel - id: stateLabel
$type: haxework.gui.LabelView $type: haxework.view.LabelView
$style: label $style: label
text: offline text: offline
width: 200 width: 200
height: 50 height: 50
- id: nameInput - id: nameInput
$type: haxework.gui.InputView $type: haxework.view.InputView
$style: label $style: label
width: 200 width: 200
height: 50 height: 50
text: User text: User
skin: skin:
$type: haxework.gui.skin.ColorSkin $type: haxework.view.skin.ColorSkin
color: '#444444' color: '#444444'
- id: loginButton - id: loginButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
$style: button $style: button
text: Login text: Login
# game list # game list
- id: gameListFrame - id: gameListFrame
$type: haxework.gui.VGroupView $type: haxework.view.VGroupView
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
views: views:
- id: createGameButton - id: createGameButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
$style: button $style: button
text: Create text: Create
- id: gameList - id: gameList
$type: haxework.gui.list.VListView<ru.m.tankz.proto.core.GameInfoProto> $type: haxework.view.list.VListView<ru.m.tankz.proto.core.GameInfoProto>
factory: "@class:ru.m.tankz.view.network.GameItemView" factory: "@class:ru.m.tankz.view.network.GameItemView"
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
paddings: 10 paddings: 10
scroll: scroll:
$type: haxework.gui.list.VScrollView $type: haxework.view.list.VScrollView
width: 10 width: 10
pHeight: 100 pHeight: 100
skin: skin:
$type: haxework.gui.list.VScrollSkin $type: haxework.view.list.VScrollSkin
skin: skin:
$type: haxework.gui.skin.ColorSkin $type: haxework.view.skin.ColorSkin
color: "#000000" color: "#000000"
alpha: 0 alpha: 0
# game # game
- id: gameFrame - id: gameFrame
$type: haxework.gui.VGroupView $type: haxework.view.VGroupView
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
views: views:
- id: startGameButton - id: startGameButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
$style: button $style: button
text: Start text: Start
- id: leaveGameButton - id: leaveGameButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
$style: button $style: button
text: Leave text: Leave
- id: userList - id: userList
$type: haxework.gui.list.VListView<ru.m.tankz.proto.core.UserProto> $type: haxework.view.list.VListView<ru.m.tankz.proto.core.UserProto>
factory: "@class:ru.m.tankz.view.network.UserItemView" factory: "@class:ru.m.tankz.view.network.UserItemView"
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
paddings: 10 paddings: 10
scroll: scroll:
$type: haxework.gui.list.VScrollView $type: haxework.view.list.VScrollView
width: 10 width: 10
pHeight: 100 pHeight: 100
skin: skin:
$type: haxework.gui.list.VScrollSkin $type: haxework.view.list.VScrollSkin
skin: skin:
$type: haxework.gui.skin.ColorSkin $type: haxework.view.skin.ColorSkin
color: "#000000" color: "#000000"
alpha: 0 alpha: 0

10
src/client/haxe/ru/m/tankz/view/ResultFrame.hx
View File

@@ -1,10 +1,10 @@
package ru.m.tankz.view; package ru.m.tankz.view;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.DataView; import haxework.view.DataView;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import ru.m.tankz.control.Control; import ru.m.tankz.control.Control;
import ru.m.tankz.view.classic.ClassicGameFrame; import ru.m.tankz.view.classic.ClassicGameFrame;
import ru.m.tankz.view.common.LifeView; import ru.m.tankz.view.common.LifeView;

16
src/client/haxe/ru/m/tankz/view/ResultFrame.yaml
View File

@@ -1,29 +1,29 @@
--- ---
views: views:
- $type: haxework.gui.VGroupView - $type: haxework.view.VGroupView
skinId: container skinId: container
views: views:
- id: level - id: level
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text.header skinId: text.header
- id: result - id: result
$type: haxework.gui.DataView $type: haxework.view.DataView
factory: $this:playerViewFactory factory: $this:playerViewFactory
geometry.margin.top: 20 geometry.margin.top: 20
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
hAlign: right hAlign: right
margin: 10 margin: 10
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
skinId: panel skinId: panel
views: views:
- id: close - id: close
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.close skinId: button.close
+onPress: $code:close() +onPress: $code:close()
- $type: haxework.gui.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 100% geometry.size.width: 100%
- id: next - id: next
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.next skinId: button.next
+onPress: $code:next() +onPress: $code:next()

6
src/client/haxe/ru/m/tankz/view/SettingsFrame.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view; package ru.m.tankz.view;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
@:template class SettingsFrame extends VGroupView { @:template class SettingsFrame extends VGroupView {

10
src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml
View File

@@ -1,22 +1,22 @@
--- ---
views: views:
- $type: haxework.gui.VGroupView - $type: haxework.view.VGroupView
skinId: container skinId: container
views: views:
- $type: haxework.gui.LabelView - $type: haxework.view.LabelView
skinId: text.header skinId: text.header
text: Settings text: Settings
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
layout.margin: 20 layout.margin: 20
views: views:
- $type: ru.m.tankz.view.settings.SettingsEditor - $type: ru.m.tankz.view.settings.SettingsEditor
controlIndex: 0 controlIndex: 0
- $type: ru.m.tankz.view.settings.SettingsEditor - $type: ru.m.tankz.view.settings.SettingsEditor
controlIndex: 1 controlIndex: 1
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
skinId: panel skinId: panel
views: views:
- id: close - id: close
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.close skinId: button.close
+onPress: $this:onPress +onPress: $this:onPress

6
src/client/haxe/ru/m/tankz/view/StartFrame.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view; package ru.m.tankz.view;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import ru.m.tankz.view.classic.ClassicLevelFrame; import ru.m.tankz.view.classic.ClassicLevelFrame;
import ru.m.tankz.view.dota.DotaLevelFrame; import ru.m.tankz.view.dota.DotaLevelFrame;
import ru.m.tankz.view.popup.FontPopup; import ru.m.tankz.view.popup.FontPopup;

20
src/client/haxe/ru/m/tankz/view/StartFrame.yaml
View File

@@ -1,43 +1,43 @@
--- ---
views: views:
- $type: haxework.gui.VGroupView - $type: haxework.view.VGroupView
skinId: container skinId: container
layout.margin: 10 layout.margin: 10
views: views:
- $type: haxework.gui.ImageView - $type: haxework.view.ImageView
image: $asset:image:resources/image/ui/logo.png image: $asset:image:resources/image/ui/logo.png
geometry.margin.bottom: 30 geometry.margin.bottom: 30
- id: classic - id: classic
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button skinId: button
+onPress: $this:onPress +onPress: $this:onPress
text: Classic text: Classic
- id: dota - id: dota
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button skinId: button
+onPress: $this:onPress +onPress: $this:onPress
text: DotA text: DotA
# - id: font # - id: font
# $type: haxework.gui.ButtonView # $type: haxework.view.ButtonView
# skinId: button # skinId: button
# +onPress: $code:choiceFont() # +onPress: $code:choiceFont()
# text: Font # text: Font
# - id: network # - id: network
# $type: haxework.gui.ButtonView # $type: haxework.view.ButtonView
# skinId: button # skinId: button
# +onPress: $this:onPress # +onPress: $this:onPress
# text: Network (in developing) # text: Network (in developing)
# fontColor: 0xff0000 # fontColor: 0xff0000
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
skinId: panel skinId: panel
views: views:
- id: settings - id: settings
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.settings skinId: button.settings
+onPress: $this:onPress +onPress: $this:onPress
- $type: haxework.gui.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 100% geometry.size.width: 100%
- $type: haxework.gui.LabelView - $type: haxework.view.LabelView
geometry.padding: [20, 5] geometry.padding: [20, 5]
skinId: text.box skinId: text.box
text: $r:text:version text: $r:text:version

2
src/client/haxe/ru/m/tankz/view/classic/ClassicGameFrame.yaml
View File

@@ -1,7 +1,7 @@
--- ---
skinId: container skinId: container
views: views:
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
layout.margin: 5 layout.margin: 5
views: views:
- id: render - id: render

4
src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.classic; package ru.m.tankz.view.classic;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import ru.m.tankz.view.common.IGamePanel; import ru.m.tankz.view.common.IGamePanel;
import ru.m.tankz.view.common.LifeView; import ru.m.tankz.view.common.LifeView;
import ru.m.tankz.game.Game; import ru.m.tankz.game.Game;

4
src/client/haxe/ru/m/tankz/view/classic/ClassicGamePanel.yaml
View File

@@ -5,11 +5,11 @@ layout.margin: 5
layout.hAlign: right layout.hAlign: right
views: views:
- id: level - id: level
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 38 geometry.size.height: 38
geometry.size.width: 100% geometry.size.width: 100%
- $type: haxework.gui.SpriteView - $type: haxework.view.SpriteView
geometry.size.height: 50% geometry.size.height: 50%
- id: bot - id: bot
$type: ru.m.tankz.view.common.LifeView $type: ru.m.tankz.view.common.LifeView

8
src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.classic; package ru.m.tankz.view.classic;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.DataView; import haxework.view.DataView;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.gui.ToggleButtonView; import haxework.view.ToggleButtonView;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;
import ru.m.tankz.view.common.LevelFrame; import ru.m.tankz.view.common.LevelFrame;
import ru.m.tankz.preset.ClassicGame; import ru.m.tankz.preset.ClassicGame;

12
src/client/haxe/ru/m/tankz/view/classic/ClassicLevelFrame.yaml
View File

@@ -1,24 +1,24 @@
--- ---
skinId: container skinId: container
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
views: views:
- $type: haxework.gui.LabelView - $type: haxework.view.LabelView
skinId: text.header skinId: text.header
text: Classic text: Classic
- id: presets - id: presets
$type: haxework.gui.DataView $type: haxework.view.DataView
layout: layout:
$type: haxework.gui.layout.HorizontalLayout $type: haxework.view.layout.HorizontalLayout
hAlign: center hAlign: center
margin: 2 margin: 2
factory: $this:presetViewFactory factory: $this:presetViewFactory
+onDataSelect: $code:function(value) preset = value +onDataSelect: $code:function(value) preset = value
geometry.padding: 10 geometry.padding: 10
- id: levels - id: levels
$type: haxework.gui.DataView $type: haxework.view.DataView
layout: layout:
$type: haxework.gui.layout.TailLayout $type: haxework.view.layout.TailLayout
rowSize: 10 rowSize: 10
margin: 5 margin: 5
factory: $this:levelViewFactory factory: $this:levelViewFactory

4
src/client/haxe/ru/m/tankz/view/common/GameFrame.hx
View File

@@ -4,8 +4,8 @@ import ru.m.tankz.game.GameState;
import flash.events.Event; import flash.events.Event;
import haxe.ds.Option; import haxe.ds.Option;
import haxe.Timer; import haxe.Timer;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.gui.GroupView; import haxework.view.GroupView;
import ru.m.tankz.view.common.IGamePanel; import ru.m.tankz.view.common.IGamePanel;
import ru.m.tankz.game.Game; import ru.m.tankz.game.Game;
import ru.m.tankz.network.NetworkManager; import ru.m.tankz.network.NetworkManager;

2
src/client/haxe/ru/m/tankz/view/common/IGamePanel.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.common; package ru.m.tankz.view.common;
import ru.m.tankz.game.Game; import ru.m.tankz.game.Game;
import haxework.gui.IView; import haxework.view.IView;
interface IGamePanel extends IView<Dynamic> { interface IGamePanel extends IView<Dynamic> {
public var game:Game; public var game:Game;

4
src/client/haxe/ru/m/tankz/view/common/LevelFrame.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.common; package ru.m.tankz.view.common;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.GroupView; import haxework.view.GroupView;
import haxework.resources.IResources; import haxework.resources.IResources;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;

6
src/client/haxe/ru/m/tankz/view/common/LifeView.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.common; package ru.m.tankz.view.common;
import openfl.Assets; import openfl.Assets;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.ImageView; import haxework.view.ImageView;
import haxework.gui.HGroupView; import haxework.view.HGroupView;
@:template class LifeView extends HGroupView { @:template class LifeView extends HGroupView {
@:view("tank") public var tankImage:ImageView; @:view("tank") public var tankImage:ImageView;

6
src/client/haxe/ru/m/tankz/view/common/LifeView.yaml
View File

@@ -2,12 +2,12 @@
layout.margin: 5 layout.margin: 5
views: views:
- id: tank - id: tank
$type: haxework.gui.ImageView $type: haxework.view.ImageView
- id: live - id: live
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [50, 38] geometry.size.fixed: [50, 38]
- id: score - id: score
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text.box skinId: text.box
geometry.size.fixed: [100, 38] geometry.size.fixed: [100, 38]

10
src/client/haxe/ru/m/tankz/view/common/PlayerView.hx
View File

@@ -2,11 +2,11 @@ package ru.m.tankz.view.common;
import haxework.resources.IResources; import haxework.resources.IResources;
import haxework.color.ColorUtil; import haxework.color.ColorUtil;
import haxework.gui.DataView; import haxework.view.DataView;
import haxework.gui.HGroupView; import haxework.view.HGroupView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.skin.ISkin; import haxework.view.skin.ISkin;
import haxework.gui.ToggleButtonView; import haxework.view.ToggleButtonView;
import ru.m.tankz.control.Control; import ru.m.tankz.control.Control;
import ru.m.tankz.game.GameState; import ru.m.tankz.game.GameState;
import ru.m.tankz.Type.TeamId; import ru.m.tankz.Type.TeamId;

6
src/client/haxe/ru/m/tankz/view/common/PlayerView.yaml
View File

@@ -4,12 +4,12 @@ layout.margin: 10
layout.vAlign: middle layout.vAlign: middle
views: views:
- id: label - id: label
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text skinId: text
- id: teams - id: teams
$type: haxework.gui.DataView $type: haxework.view.DataView
factory: $this:teamViewFactory factory: $this:teamViewFactory
layout: layout:
$type: haxework.gui.layout.HorizontalLayout $type: haxework.view.layout.HorizontalLayout
margin: 3 margin: 3
+onDataSelect: $this:onTeamSelect +onDataSelect: $this:onTeamSelect

2
src/client/haxe/ru/m/tankz/view/dota/DotaGameFrame.yaml
View File

@@ -1,7 +1,7 @@
--- ---
skinId: container skinId: container
views: views:
- $type: haxework.gui.VGroupView - $type: haxework.view.VGroupView
layout.margin: 5 layout.margin: 5
views: views:
- id: panel - id: panel

4
src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.view.dota; package ru.m.tankz.view.dota;
import haxework.gui.HGroupView; import haxework.view.HGroupView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import ru.m.tankz.view.common.IGamePanel; import ru.m.tankz.view.common.IGamePanel;
import ru.m.tankz.view.common.LifeView; import ru.m.tankz.view.common.LifeView;
import ru.m.tankz.game.Game; import ru.m.tankz.game.Game;

6
src/client/haxe/ru/m/tankz/view/dota/DotaGamePanel.yaml
View File

@@ -6,14 +6,14 @@ views:
$type: ru.m.tankz.view.common.LifeView $type: ru.m.tankz.view.common.LifeView
tank: bc tank: bc
color: 0xff4422 color: 0xff4422
- $type: haxework.gui.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 25% geometry.size.width: 25%
- id: level - id: level
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text.box skinId: text.box
geometry.size.height: 38 geometry.size.height: 38
geometry.size.width: 50% geometry.size.width: 50%
- $type: haxework.gui.SpriteView - $type: haxework.view.SpriteView
geometry.size.width: 25% geometry.size.width: 25%
- id: dire - id: dire
$type: ru.m.tankz.view.common.LifeView $type: ru.m.tankz.view.common.LifeView

6
src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.dota; package ru.m.tankz.view.dota;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.DataView; import haxework.view.DataView;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import ru.m.tankz.view.common.LevelFrame; import ru.m.tankz.view.common.LevelFrame;
import ru.m.tankz.view.common.PlayerView; import ru.m.tankz.view.common.PlayerView;
import ru.m.tankz.game.GameState; import ru.m.tankz.game.GameState;

12
src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.yaml
View File

@@ -1,22 +1,22 @@
--- ---
skinId: container skinId: container
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
views: views:
- $type: haxework.gui.LabelView - $type: haxework.view.LabelView
skinId: text.header skinId: text.header
text: DotA text: DotA
- id: players - id: players
$type: haxework.gui.DataView $type: haxework.view.DataView
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
hAlign: right hAlign: right
factory: $this:playerViewFactory factory: $this:playerViewFactory
geometry.padding: 10 geometry.padding: 10
- id: levels - id: levels
$type: haxework.gui.DataView $type: haxework.view.DataView
layout: layout:
$type: haxework.gui.layout.TailLayout $type: haxework.view.layout.TailLayout
rowSize: 5 rowSize: 5
margin: 5 margin: 5
factory: $this:levelViewFactory factory: $this:levelViewFactory

6
src/client/haxe/ru/m/tankz/view/network/GameItemView.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.network; package ru.m.tankz.view.network;
import haxework.gui.HGroupView; import haxework.view.HGroupView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.list.ListView; import haxework.view.list.ListView;
import ru.m.tankz.proto.core.GameInfoProto; import ru.m.tankz.proto.core.GameInfoProto;

4
src/client/haxe/ru/m/tankz/view/network/GameItemView.yaml
View File

@@ -4,12 +4,12 @@ height: 44
margins: 5 margins: 5
views: views:
- id: label - id: label
$type: haxework.gui.LabelView $type: haxework.view.LabelView
$style: label $style: label
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
text: "" text: ""
skin: skin:
$type: haxework.gui.skin.ColorSkin $type: haxework.view.skin.ColorSkin
color: "#000000" color: "#000000"
alpha: 0.2 alpha: 0.2

6
src/client/haxe/ru/m/tankz/view/network/UserItemView.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.network; package ru.m.tankz.view.network;
import haxework.gui.HGroupView; import haxework.view.HGroupView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.list.ListView; import haxework.view.list.ListView;
import ru.m.tankz.proto.core.UserProto; import ru.m.tankz.proto.core.UserProto;

4
src/client/haxe/ru/m/tankz/view/network/UserItemView.yaml
View File

@@ -4,12 +4,12 @@ height: 44
margins: 5 margins: 5
views: views:
- id: label - id: label
$type: haxework.gui.LabelView $type: haxework.view.LabelView
$style: label $style: label
pWidth: 100 pWidth: 100
pHeight: 100 pHeight: 100
text: "" text: ""
skin: skin:
$type: haxework.gui.skin.ColorSkin $type: haxework.view.skin.ColorSkin
color: "#000000" color: "#000000"
alpha: 0.2 alpha: 0.2

6
src/client/haxe/ru/m/tankz/view/popup/FontPopup.hx
View File

@@ -2,9 +2,9 @@ package ru.m.tankz.view.popup;
import flash.text.Font; import flash.text.Font;
import flash.text.FontType; import flash.text.FontType;
import haxework.gui.list.LabelListItem; import haxework.view.list.LabelListItem;
import haxework.gui.list.ListView; import haxework.view.list.ListView;
import haxework.gui.popup.PopupView; import haxework.view.popup.PopupView;
class FontLabelView extends LabelListItem<Font> { class FontLabelView extends LabelListItem<Font> {

10
src/client/haxe/ru/m/tankz/view/popup/FontPopup.yaml
View File

@@ -1,6 +1,6 @@
--- ---
view: view:
$type: haxework.gui.VGroupView $type: haxework.view.VGroupView
geometry.size.width: 400 geometry.size.width: 400
geometry.size.height: 80% geometry.size.height: 80%
geometry.padding: 10 geometry.padding: 10
@@ -9,19 +9,19 @@ view:
skinId: dark skinId: dark
views: views:
- id: fonts - id: fonts
$type: haxework.gui.list.VListView $type: haxework.view.list.VListView
geometry.size.stretch: true geometry.size.stretch: true
factory: $this:fontViewFactory factory: $this:fontViewFactory
+onItemSelect: $code:function(item) close(item.data) +onItemSelect: $code:function(item) close(item.data)
scroll: scroll:
$type: haxework.gui.list.VScrollBarView $type: haxework.view.list.VScrollBarView
skinId: scroll.vertical skinId: scroll.vertical
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
geometry.size.width: 100% geometry.size.width: 100%
geometry.margin.top: 10 geometry.margin.top: 10
layout.hAlign: right layout.hAlign: right
views: views:
- $type: haxework.gui.ButtonView - $type: haxework.view.ButtonView
skinId: button.simple skinId: button.simple
text: Cancel text: Cancel
+onPress: $code:reject('cancel') +onPress: $code:reject('cancel')

6
src/client/haxe/ru/m/tankz/view/settings/ActionView.hx
View File

@@ -1,8 +1,8 @@
package ru.m.tankz.view.settings; package ru.m.tankz.view.settings;
import haxework.gui.HGroupView; import haxework.view.HGroupView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.list.ListView.IListItemView; import haxework.view.list.ListView.IListItemView;
import openfl.Assets; import openfl.Assets;
import openfl.events.KeyboardEvent; import openfl.events.KeyboardEvent;
import promhx.Deferred; import promhx.Deferred;

4
src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml
View File

@@ -3,10 +3,10 @@ geometry.margin: 5
layout.margin: 5 layout.margin: 5
views: views:
- id: action - id: action
$type: haxework.gui.LabelView $type: haxework.view.LabelView
geometry.size.fixed: [200, 38] geometry.size.fixed: [200, 38]
skinId: text.box skinId: text.box
- id: key - id: key
$type: haxework.gui.LabelView $type: haxework.view.LabelView
geometry.size.fixed: [200, 38] geometry.size.fixed: [200, 38]
skinId: text.box skinId: text.box

8
src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.view.settings; package ru.m.tankz.view.settings;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.DataView; import haxework.view.DataView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import promhx.Promise; import promhx.Promise;
import ru.m.tankz.control.ActionConfig.ActionItem; import ru.m.tankz.control.ActionConfig.ActionItem;
import ru.m.tankz.control.ActionConfig; import ru.m.tankz.control.ActionConfig;

14
src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml
View File

@@ -2,29 +2,29 @@ layout.margin: 10
layout.hAlign: center layout.hAlign: center
views: views:
- id: label - id: label
$type: haxework.gui.LabelView $type: haxework.view.LabelView
skinId: text skinId: text
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
layout.margin: 10 layout.margin: 10
views: views:
- id: change - id: change
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
+onPress: $this:onPress +onPress: $this:onPress
skinId: button.simple skinId: button.simple
text: Change text: Change
- id: clear - id: clear
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
+onPress: $this:onPress +onPress: $this:onPress
skinId: button.simple skinId: button.simple
text: Clear text: Clear
- id: reset - id: reset
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
+onPress: $this:onPress +onPress: $this:onPress
skinId: button.simple skinId: button.simple
text: Reset text: Reset
- id: list - id: list
$type: haxework.gui.DataView $type: haxework.view.DataView
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
factory: $this:viewFactory factory: $this:viewFactory
+onItemSelect: $this:onItemSelect +onItemSelect: $this:onItemSelect

2
src/editor/haxe/ru/m/tankz/editor/ColorView.hx
View File

@@ -2,7 +2,7 @@ package ru.m.tankz.editor;
import flash.events.MouseEvent; import flash.events.MouseEvent;
import haxework.color.Color; import haxework.color.Color;
import haxework.gui.ImageView; import haxework.view.ImageView;
import haxework.signal.Signal; import haxework.signal.Signal;
import openfl.Assets; import openfl.Assets;

14
src/editor/haxe/ru/m/tankz/editor/Editor.hx
View File

@@ -1,17 +1,17 @@
package ru.m.tankz.editor; package ru.m.tankz.editor;
import haxework.gui.IGroupView; import haxework.view.IGroupView;
import haxework.gui.ToggleButtonView; import haxework.view.ToggleButtonView;
import haxework.gui.IView; import haxework.view.IView;
import ru.m.tankz.editor.frame.LevelFrame; import ru.m.tankz.editor.frame.LevelFrame;
import ru.m.tankz.bundle.LevelBundle; import ru.m.tankz.bundle.LevelBundle;
import ru.m.tankz.bundle.ILevelBundle; import ru.m.tankz.bundle.ILevelBundle;
import ru.m.tankz.bundle.ConfigBundle; import ru.m.tankz.bundle.ConfigBundle;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.frame.FrameSwitcher; import haxework.view.frame.FrameSwitcher;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import haxework.gui.Root; import haxework.view.Root;
import haxework.log.TraceLogger; import haxework.log.TraceLogger;
import haxework.provider.Provider; import haxework.provider.Provider;
import haxework.resources.IResources; import haxework.resources.IResources;

12
src/editor/haxe/ru/m/tankz/editor/EditorView.yaml
View File

@@ -1,27 +1,27 @@
--- ---
$type: haxework.gui.VGroupView $type: haxework.view.VGroupView
skinId: dark skinId: dark
geometry.size.stretch: true geometry.size.stretch: true
layout.hAlign: center layout.hAlign: center
views: views:
# Tabs # Tabs
- id: tabs - id: tabs
$type: haxework.gui.HGroupView $type: haxework.view.HGroupView
geometry.margin.bottom: -2 geometry.margin.bottom: -2
views: views:
- id: level - id: level
$type: haxework.gui.ToggleButtonView $type: haxework.view.ToggleButtonView
skinId: button.tab skinId: button.tab
text: Level text: Level
+onPress: $this:onPress +onPress: $this:onPress
- id: tank - id: tank
$type: haxework.gui.ToggleButtonView $type: haxework.view.ToggleButtonView
skinId: button.tab skinId: button.tab
text: Tank text: Tank
+onPress: $this:onPress +onPress: $this:onPress
# Switcher # Switcher
- id: switcher - id: switcher
$type: haxework.gui.frame.FrameSwitcher $type: haxework.view.frame.FrameSwitcher
skinId: border skinId: border
+onSwitch: $this:onFrameSwitch +onSwitch: $this:onFrameSwitch
geometry.size.stretch: true geometry.size.stretch: true
@@ -32,7 +32,7 @@ views:
- id: tank - id: tank
$type: ru.m.tankz.editor.frame.TankFrame $type: ru.m.tankz.editor.frame.TankFrame
# Version # Version
- $type: haxework.gui.LabelView - $type: haxework.view.LabelView
skinId: text skinId: text
geometry.position: absolute geometry.position: absolute
geometry.vAlign: top geometry.vAlign: top

8
src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.hx
View File

@@ -1,9 +1,9 @@
package ru.m.tankz.editor.frame; package ru.m.tankz.editor.frame;
import haxework.gui.ButtonView; import haxework.view.ButtonView;
import haxework.gui.DataView; import haxework.view.DataView;
import haxework.gui.LabelView; import haxework.view.LabelView;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
import haxework.provider.Provider; import haxework.provider.Provider;
import ru.m.tankz.bundle.IConfigBundle; import ru.m.tankz.bundle.IConfigBundle;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;

26
src/editor/haxe/ru/m/tankz/editor/frame/LevelFrame.yaml
View File

@@ -1,54 +1,54 @@
--- ---
$type: haxework.gui.VGroupView $type: haxework.view.VGroupView
geometry.size.stretch: true geometry.size.stretch: true
layout.margin: 2 layout.margin: 2
layout.vAlign: top layout.vAlign: top
layout.hAlign: center layout.hAlign: center
views: views:
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
views: views:
- id: gameClassicButton - id: gameClassicButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.simple skinId: button.simple
text: Classic text: Classic
+onPress: $this:onPress +onPress: $this:onPress
- id: gameDotaButton - id: gameDotaButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.simple skinId: button.simple
text: DotA text: DotA
+onPress: $this:onPress +onPress: $this:onPress
- id: fileNameLabel - id: fileNameLabel
$type: haxework.gui.LabelView $type: haxework.view.LabelView
# map # map
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
views: views:
- id: spawnPointList - id: spawnPointList
$type: haxework.gui.DataView $type: haxework.view.DataView
geometry.padding: 3 geometry.padding: 3
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
hAlign: center hAlign: center
margin: 5 margin: 5
factory: $code:ru.m.tankz.editor.level.SpawnPointView.factory factory: $code:ru.m.tankz.editor.level.SpawnPointView.factory
- id: mapView - id: mapView
$type: ru.m.tankz.editor.level.MapEditView $type: ru.m.tankz.editor.level.MapEditView
- id: brickList - id: brickList
$type: haxework.gui.DataView $type: haxework.view.DataView
geometry.padding: 3 geometry.padding: 3
layout: layout:
$type: haxework.gui.layout.VerticalLayout $type: haxework.view.layout.VerticalLayout
hAlign: center hAlign: center
margin: 5 margin: 5
factory: $code:ru.m.tankz.editor.level.BrickView.factory factory: $code:ru.m.tankz.editor.level.BrickView.factory
- $type: haxework.gui.HGroupView - $type: haxework.view.HGroupView
views: views:
- id: openButton - id: openButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.simple skinId: button.simple
text: Open text: Open
+onPress: $this:onPress +onPress: $this:onPress
- id: saveButton - id: saveButton
$type: haxework.gui.ButtonView $type: haxework.view.ButtonView
skinId: button.simple skinId: button.simple
text: Save text: Save
+onPress: $this:onPress +onPress: $this:onPress

6
src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx
View File

@@ -1,10 +1,10 @@
package ru.m.tankz.editor.frame; package ru.m.tankz.editor.frame;
import ru.m.tankz.editor.tank.TankView; import ru.m.tankz.editor.tank.TankView;
import haxework.gui.IGroupView; import haxework.view.IGroupView;
import haxework.color.Color; import haxework.color.Color;
import haxework.gui.InputView; import haxework.view.InputView;
import haxework.gui.VGroupView; import haxework.view.VGroupView;
@:template class TankFrame extends VGroupView { @:template class TankFrame extends VGroupView {
public static inline var ID = 'tank'; public static inline var ID = 'tank';

6
src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.yaml
View File

@@ -5,9 +5,9 @@ layout.hAlign: center
layout.margin: 10 layout.margin: 10
views: views:
- id: tanks - id: tanks
$type: haxework.gui.GroupView $type: haxework.view.GroupView
layout: layout:
$type: haxework.gui.layout.TailLayout $type: haxework.view.layout.TailLayout
rowSize: 4 rowSize: 4
margin: 20 margin: 20
views: views:
@@ -28,7 +28,7 @@ views:
- $type: ru.m.tankz.editor.tank.TankView - $type: ru.m.tankz.editor.tank.TankView
image: "$asset:image:resources/image/tank/bd-0.png" image: "$asset:image:resources/image/tank/bd-0.png"
- id: color - id: color
$type: haxework.gui.InputView $type: haxework.view.InputView
skinId: text.box skinId: text.box
+onChange: $code:function(value) color = value +onChange: $code:function(value) color = value
geometry.size.width: 120 geometry.size.width: 120

2
src/editor/haxe/ru/m/tankz/editor/level/BrushView.hx
View File

@@ -1,7 +1,7 @@
package ru.m.tankz.editor.level; package ru.m.tankz.editor.level;
import flash.display.Shape; import flash.display.Shape;
import haxework.gui.ImageView; import haxework.view.ImageView;
import openfl.utils.Assets; import openfl.utils.Assets;
class BrushView<D> extends ImageView { class BrushView<D> extends ImageView {

2
src/editor/haxe/ru/m/tankz/editor/level/MapEditView.hx
View File

@@ -5,7 +5,7 @@ import flash.display.DisplayObjectContainer;
import flash.display.Graphics; import flash.display.Graphics;
import flash.display.Sprite; import flash.display.Sprite;
import flash.events.MouseEvent; import flash.events.MouseEvent;
import haxework.gui.SpriteView; import haxework.view.SpriteView;
import ru.m.geom.Point; import ru.m.geom.Point;
import ru.m.geom.Rectangle; import ru.m.geom.Rectangle;
import ru.m.tankz.config.Config; import ru.m.tankz.config.Config;

4
src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx
View File

@@ -3,8 +3,8 @@ package ru.m.tankz.editor.tank;
import flash.display.Bitmap; import flash.display.Bitmap;
import flash.display.BitmapData; import flash.display.BitmapData;
import haxework.color.Color; import haxework.color.Color;
import haxework.gui.utils.BitmapUtil; import haxework.view.utils.BitmapUtil;
import haxework.gui.View; import haxework.view.View;
class TankView extends View<Bitmap> { class TankView extends View<Bitmap> {