Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Molstar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michal Malý
Molstar
Commits
2e80558e
Commit
2e80558e
authored
6 years ago
by
Alexander Rose
Browse files
Options
Downloads
Patches
Plain Diff
improved animation behavior example to animate each unit individually
parent
7f0fae39
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/mol-plugin/behavior/dynamic/animation.ts
+79
-41
79 additions, 41 deletions
src/mol-plugin/behavior/dynamic/animation.ts
with
79 additions
and
41 deletions
src/mol-plugin/behavior/dynamic/animation.ts
+
79
−
41
View file @
2e80558e
...
@@ -12,6 +12,8 @@ import { Mat4, Vec3 } from 'mol-math/linear-algebra';
...
@@ -12,6 +12,8 @@ import { Mat4, Vec3 } from 'mol-math/linear-algebra';
import
{
PluginStateObject
as
SO
,
PluginStateObject
}
from
'
../../state/objects
'
;
import
{
PluginStateObject
as
SO
,
PluginStateObject
}
from
'
../../state/objects
'
;
import
{
StateSelection
}
from
'
mol-state/state/selection
'
;
import
{
StateSelection
}
from
'
mol-state/state/selection
'
;
import
{
StateObjectCell
,
State
}
from
'
mol-state
'
;
import
{
StateObjectCell
,
State
}
from
'
mol-state
'
;
import
{
StructureUnitTransforms
}
from
'
mol-model/structure/structure/util/unit-transforms
'
;
import
{
UUID
}
from
'
mol-util
'
;
const
StructureAnimationParams
=
{
const
StructureAnimationParams
=
{
rotate
:
PD
.
Boolean
(
false
),
rotate
:
PD
.
Boolean
(
false
),
...
@@ -21,25 +23,6 @@ const StructureAnimationParams = {
...
@@ -21,25 +23,6 @@ const StructureAnimationParams = {
}
}
type
StructureAnimationProps
=
PD
.
Values
<
typeof
StructureAnimationParams
>
type
StructureAnimationProps
=
PD
.
Values
<
typeof
StructureAnimationParams
>
function
getStructure
(
root
:
StateObjectCell
,
state
:
State
)
{
const
parent
=
StateSelection
.
findAncestorOfType
(
state
.
tree
,
state
.
cells
,
root
.
transform
.
ref
,
[
PluginStateObject
.
Molecule
.
Structure
])
return
parent
&&
parent
.
obj
?
parent
.
obj
as
PluginStateObject
.
Molecule
.
Structure
:
undefined
}
function
getRootStructure
(
root
:
StateObjectCell
,
state
:
State
)
{
let
parent
:
StateObjectCell
|
undefined
while
(
true
)
{
const
_parent
=
StateSelection
.
findAncestorOfType
(
state
.
tree
,
state
.
cells
,
root
.
transform
.
ref
,
[
PluginStateObject
.
Molecule
.
Structure
])
if
(
_parent
)
{
parent
=
_parent
root
=
_parent
}
else
{
break
}
}
return
parent
&&
parent
.
obj
?
parent
.
obj
as
PluginStateObject
.
Molecule
.
Structure
:
undefined
}
/**
/**
* TODO
* TODO
* - animation class is just for testing purposes, needs better API
* - animation class is just for testing purposes, needs better API
...
@@ -55,36 +38,62 @@ export const StructureAnimation = PluginBehavior.create<StructureAnimationProps>
...
@@ -55,36 +38,62 @@ export const StructureAnimation = PluginBehavior.create<StructureAnimationProps>
private
animMat
=
Mat4
.
identity
()
private
animMat
=
Mat4
.
identity
()
private
transVec
=
Vec3
.
zero
()
private
transVec
=
Vec3
.
zero
()
private
rotVec
=
Vec3
.
create
(
0
,
1
,
0
)
private
rotVec
=
Vec3
.
create
(
0
,
1
,
0
)
private
centerVec
=
Vec3
.
zero
()
private
rotateAnimHandle
=
-
1
private
rotateAnimHandle
=
-
1
private
explodeAnimHandle
=
-
1
private
explodeAnimHandle
=
-
1
private
updatedUnitTransforms
=
new
Set
<
SO
.
Molecule
.
Structure
>
()
private
structureUnitTransforms
=
new
Map
<
UUID
,
StructureUnitTransforms
>
()
constructor
(
protected
ctx
:
PluginContext
,
protected
params
:
StructureAnimationProps
)
{
constructor
(
protected
ctx
:
PluginContext
,
protected
params
:
StructureAnimationProps
)
{
super
(
ctx
,
params
)
super
(
ctx
,
params
)
this
.
update
(
params
)
this
.
update
(
params
)
}
}
private
getUnitTransforms
(
structure
:
SO
.
Molecule
.
Structure
)
{
let
unitTransforms
=
this
.
structureUnitTransforms
.
get
(
structure
.
id
)
if
(
!
unitTransforms
)
{
unitTransforms
=
new
StructureUnitTransforms
(
structure
.
data
)
this
.
structureUnitTransforms
.
set
(
structure
.
id
,
unitTransforms
)
}
return
unitTransforms
}
rotate
(
rad
:
number
)
{
rotate
(
rad
:
number
)
{
this
.
updatedUnitTransforms
.
clear
()
const
state
=
this
.
ctx
.
state
.
dataState
const
state
=
this
.
ctx
.
state
.
dataState
const
reprs
=
state
.
select
(
q
=>
q
.
rootsOfType
(
PluginStateObject
.
Molecule
.
Representation3D
))
;
const
reprs
=
state
.
select
(
q
=>
q
.
rootsOfType
(
PluginStateObject
.
Molecule
.
Representation3D
))
Mat4
.
rotate
(
this
.
rotMat
,
this
.
tmpMat
,
rad
,
this
.
rotVec
)
Mat4
.
rotate
(
this
.
rotMat
,
this
.
tmpMat
,
rad
,
this
.
rotVec
)
for
(
const
r
of
reprs
)
{
for
(
const
r
of
reprs
)
{
if
(
!
SO
.
isRepresentation3D
(
r
.
obj
))
return
if
(
!
SO
.
isRepresentation3D
(
r
.
obj
))
return
const
structure
=
getRootStructure
(
r
,
state
)
const
structure
=
getRootStructure
(
r
,
state
)
if
(
!
structure
)
continue
if
(
!
structure
||
!
SO
.
Molecule
.
Structure
.
is
(
structure
.
obj
))
continue
const
unitTransforms
=
this
.
getUnitTransforms
(
structure
.
obj
)
if
(
!
this
.
updatedUnitTransforms
.
has
(
structure
.
obj
))
{
for
(
let
i
=
0
,
il
=
structure
.
obj
.
data
.
units
.
length
;
i
<
il
;
++
i
)
{
const
u
=
structure
.
obj
.
data
.
units
[
i
]
Vec3
.
transformMat4
(
this
.
centerVec
,
u
.
lookup3d
.
boundary
.
sphere
.
center
,
u
.
conformation
.
operator
.
matrix
)
Vec3
.
negate
(
this
.
transVec
,
Vec3
.
copy
(
this
.
transVec
,
structure
.
data
.
boundary
.
sphere
.
center
))
Vec3
.
negate
(
this
.
transVec
,
Vec3
.
copy
(
this
.
transVec
,
this
.
center
Vec
))
Mat4
.
fromTranslation
(
this
.
transMat
,
this
.
transVec
)
Mat4
.
fromTranslation
(
this
.
transMat
,
this
.
transVec
)
Mat4
.
mul
(
this
.
animMat
,
this
.
rotMat
,
this
.
transMat
)
Mat4
.
mul
(
this
.
animMat
,
this
.
rotMat
,
this
.
transMat
)
Vec3
.
copy
(
this
.
transVec
,
structure
.
data
.
boundary
.
sphere
.
center
)
Vec3
.
copy
(
this
.
transVec
,
this
.
center
Vec
)
Mat4
.
fromTranslation
(
this
.
transMat
,
this
.
transVec
)
Mat4
.
fromTranslation
(
this
.
transMat
,
this
.
transVec
)
Mat4
.
mul
(
this
.
animMat
,
this
.
transMat
,
this
.
animMat
)
Mat4
.
mul
(
this
.
animMat
,
this
.
transMat
,
this
.
animMat
)
r
.
obj
.
data
.
setState
({
transform
:
this
.
animMat
})
unitTransforms
.
setTransform
(
this
.
animMat
,
u
)
}
this
.
updatedUnitTransforms
.
add
(
structure
.
obj
)
}
r
.
obj
.
data
.
setState
({
unitTransforms
})
this
.
ctx
.
canvas3d
.
add
(
r
.
obj
.
data
)
this
.
ctx
.
canvas3d
.
add
(
r
.
obj
.
data
)
this
.
ctx
.
canvas3d
.
requestDraw
(
true
)
}
}
this
.
ctx
.
canvas3d
.
requestDraw
(
true
)
}
}
animateRotate
(
play
:
boolean
)
{
animateRotate
(
play
:
boolean
)
{
...
@@ -99,30 +108,42 @@ export const StructureAnimation = PluginBehavior.create<StructureAnimationProps>
...
@@ -99,30 +108,42 @@ export const StructureAnimation = PluginBehavior.create<StructureAnimationProps>
}
}
}
}
explode
(
d
:
number
)
{
explode
(
p
:
number
)
{
this
.
updatedUnitTransforms
.
clear
()
const
state
=
this
.
ctx
.
state
.
dataState
const
state
=
this
.
ctx
.
state
.
dataState
const
reprs
=
state
.
select
(
q
=>
q
.
rootsOfType
(
PluginStateObject
.
Molecule
.
Representation3D
));
const
reprs
=
state
.
select
(
q
=>
q
.
rootsOfType
(
PluginStateObject
.
Molecule
.
Representation3D
));
for
(
const
r
of
reprs
)
{
for
(
const
r
of
reprs
)
{
if
(
!
SO
.
isRepresentation3D
(
r
.
obj
))
return
if
(
!
SO
.
isRepresentation3D
(
r
.
obj
))
return
const
structure
=
getStructure
(
r
,
state
)
const
structure
=
getRootStructure
(
r
,
state
)
if
(
!
structure
)
continue
if
(
!
structure
||
!
SO
.
Molecule
.
Structure
.
is
(
structure
.
obj
))
continue
const
rootStructure
=
getRootStructure
(
r
,
state
)
if
(
!
rootStructure
)
continue
Vec3
.
sub
(
this
.
transVec
,
structure
.
data
.
boundary
.
sphere
.
center
,
rootStructure
.
data
.
boundary
.
sphere
.
center
)
const
unitTransforms
=
this
.
getUnitTransforms
(
structure
.
obj
)
const
d
=
structure
.
obj
.
data
.
boundary
.
sphere
.
radius
*
(
p
/
100
)
if
(
!
this
.
updatedUnitTransforms
.
has
(
structure
.
obj
))
{
for
(
let
i
=
0
,
il
=
structure
.
obj
.
data
.
units
.
length
;
i
<
il
;
++
i
)
{
const
u
=
structure
.
obj
.
data
.
units
[
i
]
Vec3
.
transformMat4
(
this
.
centerVec
,
u
.
lookup3d
.
boundary
.
sphere
.
center
,
u
.
conformation
.
operator
.
matrix
)
Vec3
.
sub
(
this
.
transVec
,
this
.
centerVec
,
structure
.
obj
.
data
.
boundary
.
sphere
.
center
)
Vec3
.
setMagnitude
(
this
.
transVec
,
this
.
transVec
,
d
)
Vec3
.
setMagnitude
(
this
.
transVec
,
this
.
transVec
,
d
)
Mat4
.
fromTranslation
(
this
.
animMat
,
this
.
transVec
)
Mat4
.
fromTranslation
(
this
.
animMat
,
this
.
transVec
)
r
.
obj
.
data
.
setState
({
transform
:
this
.
animMat
})
unitTransforms
.
setTransform
(
this
.
animMat
,
u
)
}
this
.
updatedUnitTransforms
.
add
(
structure
.
obj
)
}
r
.
obj
.
data
.
setState
({
unitTransforms
})
this
.
ctx
.
canvas3d
.
add
(
r
.
obj
.
data
)
this
.
ctx
.
canvas3d
.
add
(
r
.
obj
.
data
)
this
.
ctx
.
canvas3d
.
requestDraw
(
true
)
}
}
this
.
ctx
.
canvas3d
.
requestDraw
(
true
)
}
}
animateExplode
(
play
:
boolean
)
{
animateExplode
(
play
:
boolean
)
{
if
(
play
)
{
if
(
play
)
{
const
animateExplode
=
(
t
:
number
)
=>
{
const
animateExplode
=
(
t
:
number
)
=>
{
this
.
explode
((
Math
.
sin
(
t
*
0.001
)
+
1
)
*
5
)
this
.
explode
((
Math
.
sin
(
t
*
0.001
)
+
1
)
*
5
0
)
this
.
explodeAnimHandle
=
requestAnimationFrame
(
animateExplode
)
this
.
explodeAnimHandle
=
requestAnimationFrame
(
animateExplode
)
}
}
this
.
explodeAnimHandle
=
requestAnimationFrame
(
animateExplode
)
this
.
explodeAnimHandle
=
requestAnimationFrame
(
animateExplode
)
...
@@ -161,3 +182,20 @@ export const StructureAnimation = PluginBehavior.create<StructureAnimationProps>
...
@@ -161,3 +182,20 @@ export const StructureAnimation = PluginBehavior.create<StructureAnimationProps>
},
},
params
:
()
=>
StructureAnimationParams
params
:
()
=>
StructureAnimationParams
});
});
//
function
getRootStructure
(
root
:
StateObjectCell
,
state
:
State
)
{
let
parent
:
StateObjectCell
|
undefined
while
(
true
)
{
const
_parent
=
StateSelection
.
findAncestorOfType
(
state
.
tree
,
state
.
cells
,
root
.
transform
.
ref
,
[
PluginStateObject
.
Molecule
.
Structure
])
if
(
_parent
)
{
parent
=
_parent
root
=
_parent
}
else
{
break
}
}
return
parent
?
parent
:
SO
.
Molecule
.
Structure
.
is
(
root
.
obj
)
?
root
:
undefined
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment