Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed mesh sprite #5195

Merged
merged 1 commit into from Aug 21, 2019
Merged

fixed mesh sprite #5195

merged 1 commit into from Aug 21, 2019

Conversation

@2youyou2
Copy link
Contributor

@2youyou2 2youyou2 commented Aug 20, 2019

Re: cocos-creator/2d-tasks#

Changes:

  • fixed mesh sprite not update indices count when vertices count is the same
@2youyou2 2youyou2 merged commit a86ab57 into cocos-creator:v2.1.3 Aug 21, 2019
1 check passed
jareguo added a commit that referenced this issue Aug 28, 2019
…elease

* commit '95bb66312892cb63b43c3dff942a221de6fafdb5':
  refine engine prepare (#5261)
  space added when atlas calculates next y position. (#5242)
  fixed animation (#5246)
  fix scrollview bar display bug (#5249)
  fixed search skeleton animation clip when no model provided (#5258)
  fix RenderComponent properties animatable for 2d-tasks/issues/1755 (#5253)
  fix error when run in wechat develop platform (#5185) (#5248)
  Optimize the code of BMFont and LetterFont (#5223)
  Fix getParameter call inside texture update (#5198)
  refine editbox css-in-js (#5203)
  improve scrollview inspector panel (#5215)
  fixed mesh sprite (#5195)
  add CCView extends EventTarget api (#5205)
  rm _rotationX and _rotationY (#5197)
  fix restore rotation invalid (#5188)
  change comments of code in CCComponentEventHandler and CCSlider (#5178)

# Conflicts:
#	cocos2d/core/mesh/CCMeshRenderer.js
#	cocos2d/core/renderer/utils/label/bmfont.js
#	cocos2d/core/renderer/utils/label/letter-font.js
#	cocos2d/core/renderer/utils/label/ttf.js
#	cocos2d/core/renderer/utils/utils.js
#	cocos2d/core/renderer/webgl/assemblers/label/2d/letter.js
#	cocos2d/core/renderer/webgl/assemblers/label/index.js
#	cocos2d/core/renderer/webgl/assemblers/sprite/2d/mesh.js
#	test/qunit/unit-es5/test-serialize-node.js
jareguo added a commit that referenced this issue Aug 28, 2019
* v2.2.0-release: (27 commits)
  add dynamicPack property to texture (#5125)
  improve cc._throw code (#5208)
  refine engine prepare (#5261)
  space added when atlas calculates next y position. (#5242)
  fixed animation (#5246)
  fix scrollview bar display bug (#5249)
  fixed search skeleton animation clip when no model provided (#5258)
  fix RenderComponent properties animatable for 2d-tasks/issues/1755 (#5253)
  fix error when run in wechat develop platform (#5185) (#5248)
  Fix tiledlayer node rebuild bug (#5247)
  Optimize the code of BMFont and LetterFont (#5223)
  Fix getParameter call inside texture update (#5198)
  refine editbox css-in-js (#5203)
  improve scrollview inspector panel (#5215)
  fix 2.2.0 opacity dirty bug (#5240)
  refine find frame index logic (#5220)
  improve sprite animation performance (#5210)
  optimize animation (#5211)
  fixed load sprite
  fixed mesh sprite (#5195)
  ...

# Conflicts:
#	cocos2d/core/CCGame.js
2youyou2 added a commit to 2youyou2/engine that referenced this issue Aug 17, 2020
@2youyou2 2youyou2 mentioned this pull request Aug 17, 2020
pandamicro pushed a commit that referenced this issue Aug 19, 2020
2youyou2 added a commit to 2youyou2/engine that referenced this issue Sep 14, 2020
commit c4606c8
Author: JoneLau <32630749+JoneLau@users.noreply.github.com>
Date:   Sun Sep 13 23:33:07 2020 +0800

    adjust the Graphics structure to support continuous data filling (cocos-creator#7359)

commit 66f9b20
Merge: 896b22e 2e6c9b6
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Sep 11 11:13:59 2020 +0800

    Merge pull request cocos-creator#7356 from YunHsiao/3d

    dynamic state cache capacity

commit 896b22e
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Sep 11 11:09:45 2020 +0800

    fix memory leak (cocos-creator#7362)

commit 2e6c9b6
Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
Date:   Thu Sep 10 14:34:19 2020 +0800

    dynamic state cache capacity

commit b2d9249
Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
Date:   Thu Sep 10 15:19:38 2020 +0800

    fix circular refs (cocos-creator#7354)

commit c85ab01
Author: minggo <nudtzxm@gmail.com>
Date:   Thu Sep 10 14:44:20 2020 +0800

    fix logic error (cocos-creator#7353)

commit ae99249
Merge: 9cebf67 6e71962
Author: minggo <nudtzxm@gmail.com>
Date:   Thu Sep 10 11:44:35 2020 +0800

    Merge pull request cocos-creator#7352 from minggo/merge_1.2

    Merge 1.2

commit 6e71962
Merge: 9cebf67 9dc5a20
Author: minggo <nudtzxm@gmail.com>
Date:   Thu Sep 10 11:41:20 2020 +0800

    merge v1.2

commit 9cebf67
Author: coulsonwang <coulsonwang@126.com>
Date:   Thu Sep 10 11:24:03 2020 +0800

    Revert "add setTarget adapter (cocos-creator#7342)" (cocos-creator#7351)

    This reverts commit edbf237.

commit 5f0687a
Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
Date:   Thu Sep 10 11:23:30 2020 +0800

    more type check on GFX public interfaces (cocos-creator#7350)

    * more type check on GFX public interfaces
    * more general vector types

commit edbf237
Author: coulsonwang <coulsonwang@126.com>
Date:   Thu Sep 10 10:02:08 2020 +0800

    add setTarget adapter (cocos-creator#7342)

commit b44ce3a
Author: coulsonwang <coulsonwang@126.com>
Date:   Thu Sep 10 09:58:20 2020 +0800

    add renderWindow adapter (cocos-creator#7343)

commit d0c300a
Author: coulsonwang <coulsonwang@126.com>
Date:   Thu Sep 10 09:57:13 2020 +0800

    fix pipeline import (cocos-creator#7344)

commit a91f97b
Author: coulsonwang <coulsonwang@126.com>
Date:   Thu Sep 10 09:56:41 2020 +0800

    rename shaderID (cocos-creator#7347)

commit 093436d
Author: coulsonwang <coulsonwang@126.com>
Date:   Thu Sep 10 09:56:10 2020 +0800

    hack buffer pool flag to 20 bits (cocos-creator#7349)

commit 9dc5a20
Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
Date:   Wed Sep 9 18:02:02 2020 +0800

    fix pass handle type check (cocos-creator#7348)

commit 8fffa7f
Author: cary <39078800+caryliu1999@users.noreply.github.com>
Date:   Wed Sep 9 11:37:35 2020 +0800

    Change skybox and shadow to buffer pool. (cocos-creator#7306)

commit a34a125
Author: pandamicro <lphuabin@gmail.com>
Date:   Wed Sep 9 10:36:25 2020 +0800

    Fix texture reset process (cocos-creator#7338)

    * Fix texture reset process

    * refine (#30)

    Co-authored-by: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>

commit 0b73aff
Author: ChiaNing <sun.cloud.mo@gmail.com>
Date:   Wed Sep 9 10:13:34 2020 +0800

    imageAsset data bug fix (cocos-creator#7337)

    * imageAsset data bug fix

    * update

commit 4671f65
Author: minggo <nudtzxm@gmail.com>
Date:   Wed Sep 9 10:06:40 2020 +0800

    do not use pipeline adapter (cocos-creator#7339)

commit 6694d74
Author: Leslie Leigh (李的序) <leslieleigh@outlook.com>
Date:   Tue Sep 8 15:05:16 2020 +0800

    Add morph name field (cocos-creator#7332)

commit 3422c13
Author: Leslie Leigh (李的序) <leslieleigh@outlook.com>
Date:   Tue Sep 8 14:55:37 2020 +0800

    Bump gift@2.0.7 (cocos-creator#7331)

commit 2d1acb5
Author: Knox <knox.h@qq.com>
Date:   Tue Sep 8 14:19:42 2020 +0800

    sync 2d webview (cocos-creator#7318)

commit a333b0b
Author: Leslie Leigh (李的序) <leslieleigh@outlook.com>
Date:   Tue Sep 8 14:08:20 2020 +0800

    Handle WebGL context lost event (cocos-creator#7291)

    * Handle WebGL context lost event

    * Fix

commit 8873c62
Author: ChiaNing <sun.cloud.mo@gmail.com>
Date:   Tue Sep 8 13:56:52 2020 +0800

    compressed texture bug fix (cocos-creator#7328)

commit f756be4
Author: Santy-Wang <wh19930829@qq.com>
Date:   Tue Sep 8 10:36:11 2020 +0800

    fix loading failure when asset is recursively referenced (cocos-creator#7327)

commit 43cc9ec
Author: minggo <nudtzxm@gmail.com>
Date:   Tue Sep 8 10:05:00 2020 +0800

    add jsb adapter (cocos-creator#7323)

commit d8b2f63
Author: Knox <knox.h@qq.com>
Date:   Tue Sep 8 10:02:37 2020 +0800

    rename video-player-impl-web (cocos-creator#7310)

    * rename video-player-impl-web

    * refine code

    * refine code

commit 9719191
Author: minggo <nudtzxm@gmail.com>
Date:   Mon Sep 7 18:33:49 2020 +0800

    record correct shared data (cocos-creator#7326)

commit a1beac8
Author: minggo <nudtzxm@gmail.com>
Date:   Mon Sep 7 11:36:51 2020 +0800

    fix typo (cocos-creator#7321)

commit d2a8714
Author: minggo <nudtzxm@gmail.com>
Date:   Mon Sep 7 10:56:11 2020 +0800

    Override some classes in jsb (cocos-creator#7319)

commit 736e13a
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Sep 4 17:59:23 2020 +0800

    sync from 1.2 (cocos-creator#7314)

    * sync from 1.2

    * delete unneeded codes

commit 12dbd38
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Sep 4 17:38:52 2020 +0800

    fix binding index (cocos-creator#7312)

commit e4bd687
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Sep 4 16:10:42 2020 +0800

    update build engine to ignore wedding out engine codes (cocos-creator#7309)

commit fbcd5be
Author: Knox <knox.h@qq.com>
Date:   Fri Sep 4 15:54:59 2020 +0800

    improve video player (cocos-creator#7304)

commit 331ec76
Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
Date:   Fri Sep 4 15:04:09 2020 +0800

    fix blend target (cocos-creator#7308)

    * fix blend target

    * GFXColor now compatible with Color

commit 876ce03
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Sep 4 14:41:48 2020 +0800

    record correct submodule handle (cocos-creator#7307)

commit 39eac46
Author: Yun Hsiao Wu <inheritorofgalaxy@gmail.com>
Date:   Fri Sep 4 14:07:49 2020 +0800

    texture unit opt (cocos-creator#7298)

    * texture unit opt

    * type checks

    * circular ref fix

    * plane as vec4 compatible

    * cache IA cross render passes

commit acdcd87
Author: minggo <nudtzxm@gmail.com>
Date:   Thu Sep 3 20:03:26 2020 +0800

    invoke function to set blend target (cocos-creator#7299)

commit 9ffff43
Author: minggo <nudtzxm@gmail.com>
Date:   Thu Sep 3 17:47:09 2020 +0800

    add submodle into array pool (cocos-creator#7280)

    * add submodule handle into shared memory

    * set clearColor to pool (#3)

    * invoke super destroy at end

    Co-authored-by: coulsonwang <coulsonwang@126.com>

commit cfdb88b
Author: minggo <nudtzxm@gmail.com>
Date:   Thu Sep 3 12:39:37 2020 +0800

    update build engine version to 3.1.0-alpha.2 (cocos-creator#7288)

    * update build engine version to 3.1.0-alpha.2

    * update build engine verson

commit 7c160fc
Merge: ba049f2 8172574
Author: pandamicro <lphuabin@gmail.com>
Date:   Thu Sep 3 11:41:41 2020 +0800

    Merge pull request cocos-creator#7289 from pandamicro/merge1.2

    Merge v1.2

commit 8172574
Author: pandamicro <lphuabin@gmail.com>
Date:   Thu Sep 3 11:37:15 2020 +0800

    Fix ci

commit e9780cd
Author: pandamicro <lphuabin@gmail.com>
Date:   Thu Sep 3 11:33:09 2020 +0800

    Fix sealed global variables

commit 3539945
Merge: 9bb07a6 8b42093
Author: pandamicro <lphuabin@gmail.com>
Date:   Thu Sep 3 11:30:28 2020 +0800

    Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2

    # Conflicts:
    #	tests/general/sealed-global-variables.json

commit 9bb07a6
Author: pandamicro <lphuabin@gmail.com>
Date:   Thu Sep 3 11:29:53 2020 +0800

    Fix issue

commit ba049f2
Merge: 3d9cd31 31e8d0f
Author: pandamicro <lphuabin@gmail.com>
Date:   Thu Sep 3 11:28:04 2020 +0800

    Merge pull request cocos-creator#7281 from pandamicro/merge1.2

    Merge v1.2 to 3d

commit 31e8d0f
Author: pandamicro <lphuabin@gmail.com>
Date:   Wed Sep 2 23:43:36 2020 +0800

    Fix issues

commit bfc472f
Author: pandamicro <lphuabin@gmail.com>
Date:   Wed Sep 2 19:54:25 2020 +0800

    Fix some issues

commit 938b701
Author: pandamicro <lphuabin@gmail.com>
Date:   Wed Sep 2 18:40:09 2020 +0800

    Update package-lock

commit 1d2a82d
Merge: 3d9cd31 6b43a2d
Author: pandamicro <lphuabin@gmail.com>
Date:   Wed Sep 2 18:39:09 2020 +0800

    Merge branch '3d-v1.2' into merge1.2

    # Conflicts:
    #	cocos/core/3d/framework/mesh-renderer.ts
    #	cocos/core/components/ui-base/ui-renderable.ts
    #	cocos/core/pipeline/forward/forward-pipeline.ts
    #	cocos/core/pipeline/forward/scene-culling.ts
    #	cocos/core/pipeline/render-additive-light-queue.ts
    #	cocos/core/pipeline/render-stage.ts
    #	cocos/core/pipeline/shadow/shadow-flow.ts
    #	cocos/core/renderer/core/memory-pools.ts
    #	cocos/core/renderer/scene/camera.ts
    #	cocos/core/renderer/scene/model.ts
    #	cocos/core/renderer/scene/render-scene.ts
    #	cocos/core/root.ts
    #	cocos/particle/billboard.ts
    #	cocos/terrain/terrain.ts
    #	cocos/ui/components/button.ts
    #	package-lock.json
    #	package.json
    #	tests/general/sealed-global-variables.json

commit 6b43a2d
Author: pandamicro <lphuabin@gmail.com>
Date:   Wed Aug 26 13:47:08 2020 +0800

    Update primitives with second uvs

commit 3d9cd31
Author: Knox <knox.h@qq.com>
Date:   Wed Sep 2 15:42:33 2020 +0800

    add video player component (cocos-creator#7226)

    * add video player component

    * refine code

    * refine code

    * refine code

    * refine code

    * refine code

    * refine code

    * refine code

commit 2edd136
Author: coulsonwang <coulsonwang@126.com>
Date:   Wed Sep 2 14:50:41 2020 +0800

    add render window pool handler (cocos-creator#7273)

commit b738d9b
Author: PP <chinese1236@qq.com>
Date:   Mon Aug 31 12:26:08 2020 +0800

    sync bug fix for Button component from 2d branch  (cocos-creator#7179)

    * reset to normal data when change button transition

    * support color changed event on Editor

    update

    # Conflicts:
    #	cocos/core/components/ui-base/ui-render-component.ts

    * refine button target

    update

    * refine button zoomScale tip

    * unregister event listeners on old target when target changed

    * check button._originalScale validity

    * update originalScale when target transform chanaged

    * do finishing transition after update finished

    * fix button state setting

    * udpate

commit e0df589
Author: cary <39078800+caryliu1999@users.noreply.github.com>
Date:   Mon Aug 31 11:48:33 2020 +0800

    export _Deserializer for adapter (cocos-creator#7256)

commit 95ab036
Author: cary <39078800+caryliu1999@users.noreply.github.com>
Date:   Mon Aug 31 11:34:06 2020 +0800

    Add serialized data synchronization for pipeline. (cocos-creator#7236)

    * Add pipeline jsb binding.

    * Add serialized data synchronization for pipeline.

    * fix ci

    * delete legacy

    * fix ci

    * delete legacy forwardPipeline

commit 4f21401
Author: minggo <nudtzxm@gmail.com>
Date:   Mon Aug 31 09:56:40 2020 +0800

    import pipeline instead (cocos-creator#7218)

    * import pipeline instead

    * simplify codes

    * add jsb index.ts

    * simplify codes

    * fix circular dependency

    * change build engine version

    * change build-engine version

    * jsb -> nr

commit 07d4798
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Aug 28 17:32:56 2020 +0800

    get global/local descriptor set layout from define.ts (cocos-creator#7243)

commit b8d0026
Author: Knox <knox.h@qq.com>
Date:   Thu Aug 27 19:51:43 2020 +0800

    sync #3d-tasks/issues/3962 (cocos-creator#7232)

    * sync #3d-tasks/issues/3962

    cocos-creator#5598
    cocos-creator#6575
    cocos-creator#6333
    cocos-creator#4003
    cocos-creator#4240
    cocos-creator#5444
    cocos-creator#5178
    cocos-creator#5656
    cocos-creator#5672
    cocos-creator#3515
    cocos-creator#3617
    cocos-creator#3802
    cocos-creator#4152

    * refine code

commit 700c67f
Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com>
Date:   Thu Aug 27 10:53:51 2020 +0800

    sync cocos-creator#6710 (cocos-creator#7165)

commit ec566ce
Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com>
Date:   Thu Aug 27 10:53:09 2020 +0800

    sync cocos-creator#6076 (cocos-creator#7161)

commit 7256f34
Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com>
Date:   Thu Aug 27 10:51:40 2020 +0800

    sync cocos-creator#6002 (cocos-creator#7160)

commit 3048de3
Author: zhefeng.zhang <35944775+Jno1995@users.noreply.github.com>
Date:   Thu Aug 27 10:51:10 2020 +0800

    sync cocos-creator#5952 (cocos-creator#7158)

commit 85a6f2a
Author: minggo <nudtzxm@gmail.com>
Date:   Wed Aug 26 11:46:35 2020 +0800

    make model is intialized before reused (cocos-creator#7221)

commit 951deef
Author: cary <39078800+caryliu1999@users.noreply.github.com>
Date:   Tue Aug 25 15:00:14 2020 +0800

    Remove the dependency of the pipeline on the model. (cocos-creator#7207)

commit 909fde2
Author: minggo <nudtzxm@gmail.com>
Date:   Tue Aug 25 14:35:40 2020 +0800

    move RenderWindow to renderer/core (cocos-creator#7216)

commit 035a632
Author: minggo <nudtzxm@gmail.com>
Date:   Mon Aug 24 11:43:43 2020 +0800

    invoke Model.initialize() before being resued (cocos-creator#7201)

commit cd03651
Author: PP <chinese1236@qq.com>
Date:   Fri Aug 21 18:50:28 2020 +0800

    remove jsb module declaration in engine repo (cocos-creator#7143)

    * remove jsb module declaration in engine repo

    * ignore jsb check

    * space

commit b019972
Author: minggo <nudtzxm@gmail.com>
Date:   Fri Aug 21 17:04:36 2020 +0800

    Add array pool and add more elements into shared memory (cocos-creator#7197)

    * Add array pool and add more elements into shared memory

    * use template parameter

    * use template parameter

    * don't use shared memory for director

commit 2618dc6
Author: pandamicro <lphuabin@gmail.com>
Date:   Fri Aug 21 14:19:06 2020 +0800

    Bump tfig@2.0.3 (cocos-creator#7198) (cocos-creator#7199)

    Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>

commit 12a1dda
Merge: da5c216 bfe63f4
Author: pandamicro <lphuabin@gmail.com>
Date:   Fri Aug 21 10:59:03 2020 +0800

    Merge pull request cocos-creator#7196 from pandamicro/merge1.2

    Merge v1.2

commit bfe63f4
Merge: 2fb448c f289fa7
Author: pandamicro <lphuabin@gmail.com>
Date:   Fri Aug 21 10:48:52 2020 +0800

    Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2

    # Conflicts:
    #	cocos/core/game.ts

commit 2fb448c
Author: pandamicro <lphuabin@gmail.com>
Date:   Fri Aug 21 10:45:49 2020 +0800

    Fix

commit da5c216
Author: yinkaile <501251991@qq.com>
Date:   Wed Aug 19 17:42:41 2020 +0800

    sync cocos-creator#5195 (cocos-creator#7150)

commit e68cd34
Author: PP <chinese1236@qq.com>
Date:   Sun Aug 16 23:05:25 2020 +0800

    ban runninng engine main loop in editor (cocos-creator#7098)

    * ban runninng engine main loop in editor

    * update
@2youyou2 2youyou2 deleted the v2.1.3-mesh-sprite branch Sep 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant