testCommit

This commit is contained in:
=
2017-11-22 16:00:56 +01:00
parent 9a2353b01c
commit 3324056634
13 changed files with 279 additions and 117 deletions

View File

@@ -0,0 +1,128 @@
Untitled
- Delay -
active: false
- Duration -
lowMin: 1000.0
lowMax: 1000.0
- Count -
min: 0
max: 1000
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 7000.0
highMax: 7000.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life Offset -
active: false
- X Offset -
active: false
- Y Offset -
active: false
- Spawn Shape -
shape: line
- Spawn Width -
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 400.0
highMax: 400.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 0.0
lowMax: 0.0
highMin: 80.0
highMax: 80.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 100.0
highMax: 100.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Angle -
active: false
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: false
- Tint -
colorsCount: 15
colors0: 1.0
colors1: 0.0
colors2: 0.0
colors3: 1.0
colors4: 0.41568628
colors5: 0.0
colors6: 0.20784314
colors7: 1.0
colors8: 0.0
colors9: 0.85490197
colors10: 0.0
colors11: 1.0
colors12: 0.0
colors13: 0.5372549
colors14: 1.0
timelineCount: 5
timeline0: 0.0
timeline1: 0.32702237
timeline2: 0.54044753
timeline3: 0.82271945
timeline4: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Options -
attached: false
continuous: true
aligned: false
additive: true
behind: false
premultipliedAlpha: false
- Image Path -
particle.png

View File

@@ -2,16 +2,16 @@ Untitled
- Delay -
active: false
- Duration -
lowMin: 100.0
lowMax: 100.0
lowMin: 200.0
lowMax: 200.0
- Count -
min: 0
max: 10000
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 1000.0
highMax: 1000.0
highMin: 300.0
highMax: 300.0
relative: false
scalingCount: 1
scaling0: 1.0
@@ -72,18 +72,20 @@ timeline2: 1.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 300.0
lowMax: 280.0
highMin: 800.0
highMax: 800.0
relative: false
scalingCount: 3
scalingCount: 4
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
timelineCount: 3
scaling3: 0.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.29791272
timeline2: 0.2989127
timeline3: 1.0
- Angle -
active: true
lowMin: 89.0
@@ -107,8 +109,8 @@ active: false
active: true
lowMin: 0.0
lowMax: 0.0
highMin: -50.0
highMax: -100.0
highMin: -100.0
highMax: -150.0
relative: false
scalingCount: 4
scaling0: 0.0
@@ -121,20 +123,28 @@ timeline1: 0.29981026
timeline2: 0.65753424
timeline3: 0.75342464
- Tint -
colorsCount: 9
colors0: 0.0
colors1: 0.4
colors2: 1.0
colorsCount: 15
colors0: 1.0
colors1: 0.0
colors2: 0.0
colors3: 1.0
colors4: 0.0
colors4: 0.41568628
colors5: 0.0
colors6: 1.0
colors6: 0.20784314
colors7: 1.0
colors8: 1.0
timelineCount: 3
colors8: 0.0
colors9: 0.85490197
colors10: 0.0
colors11: 1.0
colors12: 0.0
colors13: 0.5372549
colors14: 1.0
timelineCount: 5
timeline0: 0.0
timeline1: 0.35800344
timeline2: 1.0
timeline1: 0.32702237
timeline2: 0.54044753
timeline3: 0.82271945
timeline4: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
@@ -144,7 +154,7 @@ relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
scaling2: 0.2
timelineCount: 3
timeline0: 0.0
timeline1: 0.70547944

View File

@@ -11,9 +11,9 @@ vec3 saturateColor(in vec3 color, in float a);
void main() {
float a = texture2D(texture, pass_TexCoords).a * alpha;
gl_FragColor = vec4(color, a);
vec3 black = vec3(0.0, 0.0, 0.0);
gl_FragColor.rgb = mix(color, black, 1.0 - gl_FragColor.a);
gl_FragColor.rgb = mix(color, black, 1.0 - a);
gl_FragColor.a = a;
}