Changeset 657 for OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/include

Timestamp:

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

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

Location:

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/include

Files:

• OgreD3D7RenderWindow.h (modified) (2 diffs)
• OgreD3D7Texture.h (modified) (3 diffs)

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/include/OgreD3D7RenderWindow.h

@@ -119 +119 @@
         */
         void writeContentsToFile(const String& filename);
-
+        // DirectDraw Methods
+                void createDDSurfaces(void);
+                void releaseDDSurfaces(void);
+                void restoreDDSurfaces(void);
+                void createDepthBuffer(void);
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
                 uchar *getBufferContents(int &dimx, int &dimy);
@@ -159 +163 @@
         LPDIRECT3DDEVICE7 mlpD3DDevice;
 
-        // DirectDraw Methods
-        void createDDSurfaces(void);
-        void releaseDDSurfaces(void);
-        void restoreDDSurfaces(void);
-        void createDepthBuffer(void);
 
         // Method for dealing with resize / move & 3d library

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/include/OgreD3D7Texture.h

@@ -53 +53 @@
         LPDIRECTDRAWSURFACE7 getDDSurface(void);
 
-        /// @copydoc Texture::createInternalResources
-        void createInternalResources(void);
-
                 /// @copydoc Texture::getBuffer
                 HardwarePixelBufferSharedPtr getBuffer(size_t face, size_t mipmap);
@@ -63 +60 @@
                 static PixelFormat closestD3DXFormat( PixelFormat format );
                 static bool OgreFormat_to_DDPixelFormat( PixelFormat format, DDPIXELFORMAT & out );
+
+                /// Restore this texture from a lost device
+                void restoreFromLostDevice(void);
+
     protected:
         IDirect3DDevice7 * mD3DDevice;       ///< A pointer to the Direct3D device.
@@ -71 +72 @@
                 typedef std::vector<HardwarePixelBufferSharedPtr> SurfaceList;
                 SurfaceList                                             mSurfaceList;
+                /// Are we restoring from a lost device?
+                bool mRestoring;
+
         
 
         /// @copydoc Resource::loadImpl
         void loadImpl(void);
-        /// @copydoc Resource::unloadImpl
-        void unloadImpl(void);
+                /// @copydoc Texture::createInternalResourcesImpl
+                void createInternalResourcesImpl(void);
+        /// @copydoc Resource::freeInternalResourcesImpl
+        void freeInternalResourcesImpl(void);
                 
                 void createSurface2D(void);