@safe-engine/cocos 2.3.7 → 2.3.8
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.
- package/dist/collider/CollideComponent.d.ts.map +1 -1
- package/dist/collider/CollideComponent.js +4 -3
- package/dist/collider/CollideSystem.d.ts +2 -0
- package/dist/collider/CollideSystem.d.ts.map +1 -1
- package/dist/collider/CollideSystem.js +2 -0
- package/dist/core/NodeComp.d.ts +21 -2
- package/dist/core/NodeComp.d.ts.map +1 -1
- package/dist/core/NodeComp.js +8 -15
- package/dist/norender/NoRenderSystem.d.ts +1 -2
- package/dist/norender/NoRenderSystem.d.ts.map +1 -1
- package/dist/norender/NoRenderSystem.js +0 -3
- package/dist/polyfills.d.ts +0 -5
- package/dist/polyfills.d.ts.map +1 -1
- package/dist/polyfills.js +1 -6
- package/dist/render/RenderSystem.d.ts.map +1 -1
- package/dist/render/RenderSystem.js +11 -7
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"CollideComponent.d.ts","sourceRoot":"","sources":["../../src/collider/CollideComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAanC,UAAU,aAAc,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzB,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC3C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAA;CAC5C;AACD,qBAAa,QAAQ,CAAC,CAAC,GAAG,aAAa,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAC5D,YAAY,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAK;IACtC,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,KAAK,CAAA;IAC/B,YAAY,MAAA;IACZ,KAAK,EAAE,EAAE,CAAC,IAAI,CAAsB;IACpC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAsB;IAGvC,OAAO;IAKP,IAAI,KAAK;;;;;;;;;;;;;;;;;;;;;MAKR;CACF;AAED,UAAU,gBAAiB,SAAQ,kBAAkB,CAAC,WAAW,CAAC;IAChE,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,WAAY,SAAQ,QAAQ,CAAC,aAAa,GAAG,gBAAgB,CAAC;IACzE,IAAI,IAAI,IAII,EAAE,CAAC,IAAI,CAFlB;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAGlB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CA6B7B;AAED,UAAU,mBAAoB,SAAQ,kBAAkB,CAAC,cAAc,CAAC;IACtE,MAAM,EAAE,MAAM,CAAA;CACf;AACD,qBAAa,cAAe,SAAQ,QAAQ,CAAC,aAAa,GAAG,mBAAmB,CAAC;IAC/E,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAuB7B;AAED,UAAU,oBAAqB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACxE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACzC;AAED,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC;IACjF,IAAI,MAAM,IAAI,IAAI,EAAE,CAUnB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAExB;IAED,MAAM,CAAC,EAAE,KAAA,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ;CAoB7B;AAED,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,IAAI,IAAA;CACL;AASD,qBAAa,QAAQ;IACnB,UAAU,EAAE,QAAQ,CAAA;IACpB,UAAU,EAAE,QAAQ,CAAA;IACpB,SAAS,EAAE,OAAO,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,eAAe,EAAE,OAAO,CAAA;IACxB,gBAAgB,EAAE,OAAO,CAAA;gBAEb,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ;IAsBpD,WAAW;IAeX,IAAI;CAyBL"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ComponentX } from '../core/decorator';
|
|
2
2
|
import { getMax, getMin } from '../helper/math';
|
|
3
3
|
import { Vec2 } from '../polyfills';
|
|
4
|
+
import { CollideSystem } from './CollideSystem';
|
|
4
5
|
function getNodeToWorldTransformAR(node) {
|
|
5
6
|
const t = node.instance.getNodeToWorldTransform();
|
|
6
7
|
const anchorPointSize = node.instance.getAnchorPointInPoints();
|
|
@@ -63,7 +64,7 @@ export class BoxCollider extends Collider {
|
|
|
63
64
|
this._AABB.width = getMax(listX) - this._AABB.x;
|
|
64
65
|
this._AABB.height = getMax(listY) - this._AABB.y;
|
|
65
66
|
if (draw) {
|
|
66
|
-
draw.drawPoly(this._worldPoints, null,
|
|
67
|
+
draw.drawPoly(this._worldPoints, null, CollideSystem.debugWidth, CollideSystem.debugColor);
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
}
|
|
@@ -80,7 +81,7 @@ export class CircleCollider extends Collider {
|
|
|
80
81
|
this._worldPosition = cc.pointApplyAffineTransform(cc.p(x, y), transform);
|
|
81
82
|
if (draw) {
|
|
82
83
|
draw.drawDot(this._worldPosition, this._worldRadius, cc.Color.DEBUG_FILL_COLOR);
|
|
83
|
-
draw.drawCircle(this._worldPosition, this._worldRadius, 0, 64, true,
|
|
84
|
+
draw.drawCircle(this._worldPosition, this._worldRadius, 0, 64, true, CollideSystem.debugWidth, CollideSystem.debugColor);
|
|
84
85
|
}
|
|
85
86
|
this._preAabb = cloneRect(this._AABB);
|
|
86
87
|
this._AABB.x = this._worldPosition.x - this._worldRadius;
|
|
@@ -117,7 +118,7 @@ export class PolygonCollider extends Collider {
|
|
|
117
118
|
this._worldPoints = this.points.map((p) => cc.pointApplyAffineTransform(p, transform));
|
|
118
119
|
// cc.log(polyPoints);
|
|
119
120
|
if (draw) {
|
|
120
|
-
draw.drawPoly(this._worldPoints, cc.Color.DEBUG_FILL_COLOR,
|
|
121
|
+
draw.drawPoly(this._worldPoints, cc.Color.DEBUG_FILL_COLOR, CollideSystem.debugWidth, CollideSystem.debugColor);
|
|
121
122
|
}
|
|
122
123
|
const listX = this._worldPoints.map(({ x }) => x);
|
|
123
124
|
const listY = this._worldPoints.map(({ y }) => y);
|
|
@@ -2,6 +2,8 @@ import { EntityManager, EventManager, System } from 'entityx-ts';
|
|
|
2
2
|
import { Collider, Contract } from './CollideComponent';
|
|
3
3
|
export declare function shouldCollider(colA: Collider, colB: Collider): boolean;
|
|
4
4
|
export declare class CollideSystem implements System {
|
|
5
|
+
static debugWidth: number;
|
|
6
|
+
static debugColor: cc.Color;
|
|
5
7
|
listColliders: Collider[];
|
|
6
8
|
_contracts: Contract[];
|
|
7
9
|
removeColliders: any[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollideSystem.d.ts","sourceRoot":"","sources":["../../src/collider/CollideSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAK5E,OAAO,EAA+B,QAAQ,EAAiB,QAAQ,EAAmB,MAAM,oBAAoB,CAAA;AAEpH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,WAQ5D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,aAAa,EAAE,QAAQ,EAAE,CAAK;IAC9B,UAAU,EAAE,QAAQ,EAAE,CAAK;IAC3B,eAAe,QAAK;IACpB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAA;IAC1B,gBAAgB,UAAQ;IACxB,OAAO,UAAO;IACd,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,aAAa,CASpB;IAED,OAAO,CAAC,gBAAgB,CAEvB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2GhE,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAS9B,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAIjC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK;IAI3B,eAAe,CAAC,MAAM,UAAO;CAI9B"}
|
|
1
|
+
{"version":3,"file":"CollideSystem.d.ts","sourceRoot":"","sources":["../../src/collider/CollideSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAK5E,OAAO,EAA+B,QAAQ,EAAiB,QAAQ,EAAmB,MAAM,oBAAoB,CAAA;AAEpH,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,WAQ5D;AAED,qBAAa,aAAc,YAAW,MAAM;IAC1C,MAAM,CAAC,UAAU,SAAI;IACrB,MAAM,CAAC,UAAU,WAA8B;IAC/C,aAAa,EAAE,QAAQ,EAAE,CAAK;IAC9B,UAAU,EAAE,QAAQ,EAAE,CAAK;IAC3B,eAAe,QAAK;IACpB,aAAa,EAAE,EAAE,CAAC,QAAQ,CAAA;IAC1B,gBAAgB,UAAQ;IACxB,OAAO,UAAO;IACd,cAAc,cAAW;IAEzB,SAAS,CAAC,aAAa,EAAE,YAAY;IASrC,OAAO,CAAC,aAAa,CASpB;IAED,OAAO,CAAC,gBAAgB,CAEvB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;IA2GhE,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAS9B,cAAc,CAAC,QAAQ,EAAE,QAAQ;IAIjC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK;IAI3B,eAAe,CAAC,MAAM,UAAO;CAI9B"}
|
|
@@ -13,6 +13,8 @@ export function shouldCollider(colA, colB) {
|
|
|
13
13
|
return colliderMatrix[groupA][groupB];
|
|
14
14
|
}
|
|
15
15
|
export class CollideSystem {
|
|
16
|
+
static debugWidth = 3;
|
|
17
|
+
static debugColor = cc.Color.DEBUG_BORDER_COLOR;
|
|
16
18
|
listColliders = [];
|
|
17
19
|
_contracts = [];
|
|
18
20
|
removeColliders = [];
|
package/dist/core/NodeComp.d.ts
CHANGED
|
@@ -124,6 +124,25 @@ export declare class NodeComp<C extends cc.Node = cc.Node> {
|
|
|
124
124
|
angle(other: Vec2): number;
|
|
125
125
|
distance(other: /*elided*/ any): number;
|
|
126
126
|
};
|
|
127
|
+
convertToWorldSpace(point: Vec2): {
|
|
128
|
+
x: number;
|
|
129
|
+
y: number;
|
|
130
|
+
equals(other: /*elided*/ any): boolean;
|
|
131
|
+
add(value: cc.Point | Vec2): /*elided*/ any;
|
|
132
|
+
addSelf(value: cc.Point | Vec2): /*elided*/ any;
|
|
133
|
+
sub(value: cc.Point | Vec2): /*elided*/ any;
|
|
134
|
+
mul(multiply: number): /*elided*/ any;
|
|
135
|
+
mulSelf(multiply: number): /*elided*/ any;
|
|
136
|
+
mag(): number;
|
|
137
|
+
normalizeSelf(): /*elided*/ any;
|
|
138
|
+
normalize(): /*elided*/ any;
|
|
139
|
+
cross(other: Vec2): number;
|
|
140
|
+
signAngle(other: Vec2): number;
|
|
141
|
+
lengthSqr(): number;
|
|
142
|
+
dot(other: Vec2): number;
|
|
143
|
+
angle(other: Vec2): number;
|
|
144
|
+
distance(other: /*elided*/ any): number;
|
|
145
|
+
};
|
|
127
146
|
getBoundingBox(): cc.Rect;
|
|
128
147
|
get contentSize(): Size;
|
|
129
148
|
set contentSize(size: Size);
|
|
@@ -132,8 +151,8 @@ export declare class NodeComp<C extends cc.Node = cc.Node> {
|
|
|
132
151
|
pauseAllActionsAndSchedule(): void;
|
|
133
152
|
resumeAllActionsAndSchedule(): void;
|
|
134
153
|
removeFromParent(cleanup?: boolean): void;
|
|
135
|
-
addChild(child: NodeComp, zOrder?: number, tag?: number):
|
|
136
|
-
removeAllChildren(cleanup?:
|
|
154
|
+
addChild(child: NodeComp, zOrder?: number, tag?: number): void;
|
|
155
|
+
removeAllChildren(cleanup?: boolean): void;
|
|
137
156
|
getData<T>(key: string): T;
|
|
138
157
|
setData<T extends Integer | Float | string>(key: string, value: T): void;
|
|
139
158
|
get event(): EventRegister;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/core/NodeComp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAGhD,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEtE,MAAM,MAAM,iBAAiB,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,CAAA;AAC5D,qBAAa,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI;IAC/C,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,CAAA;IACX,MAAM,EAAE,QAAQ,CAAA;IAChB,QAAQ,EAAE,QAAQ,EAAE,CAAK;IACzB,IAAI,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"NodeComp.d.ts","sourceRoot":"","sources":["../../src/core/NodeComp.ts"],"names":[],"mappings":"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"}
|
package/dist/core/NodeComp.js
CHANGED
|
@@ -7,7 +7,6 @@ export class NodeComp {
|
|
|
7
7
|
parent;
|
|
8
8
|
children = [];
|
|
9
9
|
name;
|
|
10
|
-
// private _group
|
|
11
10
|
_active = true;
|
|
12
11
|
constructor(instance, entity) {
|
|
13
12
|
this.entity = entity;
|
|
@@ -120,12 +119,6 @@ export class NodeComp {
|
|
|
120
119
|
}
|
|
121
120
|
this.instance.setVisible(val);
|
|
122
121
|
}
|
|
123
|
-
// get group() {
|
|
124
|
-
// return this._group
|
|
125
|
-
// }
|
|
126
|
-
// set group(val: string | number) {
|
|
127
|
-
// this._group = val
|
|
128
|
-
// }
|
|
129
122
|
get w() {
|
|
130
123
|
return this.instance.width;
|
|
131
124
|
}
|
|
@@ -185,16 +178,16 @@ export class NodeComp {
|
|
|
185
178
|
});
|
|
186
179
|
}
|
|
187
180
|
convertToNodeSpace(point) {
|
|
188
|
-
|
|
189
|
-
return Vec2(x, y);
|
|
181
|
+
return Vec2(this.instance.convertToNodeSpace(point));
|
|
190
182
|
}
|
|
191
183
|
convertToNodeSpaceAR(point) {
|
|
192
|
-
|
|
193
|
-
return Vec2(x, y);
|
|
184
|
+
return Vec2(this.instance.convertToNodeSpaceAR(point));
|
|
194
185
|
}
|
|
195
186
|
convertToWorldSpaceAR(point) {
|
|
196
|
-
|
|
197
|
-
|
|
187
|
+
return Vec2(this.instance.convertToWorldSpaceAR(point));
|
|
188
|
+
}
|
|
189
|
+
convertToWorldSpace(point) {
|
|
190
|
+
return Vec2(this.instance.convertToWorldSpace(point));
|
|
198
191
|
}
|
|
199
192
|
getBoundingBox() {
|
|
200
193
|
const box = this.instance.getBoundingBox();
|
|
@@ -251,11 +244,11 @@ export class NodeComp {
|
|
|
251
244
|
this.instance.removeFromParent();
|
|
252
245
|
}
|
|
253
246
|
}
|
|
254
|
-
addChild(child) {
|
|
247
|
+
addChild(child, zOrder, tag) {
|
|
255
248
|
child._active = true;
|
|
256
249
|
child.parent = this;
|
|
257
250
|
this.children.push(child);
|
|
258
|
-
this.instance.addChild(child.instance);
|
|
251
|
+
this.instance.addChild(child.instance, zOrder, tag);
|
|
259
252
|
}
|
|
260
253
|
removeAllChildren(cleanup) {
|
|
261
254
|
this.children.forEach((child) => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EventManager, System } from 'entityx-ts';
|
|
2
2
|
export declare class NoRenderSystem implements System {
|
|
3
3
|
configure(event_manager: EventManager): void;
|
|
4
4
|
onAddTouchEventRegister: ({ entity, component }: {
|
|
@@ -11,6 +11,5 @@ export declare class NoRenderSystem implements System {
|
|
|
11
11
|
onRemovedTouchEventRegister: ({ component }: {
|
|
12
12
|
component: any;
|
|
13
13
|
}) => void;
|
|
14
|
-
update(entities: EntityManager, events: EventManager, dt: number): any;
|
|
15
14
|
}
|
|
16
15
|
//# sourceMappingURL=NoRenderSystem.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NoRenderSystem.d.ts","sourceRoot":"","sources":["../../src/norender/NoRenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"NoRenderSystem.d.ts","sourceRoot":"","sources":["../../src/norender/NoRenderSystem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAM7D,qBAAa,cAAe,YAAW,MAAM;IAC3C,SAAS,CAAC,aAAa,EAAE,YAAY;IAMrC,uBAAuB,GAAI;;;KAAqB,UAiD/C;IAED,kBAAkB,GAAI;;KAAa,UAIlC;IAED,2BAA2B,GAAI;;KAAa,UAM3C;CAMF"}
|
package/dist/polyfills.d.ts
CHANGED
|
@@ -31,11 +31,6 @@ export declare enum SpriteType {
|
|
|
31
31
|
FILLED = 3,
|
|
32
32
|
MESH = 4
|
|
33
33
|
}
|
|
34
|
-
export declare const RED: cc.Color;
|
|
35
|
-
export declare const BLACK: cc.Color;
|
|
36
|
-
export declare const WHITE: cc.Color;
|
|
37
|
-
export declare const GREEN: cc.Color;
|
|
38
|
-
export declare const BLUE: cc.Color;
|
|
39
34
|
export declare function Color4B(r: number, g: number, b: number, a: number): cc.Color;
|
|
40
35
|
export type Color4B = ReturnType<typeof Color4B>;
|
|
41
36
|
declare class _Size {
|
package/dist/polyfills.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polyfills.d.ts","sourceRoot":"","sources":["../src/polyfills.ts"],"names":[],"mappings":"AAOA,cAAM,KAAK;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,CAAC,IAAI,MAAA;gBACC,CAAC,GAAE,MAAM,GAAG,MAAU,EAAE,CAAC,SAAI;IAazC,MAAM,CAAC,KAAK,EAAE,KAAK;IAInB,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK;IAIlC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK;IAOtC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK;IAIlC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK;IAI5B,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK;IAOhC,GAAG,IAAI,MAAM;IAIb,aAAa,IAAI,KAAK;IAOtB,SAAS,IAAI,KAAK;IAIX,KAAK,CAAC,KAAK,EAAE,IAAI;IAGjB,SAAS,CAAC,KAAK,EAAE,IAAI;IAIrB,SAAS;IAGT,GAAG,CAAC,KAAK,EAAE,IAAI;IAGf,KAAK,CAAC,KAAK,EAAE,IAAI;IAcjB,QAAQ,CAAC,KAAK,EAAE,KAAK;CAG7B;AACD,MAAM,MAAM,IAAI,GAAG,KAAK,CAAA;AACxB,wBAAgB,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1D;yBAFe,IAAI;;;AAKpB,oBAAY,UAAU;IACpB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;CACL;
|
|
1
|
+
{"version":3,"file":"polyfills.d.ts","sourceRoot":"","sources":["../src/polyfills.ts"],"names":[],"mappings":"AAOA,cAAM,KAAK;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,CAAC,IAAI,MAAA;gBACC,CAAC,GAAE,MAAM,GAAG,MAAU,EAAE,CAAC,SAAI;IAazC,MAAM,CAAC,KAAK,EAAE,KAAK;IAInB,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK;IAIlC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK;IAOtC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK;IAIlC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK;IAI5B,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK;IAOhC,GAAG,IAAI,MAAM;IAIb,aAAa,IAAI,KAAK;IAOtB,SAAS,IAAI,KAAK;IAIX,KAAK,CAAC,KAAK,EAAE,IAAI;IAGjB,SAAS,CAAC,KAAK,EAAE,IAAI;IAIrB,SAAS;IAGT,GAAG,CAAC,KAAK,EAAE,IAAI;IAGf,KAAK,CAAC,KAAK,EAAE,IAAI;IAcjB,QAAQ,CAAC,KAAK,EAAE,KAAK;CAG7B;AACD,MAAM,MAAM,IAAI,GAAG,KAAK,CAAA;AACxB,wBAAgB,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1D;yBAFe,IAAI;;;AAKpB,oBAAY,UAAU;IACpB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;CACL;AAaD,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,YAEjE;AACD,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAA;AAEhD,cAAM,KAAK;IACT,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,IAAI,MAAA;gBACC,KAAK,SAAI,EAAE,MAAM,SAAI;CAWlC;AAED,MAAM,MAAM,IAAI,GAAG,KAAK,CAAA;AACxB,wBAAgB,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAEjD;AAED,qBAAa,KAAM,SAAQ,EAAE,CAAC,KAAK;IACzB,WAAW,EAAE,MAAM,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,mBAAmB,EAAE,MAAM,IAAI,CAAA;IAC/B,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,iBAAiB,EAAE,MAAM,IAAI,CAAA;CACtC;AAED,wBAAgB,UAAU,IAAI,IAAI,CAEjC"}
|
package/dist/polyfills.js
CHANGED
|
@@ -96,13 +96,8 @@ export var SpriteType;
|
|
|
96
96
|
SpriteType[SpriteType["FILLED"] = 3] = "FILLED";
|
|
97
97
|
SpriteType[SpriteType["MESH"] = 4] = "MESH";
|
|
98
98
|
})(SpriteType || (SpriteType = {}));
|
|
99
|
-
export const RED = Color4B(255, 0, 0, 255);
|
|
100
|
-
export const BLACK = Color4B(0, 0, 0, 255);
|
|
101
|
-
export const WHITE = Color4B(255, 255, 255, 255);
|
|
102
|
-
export const GREEN = Color4B(0, 255, 0, 255);
|
|
103
|
-
export const BLUE = Color4B(0, 0, 255, 255);
|
|
104
99
|
cc.Color.DEBUG_FILL_COLOR = cc.color(255, 255, 0, 48);
|
|
105
|
-
cc.Color.DEBUG_BORDER_COLOR = cc.
|
|
100
|
+
cc.Color.DEBUG_BORDER_COLOR = cc.Color.RED;
|
|
106
101
|
cc.Color.prototype.fromHEX = cc.hexToColor;
|
|
107
102
|
cc.Intersection = {
|
|
108
103
|
polygonPolygon,
|
|
@@ -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;
|
|
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;AAKlG,oBAAY,WAAW;IACrB,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;IACL,MAAM,IAAA;IACN,IAAI,IAAA;IACJ,SAAS,IAAA;CACV;AA4CD,qBAAa,YAAa,YAAW,MAAM;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY;IAWrC,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,iBAAiB,CAgBxB;IAED,OAAO,CAAC,eAAe,CAatB;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,6 +1,5 @@
|
|
|
1
1
|
import { EventTypes } from 'entityx-ts';
|
|
2
2
|
import { NodeComp } from '../core/NodeComp';
|
|
3
|
-
import { BLUE, RED } from '../polyfills';
|
|
4
3
|
import { GraphicsRender, MaskRender, MotionStreakComp, NodeRender, ParticleComp, SpriteRender, TiledMap } from './RenderComponent';
|
|
5
4
|
export var SpriteTypes;
|
|
6
5
|
(function (SpriteTypes) {
|
|
@@ -19,7 +18,8 @@ function createTiledSprite(src, totalW, totalH) {
|
|
|
19
18
|
const tileW = frame ? frame.getRect().width : tileSprite.getContentSize().width;
|
|
20
19
|
const tileH = frame ? frame.getRect().height : tileSprite.getContentSize().height;
|
|
21
20
|
// tạo renderTexture với kích thước cần phủ
|
|
22
|
-
const
|
|
21
|
+
const { width, height } = cc.winSize;
|
|
22
|
+
const rt = new cc.RenderTexture(width, height);
|
|
23
23
|
rt.beginWithClear(0, 0, 0, 0);
|
|
24
24
|
const drawSprite = new cc.Sprite(tileSprite.getTexture());
|
|
25
25
|
// if (frame) {
|
|
@@ -32,6 +32,7 @@ function createTiledSprite(src, totalW, totalH) {
|
|
|
32
32
|
for (let r = 0; r < rows; r++) {
|
|
33
33
|
for (let c = 0; c < cols; c++) {
|
|
34
34
|
const s = new cc.Sprite(frame);
|
|
35
|
+
s.setFlippedY(true);
|
|
35
36
|
s.setAnchorPoint(0, 0);
|
|
36
37
|
s.setPosition(c * tileW, r * tileH);
|
|
37
38
|
s.visit(rt);
|
|
@@ -39,7 +40,7 @@ function createTiledSprite(src, totalW, totalH) {
|
|
|
39
40
|
}
|
|
40
41
|
rt.end();
|
|
41
42
|
const finalSprite = rt.sprite;
|
|
42
|
-
finalSprite.setFlippedY(true)
|
|
43
|
+
// finalSprite.setFlippedY(true) // RenderTexture bị lật
|
|
43
44
|
finalSprite.setAnchorPoint(0, 0);
|
|
44
45
|
finalSprite.setContentSize(cc.size(totalW, totalH));
|
|
45
46
|
return new cc.Sprite(finalSprite.texture);
|
|
@@ -82,19 +83,22 @@ export class RenderSystem {
|
|
|
82
83
|
};
|
|
83
84
|
onAddMaskRender = ({ entity, component: maskComp }) => {
|
|
84
85
|
const { inverted, spriteFrame, cropSize, alphaThreshold = 0.05 } = maskComp.props;
|
|
85
|
-
let stencil
|
|
86
|
+
let stencil;
|
|
86
87
|
if (cropSize) {
|
|
87
88
|
const { width, height } = cropSize;
|
|
88
89
|
stencil = new cc.LayerColor(cc.Color.WHITE, width, height);
|
|
89
90
|
}
|
|
91
|
+
else {
|
|
92
|
+
stencil = new cc.Sprite(spriteFrame);
|
|
93
|
+
}
|
|
90
94
|
const clipper = new cc.ClippingNode(stencil);
|
|
91
95
|
clipper.setAlphaThreshold(!spriteFrame ? 1 : alphaThreshold);
|
|
92
|
-
clipper.setInverted(inverted
|
|
96
|
+
clipper.setInverted(inverted);
|
|
93
97
|
maskComp.node = entity.assign(new NodeComp(clipper, entity));
|
|
94
98
|
};
|
|
95
99
|
onAddGraphicsRender = ({ entity }) => {
|
|
96
100
|
const graphicsComp = entity.getComponent(GraphicsRender);
|
|
97
|
-
const { lineWidth = 5, strokeColor = RED, fillColor = BLUE } = graphicsComp.props;
|
|
101
|
+
const { lineWidth = 5, strokeColor = cc.Color.RED, fillColor = cc.Color.BLUE } = graphicsComp.props;
|
|
98
102
|
const node = new cc.DrawNode();
|
|
99
103
|
node.setColor(strokeColor);
|
|
100
104
|
node.setDrawColor(fillColor);
|
|
@@ -118,7 +122,7 @@ export class RenderSystem {
|
|
|
118
122
|
const node = new cc.MotionStreak(fade || 0.4, // fade (vệt tồn tại 0.4s)
|
|
119
123
|
minSeg || 1, // minSeg
|
|
120
124
|
stroke || 20, // stroke (độ rộng vệt)
|
|
121
|
-
color || cc.
|
|
125
|
+
color || cc.Color.WHITE, spriteFrame);
|
|
122
126
|
component.node = entity.assign(new NodeComp(node, entity));
|
|
123
127
|
};
|
|
124
128
|
onRemovedNodeComp = ({ component }) => {
|