Commit Graph

55 Commits

Author SHA1 Message Date
Jare Guo 676c267150 remove RawAsset (sync #6286) (#7697) 2020-11-08 22:45:15 +08:00
Jare Guo a0d5508779 simplify attribute implements (sync #5040) (#7679) 2020-11-05 17:37:56 +08:00
Jare Guo 9bf46ac0a5 obsolete target support of deserializer (sync #6494) (#7680)
* fix merge error (resync #6285)

* fix rare editor crash caused by invalid PrivateNode data (sync #6971)

* obsolete target support of deserializer (sync #6494)
2020-11-03 13:39:23 +08:00
pandamicro 3068956648 Refactor gfx module naming convention (#7663)
* Remove GFX prefix in gfx module

* Full deprecation for old GFX APIs

* export gfx module

* Fix issues and make deprecated exports backward compatible

* Adaptation in engine modules for gfx

* Fix ci

* fix ci
2020-11-02 09:49:50 +08:00
Jare Guo e2b740dd15 Finally merge runtime deserializer & asset manager (#7648)
* sync asset-manager

refine

refine

refine

* change director

* refine

* fix bugs

* commit

* refine and fix bugs

* refine docs

* fix bugs

* merge

* fix bugs

* fix bugs

* merge

* sync jsb-adapter

* fix ci

* adapt preloading process for new Deserializer

* adapt preloading process for new Deserializer

* fix bugs

* minor fix

* dump dependency of SpriteFrame explicitly (sync #6938)

* dump dependency of SpriteFrame explicitly (sync #6938)

* remove unused variable

* exporting should trigger uuid compression in serializer

* refine

* fix ci

Co-authored-by: Santy-Wang <wh19930829@qq.com>
2020-10-30 20:51:58 +08:00
cary 6bcc7933a9 Add motion streak and particle 2d. (#7588)
* Add motion streak and particle 2d.

* fix buffer error

* modify comment error

* fix ci

* fix comment

* modify some comment
2020-10-27 11:48:17 +08:00
pandamicro 6101d772a2 Merge remote-tracking branch 'origin/3d-v1.2' into 3d
# Conflicts:
#	EngineErrorMap.md
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/data/decorators/property.ts
#	cocos/core/pipeline/forward/forward-pipeline.ts
#	cocos/core/pipeline/forward/scene-culling.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/shadows.ts
#	cocos/core/renderer/ui/mesh-buffer.ts
#	cocos/core/renderer/ui/ui-vertex-format.ts
#	cocos/core/scene-graph/scene-globals.ts
#	cocos/terrain/terrain.ts
#	cocos/ui/assembler/graphics/webgl/graphics-assembler.ts
#	cocos/ui/components/graphics.ts
#	editor/assets/default_prefab/3d/Capsule.prefab.meta
#	editor/assets/default_prefab/3d/Cone.prefab.meta
#	editor/assets/default_prefab/3d/Cube.prefab.meta
#	editor/assets/default_prefab/3d/Cylinder.prefab.meta
#	editor/assets/default_prefab/3d/Plane.prefab.meta
#	editor/assets/default_prefab/3d/Quad.prefab.meta
#	editor/assets/default_prefab/3d/Sphere.prefab.meta
#	editor/assets/default_prefab/3d/Torus.prefab.meta
#	editor/assets/default_prefab/Camera.prefab.meta
#	editor/assets/default_prefab/Terrain.prefab.meta
#	editor/assets/default_prefab/effects/Particle System.prefab.meta
#	editor/assets/default_prefab/light/Directional Light.prefab.meta
#	editor/assets/default_prefab/light/Sphere Light.prefab.meta
#	editor/assets/default_prefab/light/Spot Light.prefab.meta
#	editor/assets/default_prefab/ui/Button.prefab.meta
#	editor/assets/default_prefab/ui/Canvas.prefab.meta
#	editor/assets/default_prefab/ui/EditBox.prefab.meta
#	editor/assets/default_prefab/ui/Label.prefab.meta
#	editor/assets/default_prefab/ui/Layout.prefab.meta
#	editor/assets/default_prefab/ui/Mask.prefab.meta
#	editor/assets/default_prefab/ui/ProgressBar.prefab.meta
#	editor/assets/default_prefab/ui/ScrollView.prefab.meta
#	editor/assets/default_prefab/ui/Slider.prefab.meta
#	editor/assets/default_prefab/ui/Sprite.prefab.meta
#	editor/assets/default_prefab/ui/Toggle.prefab.meta
#	editor/assets/default_prefab/ui/ToggleContainer.prefab.meta
#	editor/assets/default_prefab/ui/Widget.prefab.meta
2020-10-21 18:35:11 +08:00
Jare Guo 0319477911 fix decorator warning of ValueTypes (#7553)
* fix decorator warning of ValueTypes (sync #6285)

* refresh copyright
2020-10-21 16:31:41 +08:00
Jare Guo a0a992de5d remove asserts from addChild & sync 2D changes (#7479)
* remove asserts from addChild

* expose js._registeredClassIds & js._registeredClassNames (sync #3174)

To unload scripts dynamically.
Also revert part of changes from https://github.com/cocos-creator/engine/pull/3204/files#diff-cabe5229c3c6e31339220008e54fe853L421

* remove unused code (sync #3174)

* minor tweak (sync #3421)

* should not invoke component if destroy() called before node activating (sync #3430)

* node should removed and destroyed with scene (sync #3456 #3483)

* fix WebGL detection on Android browsers (sync #3510)

* remove redundant right shift for bitwise operation (sync #3754)

* fix label blur when using dark font color (sync #3949)

* refine tooltip of Block Input Event (sync #4053)

* fix IE/Edge exception when output log/warn before engine initialization(sync #4447, #4500)

* sync class, attribute (#4689, #4712, #4781, #4712)

* fix loading unknown texture format (sync #4820)

* prefer toLowerCase to toLocaleLowerCase + sync #5114

* optimize bezier calculation (sync #5155)

* fix potential memory leak in scene-editor (sync #5643)

* fix _posDirty error of Mask on native platform (sync #6168)
2020-10-15 17:28:14 +08:00
cary 8fffa7fb88 Change skybox and shadow to buffer pool. (#7306) 2020-09-09 11:37:35 +08:00
pandamicro 8172574ec3 Fix ci 2020-09-03 11:37:15 +08:00
pandamicro e9780cd3c8 Fix sealed global variables 2020-09-03 11:33:09 +08:00
pandamicro 3539945cf4 Merge remote-tracking branch 'origin/3d-v1.2' into merge1.2
# Conflicts:
#	tests/general/sealed-global-variables.json
2020-09-03 11:30:28 +08:00
Leslie Leigh (李的序) 4e56acb851 Fix missed cc.* (#7282)
* Fix missed `cc.*`

* Fix
2020-09-02 19:04:38 +08:00
pandamicro 1d2a82d957 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
2020-09-02 18:39:09 +08:00
pandamicro 3240dba206 Component rename for new standard and 2d compatibility (#7103)
* Rename ui related components

* Rename files

* Remove Useless errors

* Fix sealed names

* Fix sealed global variables

* Fix circular reference

* Refactor more component names

* Rename particle and animation related component

* export scene and models sub module in renderer

* Rename ModelComponents to Model

* Refactor LightComponents to Light

* Refactor CameraComponent to Camera

* Refactor ConstraintComponents to Constraint and rename physics comps

* Cleanup and fix issues

* Small fixes

* Refactor Model to MeshRenderer

* Final touch

* Fix data class export

* Better deprecation to cover all old usage

* Simpler and better deprecation with js.setClassAlias

* Fix ci

* Fix editor issue
2020-09-02 15:31:49 +08:00
Leslie Leigh (李的序) bc5b531191 Add decorator @editable @serializable (#7178) 2020-09-02 11:44:12 +08:00
cary 95ab0362a7 Add serialized data synchronization for pipeline. (#7236)
* Add pipeline jsb binding.

* Add serialized data synchronization for pipeline.

* fix ci

* delete legacy

* fix ci

* delete legacy forwardPipeline
2020-08-31 11:34:06 +08:00
zhefeng.zhang ec566ce2d5 sync #6076 (#7161) 2020-08-27 10:53:09 +08:00
cary 7eacd78c0d Merge planar shadow and shadow map. (#7185)
* Merge planar shadow and shadow map.

* fix comment

* modify shadows name

* fix ci
2020-08-24 20:21:08 +08:00
cary c08d84d11e Revert scene global. (#7181)
* Revert scene global.

* fix ci
2020-08-19 23:41:38 +08:00
cary a6c536ec38 Move global data of scene to pipeline. (#7109)
* Move global data of scene to pipeline.

* fix some code judgments.

* fix pipeline save error

* refine skybox and fog info

* fix planer shadow

* fix fog error

* delete setter of skybox and fog
2020-08-17 23:08:59 +08:00
Yun Hsiao Wu dfc3d141f2 GFX Descriptor Set (#7101)
* gfx: descriptor sets

* gfx: descriptor set, singular

* better structure

* adapt upper layers: first pass

finally all compiler errors cleared.

OKAY IT'S HAPPENING EVERYBODY STAY THE ****ING CALM

* adapt upper layers: second pass

THERE AND BACK AGAIN

* unified light pass & shadow shader

* gfx: descriptor set & pipeline layout

* light pass: better structure

* light pass: dynamic uniform

* even more type checking for memory pools

* Fix particleSystem and lineComponent.

* delete comment

* guard pool init param

* Fix trail module error.

* delete space

* light pass: instancing & batching support

* don't polyfill gfx stuff inside EffectAsset

* better light pass structure

* fix spot light culling

Co-authored-by: caryliu <caryliu1999@gmail.com>
2020-08-13 18:21:15 +08:00
cary 7d77ea3dde Modify pipeline resourceization. (#7067)
* Modify pipeline resourceization.

* change to call setRenderPipeline only once.
2020-08-07 12:10:03 +08:00
Yun Hsiao Wu afeb83e9a6 native pools (#7028) 2020-08-04 14:14:56 +08:00
Knox 0ffa00f2cc add safe area component for 3d-tasks/issues/3760 (#7020)
* add safe area component for 3d-tasks/issues/3760

* refine

* add cc.SafeAreaComponent to sealed-global-variables.json

* add canvas-resize event
2020-07-31 08:46:49 +08:00
Yun Hsiao Wu 33c3c841d7 fix material hash calculation (#6933) 2020-06-28 11:55:21 +08:00
pandamicro b2830f5271 Merge remote-tracking branch 'origin/3d-v1.1.1' into 3d
# Conflicts:
#	cocos/core/3d/builtin/effects.ts
#	cocos/core/3d/framework/light-component.ts
#	cocos/core/3d/framework/model-component.ts
#	cocos/core/animation/animation-state.ts
#	cocos/core/assets/image-asset.ts
#	cocos/core/data/object.ts
#	cocos/core/event/callbacks-invoker.ts
#	cocos/core/game.ts
#	cocos/core/gfx/webgl/webgl-commands.ts
#	cocos/core/gfx/webgl2/webgl2-commands.ts
#	cocos/core/pipeline/define.ts
#	cocos/core/platform/event-manager/events.ts
#	cocos/core/primitive/primitive.ts
#	cocos/core/renderer/scene/model.ts
#	cocos/core/renderer/scene/render-scene.ts
#	cocos/core/root.ts
#	cocos/core/scene-graph/node-event-processor.ts
#	cocos/core/splash-screen-webgl.ts
#	cocos/particle/index.ts
#	cocos/terrain/terrain.ts
#	exports/base.ts
2020-06-17 14:47:36 +08:00
Leslie Leigh (李的序) 3b31edae67 Fix once bug (#6889) 2020-06-17 12:01:11 +08:00
Leslie Leigh (李的序) 83f553034e Treat node:eulerAngle curve as skeletal curve; skeletal blending for common targets (#6850)
* Treat node:eulerAngle curve as skeletal curve; skeletal blending for common targets

* Fix

* add test

* Fix

* Fix
2020-06-16 13:39:02 +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
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
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
Leslie Leigh (李的序) c7fb63b1ec Mark event-related API of AnimationState as deprecated (#6772)
* Add 'last-frame-arrived' event; Optimize animation state events

* Doc

* Rename 'last-frame-arrived' -> 'iteration-end'

* Revert refine

* Doc

* Revert `iteration-end`

* CI
2020-05-29 18:38:51 +08:00
Leslie Leigh (李的序) 2a2a56ad2b Solve the "once-off" problem (#6782)
* Solve the "once-off" problem

* Revert CallbacksInvoker

* Update

* Optimize
2020-05-29 15:20:49 +08:00
SijieWang 4d0c9c0249 Replace methods that cannot be used (#6743) 2020-05-27 17:35:34 +08:00
Leslie Leigh (李的序) 21e2712bf4 Add animation component event unit test (#6750)
* Add animation component event unit test

* CI
2020-05-27 16:23:22 +08:00
Leslie Leigh (李的序) b4580ecfbf Animation events (#6737) 2020-05-26 15:50:22 +08:00
ChiaNing abbdae70c0 webview remove (#6700) 2020-05-25 17:51:54 +08:00
Leslie Leigh (李的序) 58b998f3f8 Refactor cross-fade implementation (#6326)
* Cross fade

* Bug fix

* Fix CI

* Update 1

* Update 2

* Update 3

* Rename BlendState -> BlendStateBuffer
2020-03-17 16:33:39 +08:00
Yun Hsiao Wu 45d182308b GPU instancing support (#6300)
* instancing works

* misc opts

* material.setproperty typing

* baked skinning model instancing works

* fix isNormalized

* custom chunk rules injection framework

* profiler instance count

* seperate custom joint textures

* fix joint mapped buffers

* WebGL 1 doesn't allow int attributes

* should rebuild instances after pso change

* set instance attribute

* constants naming
2020-03-12 10:21:19 +08:00
Leslie Leigh (李的序) 284aa38d25 Build time constants (#6256)
* consts

* Bump @cocos/build-engine version

* Fix

* Upload @cocos/build-engine

* Rm scripts/build-engine/.gitignore
2020-03-11 14:05:22 +08:00
Leslie Leigh (李的序) 81bc025d2f Catch common target initialization error (#6246) 2020-03-03 13:19:41 +08:00
Leslie Leigh (李的序) eaf1e84870 Optimize partial object animation (#5981) 2019-12-27 18:50:25 +08:00
Leslie Leigh (李的序) afd62241c4 Support of partial property animation. (#5818)
* Partial property animation

* Optimize easingMethods storage

* Fix

* Fix CI error
2019-12-26 15:04:46 +08:00
Lelie Leight (李的序) a95b1915cb Add test to ensure no more stuffs are added to global variable 'cc' (#5844) 2019-12-05 15:27:07 +08:00
Lelie Leight (李的序) d446a357ce Warn on explicit undefined type (#5770) 2019-11-23 18:17:45 +08:00
Lelie Leight (李的序) 441435e474 optimize size of serialized animation clip (#5559) 2019-10-21 15:35:20 +08:00
SijieWang b215a60e3e Delete some of the Editor references (#5345)
* Delete some of the Editor references

* review code

* test case
2019-09-09 09:58:31 +08:00
pandamicro 9f89b0ef24 New module division (#5285)
* Temp

* temp

* move ui core

* Arrange ui and terrain

* Fix import path for all modules except core

* Move primitives into core

* Fix debug.getError

* Move audio-downloader to audio module

* export game from game.ts

* Migrate load-pipeline to ts

* Fix core modules and cleanup

* Move animation into core

* Fix module exports

* Fix director issue

* Remove most cc.director usage

* Fix ts issues

* Fix issues for unit test and editor running

* Revert removing deprecated import

* tweaks

* tweaks

* Fix ci

* Fix ci

* Add modules in module division

* Upgrade coordinates-converts-utils
2019-08-30 11:35:22 +08:00