From: Mircea Kitsune Date: Thu, 24 May 2012 13:03:47 +0000 (+0300) Subject: Oops, forgot to enable cubic movement after testing X-Git-Tag: xonotic-v0.8.0~295^2~24 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7130e9653d2bf925fcdb2342dfdeced1c4264e9;p=xonotic%2Fxonotic-data.pk3dir.git Oops, forgot to enable cubic movement after testing --- diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 6ce77d5f5..5ac8f7348 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -188,11 +188,9 @@ void SUB_CalcMove_controller_think (void) traveltime = self.animstate_endtime - self.animstate_starttime; phasepos = (nexttick - self.animstate_starttime) / traveltime; // range: [0, 1] + phasepos = cubic_speedfunc(self.platmovetype_start, self.platmovetype_end, phasepos); - //phasepos = cubic_speedfunc(self.platmovetype_start, self.platmovetype_end, phasepos); - -/* - switch(self.platmovetype) + /* switch(self.platmovetype) { case 1: // linear break; @@ -213,8 +211,7 @@ void SUB_CalcMove_controller_think (void) // phasepos = sin(phasepos * (3.14159265 / 2)); phasepos = cubic_speedfunc(1.5, 0, phasepos); break; - } -*/ + } */ nextpos = self.origin + (delta * phasepos) + (delta2 * phasepos * phasepos); // derivative: delta + 2 * delta2 * phasepos (e.g. for angle positioning)