Commit Graph

17466 Commits

Author SHA1 Message Date
ChiaNing 780a3fce31 components help docs bug fix (#6848) 2020-06-10 14:21:21 +08:00
Leslie Leigh (李的序) adfdb67bb8 Eliminate cc.* log functions invocation (#6845) 2020-06-10 14:19:11 +08:00
Leslie Leigh (李的序) 7b792b42d9 Type fix for inherited CCObject.destroy() (#6847)
* Type fix for inherited CCObject.destroy()

* Fix

* Fix
2020-06-10 14:03:46 +08:00
minggo 46160591ec Format codes (#2539) 2020-06-09 18:16:26 +08:00
CocosRobot b14b7f56ef [AUTO][ci skip]: updating cocos2dx_files.json (#2538)
* [ci skip][AUTO]: updating jsbinding automatically

* [AUTO][ci skip]: updating cocos2dx_files.json
2020-06-09 18:07:19 +08:00
minggo b4234b5a67 Remove texture view (#2530) 2020-06-09 15:11:18 +08:00
minggo 10377de263 Remove texture view (#6830)
* fix conflict

* support creating texture view

* remove GFXTextureViewType

* set texture type to cube

* set status

* fix comment

* IGFXFramebufferInfo add mipmap level element

* set mipmap levels for all attachments

* make mipmap level optional

* fix comments
2020-06-09 11:23:34 +08:00
pandamicro 845fc81fce Improve CallbacksInvoker to remove __eventTargets mechanism (#6837)
* Improve CallbacksInvoker to remove __eventTargets mechanism

* Fix return value in Eventify.once

* Use isValid to check callback target validity

* Ensure event processor destroy during node destroy

* Fix node once can't remove touch/mouse listeners issue

* Strict check to include TO_DESTROY and DESTROYED state

* Remove execute and invoke directly in emit

* Fix ci
2020-06-09 11:23:20 +08:00
CocosRobot 3efcfc0b19 [ci skip][AUTO]: updating jsbinding automatically (#2536) 2020-06-09 09:50:39 +08:00
Yun Hsiao Wu 7bacb7fb5c vk: clang format (#2535) 2020-06-09 09:45:27 +08:00
jiaxin.lai c31294342a awake if change collisionFilterGroup&Mask (#6839) 2020-06-08 21:07:01 +08:00
jiaxin.lai dac83d5f24 adapt for alipay (#6838) 2020-06-08 17:35:09 +08:00
Yun Hsiao Wu fa06dcdad3 fix additive light pass (#6829) 2020-06-08 16:39:12 +08:00
yinkaile a955a7839e export CurveRange (#6835)
* export CurveRange

* no need export to cc manually
2020-06-08 11:12:50 +08:00
pandamicro e746d54086 Fix image release for CLEANUP_IMAGE_CACHE (#6836)
* Fix potential gl texture leak

* reorder

* Fix Model.recieveShadows deprecation

* Fix image destroy for CLEANUP_IMAGE_CACHE
2020-06-07 18:10:37 +08:00
coulsonwang 46d2c3996f no need to flip render target texcoord for metal and vulkan (#6824) 2020-06-05 16:48:57 +08:00
Leslie Leigh (李的序) daee998c13 Bump tfig to ^1.2.5 (#6831) 2020-06-05 15:36:09 +08:00
江战 cad70edf1b travis add nodejs / 3dgfx (#2524)
* update install script

* restore changes
2020-06-05 14:24:22 +08:00
Yun Hsiao Wu d368b11250 vk: better vendor info (#2529) 2020-06-05 14:21:42 +08:00
pandamicro 8ed2199ae6 export PrimitiveType (#6814) 2020-06-04 16:49:31 +08:00
ChiaNing fca0664261 fix onHidden/onShow event bug (#6817) 2020-06-04 16:49:07 +08:00
Yun Hsiao Wu d4ba6cc007 fix planar shadow & instancing (#6823) 2020-06-04 16:39:57 +08:00
pandamicro 395265fc15 Merge pull request #6738 from YunHsiao/3d
merge 3d-gfx into 3d
2020-06-04 13:38:13 +08:00
ChiaNing 4775c33658 fix editbox input emoji fragment bug (#6810)
* fix editbox input emoji fragment bug

* update
2020-06-04 10:54:26 +08:00
Yun Hsiao Wu 3228b964f8 disable light pass for now 2020-06-04 10:39:14 +08:00
Yun Hsiao Wu 033226ec74 fix pass instance init 2020-06-04 10:19:37 +08:00
Yun Hsiao Wu c1b3382e06 Merge pull request #6 from minggo/patch_macro_issue
only concat not undefined patch macros
2020-06-03 18:35:29 +08:00
Yun Hsiao Wu b783e5fe92 handle restore operation (#6815) 2020-06-03 18:00:29 +08:00
minggo 5f2c00dda2 Merge branch '3d' into patch_macro_issue 2020-06-03 16:34:01 +08:00
minggo 2253d8aabd return correct patch macros 2020-06-03 16:33:02 +08:00
Leslie Leigh (李的序) ca7b59229a Bug fix: animation in normal wrap mode won't stop their blend state writers (#6808)
* Bug fix: animation in normal wrap mode won't stop their blend state writers

* Add test
2020-06-03 16:30:13 +08:00
JayceLai e6cfa7115a export PrimitiveType 2020-06-03 16:29:51 +08:00
minggo 75331d43fc only concat none undefiend patch macros 2020-06-03 16:26:05 +08:00
Yun Hsiao Wu 69db70a910 Merge remote-tracking branch 'origin/3d' into 3d 2020-06-03 16:22:00 +08:00
CocosRobot 4f241df386 [AUTO][ci skip]: updating cocos2dx_files.json (#2522) 2020-06-03 16:21:26 +08:00
minggo ecbb8f78d7 use clang-format to format codes (#2521) 2020-06-03 16:02:05 +08:00
Yun Hsiao Wu a5ce183aa7 pipeline layout can be globally reused too 2020-06-03 15:55:01 +08:00
Yun Hsiao Wu 9ca7c2ce6e directional light stack (#6813)
* directional light stack

* hasChangedFlags: bitwise or instead of direct assignment
2020-06-03 15:02:57 +08:00
pandamicro 9efb595586 Merge pull request #6812 from VisualSJ/3d
Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d
2020-06-03 14:57:12 +08:00
SijieWang 83f6c572b5 cc -> legacyCC 2020-06-03 13:38:17 +08:00
SijieWang a9f3969245 Merge remote-tracking branch 'cocos-for-editor/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/audio/assets/clip.ts
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/batched-skinning-model-component.ts
#	cocos/core/3d/framework/editor-camera-component.ts
#	cocos/core/3d/framework/index.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-clip.ts
#	cocos/core/animation/animation-manager.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/animation/skeletal-animation-component.ts
#	cocos/core/animation/skeletal-animation-state.ts
#	cocos/core/assets/mesh.ts
#	cocos/core/assets/simple-texture.ts
#	cocos/core/assets/sprite-frame.ts
#	cocos/core/assets/texture-base.ts
#	cocos/core/data/class-decorator.ts
#	cocos/core/data/instantiate.ts
#	cocos/core/event/event-target.ts
#	cocos/core/game.ts
#	cocos/core/load-pipeline/CCLoader.ts
#	cocos/core/load-pipeline/plist-parser.ts
#	cocos/core/load-pipeline/unpackers.ts
#	cocos/core/load-pipeline/url.ts
#	cocos/core/math/deprecated.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/scene-graph/base-node.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	predefine.ts
2020-06-03 13:25:42 +08:00
江战 754d974596 fix url (#2520) 2020-06-03 10:02:26 +08:00
jiaxin.lai a0a7cc2f0b fix vertex index of ray model (#6809)
* fix vertex index

* tweaks
2020-06-02 19:59:09 +08:00
Yun Hsiao Wu 69c88434a4 Merge branch '3d-gfx' into 3d 2020-06-02 17:59:07 +08:00
minggo f44822c960 Create PSO in render stage (#6732)
* record PSO in sub model

* import Pass

* create PSO dynamically in render stage

* remove debug codes

* rmeove PSO in more components

* remove unneeded codes

* add comments

* subModel.psoCreateInfos -> subModel.psoInfos

* remove unneeded \!

* remove spaces

* remove unneeded codes

* IPSOCreationInfo -> IPSOCreateInfo

* add name into hash computing

* add GFXInputState back

* concat super's macro patches
2020-06-02 17:11:22 +08:00
Myway c44bff541d model component support lighting map (#6796)
* 模型支持lighting map渲染

* change static lighting settings
2020-06-02 17:09:18 +08:00
Yun Hsiao Wu 8086fe6494 fix skybox binding layout update (#6806) 2020-06-02 16:32:35 +08:00
pandamicro def53e4c74 Restore ImageAsset destroy logic to help destroy Image (#6804) 2020-06-02 13:52:55 +08:00
jiaxin.lai 7079d5e1af Fix ray_subMesh/mesh/model (#6801)
* fix ray_subMesh/mesh/model

* tweaks

* tweaks

* tweaks

* fix ray_model

* tweaks

* tweaks

* docs

* tweaks
2020-06-02 12:54:05 +08:00
pandamicro 51ecb2f1af Fix CLEANUP_IMAGE_CACHE not working issue (#6803) 2020-06-02 11:25:40 +08:00