Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DRAFT] glTF interactivity and flow graph update (For snapshot) #15810

Draft
wants to merge 156 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
d25675e
Some architecture changes
RaananW Sep 10, 2024
745b74b
Set Delay block
RaananW Sep 10, 2024
6d2adf7
add resetToDefaultValue
RaananW Sep 10, 2024
f9c3872
Fix GetPointer
RaananW Sep 10, 2024
70cc7c6
fix compilation
RaananW Sep 10, 2024
21177b8
back to "property"
RaananW Sep 10, 2024
0f6c956
better type
RaananW Sep 10, 2024
288ea3d
Set property block (pointer in gltf world)
RaananW Sep 10, 2024
eb81a43
sync specs
RaananW Sep 11, 2024
ba45506
Updating existing blocks
RaananW Sep 12, 2024
cd847fb
for, while, do n
RaananW Sep 12, 2024
4d25baf
multigate and waitall
RaananW Sep 13, 2024
2ed4399
Events, Properties, and the flow graph assets context
RaananW Sep 13, 2024
94da015
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Sep 23, 2024
4a6e0c2
small changes to assets container
RaananW Sep 24, 2024
a52f7e7
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Sep 27, 2024
1f3d804
switching to a different property/asset architecture
RaananW Sep 27, 2024
1b09498
disconnect from all
RaananW Sep 27, 2024
dccf2f2
allow disabling a connection
RaananW Sep 27, 2024
eb3863a
provide property name as part of the path converter
RaananW Sep 27, 2024
d35e8ed
add getProperty name
RaananW Sep 27, 2024
1efb8ce
docs
RaananW Sep 27, 2024
9a81a45
changes to get and set property
RaananW Sep 27, 2024
ffb373d
json pointer parser block
RaananW Sep 27, 2024
582859c
animation is animation group
RaananW Sep 27, 2024
0e95c0f
small fixes
RaananW Sep 27, 2024
b623521
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Sep 30, 2024
3c0dbc2
allow animation as input
RaananW Sep 30, 2024
76b9ef3
add priority to execution blocks
RaananW Sep 30, 2024
4a119bd
better doc
RaananW Sep 30, 2024
45c7d4f
rename error output to "error"
RaananW Sep 30, 2024
d7b71b5
move animationtype to constants
RaananW Oct 1, 2024
c9bb596
define a block as optional is now possible.
RaananW Oct 1, 2024
957f12e
priority for execution blocks
RaananW Oct 1, 2024
43d3cc1
rich types with correlation to animation types
RaananW Oct 1, 2024
1b54981
allow payload in a signal connection.
RaananW Oct 1, 2024
7d4efcb
getvariable with initial value
RaananW Oct 1, 2024
adca260
interpolation block
RaananW Oct 1, 2024
7ac5a2b
better dealing with animation blocks
RaananW Oct 1, 2024
57b934f
add blocks to index.ts
RaananW Oct 1, 2024
616af7f
missing file
RaananW Oct 1, 2024
0d3ead2
fix event out/done confusion
RaananW Oct 1, 2024
ccc24f4
disconnect in-place
RaananW Oct 1, 2024
de694e6
sorting is in-place
RaananW Oct 1, 2024
ce2a49c
easing function might be undefined
RaananW Oct 1, 2024
b38096e
add priority and allow n to n connections
RaananW Oct 1, 2024
4e0403f
bug fix
RaananW Oct 1, 2024
3bbcd95
missing blocks
RaananW Oct 1, 2024
2cd0f23
fixing a few issues
RaananW Oct 1, 2024
8b8f8c4
make sure we are not disposing the wrong animation
RaananW Oct 1, 2024
aaf1494
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Oct 2, 2024
84281ca
fix keyframe generation
RaananW Oct 2, 2024
7b0422f
fix set iteration for build
RaananW Oct 2, 2024
1c341ca
fix typing issues
RaananW Oct 2, 2024
b4c96c4
type is a type is a type
RaananW Oct 2, 2024
3c9cf82
Some major changes, mainly glTF loading
RaananW Oct 11, 2024
f5a3ba9
Switch to enum and remove statics
RaananW Oct 11, 2024
ae42a84
Move to FlowGraphBlockNames
RaananW Oct 11, 2024
e584dd1
fix type issue
RaananW Oct 11, 2024
9df4466
block name
RaananW Oct 11, 2024
485ff6f
fix formatting
RaananW Oct 11, 2024
b9b2a6f
cleanup
RaananW Oct 11, 2024
3a72d0d
Async parsing including block factory
RaananW Oct 11, 2024
ed3b6a9
revert
RaananW Oct 11, 2024
452d669
fix compilation
RaananW Oct 11, 2024
0fef367
added combine/extract
RaananW Oct 14, 2024
d654a06
rename to value
RaananW Oct 14, 2024
2f970da
rename key
RaananW Oct 14, 2024
9f977be
TODO message
RaananW Oct 14, 2024
e347f04
update glTF loader
RaananW Oct 14, 2024
9edc870
rename to blocks
RaananW Oct 14, 2024
1f9144d
improve async loading
RaananW Oct 14, 2024
3d7d685
a bit of cleanup
RaananW Oct 15, 2024
1de5b05
fix naming
RaananW Oct 15, 2024
44b9da0
further changes to gltf interactivity
RaananW Oct 15, 2024
5e7dc39
change the way gltf is parsed
RaananW Oct 16, 2024
8884a0d
fixing serializatiosn and unit tests
RaananW Oct 17, 2024
617a377
unit tests
RaananW Oct 17, 2024
249b9df
Make selectability work :-)
RaananW Oct 17, 2024
aa0d164
KHR selectability
RaananW Oct 18, 2024
1cca4ff
further pointer support
RaananW Oct 18, 2024
740656d
some fixes
RaananW Oct 18, 2024
afc05df
some bug fixes
RaananW Oct 18, 2024
9c12048
further fixes
RaananW Oct 18, 2024
2ec28f1
json pointer can now set
RaananW Oct 18, 2024
8b57bf9
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Oct 21, 2024
122fe4e
new structure, parse configuration better
RaananW Oct 21, 2024
e79119b
Move to the right directory
RaananW Oct 21, 2024
ee0e8ff
adjusting glTF unit tests
RaananW Oct 21, 2024
63ef78f
pointer support
RaananW Oct 21, 2024
8771e17
fix compilation
RaananW Oct 22, 2024
b3f5bd6
Node visibility
RaananW Oct 28, 2024
0717f23
Initial new object model mapping
RaananW Oct 30, 2024
efe0b4b
fixing some typos
RaananW Oct 30, 2024
75c47bc
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Oct 30, 2024
f7b7b4b
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Oct 31, 2024
2f76dab
objectmodelmapping
RaananW Oct 31, 2024
2c0498c
Fixing the object model definition
RaananW Oct 31, 2024
0e44986
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 4, 2024
5a09e3c
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 5, 2024
df79a46
making changes to interpolation
RaananW Nov 6, 2024
16d146e
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 7, 2024
a3d73b5
slight change to interpolation
RaananW Nov 7, 2024
58a5fee
right handed parsing
RaananW Nov 7, 2024
af89f81
pointer interpolation interactivity
RaananW Nov 8, 2024
8926479
further implementation interpolation
RaananW Nov 11, 2024
945b5a9
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 11, 2024
292ed77
Interactivity interpolation
RaananW Nov 11, 2024
4a2f5a8
make sure to export everything correctly
RaananW Nov 12, 2024
f3fe4e2
riht-handed data as parameter in context
RaananW Nov 12, 2024
59c154a
connect flows correctly
RaananW Nov 12, 2024
297a97b
Support easing (Bezier)
RaananW Nov 12, 2024
bd350f6
interactivity example with bezier
RaananW Nov 12, 2024
a829cc9
better import
RaananW Nov 12, 2024
8910473
simplify and fix tests
RaananW Nov 12, 2024
cb286aa
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 13, 2024
2309ea6
small fix
RaananW Nov 13, 2024
1e3d5eb
avoid chunks in umd
RaananW Nov 13, 2024
a88c56b
export everything in UMD
RaananW Nov 13, 2024
7ff7f37
avoid importing from directories
RaananW Nov 13, 2024
0abc793
remove unneeded
RaananW Nov 13, 2024
1ea7847
fix build issue
RaananW Nov 13, 2024
148d1bf
fix unit tests
RaananW Nov 13, 2024
817138e
if scene is already ready, trigger the event
RaananW Nov 13, 2024
9712cd7
new fixes
RaananW Nov 13, 2024
3e95d09
event ordering
RaananW Nov 14, 2024
fb73648
value parsing and visibility extension
RaananW Nov 14, 2024
53da983
Allow different types of point events (defaults to pick)
RaananW Nov 14, 2024
28fbd71
Fix Float3/4 to Color3/4
RaananW Nov 18, 2024
65b4285
internal
RaananW Nov 18, 2024
41bdbd3
logger initial
RaananW Nov 18, 2024
4301279
Allow using uniqueId as index
RaananW Nov 19, 2024
982ee95
Allow reusing an async node (cancel and run again)
RaananW Nov 19, 2024
76861c0
Allow using uniqueId as index
RaananW Nov 19, 2024
888703c
Only run one interpolation per object type
RaananW Nov 19, 2024
775a6e6
support interpolation better
RaananW Nov 19, 2024
1cc9189
changes to stop animation
RaananW Nov 19, 2024
f8d5ee0
reset the timer
RaananW Nov 19, 2024
7a5f5aa
fix an issue in interpolation of Bezier curve and t = 0
RaananW Nov 19, 2024
72fcb29
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 21, 2024
20f0b69
Support unknown nodes (log and ignore)
RaananW Nov 21, 2024
8c236ba
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Nov 28, 2024
50098aa
attach the math select
RaananW Nov 28, 2024
55a923f
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Dec 6, 2024
cab6cf3
update selectability
RaananW Dec 6, 2024
d533313
add hoverability and selectability to the JSON model
RaananW Dec 6, 2024
46cbd74
Merge remote-tracking branch 'upstream/master' into gltfInteractivity
RaananW Dec 16, 2024
982f253
events
RaananW Dec 16, 2024
e5e9b74
introduce onStateChanged, fix an issue with pending async blocks
RaananW Dec 17, 2024
0e6d711
better parsing, new event architecture
RaananW Dec 18, 2024
0da2df6
reset animation to stay safe
RaananW Dec 18, 2024
3261750
fix loader for animation and hover
RaananW Dec 18, 2024
20f0cbf
fix build
RaananW Dec 18, 2024
39c236a
fix UMD
RaananW Dec 18, 2024
ad1a77b
fix type issue
RaananW Dec 18, 2024
a3a7df2
fix timeSinceStart not assigned correctly
RaananW Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions packages/dev/core/src/Animations/animation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,8 @@ export class Animation {

// check for easingFunction and correction of gradient
const easingFunction = startKey.easingFunction || this.getEasingFunction();
if (easingFunction !== null) {
// can also be undefined, if not provided
if (easingFunction) {
gradient = easingFunction.ease(gradient);
}

Expand Down Expand Up @@ -1328,35 +1329,35 @@ export class Animation {
/**
* Float animation type
*/
public static readonly ANIMATIONTYPE_FLOAT = 0;
public static readonly ANIMATIONTYPE_FLOAT = Constants.ANIMATIONTYPE_FLOAT;
/**
* Vector3 animation type
*/
public static readonly ANIMATIONTYPE_VECTOR3 = 1;
public static readonly ANIMATIONTYPE_VECTOR3 = Constants.ANIMATIONTYPE_VECTOR3;
/**
* Quaternion animation type
*/
public static readonly ANIMATIONTYPE_QUATERNION = 2;
public static readonly ANIMATIONTYPE_QUATERNION = Constants.ANIMATIONTYPE_QUATERNION;
/**
* Matrix animation type
*/
public static readonly ANIMATIONTYPE_MATRIX = 3;
public static readonly ANIMATIONTYPE_MATRIX = Constants.ANIMATIONTYPE_MATRIX;
/**
* Color3 animation type
*/
public static readonly ANIMATIONTYPE_COLOR3 = 4;
public static readonly ANIMATIONTYPE_COLOR3 = Constants.ANIMATIONTYPE_COLOR3;
/**
* Color3 animation type
*/
public static readonly ANIMATIONTYPE_COLOR4 = 7;
public static readonly ANIMATIONTYPE_COLOR4 = Constants.ANIMATIONTYPE_COLOR4;
/**
* Vector2 animation type
*/
public static readonly ANIMATIONTYPE_VECTOR2 = 5;
public static readonly ANIMATIONTYPE_VECTOR2 = Constants.ANIMATIONTYPE_VECTOR2;
/**
* Size animation type
*/
public static readonly ANIMATIONTYPE_SIZE = 6;
public static readonly ANIMATIONTYPE_SIZE = Constants.ANIMATIONTYPE_SIZE;
/**
* Relative Loop Mode
*/
Expand Down
34 changes: 34 additions & 0 deletions packages/dev/core/src/Engines/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,40 @@ export class Constants {
*/
public static MatricesWeightsExtraKind = "matricesWeightsExtra";

// Animation type
/**
* Float animation type
*/
public static readonly ANIMATIONTYPE_FLOAT = 0;
/**
* Vector3 animation type
*/
public static readonly ANIMATIONTYPE_VECTOR3 = 1;
/**
* Quaternion animation type
*/
public static readonly ANIMATIONTYPE_QUATERNION = 2;
/**
* Matrix animation type
*/
public static readonly ANIMATIONTYPE_MATRIX = 3;
/**
* Color3 animation type
*/
public static readonly ANIMATIONTYPE_COLOR3 = 4;
/**
* Color3 animation type
*/
public static readonly ANIMATIONTYPE_COLOR4 = 7;
/**
* Vector2 animation type
*/
public static readonly ANIMATIONTYPE_VECTOR2 = 5;
/**
* Size animation type
*/
public static readonly ANIMATIONTYPE_SIZE = 6;

/**
* The default minZ value for the near plane of a frustum light
*/
Expand Down
Loading
Loading