X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fanim%2Feasing.qc;h=3014fa80873a8aa479dcb8cb986c19bf54d9ea35;hb=f532317ada52b5363cb0b74bfbdd38f5015e290c;hp=080f390ba9314245cff104f5761d9976d455a6a6;hpb=c741e6b3f012aa525f23e1df30d1d933b383fbc5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/anim/easing.qc b/qcsrc/menu/anim/easing.qc
index 080f390ba..3014fa808 100644
--- a/qcsrc/menu/anim/easing.qc
+++ b/qcsrc/menu/anim/easing.qc
@@ -1,20 +1,8 @@
-#ifndef ANIM_EASING_H
-	#define ANIM_EASING_H
-	#include "animation.qc"
-	entity makeHostedEasing(entity, void(entity, float), float(float, float, float, float), float, float, float);
-	entity makeEasing(entity, void(entity, float), float(float, float, float, float), float, float, float, float);
-	float easingLinear(float, float, float, float);
-	float easingQuadIn(float, float, float, float);
-	float easingQuadOut(float, float, float, float);
-	float easingQuadInOut(float, float, float, float);
-	CLASS(Easing, Animation)
-		METHOD(Easing, calcValue, float(entity, float, float, float, float));
-		METHOD(Easing, setMath, void(entity, float(float, float, float, float)));
-		ATTRIB(Easing, math, float(float, float, float, float), easingLinear)
-	ENDCLASS(Easing)
-#endif
+#include "easing.qh"
+
+#include "../menu.qh"
+#include "keyframe.qh"
 
-#ifdef IMPLEMENTATION
 	entity makeHostedEasing(entity obj, void(entity, float) objSetter, float(float, float, float, float) func, float animDuration, float animStartValue, float animEnd)
 	{
 		entity this = makeEasing(obj, objSetter, func, time, animDuration, animStartValue, animEnd);
@@ -62,5 +50,3 @@
 		if (tickTime < (animDuration / 2)) return easingQuadIn(tickTime, (animDuration / 2), animStart, (animDelta / 2));
 		else return easingQuadOut((tickTime - (animDuration / 2)), (animDuration / 2), (animStart + (animDelta / 2)), (animDelta / 2));
 	}
-
-#endif