[Orxonox-commit 4758] r9427 - data/trunk/materials

[davidsa at orxonox.net]

Author: davidsa
Date: 2012-11-04 14:02:47 +0100 (Sun, 04 Nov 2012)
New Revision: 9427

Modified:
   data/trunk/materials/glow.material
Log:
FIX: changed nested comments into single line comments, as it turns out Ogre material scripts don't like nested comments so my material script was broken

Modified: data/trunk/materials/glow.material
===================================================================
--- data/trunk/materials/glow.material	2012-11-04 12:51:48 UTC (rev 9426)
+++ data/trunk/materials/glow.material	2012-11-04 13:02:47 UTC (rev 9427)
@@ -22,24 +22,38 @@
                         depth_check on
                         depth_func less_equal
                         lighting off
-                        emissive 0.5 0.9 1.0 0.0 //what color should the glow be, emissive light can be changed through ogre as well
+
+                        //what color should the glow be, emissive light can be changed through ogre as well
+                        emissive 0.5 0.9 1.0 0.0
                         
                         vertex_program_ref glow_vs
                         {
-                                param_named_auto iWorldTMatrix inverse_transpose_world_matrix //don't worry about auto parameters here, they are given
+                                //don't worry about auto parameters here, they are given
+                                param_named_auto iWorldTMatrix inverse_transpose_world_matrix
                                 param_named_auto iViewMatrix inverse_view_matrix
                                 param_named_auto worldMatrix   world_matrix
                                 param_named_auto viewProjMatrix viewproj_matrix
-                                param_named inflate float 0.05 //how much should the glow expand from the model, usually a small value
+
+                                //how much should the glow expand from the model, usually a small value
+                                param_named inflate float 0.05
                         }
                         
                         fragment_program_ref glow_ps
                         {
-                                param_named alphaValue float 0.5 //base alpha value of glow
-                                param_named cutoffAngle float 70.0 //from which view to surface normal angle on should the intensity of the glow decrease
-                                param_named exponent float 2.5 //by which exponent should the intensity decrease
-                                param_named_auto time time_0_x 50 //how fast should the light pulsate
-                                param_named_auto color surface_emissive_colour //don't worry about this one, it makes sure we use the emissive color value
+                                //base alpha value of glow
+                                param_named alphaValue float 0.5
+
+                                //from which view to surface normal angle on should the intensity of the glow decrease
+                                param_named cutoffAngle float 70.0
+
+                                //by which exponent should the intensity decrease
+                                param_named exponent float 2.5
+
+                                //how fast should the light pulsate
+                                param_named_auto time time_0_x 50
+
+                                //don't worry about this one, it makes sure we use the emissive color value
+                                param_named_auto color surface_emissive_colour
                         }
                 }