Changeset 1865

Timestamp:

11/04/09 17:35:18 (2 months ago)

Author:

borrillis

Message:

-- Light

• Added PowerScale?, ShadowFarDistance?, and shadowFarDistanceSquared Properties

-- SceneQuery? Type Flags

• overrode TypeFlags? property in MovableObject? derivatives
• Added SceneQueryTypeMask? Enumeration for engine defined type masks

Location:

branches/ogre_1.7_update/Projects/Axiom

Files:

• Engine/Core/BillboardSet.cs (modified) (2 diffs)
• Engine/Core/CoreEnums.cs (modified) (1 diff)
• Engine/Core/Entity.cs (modified) (2 diffs)
• Engine/Core/Frustum.cs (modified) (2 diffs)
• Engine/Core/Light.cs (modified) (4 diffs)
• Engine/Core/MovableObject.cs (modified) (1 diff)
• Engine/Core/SceneQuery.cs (modified) (1 diff)
• Engine/Core/StaticGeometry/Region.cs (modified) (1 diff)
• Engine/ParticleSystems/ParticleSystem.cs (modified) (1 diff)
• Plugins/OctreeZone/TerrainZoneRenderable.cs (modified) (1 diff, 1 prop)
• SceneManagers/Bsp/BspSceneManager.cs (modified) (2 diffs)
• SceneManagers/Octree/TerrainRenderable.cs (modified) (4 diffs)

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/BillboardSet.cs

@@ -1798 +1798 @@
         #endregion
 
-        #region Implementation of SceneObject
+        #region MovableObject Implementation
 
         public override AxisAlignedBox BoundingBox
@@ -2036 +2036 @@
         }
 
-        #endregion
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.Fx;
+            }
+        }
+
+        #endregion MovableObject Implementation
     }
 

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/CoreEnums.cs

@@ -75 +75 @@
                 Overhead = 16
         }
+    /// <summary>
+    /// Scene Query Type Mask values
+    /// </summary>
+    /// <seealso cref="SceneQuery"/>
+    [Flags]
+    public enum SceneQueryTypeMask : ulong
+    {
+        /// <summary>Query type mask which will be used for world geometry <see cref="SceneQuery"/></summary>
+        WorldGeometry   = 0x80000000,
+        /// <summary>Query type mask which will be used for entities <see cref="SceneQuery"/></summary>
+        Entity          = 0x40000000,
+        /// <summary>Query type mask which will be used for effects like billboardsets / particle systems <see cref="SceneQuery"/></summary>
+        Fx              = 0x20000000,
+        /// <summary>Query type mask which will be used for StaticGeometry <see cref="SceneQuery"/></summary>
+        StaticGeometry  = 0x10000000,
+        /// <summary>Query type mask which will be used for lights <see cref="SceneQuery"/></summary>
+        Light           = 0x08000000,
+        /// <summary>Query type mask which will be used for frusta and cameras <see cref="SceneQuery"/></summary>
+        Frustum         = 0x04000000,
+        /// <summary>User type mask limit</summary>
+        UserLimit       = Frustum
+    }
 
     /// <summary>

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/Entity.cs

@@ -1617 +1617 @@
         #endregion
 
-        #region Implementation of SceneObject
+        #region MovableObject Implementation
 
         private static TimingMeter copyAnimationMeter = MeterManager.GetMeter( "Copy Animation", "Entity Queue" );
@@ -2217 +2217 @@
         }
 
-        #endregion Methods
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.Entity;
+            }
+        }
+
+        #endregion MovableObject Implementation
 
         /// <summary>

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/Frustum.cs

@@ -1823 +1823 @@
                 #endregion
 
-                #region SceneObject Members
+                #region MovableObject Implementation
 
                 /// <summary>
@@ -1866 +1866 @@
                                 queue.AddRenderable(this);
                         }
-                }
-
-                #endregion SceneObject Members
-
-                #region IRenderable Members
-
-                public bool CastsShadows
+        }
+
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.Frustum;
+            }
+        }
+
+        #endregion  MovableObject Implementation
+
+        #region IRenderable Members
+
+        public bool CastsShadows
                 {
                         get

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/Light.cs

@@ -162 +162 @@
         protected LightType type;
 
+        protected Real powerScale = 1.0f;
+        protected bool ownShadowFarDistance = false;
+        protected Real shadowFarDistance = 0.0f;
+        protected Real shadowFarDistanceSquared = 0.0f;
+
         #endregion
 
@@ -440 +445 @@
             get
             {
-                throw new NotImplementedException();
-            }
-            set
-            {
-                throw new NotImplementedException();
+                return ownShadowFarDistance ? shadowFarDistance : Manager.ShadowFarDistance;
+            }
+            set
+            {
+                ownShadowFarDistance = true;
+                shadowFarDistance = value;
+                shadowFarDistanceSquared = value * value;
+            }
+        }
+
+        public float ShadowFarDistanceSquared
+        {
+            get
+            {
+                return ownShadowFarDistance ? shadowFarDistanceSquared : Manager.ShadowFarDistanceSquared;
             }
         }
@@ -452 +467 @@
             get
             {
-                throw new NotImplementedException();
-            }
-            set
-            {
-                throw new NotImplementedException();
+                return powerScale;
+            }
+            set
+            {
+                powerScale = value;
             }
         }
@@ -1227 +1242 @@
         }
 
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.Light;
+            }
+        }
+
         #endregion MovableObject Implementation
 

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/MovableObject.cs

@@ -449 +449 @@
         ///             meaning of the bits is application-specific.
         /// </remarks>
-        public ulong QueryFlags
+        public virtual ulong QueryFlags
         {
             get

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/SceneQuery.cs

@@ -108 +108 @@
             this.creator = creator;
 
+            this.queryMask = 0xFFFFFFFF;
+
+            // default type mask to everything except lights & fx (previous behaviour)
+            this.queryTypeMask = ( 0xFFFFFFFF & (ulong)~SceneQueryTypeMask.Fx ) & (ulong)~SceneQueryTypeMask.Light;
+ 
             // default to no world fragments queried
             AddWorldFragmentType( WorldFragmentType.None );

branches/ogre_1.7_update/Projects/Axiom/Engine/Core/StaticGeometry/Region.cs

@@ -508 +508 @@
             }
 
+            public override ulong TypeFlags
+            {
+                get
+                {
+                    return (ulong)SceneQueryTypeMask.StaticGeometry;
+                }
+            }
             #endregion MovableObject Implementation
         }

branches/ogre_1.7_update/Projects/Axiom/Engine/ParticleSystems/ParticleSystem.cs

@@ -1645 +1645 @@
                 }
 
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.Fx;
+            }
+        }
+
                 internal ParticleSystemRenderer Renderer
                 {

branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainZoneRenderable.cs

@@ -1 +1 @@
 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZoneRenderable.cs:1012-1662
+/trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZoneRenderable.cs:1842-1861
         }
 
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.WorldGeometry;
+            }
+        }
+
         #endregion
     }

@@ -1 +1 @@
 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZoneRenderable.cs:1012-1662
+/trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZoneRenderable.cs:1842-1861

branches/ogre_1.7_update/Projects/Axiom/SceneManagers/Bsp/BspSceneManager.cs

@@ -1343 +1343 @@
 
                     // check object against brushes
-                    foreach ( BspBrush brush in leaf.SolidBrushes)
-                    {
-                        if ( brush == null )
-                            continue;
-
-                        // test brush against object
-                        boundedVolume.planes = brush.Planes;
-                        if ( boundedVolume.Intersects( aBox ) )
+                    if ( ( QueryTypeMask & (ulong)SceneQueryTypeMask.WorldGeometry ) != 0 )
+                    {
+                        foreach ( BspBrush brush in leaf.SolidBrushes )
                         {
-                            // check if this pair is already reported
-                            IList interBrushList = brushIntersections.FindBucket( aObj );
-                            if ( interBrushList == null || interBrushList.Contains( brush ) == false)
+                            if ( brush == null )
+                                continue;
+
+                            // test brush against object
+                            boundedVolume.planes = brush.Planes;
+                            if ( boundedVolume.Intersects( aBox ) )
                             {
-                                brushIntersections.Add( aObj, brush );
-                                // report this brush as it's WorldFragment
-                                listener.OnQueryResult( aObj, brush.Fragment );
+                                // check if this pair is already reported
+                                IList interBrushList = brushIntersections.FindBucket( aObj );
+                                if ( interBrushList == null || interBrushList.Contains( brush ) == false )
+                                {
+                                    brushIntersections.Add( aObj, brush );
+                                    // report this brush as it's WorldFragment
+                                    listener.OnQueryResult( aObj, brush.Fragment );
+                                }
                             }
                         }
@@ -1466 +1469 @@
 
             // Check ray against brushes
-            for ( int brushPoint = 0; brushPoint < leaf.SolidBrushes.Length; brushPoint++ )
-            {
-                BspBrush brush = leaf.SolidBrushes[ brushPoint ];
-
-                if ( brush == null )
-                    continue;
-
-                boundedVolume.planes = brush.Planes;
-
-                IntersectResult result = tracingRay.Intersects( boundedVolume );
-                // if the result came back positive and intersection point is inside
-                // the node, check if this brush is closer
-                if ( result.Hit && result.Distance <= maxDistance )
-                {
-                    if ( result.Distance < intersectBrushDist )
-                    {
-                        intersectBrushDist = result.Distance;
-                        intersectBrush = brush;
-                    }
-                }
-            }
-
-            if ( intersectBrush != null )
-            {
-                listener.OnQueryResult( intersectBrush.Fragment, intersectBrushDist + traceDistance );
-                StopRayTracing = true;
+            if ( ( QueryTypeMask & (ulong)SceneQueryTypeMask.WorldGeometry ) != 0 )
+            {
+                for ( int brushPoint = 0; brushPoint < leaf.SolidBrushes.Length; brushPoint++ )
+                {
+                    BspBrush brush = leaf.SolidBrushes[ brushPoint ];
+
+                    if ( brush == null )
+                        continue;
+
+                    boundedVolume.planes = brush.Planes;
+
+                    IntersectResult result = tracingRay.Intersects( boundedVolume );
+                    // if the result came back positive and intersection point is inside
+                    // the node, check if this brush is closer
+                    if ( result.Hit && result.Distance <= maxDistance )
+                    {
+                        if ( result.Distance < intersectBrushDist )
+                        {
+                            intersectBrushDist = result.Distance;
+                            intersectBrush = brush;
+                        }
+                    }
+                }
+
+                if ( intersectBrush != null )
+                {
+                    listener.OnQueryResult( intersectBrush.Fragment, intersectBrushDist + traceDistance );
+                    StopRayTracing = true;
+                }
             }
         }

branches/ogre_1.7_update/Projects/Axiom/SceneManagers/Octree/TerrainRenderable.cs

@@ -550 +550 @@
                 #endregion Methods
 
-                #region SceneObject Members
+                #region MovableObject Implementation
 
                 public override AxisAlignedBox BoundingBox
@@ -567 +567 @@
                         }
                 }
+
+        public override ulong TypeFlags
+        {
+            get
+            {
+                return (ulong)SceneQueryTypeMask.WorldGeometry;
+            }
+        }
 
                 public override void NotifyCurrentCamera( Camera camera )
@@ -605 +613 @@
                 {
                         queue.AddRenderable( this );
-                }
-
-                #endregion SceneObject Members
-
-                #region IRenderable Members
-
-                public bool CastsShadows
+        }
+
+        #endregion MovableObject Implementation
+
+        #region IRenderable Implementation
+
+        public bool CastsShadows
                 {
                         get
@@ -994 +1002 @@
                 }
 
-                #endregion
+                #endregion IRenderable Implementation
         }
 

@@ -1 +1 @@
 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZoneRenderable.cs:1012-1662
+/trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZoneRenderable.cs:1842-1861