[Orxonox-commit 4840] r9509 - in data/trunk: images/effects materials

[davidsa at orxonox.net]

Author: davidsa
Date: 2012-12-14 14:24:19 +0100 (Fri, 14 Dec 2012)
New Revision: 9509

Added:
   data/trunk/images/effects/lensflare-halo4.png
   data/trunk/images/effects/lensflare-halo5.png
   data/trunk/images/effects/lensflare-iris.png
   data/trunk/images/effects/lensflare-ring.png
Modified:
   data/trunk/images/effects/lensflare-halo1.png
   data/trunk/materials/glow.material
   data/trunk/materials/lensflare.material
Log:
tweaked and added more lens flare materials, tweaked the glow material

Modified: data/trunk/images/effects/lensflare-halo1.png
===================================================================
(Binary files differ)

Added: data/trunk/images/effects/lensflare-halo4.png
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/effects/lensflare-halo4.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: data/trunk/images/effects/lensflare-halo5.png
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/effects/lensflare-halo5.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: data/trunk/images/effects/lensflare-iris.png
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/effects/lensflare-iris.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: data/trunk/images/effects/lensflare-ring.png
===================================================================
(Binary files differ)


Property changes on: data/trunk/images/effects/lensflare-ring.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: data/trunk/materials/glow.material
===================================================================
--- data/trunk/materials/glow.material	2012-12-11 17:13:18 UTC (rev 9508)
+++ data/trunk/materials/glow.material	2012-12-14 13:24:19 UTC (rev 9509)
@@ -34,19 +34,19 @@
                                 param_named_auto viewProjMatrix viewproj_matrix
 
                                 //how much should the glow expand from the model, usually a small value
-                                param_named inflate float 0.05
+                                param_named inflate float 0.1
                         }
                         
                         fragment_program_ref glow_ps
                         {
                                 //base alpha value of glow
-                                param_named alphaValue float 0.5
+                                param_named alphaValue float 0.6
 
                                 //from which view to surface normal angle on should the intensity of the glow decrease
-                                param_named cutoffAngle float 70.0
+                                param_named cutoffAngle float 65.0
 
                                 //by which exponent should the intensity decrease
-                                param_named exponent float 2.5
+                                param_named exponent float 3.0
 
                                 //how fast should the light pulsate
                                 param_named_auto time time_0_x 50

Modified: data/trunk/materials/lensflare.material
===================================================================
--- data/trunk/materials/lensflare.material	2012-12-11 17:13:18 UTC (rev 9508)
+++ data/trunk/materials/lensflare.material	2012-12-14 13:24:19 UTC (rev 9509)
@@ -61,12 +61,104 @@
             texture_unit
             {
                 tex_address_mode clamp
-                texture lensflare-halo1.png
+                texture lensflare-halo3.png
             }
         }
     }
  }
 
+material lensflare/halo4
+ {
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend src_alpha dest_alpha
+            depth_write off
+            depth_check off
+ 
+            cull_hardware none
+            cull_software none
+ 
+            texture_unit
+            {
+                tex_address_mode clamp
+                texture lensflare-halo4.png
+            }
+        }
+    }
+ }
+
+material lensflare/halo5
+ {
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend src_alpha dest_alpha
+            depth_write off
+            depth_check off
+ 
+            cull_hardware none
+            cull_software none
+ 
+            texture_unit
+            {
+                tex_address_mode clamp
+                texture lensflare-halo5.png
+            }
+        }
+    }
+ }
+
+material lensflare/iris
+ {
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend src_alpha dest_alpha
+            depth_write off
+            depth_check off
+ 
+            cull_hardware none
+            cull_software none
+ 
+            texture_unit
+            {
+                tex_address_mode clamp
+                texture lensflare-iris.png
+            }
+        }
+    }
+ }
+
+material lensflare/ring
+ {
+    technique
+    {
+        pass
+        {
+            lighting off
+            scene_blend src_alpha dest_alpha
+            depth_write off
+            depth_check off
+ 
+            cull_hardware none
+            cull_software none
+ 
+            texture_unit
+            {
+                tex_address_mode clamp
+                texture lensflare-ring.png
+            }
+        }
+    }
+ }
+
 material lensflare/bursthalo
  {
     technique