Compare commits
No commits in common. "15b2b9543be7a9ed5c8889e04df715f91d479d45" and "78a67ee6650d846fe5cc4770770b1511328033e6" have entirely different histories.
15b2b9543b
...
78a67ee665
3 changed files with 28 additions and 17 deletions
|
@ -2,21 +2,21 @@ const path = require('path')
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
rules: {
|
rules: {
|
||||||
//'no-relative-imports': [
|
'no-relative-imports': [
|
||||||
//'warn',
|
'warn',
|
||||||
//{
|
{
|
||||||
//aliases: [
|
aliases: [
|
||||||
//{name: '@theatre/core', path: path.resolve(__dirname, './core/src')},
|
{name: '@theatre/core', path: path.resolve(__dirname, './core/src')},
|
||||||
//{
|
{
|
||||||
//name: '@theatre/shared',
|
name: '@theatre/shared',
|
||||||
//path: path.resolve(__dirname, './shared/src'),
|
path: path.resolve(__dirname, './shared/src'),
|
||||||
//},
|
},
|
||||||
//{
|
{
|
||||||
//name: '@theatre/studio',
|
name: '@theatre/studio',
|
||||||
//path: path.resolve(__dirname, './studio/src'),
|
path: path.resolve(__dirname, './studio/src'),
|
||||||
//},
|
},
|
||||||
//],
|
],
|
||||||
//},
|
},
|
||||||
//],
|
],
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -558,6 +558,7 @@ export default class TheatreStudio implements IStudio {
|
||||||
propAddress,
|
propAddress,
|
||||||
propConfig,
|
propConfig,
|
||||||
)
|
)
|
||||||
|
console.log('inner setPropAsSequenced', performance.now())
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
__experimental_setPropAsStatic<V>(prop: Pointer<V>): void {
|
__experimental_setPropAsStatic<V>(prop: Pointer<V>): void {
|
||||||
|
@ -692,6 +693,7 @@ export default class TheatreStudio implements IStudio {
|
||||||
if (propConfig === undefined) {
|
if (propConfig === undefined) {
|
||||||
throw new Error('propConfig is undefined. so, yeah.')
|
throw new Error('propConfig is undefined. so, yeah.')
|
||||||
}
|
}
|
||||||
|
console.log({propConfig, propAddress})
|
||||||
stateEditors.coreByProject.historic.sheetsById.sequence.setPrimitivePropAsSequenced(
|
stateEditors.coreByProject.historic.sheetsById.sequence.setPrimitivePropAsSequenced(
|
||||||
propAddress,
|
propAddress,
|
||||||
propConfig,
|
propConfig,
|
||||||
|
@ -840,6 +842,7 @@ export default class TheatreStudio implements IStudio {
|
||||||
root.template.staticConfig,
|
root.template.staticConfig,
|
||||||
path,
|
path,
|
||||||
) as PropTypeConfig
|
) as PropTypeConfig
|
||||||
|
console.log(path, propConfig)
|
||||||
|
|
||||||
const addStaticOrKeyframeProp = <T>(value: T, path: PathToProp) => {
|
const addStaticOrKeyframeProp = <T>(value: T, path: PathToProp) => {
|
||||||
const propAddress = {...root.address, pathToProp: path}
|
const propAddress = {...root.address, pathToProp: path}
|
||||||
|
@ -862,6 +865,12 @@ export default class TheatreStudio implements IStudio {
|
||||||
keyframes,
|
keyframes,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
console.log({
|
||||||
|
a: {...root.address},
|
||||||
|
objectKey,
|
||||||
|
trackId,
|
||||||
|
keyframes,
|
||||||
|
})
|
||||||
} else if (propConfig !== undefined) {
|
} else if (propConfig !== undefined) {
|
||||||
throw Error('hmmm')
|
throw Error('hmmm')
|
||||||
}
|
}
|
||||||
|
@ -871,11 +880,13 @@ export default class TheatreStudio implements IStudio {
|
||||||
forEachPropDeep(
|
forEachPropDeep(
|
||||||
defaultValue,
|
defaultValue,
|
||||||
(v, pathToProp) => {
|
(v, pathToProp) => {
|
||||||
|
console.log('comp compoumnD')
|
||||||
addStaticOrKeyframeProp(v, pathToProp)
|
addStaticOrKeyframeProp(v, pathToProp)
|
||||||
},
|
},
|
||||||
getPointerParts(prop).path,
|
getPointerParts(prop).path,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
console.log('singlerer', {defaultValue, path})
|
||||||
addStaticOrKeyframeProp(defaultValue, path)
|
addStaticOrKeyframeProp(defaultValue, path)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1052,7 +1052,7 @@ namespace stateEditors {
|
||||||
if (!track) return
|
if (!track) return
|
||||||
if (p.keyframes.length < 1)
|
if (p.keyframes.length < 1)
|
||||||
throw new Error(
|
throw new Error(
|
||||||
'holy shit, we are trying to add non-existing keyframes',
|
'holy shit, you are trying to add non-existing keyframes',
|
||||||
)
|
)
|
||||||
//const {keyframes} = track
|
//const {keyframes} = track
|
||||||
if (!override)
|
if (!override)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue