X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fanim%2Fkeyframe.c;h=3bcda94e692939b733c668cf09e46b27e59364c6;hb=aa567df8fe657e09850b52f45dc7a939913ce7cb;hp=95fbf63ccefe5b15d5acc6a019db25a868d2fedf;hpb=5174b0f43d421554519d485b94893249cb095963;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/anim/keyframe.c b/qcsrc/menu/anim/keyframe.c index 95fbf63cc..3bcda94e6 100644 --- a/qcsrc/menu/anim/keyframe.c +++ b/qcsrc/menu/anim/keyframe.c @@ -6,7 +6,7 @@ CLASS(Keyframe) EXTENDS(Animation) ATTRIB(Keyframe, currentChild, entity, NULL) ATTRIB(Keyframe, firstChild, entity, NULL) ATTRIB(Keyframe, lastChild, entity, NULL) -ENDCLASS(Animation) +ENDCLASS(Keyframe) entity makeHostedKeyframe(entity, void(entity, float), float, float, float); entity makeKeyframe(entity, void(entity, float), float, float, float); float getNewChildStart(entity); @@ -31,7 +31,7 @@ entity makeKeyframe(entity obj, void(entity, float) objSetter, float animDuratio return me; } -entity addEasingKeyframe(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func) +entity Keyframe_addEasing(entity me, float animDurationTime, float animEnd, float(float, float, float, float) func) { entity other; other = makeEasing(me.object, me.setter, func, getNewChildStart(me), getNewChildDuration(me, animDurationTime), getNewChildValue(me), animEnd); @@ -65,7 +65,7 @@ float getNewChildValue(entity me) return me.startValue; } -void addAnimKeyframe(entity me, entity other) +void Keyframe_addAnim(entity me, entity other) { if(other.parent) error("Can't add already added anim!"); @@ -75,8 +75,7 @@ void addAnimKeyframe(entity me, entity other) other.parent = me; - entity f, l; - f = me.firstChild; + entity l; l = me.lastChild; if(l) @@ -92,7 +91,7 @@ void addAnimKeyframe(entity me, entity other) me.lastChild = other; } -float calcValueKeyframe(entity me, float tickTime, float animDuration, float animStartValue, float animDelta) +float Keyframe_calcValue(entity me, float tickTime, float animDuration, float animStartValue, float animDelta) { if (me.currentChild) if (me.currentChild.isFinished(me.currentChild))