void() SUB_CalcAngleMoveDone;
//void() SUB_UseTargets;
-/*
-==================
-SUB_Remove
-
-Remove self
-==================
-*/
-void SUB_Remove()
-{
- remove (self);
-}
-
/*
==================
SUB_Friction
*/
.float friction;
void SUB_Friction (void)
-{
- self.nextthink = time;
- if(self.flags & FL_ONGROUND)
- self.velocity = self.velocity * (1 - frametime * self.friction);
+{SELFPARAM();
+ self.SUB_NEXTTHINK = time;
+ if(self.SUB_FLAGS & FL_ONGROUND)
+ self.SUB_VELOCITY = self.SUB_VELOCITY * (1 - frametime * self.friction);
}
/*
}
void SUB_SetFade_Think (void)
-{
+{SELFPARAM();
if(self.alpha == 0)
self.alpha = 1;
- self.think = SUB_SetFade_Think;
- self.nextthink = time;
+ self.SUB_THINK = SUB_SetFade_Think;
+ self.SUB_NEXTTHINK = time;
self.alpha -= frametime * self.fade_rate;
if (self.alpha < 0.01)
SUB_VanishOrRemove(self);
else
- self.nextthink = time;
+ self.SUB_NEXTTHINK = time;
}
/*
void SUB_SetFade (entity ent, float when, float fading_time)
{
ent.fade_rate = 1/fading_time;
- ent.think = SUB_SetFade_Think;
- ent.nextthink = when;
+ ent.SUB_THINK = SUB_SetFade_Think;
+ ent.SUB_NEXTTHINK = when;
}
/*
=============
SUB_CalcMove
-calculate self.velocity and self.nextthink to reach dest from
-self.origin traveling at speed
+calculate self.SUB_VELOCITY and self.SUB_NEXTTHINK to reach dest from
+self.SUB_ORIGIN traveling at speed
===============
*/
void SUB_CalcMoveDone (void)
-{
+{SELFPARAM();
// After moving, set origin to exact final destination
- setorigin (self, self.finaldest);
- self.velocity = '0 0 0';
- self.nextthink = -1;
+ SUB_SETORIGIN (self, self.finaldest);
+ self.SUB_VELOCITY = '0 0 0';
+ self.SUB_NEXTTHINK = -1;
if (self.think1)
self.think1 ();
}
.float platmovetype_turn;
void SUB_CalcMove_controller_think (void)
-{
+{SELFPARAM();
entity oldself;
float traveltime;
float phasepos;
vector nextpos;
delta = self.destvec;
delta2 = self.destvec2;
- if(time < self.animstate_endtime) {
+ if(time < self.animstate_endtime)
+ {
nexttick = time + PHYS_INPUT_FRAMETIME;
traveltime = self.animstate_endtime - self.animstate_starttime;
destangle_x = -destangle_x; // flip up / down orientation
// take the shortest distance for the angles
- self.owner.angles_x -= 360 * floor((self.owner.angles_x - destangle_x) / 360 + 0.5);
- self.owner.angles_y -= 360 * floor((self.owner.angles_y - destangle_y) / 360 + 0.5);
- self.owner.angles_z -= 360 * floor((self.owner.angles_z - destangle_z) / 360 + 0.5);
- angloc = destangle - self.owner.angles;
+ vector v = SUB_ANGLES(self.owner);
+ v.x -= 360 * floor((v.x - destangle_x) / 360 + 0.5);
+ v.y -= 360 * floor((v.y - destangle_y) / 360 + 0.5);
+ v.z -= 360 * floor((v.z - destangle_z) / 360 + 0.5);
+ SUB_ANGLES(self.owner) = v;
+ angloc = destangle - SUB_ANGLES(self.owner);
angloc = angloc * (1 / PHYS_INPUT_FRAMETIME); // so it arrives for the next frame
- self.owner.avelocity = angloc;
+ self.owner.SUB_AVELOCITY = angloc;
}
if(nexttick < self.animstate_endtime)
- veloc = nextpos - self.owner.origin;
+ veloc = nextpos - self.owner.SUB_ORIGIN;
else
- veloc = self.finaldest - self.owner.origin;
+ veloc = self.finaldest - self.owner.SUB_ORIGIN;
veloc = veloc * (1 / PHYS_INPUT_FRAMETIME); // so it arrives for the next frame
- self.owner.velocity = veloc;
+ self.owner.SUB_VELOCITY = veloc;
self.nextthink = nexttick;
- } else {
+ }
+ else
+ {
// derivative: delta + 2 * delta2 (e.g. for angle positioning)
oldself = self;
- self.owner.think = self.think1;
- self = self.owner;
+ self.owner.SUB_THINK = self.think1;
+ setself(self.owner);
remove(oldself);
- self.think();
+ self.SUB_THINK();
}
}
// 2 * control * t - 2 * control * t * t + destin * t * t
// 2 * control * t + (destin - 2 * control) * t * t
- controller.origin = org; // starting point
+ setorigin(controller, org);
control -= org;
destin -= org;
// 2 * control * t - 2 * control * t * t + destin * t * t
// 2 * control * t + (destin - 2 * control) * t * t
- controller.origin = org; // starting point
+ setorigin(controller, org);
destin -= org;
controller.destvec = destin; // end point
// TODO average too?
void SUB_CalcMove_Bezier (vector tcontrol, vector tdest, float tspeedtype, float tspeed, void() func)
-{
+{SELFPARAM();
float traveltime;
entity controller;
self.think1 = func;
self.finaldest = tdest;
- self.think = SUB_CalcMoveDone;
+ self.SUB_THINK = SUB_CalcMoveDone;
switch(tspeedtype)
{
default:
case TSPEED_START:
- traveltime = 2 * vlen(tcontrol - self.origin) / tspeed;
+ traveltime = 2 * vlen(tcontrol - self.SUB_ORIGIN) / tspeed;
break;
case TSPEED_END:
traveltime = 2 * vlen(tcontrol - tdest) / tspeed;
break;
case TSPEED_LINEAR:
- traveltime = vlen(tdest - self.origin) / tspeed;
+ traveltime = vlen(tdest - self.SUB_ORIGIN) / tspeed;
break;
case TSPEED_TIME:
traveltime = tspeed;
if (traveltime < 0.1) // useless anim
{
- self.velocity = '0 0 0';
- self.nextthink = self.ltime + 0.1;
+ self.SUB_VELOCITY = '0 0 0';
+ self.SUB_NEXTTHINK = self.SUB_LTIME + 0.1;
return;
}
controller.platmovetype = self.platmovetype;
controller.platmovetype_start = self.platmovetype_start;
controller.platmovetype_end = self.platmovetype_end;
- SUB_CalcMove_controller_setbezier(controller, self.origin, tcontrol, tdest);
+ SUB_CalcMove_controller_setbezier(controller, self.SUB_ORIGIN, tcontrol, tdest);
controller.finaldest = (tdest + '0 0 0.125'); // where do we want to end? Offset to overshoot a bit.
controller.animstate_starttime = time;
controller.animstate_endtime = time + traveltime;
controller.think = SUB_CalcMove_controller_think;
- controller.think1 = self.think;
+ controller.think1 = self.SUB_THINK;
// the thinking is now done by the controller
- self.think = SUB_NullThink; // for PushMove
- self.nextthink = self.ltime + traveltime;
+ self.SUB_THINK = SUB_NullThink; // for PushMove
+ self.SUB_NEXTTHINK = self.SUB_LTIME + traveltime;
// invoke controller
- self = controller;
+ setself(controller);
self.think();
- self = self.owner;
+ setself(self.owner);
}
void SUB_CalcMove (vector tdest, float tspeedtype, float tspeed, void() func)
-{
+{SELFPARAM();
vector delta;
float traveltime;
self.think1 = func;
self.finaldest = tdest;
- self.think = SUB_CalcMoveDone;
+ self.SUB_THINK = SUB_CalcMoveDone;
- if (tdest == self.origin)
+ if (tdest == self.SUB_ORIGIN)
{
- self.velocity = '0 0 0';
- self.nextthink = self.ltime + 0.1;
+ self.SUB_VELOCITY = '0 0 0';
+ self.SUB_NEXTTHINK = self.SUB_LTIME + 0.1;
return;
}
- delta = tdest - self.origin;
+ delta = tdest - self.SUB_ORIGIN;
switch(tspeedtype)
{
// The only currently implemented alternative movement is linear (value 1)
if (traveltime < 0.15 || (self.platmovetype_start == 1 && self.platmovetype_end == 1)) // is this correct?
{
- self.velocity = delta * (1/traveltime); // QuakeC doesn't allow vector/float division
- self.nextthink = self.ltime + traveltime;
+ self.SUB_VELOCITY = delta * (1/traveltime); // QuakeC doesn't allow vector/float division
+ self.SUB_NEXTTHINK = self.SUB_LTIME + traveltime;
return;
}
// now just run like a bezier curve...
- SUB_CalcMove_Bezier((self.origin + tdest) * 0.5, tdest, tspeedtype, tspeed, func);
+ SUB_CalcMove_Bezier((self.SUB_ORIGIN + tdest) * 0.5, tdest, tspeedtype, tspeed, func);
}
void SUB_CalcMoveEnt (entity ent, vector tdest, float tspeedtype, float tspeed, void() func)
-{
- entity oldself;
-
- oldself = self;
- self = ent;
-
- SUB_CalcMove (tdest, tspeedtype, tspeed, func);
-
- self = oldself;
+{SELFPARAM();
+ WITH(entity, self, ent, SUB_CalcMove(tdest, tspeedtype, tspeed, func));
}
/*
=============
SUB_CalcAngleMove
-calculate self.avelocity and self.nextthink to reach destangle from
+calculate self.SUB_AVELOCITY and self.SUB_NEXTTHINK to reach destangle from
self.angles rotating
-The calling function should make sure self.think is valid
+The calling function should make sure self.SUB_THINK is valid
===============
*/
void SUB_CalcAngleMoveDone (void)
-{
+{SELFPARAM();
// After rotating, set angle to exact final angle
self.angles = self.finalangle;
- self.avelocity = '0 0 0';
- self.nextthink = -1;
+ self.SUB_AVELOCITY = '0 0 0';
+ self.SUB_NEXTTHINK = -1;
if (self.think1)
self.think1 ();
}
// FIXME: I fixed this function only for rotation around the main axes
void SUB_CalcAngleMove (vector destangle, float tspeedtype, float tspeed, void() func)
-{
+{SELFPARAM();
vector delta;
float traveltime;
self.think1 = func;
self.finalangle = destangle;
- self.think = SUB_CalcAngleMoveDone;
+ self.SUB_THINK = SUB_CalcAngleMoveDone;
if (traveltime < 0.1)
{
- self.avelocity = '0 0 0';
- self.nextthink = self.ltime + 0.1;
+ self.SUB_AVELOCITY = '0 0 0';
+ self.SUB_NEXTTHINK = self.SUB_LTIME + 0.1;
return;
}
- self.avelocity = delta * (1 / traveltime);
- self.nextthink = self.ltime + traveltime;
+ self.SUB_AVELOCITY = delta * (1 / traveltime);
+ self.SUB_NEXTTHINK = self.SUB_LTIME + traveltime;
}
void SUB_CalcAngleMoveEnt (entity ent, vector destangle, float tspeedtype, float tspeed, void() func)
-{
- entity oldself;
-
- oldself = self;
- self = ent;
-
- SUB_CalcAngleMove (destangle, tspeedtype, tspeed, func);
-
- self = oldself;
+{SELFPARAM();
+ WITH(entity, self, ent, SUB_CalcAngleMove (destangle, tspeedtype, tspeed, func));
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff