Renamed setResizeable to setResizable (!)

Tidied the Xcode project some more and fixed compiling. Didn't implement CIrrDeviceOSX::minimizeWindow yet

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2264 dfc29bdd-3216-0410-991c-e03cc46cb475
master
bitplane 2009-03-10 02:15:12 +00:00
parent bee75f48fa
commit 738954d3cd
18 changed files with 1192 additions and 1127 deletions

View File

@ -2,7 +2,7 @@ Changes in 1.6
- Added SGI RGB file reader by Gary Conway, for loading Silicon Graphics .rgb, .rgba, .sgi, .int and .inta textures
- Renamed setResizeAble to setResizeable
- Renamed setResizeAble to setResizable
- Added new device method minimizeWindow which minimizes the window (just as if the minimize button has been clicked).

View File

@ -1,237 +1,237 @@
// Copyright (C) 2002-2009 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __I_IRRLICHT_DEVICE_H_INCLUDED__
#define __I_IRRLICHT_DEVICE_H_INCLUDED__
#include "IReferenceCounted.h"
#include "dimension2d.h"
#include "IVideoDriver.h"
#include "EDriverTypes.h"
#include "IEventReceiver.h"
#include "ICursorControl.h"
#include "IVideoModeList.h"
#include "ITimer.h"
#include "IOSOperator.h"
namespace irr
{
class ILogger;
class IEventReceiver;
namespace io {
class IFileSystem;
} // end namespace io
namespace gui {
class IGUIEnvironment;
} // end namespace gui
namespace scene {
class ISceneManager;
} // end namespace scene
//! The Irrlicht device. You can create it with createDevice() or createDeviceEx().
/** This is the most important class of the Irrlicht Engine. You can access everything
in the engine if you have a pointer to an instance of this class.
There should be only one instance of this class at any time.
*/
class IrrlichtDevice : public virtual IReferenceCounted
{
public:
//! Runs the device.
/** Also increments the virtual timer by calling
ITimer::tick();. You can prevent this
by calling ITimer::stop(); before and ITimer::start() after
calling IrrlichtDevice::run(). Returns false if device wants
to be deleted. Use it in this way:
\code
while(device->run())
{
// draw everything here
}
\endcode
If you want the device to do nothing if the window is inactive
(recommended), use the slightly enhanced code shown at isWindowActive().
Note if you are running Irrlicht inside an external, custom
created window: Calling Device->run() will cause Irrlicht to
dispatch windows messages internally.
If you are running Irrlicht in your own custom window, you can
also simply use your own message loop using GetMessage,
DispatchMessage and whatever and simply don't use this method.
But note that Irrlicht will not be able to fetch user input
then. See irr::SIrrlichtCreationParameters::WindowId for more
informations and example code.
*/
virtual bool run() = 0;
//! Cause the device to temporarily pause execution and let other processes run.
/** This should bring down processor usage without major
performance loss for Irrlicht */
virtual void yield() = 0;
//! Pause execution and let other processes to run for a specified amount of time.
/** It may not wait the full given time, as sleep may be interrupted
\param timeMs: Time to sleep for in milisecs.
\param pauseTimer: If true, pauses the device timer while sleeping
*/
virtual void sleep(u32 timeMs, bool pauseTimer=false) = 0;
//! Provides access to the video driver for drawing 3d and 2d geometry.
/** \return Pointer the video driver. */
virtual video::IVideoDriver* getVideoDriver() = 0;
//! Provides access to the virtual file system.
/** \return Pointer to the file system. */
virtual io::IFileSystem* getFileSystem() = 0;
//! Provides access to the 2d user interface environment.
/** \return Pointer to the gui environment. */
virtual gui::IGUIEnvironment* getGUIEnvironment() = 0;
//! Provides access to the scene manager.
/** \return Pointer to the scene manager. */
virtual scene::ISceneManager* getSceneManager() = 0;
//! Provides access to the cursor control.
/** \return Pointer to the mouse cursor control interface. */
virtual gui::ICursorControl* getCursorControl() = 0;
//! Provides access to the message logger.
/** \return Pointer to the logger. */
virtual ILogger* getLogger() = 0;
//! Gets a list with all video modes available.
/** If you are confused now, because you think you have to
create an Irrlicht Device with a video mode before being able
to get the video mode list, let me tell you that there is no
need to start up an Irrlicht Device with EDT_DIRECT3D8,
EDT_OPENGL or EDT_SOFTWARE: For this (and for lots of other
reasons) the null driver, EDT_NULL exists.
\return Pointer to a list with all video modes supported
by the gfx adapter. */
virtual video::IVideoModeList* getVideoModeList() = 0;
//! Provides access to the operation system operator object.
/** The OS operator provides methods for
getting system specific informations and doing system
specific operations, such as exchanging data with the clipboard
or reading the operation system version.
\return Pointer to the OS operator. */
virtual IOSOperator* getOSOperator() = 0;
//! Provides access to the engine's timer.
/** The system time can be retrieved by it as
well as the virtual time, which also can be manipulated.
\return Pointer to the ITimer object. */
virtual ITimer* getTimer() = 0;
//! Sets the caption of the window.
/** \param text: New text of the window caption. */
virtual void setWindowCaption(const wchar_t* text) = 0;
//! Returns if the window is active.
/** If the window is inactive,
nothing needs to be drawn. So if you don't want to draw anything
when the window is inactive, create your drawing loop this way:
\code
while(device->run())
{
if (device->isWindowActive())
{
// draw everything here
}
else
device->yield();
}
\endcode
\return True if window is active. */
virtual bool isWindowActive() const = 0;
//! Checks if the Irrlicht window has focus
/** \return True if window has focus. */
virtual bool isWindowFocused() const = 0;
//! Checks if the Irrlicht window is minimized
/** \return True if window is minimized. */
virtual bool isWindowMinimized() const = 0;
//! Checks if the Irrlicht window is running in fullscreen mode
/** \return True if window is fullscreen. */
virtual bool isFullscreen() const = 0;
//! Get the current color format of the window
/** \return Color format of the window. */
virtual video::ECOLOR_FORMAT getColorFormat() const = 0;
//! Notifies the device that it should close itself.
/** IrrlichtDevice::run() will always return false after closeDevice() was called. */
virtual void closeDevice() = 0;
//! Get the version of the engine.
/** The returned string
will look like this: "1.2.3" or this: "1.2".
\return String which contains the version. */
virtual const c8* getVersion() const = 0;
//! Sets a new user event receiver which will receive events from the engine.
/** Return true in IEventReceiver::OnEvent to prevent the event from continuing along
the chain of event receivers. The path that an event takes through the system depends
on its type. See irr::EEVENT_TYPE for details.
\param receiver New receiver to be used. */
virtual void setEventReceiver(IEventReceiver* receiver) = 0;
//! Provides access to the current event receiver.
/** \return Pointer to the current event receiver. Returns 0 if there is none. */
virtual IEventReceiver* getEventReceiver() = 0;
//! Sends a user created event to the engine.
/** Is is usually not necessary to use this. However, if you
are using an own input library for example for doing joystick
input, you can use this to post key or mouse input events to
the engine. Internally, this method only delegates the events
further to the scene manager and the GUI environment. */
virtual bool postEventFromUser(const SEvent& event) = 0;
//! Sets the input receiving scene manager.
/** If set to null, the main scene manager (returned by
GetSceneManager()) will receive the input
\param sceneManager New scene manager to be used. */
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) = 0;
//! Sets if the window should be resizeable in windowed mode.
/** The default is false. This method only works in windowed
mode.
\param resize Flag whether the window should be resizeable. */
virtual void setResizeable(bool resize=false) = 0;
//! Minimizes the window if possible.
virtual void minimizeWindow() =0;
//! Activate any joysticks, and generate events for them.
/** Irrlicht contains support for joysticks, but does not generate joystick events by default,
as this would consume joystick info that 3rd party libraries might rely on. Call this method to
activate joystick support in Irrlicht and to receive irr::SJoystickEvent events.
\param joystickInfo On return, this will contain an array of each joystick that was found and activated.
\return true if joysticks are supported on this device and _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
is defined, false if joysticks are not supported or support is compiled out.
*/
virtual bool activateJoysticks(core::array<SJoystickInfo>& joystickInfo) =0;
//! Set the current Gamma Value for the Display
virtual bool setGammaRamp(f32 red, f32 green, f32 blue,
f32 relativebrightness, f32 relativecontrast) =0;
//! Get the current Gamma Value for the Display
virtual bool getGammaRamp(f32 &red, f32 &green, f32 &blue,
f32 &brightness, f32 &contrast) =0;
};
} // end namespace irr
#endif
// Copyright (C) 2002-2009 Nikolaus Gebhardt
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __I_IRRLICHT_DEVICE_H_INCLUDED__
#define __I_IRRLICHT_DEVICE_H_INCLUDED__
#include "IReferenceCounted.h"
#include "dimension2d.h"
#include "IVideoDriver.h"
#include "EDriverTypes.h"
#include "IEventReceiver.h"
#include "ICursorControl.h"
#include "IVideoModeList.h"
#include "ITimer.h"
#include "IOSOperator.h"
namespace irr
{
class ILogger;
class IEventReceiver;
namespace io {
class IFileSystem;
} // end namespace io
namespace gui {
class IGUIEnvironment;
} // end namespace gui
namespace scene {
class ISceneManager;
} // end namespace scene
//! The Irrlicht device. You can create it with createDevice() or createDeviceEx().
/** This is the most important class of the Irrlicht Engine. You can access everything
in the engine if you have a pointer to an instance of this class.
There should be only one instance of this class at any time.
*/
class IrrlichtDevice : public virtual IReferenceCounted
{
public:
//! Runs the device.
/** Also increments the virtual timer by calling
ITimer::tick();. You can prevent this
by calling ITimer::stop(); before and ITimer::start() after
calling IrrlichtDevice::run(). Returns false if device wants
to be deleted. Use it in this way:
\code
while(device->run())
{
// draw everything here
}
\endcode
If you want the device to do nothing if the window is inactive
(recommended), use the slightly enhanced code shown at isWindowActive().
Note if you are running Irrlicht inside an external, custom
created window: Calling Device->run() will cause Irrlicht to
dispatch windows messages internally.
If you are running Irrlicht in your own custom window, you can
also simply use your own message loop using GetMessage,
DispatchMessage and whatever and simply don't use this method.
But note that Irrlicht will not be able to fetch user input
then. See irr::SIrrlichtCreationParameters::WindowId for more
informations and example code.
*/
virtual bool run() = 0;
//! Cause the device to temporarily pause execution and let other processes run.
/** This should bring down processor usage without major
performance loss for Irrlicht */
virtual void yield() = 0;
//! Pause execution and let other processes to run for a specified amount of time.
/** It may not wait the full given time, as sleep may be interrupted
\param timeMs: Time to sleep for in milisecs.
\param pauseTimer: If true, pauses the device timer while sleeping
*/
virtual void sleep(u32 timeMs, bool pauseTimer=false) = 0;
//! Provides access to the video driver for drawing 3d and 2d geometry.
/** \return Pointer the video driver. */
virtual video::IVideoDriver* getVideoDriver() = 0;
//! Provides access to the virtual file system.
/** \return Pointer to the file system. */
virtual io::IFileSystem* getFileSystem() = 0;
//! Provides access to the 2d user interface environment.
/** \return Pointer to the gui environment. */
virtual gui::IGUIEnvironment* getGUIEnvironment() = 0;
//! Provides access to the scene manager.
/** \return Pointer to the scene manager. */
virtual scene::ISceneManager* getSceneManager() = 0;
//! Provides access to the cursor control.
/** \return Pointer to the mouse cursor control interface. */
virtual gui::ICursorControl* getCursorControl() = 0;
//! Provides access to the message logger.
/** \return Pointer to the logger. */
virtual ILogger* getLogger() = 0;
//! Gets a list with all video modes available.
/** If you are confused now, because you think you have to
create an Irrlicht Device with a video mode before being able
to get the video mode list, let me tell you that there is no
need to start up an Irrlicht Device with EDT_DIRECT3D8,
EDT_OPENGL or EDT_SOFTWARE: For this (and for lots of other
reasons) the null driver, EDT_NULL exists.
\return Pointer to a list with all video modes supported
by the gfx adapter. */
virtual video::IVideoModeList* getVideoModeList() = 0;
//! Provides access to the operation system operator object.
/** The OS operator provides methods for
getting system specific informations and doing system
specific operations, such as exchanging data with the clipboard
or reading the operation system version.
\return Pointer to the OS operator. */
virtual IOSOperator* getOSOperator() = 0;
//! Provides access to the engine's timer.
/** The system time can be retrieved by it as
well as the virtual time, which also can be manipulated.
\return Pointer to the ITimer object. */
virtual ITimer* getTimer() = 0;
//! Sets the caption of the window.
/** \param text: New text of the window caption. */
virtual void setWindowCaption(const wchar_t* text) = 0;
//! Returns if the window is active.
/** If the window is inactive,
nothing needs to be drawn. So if you don't want to draw anything
when the window is inactive, create your drawing loop this way:
\code
while(device->run())
{
if (device->isWindowActive())
{
// draw everything here
}
else
device->yield();
}
\endcode
\return True if window is active. */
virtual bool isWindowActive() const = 0;
//! Checks if the Irrlicht window has focus
/** \return True if window has focus. */
virtual bool isWindowFocused() const = 0;
//! Checks if the Irrlicht window is minimized
/** \return True if window is minimized. */
virtual bool isWindowMinimized() const = 0;
//! Checks if the Irrlicht window is running in fullscreen mode
/** \return True if window is fullscreen. */
virtual bool isFullscreen() const = 0;
//! Get the current color format of the window
/** \return Color format of the window. */
virtual video::ECOLOR_FORMAT getColorFormat() const = 0;
//! Notifies the device that it should close itself.
/** IrrlichtDevice::run() will always return false after closeDevice() was called. */
virtual void closeDevice() = 0;
//! Get the version of the engine.
/** The returned string
will look like this: "1.2.3" or this: "1.2".
\return String which contains the version. */
virtual const c8* getVersion() const = 0;
//! Sets a new user event receiver which will receive events from the engine.
/** Return true in IEventReceiver::OnEvent to prevent the event from continuing along
the chain of event receivers. The path that an event takes through the system depends
on its type. See irr::EEVENT_TYPE for details.
\param receiver New receiver to be used. */
virtual void setEventReceiver(IEventReceiver* receiver) = 0;
//! Provides access to the current event receiver.
/** \return Pointer to the current event receiver. Returns 0 if there is none. */
virtual IEventReceiver* getEventReceiver() = 0;
//! Sends a user created event to the engine.
/** Is is usually not necessary to use this. However, if you
are using an own input library for example for doing joystick
input, you can use this to post key or mouse input events to
the engine. Internally, this method only delegates the events
further to the scene manager and the GUI environment. */
virtual bool postEventFromUser(const SEvent& event) = 0;
//! Sets the input receiving scene manager.
/** If set to null, the main scene manager (returned by
GetSceneManager()) will receive the input
\param sceneManager New scene manager to be used. */
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) = 0;
//! Sets if the window should be resizable in windowed mode.
/** The default is false. This method only works in windowed
mode.
\param resize Flag whether the window should be resizable. */
virtual void setResizable(bool resize=false) = 0;
//! Minimizes the window if possible.
virtual void minimizeWindow() =0;
//! Activate any joysticks, and generate events for them.
/** Irrlicht contains support for joysticks, but does not generate joystick events by default,
as this would consume joystick info that 3rd party libraries might rely on. Call this method to
activate joystick support in Irrlicht and to receive irr::SJoystickEvent events.
\param joystickInfo On return, this will contain an array of each joystick that was found and activated.
\return true if joysticks are supported on this device and _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
is defined, false if joysticks are not supported or support is compiled out.
*/
virtual bool activateJoysticks(core::array<SJoystickInfo>& joystickInfo) =0;
//! Set the current Gamma Value for the Display
virtual bool setGammaRamp(f32 red, f32 green, f32 blue,
f32 relativebrightness, f32 relativecontrast) =0;
//! Get the current Gamma Value for the Display
virtual bool getGammaRamp(f32 &red, f32 &green, f32 &blue,
f32 &brightness, f32 &contrast) =0;
};
} // end namespace irr
#endif

File diff suppressed because it is too large Load Diff

View File

@ -182,21 +182,19 @@ private:
bool readHeader(io::IReadFile* file, rgbStruct* rgb) const;
void readRGBrow( u8 *buf, int y, int z, io::IReadFile* file, rgbStruct* rgb) const;
void convertLong(u32 *array, long length) const;
void convertShort(u16 *array, long length) const;
void processFile(rgbStruct *rgb, io::IReadFile *file) const;
bool checkFormat(io::IReadFile *file, rgbStruct *rgb) const;
bool readOffsetTables(io::IReadFile* file, rgbStruct *rgb) const;
void converttoARGB(u8* in, rgbStruct *rgb) const;
#ifndef __BIG_ENDIAN__
void convertLong(u32 *array, long length) const;
void convertShort(u16 *array, long length) const;
#endif
};
} // end namespace video
} // end namespace irr
#endif
#endif
#endif // _IRR_COMPILE_WITH_RGB_LOADER_
#endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__

View File

@ -406,8 +406,8 @@ void CIrrDeviceConsole::closeDevice()
IsDeviceRunning = false;
}
//! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceConsole::setResizeable(bool resize)
//! Sets if the window should be resizable in windowed mode.
void CIrrDeviceConsole::setResizable(bool resize)
{
// do nothing
}

View File

@ -75,8 +75,8 @@ namespace irr
//! notifies the device that it should close itself
virtual void closeDevice();
//! Sets if the window should be resizeable in windowed mode.
virtual void setResizeable(bool resize=false);
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false);
//! Minimizes the window.
virtual void minimizeWindow();

View File

@ -1050,8 +1050,8 @@ video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const
}
//! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceLinux::setResizeable(bool resize)
//! Sets if the window should be resizable in windowed mode.
void CIrrDeviceLinux::setResizable(bool resize)
{
#ifdef _IRR_COMPILE_WITH_X11_
if (CreationParams.DriverType == video::EDT_NULL)

View File

@ -87,8 +87,8 @@ namespace irr
//! supported by the gfx adapter.
video::IVideoModeList* getVideoModeList();
//! Sets if the window should be resizeable in windowed mode.
virtual void setResizeable(bool resize=false);
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false);
//! Minimizes the window.
virtual void minimizeWindow();

View File

@ -45,7 +45,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
Screen((SDL_Surface*)param.WindowId), SDL_Flags(SDL_HWSURFACE|SDL_ANYFORMAT),
MouseX(0), MouseY(0), MouseButtonStates(0),
Width(param.WindowSize.Width), Height(param.WindowSize.Height),
Close(0), Resizeable(false),
Close(0), Resizable(false),
WindowHasFocus(false), WindowMinimized(false)
{
#ifdef _DEBUG
@ -660,10 +660,10 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
}
//! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceSDL::setResizeable(bool resize)
//! Sets if the window should be resizable in windowed mode.
void CIrrDeviceSDL::setResizable(bool resize)
{
if (resize != Resizeable)
if (resize != Resizable)
{
if (resize)
SDL_Flags |= SDL_RESIZABLE;
@ -672,7 +672,7 @@ void CIrrDeviceSDL::setResizeable(bool resize)
if (Screen)
SDL_FreeSurface(Screen);
Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags );
Resizeable = resize;
Resizable = resize;
}
}

View File

@ -64,8 +64,8 @@ namespace irr
//! \return Returns a pointer to a list with all video modes supported
video::IVideoModeList* getVideoModeList();
//! Sets if the window should be resizeable in windowed mode.
virtual void setResizeable(bool resize=false);
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false);
//! Minimizes the window.
virtual void minimizeWindow();
@ -185,7 +185,7 @@ namespace irr
u32 Width, Height;
bool Close;
bool Resizeable;
bool Resizable;
bool WindowHasFocus;
bool WindowMinimized;

View File

@ -892,8 +892,8 @@ void CIrrDeviceWin32::OnResized()
Resized = true;
}
//! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceWin32::setResizeable(bool resize)
//! Sets if the window should be resizable in windowed mode.
void CIrrDeviceWin32::setResizable(bool resize)
{
if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
return;

View File

@ -66,8 +66,8 @@ namespace irr
//! Notifies the device, that it has been resized
void OnResized();
//! Sets if the window should be resizeable in windowed mode.
virtual void setResizeable(bool resize=false);
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false);
//! Minimizes the window.
virtual void minimizeWindow();

View File

@ -741,8 +741,8 @@ void CIrrDeviceWinCE::OnResized()
}
//! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceWinCE::setResizeable(bool resize)
//! Sets if the window should be resizable in windowed mode.
void CIrrDeviceWinCE::setResizable(bool resize)
{
if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
return;

View File

@ -66,8 +66,8 @@ namespace irr
//! Notifies the device, that it has been resized
void OnResized();
//! Sets if the window should be resizeable in windowed mode.
virtual void setResizeable(bool resize=false);
//! Sets if the window should be resizable in windowed mode.
virtual void setResizable(bool resize=false);
//! Minimizes the window.
virtual void minimizeWindow();

View File

@ -52,7 +52,7 @@
- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
{
if (_device->isResizeAble())
if (_device->isResizable())
return proposedFrameSize;
else
return [window frame].size;

View File

@ -63,10 +63,13 @@ namespace irr
virtual void closeDevice();
//! Sets if the window should be resizable in windowed mode.
virtual void setResizeAble(bool resize);
virtual void setResizable(bool resize);
//! Returns true if the window is resizable, false if not
virtual bool isResizeAble() const;
virtual bool isResizable() const;
//! Minimizes the window if possible
virtual void minimizeWindow();
//! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
@ -76,8 +79,8 @@ namespace irr
virtual video::IVideoModeList* getVideoModeList();
void flush();
void setMouseLocation(int x,int y);
void setResize(int width,int height);
void setMouseLocation(int x, int y);
void setResize(int width, int height);
void setCursorVisible(bool visible);
private:

View File

@ -369,7 +369,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
if (CreationParams.DriverType != video::EDT_NULL)
createWindow();
setResizeAble(false);
setResizable(false);
CursorControl = new CCursorControl(CreationParams.WindowSize, this);
createDriver();
@ -1085,17 +1085,21 @@ void CIrrDeviceMacOSX::initKeycodes()
//! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceMacOSX::setResizeAble(bool resize)
//! Sets if the window should be resizable in windowed mode.
void CIrrDeviceMacOSX::setResizable(bool resize)
{
IsResizable = resize;
}
bool CIrrDeviceMacOSX::isResizeAble() const
bool CIrrDeviceMacOSX::isResizable() const
{
return IsResizable;
}
void CIrrDeviceMacOSX::minimizeWindow()
{
// todo: implement
}
bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rect<s32>* src )
{

View File

@ -2021,63 +2021,16 @@
0910BA810D1F6BB800D46B04 /* gui */ = {
isa = PBXGroup;
children = (
34FFD9CB0F6601AC00420884 /* element */,
4C53DEE60A484C220014E966 /* BuiltInFont.h */,
5DD480580C7D945800728AA9 /* CDefaultGUIElementFactory.cpp */,
5DD480590C7D945800728AA9 /* CDefaultGUIElementFactory.h */,
4C53DF2E0A484C230014E966 /* CGUIButton.cpp */,
4C53DF2F0A484C230014E966 /* CGUIButton.h */,
4C53DF300A484C230014E966 /* CGUICheckBox.cpp */,
4C53DF310A484C230014E966 /* CGUICheckBox.h */,
5DD4805E0C7D947B00728AA9 /* CGUIColorSelectDialog.cpp */,
5DD4805F0C7D947B00728AA9 /* CGUIColorSelectDialog.h */,
4C53DF320A484C230014E966 /* CGUIComboBox.cpp */,
4C53DF330A484C230014E966 /* CGUIComboBox.h */,
4C53DF340A484C230014E966 /* CGUIContextMenu.cpp */,
4C53DF350A484C230014E966 /* CGUIContextMenu.h */,
4C53DF360A484C230014E966 /* CGUIEditBox.cpp */,
4C53DF370A484C230014E966 /* CGUIEditBox.h */,
4C53DF380A484C230014E966 /* CGUIEnvironment.cpp */,
4C53DF390A484C230014E966 /* CGUIEnvironment.h */,
4C53DF3A0A484C230014E966 /* CGUIFileOpenDialog.cpp */,
4C53DF3B0A484C230014E966 /* CGUIFileOpenDialog.h */,
4C53DF3C0A484C230014E966 /* CGUIFont.cpp */,
4C53DF3D0A484C230014E966 /* CGUIFont.h */,
4C53DF3E0A484C230014E966 /* CGUIImage.cpp */,
4C53DF3F0A484C230014E966 /* CGUIImage.h */,
3484C4DF0F48D1B000C81F60 /* CGUIImageList.h */,
3484C4E00F48D1B000C81F60 /* CGUIImageList.cpp */,
4C53DF400A484C230014E966 /* CGUIInOutFader.cpp */,
4C53DF410A484C230014E966 /* CGUIInOutFader.h */,
4C53DF420A484C230014E966 /* CGUIListBox.cpp */,
4C53DF430A484C230014E966 /* CGUIListBox.h */,
4C53DF440A484C230014E966 /* CGUIMenu.cpp */,
4C53DF450A484C230014E966 /* CGUIMenu.h */,
4C53DF460A484C230014E966 /* CGUIMeshViewer.cpp */,
4C53DF470A484C230014E966 /* CGUIMeshViewer.h */,
4C53DF480A484C230014E966 /* CGUIMessageBox.cpp */,
4C53DF490A484C230014E966 /* CGUIMessageBox.h */,
4C53DF4A0A484C230014E966 /* CGUIModalScreen.cpp */,
4C53DF4B0A484C230014E966 /* CGUIModalScreen.h */,
4C53DF4C0A484C230014E966 /* CGUIScrollBar.cpp */,
4C53DF4D0A484C230014E966 /* CGUIScrollBar.h */,
4C53DF4E0A484C230014E966 /* CGUISkin.cpp */,
4C53DF4F0A484C230014E966 /* CGUISkin.h */,
5DD480600C7D947B00728AA9 /* CGUISpinBox.cpp */,
5DD480610C7D947B00728AA9 /* CGUISpinBox.h */,
5DD480620C7D947B00728AA9 /* CGUISpriteBank.cpp */,
5DD480630C7D947B00728AA9 /* CGUISpriteBank.h */,
4C53DF500A484C230014E966 /* CGUIStaticText.cpp */,
4C53DF510A484C230014E966 /* CGUIStaticText.h */,
4C53DF520A484C230014E966 /* CGUITabControl.cpp */,
4C53DF530A484C230014E966 /* CGUITabControl.h */,
0910B9DA0D1F5D4100D46B04 /* CGUITable.cpp */,
0910B9DB0D1F5D4100D46B04 /* CGUITable.h */,
4C53DF540A484C230014E966 /* CGUIToolBar.cpp */,
4C53DF550A484C230014E966 /* CGUIToolBar.h */,
3484C4EC0F48D3A100C81F60 /* CGUITreeView.h */,
3484C4ED0F48D3A100C81F60 /* CGUITreeView.cpp */,
4C53DF560A484C230014E966 /* CGUIWindow.cpp */,
4C53DF570A484C230014E966 /* CGUIWindow.h */,
);
name = gui;
sourceTree = "<group>";
@ -2085,31 +2038,14 @@
0910BA820D1F6C3900D46B04 /* io */ = {
isa = PBXGroup;
children = (
4C53E0030A484C250014E966 /* CZipReader.cpp */,
4C53E0040A484C250014E966 /* CZipReader.h */,
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */,
4C53DEF00A484C220014E966 /* CAttributes.cpp */,
4C53DEF10A484C220014E966 /* CAttributes.h */,
34FFD9CA0F66018500420884 /* xml */,
34FFD9C90F66014200420884 /* file */,
34FFD9C80F66012D00420884 /* attributes */,
34FFD9C70F66011C00420884 /* archive */,
4C53DF260A484C230014E966 /* CFileList.cpp */,
4C53DF270A484C230014E966 /* CFileList.h */,
4C53DF280A484C230014E966 /* CFileSystem.cpp */,
4C53DF290A484C230014E966 /* CFileSystem.h */,
4C53DF6E0A484C230014E966 /* CLimitReadFile.cpp */,
4C53DF6F0A484C230014E966 /* CLimitReadFile.h */,
3484C4FB0F48D4CB00C81F60 /* CMemoryFile.h */,
3484C4FC0F48D4CB00C81F60 /* CMemoryFile.cpp */,
4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */,
4C43EEBF0A74A5C800F942FC /* CPakReader.h */,
4C53DFA70A484C240014E966 /* CReadFile.cpp */,
4C53DFA80A484C240014E966 /* CReadFile.h */,
4C53DFF20A484C250014E966 /* CWriteFile.cpp */,
4C53DFF30A484C250014E966 /* CWriteFile.h */,
4C53DFFA0A484C250014E966 /* CXMLReader.cpp */,
4C53DFFB0A484C250014E966 /* CXMLReader.h */,
4C53DFFC0A484C250014E966 /* CXMLReaderImpl.h */,
4C53DFFD0A484C250014E966 /* CXMLWriter.cpp */,
4C53DFFE0A484C250014E966 /* CXMLWriter.h */,
4C53E00E0A484C250014E966 /* irrXML.cpp */,
);
name = io;
sourceTree = "<group>";
@ -2117,16 +2053,7 @@
0910BA830D1F6CA600D46B04 /* irr */ = {
isa = PBXGroup;
children = (
34EC243A0F59272E0037BC3A /* CIrrDeviceConsole.h */,
34EC243B0F59272E0037BC3A /* CIrrDeviceConsole.cpp */,
4C53DF660A484C230014E966 /* CIrrDeviceLinux.cpp */,
4C53DF670A484C230014E966 /* CIrrDeviceLinux.h */,
5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */,
5DD480C30C7DA66800728AA9 /* CIrrDeviceSDL.h */,
4C53DF680A484C230014E966 /* CIrrDeviceStub.cpp */,
4C53DF690A484C230014E966 /* CIrrDeviceStub.h */,
4C53DF6A0A484C230014E966 /* CIrrDeviceWin32.cpp */,
4C53DF6B0A484C230014E966 /* CIrrDeviceWin32.h */,
34FFD9C60F6600DA00420884 /* device */,
4C53DF720A484C230014E966 /* CLogger.cpp */,
4C53DF730A484C230014E966 /* CLogger.h */,
4C53DF990A484C240014E966 /* COSOperator.cpp */,
@ -2613,6 +2540,138 @@
name = loader;
sourceTree = "<group>";
};
34FFD9C50F6600A900420884 /* libraries */ = {
isa = PBXGroup;
children = (
4C53E1710A484C2C0014E966 /* zlib */,
4C53E0130A484C250014E966 /* jpeglib */,
09293C2B0ED31FF8003B8C9C /* libpng */,
);
name = libraries;
sourceTree = "<group>";
};
34FFD9C60F6600DA00420884 /* device */ = {
isa = PBXGroup;
children = (
4C53E14A0A484C2C0014E966 /* MacOSX */,
34EC243A0F59272E0037BC3A /* CIrrDeviceConsole.h */,
34EC243B0F59272E0037BC3A /* CIrrDeviceConsole.cpp */,
4C53DF660A484C230014E966 /* CIrrDeviceLinux.cpp */,
4C53DF670A484C230014E966 /* CIrrDeviceLinux.h */,
5DD480C40C7DA66800728AA9 /* CIrrDeviceSDL.cpp */,
5DD480C30C7DA66800728AA9 /* CIrrDeviceSDL.h */,
4C53DF680A484C230014E966 /* CIrrDeviceStub.cpp */,
4C53DF690A484C230014E966 /* CIrrDeviceStub.h */,
4C53DF6A0A484C230014E966 /* CIrrDeviceWin32.cpp */,
4C53DF6B0A484C230014E966 /* CIrrDeviceWin32.h */,
);
name = device;
sourceTree = "<group>";
};
34FFD9C70F66011C00420884 /* archive */ = {
isa = PBXGroup;
children = (
4C53E0030A484C250014E966 /* CZipReader.cpp */,
4C53E0040A484C250014E966 /* CZipReader.h */,
4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */,
4C43EEBF0A74A5C800F942FC /* CPakReader.h */,
);
name = archive;
sourceTree = "<group>";
};
34FFD9C80F66012D00420884 /* attributes */ = {
isa = PBXGroup;
children = (
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */,
4C53DEF00A484C220014E966 /* CAttributes.cpp */,
4C53DEF10A484C220014E966 /* CAttributes.h */,
);
name = attributes;
sourceTree = "<group>";
};
34FFD9C90F66014200420884 /* file */ = {
isa = PBXGroup;
children = (
4C53DFA70A484C240014E966 /* CReadFile.cpp */,
4C53DFA80A484C240014E966 /* CReadFile.h */,
4C53DFF20A484C250014E966 /* CWriteFile.cpp */,
4C53DFF30A484C250014E966 /* CWriteFile.h */,
4C53DF6E0A484C230014E966 /* CLimitReadFile.cpp */,
4C53DF6F0A484C230014E966 /* CLimitReadFile.h */,
3484C4FB0F48D4CB00C81F60 /* CMemoryFile.h */,
3484C4FC0F48D4CB00C81F60 /* CMemoryFile.cpp */,
);
name = file;
sourceTree = "<group>";
};
34FFD9CA0F66018500420884 /* xml */ = {
isa = PBXGroup;
children = (
4C53DFFA0A484C250014E966 /* CXMLReader.cpp */,
4C53DFFB0A484C250014E966 /* CXMLReader.h */,
4C53DFFC0A484C250014E966 /* CXMLReaderImpl.h */,
4C53DFFD0A484C250014E966 /* CXMLWriter.cpp */,
4C53DFFE0A484C250014E966 /* CXMLWriter.h */,
4C53E00E0A484C250014E966 /* irrXML.cpp */,
);
name = xml;
sourceTree = "<group>";
};
34FFD9CB0F6601AC00420884 /* element */ = {
isa = PBXGroup;
children = (
4C53DF2E0A484C230014E966 /* CGUIButton.cpp */,
4C53DF2F0A484C230014E966 /* CGUIButton.h */,
4C53DF300A484C230014E966 /* CGUICheckBox.cpp */,
4C53DF310A484C230014E966 /* CGUICheckBox.h */,
5DD4805E0C7D947B00728AA9 /* CGUIColorSelectDialog.cpp */,
5DD4805F0C7D947B00728AA9 /* CGUIColorSelectDialog.h */,
4C53DF320A484C230014E966 /* CGUIComboBox.cpp */,
4C53DF330A484C230014E966 /* CGUIComboBox.h */,
4C53DF340A484C230014E966 /* CGUIContextMenu.cpp */,
4C53DF350A484C230014E966 /* CGUIContextMenu.h */,
4C53DF360A484C230014E966 /* CGUIEditBox.cpp */,
4C53DF370A484C230014E966 /* CGUIEditBox.h */,
4C53DF380A484C230014E966 /* CGUIEnvironment.cpp */,
4C53DF390A484C230014E966 /* CGUIEnvironment.h */,
4C53DF3A0A484C230014E966 /* CGUIFileOpenDialog.cpp */,
4C53DF3B0A484C230014E966 /* CGUIFileOpenDialog.h */,
4C53DF3E0A484C230014E966 /* CGUIImage.cpp */,
4C53DF3F0A484C230014E966 /* CGUIImage.h */,
3484C4DF0F48D1B000C81F60 /* CGUIImageList.h */,
3484C4E00F48D1B000C81F60 /* CGUIImageList.cpp */,
4C53DF400A484C230014E966 /* CGUIInOutFader.cpp */,
4C53DF410A484C230014E966 /* CGUIInOutFader.h */,
4C53DF420A484C230014E966 /* CGUIListBox.cpp */,
4C53DF430A484C230014E966 /* CGUIListBox.h */,
4C53DF440A484C230014E966 /* CGUIMenu.cpp */,
4C53DF450A484C230014E966 /* CGUIMenu.h */,
4C53DF460A484C230014E966 /* CGUIMeshViewer.cpp */,
4C53DF470A484C230014E966 /* CGUIMeshViewer.h */,
4C53DF480A484C230014E966 /* CGUIMessageBox.cpp */,
4C53DF490A484C230014E966 /* CGUIMessageBox.h */,
4C53DF4A0A484C230014E966 /* CGUIModalScreen.cpp */,
4C53DF4B0A484C230014E966 /* CGUIModalScreen.h */,
4C53DF4C0A484C230014E966 /* CGUIScrollBar.cpp */,
4C53DF4D0A484C230014E966 /* CGUIScrollBar.h */,
5DD480600C7D947B00728AA9 /* CGUISpinBox.cpp */,
5DD480610C7D947B00728AA9 /* CGUISpinBox.h */,
4C53DF500A484C230014E966 /* CGUIStaticText.cpp */,
4C53DF510A484C230014E966 /* CGUIStaticText.h */,
4C53DF520A484C230014E966 /* CGUITabControl.cpp */,
4C53DF530A484C230014E966 /* CGUITabControl.h */,
0910B9DA0D1F5D4100D46B04 /* CGUITable.cpp */,
0910B9DB0D1F5D4100D46B04 /* CGUITable.h */,
4C53DF540A484C230014E966 /* CGUIToolBar.cpp */,
4C53DF550A484C230014E966 /* CGUIToolBar.h */,
3484C4EC0F48D3A100C81F60 /* CGUITreeView.h */,
3484C4ED0F48D3A100C81F60 /* CGUITreeView.cpp */,
4C53DF560A484C230014E966 /* CGUIWindow.cpp */,
4C53DF570A484C230014E966 /* CGUIWindow.h */,
);
name = element;
sourceTree = "<group>";
};
4C00546D0A48470500C844C2 /* examples */ = {
isa = PBXGroup;
children = (
@ -2757,11 +2816,8 @@
4C53DEE50A484C220014E966 /* Irrlicht */ = {
isa = PBXGroup;
children = (
09293C2B0ED31FF8003B8C9C /* libpng */,
34FFD9C50F6600A900420884 /* libraries */,
4C6DC9960A486B110017A6E5 /* Engine */,
4C53E14A0A484C2C0014E966 /* MacOSX */,
4C53E0130A484C250014E966 /* jpeglib */,
4C53E1710A484C2C0014E966 /* zlib */,
);
name = Irrlicht;
path = ..;