Changeset 657 for OGRE/trunk/ogre_changes/OgreMain/include/OgreRenderSystem.h

Timestamp:

02/20/06 19:06:03 (18 years ago)

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

File:

• OGRE/trunk/ogre_changes/OgreMain/include/OgreRenderSystem.h (modified) (7 diffs)

OGRE/trunk/ogre_changes/OgreMain/include/OgreRenderSystem.h

@@ -42 +42 @@
 #include "OgreGpuProgram.h"
 #include "OgrePlane.h"
+#include "OgreIteratorWrappers.h"
 
 namespace Ogre
@@ -173 +174 @@
         virtual void setConfigOption(const String &name, const String &value) = 0;
 
-                virtual HardwareOcclusionQuery* createHardwareOcclusionQuery() = 0;
+                /** Create an object for performing hardware occlusion queries. 
+                */
+                virtual HardwareOcclusionQuery* createHardwareOcclusionQuery(void) = 0;
+
+                /** Destroy a hardware occlusion query object. 
+                */
+                virtual void destroyHardwareOcclusionQuery(HardwareOcclusionQuery *hq);
 
         /** Validates the options set for the rendering system, returning a message if there are problems.
@@ -295 +302 @@
                                 Description: External window handle, for embedding the OGRE context
                                 Values: positive integer for W32 (HWND handle)
-                                        posint:posint:posint for GLX (display:screen:windowHandle)
+                                        poslong:posint:poslong (display*:screen:windowHandle) or
+                                        poslong:posint:poslong:poslong (display*:screen:windowHandle:XVisualInfo*) for GLX
                                 Default: 0 (None)
                                 **
@@ -301 +309 @@
                                 Description: Parent window handle, for embedding the OGRE context
                                 Values: positive integer for W32 (HWND handle)
-                                        posint:posint:posint for GLX (display:screen:windowHandle)
+                                        poslong:posint:poslong for GLX (display*:screen:windowHandle)
                                 Default: 0 (None)
                                 **
@@ -392 +400 @@
         virtual RenderTarget * detachRenderTarget( const String &name );
 
+                /// Iterator over RenderTargets
+                typedef MapIterator<Ogre::RenderTargetMap> RenderTargetIterator;
+
+                /** Returns a specialised MapIterator over all render targets attached to the RenderSystem. */
+                virtual RenderTargetIterator getRenderTargetIterator(void) {
+                        return RenderTargetIterator( mRenderTargets.begin(), mRenderTargets.end() );
+                }
         /** Returns a description of an error code.
         */
@@ -947 +962 @@
         virtual Real getMaximumDepthInputValue(void) = 0;
 
+                /** Defines a listener on the custom events that this render system 
+                        can raise.
+                @see RenderSystem::addListener
+                */
+                class _OgreExport Listener
+                {
+                public:
+                        Listener() {}
+                        virtual ~Listener() {}
+
+                        /** A rendersystem-specific event occurred.
+                        @param eventName The name of the event which has occurred
+                        @param parameters A list of parameters that may belong to this event,
+                                may be null if there are no parameters
+                        */
+                        virtual void eventOccurred(const String& eventName, 
+                                const NameValuePairList* parameters = 0) = 0;
+                };
+                /** Adds a listener to the custom events that this render system can raise.
+                @remarks
+                        Some render systems have quite specific, internally generated events 
+                        that the application may wish to be notified of. Many applications
+                        don't have to worry about these events, and can just trust OGRE to 
+                        handle them, but if you want to know, you can add a listener here.
+                @par
+                        Events are raised very generically by string name. Perhaps the most 
+                        common example of a render system specific event is the loss and 
+                        restoration of a device in DirectX; which OGRE deals with, but you 
+                        may wish to know when it happens. 
+                @see RenderSystem::getRenderSystemEvents
+                */
+                virtual void addListener(Listener* l);
+                /** Remove a listener to the custom events that this render system can raise.
+                */
+                virtual void removeListener(Listener* l);
+
+                /** Gets a list of the rendersystem specific events that this rendersystem
+                        can raise.
+                @see RenderSystem::addListener
+                */
+                virtual const StringVector& getRenderSystemEvents(void) const { return mEventNames; }
     protected:
 
@@ -984 +1040 @@
 
         bool mInvertVertexWinding;
+
+                /// List of names of events this rendersystem may raise
+                StringVector mEventNames;
+
+                /// Internal method for firing a rendersystem event
+                virtual void fireEvent(const String& name, const NameValuePairList* params = 0);
+
+                typedef std::list<Listener*> ListenerList;
+                ListenerList mEventListeners;
+
+                typedef std::list<HardwareOcclusionQuery*> HardwareOcclusionQueryList;
+                HardwareOcclusionQueryList mHwOcclusionQueries;
+
+
     };
 }