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

Timestamp:

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

Author:

mattausch

Message:

changed to ogre 103
added readme

Location:

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src

Files:

• OgreD3D9HardwareOcclusionQuery.cpp (modified) (1 diff)
• OgreD3D9RenderWindow.cpp (modified) (19 diffs)

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9HardwareOcclusionQuery.cpp

@@ -87 +87 @@
                                 mSkipCounter = 0; 
 }
-                        //std::stringstream d; d << "count: " << mSkipCounter;
-                        //LogManager::getSingleton().logMessage(d.str());
                         if (mSkipCounter == 0)
                 {

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp

@@ -45 +45 @@
         LRESULT D3D9RenderWindow::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
         {
-                LPCREATESTRUCT lpcs;
-                D3D9RenderWindow* win;
-
-                // look up window instance
-                if( WM_CREATE != uMsg )
-                        // Get window pointer
-                        win = (D3D9RenderWindow*)GetWindowLong( hWnd, 0 );
+                if (uMsg == WM_CREATE)
+                {
+                        // copy D3D9RenderWindow* from createwindow param to userdata slot
+                        SetWindowLong(hWnd, GWL_USERDATA,
+                                (LONG)(((LPCREATESTRUCT)lParam)->lpCreateParams));
+                        return 0;
+                }
+
+                D3D9RenderWindow* win =
+                        (D3D9RenderWindow*)GetWindowLong(hWnd, GWL_USERDATA);
+
+                if (!win)
+                        return DefWindowProc(hWnd, uMsg, wParam, lParam);
 
                 switch( uMsg )
                 {
                 case WM_ACTIVATE:
-                        if( WA_INACTIVE == LOWORD( wParam ) )
-                                win->mActive = false;
-                        else
-                                win->mActive = true;
+                        win->mActive = (LOWORD(wParam) != WA_INACTIVE);
                         break;
 
-                case WM_CREATE:
-                        // Log the new window
-                        // Get CREATESTRUCT
-                        lpcs = (LPCREATESTRUCT)lParam;
-                        win = (D3D9RenderWindow*)(lpcs->lpCreateParams);
-                        // Store pointer in window user data area
-                        SetWindowLong( hWnd, 0, (long)win );
-                        win->mActive = true;
-
-                        return 0;
+                case WM_ENTERSIZEMOVE:
+                        win->mSizing = true;
                         break;
 
-                case WM_KEYDOWN:
-                        // TEMPORARY CODE
-                        // TODO - queue up keydown / keyup events with
-                        //  window name and timestamp to be processed
-                        //  by main loop
-
-                        // ESCAPE closes window
-                        /*
-                        if (wParam == VK_ESCAPE)
-                        {
-                        win->mClosed = true;
-                        return 0L;
-                        }
-                        */
+                case WM_EXITSIZEMOVE:
+                        win->windowMovedOrResized();
+                        win->mSizing = false;
                         break;
 
-                case WM_PAINT:
-                        // If we get WM_PAINT messges, it usually means our window was
-                        // comvered up, so we need to refresh it by re-showing the contents
-                        // of the current frame.
-                        if( win->mActive && win->mReady )
-                                win->update();
-                        break;
-
                 case WM_MOVE:
-                        // Move messages need to be tracked to update the screen rects
-                        // used for blitting the backbuffer to the primary
-                        // *** This doesn't need to be used to Direct3D9 ***
-                        break;
-
-                case WM_ENTERSIZEMOVE:
-                        // Previent rendering while moving / sizing
-                        win->mReady = false;
-                        break;
-
-                case WM_EXITSIZEMOVE:
-                        win->WindowMovedOrResized();
-                        win->mReady = true;
-                        break;
-
                 case WM_SIZE:
-                        // Check to see if we are losing or gaining our window.  Set the 
-                        // active flag to match
-                        if( SIZE_MAXHIDE == wParam || SIZE_MINIMIZED == wParam )
-                                win->mActive = false;
-                        else
-                        {
-                                win->mActive = true;
-                                if( win->mReady )
-                                        win->WindowMovedOrResized();
-                        }
+                        if (!win->mSizing)
+                                win->windowMovedOrResized();
                         break;
 
@@ -134 +87 @@
 
                 case WM_CLOSE:
-                        DestroyWindow( win->mHWnd );
+                        win->destroy(); // cleanup and call DestroyWindow
                         win->mClosed = true;
                         return 0;
@@ -147 +100 @@
         {
                 mIsFullScreen = false;
-                mIsSwapChain = deviceIfSwapChain != NULL;
+                mIsSwapChain = (deviceIfSwapChain != NULL);
+                mIsExternal = false;
                 mHWnd = 0;
                 mActive = false;
-                mReady = false;
+                mSizing = false;
                 mClosed = false;
         }
@@ -161 +115 @@
                         LPDIRECT3DDEVICE9 mpD3DDevice = mDriver->getD3DDevice();
                         SAFE_RELEASE( mpD3DDevice );
-                        mDriver->setD3DDevice( mpD3DDevice );
+                        mDriver->setD3DDevice( NULL );
                 }
         }
@@ -192 +146 @@
                 String title = name;
                 unsigned int colourDepth = 32;
-                unsigned int left = 0; // Defaults to screen center
-                unsigned int top = 0; // Defaults to screen center
+                int left = -1; // Defaults to screen center
+                int top = -1; // Defaults to screen center
                 bool depthBuffer = true;
+                String border = "";
+                bool outerSize = false;
                 
                 if(miscParams)
@@ -203 +159 @@
                         opt = miscParams->find("left");
                         if(opt != miscParams->end())
-                                left = StringConverter::parseUnsignedInt(opt->second);
+                                left = StringConverter::parseInt(opt->second);
                         // top (y)
                         opt = miscParams->find("top");
                         if(opt != miscParams->end())
-                                top = StringConverter::parseUnsignedInt(opt->second);
+                                top = StringConverter::parseInt(opt->second);
                         // Window title
                         opt = miscParams->find("title");
                         if(opt != miscParams->end())
                                 title = opt->second;
+                        // parentWindowHandle           -> parentHWnd
+                        opt = miscParams->find("parentWindowHandle");
+                        if(opt != miscParams->end())
+                                parentHWnd = (HWND)StringConverter::parseUnsignedInt(opt->second);
                         // externalWindowHandle         -> externalHandle
                         opt = miscParams->find("externalWindowHandle");
@@ -240 +200 @@
                         if(opt != miscParams->end())
                                 mFSAAQuality = StringConverter::parseUnsignedInt(opt->second);
+                        // window border style
+                        opt = miscParams->find("border");
+                        if(opt != miscParams->end())
+                                border = opt->second;
+                        // set outer dimensions?
+                        opt = miscParams->find("outerDimensions");
+                        if(opt != miscParams->end())
+                                outerSize = StringConverter::parseBool(opt->second);
                 }
                 
@@ -249 +217 @@
                 if (!externalHandle)
                 {
-                        DWORD dwStyle = (fullScreen ? WS_POPUP : WS_OVERLAPPEDWINDOW) | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+                        DWORD dwStyle = WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
                         RECT rc;
 
                         mWidth = width;
                         mHeight = height;
+                        mTop = top;
+                        mLeft = left;
 
                         if (!fullScreen)
                         {
-                                // Calculate window dimensions required to get the requested client area
+                                if (parentHWnd)
+                                {
+                                        dwStyle |= WS_CHILD;
+                                }
+                                else
+                                {
+                                        if (border == "none")
+                                                dwStyle |= WS_POPUP;
+                                        else if (border == "fixed")
+                                                dwStyle |= WS_OVERLAPPED | WS_BORDER | WS_CAPTION |
+                                                WS_SYSMENU | WS_MINIMIZEBOX;
+                                        else
+                                                dwStyle |= WS_OVERLAPPEDWINDOW;
+                                }
+
+                                if (!outerSize)
+                                {
+                                        // Calculate window dimensions required
+                                        // to get the requested client area
                                 SetRect(&rc, 0, 0, mWidth, mHeight);
                                 AdjustWindowRect(&rc, dwStyle, false);
@@ -264 +252 @@
 
                                 // Clamp width and height to the desktop dimensions
-                                if (mWidth > (unsigned)GetSystemMetrics(SM_CXSCREEN))
-                                        mWidth = (unsigned)GetSystemMetrics(SM_CXSCREEN);
-                                if (mHeight > (unsigned)GetSystemMetrics(SM_CYSCREEN))
-                                        mHeight = (unsigned)GetSystemMetrics(SM_CYSCREEN);
-
-                                if (!left)
-                                        mLeft = (GetSystemMetrics(SM_CXSCREEN) / 2) - (mWidth / 2);
-                                else
-                                        mLeft = left;
-                                if (!top)
-                                        mTop = (GetSystemMetrics(SM_CYSCREEN) / 2) - (mHeight / 2);
-                                else
-                                        mTop = top;
+                                        int screenw = GetSystemMetrics(SM_CXSCREEN);
+                                        int screenh = GetSystemMetrics(SM_CYSCREEN);
+                                        if ((int)mWidth > screenw)
+                                                mWidth = screenw;
+                                        if ((int)mHeight > screenh)
+                                                mHeight = screenh;
+                                        if (mLeft < 0)
+                                                mLeft = (screenw - mWidth) / 2;
+                                        if (mTop < 0)
+                                                mTop = (screenh - mHeight) / 2;
+                                }
                         }
                         else
+                        {
+                                dwStyle |= WS_POPUP;
                                 mTop = mLeft = 0;
+                        }
 
                         // Register the window class
                         // NB allow 4 bytes of window data for D3D9RenderWindow pointer
-            WNDCLASS wndClass = { CS_HREDRAW | CS_VREDRAW, WndProc, 0, 4, hInst,
-                                LoadIcon( NULL, IDI_APPLICATION ),
-                                LoadCursor( NULL, IDC_ARROW ),
-                                (HBRUSH)GetStockObject( BLACK_BRUSH ), NULL,
-                                TEXT(title.c_str()) };
-                        RegisterClass( &wndClass );
+                        WNDCLASS wc = { 0, WndProc, 0, 0, hInst,
+                                LoadIcon(0, IDI_APPLICATION), LoadCursor(NULL, IDC_ARROW),
+                                (HBRUSH)GetStockObject(BLACK_BRUSH), 0, "OgreD3D9Wnd" };
+                        RegisterClass(&wc);
 
                         // Create our main window
                         // Pass pointer to self
-                        HWND hWnd = CreateWindow(TEXT(title.c_str()),
-                                                                         TEXT(title.c_str()),
-                                                                         dwStyle, mLeft, mTop,
-                                                                         mWidth, mHeight, 0L, 0L, hInst, this);
-                        GetClientRect(hWnd,&rc);
+                        mIsExternal = false;
+                        mHWnd = CreateWindow("OgreD3D9Wnd", title.c_str(), dwStyle,
+                                mLeft, mTop, mWidth, mHeight, parentHWnd, 0, hInst, this);
+                }
+                else
+                {
+                        mHWnd = externalHandle;
+                        mIsExternal = true;
+                }
+
+                        RECT rc;
+                // top and left represent outer window coordinates
+                GetWindowRect(mHWnd, &rc);
+                mTop = rc.top;
+                mLeft = rc.left;
+                // width and height represent interior drawable area
+                        GetClientRect(mHWnd,&rc);
                         mWidth = rc.right;
                         mHeight = rc.bottom;
 
-                        ShowWindow(hWnd, SW_SHOWNORMAL);
-                        UpdateWindow(hWnd);
-
-                        mHWnd = hWnd;
-                        // Store info
                         mName = name;
                         mIsDepthBuffered = depthBuffer;
                         mIsFullScreen = fullScreen;
-                }
-                else
-                {
-                        mHWnd = externalHandle;
-                        ShowWindow(mHWnd, SW_SHOWNORMAL);
-                        UpdateWindow(mHWnd);
-                        RECT rc;
-                        GetClientRect(mHWnd,&rc);
-                        mWidth = rc.right;
-                        mHeight = rc.bottom;
-                        mLeft = rc.left;
-                        mTop = rc.top;
-                        mName = name;
-                        mIsDepthBuffered = depthBuffer;
-                        mIsFullScreen = fullScreen;
-                }
-
-                // track colour depth
                 mColourDepth = colourDepth;
 
@@ -337 +313 @@
                 createD3DResources();
 
-                mReady = true;
+                mActive = true;
         }
 
@@ -365 +341 @@
                 md3dpp.BackBufferWidth                  = mWidth;
                 md3dpp.BackBufferHeight                 = mHeight;
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         //md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
@@ -504 +481 @@
         }
 
-        
-        void D3D9RenderWindow::destroy()
+        void D3D9RenderWindow::destroyD3DResources()
         {
                 mpRenderSurface = 0;
@@ -515 +491 @@
                 else
                 {
-                        // ignore deptzh buffer, access device through driver
+                        // ignore depth buffer, access device through driver
                         mpRenderZBuffer = 0;
                         LPDIRECT3DDEVICE9 mpD3DDevice = mDriver->getD3DDevice();
                         SAFE_RELEASE(mpD3DDevice);
-                        mDriver->setD3DDevice( mpD3DDevice );
+                        mDriver->setD3DDevice(NULL);
+                }
+        }
+
+        void D3D9RenderWindow::destroy()
+        {
+                if (mHWnd && !mIsExternal)
                         DestroyWindow( mHWnd );
-                }
                 mHWnd = 0;
+                mActive = false;
+        }
+
+        bool D3D9RenderWindow::isVisible() const
+        {
+                return (mHWnd && !IsIconic(mHWnd));
+        }
+
+        void D3D9RenderWindow::reposition(int top, int left)
+        {
+                if (mHWnd && !mIsFullScreen)
+                {
+                        SetWindowPos(mHWnd, 0, top, left, 0, 0,
+                                SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+                }
         }
 
         void D3D9RenderWindow::resize( unsigned int width, unsigned int height )
         {
+                if (mHWnd && !mIsFullScreen)
+                {
+                        RECT rc = { 0, 0, width, height };
+                        AdjustWindowRect(&rc, GetWindowLong(mHWnd, GWL_STYLE), false);
+                        width = rc.right - rc.left;
+                        height = rc.bottom - rc.top;
+                        SetWindowPos(mHWnd, 0, 0, 0, width, height,
+                                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+                }
+        }
+
+        void D3D9RenderWindow::windowMovedOrResized()
+        {
+                if (!mHWnd || IsIconic(mHWnd))
+                        return;
+
+                RECT rc;
+                // top and left represent outer window position
+                GetWindowRect(mHWnd, &rc);
+                mTop = rc.top;
+                mLeft = rc.left;
+                // width and height represent drawable area only
+                GetClientRect(mHWnd, &rc);
+                unsigned int width = rc.right;
+                unsigned int height = rc.bottom;
+                if (mWidth == width && mHeight == height)
+                        return;
                 
                 if (mIsSwapChain) 
@@ -584 +607 @@
                         }
                 }
-                // primary windows would reset the device - not implemented yet.
+                // primary windows must reset the device
                 else 
                 {
-                        mWidth = width;
-                        mHeight = height;
+                        md3dpp.BackBufferWidth = mWidth = width;
+                        md3dpp.BackBufferHeight = mHeight = height;
+                        static_cast<D3D9RenderSystem*>(
+                                Root::getSingleton().getRenderSystem())->_notifyDeviceLost();
                 }
 
@@ -595 +620 @@
                 while( it != mViewportList.end() )
                         (*it++).second->_updateDimensions();
-                // TODO - resize window
         }
 
@@ -617 +641 @@
                                 static_cast<D3D9RenderSystem*>(
                                         Root::getSingleton().getRenderSystem())->_notifyDeviceLost();
-                                Sleep(500);
-
                         }
                         else if( FAILED(hr) )
@@ -668 +690 @@
                         return;
                 }
-        }
-
-        void D3D9RenderWindow::WindowMovedOrResized()
-        {
-                // TODO
         }
 
@@ -863 +880 @@
                                 else
                                         SAFE_RELEASE (mpRenderZBuffer);
-                                Sleep(500);
+                                Sleep(50);
                                 return;
                         }
-                        else if (hr == D3DERR_DEVICENOTRESET)
+                        else
                         {
                                 // device lost, and we can reset
@@ -875 +892 @@
                                 {
                                         // Wait a while
-                                        Sleep(500);
+                                        Sleep(50);
                                         return;
                                 }