Changeset 193 for trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/include

Timestamp:

08/03/05 14:12:41 (20 years ago)

Author:

mattausch

Message:

changed to ogre 103
added readme

Location:

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/include

Files:

• OgreD3D9RenderWindow.h (modified) (3 diffs)
• OgreD3D9Texture.h (modified) (2 diffs)

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/include/OgreD3D9RenderWindow.h

@@ -46 +46 @@
                     bool fullScreen, const NameValuePairList *miscParams);
                 void destroy(void);
-                bool isActive() const { return mActive; }
+                bool isVisible() const;
                 bool isClosed() const { return mClosed; }
-                void reposition( int left, int top ) {}
+                void reposition(int left, int top);
                 void resize( unsigned int width, unsigned int height );
                 void swapBuffers( bool waitForVSync = true );
@@ -61 +61 @@
                 */
                 void writeContentsToFile(const String& filename);
+                bool requiresTextureFlipping() const { return false; }
 
+                // Method for dealing with resize / move & 3d library
+                void windowMovedOrResized();
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
                 uchar *getBufferContents(int &dimx, int &dimy);
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 
-                bool requiresTextureFlipping() const { return false; }
-
-                // Method for dealing with resize / move & 3d library
-                virtual void WindowMovedOrResized(void);
-
-                bool isReady() const { return mReady; }
-                void setReady(bool set) { mReady = set; }
-                void setActive(bool set) { mActive = set; }
                 /// Get the presentation parameters used with this window
                 D3DPRESENT_PARAMETERS* getPresentationParameters(void) 
                 { return &md3dpp; }
+
                 /// @copydoc RenderTarget::update
-                void update(void);
+                void update();
 
                 /** Create (or recreate) the D3D device or SwapChain for this window.
                 */
-                void createD3DResources(void);
+                void createD3DResources();
+        
+                /** Destroy the D3D device or SwapChain for this window.
+                */
+                void destroyD3DResources();
         
         protected:
@@ -88 +88 @@
                 D3D9Driver *mDriver;                    // D3D9 driver
                 HWND    mHWnd;                                  // Win32 Window handle
-                bool    mActive;                                // Is active i.e. visible
-                bool    mReady;                                 // Is ready i.e. available for update
+                bool    mIsExternal;                    // window not created by Ogre
+                bool    mSizing;
                 bool    mClosed;
                 bool    mIsSwapChain;                   // Is this a secondary window?

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/include/OgreD3D9Texture.h

@@ -161 +161 @@
                 static PixelFormat _getClosestSupportedPF(PixelFormat ogrePF);
 
-                /// For dealing with lost devices - release the resource if in the default pool
-                void releaseIfDefaultPool(void);
-                /// For dealing with lost devices - recreate the resource if in the default pool
-                void recreateIfDefaultPool(LPDIRECT3DDEVICE9 pDev);
+                /// For dealing with lost devices - release the resource if in the default pool (and return true)
+                bool releaseIfDefaultPool(void);
+                /// For dealing with lost devices - recreate the resource if in the default pool (and return true)
+                bool recreateIfDefaultPool(LPDIRECT3DDEVICE9 pDev);
 
     };
@@ -243 +243 @@
                 (mName + "_PRIVATE##", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
                 texType, mWidth, mHeight, 0, internalFormat, TU_RENDERTARGET );
+                        mPrivateTex->load();
         }