Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

fix relative motion support #632

Merged
merged 5 commits into from
Jun 17, 2022
Merged

fix relative motion support #632

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42dcec1
fix relative motion support
jafu888 Jun 16, 2022
c3d1fea
support rotations angle
jafu888 Jun 16, 2022
c4d2d8c
clean up spline
jafu888 Jun 16, 2022
6621f56
resolve comments
jafu888 Jun 17, 2022
342b14e
remove Nullable
jafu888 Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions constraintlayout/core/src/main/java/androidx/constraintlayout/core/motion/Motion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import androidx.constraintlayout.core.motion.utils.KeyCache;
import androidx.constraintlayout.core.motion.utils.KeyCycleOscillator;
import androidx.constraintlayout.core.motion.utils.KeyFrameArray;
import androidx.constraintlayout.core.motion.utils.NonNull;
import androidx.constraintlayout.core.motion.utils.Nullable;
import androidx.constraintlayout.core.motion.utils.Rect;
import androidx.constraintlayout.core.motion.utils.SplineSet;
import androidx.constraintlayout.core.motion.utils.TimeCycleSplineSet;
Expand Down Expand Up @@ -78,9 +80,9 @@ public class Motion implements TypedValues {
private static final boolean DEBUG = false;
private static final boolean FAVOR_FIXED_SIZE_VIEWS = false;
MotionWidget mView;
int mId;
public String mId;
String mConstraintTag;
private int mCurveFitType = UNSET;
private int mCurveFitType = CurveFit.SPLINE;
private MotionPaths mStartMotionPath = new MotionPaths();
private MotionPaths mEndMotionPath = new MotionPaths();

Expand Down Expand Up @@ -125,7 +127,7 @@ public class Motion implements TypedValues {
private float mQuantizeMotionPhase = Float.NaN;
private DifferentialInterpolator mQuantizeMotionInterpolator = null;
private boolean mNoMovement = false;

Motion mRelativeMotion;
/**
* Get the view to pivot around
*
Expand Down Expand Up @@ -237,16 +239,23 @@ public float getFinalHeight() {
*
* @return the view id of the view this is in polar mode to or -1 if not in polar
*/
public int getAnimateRelativeTo() {
@Nullable
public String getAnimateRelativeTo() {
return mStartMotionPath.mAnimateRelativeTo;
}

/**
* @TODO: add description
* set up the motion to be relative to this other motionController
*/
public void setupRelative(Motion motionController) {
mStartMotionPath.setupRelative(motionController, motionController.mStartMotionPath);
mEndMotionPath.setupRelative(motionController, motionController.mEndMotionPath);
mRelativeMotion = motionController;
}
private void setupRelative() {
if (mRelativeMotion == null) {
return;
}
mStartMotionPath.setupRelative(mRelativeMotion, mRelativeMotion.mStartMotionPath);
mEndMotionPath.setupRelative(mRelativeMotion, mRelativeMotion.mEndMotionPath);
}

public float getCenterX() {
Expand Down Expand Up @@ -673,6 +682,8 @@ public void setup(int parentWidth,
HashSet<String> cycleAttributes = new HashSet<>(); // attributes we need to oscillate
HashMap<String, Integer> interpolation = new HashMap<>();
ArrayList<MotionKeyTrigger> triggerList = null;

setupRelative();
if (DEBUG) {
if (mKeyList == null) {
Utils.log(TAG, ">>>>>>>>>>>>>>> mKeyList==null");
Expand Down Expand Up @@ -934,6 +945,7 @@ public void setup(int parentWidth,
mSpline[i + 1] = CurveFit.get(mCurveFitType, timePoints, splinePoints);
}

// Spline for positions
mSpline[0] = CurveFit.get(mCurveFitType, timePoint, splineData);
// --------------------------- SUPPORT ARC MODE --------------
if (points[0].mPathMotionArc != UNSET) {
Expand Down Expand Up @@ -1722,7 +1734,10 @@ public boolean setValue(int id, String value) {
mQuantizeMotionInterpolator = getInterpolator(SPLINE_STRING, value, 0);
return true;
}

if ( MotionType.TYPE_ANIMATE_RELATIVE_TO == id) {
mStartMotionPath.mAnimateRelativeTo = value;
return true;
}
return false;
}

Expand Down Expand Up @@ -1763,4 +1778,9 @@ public void setStaggerOffset(float staggerOffset) {
public float getMotionStagger() {
return mMotionStagger;
}

public void setIdString(String stringId) {
mId = stringId;
mStartMotionPath.mId = mId;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about mEndMotionPath.mId = mId?
Is it not relevant there?

}
}
14 changes: 10 additions & 4 deletions constraintlayout/core/src/main/java/androidx/constraintlayout/core/motion/MotionPaths.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public class MotionPaths implements Comparable<MotionPaths> {
public static final int CARTESIAN = MotionKeyPosition.TYPE_CARTESIAN;
public static final int SCREEN = MotionKeyPosition.TYPE_SCREEN;
static String[] sNames = {"position", "x", "y", "width", "height", "pathRotate"};
public String mId;
Easing mKeyFrameEasing;
int mDrawPath = 0;
float mTime;
Expand All @@ -58,7 +59,7 @@ public class MotionPaths implements Comparable<MotionPaths> {
float mPathRotate = Float.NaN;
float mProgress = Float.NaN;
int mPathMotionArc = UNSET;
int mAnimateRelativeTo = UNSET;
String mAnimateRelativeTo = null;
float mRelativeAngle = Float.NaN;
Motion mRelativeToController = null;

Expand Down Expand Up @@ -121,7 +122,7 @@ public MotionPaths(int parentWidth,
MotionKeyPosition c,
MotionPaths startTimePoint,
MotionPaths endTimePoint) {
if (startTimePoint.mAnimateRelativeTo != UNSET) {
if (startTimePoint.mAnimateRelativeTo != null) {
initPolar(parentWidth, parentHeight, c, startTimePoint, endTimePoint);
return;
}
Expand Down Expand Up @@ -157,6 +158,9 @@ void initPolar(int parentWidth,
mHeight = (int) (s.mHeight + scaleY * scaleHeight);
float startfactor = 1 - position;
float endfactor = position;
Utils.log(mId+": start "+s.mX+","+s.mY);
Utils.log(mId+": end "+e.mX+","+e.mY);
Utils.log(mId+": mAnimateRelativeTo "+e.mAnimateRelativeTo);
switch (c.mPositionType) {
case MotionKeyPosition.TYPE_SCREEN:
this.mX = Float.isNaN(c.mPercentX) ? (position * (e.mX - s.mX) + s.mX)
Expand Down Expand Up @@ -198,7 +202,6 @@ public void setupRelative(Motion mc, MotionPaths relative) {
mY = (float) (Math.atan2(dy, dx) + Math.PI / 2);
} else {
mY = (float) Math.toRadians(mRelativeAngle);

}
}

Expand Down Expand Up @@ -926,7 +929,10 @@ public void applyParameters(MotionWidget c) {
point.mDrawPath = c.mMotion.mDrawPath;
point.mAnimateCircleAngleTo = c.mMotion.mAnimateCircleAngleTo;
point.mProgress = c.mPropertySet.mProgress;
point.mRelativeAngle = 0; // c.layout.circleAngle;
if (c.mWidgetFrame != null && c.mWidgetFrame.widget != null) {
point.mRelativeAngle = c.mWidgetFrame.widget.mCircleConstraintAngle;
}

Set<String> at = c.getCustomAttributeNames();
for (String s : at) {
CustomVariable attr = c.getCustomAttribute(s);
Expand Down
9 changes: 5 additions & 4 deletions constraintlayout/core/src/main/java/androidx/constraintlayout/core/motion/MotionWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class MotionWidget implements TypedValues {
* @DoNotShow
*/
public static class Motion {
public int mAnimateRelativeTo = UNSET;
public String mAnimateRelativeTo = null;
public int mAnimateCircleAngleTo = 0;
public String mTransitionEasing = null;
public int mPathMotionArc = UNSET;
Expand Down Expand Up @@ -166,6 +166,10 @@ public boolean setValue(int id, float value) {

@Override
public boolean setValue(int id, String value) {
if (id == MotionType.TYPE_ANIMATE_RELATIVE_TO) {
mMotion.mAnimateRelativeTo = value;
return true;
}
return setValueMotion(id, value);
}

Expand All @@ -179,9 +183,6 @@ public boolean setValue(int id, boolean value) {
*/
public boolean setValueMotion(int id, int value) {
switch (id) {
case MotionType.TYPE_ANIMATE_RELATIVE_TO:
mMotion.mAnimateRelativeTo = value;
break;
case MotionType.TYPE_ANIMATE_CIRCLEANGLE_TO:
mMotion.mAnimateCircleAngleTo = value;
break;
Expand Down
41 changes: 39 additions & 2 deletions constraintlayout/core/src/main/java/androidx/constraintlayout/core/state/Transition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,11 +710,31 @@ public void addCustomColor(int state, String widgetId, String property, int colo
public void updateFrom(ConstraintWidgetContainer container, int state) {
final ArrayList<ConstraintWidget> children = container.getChildren();
final int count = children.size();
WidgetState [] states = new WidgetState[count];
boolean relative = false;
for (int i = 0; i < count; i++) {
ConstraintWidget child = children.get(i);
WidgetState widgetState = getWidgetState(child.stringId, null, state);
states[i] = widgetState;
widgetState.update(child, state);
String id = widgetState.getPathRelativeId();
if (id != null) {
relative = true;
}
}
if (relative) {
for (int i = 0; i < count; i++) {
ConstraintWidget child = children.get(i);
WidgetState widgetState = getWidgetState(child.stringId, null, state);
states[i] = widgetState;
String id = widgetState.getPathRelativeId();
if (id != null) {
widgetState.setPathRelative(getWidgetState(id, null, state));

}
}
}

calcStagger();
}

Expand Down Expand Up @@ -844,6 +864,7 @@ static class WidgetState {
WidgetFrame mEnd;
WidgetFrame mInterpolated;
Motion mMotionControl;
boolean mNeedSetup = true;
MotionWidget mMotionWidgetStart;
MotionWidget mMotionWidgetEnd;
MotionWidget mMotionWidgetInterpolated;
Expand Down Expand Up @@ -886,13 +907,23 @@ public void update(ConstraintWidget child, int state) {
mStart.update(child);
mMotionWidgetStart.updateMotion(mMotionWidgetStart);
mMotionControl.setStart(mMotionWidgetStart);
mNeedSetup = true;
} else if (state == END) {
mEnd.update(child);
mMotionControl.setEnd(mMotionWidgetEnd);
mNeedSetup = true;
}
mParentWidth = -1;
}

/**
* Return the id of the widget to animate relative to
* @return id of widget or null
*/
String getPathRelativeId() {
return mMotionControl.getAnimateRelativeTo();
}

public WidgetFrame getFrame(int type) {
if (type == START) {
return mStart;
Expand All @@ -909,14 +940,20 @@ public void interpolate(int parentWidth,
// TODO only update if parentHeight != mParentHeight || parentWidth != mParentWidth) {
mParentHeight = parentHeight;
mParentWidth = parentWidth;
mMotionControl.setup(parentWidth, parentHeight, 1, System.nanoTime());

if (mNeedSetup) {
mMotionControl.setup(parentWidth, parentHeight, 1, System.nanoTime());
mNeedSetup = false;
}
WidgetFrame.interpolate(parentWidth, parentHeight,
mInterpolated, mStart, mEnd, transition, progress);
mInterpolated.interpolatedPos = progress;
mMotionControl.interpolate(mMotionWidgetInterpolated,
progress, System.nanoTime(), mKeyCache);
}

public void setPathRelative(WidgetState widgetState) {
mMotionControl.setupRelative( widgetState.mMotionControl);
}
}

static class KeyPosition {
Expand Down
3 changes: 2 additions & 1 deletion ...raintlayout/core/src/main/java/androidx/constraintlayout/core/state/TransitionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import androidx.constraintlayout.core.motion.utils.TypedBundle;
import androidx.constraintlayout.core.motion.utils.TypedValues;
import androidx.constraintlayout.core.motion.utils.Utils;
import androidx.constraintlayout.core.parser.CLArray;
import androidx.constraintlayout.core.parser.CLContainer;
import androidx.constraintlayout.core.parser.CLElement;
Expand Down Expand Up @@ -133,7 +134,7 @@ private static int map(String val, String... types) {
private static void map(TypedBundle bundle, int type, String val, String... types) {
for (int i = 0; i < types.length; i++) {
if (types[i].equals(val)) {
bundle.add(TypedValues.PositionType.TYPE_PATH_MOTION_ARC, i);
bundle.add(type, i);
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions ...intlayout/core/src/main/java/androidx/constraintlayout/core/widgets/ConstraintWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import androidx.constraintlayout.core.Cache;
import androidx.constraintlayout.core.LinearSystem;
import androidx.constraintlayout.core.SolverVariable;
import androidx.constraintlayout.core.motion.utils.Utils;
import androidx.constraintlayout.core.state.WidgetFrame;
import androidx.constraintlayout.core.widgets.analyzer.ChainRun;
import androidx.constraintlayout.core.widgets.analyzer.HorizontalWidgetRun;
Expand Down Expand Up @@ -361,7 +362,7 @@ public boolean hasResolvedTargets(int orientation, int size) {
float mResolvedDimensionRatio = 1.0f;

private int[] mMaxDimension = {Integer.MAX_VALUE, Integer.MAX_VALUE};
private float mCircleConstraintAngle = 0;
public float mCircleConstraintAngle = Float.NaN;
private boolean mHasBaseline = false;
private boolean mInPlaceholder;

Expand Down Expand Up @@ -602,7 +603,7 @@ public void reset() {
mCenterY.reset();
mCenter.reset();
mParent = null;
mCircleConstraintAngle = 0;
mCircleConstraintAngle = Float.NaN;
mWidth = 0;
mHeight = 0;
mDimensionRatio = 0;
Expand Down Expand Up @@ -676,7 +677,7 @@ private void serializeAnchor(StringBuilder ret, String side, ConstraintAnchor a)
}

private void serializeCircle(StringBuilder ret, ConstraintAnchor a, float angle) {
if (a.mTarget == null) {
if (a.mTarget == null || Float.isNaN(angle)) {
return;
}

Expand Down Expand Up @@ -3583,6 +3584,8 @@ public void copy(ConstraintWidget src, HashMap<ConstraintWidget, ConstraintWidge

mMaxDimension = Arrays.copyOf(src.mMaxDimension, src.mMaxDimension.length);
mCircleConstraintAngle = src.mCircleConstraintAngle;
Utils.logStack(" copying angle = "+mCircleConstraintAngle, 5);

mHasBaseline = src.mHasBaseline;
mInPlaceholder = src.mInPlaceholder;

Expand Down
Loading