Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add ColorRepresentation compatibility when create Tween #13

Merged
merged 2 commits into from
Sep 14, 2023
Merged

Add ColorRepresentation compatibility when create Tween #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9d3cf2
Add tween ColorRepresentation compatibility
agargaro Sep 14, 2023
84f14f2
Update types
agargaro Sep 14, 2023
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
13 changes: 7 additions & 6 deletions src/tweening/Actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { Color, Euler, MathUtils, Quaternion, Vector3 } from "three";
import { Color, ColorRepresentation, Euler, MathUtils, Quaternion, Vector3 } from "three";
import { DEFAULT_EASING, Easing, EasingFunction, Easings } from "./Easings";
import { RunningAction } from "./RunningTween";
import { Tween } from "./Tween";

const easings = new Easings();
export type AllowedTypes = number | Vector3 | Quaternion | Euler | Color;
export type AllowedTypes = number | Vector3 | Quaternion | Euler | ColorRepresentation;
export type Omitype<T, U> = { [P in keyof T as T[P] extends U ? never : P]: T[P] };
export type PickType<T, U> = { [P in keyof T as T[P] extends U ? P : never]: T[P] };
export type TransformType<T, U, V> = { [P in keyof T]: T[P] extends U ? T[P] | V : T[P] };
export type FilteredType<T> = PickType<Partial<TransformType<T, Vector3, number>>, AllowedTypes>;
export type TransformedTypes<T> = TransformType<TransformType<T, Color, ColorRepresentation>, Vector3, number>;
export type FilteredType<T> = PickType<Partial<TransformedTypes<T>>, AllowedTypes>;
export type Motion<T> = { [key in keyof FilteredType<T>]: FilteredType<T>[key] };

/**
Expand Down Expand Up @@ -138,7 +139,7 @@ export class ActionMotion<T> implements IAction<T> {
return typeof easing === "string" ? (easings[easing] ?? easings.linear) : easing;
}

private vector3(key: string, actionValue: Vector3, targetValue: Vector3): RunningAction<Vector3> {
private vector3(key: string, actionValue: Vector3 | number, targetValue: Vector3): RunningAction<Vector3> {
if (targetValue?.isVector3) {
const value = typeof actionValue === "number" ? new Vector3(actionValue, actionValue, actionValue) : actionValue;
return {
Expand Down Expand Up @@ -180,14 +181,14 @@ export class ActionMotion<T> implements IAction<T> {
}
}

private color(key: string, actionValue: Color, targetValue: Color): RunningAction<Color> {
private color(key: string, actionValue: ColorRepresentation, targetValue: Color): RunningAction<Color> {
if (targetValue?.isColor) {
return {
key,
time: this.time,
easing: this.getEasing(),
start: targetValue.clone(),
end: this.isBy ? actionValue.clone().add(targetValue) : actionValue,
end: this.isBy ? new Color(actionValue).add(targetValue) : new Color(actionValue),
callback: (start, end, alpha) => { targetValue.lerpColors(start, end, alpha) }
};
}
Expand Down