@safe-engine/cocos 2.5.13 → 2.5.14

package/dist/render/TiledSprite.d.ts

@@ -10,5 +10,5 @@ export declare class TiledSpriteNode extends cc.Sprite {
     updateShaderUniforms(): void;
     setContentSize(w: any, h: any): void;
 }
-export declare function createTiledSprite(src: string, totalW: number, totalH: number): TiledSpriteNode;
+export declare function createTiledSprite(src: string, totalW: number, totalH: number): cc.Sprite;
 //# sourceMappingURL=TiledSprite.d.ts.map

package/dist/render/TiledSprite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TiledSprite.d.ts","sourceRoot":"","sources":["../../src/render/TiledSprite.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAgB,SAAQ,EAAE,CAAC,MAAM;IAC5C,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,aAAa,EAAE,oBAAoB,CAAA;IACnC,WAAW,EAAE,oBAAoB,CAAA;IACjC,OAAO,EAAE,oBAAoB,CAAA;IAC7B,SAAS,EAAE,oBAAoB,CAAA;IAC/B,QAAQ,EAAE,oBAAoB,CAAA;gBAElB,IAAI,KAAA;IAMhB,UAAU;IAuBV,oBAAoB;IAkBpB,cAAc,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;CAIpB;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAS5E"}
+{"version":3,"file":"TiledSprite.d.ts","sourceRoot":"","sources":["../../src/render/TiledSprite.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAgB,SAAQ,EAAE,CAAC,MAAM;IAC5C,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAA;IACtB,aAAa,EAAE,oBAAoB,CAAA;IACnC,WAAW,EAAE,oBAAoB,CAAA;IACjC,OAAO,EAAE,oBAAoB,CAAA;IAC7B,SAAS,EAAE,oBAAoB,CAAA;IAC/B,QAAQ,EAAE,oBAAoB,CAAA;gBAElB,IAAI,KAAA;IAMhB,UAAU;IAsBV,oBAAoB;IAkBpB,cAAc,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;CAIpB;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAkC5E"}

package/dist/render/TiledSprite.js

@@ -28,23 +28,23 @@ export class TiledSpriteNode extends cc.Sprite {
         this._texLoc = program.getUniformLocationForName('u_texture');
         this._scaleLoc = program.getUniformLocationForName('u_scale');
         this._sizeLoc = program.getUniformLocationForName('u_size');
-        this.scheduleUpdate();
+        // this.scheduleUpdate()
     }
     updateShaderUniforms() {
         if (!this._program || !this.texture || !this.texture.isLoaded())
             return;
         const texW = this.texture.width;
         const texH = this.texture.height;
-        const size = this.getContentSize();
-        console.log('TiledSprite updateShaderUniforms', size, texW, texH);
-        const scaleX = size.width / texW;
-        const scaleY = size.height / texH;
+        const { height, width } = this.getContentSize();
+        // console.log('TiledSprite updateShaderUniforms', { height, width }, texW, texH)
+        const scaleX = width / texW;
+        const scaleY = height / texH;
         this._program.use();
         this._program.setUniformLocationWith2f(this._tileScaleLoc, scaleX, scaleY);
         this._program.setUniformLocationWith2f(this._texSizeLoc, texW, texH);
         this._program.setUniformLocationWith1i(this._texLoc, 0);
         this._program.setUniformLocationWith2f(this._scaleLoc, scaleX, scaleY);
-        this._program.setUniformLocationWith2f(this._sizeLoc, size.width, size.height);
+        this._program.setUniformLocationWith2f(this._sizeLoc, width, height);
     }
     setContentSize(w, h) {
         super.setContentSize(w, h);
@@ -52,14 +52,38 @@ export class TiledSpriteNode extends cc.Sprite {
     }
 }
 export function createTiledSprite(src, totalW, totalH) {
-    const tileSprite = new TiledSpriteNode(src);
-    function afterLoaded() {
-        tileSprite.setContentSize(totalW, totalH);
-        console.log('createTiledSprite', src, totalW, totalH, tileSprite);
+    const tileSprite = new cc.Sprite(src);
+    // lấy kích thước gốc của texture
+    const tileW = tileSprite.texture.width;
+    const tileH = tileSprite.texture.height;
+    const program = new cc.GLProgram();
+    program.initWithString(tiledVsh, tieldFsh);
+    // program.initWithVertexShaderByteArray(vert, frag);
+    program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
+    program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
+    program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
+    if (!program.link()) {
+        console.error('Failed to link shader program');
+        return;
     }
+    program.updateUniforms();
+    program.setUniformLocationWith1i(program.getUniformLocationForName('u_texture'), 0);
+    const tileScaleLoc = program.getUniformLocationForName('u_tileScale');
+    const texSizeLoc = program.getUniformLocationForName('u_texSize');
+    const scaleX = totalW / tileW;
+    const scaleY = totalH / tileH;
     if (tileSprite.texture._textureLoaded)
         afterLoaded();
     else
         tileSprite.texture.addLoadedEventListener(afterLoaded);
+    function afterLoaded() {
+        // program.use()
+        program.setUniformLocationWith2f(texSizeLoc, tileW, tileH);
+        program.setUniformLocationWith2f(tileScaleLoc, scaleX, scaleY);
+        tileSprite.setShaderProgram(program);
+        // nếu dùng batch node hoặc spriteframe atlas, đảm bảo texture unit đúng
+    }
+    // tileSprite.setContentSize(totalW, totalH)
+    tileSprite.setScale(scaleX, scaleY);
     return tileSprite;
 }

package/dist/render/shader.d.ts

@@ -1,3 +1,3 @@
 export declare const tieldFsh = "\n#ifdef GL_ES\nprecision mediump float;\n#endif\n\nvarying vec2 v_texCoord;\nvarying vec4 v_fragmentColor;\n\nuniform sampler2D u_texture;\nuniform vec2 u_tileScale;\nuniform vec2 u_texSize;\n\nvoid main()\n{\n    // scale UV to tile space\n    vec2 uv = v_texCoord * u_tileScale;\n\n    // wrap using fract\n    vec2 uvw = fract(uv);\n\n    // avoid linear-filter seams: push UVs slightly away from exact 0.0/1.0 edges\n    // compute texel size in uv-space\n    vec2 texel = 1.0 / u_texSize;\n\n    // shrink usable range slightly to avoid sampling border when linear filter is used\n    // the factor 1.0 - 2.0*texel moves the uv into [texel, 1-texel]\n    uvw = uvw * (1.0 - 2.0 * texel) + texel;\n\n    vec4 color = texture2D(u_texture, uvw);\n\n    gl_FragColor = color * v_fragmentColor;\n}\n";
-export declare const tiledVsh = "\nattribute vec4 a_position;\nattribute vec2 a_texCoord;\nattribute vec4 a_color;\n\n#ifdef GL_ES\nvarying mediump vec2 v_texCoord;\nvarying lowp vec4 v_fragmentColor;\n#else\nvarying vec2 v_texCoord;\nvarying vec4 v_fragmentColor;\n#endif\nuniform vec2 u_scale;\nuniform vec2 u_size;\n\nvoid main() {\n    vec2 pivot = u_size * 0.5;\n    vec4 pos = a_position;\n    // pos.xy *= u_scale;   // scale h\u00ECnh \u1EA3nh\n    pos.xy = (pos.xy - pivot) * u_scale + pivot;\n    gl_Position = CC_PMatrix * pos;\n    v_texCoord = a_texCoord;\n    v_fragmentColor = a_color;\n}\n";
+export declare const tiledVsh = "\nattribute vec4 a_position;\nattribute vec2 a_texCoord;\nattribute vec4 a_color;\n\n#ifdef GL_ES\nvarying mediump vec2 v_texCoord;\nvarying lowp vec4 v_fragmentColor;\n#else\nvarying vec2 v_texCoord;\nvarying vec4 v_fragmentColor;\n#endif\nuniform vec2 u_scale;\nuniform vec2 u_size;\n\nvoid main() {\n    gl_Position = CC_PMatrix * a_position;\n    v_texCoord = a_texCoord;\n    v_fragmentColor = a_color;\n}\n";
 //# sourceMappingURL=shader.d.ts.map

package/dist/render/shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader.d.ts","sourceRoot":"","sources":["../../src/render/shader.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,qyBAgCpB,CAAA;AACD,eAAO,MAAM,QAAQ,ikBAwBpB,CAAA"}
+{"version":3,"file":"shader.d.ts","sourceRoot":"","sources":["../../src/render/shader.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,qyBAgCpB,CAAA;AACD,eAAO,MAAM,QAAQ,iaAoBpB,CAAA"}

package/dist/render/shader.js

@@ -47,11 +47,7 @@ uniform vec2 u_scale;
 uniform vec2 u_size;
 
 void main() {
-    vec2 pivot = u_size * 0.5;
-    vec4 pos = a_position;
-    // pos.xy *= u_scale;   // scale hình ảnh
-    pos.xy = (pos.xy - pivot) * u_scale + pivot;
-    gl_Position = CC_PMatrix * pos;
+    gl_Position = CC_PMatrix * a_position;
     v_texCoord = a_texCoord;
     v_fragmentColor = a_color;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "2.5.13",
+  "version": "2.5.14",
   "description": "safe-engine with cocos renderer support",
   "type": "module",
   "main": "dist/index.js",