From d3ed9143985fbb7799ed2d4baf5819bef37177de Mon Sep 17 00:00:00 2001 From: Wyatt Gillette Date: Tue, 27 Feb 2024 09:51:51 +0100 Subject: [PATCH] #2194 add ClipAction.getAnimClip() method, remove ClipAction.reset() method (#2195) Add the ClipAction.getAnimClip() method and remove ClipAction.reset() method --- .../jme3/anim/tween/action/ClipAction.java | 58 ++++++++++++++++--- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java b/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java index 9f5c855521..7c442bd122 100644 --- a/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java +++ b/jme3-core/src/main/java/com/jme3/anim/tween/action/ClipAction.java @@ -1,15 +1,52 @@ +/* + * Copyright (c) 2009-2024 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package com.jme3.anim.tween.action; -import com.jme3.anim.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.jme3.anim.AnimClip; +import com.jme3.anim.AnimTrack; +import com.jme3.anim.MorphTrack; +import com.jme3.anim.TransformTrack; +import com.jme3.anim.tween.action.BlendableAction; import com.jme3.anim.util.HasLocalTransform; import com.jme3.math.Transform; import com.jme3.scene.Geometry; import com.jme3.util.clone.Cloner; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; public class ClipAction extends BlendableAction { + private AnimClip clip; private Transform transform = new Transform(); @@ -59,8 +96,13 @@ private void interpolateMorphTrack(double t, MorphTrack track) { // } } - public void reset() { - + /** + * Gets the animation clip associated with this action. + * + * @return The animation clip + */ + public AnimClip getAnimClip() { + return clip; } @Override @@ -100,8 +142,8 @@ public ClipAction jmeClone() { try { ClipAction clone = (ClipAction) super.clone(); return clone; - } catch (CloneNotSupportedException exception) { - throw new RuntimeException(exception); + } catch (CloneNotSupportedException ex) { + throw new RuntimeException(ex); } }