Changeset 11088 for data

Timestamp:

Jan 24, 2016, 12:21:43 PM (9 years ago)

Author:

landauf

Message:

improved glow effects

Location:

data/trunk

Files:

• images/textures/assff_glow.JPG (added)
• materials/Example.material (modified) (1 diff)
• materials/Example.material~ (deleted)
• materials/Flares.material (modified) (3 diffs)
• materials/PE_materials.material (modified) (3 diffs)
• materials/Trail.material (modified) (3 diffs)
• materials/assff.material (modified) (1 diff)
• materials/laserbeam.material (modified) (3 diffs)
• programs/glow.cg (modified) (1 diff)

data/trunk/materials/Example.material

@@ -328 +328 @@
         technique
         {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture flare.png
+                        }
+                }
+        }
+
+        technique
+        {
+                scheme glow
                 pass
                 {

data/trunk/materials/Flares.material

@@ -121 +121 @@
                         scene_blend add
                         depth_write off
+                        emissive 1 1 1
 
                         texture_unit
@@ -126 +127 @@
                                 texture backlightflare.png
                         }
-
+                }
+        }
+
+        technique
+        {
+                scheme glow
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
                         emissive 1 1 1
+
+                        texture_unit
+                        {
+                                texture backlightflare_glow.png
+                        }
+                }
+        }
+}
+
+material Flares/ThrusterFlare1
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+                        emissive 1 1 1
+
+                        texture_unit
+                        {
+                                texture bigflare1.png
+                        }
                 }
         }
@@ -136 +171 @@
                 pass
                 {
-                        texture_unit
-                        {
-                                texture backlightflare_glow.png
-                        }
-                        ambient 1 1 1
-                        diffuse 1 1 1
-                        specular 0 0 0 1
+                        lighting off
+                        scene_blend add
+                        depth_write off
                         emissive 1 1 1
-                }
-        }
-}
-
-material Flares/ThrusterFlare1
-{
-        technique
-        {
-                pass
-                {
-                        lighting off
-                        scene_blend add
-                        depth_write off
-
-                        texture_unit
-                        {
-                                texture bigflare1.png
-                        }
-
-                        emissive 1 1 1
-                }
-        }
-
-        technique
-        {
-                scheme glow
-                pass
-                {
+
                         texture_unit
                         {
                                 texture bigflare1_glow.png
                         }
-                        ambient 1 1 1
-                        diffuse 1 1 1
-                        specular 0 0 0 1
-                        emissive 1 1 1
                 }
         }

data/trunk/materials/PE_materials.material

@@ -37 +37 @@
                 }
         }
+
+        technique
+        {
+                scheme glow
+                pass
+                {
+                        lighting off
+                        depth_write off
+                        scene_blend add
+
+                        texture_unit
+                        {
+                                texture flare.png
+                        }
+                }
+        }
 }
 
@@ -190 +206 @@
                         depth_write off
                         scene_blend add
+                        emissive 1 1 1
 
                         texture_unit
@@ -195 +212 @@
                                 texture explosion3.png
                         }
-
+                }
+        }
+
+        technique
+        {
+                scheme glow
+                pass
+                {
+                        lighting off
+                        depth_write off
+                        scene_blend add
                         emissive 1 1 1
-                }
-        }
-
-        technique
-        {
-                scheme glow
-                pass
-                {
+
                         texture_unit
                         {
                                 texture explosion3_glow.png
                         }
-                        ambient 1 1 1
-                        diffuse 1 1 1
-                        specular 0 0 0 1
-                        emissive 1 1 1
                 }
         }

data/trunk/materials/Trail.material

@@ -9 +9 @@
                         depth_check on
                         depth_write off
+                        emissive 1 1 1
 
                         texture_unit
@@ -14 +15 @@
                                 texture backlighttrail.png
                         }
-
-                        emissive 1 1 1
                 }
         }
@@ -24 +23 @@
                 pass
                 {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check on
+                        depth_write off
+                        emissive 1 1 1
+
                         texture_unit
                         {
                                 texture backlighttrail_glow.png
                         }
-                        ambient 1 1 1
-                        diffuse 1 1 1
-                        specular 0 0 0 1
-                        emissive 1 1 1
                 }
         }

data/trunk/materials/assff.material

@@ -23 +23 @@
                 }
         }
+
+        technique
+        {
+                scheme glow
+                pass
+                {
+                        lighting off
+
+                        texture_unit
+                        {
+                                texture assff_glow.JPG
+                        }
+                }
+        }
 }

data/trunk/materials/laserbeam.material

@@ -8 +8 @@
                         depth_write off
                         scene_blend add
+                        emissive 1 1 1
+
                         texture_unit
                         {
@@ -13 +15 @@
                                 colour_op modulate
                         }
-                        emissive 1 1 1
                 }
         }
@@ -22 +23 @@
                 pass
                 {
+                        lighting off
+                        depth_write off
+                        scene_blend add
+                        emissive 1 1 1
+
                         texture_unit
                         {
                                 texture laserbeam_glow.png
                         }
-                        ambient 1 1 1
-                        diffuse 1 1 1
-                        specular 0 0 0 1
-                        emissive 1 1 1
                 }
         }

data/trunk/programs/glow.cg

@@ -69 +69 @@
                 tex2D(scene, uv) +
 #endif
-                tex2D(blurXY, uv) * 4;
+                tex2D(blurXY, uv) * 1;
 }