mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-10-29 03:26:38 +00:00 
			
		
		
		
	add physic and solve a problem with window.h macro min/max
This commit is contained in:
		
							parent
							
								
									ff941b5963
								
							
						
					
					
						commit
						84dce2eb36
					
				
					 5 changed files with 12 additions and 2 deletions
				
			
		|  | @ -9,6 +9,9 @@ | ||||||
| #include <iterator> | #include <iterator> | ||||||
| #include <boost/lexical_cast.hpp> | #include <boost/lexical_cast.hpp> | ||||||
| 
 | 
 | ||||||
|  | #undef min | ||||||
|  | #undef max | ||||||
|  | 
 | ||||||
| using namespace MWGui; | using namespace MWGui; | ||||||
| 
 | 
 | ||||||
| const int StatsWindow::lineHeight = 18; | const int StatsWindow::lineHeight = 18; | ||||||
|  |  | ||||||
|  | @ -6,6 +6,9 @@ | ||||||
| 
 | 
 | ||||||
| #include <boost/lexical_cast.hpp> | #include <boost/lexical_cast.hpp> | ||||||
| 
 | 
 | ||||||
|  | #undef min | ||||||
|  | #undef max | ||||||
|  | 
 | ||||||
| using namespace MWGui; | using namespace MWGui; | ||||||
| using namespace MWGui::Widgets; | using namespace MWGui::Widgets; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,6 +1,9 @@ | ||||||
| #ifndef GAME_MWMECHANICS_STAT_H | #ifndef GAME_MWMECHANICS_STAT_H | ||||||
| #define GAME_MWMECHANICS_STAT_H | #define GAME_MWMECHANICS_STAT_H | ||||||
| 
 | 
 | ||||||
|  | #undef min | ||||||
|  | #undef max | ||||||
|  | 
 | ||||||
| #include <limits> | #include <limits> | ||||||
| 
 | 
 | ||||||
| namespace MWMechanics | namespace MWMechanics | ||||||
|  |  | ||||||
|  | @ -19,9 +19,10 @@ | ||||||
| using namespace MWRender; | using namespace MWRender; | ||||||
| using namespace Ogre; | using namespace Ogre; | ||||||
| 
 | 
 | ||||||
| MWScene::MWScene(OEngine::Render::OgreRenderer &_rend) | MWScene::MWScene(OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng) | ||||||
|   : rend(_rend) |   : rend(_rend) | ||||||
| { | { | ||||||
|  |   eng = physEng; | ||||||
|   rend.createScene("PlayerCam", 55, 5); |   rend.createScene("PlayerCam", 55, 5); | ||||||
| 
 | 
 | ||||||
|   // Set default mipmap level (NB some APIs ignore this)
 |   // Set default mipmap level (NB some APIs ignore this)
 | ||||||
|  |  | ||||||
|  | @ -46,7 +46,7 @@ namespace MWRender | ||||||
| 
 | 
 | ||||||
|     public: |     public: | ||||||
| 
 | 
 | ||||||
|         MWScene (OEngine::Render::OgreRenderer &_rend); |         MWScene (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng); | ||||||
| 
 | 
 | ||||||
|         ~MWScene(); |         ~MWScene(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue