diff options
| author | Paweł Redman <trem.redman@gmail.com> | 2014-01-19 20:31:28 +0100 |
|---|---|---|
| committer | Paweł Redman <trem.redman@gmail.com> | 2014-01-19 20:31:28 +0100 |
| commit | cd9f8731a13a29d51a401f67ec2aa0b8962e01c8 (patch) | |
| tree | a90d3707ba149fb4abd0ae1d05d8927a51ea6207 | |
| parent | b7cb8e95b64cab51162caa8b59335d3ecd8edf19 (diff) | |
Minor shader and particle system fixes
| -rw-r--r-- | assets/scripts/g_jetpack.particle | 126 | ||||
| -rw-r--r-- | assets/scripts/g_misc.shader | 9 |
2 files changed, 72 insertions, 63 deletions
diff --git a/assets/scripts/g_jetpack.particle b/assets/scripts/g_jetpack.particle index 398aafa..f46862e 100644 --- a/assets/scripts/g_jetpack.particle +++ b/assets/scripts/g_jetpack.particle @@ -2,31 +2,31 @@ jetPackDescendPS { ejector { - particle - { - shader sync gfx/sprites/smoke_blue - displacement 0 0 0 0 + particle + { + shader sync bluesmoke + displacement 0 0 0 0 - velocityType static - velocityDir linear - velocityMagnitude 50 - velocity 0 0 -1 ~15 + velocityType static + velocityDir linear + velocityMagnitude 50 + velocity 0 0 -1 ~15 - accelerationType static - accelerationDir linear - acceleration 0 0 -1 ~5 - accelerationMagnitude 25 + accelerationType static + accelerationDir linear + acceleration 0 0 -1 ~5 + accelerationMagnitude 25 - radius 0 5 40 - alpha 250 .15 0 - rotation 0 ~360 ~360 - bounce 0.0 + radius 0 5 40 + alpha 250 0.15 0 + rotation 0 ~360 ~360 + bounce 0 - lifeTime 1000 - } - count infinite - delay 0 - period 45 - ~0% + lifeTime 1000 + } + count infinite + delay 0 + period 45 - 0 } } @@ -34,31 +34,31 @@ jetPackAscendPS { ejector { - particle - { - shader sync gfx/sprites/smoke_blue - displacement 0 0 0 0 + particle + { + shader sync bluesmoke + displacement 0 0 0 0 - velocityType static - velocityDir linear - velocityMagnitude 50 - velocity 0 0 -1 ~15 + velocityType static + velocityDir linear + velocityMagnitude 50 + velocity 0 0 -1 ~15 - accelerationType static - accelerationDir linear - acceleration 0 0 -1 ~5 - accelerationMagnitude 25 + accelerationType static + accelerationDir linear + acceleration 0 0 -1 ~5 + accelerationMagnitude 25 - radius 0 5 40 - alpha 250 .30 0 - rotation 0 ~360 ~360 - bounce 0.0 + radius 0 5 40 + alpha 250 0.3 0 + rotation 0 ~360 ~360 + bounce 0 - lifeTime 2000 - } - count infinite - delay 0 - period 45 - ~0% + lifeTime 2000 + } + count infinite + delay 0 + period 45 - 0 } } @@ -66,30 +66,30 @@ jetPackHoverPS { ejector { - particle - { - shader sync gfx/sprites/smoke_blue - displacement 0 0 0 0 + particle + { + shader sync bluesmoke + displacement 0 0 0 0 - velocityType static - velocityDir linear - velocityMagnitude 50 - velocity 0 0 -1 ~15 + velocityType static + velocityDir linear + velocityMagnitude 50 + velocity 0 0 -1 ~15 - accelerationType static - accelerationDir linear - acceleration 0 0 -1 ~5 - accelerationMagnitude 25 + accelerationType static + accelerationDir linear + acceleration 0 0 -1 ~5 + accelerationMagnitude 25 - radius 0 5 40 - alpha 250 .20 0 - rotation 0 ~360 ~360 - bounce 0.0 + radius 0 5 40 + alpha 250 0.2 0 + rotation 0 ~360 ~360 + bounce 0 - lifeTime 1500 - } - count infinite - delay 0 - period 45 - ~0% + lifeTime 1500 + } + count infinite + delay 0 + period 45 - 0 } }
\ No newline at end of file diff --git a/assets/scripts/g_misc.shader b/assets/scripts/g_misc.shader index bafde0a..ab614ab 100644 --- a/assets/scripts/g_misc.shader +++ b/assets/scripts/g_misc.shader @@ -138,4 +138,13 @@ models/mapobjects/plant_life/grass depthWrite rgbGen vertex } +} + +bluesmoke +{ + nopicmip + { + map gfx/sprites/smoke_blue.tga + blendFunc Blend + } }
\ No newline at end of file |