Test_Project_Cocos/cocos-enhance-kit
1
0
Fork 0
mirror of https://github.com/smallmain/cocos-enhance-kit.git synced 2025-10-09 19:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[engine] [cocos2d-x] [jsb-adapter] 适配引擎 v2.4.10 版本

Browse Source
This commit is contained in:
SmallMain
2022-10-01 17:51:47 +08:00
parent 0740917436
commit e2077e59b5
31 changed files with 200 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
engine/cocos2d/core/renderer/utils/dynamic-atlas/manager.js
View File

@@ -32,8 +32,8 @@ function beforeSceneLoad() {
let _enabled = false;
/**
* !#en Manage Dynamic Atlas Manager. Dynamic Atlas Manager is used for merging textures at runtime, see [Dynamic Atlas](https://docs.cocos.com/creator/manual/en/advanced-topics/dynamic-atlas.html) for details.
* !#zh 管理动态图集。动态图集用于在运行时对贴图进行合并，详见 [动态合图](https://docs.cocos.com/creator/manual/zh/advanced-topics/dynamic-atlas.html)。
* !#en Manage Dynamic Atlas Manager. Dynamic Atlas Manager is used for merging textures at runtime, see [Dynamic Atlas](https://docs.cocos.com/creator/2.4/manual/en/advanced-topics/dynamic-atlas.html) for details.
* !#zh 管理动态图集。动态图集用于在运行时对贴图进行合并，详见 [动态合图](https://docs.cocos.com/creator/2.4/manual/zh/advanced-topics/dynamic-atlas.html)。
* @class DynamicAtlasManager
*/
let dynamicAtlasManager = {
@@ -41,8 +41,8 @@ let dynamicAtlasManager = {
Rect: Rect,
/**
* !#en Enable or disable the dynamic atlas, see [Dynamic Atlas](https://docs.cocos.com/creator/manual/en/advanced-topics/dynamic-atlas.html) for details.
* !#zh 开启或者关闭动态图集，详见 [动态合图](https://docs.cocos.com/creator/manual/zh/advanced-topics/dynamic-atlas.html)。
* !#en Enable or disable the dynamic atlas, see [Dynamic Atlas](https://docs.cocos.com/creator/2.4/manual/en/advanced-topics/dynamic-atlas.html) for details.
* !#zh 开启或者关闭动态图集，详见 [动态合图](https://docs.cocos.com/creator/2.4/manual/zh/advanced-topics/dynamic-atlas.html)。
* @property enabled
* @type {Boolean}
*/
@@ -192,6 +192,7 @@ let dynamicAtlasManager = {
* !#zh 添加碎图进入动态图集。
* @method insertSpriteFrame
* @param {SpriteFrame} spriteFrame
* @return {Object} frame
*/
insertSpriteFrame(spriteFrame) {
if (CC_EDITOR) return null;

12
engine/cocos2d/core/renderer/webgl/assemblers/motion-streak-multi.js
View File

@@ -25,6 +25,8 @@
import MotionStreakAssembler from "./motion-streak";
import { vfmtPosUvColorTexId } from '../../webgl/vertex-format';
import Mat4 from '../../../value-types/mat4';
const MotionStreak = require('../../../components/CCMotionStreak');
const RenderFlow = require('../../render-flow');
@@ -47,6 +49,7 @@ Point.prototype.setDir = function (x, y) {
let _normal = cc.v2();
let _vec2 = cc.v2();
let _worldMat = new Mat4();
function normal (out, dir) {
//get perpendicular
@@ -74,14 +77,14 @@ export default class MultiMotionStreakAssembler extends MotionStreakAssembler {
let stroke = comp._stroke / 2;
let node = comp.node;
let matrix = node._worldMatrix.m;
let tx = matrix[12], ty = matrix[13];
node.getWorldMatrix(_worldMat);
let tx = _worldMat.m[12], ty = _worldMat.m[13];
let points = comp._points;
let lastPos = comp._lastWPos;
let fadeTime = comp._fadeTime;
let moved = lastPos.x !== tx || lastPos.y !== ty;
let moved = comp._lastWPosUpdated && (lastPos.x !== tx || lastPos.y !== ty);
if (moved) {
let cur;
let newHead = false;
@@ -126,7 +129,8 @@ export default class MultiMotionStreakAssembler extends MotionStreakAssembler {
lastPos.x = tx;
lastPos.y = ty;
comp._lastWPosUpdated = true;
if (points.length < 2) {
return;
}

11
engine/cocos2d/core/renderer/webgl/assemblers/motion-streak.js
View File

@@ -24,6 +24,7 @@
****************************************************************************/
import Assembler2D from '../../assembler-2d';
import Mat4 from '../../../value-types/mat4';
const RenderFlow = require('../../render-flow');
@@ -48,6 +49,7 @@ let _tangent = cc.v2();
let _miter = cc.v2();
let _normal = cc.v2();
let _vec2 = cc.v2();
let _worldMat = new Mat4();
function normal (out, dir) {
//get perpendicular
@@ -91,14 +93,14 @@ export default class MotionStreakAssembler extends Assembler2D {
let stroke = comp._stroke / 2;
let node = comp.node;
let matrix = node._worldMatrix.m;
let tx = matrix[12], ty = matrix[13];
node.getWorldMatrix(_worldMat);
let tx = _worldMat.m[12], ty = _worldMat.m[13];
let points = comp._points;
let lastPos = comp._lastWPos;
let fadeTime = comp._fadeTime;
let moved = lastPos.x !== tx || lastPos.y !== ty;
let moved = comp._lastWPosUpdated && (lastPos.x !== tx || lastPos.y !== ty);
if (moved) {
let cur;
let newHead = false;
@@ -143,7 +145,8 @@ export default class MotionStreakAssembler extends Assembler2D {
lastPos.x = tx;
lastPos.y = ty;
comp._lastWPosUpdated = true;
if (points.length < 2) {
return;
}