@safe-engine/cocos 2.2.1 → 2.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4,17 +4,8 @@ import { BaseComponentProps, ColorSource } from '../safex';
|
|
|
4
4
|
export declare class NodeRender extends ComponentX {
|
|
5
5
|
nodeName: string;
|
|
6
6
|
}
|
|
7
|
-
declare enum SpriteTypes {
|
|
8
|
-
SIMPLE = 0,
|
|
9
|
-
SLICED = 1,
|
|
10
|
-
TILED = 2,
|
|
11
|
-
FILLED = 3,
|
|
12
|
-
MESH = 4,
|
|
13
|
-
ANIMATION = 5
|
|
14
|
-
}
|
|
15
7
|
interface SpriteRenderProps {
|
|
16
8
|
spriteFrame: string;
|
|
17
|
-
type?: SpriteTypes;
|
|
18
9
|
capInsets?: [number, number, number, number];
|
|
19
10
|
tiledSize?: Size;
|
|
20
11
|
}
|
|
@@ -62,8 +53,8 @@ interface MotionStreakProps {
|
|
|
62
53
|
stroke?: number;
|
|
63
54
|
color?: Color4B;
|
|
64
55
|
}
|
|
65
|
-
export declare class
|
|
66
|
-
$ref?:
|
|
56
|
+
export declare class MotionStreakComp extends ComponentX<MotionStreakProps & {
|
|
57
|
+
$ref?: MotionStreakComp;
|
|
67
58
|
}, cc.MotionStreak> {
|
|
68
59
|
reset(): void;
|
|
69
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE1D,qBAAa,UAAW,SAAQ,UAAU;IACxC,QAAQ,EAAE,MAAM,CAAA;CACjB;
|
|
1
|
+
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAU,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE1D,qBAAa,UAAW,SAAQ,UAAU;IACxC,QAAQ,EAAE,MAAM,CAAA;CACjB;AASD,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAA;IAEnB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5C,SAAS,CAAC,EAAE,IAAI,CAAA;CACjB;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC;IAC3G,IAAI,WAAW,WAEd;IAED,IAAI,WAAW,CAAC,KAAK,QAAA,EAKpB;IACD,WAAW;CAGZ;AACD,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AACD,qBAAa,UAAW,SAAQ,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC,YAAY,CAAC;CAAG;AAE/E,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAA;CAClB;AACD,qBAAa,YAAa,SAAQ,UAAU,CAAC,iBAAiB,EAAE,EAAE,CAAC,cAAc,CAAC;CAAG;AAErF,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,SAAS,CAAC,EAAE,WAAW,CAAA;CACxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,mBAAmB,GAAG,kBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IACnH,OAAO,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;IASf,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO;IAG5E,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,OAAO;IAMzD,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,SAAI,EAAE,QAAQ,SAAK,EAAE,gBAAgB,UAAO,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO;IAyB7H,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,KAAK;IAe3D,KAAK;CAKN;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,QAAS,SAAQ,UAAU,CAAC,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,EAAE,EAAE,CAAC,WAAW,CAAC;CAAG;AAEhG,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AACD,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE,gBAAgB,CAAA;CAAE,EAAE,EAAE,CAAC,YAAY,CAAC;IAChH,KAAK;CAGN"}
|
|
@@ -2,15 +2,6 @@ import { ComponentX, render } from '../core/decorator';
|
|
|
2
2
|
export class NodeRender extends ComponentX {
|
|
3
3
|
nodeName;
|
|
4
4
|
}
|
|
5
|
-
var SpriteTypes;
|
|
6
|
-
(function (SpriteTypes) {
|
|
7
|
-
SpriteTypes[SpriteTypes["SIMPLE"] = 0] = "SIMPLE";
|
|
8
|
-
SpriteTypes[SpriteTypes["SLICED"] = 1] = "SLICED";
|
|
9
|
-
SpriteTypes[SpriteTypes["TILED"] = 2] = "TILED";
|
|
10
|
-
SpriteTypes[SpriteTypes["FILLED"] = 3] = "FILLED";
|
|
11
|
-
SpriteTypes[SpriteTypes["MESH"] = 4] = "MESH";
|
|
12
|
-
SpriteTypes[SpriteTypes["ANIMATION"] = 5] = "ANIMATION";
|
|
13
|
-
})(SpriteTypes || (SpriteTypes = {}));
|
|
14
5
|
export class SpriteRender extends ComponentX {
|
|
15
6
|
get spriteFrame() {
|
|
16
7
|
return this.props.spriteFrame;
|
|
@@ -80,7 +71,7 @@ export class GraphicsRender extends ComponentX {
|
|
|
80
71
|
}
|
|
81
72
|
export class TiledMap extends ComponentX {
|
|
82
73
|
}
|
|
83
|
-
export class
|
|
74
|
+
export class MotionStreakComp extends ComponentX {
|
|
84
75
|
reset() {
|
|
85
76
|
this.node.instance.reset();
|
|
86
77
|
}
|
|
@@ -91,4 +82,4 @@ Object.defineProperty(MaskRender.prototype, 'render', { value: render });
|
|
|
91
82
|
Object.defineProperty(ParticleComp.prototype, 'render', { value: render });
|
|
92
83
|
Object.defineProperty(GraphicsRender.prototype, 'render', { value: render });
|
|
93
84
|
Object.defineProperty(TiledMap.prototype, 'render', { value: render });
|
|
94
|
-
Object.defineProperty(
|
|
85
|
+
Object.defineProperty(MotionStreakComp.prototype, 'render', { value: render });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAOlG,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AAED,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"RenderSystem.d.ts","sourceRoot":"","sources":["../../src/render/RenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAOlG,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AAED,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,iBAAiB,CAgBxB;IAED,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,mBAAmB,CAQ1B;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,OAAO,CAAC,aAAa,CAKpB;IAED,OAAO,CAAC,iBAAiB,CAUxB;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EventTypes } from 'entityx-ts';
|
|
2
2
|
import { NodeComp } from '../core/NodeComp';
|
|
3
3
|
import { BLUE, RED } from '../polyfills';
|
|
4
|
-
import { GraphicsRender, MaskRender,
|
|
4
|
+
import { GraphicsRender, MaskRender, MotionStreakComp, NodeRender, ParticleComp, SpriteRender, TiledMap } from './RenderComponent';
|
|
5
5
|
import { TiledSprite } from './TiledSprite';
|
|
6
6
|
export var SpriteTypes;
|
|
7
7
|
(function (SpriteTypes) {
|
|
@@ -20,7 +20,7 @@ export class RenderSystem {
|
|
|
20
20
|
event_manager.subscribe(EventTypes.ComponentAdded, GraphicsRender, this.onAddGraphicsRender);
|
|
21
21
|
event_manager.subscribe(EventTypes.ComponentAdded, ParticleComp, this.onAddParticleComp);
|
|
22
22
|
event_manager.subscribe(EventTypes.ComponentAdded, TiledMap, this.onAddTiledMap);
|
|
23
|
-
event_manager.subscribe(EventTypes.ComponentAdded,
|
|
23
|
+
event_manager.subscribe(EventTypes.ComponentAdded, MotionStreakComp, this.onAddMotionStreak);
|
|
24
24
|
event_manager.subscribe(EventTypes.ComponentRemoved, NodeComp, this.onRemovedNodeComp);
|
|
25
25
|
}
|
|
26
26
|
onAddNodeRender = ({ entity }) => {
|
|
@@ -30,24 +30,20 @@ export class RenderSystem {
|
|
|
30
30
|
nodeRenderComp.node = ett.assign(new NodeComp(node, ett));
|
|
31
31
|
};
|
|
32
32
|
onAddSpriteRender = ({ entity, component: spriteComp }) => {
|
|
33
|
-
const { spriteFrame,
|
|
33
|
+
const { spriteFrame, capInsets, tiledSize } = spriteComp.props;
|
|
34
34
|
const frame = cc.spriteFrameCache.getSpriteFrame(spriteFrame);
|
|
35
35
|
// console.log('frame', spriteFrame, frame)
|
|
36
36
|
let node;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
break;
|
|
48
|
-
default:
|
|
49
|
-
node = new cc.Sprite(frame || spriteFrame);
|
|
50
|
-
break;
|
|
37
|
+
if (tiledSize) {
|
|
38
|
+
node = new TiledSprite({ texture: spriteFrame, width: tiledSize.width, height: tiledSize.height });
|
|
39
|
+
}
|
|
40
|
+
else if (capInsets) {
|
|
41
|
+
const rect = cc.rect(...capInsets);
|
|
42
|
+
node = new ccui.Scale9Sprite(frame || spriteFrame, rect, rect);
|
|
43
|
+
// console.log('Scale9Sprite', node)
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
node = new cc.Sprite(frame || spriteFrame);
|
|
51
47
|
}
|
|
52
48
|
const ett = entity;
|
|
53
49
|
spriteComp.node = ett.assign(new NodeComp(node, ett));
|
|
@@ -79,14 +75,13 @@ export class RenderSystem {
|
|
|
79
75
|
const node = new cc.TMXTiledMap(mapFile);
|
|
80
76
|
tiledMapComp.node = entity.assign(new NodeComp(node, entity));
|
|
81
77
|
};
|
|
82
|
-
onAddMotionStreak = ({ entity }) => {
|
|
83
|
-
const
|
|
84
|
-
const { spriteFrame, fade, minSeg, stroke, color } = motionStreakComp.props;
|
|
78
|
+
onAddMotionStreak = ({ entity, component }) => {
|
|
79
|
+
const { spriteFrame, fade, minSeg, stroke, color } = component.props;
|
|
85
80
|
const node = new cc.MotionStreak(fade || 0.4, // fade (vệt tồn tại 0.4s)
|
|
86
81
|
minSeg || 1, // minSeg
|
|
87
82
|
stroke || 20, // stroke (độ rộng vệt)
|
|
88
83
|
color || cc.color(255, 255, 255, 255), spriteFrame);
|
|
89
|
-
|
|
84
|
+
component.node = entity.assign(new NodeComp(node, entity));
|
|
90
85
|
};
|
|
91
86
|
onRemovedNodeComp = ({ component }) => {
|
|
92
87
|
const node = component;
|