Yun Hsiao Wu
3493f0c02f
fix camera pre-rotation adaptation ( #9534 )
...
* fix camera pre-rotation adaptation
* more consistent wrap modes
2021-10-26 15:29:12 +08:00
PP
f5511f4c87
Revert "Revert "optimize interface in screen module ( #9176 )"" ( #9490 )
...
This reverts commit b88d4845cc .
2021-10-15 10:21:04 +08:00
pandamicro
b88d4845cc
Revert "optimize interface in screen module ( #9176 )"
...
This reverts commit 4735476945 .
2021-10-14 23:07:23 +08:00
PP
4735476945
optimize interface in screen module ( #9176 )
...
* optimize interface in screen module
* remove DPR calculating
* update screen-adapter init
* set screen.resolutionScale as 1 by default
* remove pixelRatio getter in system-info
* remove sys.windowPixelRatio access
* optimize screen.windowSize
update
* convertToCocosScreenSpace
* change resolution-change to window-resize
* fix native UI
update
update UI
update UI
* optimize screen init
* fix subContextView
* fix root resize
* fix precision issue on Metal render end
* sys.windowPixelRatio
* use warnID
* remove screen.convertToCocosScreenSpace
* put private property and method together after public ones
* warnID
* fix landScape on CocosPlay
* fix DPR on vivo platform
* fix CI
2021-10-14 22:16:34 +08:00
Leslie Leigh (李的序)
f1f0fbaf16
[WIP] Feature: NewGenAnim ( #9331 )
...
* NewGenAnim
* Fix/Optimize simple directional blending
* Class transition by type (#29 )
* Transition & Gradient transition (#30 )
* The default ExitCondition should be 1.0
* Do correct graph eval
* Fix PoseSubgraph connect() signature order (#31 )
* Graph defaults test (#32 )
* Conditions (#33 )
* Trigger (#34 )
* Transition should only be considered when satemachine exited (#35 )
* Add layer.name (#36 )
* Fix some behaviours; add API to query poses and transition (#37 )
Fix single frame exit condition behaviours; Fix pose -> subgraph behaviours
* Support self transition; refactor sub state machine implementation (#38 )
* Temp
* Flat whole layer statemachine
* Add test for test reset triggers
* Allow self transition
* Self transition test
* Fix deserialize (#39 )
* update animgraph template (#40 )
* The inheritance of any state (#41 )
* StateMachine events (#42 )
* Fix state machine events; Allow multiple transitions between two nodes (#43 )
* Transition priority test (#44 )
* Optimize variable bind (#45 )
* Fix variable bind errors (#46 )
* Expose blend algorithm to editor (#47 )
* Cont (#48 )
* update animgraph template (#49 )
* update animgraph template
* update animgraph template
* Pose speed (#50 )
* blend tree add EditorExtendable data (#51 )
* Correct pose blend duration (#52 )
* Export some types (#53 )
* animation pose EditorExtendable (#54 )
(cherry picked from commit d5dd5f32c9dbacb68c016ff8ba56d383c781a021)
* Implement clone() (#55 )
* Fix trigger condition serialization (#56 )
* Add variable type: integer (#57 )
* Optimize 0 weight case (#58 )
* Relative duration (#59 )
* update_hdr_skybox (#9230 )
* Rename.. (#60 )
* Optimize animation blend item export (#61 )
* Fix Type (#62 )
* modify aniamtion graph template data (#63 )
* modify aniamtion graph template data
* add animation graph component template
* Fix serialize issue (#64 )
* Optimize (#65 )
* Remove MotionState.startRatio, loop (#66 )
* Update (#67 )
* Fix circular reference (#68 )
* CR (#69 )
* Fix exit time greater than 1 (#70 )
Co-authored-by: 黄森斌 <arsen2010@126.com >
Co-authored-by: linshunjun <49218738+linshunjun@users.noreply.github.com >
2021-10-14 10:28:23 +08:00
Yun Hsiao Wu
427ff1254c
instance buffer allow different strides ( #9329 )
2021-09-16 17:39:37 +08:00
Leslie Leigh (李的序)
62d695c04e
Suppress warns when baking skeletal curves in AnimationClip ( #9147 )
2021-08-06 16:03:04 +08:00
Leslie Leigh (李的序)
3a52b35f3c
Optimize CCON related messages ( #9122 )
2021-08-04 10:02:53 +08:00
Santy-Wang
00367f39e1
support auto-finalization in editor ( #9008 )
...
* support auto-finalization in editor
* refine
* refine
* handle global variable
* refine
* fix bug
* refine
* use debug instead
2021-07-23 15:10:40 +08:00
Leslie Leigh (李的序)
6d10f68ef8
AnimationCurve ( #8409 )
...
* AnimationCurve
* Mark curve frame values as uniquelyReferenced
* Adjust modules
* Update
* Manually implements KeyframeCurve.iterator
* TargetPath
* Update
* Fix BUG
* Fix
* Add size track
* Update
* Fix size; unit tests
* fix split animation (#24 )
* CCONB animation clip; Remove integer track/channel/curve
* Optimize key shared curves
* Remove keyframecurve.empty
* Exotic animation
* Fix unit tests
* start/end -> left/right
* Curve range rename
* Easing methods
* Fix untyped track
* Fix
* fix upgradUnTypedTracks (#26 )
* Rename
.interpMode -> .interpolationMode
RealInterpMode -> RealInterpolationMode
QuaternionInterpMode -> QuaternionInterpolationMode
ExtrapMode -> ExtrapolationMode
.preExtrap -> .preExtrapolation
.postExtrap -> .postExtrapolation
QuaternionCurve -> QuatCurve
QuaternionKeyframeValue -> QuatKeyframeValue
* Update pre/post extrap
* Optimize-1
* Optimize-2
* Eliminate for-of
* Mark deprecateds
* Hide RealKeyframeValue/QuatKeyframeValue Constructor
* Fix quat keyframe value name
* Error ID
* Fix RealKeyframeValue editor extras
* Elimanate for-of forEach
Co-authored-by: zheng han <sunstar198941@gmail.com >
2021-07-23 11:26:55 +08:00
stanleyljl
b4d653aeb3
swap setMaterialInstance parameters ( #9021 )
...
* swap setMaterialInstance parameters
* add warnID for setMaterialInstance
Co-authored-by: lijilin <jilin.li@cocos.com >
2021-07-20 21:11:55 +08:00
cary
cc9b75eaad
Add custom material processing and pipeline type for pipeline. ( #8418 )
...
* Add custom material processing and pipeline type for pipeline.
* fix ci
* delete pipelinetype and add deferred pipeline scene data
* rename mat
* fix forward error
* modify native adapter
2021-07-14 17:08:04 +08:00
Santy-Wang
75f10acbb7
sync v3.1.2 ( #8794 )
...
* Do not modify local descriptor set v3.1.2 (#8773 )
* delete local descriptorSet for v3.1.2
* update
* V3.1.2 zxx43 particle (#8784 )
* fix https://github.com/cocos-creator/3d-tasks/issues/7421
* remove temp params & add create function to onFocusInEditor
* restrict particle system object count
* print error msg
* Add globalDSManager for v3.1.2 (#8727 )
* update
* update
* update
* update
* delete for of
* update
* update
Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com >
Co-authored-by: zxx43 <zxx43@hotmail.com >
2021-06-09 16:04:16 +08:00
Yun Hsiao Wu
d8890c558f
optimize WebGLCmdFuncBindStates ( #8705 )
2021-05-26 12:36:19 +08:00
ChiaNing
587c40dc31
add char mode warn when size too big & sprite dirty bug ( #8595 )
...
* add char mode warn when size too big & sprite dirty bug
* update
2021-04-29 16:38:25 +08:00
minggo
99d5f8f96c
support max pass up to 8 ( #8510 )
2021-04-21 16:53:55 +08:00
troublemaker52025
05a72cdee1
Delete private node for v3.1 ( #8382 )
...
* delete private node
# Conflicts:
# cocos/core/scene-graph/private-node.ts
* update
* Alias of Node
* update
* dont use enum ALL
* fix bug for editor
* update
* update
* update
* Retaining deprecated objects
* update
* update
* update
* using warnID and update EngineErrorMap.md
2021-04-08 17:47:05 +08:00
pandamicro
92d5e8934d
Add deprecation for replaced 2D render APIs ( #8143 )
2021-01-15 13:55:42 +08:00
pandamicro
c6dad8c494
Merge render scene and improve naming for 2d render ( #8142 )
...
* format and tweek
* Refactor renderer: UI to 2D naming
* refactor root.ui to root.batcher2D
* Refactor UIBatchView to BatchView2D
* Fix issues
* Merge UI render scene to main render scene
* Improve camera scene check in forward pipeline
* Fix eslint ci
* skip js files
2021-01-15 11:43:09 +08:00
ChiaNing
fa2057deb4
RenderRoot2d comp add ( #8120 )
...
* RenderRoot2d comp add
* name change
* require UITransform on renderRoot
2021-01-12 14:55:17 +08:00
pandamicro
9b75d50b1b
Improve game mainLoop safety ( #7796 )
...
* Improve game mainLoop safety
* Fix ci
* Fix ci
* Fix game pause state set
* Fix game init timing
* Fix camera component imports
* Fix eslint warnings
* allow dangling underscores
* Fix more warning
2020-12-22 18:19:40 +08:00
ChiaNing
f3d62ce258
mask invert bug fix & uiComp check ( #7758 )
...
* mask invert bug fix
* uiComp check
2020-11-11 19:13:37 +08:00
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
ChiaNing
6ed0e81cca
new UI custom material & use hash check merge ( #7649 )
...
* new UI custom material & use hash check merge
* update
* update
* apidoc
2020-10-31 13:34:15 +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
Jare Guo
b7c56393d5
Merge remote-tracking branch 'fireball/3d' into 3d-v1.2
...
# Conflicts:
# EngineErrorMap.md
# cocos/core/assets/image-asset.ts
# cocos/core/data/class.ts
# cocos/core/data/deserialize.ts
# package.json
2020-10-28 18:37:39 +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
Knox
7b5132a6fd
support for adding widgets to the canvas ( #7547 )
...
* support for adding widgets to the canvas
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
2020-10-21 16:36:51 +08:00
Leslie Leigh (李的序)
114746ec50
Remove es5 cc class ( #7504 )
...
* Remove empty comments
* Remove CCClass() style class declaration
* Optimize
2020-10-19 11:51:37 +08:00
Jare Guo
2cdc3d1b8b
Refine EngineErrorMap and sync 2D changes ( #7542 )
...
* refine Color.toCSS/toHex (sync #6216 #6207 )
* refine component.resetInEditor (sync #6244 )
* Revert "Improve error maps (#5527 )"
This reverts commit 224cea23ab .
# Conflicts:
# EngineErrorMap.md
# cocos/core/assets/sprite-frame.ts
* Revert "Component rename for new standard and 2d compatibility (#7103 )"
This reverts commit 3240dba206 .
# Conflicts:
# EngineErrorMap.md
* Remove some old deprecations (sync #6271 )
2020-10-16 10:55:32 +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
Jare Guo
0b1fa249da
bug fixes and sync remain codes
...
fuck
2020-09-28 16:37:24 +08:00
Jare Guo
1f5c1bb0c9
embed -dynamic interface into -compiled to support ts declare and use an unify Details class
2020-09-27 19:25:00 +08:00
minggo
6e71962fb9
merge v1.2
2020-09-10 11:41:20 +08:00
Leslie Leigh (李的序)
a333b0b564
Handle WebGL context lost event ( #7291 )
...
* Handle WebGL context lost event
* Fix
2020-09-08 14:08:20 +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
Knox
3d9cd319ee
add video player component ( #7226 )
...
* add video player component
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
* refine code
2020-09-02 15:42:33 +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
Knox
b8d0026694
sync #3d-tasks/issues/3962 ( #7232 )
...
* sync #3d-tasks/issues/3962
https://github.com/cocos-creator/engine/pull/5598
https://github.com/cocos-creator/engine/pull/6575
https://github.com/cocos-creator/engine/pull/6333
https://github.com/cocos-creator/engine/pull/4003
https://github.com/cocos-creator/engine/pull/4240
https://github.com/cocos-creator/engine/pull/5444
https://github.com/cocos-creator/engine/pull/5178
https://github.com/cocos-creator/engine/pull/5656
https://github.com/cocos-creator/engine/pull/5672
https://github.com/cocos-creator/engine/pull/3515
https://github.com/cocos-creator/engine/pull/3617
https://github.com/cocos-creator/engine/pull/3802
https://github.com/cocos-creator/engine/pull/4152
* refine code
2020-08-27 19:51:43 +08:00
PP
f9a6fd59b2
error when design resolution is invalid ( #7063 )
2020-08-03 19:17:53 +08:00
pandamicro
dbf4519339
Properly deprecate UI related API in Node ( #6754 )
...
* Properly deprecate UI related API in Node
* UI transform property access fix
* UI transform property access fix for widget
2020-06-23 11:44:43 +08:00
Yun Hsiao Wu
69db70a910
Merge remote-tracking branch 'origin/3d' into 3d
2020-06-03 16:22:00 +08:00
Leslie Leigh (李的序)
db885e32d1
Warn if morph target count is overflow ( #6622 )
2020-04-28 14:48:01 +08:00
pandamicro
c47e1a1d1b
Merge branch '3d' into 3d-gfx
...
# Conflicts:
# cocos/core/game.ts
# cocos/core/pipeline/batched-buffer.ts
# cocos/core/platform/view.ts
# gulpfile.js
2020-03-26 11:06:40 +08:00
jiaxin.lai
aa0eb1bdaf
cylinder collider ( #6416 )
...
* stash
* stash
* stash
* stash
* fix z direction
* impl cannon cylinder
* stash
* stash
* stash
* fix memory leak
* update @cocos/ammo
* add error map
* update package-lock
* tweaks
2020-03-25 18:35:27 +08:00
Leslie Leigh (李的序)
ebf45b15ae
Bump eslint; Optimize an error string; Add assert functions ( #6398 )
...
* Bump eslint; Optimize an error string; Add assert functions
* Add comment
* Add license
2020-03-23 19:08:16 +08:00
ChiaNing
644218fd09
Sprite Frame change ( #6336 )
...
* sprite-frame change
* spriteframe update
* set texture fix
* can render fix
* spriteframe textureLoaded fix
* update
* update
* texture loaded update
* refresh texture add
* format fix
2020-03-20 19:37:50 +08:00
jiaxin.lai
a4af34630f
integrate trimesh shape of ammo & cannon ( #6232 )
...
* stash
* cannon impl
* ammo mesh collider
* finish ammo mesh collider
* cannon trimesh shape
* tweaks
* tweaks
* tweaks
* update @cocos/ammo & @cocos/cannon
* fix ci
* naming norm
* use config object
* renaming
* naming norm
* naming norm
* tweaks
* stash
* stash
* stash
* add error map
* export impl
* update package-lock
* export impl of world
* tweaks
2020-03-15 19:41:16 +08:00