Changeset 1908

Timestamp:

11/18/09 22:13:16 (3 months ago)

Author:

borrillis

Message:

- UnifiedHighLevelGpuProgram?

• lots wrong here, works now.

- CellShading? demo

• Now uses Unified programs to delegate to HLSL or CG + Added CellShading? HLSL program
• demo now runs under all three renderers

Location:

trunk

Files:

• Media/GpuPrograms/Example_CelShading.hlsl (added)
• Media/Materials/CelShading.material (modified) (3 diffs)
• Projects/Axiom/Engine/Graphics/UnifiedHighLevelGpuProgram.cs (modified) (17 diffs)
• Projects/AxiomDemos/Source/Browser/WinForm/Axiom.Demos.Browser.WinForm.csproj (modified) (2 diffs)

trunk/Media/Materials/CelShading.material

@@ -1 @@
-vertex_program Ogre/CelShadingVP cg
+vertex_program Ogre/CelShadingCG_vp cg
 {
         source Example_CelShading.cg
         entry_point main_vp
         profiles vs_1_1 arbvp1
+}
 
+fragment_program Ogre/CelShadingCG_fp cg
+{
+        source Example_CelShading.cg
+        entry_point main_fp
+        profiles ps_1_1 arbfp1 fp20
+}
+
+vertex_program Ogre/CelShadingHLSL_vp hlsl
+{
+        source Example_CelShading.hlsl
+        entry_point main_vp
+        target vs_1_1 arbvp1
+}
+
+fragment_program Ogre/CelShadingHLSL_fp hlsl
+{
+        source Example_CelShading.hlsl
+        entry_point main_fp
+        target ps_2_0
+}
+
+vertex_program Ogre/CelShadingVP unified
+{
+        delegate Ogre/CelShadingHLSL_vp
+        delegate Ogre/CelShadingCG_vp
         default_params
         {
@@ -11 +37 @@
                 param_named_auto worldViewProj worldviewproj_matrix
                 param_named shininess float 10 
-        }
+        }       
 }
 
-fragment_program Ogre/CelShadingFP cg
+fragment_program Ogre/CelShadingFP unified
 {
-        source Example_CelShading.cg
-        entry_point main_fp
-        profiles ps_1_1 arbfp1 fp20
+        delegate Ogre/CelShadingHLSL_fp
+        delegate Ogre/CelShadingCG_fp
 }
-
 
 material Examples/CelShading
@@ -61 +85 @@
                         }
                 }
+
         }
         

trunk/Projects/Axiom/Engine/Graphics/UnifiedHighLevelGpuProgram.cs

@@ -72 +72 @@
                 private List<String> _delegateNames = new List<string>();
 
-                private HighLevelGpuProgram _chosenDelgate;
+                private HighLevelGpuProgram _chosenDelegate;
                 public HighLevelGpuProgram Delegate
                 {
                         get
                         {
-                                if ( _chosenDelgate == null )
+                                if ( _chosenDelegate == null )
                                         chooseDelegate();
-                                return _chosenDelgate;
+                                return _chosenDelegate;
                         }
                 }
@@ -104 +104 @@
                 protected virtual void chooseDelegate()
                 {
-                        _chosenDelgate = null;
+                        _chosenDelegate = null;
                         foreach ( string delegateName in _delegateNames )
                         {
-                                HighLevelGpuProgram program = HighLevelGpuProgramManager.Instance[ delegateName ];
-                                if ( program != null && program.IsSupported )
-                                {
-                                        _chosenDelgate = program;
-                                        break;
-                                }
+                HighLevelGpuProgram program = HighLevelGpuProgramManager.Instance[ delegateName ];
+                if ( program != null && program.IsSupported )
+                {
+                    _chosenDelegate = program;
+                    break;
+                }
                         }
                 }
@@ -131 +131 @@
                         _delegateNames.Add( delegateName );
                         // Invalidate current selection
-                        _chosenDelgate = null;
+                        _chosenDelegate = null;
                 }
 
@@ -141 +141 @@
                         _delegateNames.Clear();
                         // Invalidate current selection
-                        _chosenDelgate = null;
+                        _chosenDelegate = null;
                 }
 
@@ -152 +152 @@
                         get
                         {
-                                if ( _chosenDelgate != null )
-                                {
-                                        return _chosenDelgate.BindingDelegate;
+                                if ( Delegate != null )
+                                {
+                                        return Delegate.BindingDelegate;
                                 }
 
@@ -165 +165 @@
                         get
                         {
-                                if ( _chosenDelgate != null )
-                                {
-                                        return _chosenDelgate.IsMorphAnimationIncluded;
+                                if ( Delegate != null )
+                                {
+                                        return Delegate.IsMorphAnimationIncluded;
                                 }
 
@@ -174 +174 @@
                         set
                         {
-                                if ( _chosenDelgate != null )
-                                        _chosenDelgate.IsMorphAnimationIncluded = value;
+                                if ( Delegate != null )
+                                        Delegate.IsMorphAnimationIncluded = value;
                         }
                 }
@@ -183 +183 @@
                         get
                         {
-                                if ( _chosenDelgate != null )
-                                {
-                                        return _chosenDelgate.IsSkeletalAnimationIncluded;
+                                if ( Delegate != null )
+                                {
+                                        return Delegate.IsSkeletalAnimationIncluded;
                                 }
                                 return false;
@@ -191 +191 @@
                         set
                         {
-                                if ( _chosenDelgate != null )
-                                        _chosenDelgate.IsSkeletalAnimationIncluded = value;
+                                if ( Delegate != null )
+                                        Delegate.IsSkeletalAnimationIncluded = value;
                         }
                 }
@@ -200 +200 @@
                         get
                         {
-                                if ( _chosenDelgate != null )
-                                {
-                                        return _chosenDelgate.PoseAnimationCount;
+                                if ( Delegate != null )
+                                {
+                                        return Delegate.PoseAnimationCount;
                                 }
                                 return 0;
@@ -208 +208 @@
                         set
                         {
-                                if ( _chosenDelgate != null )
-                                        _chosenDelgate.PoseAnimationCount = value;
+                                if ( Delegate != null )
+                                        Delegate.PoseAnimationCount = value;
                         }
                 }
@@ -217 +217 @@
                         get
                         {
-                                return _chosenDelgate != null;
+                                return Delegate != null;
                         }
                 }
@@ -225 +225 @@
                         get
                         {
-                                if ( _chosenDelgate != null )
-                                {
-                                        return _chosenDelgate.PassSurfaceAndLightStates;
+                                if ( Delegate != null )
+                                {
+                                        return Delegate.PassSurfaceAndLightStates;
                                 }
                                 return false;
@@ -233 +233 @@
                         set
                         {
-                                if ( _chosenDelgate != null )
-                                        _chosenDelgate.PassSurfaceAndLightStates = value;
-                        }
-                }
+                                if ( Delegate != null )
+                                        Delegate.PassSurfaceAndLightStates = value;
+                        }
+                }
+
+        public override bool HasDefaultParameters
+        {
+            get
+            {
+                if ( Delegate != null )
+                {
+                    return Delegate.HasDefaultParameters;
+                }
+                return false;
+            }
+        }
+
+        public override GpuProgramParameters DefaultParameters
+        {
+            get
+            {
+                if ( Delegate != null )
+                {
+                    return Delegate.DefaultParameters;
+                }
+                return null;
+            }
+        }
 
                 public override GpuProgramParameters CreateParameters()
@@ -253 +277 @@
                 }
 
-                protected override void CreateLowLevelImpl()
+        public override bool SetParam( string name, string val )
+        {
+            switch ( name )
+            {
+                case "delegate":
+                    AddDelegateProgram( val );
+                    return true;
+                    break;
+            }
+            return false;
+        }
+
+        public override void Load( bool background )
+        {
+            if ( Delegate != null )
+                Delegate.Load( background );
+        }
+
+        protected override void CreateLowLevelImpl()
                 {
                         throw new Exception( "The method or operation is not implemented." );
@@ -268 +310 @@
                 }
 
-                public override bool SetParam( string name, string val )
-                {
-                        switch ( name )
-                        {
-                                case "delegate":
-                                        AddDelegateProgram( val );
-                                        return true;
-                                        break;
-                        }
-                        return false;
-                }
-
                 protected override void LoadFromSource()
                 {
@@ -289 +319 @@
                         get
                         {
-                                if ( _chosenDelgate != null )
-                                {
-                                        return _chosenDelgate.SamplerCount;
+                                if ( Delegate != null )
+                                {
+                                        return Delegate.SamplerCount;
                                 }
                                 return 0;

trunk/Projects/AxiomDemos/Source/Browser/WinForm/Axiom.Demos.Browser.WinForm.csproj

@@ -105 +105 @@
       <SubType>Code</SubType>
     </Compile>
+    <None Include="..\..\..\..\..\Media\GpuPrograms\Example_CelShading.hlsl">
+      <Link>Media\GpuPrograms\Example_CelShading.hlsl</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="..\..\..\..\..\Media\Materials\Example.particle">
       <Link>Media\Materials\Example.particle</Link>
@@ -602 +606 @@
     <None Include="..\..\..\..\..\Media\Materials\Glass.material">
       <Link>Media\Materials\Glass.material</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\..\..\Media\Materials\hdr.material">
-      <Link>Media\Materials\hdr.material</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>