@safe-engine/cocos 2.1.7 → 2.1.9
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/render/RenderComponent.d.ts +3 -2
- package/dist/render/RenderComponent.d.ts.map +1 -1
- package/dist/render/RenderSystem.d.ts.map +1 -1
- package/dist/render/RenderSystem.js +3 -9
- package/dist/render/TiledSprite.d.ts.map +1 -1
- package/dist/render/TiledSprite.js +4 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ComponentX } from '../core/decorator';
|
|
2
|
-
import { Color4B, Vec2 } from '../polyfills';
|
|
2
|
+
import { Color4B, Size, Vec2 } from '../polyfills';
|
|
3
3
|
import { BaseComponentProps, ColorSource } from '../safex';
|
|
4
4
|
export declare class NodeRender extends ComponentX {
|
|
5
5
|
nodeName: string;
|
|
@@ -15,7 +15,8 @@ declare enum SpriteTypes {
|
|
|
15
15
|
interface SpriteRenderProps {
|
|
16
16
|
spriteFrame: string;
|
|
17
17
|
type?: SpriteTypes;
|
|
18
|
-
capInsets?:
|
|
18
|
+
capInsets?: [number, number, number, number];
|
|
19
|
+
tiledSize?: Size;
|
|
19
20
|
}
|
|
20
21
|
export declare class SpriteRender extends ComponentX<SpriteRenderProps & BaseComponentProps<SpriteRender>, cc.Sprite> {
|
|
21
22
|
get spriteFrame(): string;
|
|
@@ -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,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"RenderComponent.d.ts","sourceRoot":"","sources":["../../src/render/RenderComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,CAuBxB;IAED,OAAO,CAAC,eAAe,CAKtB;IAED,OAAO,CAAC,mBAAmB,CAQ1B;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,OAAO,CAAC,aAAa,CAKpB;IAED,OAAO,CAAC,iBAAiB,CAWxB;IAED,OAAO,CAAC,iBAAiB,CAKxB;IAED,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE"}
|
|
@@ -30,23 +30,17 @@ export class RenderSystem {
|
|
|
30
30
|
nodeRenderComp.node = ett.assign(new NodeComp(node, ett));
|
|
31
31
|
};
|
|
32
32
|
onAddSpriteRender = ({ entity, component: spriteComp }) => {
|
|
33
|
-
const { spriteFrame, type, capInsets } = spriteComp.props;
|
|
33
|
+
const { spriteFrame, type, capInsets, tiledSize } = spriteComp.props;
|
|
34
34
|
const frame = cc.spriteFrameCache.getSpriteFrame(spriteFrame);
|
|
35
35
|
// console.log('frame', spriteFrame, frame)
|
|
36
36
|
let node;
|
|
37
37
|
switch (type) {
|
|
38
38
|
case SpriteTypes.TILED:
|
|
39
|
-
node = new TiledSprite({ texture: spriteFrame });
|
|
39
|
+
node = new TiledSprite({ texture: spriteFrame, width: tiledSize.width, height: tiledSize.height });
|
|
40
40
|
break;
|
|
41
41
|
case SpriteTypes.SLICED:
|
|
42
42
|
{
|
|
43
|
-
|
|
44
|
-
if (capInsets instanceof cc.Rect) {
|
|
45
|
-
rect = capInsets;
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
rect = cc.rect(...capInsets);
|
|
49
|
-
}
|
|
43
|
+
const rect = cc.rect(...capInsets);
|
|
50
44
|
node = new ccui.Scale9Sprite(frame || spriteFrame, rect, rect);
|
|
51
45
|
// console.log('Scale9Sprite', node)
|
|
52
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TiledSprite.d.ts","sourceRoot":"","sources":["../../src/render/TiledSprite.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;;;;CAgBhC,CAAA;AAED,eAAO,MAAM,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"TiledSprite.d.ts","sourceRoot":"","sources":["../../src/render/TiledSprite.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;;;;CAgBhC,CAAA;AAED,eAAO,MAAM,WAAW,EAAE,GAmExB,CAAA"}
|
|
@@ -58,10 +58,13 @@ export const TiledSprite = cc.Sprite.extend({
|
|
|
58
58
|
if (this._tilingSprite) {
|
|
59
59
|
this._tilingSprite.width = this.width;
|
|
60
60
|
this._tilingSprite.height = this.height;
|
|
61
|
+
this._canvas.width = this.width;
|
|
62
|
+
this._canvas.height = this.height;
|
|
63
|
+
// console.log('_updateRepeat', this._pixiApp, this._tilingSprite)
|
|
61
64
|
this._pixiApp.renderer.render(this._pixiApp.stage);
|
|
62
65
|
this._texture.initWithElement(this._canvas);
|
|
63
66
|
this._texture.handleLoadedTexture();
|
|
64
|
-
// console.log('_texture', this._texture)
|
|
67
|
+
// console.log('_texture', this._texture, this)
|
|
65
68
|
this.setTexture(this._texture);
|
|
66
69
|
}
|
|
67
70
|
},
|