feat:currently remove rotationX,rotationY
This commit is contained in:
parent
2fb05f9dc1
commit
e2df869b52
@ -313,28 +313,6 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
|
|||||||
setRotation(prop.asNumber().toFloat());
|
setRotation(prop.asNumber().toFloat());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "rotationX":
|
|
||||||
if (isAnimating()) {
|
|
||||||
addAnimator(ObjectAnimator.ofFloat(
|
|
||||||
this,
|
|
||||||
name,
|
|
||||||
getRotationX(),
|
|
||||||
prop.asNumber().toFloat()));
|
|
||||||
} else {
|
|
||||||
setRotationX(prop.asNumber().toFloat());
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case "rotationY":
|
|
||||||
if (isAnimating()) {
|
|
||||||
addAnimator(ObjectAnimator.ofFloat(
|
|
||||||
this,
|
|
||||||
name,
|
|
||||||
getRotationY(),
|
|
||||||
prop.asNumber().toFloat()));
|
|
||||||
} else {
|
|
||||||
setRotationY(prop.asNumber().toFloat());
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -601,26 +579,6 @@ public abstract class ViewNode<T extends View> extends DoricContextHolder {
|
|||||||
return getNodeView().getRotation() / 180;
|
return getNodeView().getRotation() / 180;
|
||||||
}
|
}
|
||||||
|
|
||||||
@DoricMethod
|
|
||||||
public void setRotationX(float rotation) {
|
|
||||||
getNodeView().setRotationX(rotation * 180);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DoricMethod
|
|
||||||
public float getRotationX() {
|
|
||||||
return getNodeView().getRotationX() / 180;
|
|
||||||
}
|
|
||||||
|
|
||||||
@DoricMethod
|
|
||||||
public void setRotationY(float rotation) {
|
|
||||||
getNodeView().setRotationY(rotation * 180);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DoricMethod
|
|
||||||
public float getRotationY() {
|
|
||||||
return getNodeView().getRotationY() / 180;
|
|
||||||
}
|
|
||||||
|
|
||||||
@DoricMethod
|
@DoricMethod
|
||||||
public void setPivotX(float v) {
|
public void setPivotX(float v) {
|
||||||
getNodeView().setPivotX(v * getNodeView().getWidth());
|
getNodeView().setPivotX(v * getNodeView().getWidth());
|
||||||
|
@ -73,8 +73,6 @@ @interface DoricViewNode ()
|
|||||||
@property(nonatomic, copy) NSNumber *scaleX;
|
@property(nonatomic, copy) NSNumber *scaleX;
|
||||||
@property(nonatomic, copy) NSNumber *scaleY;
|
@property(nonatomic, copy) NSNumber *scaleY;
|
||||||
@property(nonatomic, copy) NSNumber *rotation;
|
@property(nonatomic, copy) NSNumber *rotation;
|
||||||
@property(nonatomic, copy) NSNumber *rotationX;
|
|
||||||
@property(nonatomic, copy) NSNumber *rotationY;
|
|
||||||
@property(nonatomic, copy) NSNumber *pivotX;
|
@property(nonatomic, copy) NSNumber *pivotX;
|
||||||
@property(nonatomic, copy) NSNumber *pivotY;
|
@property(nonatomic, copy) NSNumber *pivotY;
|
||||||
@end
|
@end
|
||||||
|
@ -59,12 +59,10 @@ export interface IView {
|
|||||||
* float [0,..1]
|
* float [0,..1]
|
||||||
*/
|
*/
|
||||||
pivotY?: number
|
pivotY?: number
|
||||||
|
/**
|
||||||
|
* rotation*PI
|
||||||
|
*/
|
||||||
rotation?: number
|
rotation?: number
|
||||||
|
|
||||||
rotationX?: number
|
|
||||||
|
|
||||||
rotationY?: number
|
|
||||||
/**----------transform----------*/
|
/**----------transform----------*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -331,12 +329,6 @@ export abstract class View implements Modeling, IView {
|
|||||||
|
|
||||||
@Property
|
@Property
|
||||||
rotation?: number
|
rotation?: number
|
||||||
|
|
||||||
@Property
|
|
||||||
rotationX?: number
|
|
||||||
|
|
||||||
@Property
|
|
||||||
rotationY?: number
|
|
||||||
/**----------transform----------*/
|
/**----------transform----------*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user