[Orxonox-commit 3191] r7884 - in data/trunk: materials programs

[landauf at orxonox.net]

Author: landauf
Date: 2011-02-14 12:18:12 +0100 (Mon, 14 Feb 2011)
New Revision: 7884

Modified:
   data/trunk/materials/Arrow.material
   data/trunk/materials/Banners.material
   data/trunk/materials/swallow_material.material
   data/trunk/programs/BloomFP.cg
Log:
eol-style native


Property changes on: data/trunk/materials/Arrow.material
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: data/trunk/materials/Banners.material
===================================================================
--- data/trunk/materials/Banners.material	2011-02-14 11:15:39 UTC (rev 7883)
+++ data/trunk/materials/Banners.material	2011-02-14 11:18:12 UTC (rev 7884)
@@ -1,52 +1,52 @@
-
-material Banners/Pickups
-{
-	technique
-	{
-		pass
-		{
-			lighting off
-			scene_blend add
-			depth_write off
-
-			texture_unit
-			{
-				texture Pickups.png
-			}
-		}
-	}
-}
-material Banners/Drone
-{
-	technique
-	{
-		pass
-		{
-			lighting off
-			scene_blend add
-			depth_write off
-
-			texture_unit
-			{
-				texture DroneBanner.png
-			}
-		}
-	}
-}
-material Banners/Formation
-{
-	technique
-	{
-		pass
-		{
-			lighting off
-			scene_blend add
-			depth_write off
-
-			texture_unit
-			{
-				texture Formation.png
-			}
-		}
-	}
-}
+
+material Banners/Pickups
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture Pickups.png
+			}
+		}
+	}
+}
+material Banners/Drone
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture DroneBanner.png
+			}
+		}
+	}
+}
+material Banners/Formation
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture Formation.png
+			}
+		}
+	}
+}


Property changes on: data/trunk/materials/Banners.material
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: data/trunk/materials/swallow_material.material
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: data/trunk/programs/BloomFP.cg
===================================================================
--- data/trunk/programs/BloomFP.cg	2011-02-14 11:15:39 UTC (rev 7883)
+++ data/trunk/programs/BloomFP.cg	2011-02-14 11:18:12 UTC (rev 7884)
@@ -1,7 +1,7 @@
-sampler RT1 : register(s0);
-sampler RT2 : register(s1);
-
-float4 Bloom_ps (float2 iTexCoord : TEXCOORD0) : COLOR
-{
-	return 0.5*tex2D(RT1, iTexCoord) + 0.5*tex2D(RT2, iTexCoord);
-}
+sampler RT1 : register(s0);
+sampler RT2 : register(s1);
+
+float4 Bloom_ps (float2 iTexCoord : TEXCOORD0) : COLOR
+{
+	return 0.5*tex2D(RT1, iTexCoord) + 0.5*tex2D(RT2, iTexCoord);
+}


Property changes on: data/trunk/programs/BloomFP.cg
___________________________________________________________________
Added: svn:eol-style
   + native