Merge pull request cocos#14 from minggo/merge_v3.3

Merge v3.3
GengineJS · May 25, 2021 · 67b9223 · 67b9223
2 parents 5655b83 + 25bd903
commit 67b9223
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/cocos/2d/renderer/draw-batch.ts b/cocos/2d/renderer/draw-batch.ts
@@ -28,6 +28,7 @@
  * @hidden
  */
 
+import { JSB } from 'internal:constants';
 import { MeshBuffer } from './mesh-buffer';
 import { Material } from '../../core/assets/material';
 import { Texture, Sampler } from '../../core/gfx';
@@ -130,8 +131,11 @@ export class DrawBatch2D {
                     this._passes[i] = new Pass(legacyCC.director.root);
                     // @ts-expect-error hack for UI use pass object
                     this._passes[i]._handle = PassPool.alloc();
-                    // @ts-expect-error hack for UI use pass object
-                    this._passes[i]._nativeObj = new ns.Pass();
+
+                    if (JSB) {
+                        // @ts-expect-error hack for UI use pass object
+                        this._passes[i]._nativeObj = new ns.Pass();
+                    }
                 }
                 const mtlPass = passes[i];
                 const passInUse = this._passes[i];

diff --git a/cocos/core/renderer/scene/submodel.ts b/cocos/core/renderer/scene/submodel.ts
@@ -64,13 +64,9 @@ export class SubModel {
      }
 
      private _createDescriptorSet (descInfo: DescriptorSetInfo) {
-         if (JSB) {
-             const dsHandle = DSPool.alloc(this._device!, descInfo);
-             SubModelPool.set(this._handle, SubModelView.DESCRIPTOR_SET, dsHandle);
-             this._descriptorSet = DSPool.get(dsHandle);
-             return;
-         }
-         this._descriptorSet = this._device!.createDescriptorSet(descInfo);
+         const dsHandle = DSPool.alloc(this._device!, descInfo);
+         SubModelPool.set(this._handle, SubModelView.DESCRIPTOR_SET, dsHandle);
+         this._descriptorSet = DSPool.get(dsHandle);
      }
 
      private _setPassCount (val: number) {
@@ -152,13 +148,9 @@ export class SubModel {
      }
 
      private _setInputAssembler (iaInfo: InputAssemblerInfo) {
-         if (JSB) {
-             const iaHandle = IAPool.alloc(this._device!, iaInfo);
-             SubModelPool.set(this._handle, SubModelView.INPUT_ASSEMBLER, iaHandle);
-             this._inputAssembler = IAPool.get(iaHandle);
-             return;
-         }
-         this._inputAssembler = this._device!.createInputAssembler(iaInfo);
+         const iaHandle = IAPool.alloc(this._device!, iaInfo);
+         SubModelPool.set(this._handle, SubModelView.INPUT_ASSEMBLER, iaHandle);
+         this._inputAssembler = IAPool.get(iaHandle);
      }
 
      private _setSubMesh (subMesh: RenderingSubMesh) {

diff --git a/cocos/dragon-bones/CCSlot.ts b/cocos/dragon-bones/CCSlot.ts
@@ -4,7 +4,7 @@
  */
 
 import { BoneType, BinaryOffset, Slot } from '@cocos/dragonbones-js';
-import { Color, ImageAsset, mat4, Mat4, Texture2D } from '../core';
+import { Color, Mat4, Texture2D } from '../core';
 import { ccclass } from '../core/data/class-decorator';
 import { CCTextureData } from './CCTextureData';
 
@@ -38,8 +38,8 @@ export class CCSlot extends Slot {
     getTexture () {
         if (this._textureData) {
             const sp = (this._textureData as any).spriteFrame;
-            const tex = sp.texture instanceof ImageAsset ? sp.texture._texture : sp.texture;
-            return tex as Texture2D;
+            const tex = sp.texture as Texture2D;
+            return tex;
         }
         return null;
     }

diff --git a/cocos/spine/skeleton-texture.ts b/cocos/spine/skeleton-texture.ts
@@ -3,13 +3,13 @@
  * @module spine
  */
 
-import { ImageAsset, Material, Texture2D } from '../core';
+import { Material, Texture2D } from '../core';
 import { Filter, WrapMode } from '../core/assets/asset-enum';
 import spine from './lib/spine-core.js';
 
 export class SkeletonTexture extends spine.Texture {
     name = 'sp.SkeletonTexture';
-    _texture: Texture2D|ImageAsset | null = null;
+    _texture: Texture2D | null = null;
     _material: Material | null = null;
 
     constructor (opt:ImageBitmap|HTMLImageElement) {
@@ -22,8 +22,7 @@ export class SkeletonTexture extends spine.Texture {
     }
 
     getRealTexture (): Texture2D|null {
-        if (!this._texture) { return null; }
-        return this._texture instanceof ImageAsset ? this._texture._texture as Texture2D : this._texture;
+        return this._texture;
     }
 
     setFilters (minFilter: spine.TextureFilter, magFilter: spine.TextureFilter) {

diff --git a/platforms/native/engine/jsb-dragonbones.js b/platforms/native/engine/jsb-dragonbones.js
@@ -794,7 +794,7 @@ const cacheManager = require('./jsb-cache-manager');
                 middleware.resetIndicesStart = false;
             }
 
-            ui.commitComp(this, realTexture._texture, this._assembler, null);
+            ui.commitComp(this, realTexture, this._assembler, null);
             this.material = mat;
         }
     }

diff --git a/platforms/native/engine/jsb-spine-skeleton.js b/platforms/native/engine/jsb-spine-skeleton.js
@@ -96,13 +96,14 @@ const cacheManager = require('./jsb-cache-manager');
             return;
         }
 
-        let skeletonCache = spine.retainSkeletonData(uuid);
-        if (skeletonCache) {
-            this._skeletonCache = skeletonCache;
-            this.width = this._skeletonCache.getWidth();
-            this.height = this._skeletonCache.getHeight();                 
-            return;
-        }
+        // gfxTexture may not exist if this._skeletonCache == null
+        // let skeletonCache = spine.retainSkeletonData(uuid);
+        // if (skeletonCache) {
+        //     this._skeletonCache = skeletonCache;
+        //     this.width = this._skeletonCache.getWidth();
+        //     this.height = this._skeletonCache.getHeight();                 
+        //     return;
+        // }
 
         let atlasText = this.atlasText;
         if (!atlasText) {
@@ -117,6 +118,8 @@ const cacheManager = require('./jsb-cache-manager');
             return;
         }
 
+        _gTextureIdx = 1;
+        _textureKeyMap = {};
         let jsbTextures = {};
         for (let i = 0; i < textures.length; ++i) {
             let texture = textures[i];
@@ -894,7 +897,7 @@ const cacheManager = require('./jsb-cache-manager');
                 middleware.resetIndicesStart = false;
             }
 
-            ui.commitComp(this, realTexture._texture, this._assembler, null);
+            ui.commitComp(this, realTexture, this._assembler, null);
             this.material = mat;
         }
     }