Skip to content

D
deprecated-irrlicht-mac
Commit 738954d3 authored by bitplane's avatar bitplane
Browse files
Options

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
parent bee75f48
Show whitespace changes
Inline Side-by-side
Showing with 1192 additions and 1127 deletions
changes.txt
View file @ 738954d3
...@@ -2,7 +2,7 @@ Changes in 1.6 ...@@ -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 - 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). - Added new device method minimizeWindow which minimizes the window (just as if the minimize button has been clicked).
......
include/IrrlichtDevice.h
View file @ 738954d3
...@@ -202,11 +202,11 @@ namespace irr ...@@ -202,11 +202,11 @@ namespace irr
\param sceneManager New scene manager to be used. */ \param sceneManager New scene manager to be used. */
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) = 0; virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager) = 0;
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
/** The default is false. This method only works in windowed /** The default is false. This method only works in windowed
mode. mode.
\param resize Flag whether the window should be resizeable. */ \param resize Flag whether the window should be resizable. */
virtual void setResizeable(bool resize=false) = 0; virtual void setResizable(bool resize=false) = 0;
//! Minimizes the window if possible. //! Minimizes the window if possible.
virtual void minimizeWindow() =0; virtual void minimizeWindow() =0;
......
source/Irrlicht/CImageLoaderRGB.cpp
View file @ 738954d3
...@@ -231,10 +231,10 @@ IImage* CImageLoaderRGB::loadImage(io::IReadFile* file) const ...@@ -231,10 +231,10 @@ IImage* CImageLoaderRGB::loadImage(io::IReadFile* file) const
Complete Alpha blending computation Complete Alpha blending computation
The actual resulting merged color is computed this way: The actual resulting merged color is computed this way:
(image color × alpha) + (background color × (100% - alpha)). (image color ◊ alpha) + (background color ◊ (100% - alpha)).
Using precomputed blending Using precomputed blending
(image color) + (background color × (100% - alpha)). (image color) + (background color ◊ (100% - alpha)).
Alternatively, the RGB files could use another blending technique entirely Alternatively, the RGB files could use another blending technique entirely
...@@ -584,8 +584,10 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb ...@@ -584,8 +584,10 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb
iPtr = (u8 *) tempShort; iPtr = (u8 *) tempShort;
} }
#ifndef __BIG_ENDIAN__
if (rgb->header.BPC != 1) if (rgb->header.BPC != 1)
convertShort(&pixel, 1); convertShort(&pixel, 1);
#endif
count = (int)(pixel & 0x7F); count = (int)(pixel & 0x7F);
...@@ -616,9 +618,9 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb ...@@ -616,9 +618,9 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb
pixel = *tempShort; pixel = *tempShort;
tempShort++; tempShort++;
iPtr = (u8 *) (tempShort); iPtr = (u8 *) (tempShort);
#ifndef __BIG_ENDIAN__
convertShort(&pixel, 1); convertShort(&pixel, 1);
#endif
tempShort = (u16 *) (oPtr); tempShort = (u16 *) (oPtr);
*tempShort = pixel; *tempShort = pixel;
tempShort++; tempShort++;
...@@ -640,8 +642,10 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb ...@@ -640,8 +642,10 @@ void CImageLoaderRGB::readRGBrow(u8 *buf, int y, int z, io::IReadFile* file, rgb
iPtr = (u8 *) (tempShort); iPtr = (u8 *) (tempShort);
} }
#ifndef __BIG_ENDIAN__
if (rgb->header.BPC != 1) if (rgb->header.BPC != 1)
convertShort(&pixel, 1); convertShort(&pixel, 1);
#endif
while (count--) while (count--)
{ {
...@@ -730,7 +734,7 @@ void CImageLoaderRGB::converttoARGB(u8* in, rgbStruct *rgb) const ...@@ -730,7 +734,7 @@ void CImageLoaderRGB::converttoARGB(u8* in, rgbStruct *rgb) const
{ {
u32 cnt=0; u32 cnt=0;
u8 tmp; u8 tmp;
// (image color × alpha) + (background color × (100% - alpha)). // (image color ◊ alpha) + (background color ◊ (100% - alpha)).
for ( int y=0; y < rgb->header.Ysize; y++) for ( int y=0; y < rgb->header.Ysize; y++)
{ {
......
source/Irrlicht/CImageLoaderRGB.h
View file @ 738954d3
...@@ -182,21 +182,19 @@ private: ...@@ -182,21 +182,19 @@ private:
bool readHeader(io::IReadFile* file, rgbStruct* rgb) const; bool readHeader(io::IReadFile* file, rgbStruct* rgb) const;
void readRGBrow( u8 *buf, int y, int z, 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; void processFile(rgbStruct *rgb, io::IReadFile *file) const;
bool checkFormat(io::IReadFile *file, rgbStruct *rgb) const; bool checkFormat(io::IReadFile *file, rgbStruct *rgb) const;
bool readOffsetTables(io::IReadFile* file, rgbStruct *rgb) const; bool readOffsetTables(io::IReadFile* file, rgbStruct *rgb) const;
void converttoARGB(u8* in, 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 video
} // end namespace irr } // end namespace irr
#endif // _IRR_COMPILE_WITH_RGB_LOADER_
#endif #endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__
#endif
source/Irrlicht/CIrrDeviceConsole.cpp
View file @ 738954d3
...@@ -406,8 +406,8 @@ void CIrrDeviceConsole::closeDevice() ...@@ -406,8 +406,8 @@ void CIrrDeviceConsole::closeDevice()
IsDeviceRunning = false; IsDeviceRunning = false;
} }
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
void CIrrDeviceConsole::setResizeable(bool resize) void CIrrDeviceConsole::setResizable(bool resize)
{ {
// do nothing // do nothing
} }
......
source/Irrlicht/CIrrDeviceConsole.h
View file @ 738954d3
...@@ -75,8 +75,8 @@ namespace irr ...@@ -75,8 +75,8 @@ namespace irr
//! notifies the device that it should close itself //! notifies the device that it should close itself
virtual void closeDevice(); virtual void closeDevice();
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizeable(bool resize=false); virtual void setResizable(bool resize=false);
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow(); virtual void minimizeWindow();
......
source/Irrlicht/CIrrDeviceLinux.cpp
View file @ 738954d3
...@@ -1050,8 +1050,8 @@ video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const ...@@ -1050,8 +1050,8 @@ video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const
} }
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
void CIrrDeviceLinux::setResizeable(bool resize) void CIrrDeviceLinux::setResizable(bool resize)
{ {
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
if (CreationParams.DriverType == video::EDT_NULL) if (CreationParams.DriverType == video::EDT_NULL)
......
source/Irrlicht/CIrrDeviceLinux.h
View file @ 738954d3
...@@ -87,8 +87,8 @@ namespace irr ...@@ -87,8 +87,8 @@ namespace irr
//! supported by the gfx adapter. //! supported by the gfx adapter.
video::IVideoModeList* getVideoModeList(); video::IVideoModeList* getVideoModeList();
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizeable(bool resize=false); virtual void setResizable(bool resize=false);
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow(); virtual void minimizeWindow();
......
source/Irrlicht/CIrrDeviceSDL.cpp
View file @ 738954d3
...@@ -45,7 +45,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param) ...@@ -45,7 +45,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
Screen((SDL_Surface*)param.WindowId), SDL_Flags(SDL_HWSURFACE|SDL_ANYFORMAT), Screen((SDL_Surface*)param.WindowId), SDL_Flags(SDL_HWSURFACE|SDL_ANYFORMAT),
MouseX(0), MouseY(0), MouseButtonStates(0), MouseX(0), MouseY(0), MouseButtonStates(0),
Width(param.WindowSize.Width), Height(param.WindowSize.Height), Width(param.WindowSize.Width), Height(param.WindowSize.Height),
Close(0), Resizeable(false), Close(0), Resizable(false),
WindowHasFocus(false), WindowMinimized(false) WindowHasFocus(false), WindowMinimized(false)
{ {
#ifdef _DEBUG #ifdef _DEBUG
...@@ -660,10 +660,10 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList() ...@@ -660,10 +660,10 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
} }
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
void CIrrDeviceSDL::setResizeable(bool resize) void CIrrDeviceSDL::setResizable(bool resize)
{ {
if (resize != Resizeable) if (resize != Resizable)
{ {
if (resize) if (resize)
SDL_Flags |= SDL_RESIZABLE; SDL_Flags |= SDL_RESIZABLE;
...@@ -672,7 +672,7 @@ void CIrrDeviceSDL::setResizeable(bool resize) ...@@ -672,7 +672,7 @@ void CIrrDeviceSDL::setResizeable(bool resize)
if (Screen) if (Screen)
SDL_FreeSurface(Screen); SDL_FreeSurface(Screen);
Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags ); Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags );
Resizeable = resize; Resizable = resize;
} }
} }
......
source/Irrlicht/CIrrDeviceSDL.h
View file @ 738954d3
...@@ -64,8 +64,8 @@ namespace irr ...@@ -64,8 +64,8 @@ namespace irr
//! \return Returns a pointer to a list with all video modes supported //! \return Returns a pointer to a list with all video modes supported
video::IVideoModeList* getVideoModeList(); video::IVideoModeList* getVideoModeList();
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizeable(bool resize=false); virtual void setResizable(bool resize=false);
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow(); virtual void minimizeWindow();
...@@ -185,7 +185,7 @@ namespace irr ...@@ -185,7 +185,7 @@ namespace irr
u32 Width, Height; u32 Width, Height;
bool Close; bool Close;
bool Resizeable; bool Resizable;
bool WindowHasFocus; bool WindowHasFocus;
bool WindowMinimized; bool WindowMinimized;
......
source/Irrlicht/CIrrDeviceWin32.cpp
View file @ 738954d3
...@@ -892,8 +892,8 @@ void CIrrDeviceWin32::OnResized() ...@@ -892,8 +892,8 @@ void CIrrDeviceWin32::OnResized()
Resized = true; Resized = true;
} }
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
void CIrrDeviceWin32::setResizeable(bool resize) void CIrrDeviceWin32::setResizable(bool resize)
{ {
if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen) if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
return; return;
......
source/Irrlicht/CIrrDeviceWin32.h
View file @ 738954d3
...@@ -66,8 +66,8 @@ namespace irr ...@@ -66,8 +66,8 @@ namespace irr
//! Notifies the device, that it has been resized //! Notifies the device, that it has been resized
void OnResized(); void OnResized();
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizeable(bool resize=false); virtual void setResizable(bool resize=false);
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow(); virtual void minimizeWindow();
......
source/Irrlicht/CIrrDeviceWinCE.cpp
View file @ 738954d3
...@@ -741,8 +741,8 @@ void CIrrDeviceWinCE::OnResized() ...@@ -741,8 +741,8 @@ void CIrrDeviceWinCE::OnResized()
} }
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
void CIrrDeviceWinCE::setResizeable(bool resize) void CIrrDeviceWinCE::setResizable(bool resize)
{ {
if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen) if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
return; return;
......
source/Irrlicht/CIrrDeviceWinCE.h
View file @ 738954d3
...@@ -66,8 +66,8 @@ namespace irr ...@@ -66,8 +66,8 @@ namespace irr
//! Notifies the device, that it has been resized //! Notifies the device, that it has been resized
void OnResized(); void OnResized();
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
virtual void setResizeable(bool resize=false); virtual void setResizable(bool resize=false);
//! Minimizes the window. //! Minimizes the window.
virtual void minimizeWindow(); virtual void minimizeWindow();
......
source/Irrlicht/MacOSX/AppDelegate.mm
View file @ 738954d3
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
{ {
if (_device->isResizeAble()) if (_device->isResizable())
return proposedFrameSize; return proposedFrameSize;
else else
return [window frame].size; return [window frame].size;
......
source/Irrlicht/MacOSX/CIrrDeviceMacOSX.h
View file @ 738954d3
...@@ -63,10 +63,13 @@ namespace irr ...@@ -63,10 +63,13 @@ namespace irr
virtual void closeDevice(); virtual void closeDevice();
//! Sets if the window should be resizable in windowed mode. //! 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 //! 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. //! Activate any joysticks, and generate events for them.
virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo); virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
...@@ -76,8 +79,8 @@ namespace irr ...@@ -76,8 +79,8 @@ namespace irr
virtual video::IVideoModeList* getVideoModeList(); virtual video::IVideoModeList* getVideoModeList();
void flush(); void flush();
void setMouseLocation(int x,int y); void setMouseLocation(int x, int y);
void setResize(int width,int height); void setResize(int width, int height);
void setCursorVisible(bool visible); void setCursorVisible(bool visible);
private: private:
......
source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
View file @ 738954d3
...@@ -369,7 +369,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param) ...@@ -369,7 +369,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
if (CreationParams.DriverType != video::EDT_NULL) if (CreationParams.DriverType != video::EDT_NULL)
createWindow(); createWindow();
setResizeAble(false); setResizable(false);
CursorControl = new CCursorControl(CreationParams.WindowSize, this); CursorControl = new CCursorControl(CreationParams.WindowSize, this);
createDriver(); createDriver();
...@@ -1085,17 +1085,21 @@ void CIrrDeviceMacOSX::initKeycodes() ...@@ -1085,17 +1085,21 @@ void CIrrDeviceMacOSX::initKeycodes()
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizable in windowed mode.
void CIrrDeviceMacOSX::setResizeAble(bool resize) void CIrrDeviceMacOSX::setResizable(bool resize)
{ {
IsResizable = resize; IsResizable = resize;
} }
bool CIrrDeviceMacOSX::isResizeAble() const bool CIrrDeviceMacOSX::isResizable() const
{ {
return IsResizable; return IsResizable;
} }
void CIrrDeviceMacOSX::minimizeWindow()
{
// todo: implement
}
bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rect<s32>* src ) bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rect<s32>* src )
{ {
......
source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj
View file @ 738954d3
...@@ -2021,63 +2021,16 @@ ...@@ -2021,63 +2021,16 @@
0910BA810D1F6BB800D46B04 /* gui */ = { 0910BA810D1F6BB800D46B04 /* gui */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
34FFD9CB0F6601AC00420884 /* element */,
4C53DEE60A484C220014E966 /* BuiltInFont.h */, 4C53DEE60A484C220014E966 /* BuiltInFont.h */,
5DD480580C7D945800728AA9 /* CDefaultGUIElementFactory.cpp */, 5DD480580C7D945800728AA9 /* CDefaultGUIElementFactory.cpp */,
5DD480590C7D945800728AA9 /* CDefaultGUIElementFactory.h */, 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 */, 4C53DF3C0A484C230014E966 /* CGUIFont.cpp */,
4C53DF3D0A484C230014E966 /* CGUIFont.h */, 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 */, 4C53DF4E0A484C230014E966 /* CGUISkin.cpp */,
4C53DF4F0A484C230014E966 /* CGUISkin.h */, 4C53DF4F0A484C230014E966 /* CGUISkin.h */,
5DD480600C7D947B00728AA9 /* CGUISpinBox.cpp */,
5DD480610C7D947B00728AA9 /* CGUISpinBox.h */,
5DD480620C7D947B00728AA9 /* CGUISpriteBank.cpp */, 5DD480620C7D947B00728AA9 /* CGUISpriteBank.cpp */,
5DD480630C7D947B00728AA9 /* CGUISpriteBank.h */, 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; name = gui;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2085,31 +2038,14 @@ ...@@ -2085,31 +2038,14 @@
0910BA820D1F6C3900D46B04 /* io */ = { 0910BA820D1F6C3900D46B04 /* io */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4C53E0030A484C250014E966 /* CZipReader.cpp */, 34FFD9CA0F66018500420884 /* xml */,
4C53E0040A484C250014E966 /* CZipReader.h */, 34FFD9C90F66014200420884 /* file */,
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */, 34FFD9C80F66012D00420884 /* attributes */,
4C53DEF00A484C220014E966 /* CAttributes.cpp */, 34FFD9C70F66011C00420884 /* archive */,
4C53DEF10A484C220014E966 /* CAttributes.h */,
4C53DF260A484C230014E966 /* CFileList.cpp */, 4C53DF260A484C230014E966 /* CFileList.cpp */,
4C53DF270A484C230014E966 /* CFileList.h */, 4C53DF270A484C230014E966 /* CFileList.h */,
4C53DF280A484C230014E966 /* CFileSystem.cpp */, 4C53DF280A484C230014E966 /* CFileSystem.cpp */,
4C53DF290A484C230014E966 /* CFileSystem.h */, 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; name = io;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2117,16 +2053,7 @@ ...@@ -2117,16 +2053,7 @@
0910BA830D1F6CA600D46B04 /* irr */ = { 0910BA830D1F6CA600D46B04 /* irr */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
34EC243A0F59272E0037BC3A /* CIrrDeviceConsole.h */, 34FFD9C60F6600DA00420884 /* device */,
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 */,
4C53DF720A484C230014E966 /* CLogger.cpp */, 4C53DF720A484C230014E966 /* CLogger.cpp */,
4C53DF730A484C230014E966 /* CLogger.h */, 4C53DF730A484C230014E966 /* CLogger.h */,
4C53DF990A484C240014E966 /* COSOperator.cpp */, 4C53DF990A484C240014E966 /* COSOperator.cpp */,
...@@ -2613,6 +2540,138 @@ ...@@ -2613,6 +2540,138 @@
name = loader; name = loader;
sourceTree = "<group>"; 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 */ = { 4C00546D0A48470500C844C2 /* examples */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -2757,11 +2816,8 @@ ...@@ -2757,11 +2816,8 @@
4C53DEE50A484C220014E966 /* Irrlicht */ = { 4C53DEE50A484C220014E966 /* Irrlicht */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
09293C2B0ED31FF8003B8C9C /* libpng */, 34FFD9C50F6600A900420884 /* libraries */,
4C6DC9960A486B110017A6E5 /* Engine */, 4C6DC9960A486B110017A6E5 /* Engine */,
4C53E14A0A484C2C0014E966 /* MacOSX */,
4C53E0130A484C250014E966 /* jpeglib */,
4C53E1710A484C2C0014E966 /* zlib */,
); );
name = Irrlicht; name = Irrlicht;
path = ..; path = ..;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment