mirror of
https://github.com/minetest/irrlicht.git
synced 2024-12-25 18:20:30 +01:00
Clean-up include dependencies
Files in irr namespace Also some spelling fixes git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6526 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
80ce85ecc2
commit
f83697d0bb
@ -9,7 +9,6 @@
|
|||||||
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
|
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
|
||||||
|
|
||||||
#include "CIrrDeviceStub.h"
|
#include "CIrrDeviceStub.h"
|
||||||
#include "IrrlichtDevice.h"
|
|
||||||
#include "IImagePresenter.h"
|
#include "IImagePresenter.h"
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
@ -71,7 +70,7 @@ namespace irr
|
|||||||
virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
|
virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
|
||||||
|
|
||||||
//! Notifies the device, that it has been resized
|
//! Notifies the device, that it has been resized
|
||||||
/** Must be publis as it is called from free function (event handler) */
|
/** Must be public as it is called from free function (event handler) */
|
||||||
void OnResized();
|
void OnResized();
|
||||||
|
|
||||||
//! Sets if the window should be resizable in windowed mode.
|
//! Sets if the window should be resizable in windowed mode.
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||||
|
|
||||||
#include "CLogger.h"
|
#include "CLogger.h"
|
||||||
|
#include "os.h"
|
||||||
|
#include "irrString.h"
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
|
@ -6,8 +6,6 @@
|
|||||||
#define IRR_C_LOGGER_H_INCLUDED
|
#define IRR_C_LOGGER_H_INCLUDED
|
||||||
|
|
||||||
#include "ILogger.h"
|
#include "ILogger.h"
|
||||||
#include "os.h"
|
|
||||||
#include "irrString.h"
|
|
||||||
#include "IEventReceiver.h"
|
#include "IEventReceiver.h"
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
// Written by Michael Zeilfelder
|
// Written by Michael Zeilfelder
|
||||||
|
|
||||||
#include "CProfiler.h"
|
#include "CProfiler.h"
|
||||||
|
#include "IrrCompileConfig.h"
|
||||||
#include "CTimer.h"
|
#include "CTimer.h"
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
#ifndef IRR_C_PROFILER_H_INCLUDED
|
#ifndef IRR_C_PROFILER_H_INCLUDED
|
||||||
#define IRR_C_PROFILER_H_INCLUDED
|
#define IRR_C_PROFILER_H_INCLUDED
|
||||||
|
|
||||||
#include "IrrCompileConfig.h"
|
|
||||||
#include "IProfiler.h"
|
#include "IProfiler.h"
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
|
@ -53,7 +53,7 @@ namespace irr
|
|||||||
//! Stops the game timer.
|
//! Stops the game timer.
|
||||||
/** The timer is reference counted, which means everything which calls
|
/** The timer is reference counted, which means everything which calls
|
||||||
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
|
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
|
||||||
corretly again. */
|
correctly again. */
|
||||||
virtual void stop() IRR_OVERRIDE
|
virtual void stop() IRR_OVERRIDE
|
||||||
{
|
{
|
||||||
os::Timer::stopTimer();
|
os::Timer::stopTimer();
|
||||||
@ -62,7 +62,7 @@ namespace irr
|
|||||||
//! Starts the game timer.
|
//! Starts the game timer.
|
||||||
/** The timer is reference counted, which means everything which calls
|
/** The timer is reference counted, which means everything which calls
|
||||||
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
|
stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
|
||||||
corretly again. */
|
correctly again. */
|
||||||
virtual void start() IRR_OVERRIDE
|
virtual void start() IRR_OVERRIDE
|
||||||
{
|
{
|
||||||
os::Timer::startTimer();
|
os::Timer::startTimer();
|
||||||
|
@ -5,11 +5,12 @@
|
|||||||
#define E_PROFILE_IDS_H_INCLUDED__
|
#define E_PROFILE_IDS_H_INCLUDED__
|
||||||
|
|
||||||
#include "IrrCompileConfig.h"
|
#include "IrrCompileConfig.h"
|
||||||
|
|
||||||
|
#ifdef _IRR_COMPILE_WITH_PROFILING_
|
||||||
#include "limits.h"
|
#include "limits.h"
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
#ifdef _IRR_COMPILE_WITH_PROFILING_
|
|
||||||
enum EPROFILE_ID
|
enum EPROFILE_ID
|
||||||
{
|
{
|
||||||
// We use negative ID's to avoid clashing with user application id's.
|
// We use negative ID's to avoid clashing with user application id's.
|
||||||
@ -32,7 +33,8 @@ namespace irr
|
|||||||
EPID_OC_RENDER,
|
EPID_OC_RENDER,
|
||||||
EPID_OC_CALCPOLYS
|
EPID_OC_CALCPOLYS
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
} // end namespace irr
|
} // end namespace irr
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // E_PROFILE_IDS_H_INCLUDED__
|
#endif // E_PROFILE_IDS_H_INCLUDED__
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
#include "IrrCompileConfig.h" // for endian check
|
#include "IrrCompileConfig.h" // for endian check
|
||||||
#include "irrTypes.h"
|
#include "irrTypes.h"
|
||||||
#include "irrString.h"
|
|
||||||
#include "path.h"
|
#include "path.h"
|
||||||
#include "ILogger.h"
|
#include "ILogger.h"
|
||||||
#include "ITimer.h"
|
#include "ITimer.h"
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
// under the zlib license, reproduced below.
|
// under the zlib license, reproduced below.
|
||||||
|
|
||||||
#include "irrTypes.h"
|
#include "irrTypes.h"
|
||||||
#include "irrString.h"
|
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user