Changeset 5141

Timestamp:

Jun 6, 2008, 5:27:39 PM (16 years ago)

Author:

landauf

Message:

new emitters, renamed some of the old ones

Location:

data/Media

Files:

• materials/scripts/PE_materials.material (modified) (3 diffs)
• materials/textures/smoke2.tga (added)
• particle/bigexplosion1part1.particle (added)
• particle/bigexplosion1part2.particle (added)
• particle/bigexplosion1part3.particle (added)
• particle/explosion1.particle (added)
• particle/fairytwirl.particle (added)
• particle/ray1.particle (moved) (moved from data/Media/particle/strahl.particle) (1 diff)
• particle/ray2.particle (moved) (moved from data/Media/particle/strahl2.particle) (1 diff)
• particle/shot1.particle (moved) (moved from data/Media/particle/schuss.particle) (1 diff)
• particle/shot2.particle (added)
• particle/smoke1.particle (moved) (moved from data/Media/particle/smoke.particle)
• particle/smoke2.particle (moved) (moved from data/Media/particle/rauch.particle) (2 diffs)
• particle/smoke3.particle (added)
• particle/thruster1.particle (moved) (moved from data/Media/particle/treibwerk.particle) (4 diffs)
• particle/thruster2.particle (added)

data/Media/materials/scripts/PE_materials.material

@@ +1 @@
+material PE/point_lensflare
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        depth_write off
+                        scene_blend add
+
+                        point_sprites on
+                        point_size 0.1
+                        point_size_attenuation on
+
+                        texture_unit
+                        {
+                                texture flare.tga
+                        }
+                }
+        }
+}
+
 material PE/lensflare
 {
@@ -48 +70 @@
                         {
                                 texture smoke.tga
+                        }
+                }
+        }
+}
+
+material PE/smoke2
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        depth_write off
+                        scene_blend alpha_blend
+
+                        texture_unit
+                        {
+                                texture smoke2.tga
                         }
                 }
@@ -142 +182 @@
         }
 }
+

data/Media/particle/ray1.particle

@@ -1 +1 @@
 
-Orxonox/strahl
+Orxonox/ray1
 {
         quota   1000

data/Media/particle/ray2.particle

@@ -1 +1 @@
 
-Orxonox/strahl2
+Orxonox/ray2
 {
         quota   1200

data/Media/particle/shot1.particle

@@ -1 @@
-Orxonox/schuss
+Orxonox/shot1
 {
         quota   5000

data/Media/particle/smoke2.particle

@@ -1 +1 @@
 
-Orxonox/rauch
+Orxonox/smoke2
 {
         quota   1000
@@ -43 +43 @@
                 alpha   -0.35
         }
-
-        affector LinearForce
-        {
-                force_vector    10 0 0
-                force_application       add
-        }
 }

data/Media/particle/thruster1.particle

@@ -1 @@
-
-Orxonox/treibwerk
+Orxonox/thruster1
 {
-        quota   1000
+        quota   100
         material        PE/bigFlame
-        particle_width  20
-        particle_height 20
+        particle_width  15
+        particle_height 15
         cull_each       false
         renderer        billboard
@@ -17 +16 @@
                 colour_range_end        0.684932 0.547945 0.315068 1
                 direction       0 1 0
-                emission_rate   130.4
+                emission_rate   300
                 position        0 0 0
-                velocity        18
+                velocity        100
                 velocity_min    18
                 velocity_max    30
-                time_to_live    0.9
-                time_to_live_min        0.9
-                time_to_live_max        2
+                time_to_live    0.25
+                time_to_live_min        0
+                time_to_live_max        0.25
                 duration        0
                 duration_min    0
@@ -31 +30 @@
                 repeat_delay_min        0
                 repeat_delay_max        0
-                width   20
-                height  20
+                width   5
+                height  5
                 depth   2.8
                 inner_width     0.8
@@ -46 +45 @@
                 blue1   0
                 alpha1  0
-                red2    -0.2
-                green2  -0.4
-                blue2   -0.4
+                red2    -0.3
+                green2  -0.6
+                blue2   -0.6
                 alpha2  0
-                state_change    0.9
+                state_change    0.25
         }
 }