diff --git a/theatre/.eslintrc.js b/theatre/.eslintrc.js index 1cdf55b..141810a 100644 --- a/theatre/.eslintrc.js +++ b/theatre/.eslintrc.js @@ -2,21 +2,21 @@ const path = require('path') module.exports = { rules: { - //'no-relative-imports': [ - //'warn', - //{ - //aliases: [ - //{name: '@theatre/core', path: path.resolve(__dirname, './core/src')}, - //{ - //name: '@theatre/shared', - //path: path.resolve(__dirname, './shared/src'), - //}, - //{ - //name: '@theatre/studio', - //path: path.resolve(__dirname, './studio/src'), - //}, - //], - //}, - //], + 'no-relative-imports': [ + 'warn', + { + aliases: [ + {name: '@theatre/core', path: path.resolve(__dirname, './core/src')}, + { + name: '@theatre/shared', + path: path.resolve(__dirname, './shared/src'), + }, + { + name: '@theatre/studio', + path: path.resolve(__dirname, './studio/src'), + }, + ], + }, + ], }, } diff --git a/theatre/studio/src/TheatreStudio.ts b/theatre/studio/src/TheatreStudio.ts index 99fd5a8..813cf9a 100644 --- a/theatre/studio/src/TheatreStudio.ts +++ b/theatre/studio/src/TheatreStudio.ts @@ -558,6 +558,7 @@ export default class TheatreStudio implements IStudio { propAddress, propConfig, ) + console.log('inner setPropAsSequenced', performance.now()) }) }, __experimental_setPropAsStatic(prop: Pointer): void { @@ -692,6 +693,7 @@ export default class TheatreStudio implements IStudio { if (propConfig === undefined) { throw new Error('propConfig is undefined. so, yeah.') } + console.log({propConfig, propAddress}) stateEditors.coreByProject.historic.sheetsById.sequence.setPrimitivePropAsSequenced( propAddress, propConfig, @@ -840,6 +842,7 @@ export default class TheatreStudio implements IStudio { root.template.staticConfig, path, ) as PropTypeConfig + console.log(path, propConfig) const addStaticOrKeyframeProp = (value: T, path: PathToProp) => { const propAddress = {...root.address, pathToProp: path} @@ -862,6 +865,12 @@ export default class TheatreStudio implements IStudio { keyframes, }, ) + console.log({ + a: {...root.address}, + objectKey, + trackId, + keyframes, + }) } else if (propConfig !== undefined) { throw Error('hmmm') } @@ -871,11 +880,13 @@ export default class TheatreStudio implements IStudio { forEachPropDeep( defaultValue, (v, pathToProp) => { + console.log('comp compoumnD') addStaticOrKeyframeProp(v, pathToProp) }, getPointerParts(prop).path, ) } else { + console.log('singlerer', {defaultValue, path}) addStaticOrKeyframeProp(defaultValue, path) } } else { diff --git a/theatre/studio/src/store/stateEditors.ts b/theatre/studio/src/store/stateEditors.ts index 7e0cb08..da730b3 100644 --- a/theatre/studio/src/store/stateEditors.ts +++ b/theatre/studio/src/store/stateEditors.ts @@ -1052,7 +1052,7 @@ namespace stateEditors { if (!track) return if (p.keyframes.length < 1) 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 if (!override)