-
Notifications
You must be signed in to change notification settings - Fork 104
fix stopping and removing animclip when deleting them #578
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,6 +45,7 @@ | |
import java.io.IOException; | ||
import java.util.concurrent.ExecutionException; | ||
import javax.swing.Action; | ||
import javax.swing.SwingUtilities; | ||
import org.openide.actions.DeleteAction; | ||
import org.openide.actions.RenameAction; | ||
import org.openide.awt.Actions; | ||
|
@@ -162,19 +163,20 @@ public void stop() { | |
|
||
@Override | ||
public void destroy() throws IOException { | ||
super.destroy(); | ||
super.destroy(); | ||
final AnimComposer control = jmeControl.getLookup().lookup(AnimComposer.class); | ||
try { | ||
lookupContents.remove(this.animClip); | ||
lookupContents.remove(this); | ||
SceneApplication.getApplication().enqueue(() -> { | ||
control.removeAnimClip(this.animClip); | ||
return null; | ||
}).get(); | ||
setChanged(); | ||
} catch (InterruptedException | ExecutionException ex) { | ||
Exceptions.printStackTrace(ex); | ||
if (playing) { | ||
control.removeCurrentAction(AnimComposer.DEFAULT_LAYER); | ||
jmeControl.setAnimClip(null); | ||
|
||
} | ||
lookupContents.remove(JmeAnimClip.this.animClip); | ||
lookupContents.remove(this); | ||
SceneApplication.getApplication().enqueue( () -> { | ||
control.removeAnimClip(this.animClip); | ||
SwingUtilities.invokeLater(() -> jmeControl.refresh(false)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need to refresh after the anim has been removed from the control |
||
}); | ||
setChanged(); | ||
} | ||
|
||
@Override | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,7 @@ public void setGlobalSpeed(final float speed) { | |
Exceptions.printStackTrace(ex); | ||
} | ||
} | ||
|
||
@Override | ||
public Action[] getActions(boolean context) { | ||
return new Action[]{ | ||
|
@@ -149,4 +149,10 @@ public Node[] createNodes(Object key, DataObject key2, boolean cookie) { | |
JmeAnimClipChildren children = new JmeAnimClipChildren(this); | ||
return new Node[]{ new JmeAnimComposer((AnimComposer)key, children, key2)}; | ||
} | ||
|
||
@Override | ||
public void refresh(boolean immediate) { | ||
((JmeAnimClipChildren) jmeChildren).refreshChildren(immediate); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Refresh only happens if they are JmeSpatialChildren per default 🤷 |
||
super.refresh(immediate); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
This stops the animation if it's playing