Merge pull request #10 from diffusionstudio/konstantin/fix/remove-degrees-keyframe-option

removed degrees from Keyframe object and unit tests

Author: k9p5

src/clips/mixins/visual.decorator.spec.ts

@@ -555,7 +555,7 @@ describe('The visualize decorator', () => {
 		expect(clip.view.angle).toBe(93);
 		expect(angleSpy).toHaveBeenCalledOnce();
 
-		clip.rotation = new Keyframe([0, 60], [0, 180], { type: 'degrees' })
+		clip.rotation = new Keyframe([0, 60], [0, 180])
 
 		clip.update(new Timestamp(1000));
 		expect(clip.view.angle).toBe(90);

src/clips/mixins/visual.deserializers.spec.ts

@@ -17,7 +17,7 @@ describe('Deserializer1D', () => {
 	});
 
 	it('should desialize Keyframes', () => {
-		const keyframe = new Keyframe([30, 60], [30, 80], { extrapolate: 'extend', type: 'degrees' });
+		const keyframe = new Keyframe([30, 60], [30, 80], { extrapolate: 'extend' });
 		const data = JSON.parse(JSON.stringify(keyframe));
 
 		const rot = Deserializer1D.fromJSON(data);
@@ -31,7 +31,7 @@ describe('Deserializer1D', () => {
 		expect(rot.output[1]).toBe(80);
 
 		expect(rot.options.extrapolate).toBe('extend');
-		expect(rot.options.type).toBe('degrees');
+		expect(rot.options.type).toBe('number');
 	});
 
 	it('should not desialize functions', () => {
@@ -64,7 +64,7 @@ describe('Deserializer2D', () => {
 
 	it('should desialize nested Keyframes', () => {
 		const keyframes = {
-			x: new Keyframe([30, 60], [30, 80], { extrapolate: 'extend', type: 'degrees' }),
+			x: new Keyframe([30, 60], [30, 80], { extrapolate: 'extend' }),
 			y: new Keyframe([90, 120], ['#000000', '#FFFFFF'], { type: 'color' })
 		};
 		const data = JSON.parse(JSON.stringify(keyframes));
@@ -80,7 +80,7 @@ describe('Deserializer2D', () => {
 		expect(pos.x.output[1]).toBe(80);
 
 		expect(pos.x.options.extrapolate).toBe('extend');
-		expect(pos.x.options.type).toBe('degrees');
+		expect(pos.x.options.type).toBe('number');
 
 		expect(pos.y).toBeInstanceOf(Keyframe);
 

src/models/keyframe.spec.ts

@@ -61,37 +61,6 @@ describe('Keyframe', () => {
     expect(keyframe1.value(f(18))).toBe('#000000');
   });
 
-  it('should interpolate degree values correctly', () => {
-    const keyframe0 = new Keyframe([0, 12], [0, 360 * 2], { type: "degrees" });
-    expect(keyframe0.value(f(-3))).toBe(0);
-    expect(keyframe0.value(f(0))).toBe(0);
-    expect(keyframe0.value(f(3))).toBe(180);
-    expect(keyframe0.value(f(6))).toBe(0);
-    expect(keyframe0.value(f(9))).toBe(180);
-    expect(keyframe0.value(f(12))).toBe(0);
-    expect(keyframe0.value(f(15))).toBe(0);
-
-    const keyframe1 = new Keyframe([6, 12, 18], [180, 360, 360 * 2], { type: "degrees" });
-    expect(keyframe1.value(f(0))).toBe(180);
-    expect(keyframe1.value(f(6))).toBe(180);
-    expect(keyframe1.value(f(9))).toBe(270);
-    expect(keyframe1.value(f(12))).toBe(0);
-    expect(keyframe1.value(f(15))).toBe(180);
-    expect(keyframe1.value(f(18))).toBe(0);
-    expect(keyframe1.value(f(21))).toBe(0);
-  });
-
-  it('should interpolate degree values correctly with extend', () => {
-    const keyframe = new Keyframe([0, 12], [0, 360 * 2], { extrapolate: "extend", type: "degrees" });
-    expect(keyframe.value(f(-3))).toBe(-180);
-    expect(keyframe.value(f(0))).toBe(0);
-    expect(keyframe.value(f(3))).toBe(180);
-    expect(keyframe.value(f(6))).toBe(0);
-    expect(keyframe.value(f(9))).toBe(180);
-    expect(keyframe.value(f(12))).toBe(0);
-    expect(keyframe.value(f(15))).toBe(180);
-  });
-
   it('should not clamp values when extrapolate is set to "extend"', () => {
     const keyframe = new Keyframe([0, 12], [0, 100], { extrapolate: "extend" });
     expect(keyframe.value(f(-6))).toBe(-50);

src/models/keyframe.ts

@@ -100,10 +100,6 @@ export class Keyframe<T extends number | string> implements Omit<Serializer, 'id
     const easedT = utils.easingFunctions[this.options.easing](t);
 
     if (typeof outputStart === 'number' && typeof outputEnd === 'number') {
-      if (this.options.type === "degrees") {
-        const totalDegrees = outputEnd - outputStart;
-        return (outputStart + totalDegrees * easedT) % 360 as T;
-      }
       return utils.lerp(outputStart, outputEnd, easedT) as T;
     }
     if (typeof outputStart === 'string' && typeof outputEnd === 'string') {

src/models/keyframe.types.ts

@@ -25,10 +25,9 @@ export type KeyframeOptions = {
    * Specifies the type of output values.
    * - "number": Output values are numbers.
    * - "color": Output values are colors in hex format.
-   * - "degrees": Output values are angles in degrees.
    * @default "number"
    */
-  type?: "number" | "color" | "degrees";
+  type?: "number" | "color";
 
   /**
    * An optional easing function to apply to the interpolation.