Commit Graph

67 Commits

Author SHA1 Message Date
Leslie Leigh (李的序) aca3336745 Feat: animation graph - support absolute destination start time (#12162)
* Feat: animation graph - support absolute destination start time

* Update
2022-07-29 11:08:39 +08:00
Leslie Leigh (李的序) 8f929823f4 Optimize embedded player/event evaluation in animation state (#12186)
* Optimize embedded player evaluation in animation state

* update

* Skip wrap info calculation in certain cases in animation state

* Tweak

* Tweak

* Fix  test
2022-07-27 10:56:26 +08:00
Leslie Leigh (李的序) 4d7ca24948 Handle destination start time on empty transitions (#12007) 2022-07-15 17:05:08 +08:00
Leslie Leigh (李的序) 87d947c727 Property handle zero duration animation clips(2rd fix) (#11925) 2022-07-11 16:44:35 +08:00
Leslie Leigh (李的序) 22d0fa730b Properly handle zero duration clips (#11879) 2022-07-07 15:25:51 +08:00
Leslie Leigh (李的序) eaddf1dab7 Handle twice embedded player evaluations occur in difference animation iteration (#11836) 2022-07-05 10:50:32 +08:00
Leslie Leigh (李的序) e6dfd98840 Optimize morph animation (#11728) 2022-07-04 15:40:45 +08:00
Leslie Leigh (李的序) d4a3be4f23 Animation graph transition interruption (#11566)
* Transition interruption

* Add more tests

* Add

* Self transition interruption test

* Update

* Tweak

* Tweak
2022-07-01 13:47:02 +08:00
Leslie Leigh (李的序) 7037907b53 Improve rename variable unit test (#11666) 2022-06-24 18:25:05 +08:00
pandamicro 12072ffc62 Merge v3.5.1 zqb branch to v3.6 (#11637)
* support asset property preview (#11017)

(cherry picked from commit 85769cf8f81459b5ad98ccab4138420009572a32)

* show mesh asset thumbnail (#10981)

* V3.5.1 noise particle (#11003)

* add cpu & gpu noise for particle

* add some params & change particle noise shader

* change shader

* add cpu noise particle

* add noise preview

* run generation when preview

* revert shaders

* remove unused statements

* add particle noise module

* change noise preview interface

* add invisible to remap

* remove get deltaTime

* set noiseModule private

* fix eslint

* feat: add noise preview (#11260)

* [Optimize] asset editing undo (#10779)

* edit render-pipeline

* support renderpipeline undo

* optimize material editing undo

* reset last record data

* temporary not support animation-mask undo

* support animation-mask edit undo

* animation mask remove _jointMasks

* Animation clip embedded players (#11320)

* Animation clip subregions

* Log

* Test

* Eval

* Update

* Update

* No longer use animation state to implement clip motion

* Clear subregions

* Fix

* Mark subregion as editor extendable

* Animation clip subregion player path

* fix isnan(0.0) with webgl1.0 (#11262)

* fix isinf(0.0)==true with webgl1.0

* code style

* fix specular params with surface toon (#11265)

* code format and add sliders for parameters (#11266)

* Broadcasting of animation state\'s speed

* Fix

* Rename

* Update

* Fix

* Revert "No longer use animation state to implement clip motion"

This reverts commit 20755f9ec525b27b5b9a515c8dd687349aa4c637.

* Revert some exotic changes

* Update docs

Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>

* fix skinning model split (#11378)

* fix skinning model split

* rename function _resizeMaxJointForDS

Co-authored-by: zhakesi <zhakesi@foxmail.com>

* [ci skip][AUTO]: Automated genbindings update: d823cbba1f7ce8284da28458c26534da2e033961  (#11378) (#11383)

Co-authored-by: cocos-robot <cocos-robot@cocos.com>

* use stop emitting instead (#11381)

* add stop emitting api

* use stop emitting instead

* Update cocos/particle/particle-system.ts

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

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

* fix: imageData fault tolerance (#11374)

* fix: imageData fault tolerance

* chore: when data is an empty array,stop the function

* material  undo updating effects list (#11409)

* modify noise module ui (#11433)

* use visible decorator to control the visibility of property (#11438)

* fix joints data with value nan (#11489)

* V3.5.2 CI Android NDK  set version to 21 (#11448) (#11492)

* Minor improvement

* Fix format

* Fix particle culler

* Improve particle culler

* Manually migrate joint data upload with texture in skinning model

* Update shaders for skinning model based on joint texture

* fis native skinning model with realtime-texture mode (#45)

Co-authored-by: zhakesi <zhakesi@foxmail.com>

* fix clangtidy (#46)

* Small tweaks

* modify code struct for skinning model (#47)

* modify code struct for skinning model

* update skinning chunk

Co-authored-by: 黄森斌 <arsen2010@126.com>
Co-authored-by: zxx43 <zxx43@hotmail.com>
Co-authored-by: 袁炜海 <35713518+dogodo-cc@users.noreply.github.com>
Co-authored-by: Leslie Leigh (李的序) <leslieleigh@outlook.com>
Co-authored-by: jk20012001 <jkregister@163.com>
Co-authored-by: 徐兵 <49358166+xubing0906@users.noreply.github.com>
Co-authored-by: zhakesi <liqiao@cocos.com>
Co-authored-by: zhakesi <zhakesi@foxmail.com>
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <cocos-robot@cocos.com>
Co-authored-by: Santy-Wang <wh19930829@qq.com>
Co-authored-by: zhangxin <59186205+chichinohaha@users.noreply.github.com>
Co-authored-by: 江战 <40414978+PatriceJiang@users.noreply.github.com>
2022-06-24 15:10:45 +08:00
Leslie Leigh (李的序) 46b4d5e34b Animation graph add method to rename variables (#11659)
* Animation graph add method to rename variables

* Fix test
2022-06-23 11:58:20 +08:00
Leslie Leigh (李的序) e0555d536f Animation graph transition priority (#11555) 2022-06-20 14:28:18 +08:00
Leslie Leigh (李的序) d87a3f34ad Animation graph transition destination start (#11160)
* Animation graph transition offset

* Unit test

* Rename offset as destination start

* Rename
2022-06-20 10:12:34 +08:00
Leslie Leigh (李的序) 5b7e958651 Add AnimationController.getLayerWeight (#11380) 2022-06-20 09:59:33 +08:00
Leslie Leigh (李的序) c279004513 Activation/Inactivation should resume/pause animation (#11510) 2022-06-18 11:02:48 +08:00
Leslie Leigh (李的序) 58e25f18ee Animation graph negative speed (#11549)
* Animation graph negative speed

* Update doc
2022-06-17 10:15:32 +08:00
Leslie Leigh (李的序) 423ce5fa6b Improve error messages on animation clip track binding failure (#11224)
* Improve error messages on animation clip track binding failure

* lint
2022-06-06 13:34:57 +08:00
Leslie Leigh (李的序) b4cc1bfcc6 Add AnimationMask.joints setter (#10780)
* Add AnimationMask.joints setter

* Update

* Unit test
2022-04-18 10:55:55 +08:00
Leslie Leigh (李的序) 07c002c98a Fix failed to alter the reset mode of trigger variables (#10783) 2022-04-15 19:15:17 +08:00
Leslie Leigh (李的序) 7c9fbc431b Revert #10485, #10512, #10576 (#10683) 2022-04-07 16:22:34 +08:00
Leslie Leigh (李的序) ad38d77da4 Fix circular reference (#10625)
* Fix circular reference

* Update

* Update
2022-04-01 13:44:15 +08:00
Leslie Leigh (李的序) 891237b06e Fix skeletal animation state got update twice (#10571)
* Fix skeletal animation state got update twice

* update

* Add test

* Update

* Update

* Always update

* rename
2022-03-29 21:39:59 +08:00
Leslie Leigh (李的序) 6070aa5c79 Fix cross fade bug introduced from #10485 (#10576) 2022-03-29 20:02:10 +08:00
Leslie Leigh (李的序) 0a67669190 Animation state bugfix (#10558) 2022-03-29 11:33:47 +08:00
Leslie Leigh (李的序) 73374aa999 Fix animation bug introduced from #10485 (#10512)
* Fix animation bug introduced from #10485

* Add test
2022-03-26 15:57:50 +08:00
Leslie Leigh (李的序) 673844eafb Fix: animation blending zero check (#10499)
* Fix: zero check animation blending

* Rename
2022-03-25 18:51:15 +08:00
Leslie Leigh (李的序) f00d11adaa Optimize the way how animation component update its animation content (#10485)
* Optimize the way how animation component update its animation content

* Update

* Update

* update

* Update
2022-03-25 10:03:29 +08:00
Leslie Leigh (李的序) b87c185333 Marionette: layer, mask, auto trigger, pass through state (#10179)
* Marionette/3.5.0 Initial Commit

* Auto trigger default value

* import skeleton 改为选择 fbx 文件

* Rename passthrough -> empty

* Refactor Auto Trigger (#81)

* Refactor auto trigger

* Lint

* Optimize

* Update

* Migrate triggers (#82)

* Fix merge problems

* Optimize

* Optimize

Co-authored-by: arsen2010 <arsen2010@126.com>
2022-03-22 15:05:45 +08:00
Leslie Leigh (李的序) 93b856b98e Make animation module optional (#10257) 2022-03-10 11:55:11 +08:00
Leslie Leigh (李的序) 19c121dd07 Fix skeletal animation sample() does not work as intended (#10006)
* Fix skeletal animation sample() does not work as intended

* update

* currentClipRef -> currentClip

* Rename

* Optimize

* Internal

* Optimize

* Update
2022-01-18 22:56:10 +08:00
Leslie Leigh (李的序) b4ec6c576e Fix AnimationGraph.disconnect() (#9785)
* Fix AnimationGraph.disconnect()

* Update comment
2021-12-09 15:29:19 +08:00
Leslie Leigh (李的序) 080053bc33 Empty tracks shall not take effect (#9777)
* Empty tracks shall not take effect

* Fix test

* Fix test
2021-12-08 10:31:20 +08:00
Leslie Leigh (李的序) d47f5eb6a5 AnimationController.variables() (#9710)
* AnimationController.variables()

* rename, add test

* rename
2021-11-24 14:54:56 +08:00
Leslie Leigh (李的序) 05484abc30 Rename animation.StateStatus -> animation.MotionStateStatus (#9675) 2021-11-17 15:55:03 +08:00
Leslie Leigh (李的序) c961d105f3 Triggers should be only reset when a motion state arrived (#9612)
* Triggers should be only reset when a motion state arrived

* Code

* Fix
2021-11-03 19:43:53 +08:00
Leslie Leigh (李的序) 48dbbe3293 Respect to wrap mode of animation clip (#9607) 2021-11-03 16:43:19 +08:00
Leslie Leigh (李的序) 07fb27dac4 Support more state machine component callbacks (#9556)
* StateMachineComponent

* Rename
2021-11-01 10:31:27 +08:00
Leslie Leigh (李的序) c56fa21d33 Exit transition shall not consume triggers (#9519) 2021-10-21 19:50:20 +08:00
Leslie Leigh (李的序) 6583b7c780 Hide animation graph asset creation API in runtime (#9491) 2021-10-15 15:23:23 +08:00
Leslie Leigh (李的序) 74dd46657d Animation graph variable: rename number to float (#9486)
* Animation graph variable: rename number to float

* Add name property to animation blend
2021-10-14 18:02:49 +08:00
Leslie Leigh (李的序) df9b5ccdce Remove transition by transition object (#9483) 2021-10-14 10:30:09 +08:00
Leslie Leigh (李的序) 81d41f5446 Refine dangling transition behaviour (#9466) 2021-10-14 10:29:37 +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
Leslie Leigh (李的序) b2f8f5aa10 Fix a kind of easing method migration bug (#9132) 2021-08-04 17:07:27 +08:00
Leslie Leigh (李的序) 8a8a1230ba Rename TrackPath methods (#9086) 2021-07-29 10:06:36 +08:00
Leslie Leigh (李的序) 5f5623f5f2 ExoticAnimation: split method; evaluation method test (#9050)
* ExoticAnimation: split method; evaluation method test

* Fix cross fade

* return throw
2021-07-23 16:13:28 +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
Santy-Wang b48baac045 no need to validate animation-clip (#8958) 2021-07-12 16:58:16 +08:00
Leslie Leigh (李的序) f7205249f6 Fix an edge case when doing skeletal animation blending (#8895) 2021-06-28 11:52:22 +08:00
Leslie Leigh (李的序) 69bd320b9a Anim perf (#8865)
* Optimize and refactor skeletal animation blending(3.1)



* Type error

* Update xx

* Update yy
2021-06-24 23:13:29 +08:00