Commit 9245a765 authored by Tim Scheiber's avatar Tim Scheiber
Browse files

Merge branch 'develop' into feature/7-enemy-attack

parents 619ca8f9 13e5455c
particle: = particles/*.json
particle_def:test_particles = particles/test_particles.json
particle_sys:test_particles = particles/test_particle_system.json
particle_def: = particles/*.json
particle_sys: = particles/*.json
{
"Transform":{
"scale": {"x": 1.0, "y": 1.0, "z": 1.0}
},
"Particle_system": {
"cfg": "particle_sys:enemy_death_particle_system"
}
}
......@@ -3,7 +3,7 @@
},
"Directional_light": {
"source_radius": 1.0,
"intensity": 4000.0,
"intensity": 1000.0,
"color": {
"r": 1,
"g": 1,
......
......@@ -3,7 +3,7 @@ dummy
##----############
#| |---------##
#| p h |#
#| |---- b |#
#| |---- bbb |#
##----####| |#
##########| b G|#
###########-----##
......
{
"substance_id": "default",
"albedo_aid": "tetr_defaultmaterial_albedo.ktx",
"normal_aid": "tetr_defaultmaterial_normal.ktx",
"brdf_aid": "tetr_defaultmaterial_brdf.ktx",
"emission_aid": "default_white.ktx"
}
{
"emitters": [{
"spawn": [
{"particles_per_second": 300, "stddev":150, "time": 0.5},
{"particles_per_second": 0, "stddev":0, "time": 999}
],
"spawn_loop": false,
"size": {"x":0.2, "y":0.2},
"direction": {"mean":{"elevation":0.1, "azimuth":0}, "stddev":{"elevation":0.1, "azimuth":0.1}},
"ttl": {"mean": 3, "stddev": 0.0},
"velocity": {"mean": 15, "stddev": 8.0},
"emit_script_id": "comp_shader:particle_spawn_sphere",
"type_id": "particle_def:enemy_death_particles"
}],
"effectors": [
{
"force": 10,
"force_dir": {"y":-1},
"distance_decay": 0,
"scale_with_mass": false
}
]
}
{
"keyframes": [
{
"time": 0,
"color": {"mean":{"hue":0, "saturation":1, "alpha":20}, "stddev":{"hue":0.001}},
"size": {"mean": {"x": 0.5, "y":0.5, "z":0.5}, "stddev":{"x": 0.3, "y":0.3, "z":0.3}},
"rotation": {"mean":{"angle":0}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
"drag": 0.1
},
{
"time": 1,
"color": {"mean":{"hue":0, "saturation":1, "value":0.1, "alpha":0}, "stddev":{"hue":0.01}},
"size": {"mean": {"x": 0.01, "y":0.01, "z":0.01}},
"rotation": {"mean":{"angle":1}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
"drag": 1.0
}
],
"symmetric_scaling": false,
"rotate_with_velocity": false,
"blend": "solid",
"geometry": "mesh",
"model_id": "model:tetr",
"update_script_id": "comp_shader:particle_update_simple"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment