rpms/ember-media/devel ember-media-0.5.4-fix-materials.patch, NONE, 1.1 ember-media.spec, 1.3, 1.4

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/ember-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30527

Modified Files:
	ember-media.spec 
Added Files:
	ember-media-0.5.4-fix-materials.patch 
Log Message:
* Thu Nov 03 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-4
- Including license text in documentation
- Fixing materials to be loadable by new OGRE


ember-media-0.5.4-fix-materials.patch:

--- NEW FILE ember-media-0.5.4-fix-materials.patch ---
diff -ubr ember-media-0.5.4/user/common/resources/ogre/scripts/materials/environment.material ember-media-0.5.4.new/user/common/resources/ogre/scripts/materials/environment.material
--- ember-media-0.5.4/user/common/resources/ogre/scripts/materials/environment.material	2008-07-06 21:19:51.000000000 +0400
+++ ember-media-0.5.4.new/user/common/resources/ogre/scripts/materials/environment.material	2008-11-07 00:25:45.000000000 +0300
@@ -492,13 +492,13 @@
 	profiles ps_2_0 arbfp1
 }
 
-fragment_program Examples/FresnelRefractReflectPS asm
-{
-	source resources/ogre/scripts/programs/Example_FresnelPS.asm
-	// sorry, only for ps_1_4 :)
-	syntax ps_1_4
-
-}
+//fragment_program Examples/FresnelRefractReflectPS asm
+//{
+//	source resources/ogre/scripts/programs/Example_FresnelPS.asm
+//	// sorry, only for ps_1_4 :)
+//	syntax ps_1_4
+//
+//}
 
 material Examples/FresnelReflectionRefraction
 {
@@ -558,61 +558,61 @@
 	}
 
 	// ATI 8500 +
-	technique
-	{
-		pass
-		{
-			vertex_program_ref Examples/FresnelRefractReflectVPold
-			{
-				param_named_auto worldViewProjMatrix worldviewproj_matrix
-				param_named_auto eyePosition camera_position_object_space
-				param_named fresnelBias float -0.3
-				param_named fresnelScale float 1.4
-				param_named fresnelPower float 8
-				param_named_auto timeVal time_0_1 20
-				param_named scroll float 1 
-				param_named scale float 4 
-				param_named noise float 1
-				// scroll and noisePos will need updating per frame
-			}
-
-			// for ATI RADEON 8500 - 9200
-			fragment_program_ref Examples/FresnelRefractReflectPS
-			{
-				// distortionRange
-				param_indexed 0  float 0.025  
-				// tintColour
-				param_indexed 1  float4 0.05 0.12 0.15 1
-			}
-
-			// Noise
-			texture_unit
-			{
-				// Perlin noise volume
-				texture perlinvolume.dds 3d
-				// min / mag filtering, no mip
-				filtering linear linear none
-			}
-			// Reflection
-			texture_unit
-			{
-				// Will be filled in at runtime
-				texture Reflection
-				tex_address_mode clamp
-				// needed by ps.1.4
-				tex_coord_set 1
-			}
-			// Refraction
-			texture_unit
-			{
-				// Will be filled in at runtime
-				texture Refraction
-				tex_address_mode clamp
-				// needed by ps.1.4
-				tex_coord_set 2
-			}
-		}
-	}    
+//	technique
+//	{
+//		pass
+//		{
+//			vertex_program_ref Examples/FresnelRefractReflectVPold
+//			{
+//				param_named_auto worldViewProjMatrix worldviewproj_matrix
+//				param_named_auto eyePosition camera_position_object_space
+//				param_named fresnelBias float -0.3
+//				param_named fresnelScale float 1.4
+//				param_named fresnelPower float 8
+//				param_named_auto timeVal time_0_1 20
+//				param_named scroll float 1 
+//				param_named scale float 4 
+//				param_named noise float 1
+//				// scroll and noisePos will need updating per frame
+//			}
+//
+//			// for ATI RADEON 8500 - 9200
+//			fragment_program_ref Examples/FresnelRefractReflectPS
+//			{
+//				// distortionRange
+//				param_indexed 0  float 0.025  
+//				// tintColour
+//				param_indexed 1  float4 0.05 0.12 0.15 1
+//			}
+//
+//			// Noise
+//			texture_unit
+//			{
+//				// Perlin noise volume
+//				texture perlinvolume.dds 3d
+//				// min / mag filtering, no mip
+//				filtering linear linear none
+//			}
+//			// Reflection
+//			texture_unit
+//			{
+//				// Will be filled in at runtime
+//				texture Reflection
+//				tex_address_mode clamp
+//				// needed by ps.1.4
+//				tex_coord_set 1
+//			}
+//			// Refraction
+//			texture_unit
+//			{
+//				// Will be filled in at runtime
+//				texture Refraction
+//				tex_address_mode clamp
+//				// needed by ps.1.4
+//				tex_coord_set 2
+//			}
+//		}
+//	}    
 }
 
 material /global/environment/smoke


Index: ember-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ember-media/devel/ember-media.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ember-media.spec	4 Nov 2008 21:14:37 -0000	1.3
+++ ember-media.spec	7 Nov 2008 21:10:15 -0000	1.4
@@ -9,6 +9,7 @@
 URL:            http://www.worldforge.org/dev/eng/clients/ember
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
 Patch0:         ember-media-0.5.4-ogre16.patch
+Patch1:         ember-media-0.5.4-fix-materials.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,6 +22,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -66,6 +68,7 @@
 %changelog
 * Thu Nov 03 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-4
 - Including license text in documentation
+- Fixing materials to be loadable by new OGRE
 
 * Thu Oct 02 2008 Alexey Torkhov <atorkhov at gmail.com> 0.5.4-3
 - Update for new OGRE