Skip to content

Commit dbd5209

Browse files
committed
Particles support animate now, update DEMO
1 parent c7b908e commit dbd5209

151 files changed

Lines changed: 1487 additions & 623 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AdvancedParticleSystem.resource_order

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,36 @@
77
{"name":"UsefulTools","order":2,"path":"folders/Limekys/UsefulTools.yy",},
88
],
99
"ResourceOrderSettings":[
10-
{"name":"oPointTarget","order":12,"path":"objects/oPointTarget/oPointTarget.yy",},
11-
{"name":"sParticleSmoke","order":3,"path":"sprites/sParticleSmoke/sParticleSmoke.yy",},
12-
{"name":"Room4","order":3,"path":"rooms/Room4/Room4.yy",},
13-
{"name":"o_part_emiter2","order":4,"path":"objects/o_part_emiter2/o_part_emiter2.yy",},
14-
{"name":"o_part_emiter_fire","order":6,"path":"objects/o_part_emiter_fire/o_part_emiter_fire.yy",},
10+
{"name":"fSmall","order":7,"path":"fonts/fSmall/fSmall.yy",},
11+
{"name":"o_gm_part_animate_stretch","order":16,"path":"objects/o_gm_part_animate_stretch/o_gm_part_animate_stretch.yy",},
12+
{"name":"o_gm_part_animate","order":14,"path":"objects/o_gm_part_animate/o_gm_part_animate.yy",},
13+
{"name":"o_gm_part_emitter","order":1,"path":"objects/o_gm_part_emitter/o_gm_part_emitter.yy",},
14+
{"name":"o_part_emitter_animate_delta","order":15,"path":"objects/o_part_emitter_animate_delta/o_part_emitter_animate_delta.yy",},
15+
{"name":"o_part_emitter_animate_stretch_delta","order":17,"path":"objects/o_part_emitter_animate_stretch_delta/o_part_emitter_animate_stretch_delta.yy",},
16+
{"name":"o_part_emitter_delta","order":3,"path":"objects/o_part_emitter_delta/o_part_emitter_delta.yy",},
17+
{"name":"o_part_emitter_fire_delta","order":7,"path":"objects/o_part_emitter_fire_delta/o_part_emitter_fire_delta.yy",},
18+
{"name":"o_part_emitter_fire","order":6,"path":"objects/o_part_emitter_fire/o_part_emitter_fire.yy",},
19+
{"name":"o_part_emitter_firework_delta","order":10,"path":"objects/o_part_emitter_firework_delta/o_part_emitter_firework_delta.yy",},
20+
{"name":"o_part_emitter_firework2_delta","order":11,"path":"objects/o_part_emitter_firework2_delta/o_part_emitter_firework2_delta.yy",},
21+
{"name":"o_part_emitter_rain_delta","order":12,"path":"objects/o_part_emitter_rain_delta/o_part_emitter_rain_delta.yy",},
22+
{"name":"o_part_emitter_wiggle","order":9,"path":"objects/o_part_emitter_wiggle/o_part_emitter_wiggle.yy",},
23+
{"name":"o_gm_part_emitter_wiggle","order":8,"path":"objects/o_gm_part_emitter_wiggle/o_gm_part_emitter_wiggle.yy",},
24+
{"name":"o_part_emitter","order":2,"path":"objects/o_part_emitter/o_part_emitter.yy",},
25+
{"name":"o_part_emitter2_delta","order":5,"path":"objects/o_part_emitter2_delta/o_part_emitter2_delta.yy",},
26+
{"name":"o_part_emitter2","order":4,"path":"objects/o_part_emitter2/o_part_emitter2.yy",},
27+
{"name":"oPointTarget","order":13,"path":"objects/oPointTarget/oPointTarget.yy",},
1528
{"name":"Room2","order":1,"path":"rooms/Room2/Room2.yy",},
16-
{"name":"sFireParticles","order":2,"path":"sprites/sFireParticles/sFireParticles.yy",},
17-
{"name":"o_part_emitter_wiggle","order":8,"path":"objects/o_part_emitter_wiggle/o_part_emitter_wiggle.yy",},
18-
{"name":"s_pixel_big","order":4,"path":"sprites/s_pixel_big/s_pixel_big.yy",},
1929
{"name":"Room3","order":2,"path":"rooms/Room3/Room3.yy",},
20-
{"name":"s_heart","order":1,"path":"sprites/s_heart/s_heart.yy",},
21-
{"name":"o_part_emiter_firework_delta","order":9,"path":"objects/o_part_emiter_firework_delta/o_part_emiter_firework_delta.yy",},
30+
{"name":"Room4","order":3,"path":"rooms/Room4/Room4.yy",},
31+
{"name":"Room5","order":4,"path":"rooms/Room5/Room5.yy",},
2232
{"name":"Room6","order":5,"path":"rooms/Room6/Room6.yy",},
23-
{"name":"o_part_emiter_fire_delta","order":7,"path":"objects/o_part_emiter_fire_delta/o_part_emiter_fire_delta.yy",},
24-
{"name":"o_old_part","order":1,"path":"objects/o_old_part/o_old_part.yy",},
25-
{"name":"o_part_emiter_delta","order":3,"path":"objects/o_part_emiter_delta/o_part_emiter_delta.yy",},
26-
{"name":"o_part_emiter","order":2,"path":"objects/o_part_emiter/o_part_emiter.yy",},
33+
{"name":"Room7","order":6,"path":"rooms/Room7/Room7.yy",},
34+
{"name":"s_heart","order":1,"path":"sprites/s_heart/s_heart.yy",},
35+
{"name":"s_pixel_big","order":4,"path":"sprites/s_pixel_big/s_pixel_big.yy",},
36+
{"name":"sFireParticles","order":2,"path":"sprites/sFireParticles/sFireParticles.yy",},
2737
{"name":"sFirework","order":5,"path":"sprites/sFirework/sFirework.yy",},
28-
{"name":"o_part_rain_delta","order":11,"path":"objects/o_part_rain_delta/o_part_rain_delta.yy",},
29-
{"name":"o_part_emiter_firework2_delta","order":10,"path":"objects/o_part_emiter_firework2_delta/o_part_emiter_firework2_delta.yy",},
3038
{"name":"sFirework2","order":6,"path":"sprites/sFirework2/sFirework2.yy",},
31-
{"name":"Room5","order":4,"path":"rooms/Room5/Room5.yy",},
32-
{"name":"fSmall","order":7,"path":"fonts/fSmall/fSmall.yy",},
33-
{"name":"o_part_emiter2_delta","order":5,"path":"objects/o_part_emiter2_delta/o_part_emiter2_delta.yy",},
39+
{"name":"sParticleSmoke","order":3,"path":"sprites/sParticleSmoke/sParticleSmoke.yy",},
40+
{"name":"sSmokePlume","order":8,"path":"sprites/sSmokePlume/sSmokePlume.yy",},
3441
],
3542
}

AdvancedParticleSystem.yyp

Lines changed: 30 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
part_sys = part_system_create();
2+
3+
part_emit = part_emitter_create(part_sys);
4+
part_emitter_region(part_sys, part_emit, x-20, x+20, y-20, y+20, ps_shape_rectangle, ps_distr_linear);
5+
6+
part = part_type_create();
7+
//part_type_gravity(part, 0.1, 270);
8+
part_type_life(part, 60, 120);
9+
part_type_size(part, 0.1, 0.1, 0, 0);
10+
part_type_orientation(part, 0, 0, 0, 0, 0);
11+
part_type_speed(part, 0.25, 0.25, 0, 0);
12+
part_type_direction(part, 0, 359, 0, 0);
13+
part_type_sprite(part, sSmokePlume, true, false, false);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/// @desc
2+
draw_text(4,4 + 16*2, "gm_anim: " +string(part_particles_count(part_sys)));

objects/o_old_part/o_old_part.yy renamed to objects/o_gm_part_animate/o_gm_part_animate.yy

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/// @desc
2+
part_type_destroy(part);
3+
part_emitter_destroy(part_sys, part_emit);
4+
part_system_destroy(part_sys);
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
part_sys = part_system_create();
2+
3+
part_emit = part_emitter_create(part_sys);
4+
part_emitter_region(part_sys, part_emit, x-20, x+20, y-20, y+20, ps_shape_rectangle, ps_distr_linear);
5+
6+
part = part_type_create();
7+
//part_type_gravity(part, 0.1, 270);
8+
part_type_life(part, 60, 120);
9+
part_type_size(part, 0.1, 0.1, 0, 0);
10+
part_type_orientation(part, 0, 0, 0, 0, 0);
11+
part_type_speed(part, 0.25, 0.25, 0, 0);
12+
part_type_direction(part, 0, 359, 0, 0);
13+
part_type_sprite(part, sSmokePlume, true, true, false);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/// @desc
2+
draw_text(4,4 + 16*4, "gm_anim_stretch: " +string(part_particles_count(part_sys)));

0 commit comments

Comments
 (0)