The commit also establishes a precedent of leaving off the `virtual` keyword in overrides. Although not strictly necessary, I believe this is good for readability because it makes it clear it is an override and not a pure virtual function, and it helps keep line lengths shorter. We should move towards eliminating the macro altogether, but the definition has been left in with a note on deprecation so that in-progress work will not suffer merge conflicts.
		
			
				
	
	
		
			42 lines
		
	
	
		
			1015 B
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			42 lines
		
	
	
		
			1015 B
		
	
	
	
		
			C++
		
	
	
	
	
	
| // Copyright (C) 2002-2012 Nikolaus Gebhardt
 | |
| // This file is part of the "Irrlicht Engine".
 | |
| // For conditions of distribution and use, see copyright notice in irrlicht.h
 | |
| 
 | |
| #ifndef __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
 | |
| #define __C_SCENE_COLLISION_MANAGER_H_INCLUDED__
 | |
| 
 | |
| #include "ISceneCollisionManager.h"
 | |
| #include "ISceneManager.h"
 | |
| #include "IVideoDriver.h"
 | |
| 
 | |
| namespace irr
 | |
| {
 | |
| namespace scene
 | |
| {
 | |
| 
 | |
| 	class CSceneCollisionManager : public ISceneCollisionManager
 | |
| 	{
 | |
| 	public:
 | |
| 
 | |
| 		//! constructor
 | |
| 		CSceneCollisionManager(ISceneManager* smanager, video::IVideoDriver* driver);
 | |
| 
 | |
| 		//! destructor
 | |
| 		virtual ~CSceneCollisionManager();
 | |
| 
 | |
| 		//! Returns a 3d ray which would go through the 2d screen coordinates.
 | |
| 		virtual core::line3d<f32> getRayFromScreenCoordinates(
 | |
| 			const core::position2d<s32> & pos, const ICameraSceneNode* camera = 0) override;
 | |
| 
 | |
| 	private:
 | |
| 
 | |
| 		ISceneManager* SceneManager;
 | |
| 		video::IVideoDriver* Driver;
 | |
| 	};
 | |
| 
 | |
| 
 | |
| } // end namespace scene
 | |
| } // end namespace irr
 | |
| 
 | |
| #endif
 |