-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Remove song import global automation #5229
base: master
Are you sure you want to change the base?
Remove song import global automation #5229
Conversation
I think |
I tried that initially, but it didn't do anything. I'll try playing with it some more. |
@PhysSong okay it took some playing around with finding nodes, but I finally managed to get it working in DataFile. |
@Veratil Could you look into factory project files to see if any of them has global automation tracks? |
It will be okay if you've checked all demo projects and confirmed that there are no global automation tracks that you need to remove. |
I've gone through and found that some of the demos are still adding tracks that aren't linked to anything. I've updated the check to look for more than one There is one demo that has an unlinked automation track which has mulitple time nodes. @PhysSong Would you like me to go through and update all the demo files in this patch to the "newest" save file version then? |
If you want to do so, I'd recommend not touching files without global automations. I'm also okay if you do that in a separate pull request. |
Is there an easy way to read the |
|
Would it be okay to run |
That makes sense, but Qt will mix the order of attributes in XML tags. You can write a simple program to compress/decompress |
The result of |
@Veratil Are you going to finish this PR? |
Seconded. It would be superb if we could get this and step 3 (remove from the GUI) done for 1.3, and step 3 should be a quick and safe fix. |
I need to go through all the demo files still. |
@Veratil Bump. |
fa80de9
to
b20da4a
Compare
|
Regarding global automation clips with only one point: In many cases, they are just holding the model's value at time 0, but it's not guaranteed that they always do. |
The rest looks good to me. |
That's where thing are weird. Every global automation track that had one node was either a leftover that wasn't removed (file bloat because there wasn't a way to delete the global track), or didn't actually affect the model's value anymore (that value was saved as an attribute instead or didn't actually connect anymore). I can make the change to load it regardless, and I'll go through all the projects again to see if anything else pops up. |
I looked into this PR again. This PR will change some behaviors:
The first one sounds undesirable, but the rest don't sound too bad once #5230 is merged and #5223 (comment) is addressed. |
6d1f208
to
ef2284e
Compare
Rebased on master and (hopefully) fixed conflicts (correctly). Tested build and it seemed to be working. |
Looks like everything is still good in the demos. 👍 |
I think this is now the only one which probably needs to be addressed. @Veratil any opinions? |
I'm honestly not sure what you mean by priority here. If two automation clips are connected to the same object the global wins? |
Yes, I mean that case. Lines 841 to 844 in 1f30ffc
Here you can see the global automation track is the first element before removal. You can also see that TrackContainer::automatedValuesFromTracks uses the value from the last track connected to an object.
|
Okay I'll try to see what can be done for this to keep them in order. It never occurred to me that you could connect an object to multiple automations. |
Update? |
9d88099
to
455982f
Compare
It's ready for review now. |
Is the track order thing fixed now? |
14b9242
to
0b9db06
Compare
I fixed that in the latest commit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got a few concerns from the diff.
@Rossmaxx Factory projects probably requires re-saving again, I think |
Yeah, or unstaging them for now. |
I think we can defer re-saving to right before releasing 1.3 or any other sane point. Unstaging for now. I also manually removed related parts in factory templates and tutorials. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything looks good for now.
Removing global automation shouldn't have waited this long. |
Completes step 2 from #403
I've also removed the global automation
<track>
node from the templates. I noticed indefault.mpt
that there were<object>
nodes, but no relatedid
in any other nodes like there would normally be if there was a pattern connected. I believe this might be a bug in the automation editor.