80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

projectile: remove old rule and drawrule functions

Browse source
This commit is contained in:
Andrei Alexeyev 2023-02-24 01:15:58 +01:00
parent 95529edb59
commit 14c33cfff6
No known key found for this signature in database
GPG key ID: 72D26128040B9690
2 changed files with 0 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/projectile.c
View file

@ -664,56 +664,6 @@ int projectile_time(Projectile *p) {
return global.frames - p->birthtime;
}
int linear(Projectile *p, int t) { // sure is physics in here; a[0]: velocity
if(t == EVENT_DEATH) {
return ACTION_ACK;
}
p->angle = carg(p->args[0]);
if(t == EVENT_BIRTH) {
return ACTION_ACK;
}
p->pos = p->pos0 + p->args[0]*t;
return ACTION_NONE;
}
int accelerated(Projectile *p, int t) {
if(t == EVENT_DEATH) {
return ACTION_ACK;
}
p->angle = carg(p->args[0]);
if(t == EVENT_BIRTH) {
return ACTION_ACK;
}
p->pos += p->args[0];
p->args[0] += p->args[1];
return 1;
}
int asymptotic(Projectile *p, int t) { // v = a[0]*(a[1] + 1); a[1] -> 0
if(t == EVENT_DEATH) {
return ACTION_ACK;
}
p->angle = carg(p->args[0]);
if(t == EVENT_BIRTH) {
return ACTION_ACK;
}
p->args[1] *= 0.8;
p->pos += p->args[0]*(p->args[1] + 1);
return 1;
}
static inline bool proj_uses_spawning_effect(Projectile *proj, ProjFlags effect_flag) {
if(proj->type != PROJ_ENEMY) {
return false;
@ -1050,29 +1000,6 @@ ProjDrawRule pdraw_timeout_fade(float opacity0, float opacity1) {
return pdraw_timeout_scalefade(1+I, 1+I, opacity0, opacity1);
}
void Shrink(Projectile *p, int t, ProjDrawRuleArgs args) {
ProjDrawRule r = pdraw_timeout_scale(2.0f + 2.0if, 0.0f);
r.func(p, t, r.args);
}
void GrowFade(Projectile *p, int t, ProjDrawRuleArgs args) {
float grow_factor = creal(p->args[2]) ?: creal(p->args[1]);
ProjDrawRule r = pdraw_timeout_scalefade(0, (1+I) * (1 + grow_factor), 1, 0);
r.func(p, t, r.args);
}
void Fade(Projectile *p, int t, ProjDrawRuleArgs args) {
ProjDrawRule r = pdraw_timeout_fade(1, 0);
r.func(p, t, r.args);
}
void ScaleFade(Projectile *p, int t, ProjDrawRuleArgs args) {
float scale_min = creal(p->args[2]);
float scale_max = cimag(p->args[2]);
ProjDrawRule r = pdraw_timeout_scalefade(scale_min, scale_max, 1, 0);
r.func(p, t, r.args);
}
static void pdraw_petal_func(Projectile *p, int t, ProjDrawRuleArgs args) {
vec3 rot_axis = {
args[0].as_float[0],

12
src/projectile.h
View file

@ -37,7 +37,6 @@ typedef LIST_ANCHOR(Projectile) ProjectileList;
typedef LIST_INTERFACE(Projectile) ProjectileListInterface;
typedef int (*ProjRule)(Projectile *p, int t);
// typedef void (*ProjDrawRule)(Projectile *p, int t);
typedef bool (*ProjPredicate)(Projectile *p);
typedef union {
@ -251,17 +250,6 @@ void projectile_set_layer(Projectile *p, drawlayer_t layer) attr_nonnull_all;
bool clear_projectile(Projectile *proj, uint flags) attr_nonnull_all;
void kill_projectile(Projectile *proj) attr_nonnull_all;
int linear(Projectile *p, int t);
int accelerated(Projectile *p, int t);
int asymptotic(Projectile *p, int t);
#define DEPRECATED_DRAW_RULE attr_deprecated("")
void Shrink(Projectile *p, int t, ProjDrawRuleArgs) DEPRECATED_DRAW_RULE;
void Fade(Projectile *p, int t, ProjDrawRuleArgs) DEPRECATED_DRAW_RULE;
void GrowFade(Projectile *p, int t, ProjDrawRuleArgs) DEPRECATED_DRAW_RULE;
void ScaleFade(Projectile *p, int t, ProjDrawRuleArgs) DEPRECATED_DRAW_RULE;
ProjDrawRule pdraw_basic(void);
ProjDrawRule pdraw_timeout_scalefade_exp(cmplxf scale0, cmplxf scale1, float opacity0, float opacity1, float opacity_exp);
ProjDrawRule pdraw_timeout_scalefade(cmplxf scale0, cmplxf scale1, float opacity0, float opacity1);