projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move texture compiler to native code
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_effects.c
diff --git
a/player_effects.c
b/player_effects.c
index 2bfc3bf3bcfcaad691c4ec16471a079a3e64eac1..981c23218d905c52bd5fd680353ff9c812755788 100644
(file)
--- a/
player_effects.c
+++ b/
player_effects.c
@@
-1,7
+1,10
@@
+#include "player.h"
#include "player_effects.h"
#include "player_effects.h"
+#include "player_render.h"
#include "particle.h"
#include "particle.h"
-static void effect_blink_apply( effect_blink *ef, player_pose *pose, f32 dt ){
+void effect_blink_apply( effect_blink *ef, player_pose *pose, f32 dt )
+{
if( ef->t < 0.0f ){
ef->t = (1.0f-powf(vg_randf64(&vg.rand),4.0f))*4.0f;
ef->l = 0.08f;
if( ef->t < 0.0f ){
ef->t = (1.0f-powf(vg_randf64(&vg.rand),4.0f))*4.0f;
ef->l = 0.08f;
@@
-13,11
+16,12
@@
static void effect_blink_apply( effect_blink *ef, player_pose *pose, f32 dt ){
ef->l -= dt;
}
ef->l -= dt;
}
-static void effect_spark_apply( effect_spark *ef, v3f co, v3f v, f32 dt ){
+void effect_spark_apply( effect_spark *ef, v3f co, v3f v, f32 dt )
+{
if( !ef->colour ) return;
if( ef->t < 0.0f ){
if( !ef->colour ) return;
if( ef->t < 0.0f ){
- ef->t = 0.05f+vg_randf64(&vg.rand)*0.1f;
+ ef->t
+
= 0.05f+vg_randf64(&vg.rand)*0.1f;
v3f dir;
v3_copy( v, dir );
v3f dir;
v3_copy( v, dir );