sinbad | 10 Aug 00:50 2006
Picon
Picon

ogrenew/RenderSystems/Direct3D9/src OgreD3D9RenderWindow.cpp, 1.49, 1.50

Update of /cvsroot/ogre/ogrenew/RenderSystems/Direct3D9/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14919/RenderSystems/Direct3D9/src

Modified Files:
	OgreD3D9RenderWindow.cpp 
Log Message:
Dagon merged into HEAD

Index: OgreD3D9RenderWindow.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** OgreD3D9RenderWindow.cpp	31 May 2006 18:48:09 -0000	1.49
--- OgreD3D9RenderWindow.cpp	9 Aug 2006 22:50:49 -0000	1.50
***************
*** 52,55 ****
--- 52,56 ----
  		mSizing = false;
  		mClosed = false;
+ 		mDisplayFrequency = 0;
  	}

***************
*** 83,87 ****
  		mFSAAQuality = 0;
  		mVSync = false;
- 		unsigned int displayFrequency = 0;
  		String title = name;
  		unsigned int colourDepth = 32;
--- 84,87 ----
***************
*** 124,128 ****
  			opt = miscParams->find("displayFrequency");
  			if(opt != miscParams->end())
! 				displayFrequency = StringConverter::parseUnsignedInt(opt->second);
  			// colourDepth
  			opt = miscParams->find("colourDepth");
--- 124,128 ----
  			opt = miscParams->find("displayFrequency");
  			if(opt != miscParams->end())
! 				mDisplayFrequency = StringConverter::parseUnsignedInt(opt->second);
  			// colourDepth
  			opt = miscParams->find("colourDepth");
***************
*** 290,293 ****
--- 290,295 ----
  		md3dpp.BackBufferWidth			= mWidth;
  		md3dpp.BackBufferHeight			= mHeight;
+ 		md3dpp.FullScreen_RefreshRateInHz = mIsFullScreen ? mDisplayFrequency : 0;
+ 		

  		if (mVSync)

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Gmane