Commit f926939c authored by Florian Oetke's avatar Florian Oetke
Browse files

Merge branch 'develop' into 'master'

GDW WS18/19

See merge request !1
parents f9699ca1 e85248b7
Pipeline #3151 passed with stage
in 12 minutes and 45 seconds
{
"emitters": [{
"spawn": [
{"particles_per_second": 20000, "stddev":0, "time": 1},
{"particles_per_second": 0, "stddev":0, "time": 20}
],
"spawn_loop": true,
"size": {"x":0, "y":0},
"direction": {"mean":{"elevation":0.85, "azimuth":-0.25}, "stddev":{"elevation":0.1, "azimuth":0.1}},
"ttl": {"mean": 4, "stddev": 0.5},
"velocity": {"mean": 32, "stddev": 8.0},
"emit_script_id": "comp_shader:particle_spawn_sphere",
"type_id": "particle_def:test_particles"
}],
"effectors": [
{
"force": 10,
"force_dir": {"y":-1},
"distance_decay": 0,
"scale_with_mass": false
}
]
}
{
"keyframes": [
{
"time": 0,
"color": {"mean":{"hue":0, "saturation":1}, "stddev":{"hue":0.5}},
"size": {"mean": {"x": 0.05, "y":0.15, "z":0.04}, "stddev":{"x": 0.04, "y":0.02, "z":0.02}},
"rotation": {"mean":{"angle":0}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
"drag": 0.1
},
{
"time": 4,
"color": {"mean":{"hue":0, "saturation":1}, "stddev":{"hue":1}},
"size": {"mean": {"x": 0.01, "y":0.1, "z":0.01}},
"rotation": {"mean":{"angle":1}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
"drag": 1.0
}
],
"symmetric_scaling": true,
"rotate_with_velocity": false,
"blend": "solid",
/*
"geometry": "billboard",
"material_id": "mat:billboard_material.msf",
*/
"geometry": "mesh",
"model_id": "model:cube",
"update_script_id": "comp_shader:particle_update_simple"
}
{
"keyframes": [
{
"time": 0.1,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0, "y":0, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.2,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.2, "y":0, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.3,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.4, "y":0, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.4,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.6, "y":0, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.5,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.8, "y":0, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.6,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0, "y":0.333, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.7,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.2, "y":0.333, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.8,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.4, "y":0.333, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 0.9,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.6, "y":0.333, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 1,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.8, "y":0.333, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 1.1,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0, "y":0.666, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 1.2,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.2, "y":0.666, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 1.3,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.4, "y":0.666, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 1.4,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.6, "y":0.666, "z":0.2, "w":0.333},
"drag": 0.1
},
{
"time": 1.5,
"color": {"mean":{"value":0.8, "alpha":0.5}, "stddev":{"value":0.2}},
"size": {"mean": {"x": 0.5}, "stddev":{"x": 0.1}},
"rotation": {"mean":{"angle":0}, "stddev":{"angle": 1}},
"clip_rect": {"x":0.8, "y":0.666, "z":0.2, "w":0.333},
"drag": 0.1
}
],
"loop_keyframe_time": 1.5,
"symmetric_scaling": true,
"rotate_with_velocity": false,
"blend": "transparent",
"geometry": "billboard",
"material_id": "tex:smoke_particle.ktx",
"update_script_id": "comp_shader:particle_update_simple"
}
{
"emitters": [{
"spawn": [
{"particles_per_second": 200, "stddev":5, "time": 1}
],
"spawn_loop": true,
"size": {"x":0, "y":0},
"direction": {"mean":{"elevation":-1, "azimuth":0}, "stddev":{"elevation":0.4, "azimuth":0.4}},
"ttl": {"mean": 30, "stddev": 0},
"velocity": {"mean": 0.01, "stddev": 0.008},
"emit_script_id": "comp_shader:particle_spawn_sphere",
"type_id": "particle_def:test_smoke_particles"
}]
}
......@@ -32,7 +32,9 @@
"F3": {"type":"once", "action":"playback"},
"Space": {"type":"once", "action":"pause"},
"F11": {"type":"once", "action":"toggle_ui"}
"F11": {"type":"once", "action":"toggle_ui"},
"Caret": {"type":"once", "action":"console"}
},
"pad_sticks": {
......
{
"substance_id": "default",
"albedo_aid": "cornell_floor_albedo.ktx",
"normal_aid": "cornell_floor_normal.ktx",
"brdf_aid": "cornell_floor_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "cornell_leftwall_albedo.ktx",
"normal_aid": "cornell_leftwall_normal.ktx",
"brdf_aid": "cornell_leftwall_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "alphatest",
"albedo_aid": "cornell_light_albedo.ktx",
"normal_aid": "cornell_light_normal.ktx",
"brdf_aid": "cornell_light_brdf.ktx",
"emission_aid": "cornell_light_emission.ktx"
}
{
"substance_id": "default",
"albedo_aid": "cornell_rightwall_albedo.ktx",
"normal_aid": "cornell_rightwall_normal.ktx",
"brdf_aid": "cornell_rightwall_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "cornell_shortbox_albedo.ktx",
"normal_aid": "cornell_shortbox_normal.ktx",
"brdf_aid": "cornell_shortbox_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "cornell_sphere_albedo.ktx",
"normal_aid": "cornell_sphere_normal.ktx",
"brdf_aid": "cornell_sphere_brdf.ktx",
"emission_aid": ""
}
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