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

first attempt to make hakkeros and lasers look better together

Browse source
This commit is contained in:
Andrei Alexeyev 2018-07-25 04:18:31 +03:00
parent 09eb5e8814
commit be0fc449bd
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
7 changed files with 78 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/gfx/hakkero.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 20 KiB

2
resources/gfx/hakkero.spr Normal file
View file

@ -0,0 +1,2 @@
w = 20
h = 20

4
resources/shader/marisa_hakkero.frag.glsl
View file

@ -4,6 +4,8 @@
void main(void) {
vec4 texel = texture(tex, texCoord);
fragColor.rgb = mix(color.rgb, vec3(0.0), texel.b)*texel.a;
fragColor.rgb = mix(color.rgb, vec3(0.0), texel.b) * texel.a;
fragColor.rgb += customParams.rgb * texel.r * texel.a * customParams.a;
// fragColor.rgb = mix(fragColor.rgb, customParams.rgb, customParams.a * texel.r * texel.a);
fragColor.a = texel.a * color.a;
}

2
resources/shader/marisa_hakkero.prog
View file

@ -1 +1 @@
glsl_objects = sprite_default.vert marisa_hakkero.frag
glsl_objects = marisa_hakkero.vert marisa_hakkero.frag

8
resources/shader/marisa_hakkero.vert.glsl Normal file
View file

@ -0,0 +1,8 @@
#version 330 core
#define SPRITE_OUT_COLOR
#define SPRITE_OUT_TEXCOORD
#define SPRITE_OUT_CUSTOM
#include "lib/sprite_default.vert.glslh"

16
src/plrmodes/marisa.c
View file

@ -74,15 +74,13 @@ void marisa_common_slave_visual(Enemy *e, int t, bool render) {
return;
}
r_mat_push();
ShaderProgram *current = r_shader_current();
r_mat_translate(creal(e->pos), cimag(e->pos), 0);
r_mat_rotate(0.05*t, 0, 0, 1);
r_shader("marisa_hakkero");
r_color4(0.2, 0.4, 0.5, 1);
draw_sprite_batched(0, 0, "hakkero");
r_shader_ptr(current);
r_mat_pop();
r_draw_sprite(&(SpriteParams) {
.sprite = "hakkero",
.shader = "marisa_hakkero",
.pos = { creal(e->pos), cimag(e->pos) },
.rotation.angle = t * 0.05,
.color = RGB(0.2, 0.4, 0.5),
});
}
void marisa_common_masterspark_draw(int t) {

66
src/plrmodes/marisa_a.c
View file

@ -145,6 +145,7 @@ static float set_alpha_dimmed(Uniform *u_alpha, float a) {
return set_alpha(u_alpha, a * a * 0.5);
}
/*
static void draw_magic_star(complex pos, double a, const Color *clr1, const Color *clr2) {
if(a <= 0) {
return;
@ -174,6 +175,7 @@ static void draw_magic_star(complex pos, double a, const Color *clr1, const Colo
r_shader("sprite_default");
}
*/
static void marisa_laser_slave_visual(Enemy *e, int t, bool render) {
if(!render) {
@ -182,14 +184,27 @@ static void marisa_laser_slave_visual(Enemy *e, int t, bool render) {
}
float laser_alpha = laser_renderer->args[0];
/*
float star_alpha = laser_renderer->args[1] * global_magicstar_alpha;
draw_magic_star(e->pos, 0.75 * star_alpha,
RGB(1.0, 0.1, 0.1),
RGB(0.0, 0.1, 1.1)
);
*/
marisa_common_slave_visual(e, t, render);
ShaderCustomParams shader_params;
shader_params.color = *RGBA(0.2, 0.4, 0.5, laser_renderer->args[1] * 0.75);
r_draw_sprite(&(SpriteParams) {
.sprite = "hakkero",
.shader = "marisa_hakkero",
.pos = { creal(e->pos), cimag(e->pos) },
.rotation.angle = t * 0.05,
.color = color_lerp(RGB(0.2, 0.4, 0.5), RGB(1.0, 1.0, 1.0), 0.25 * pow(psin(t / 6.0), 2) * laser_renderer->args[1]),
.shader_params = &shader_params,
});
if(laser_alpha <= 0) {
return;
@ -351,6 +366,26 @@ static int marisa_laser_renderer(Enemy *renderer, int t) {
#undef FOR_EACH_SLAVE
#undef FOR_EACH_REAL_SLAVE
static void marisa_laser_flash_draw(Projectile *p, int t) {
Animation *fire = get_ani("fire");
AniSequence *seq = get_ani_sequence(fire, "main");
Sprite *spr = animation_get_frame(fire, seq, p->birthtime);
Color *c = color_mul_scalar(COLOR_COPY(&p->color), 1 - t / p->timeout);
c->r *= (1 - t / p->timeout);
complex pos = p->pos;
pos += p->args[0] * 15;
r_draw_sprite(&(SpriteParams) {
.sprite_ptr = spr,
.color = c,
.pos = { creal(pos), cimag(pos)},
.rotation.angle = p->angle + M_PI/2,
.scale.both = 0.40,
});
}
static int marisa_laser_slave(Enemy *e, int t) {
if(t == EVENT_BIRTH) {
return 1;
@ -382,7 +417,20 @@ static int marisa_laser_slave(Enemy *e, int t) {
f = smoothreclamp(f, 0, 1, 0, 1);
float factor = (1.0 + 0.7 * psin(t/15.0)) * -(1-f) * !!angle;
trace_laser(e, -5 * cexp(I*(angle*factor + ld->lean + M_PI/2)), creal(e->args[1]));
complex dir = -cexp(I*(angle*factor + ld->lean + M_PI/2));
trace_laser(e, 5 * dir, creal(e->args[1]));
PARTICLE(
.size = 1+I,
.pos = e->pos,
.color = color_mul_scalar(RGBA(2, 0.2, 0.5, 0), 0.2),
.rule = linear,
.draw_rule = marisa_laser_flash_draw,
.timeout = 8,
.args = { dir, 0, 0.6 + 0.2*I, },
.flags = PFLAG_NOREFLECT,
// .layer = LAYER_PARTICLE_LOW,
);
}
return 1;
@ -398,12 +446,12 @@ static void masterspark_visual(Enemy *e, int t2, bool render) {
if(t < 1./6) {
fade = t*6;
fade = sqrt(fade);
fade = sqrt(fade);
}
if(t > 3./4) {
fade = 1-t*4 + 3;
fade *= fade;
fade *= fade;
}
r_mat_push();
@ -514,17 +562,17 @@ static void marisa_laser_respawn_slaves(Player *plr, short npow) {
}
if(npow >= 200) {
create_enemy_p(&plr->slaves, 25-5.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, 8-40.0*I, dmg, -M_PI/30, 0);
create_enemy_p(&plr->slaves, -25-5.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, -8-40.0*I, dmg, M_PI/30, 0);
create_enemy_p(&plr->slaves, 25-5.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, 9-40.0*I, dmg, -M_PI/30, 0);
create_enemy_p(&plr->slaves, -25-5.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, -9-40.0*I, dmg, M_PI/30, 0);
}
if(npow / 100 == 3) {
create_enemy_p(&plr->slaves, -30.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, -50.0*I, dmg, 0, 0);
create_enemy_p(&plr->slaves, -30.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, -55.0*I, dmg, 0, 0);
}
if(npow >= 400) {
create_enemy_p(&plr->slaves, 17-30.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, 4-45.0*I, dmg, M_PI/60, 0);
create_enemy_p(&plr->slaves, -17-30.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, -4-45.0*I, dmg, -M_PI/60, 0);
create_enemy_p(&plr->slaves, 17-30.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, 18-55.0*I, dmg, M_PI/60, 0);
create_enemy_p(&plr->slaves, -17-30.0*I, ENEMY_IMMUNE, marisa_laser_slave_visual, marisa_laser_slave, -18-55.0*I, dmg, -M_PI/60, 0);
}
for(e = plr->slaves.first; e; e = e->next) {