Commit Graph

50 Commits

Author SHA1 Message Date
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
Leslie Leigh (李的序)
397ed24f5f Optimize cross fade (#8825) 2021-06-16 14:49:00 +08:00
Leslie Leigh (李的序)
1d44fab8a1 Fix clip equivalence in Animation component (#8675) 2021-05-14 16:15:33 +08:00
Santy-Wang
ad4bff3988 Restructure Module (#7968)
* module restructure

* refine

* restructure module

* merge

* revert

* fix ci

* update import path of unit-test

* split 2d and ui

* add more module

* change audio adapter

* rename primitive

* config wechat plugin

* merge

* add category config

* merge

* merge
2020-12-24 19:07:26 +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
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
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
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 (李的序)
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
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
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
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
Leslie Leigh
69f864cbf4 uniform-k (#5034)
* uniform-k

* update

* update

* typo

* opt AnimCurve constructor

* refactor animation-clip

* rename

* adapt animation clip new data structure to skeletal animation clip

* opt error

* opt error msg

* uniform test current file configuration

* opt err msg

* opt

* fix

* adapt skeletal clip

* fix

* fix

* fix
2019-08-08 21:38:20 -05:00
pandamicro
1380e46c34 Unittest (#4973)
* unit test for ts

* Fix ts-jest warnings

* Remove puppeteer for now

* fix physics define and jest config for windows

* Replace Node ref with INode ref

* Fix ci issue

* Fix

* tweak

* tweak

* Fix vscode launcher

* now physics framework export all physics component (#28)

* tweaks
2019-07-25 17:15:20 +08:00